Index: pyatcron/src/lib/about.py =================================================================== RCS file: /cvsroot/pyatcron/pyatcron/src/lib/about.py,v retrieving revision 1.2 diff -u -r1.2 about.py --- pyatcron/src/lib/about.py 15 Apr 2004 13:24:28 -0000 1.2 +++ pyatcron/src/lib/about.py 27 Apr 2004 17:02:24 -0000 @@ -10,11 +10,11 @@ # We load the widgets and the callbacks from the glade file. self.widgetTree = gtk.glade.XML (GLADE_FILE_PATH + "/about.glade") - dic = { - "on_about_delete_event" : self.deleteEvent, - "on_close_button_clicked" : self.closeClicked - } - self.widgetTree.signal_autoconnect (dic) + + dict = {} + for key in dir(self.__class__): + dict[key] = getattr(self, key) + self.widgetTree.signal_autoconnect (dict) # It's the base widget. self.win = self.widgetTree.get_widget ("about") @@ -27,10 +27,10 @@ # Displays the about dialog. self.win.show () - def deleteEvent (self, obj, event): + def on_about_delete_event (self, obj, event): self.quit () - def closeClicked (self, obj): + def on_close_button_clicked (self, obj): self.quit () # Unreferences the main window's widgets. Index: pyatcron/src/lib/mainwin.py =================================================================== RCS file: /cvsroot/pyatcron/pyatcron/src/lib/mainwin.py,v retrieving revision 1.7 diff -u -r1.7 mainwin.py --- pyatcron/src/lib/mainwin.py 27 Apr 2004 14:56:25 -0000 1.7 +++ pyatcron/src/lib/mainwin.py 27 Apr 2004 17:02:24 -0000 @@ -33,35 +33,16 @@ # We load the widgets and the callbacks from the glade file. self.widgetTree = gtk.glade.XML (GLADE_FILE_PATH + "/mainwin.glade") - dic = { - "on_mainwin_delete_event" : self.deleteEvent, - "on_mainwin_destroy_event" : self.destroyEvent, - "on_tasklist_button_press_event" : self.buttonPressEvent, - "on_mainmenu_save_activate" : self.saveActivate, - "on_mainmenu_quit_activate" : self.quitActivate, - "on_mainmenu_new_activate" : self.newActivate, - "on_mainmenu_properties_activate" : self.propertiesActivate, - "on_mainmenu_activate_activate" : self.activateActivate, - "on_mainmenu_deactivate_activate" : self.deactivateActivate, - "on_mainmenu_delete_activate" : self.deleteActivate, - "on_mainmenu_about_activate" : self.aboutActivate, - "on_popup_properties_activate" : self.propertiesActivate, - "on_popup_activate_activate" : self.activateActivate, - "on_popup_deactivate_activate" : self.deactivateActivate, - "on_popup_delete_activate" : self.deleteActivate, - "on_toolbar_new_clicked" : self.newClicked, - "on_toolbar_properties_clicked" : self.propertiesClicked, - "on_toolbar_activate_clicked" : self.activateClicked, - "on_toolbar_deactivate_clicked" : self.deactivateClicked, - "on_toolbar_delete_clicked" : self.deleteClicked, - "on_tasklist_row_activated" : self.rowActivated - } - self.widgetTree.signal_autoconnect (dic) + + dict = {} + for key in dir(self.__class__): + dict[key] = getattr(self, key) + self.widgetTree.signal_autoconnect (dict) - # When the selection changes, we call self.selectionChanged(). + # When the selection changes, we call self.on_selection_changed(). # This can't be handled directly by glade if not by using # the on_cursor_changed callback, which doesn't work well. - self.widgetTree.get_widget ("tasklist").get_selection().connect("changed", self.selectionChanged) + self.widgetTree.get_widget ("tasklist").get_selection().connect("changed", self.on_selection_changed) # It's the base widget. self.win = self.widgetTree.get_widget ("mainwin") @@ -111,13 +92,13 @@ return color - def deleteEvent (self, obj, event): + def on_mainwin_delete_event (self, obj, event): self.quit () - def destroyEvent (self, obj, event): + def on_mainwin_destroy_event (self, obj, event): self.quit () - def buttonPressEvent (self, obj, event): + def on_tasklist_button_press_event (self, obj, event): # If the right-mouse button is pressed, get the current selection. if (event.button == 3): taskList = self.widgetTree.get_widget ("tasklist") @@ -141,52 +122,64 @@ self.widgetTree.get_widget ("popup").popup (None, None, None, event.button, event.time) - def saveActivate (self, obj): + def on_mainmenu_save_activate (self, obj): self.save () - def quitActivate (self, obj): + def on_mainmenu_quit_activate (self, obj): self.quit () - def newActivate (self, obj): + def on_mainmenu_new_activate (self, obj): self.createTask () - def propertiesActivate (self, obj): + def on_mainmenu_properties_activate (self, obj): self.editTask () - def activateActivate (self, obj): + def on_mainmenu_activate_activate (self, obj): self.activateTask () - def deactivateActivate (self, obj): + def on_mainmenu_deactivate_activate (self, obj): self.deactivateTask () - def deleteActivate (self, obj): + def on_mainmenu_delete_activate (self, obj): self.confirmDeleteTask () - def aboutActivate (self, obj): + def on_mainmenu_about_activate (self, obj): self.about () + + def on_popup_properties_activate (self, obj): + self.editTask () - def newClicked (self, obj): + def on_popup_activate_activate (self, obj): + self.activateTask () + + def on_popup_deactivate_activate (self, obj): + self.deactivateTask () + + def on_popup_delete_activate (self, obj): + self.confirmDeleteTask () + + def on_toolbar_new_clicked (self, obj): self.createTask () - def propertiesClicked (self, obj): + def on_toolbar_properties_clicked (self, obj): self.editTask () - def activateClicked (self, obj): + def on_toolbar_activate_clicked (self, obj): self.activateTask () - def deactivateClicked (self, obj): + def on_toolbar_deactivate_clicked (self, obj): self.deactivateTask () - def deleteClicked (self, obj): + def on_toolbar_delete_clicked (self, obj): self.confirmDeleteTask () - def rowActivated (self, obj, path, column): + def on_tasklist_row_activated (self, obj, path, column): self.editTask () - def selectionChanged (self, obj): + def on_selection_changed (self, obj): self.updateCurrentTask () - def confirmDeleteResponse (self, obj, response): + def on_confirm_delete_response (self, obj, response): # If deletion is confirmed, delete the task. if (response == -8): self.deleteTask () @@ -278,10 +271,12 @@ # Load the dialog. xml = gtk.glade.XML (GLADE_FILE_PATH + "/confirm_delete.glade") - dic = { - "on_confirm_delete_response" : self.confirmDeleteResponse, - } - xml.signal_autoconnect (dic) + + dict = {} + for key in dir(self.__class__): + dict[key] = getattr(self, key) + xml.signal_autoconnect (dict) + confirm = xml.get_widget ("confirm_delete") # Center the dialog on the main window. Index: pyatcron/src/lib/newtask.py =================================================================== RCS file: /cvsroot/pyatcron/pyatcron/src/lib/newtask.py,v retrieving revision 1.3 diff -u -r1.3 newtask.py --- pyatcron/src/lib/newtask.py 27 Apr 2004 14:56:25 -0000 1.3 +++ pyatcron/src/lib/newtask.py 27 Apr 2004 17:02:24 -0000 @@ -37,13 +37,11 @@ # We load the widgets and the callbacks from the glade file. self.widgetTree = gtk.glade.XML (GLADE_FILE_PATH + "/newtask.glade") - dic = { - "on_newtask_delete_event" : self.deleteEvent, - "on_cancel_button_clicked" : self.cancelClicked, - "on_back_button_clicked" : self.backClicked, - "on_forward_button_clicked" : self.forwardClicked - } - self.widgetTree.signal_autoconnect (dic) + + dict = {} + for key in dir(self.__class__): + dict[key] = getattr(self, key) + self.widgetTree.signal_autoconnect (dict) # It's the base widget. self.win = self.widgetTree.get_widget ("newtask") @@ -133,16 +131,16 @@ # Update the currently viewed page self.updatePage () - def deleteEvent (self, obj, event): + def on_newtask_delete_event (self, obj, event): self.quit () - def backClicked (self, obj): + def on_back_button_clicked (self, obj): self.goBack () - def forwardClicked (self, obj): + def on_forward_button_clicked (self, obj): self.goForward () - def cancelClicked (self, obj): + def on_cancel_button_clicked (self, obj): self.quit () def goBack (self):