diff --git a/scripts/travel_ui b/scripts/travel_ui index 60b96a5b..59f6538a 100755 --- a/scripts/travel_ui +++ b/scripts/travel_ui @@ -3,7 +3,7 @@ # vim: ft=python et softtabstop=4 cinoptions=4 shiftwidth=4 ts=4 ai """ -Copyright(C) 2010 Romain Bignon +Copyright(C) 2010 Julien Hébert This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/weboob/frontends/travel_ui/application.py b/weboob/frontends/travel_ui/application.py index 924f3e3c..1532c0de 100644 --- a/weboob/frontends/travel_ui/application.py +++ b/weboob/frontends/travel_ui/application.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- """ -Copyright(C) 2010 Romain Bignon +Copyright(C) 2010 Julien Hébert This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -23,31 +23,28 @@ from weboob.tools.application import BaseApplication try: import hildon -except ImportError: - raise ImportError("erreur d'importation de hildon http://maemo.org/packages/view/python-hildon/") +except ImportError: + raise ImportError("Unable to import hildon http://maemo.org/packages/view/python-hildon/") -try : - import gtk -except ImportError: - raise ImportError("erreur d'importation de gtk") +import gtk class TransilienUI(): - "interface hildon" + "hildon interface" def __init__(self, weboob): self.weboob = weboob self.main_window = hildon.Window() self.main_window.set_title("Horaires des Prochains Trains") self.main_window.connect("destroy", self.on_main_window_destroy) - + refresh_button = hildon.Button( - gtk.HILDON_SIZE_AUTO_WIDTH | gtk.HILDON_SIZE_FINGER_HEIGHT, - hildon.BUTTON_ARRANGEMENT_HORIZONTAL, + gtk.HILDON_SIZE_AUTO_WIDTH | gtk.HILDON_SIZE_FINGER_HEIGHT, + hildon.BUTTON_ARRANGEMENT_HORIZONTAL, "Actualiser" ) retour_button = hildon.Button( - gtk.HILDON_SIZE_AUTO_WIDTH | gtk.HILDON_SIZE_FINGER_HEIGHT, - hildon.BUTTON_ARRANGEMENT_HORIZONTAL, + gtk.HILDON_SIZE_AUTO_WIDTH | gtk.HILDON_SIZE_FINGER_HEIGHT, + hildon.BUTTON_ARRANGEMENT_HORIZONTAL, "Retour" ) refresh_button.connect("clicked", self.on_refresh_button_clicked) @@ -57,63 +54,63 @@ class TransilienUI(): self.treeview = gtk.TreeView(self.treestore) self.treeview.append_column( - gtk.TreeViewColumn( - 'Train', - gtk.CellRendererText(), + gtk.TreeViewColumn( + 'Train', + gtk.CellRendererText(), text=0 )) - + self.treeview.append_column( gtk.TreeViewColumn( - 'Horaire', - gtk.CellRendererText(), + 'Horaire', + gtk.CellRendererText(), text=1 )) - + self.treeview.append_column( gtk.TreeViewColumn( - 'Destination', - gtk.CellRendererText(), + 'Destination', + gtk.CellRendererText(), text=2 )) self.treeview.append_column( gtk.TreeViewColumn( - 'Voie', - gtk.CellRendererText(), + 'Voie', + gtk.CellRendererText(), text=3 )) self.combo_source = hildon.TouchSelectorEntry(text=True) self.combo_dest = hildon.TouchSelectorEntry(text=True) - + liste = [] #liste = ConfFile('/opt/masstransit/masstransit.cfg').config.items('ListeDesGares') for name, backend in self.weboob.iter_backends(): for station in backend.iter_station_search(""): liste.append(station) - + liste.sort() for station in liste: print station self.combo_source.append_text(station.name.capitalize()) self.combo_dest.append_text(station.name.capitalize()) - + picker_button_source = hildon.PickerButton( - gtk.HILDON_SIZE_AUTO, + gtk.HILDON_SIZE_AUTO, hildon.BUTTON_ARRANGEMENT_VERTICAL) - + picker_button_dest = hildon.PickerButton( - gtk.HILDON_SIZE_AUTO, + gtk.HILDON_SIZE_AUTO, hildon.BUTTON_ARRANGEMENT_VERTICAL ) - + picker_button_source.set_title("Gare de Depart") picker_button_dest.set_title("Gare d'arrivee") - + picker_button_source.set_selector(self.combo_source) picker_button_dest.set_selector(self.combo_dest) - + vertical_box = gtk.VBox() horizontal_box = gtk.HBox() vertical_box.pack_start(horizontal_box) @@ -127,24 +124,24 @@ class TransilienUI(): self.main_window.show_all() def on_main_window_destroy(self, widget): - "quitte l'application à la fermeture de la fenetre" + "exit application at the window close" gtk.main_quit() - + def on_retour_button_clicked(self, widget): - "le bouton retour est clicked" + "the button is clicked" col_source = self.combo_source.get_active(0) col_dest = self.combo_dest.get_active(0) self.combo_source.set_active(0, col_dest) self.combo_dest.set_active(0, col_source) self.refresh() - + def on_refresh_button_clicked(self, widget): - "le bouton refresh est clicked" + "the refresh button is clicked" self.refresh() - + def refresh(self): - "met a jour les horaires" + "update departures" for name, backend in self.weboob.iter_backends(): for station in backend.iter_station_search(self.combo_source.get_current_text()): for name, backend in self.weboob.iter_backends():