Merge branch 'master' of ssh://www.ducamps.win:1020/volume1/git/python

merge
This commit is contained in:
vincent 2018-01-31 21:40:48 +01:00
commit 321a1c2122
3 changed files with 5 additions and 74 deletions

BIN
cave.dia Normal file

Binary file not shown.

View File

@ -56,12 +56,12 @@
"58": "C8",
"59": "W9",
"60": "TMC",
"61": "NT1",
"61": "TFX",
"62": "NRJ12",
"63": "France 4",
"64": "CStar",
"65": "France \u00d4",
"66": "HD1",
"66": "TF1 S\u00e9ries Films",
"67": "6ter",
"68": "Num\u00e9ro 23",
"69": "Ch\u00e9rie 25",
@ -218,7 +218,7 @@
"317": "CSTAR",
"318": "Gulli",
"319": "France \u00d4",
"320": "HD1",
"320": "TF1 S\u00e9ries Films",
"321": "L'\u00c9quipe",
"322": "6ter",
"323": "Num\u00e9ro 23",
@ -314,76 +314,6 @@
"474": "RT",
"475": "TRT T\u00fcrk",
"476": null,
"500": "TF1",
"501": "France 2",
"503": "Canal+",
"504": "M6",
"505": "Arte",
"506": "Canal+ Cin\u00e9ma",
"507": "Canal+ Sport",
"508": "Canal+ S\u00e9ries",
"509": "Canal+ Family",
"510": "Canal+ D\u00e9cal\u00e9",
"512": "Cin\u00e9+ Premier",
"513": "Cin\u00e9+ Frisson",
"514": "Cin\u00e9+ \u00c9motion",
"516": "Paramount Channel",
"517": "TCM Cin\u00e9ma",
"518": "OCS Max",
"519": "OCS City",
"520": "OCS Choc",
"521": "OCS G\u00e9ants",
"522": "SundanceTV",
"523": "Action",
"524": "Disney Cinema",
"525": "serieclub",
"530": "Elle Girl",
"531": "MTV",
"532": "Non Stop People",
"533": "J-One",
"534": "T\u00e9va",
"535": "Paris Premi\u00e8re",
"536": "RTL9",
"537": "C8",
"538": "W9",
"539": "CStar",
"540": "HD1",
"541": "6ter",
"542": "Num\u00e9ro 23",
"543": "Ch\u00e9rie 25",
"544": "TV5 Monde FBS",
"546": "Plan\u00e8te+",
"552": "National Geographic",
"553": "Nat Geo Wild",
"554": "Voyage",
"555": "Ushua\u00efa TV",
"557": "Animaux",
"558": "RMC D\u00e9couverte",
"559": "CNews",
"560": "BFM TV",
"561": "BFM Business",
"562": "Eurosport 1",
"563": "Eurosport 2",
"565": "AB Moteurs",
"567": "Equidia",
"569": "beIN Sports 1",
"570": "beIN Sports 2",
"571": "beIN Sports 3",
"572": "Golf+",
"573": "L'\u00c9quipe",
"578": "Disney Channel",
"579": "Disney XD",
"580": "Disney Junior",
"581": "Cartoon Network",
"582": "Canal J",
"583": "Nickelodeon Teen",
"590": "Stingray Brava",
"591": "M6 Music",
"592": "Mezzo Live HD",
"593": "Stingray Djazz",
"596": "MTV Hits",
"598": "A+",
"599": "Penthouse HD",
"600": "France Culture",
"601": "France Musique",
"602": "FIP",

View File

@ -50,7 +50,8 @@ class Interface:
except KeyError:
print("numero de chaine inconnue")
self.label2["text"] += "numero de chaine inconnue"+"\r"
self.value.set("")
self.value.set("")
def click_reset(self):
print("reset")