fileMenu = gtk.Menu()
menu_items = gtk.MenuItem(_("Choose database file"))
- menu_items.connect("activate", self.select_db_dialog, None)
+ menu_items.connect("activate", self._on_select_db, None)
fileMenu.append(menu_items)
menu_items = gtk.MenuItem(_("SQL history"))
- menu_items.connect("activate", self.view_sql_history, None)
+ menu_items.connect("activate", self._on_view_sql_history, None)
fileMenu.append(menu_items)
menu_items = gtk.MenuItem(_("SQL optimize"))
- menu_items.connect("activate", self.optimizeSQL, None)
+ menu_items.connect("activate", self._on_optimize_sql, None)
fileMenu.append(menu_items)
menu_items = gtk.MenuItem(_("Sync items"))
fileMenu.append(menu_items)
menu_items = gtk.MenuItem(_("Quit"))
- menu_items.connect("activate", self.destroy, None)
+ menu_items.connect("activate", self._on_destroy, None)
fileMenu.append(menu_items)
fileMenuItem = gtk.MenuItem(_("File"))
fileMenuItem.show()
fileMenuItem.set_submenu(fileMenu)
- categorymenu = gtk.Menu()
+ listmenu = gtk.Menu()
menu_items = gtk.MenuItem(_("Search"))
menu_items.connect("activate", self._on_toggle_search)
- categorymenu.append(menu_items)
+ listmenu.append(menu_items)
menu_items = gtk.MenuItem(_("Checkout All"))
menu_items.connect("activate", self._on_checkout_all)
- categorymenu.append(menu_items)
+ listmenu.append(menu_items)
+
+ menu_items = gtk.MenuItem(_("Rename List"))
+ menu_items.connect("activate", self.bottombar.rename_list, None)
+ listmenu.append(menu_items)
menu_items = gtk.MenuItem(_("Rename Category"))
menu_items.connect("activate", self.bottombar.rename_category, None)
- categorymenu.append(menu_items)
+ listmenu.append(menu_items)
- category_menu = gtk.MenuItem(_("Category"))
- category_menu.show()
- category_menu.set_submenu(categorymenu)
+ listMenuItem = gtk.MenuItem(_("List"))
+ listMenuItem.show()
+ listMenuItem.set_submenu(listmenu)
viewMenu = gtk.Menu()
viewMenuItem.show()
viewMenuItem.set_submenu(viewMenu)
- toolsMenu = gtk.Menu()
-
- menu_items = gtk.MenuItem(_("Rename List"))
- menu_items.connect("activate", self.bottombar.rename_list, None)
- toolsMenu.append(menu_items)
-
- toolsMenuItem = gtk.MenuItem(_("Tools"))
- toolsMenuItem.show()
- toolsMenuItem.set_submenu(toolsMenu)
-
helpMenu = gtk.Menu()
menu_items = gtk.MenuItem(_("About"))
helpMenu.append(menu_items)
- menu_items.connect("activate", self.show_about, None)
+ menu_items.connect("activate", self._on_about, None)
helpMenuItem = gtk.MenuItem(_("Help"))
helpMenuItem.show()
menu_bar = gtk.MenuBar()
menu_bar.show()
menu_bar.append (fileMenuItem)
- menu_bar.append (toolsMenuItem)
- menu_bar.append (category_menu)
+ menu_bar.append (listMenuItem)
menu_bar.append (viewMenuItem)
# unten -> damit als letztes menu_bar.append (helpMenuItem)
#Als letztes menü
button.connect("clicked", self._on_click_menu_filter, self.liststorehandler.SHOW_ACTIVE)
button.set_mode(False)
- renameCategoryButton = gtk.Button(_("Rename Category"))
- renameCategoryButton.connect("clicked", self.bottombar.rename_category)
- menuBar.append(renameCategoryButton)
-
renameListButton= gtk.Button(_("Rename List"))
renameListButton.connect("clicked", self.bottombar.rename_list)
menuBar.append(renameListButton)
+ renameCategoryButton = gtk.Button(_("Rename Category"))
+ renameCategoryButton.connect("clicked", self.bottombar.rename_category)
+ menuBar.append(renameCategoryButton)
+
searchButton= gtk.Button(_("Search Category"))
searchButton.connect("clicked", self._on_toggle_search)
menuBar.append(searchButton)
_moduleLogger.info("No osso support")
self._osso_c = None
- self.window.connect("delete_event", self.delete_event)
- self.window.connect("destroy", self.destroy)
+ self.window.connect("delete_event", self._on_delete_event)
+ self.window.connect("destroy", self._on_destroy)
self.window.connect("key-press-event", self.on_key_press)
- self.window.connect("window-state-event", self.on_window_state_change)
+ self.window.connect("window-state-event", self._on_window_state_change)
self._search.connect("search_changed", self._on_search)
self.window.show_all()
self._search.hide()
- self.prepare_sync_dialog()
- self.ladeAlles()
+ self._prepare_sync_dialog()
+
+ def _toggle_search(self):
+ if self._search.get_property("visible"):
+ self._search.hide()
+ else:
+ self._search.show()
@gtk_toolbox.log_exception(_moduleLogger)
def _on_checkout_all(self, widget):
def _on_click_menu_filter(self, button, val):
self.liststorehandler.set_filter(val)
- def _toggle_search(self):
- if self._search.get_property("visible"):
- self._search.hide()
- else:
- self._search.show()
-
@gtk_toolbox.log_exception(_moduleLogger)
def _on_toggle_search(self, *args):
self._toggle_search()
return True
@gtk_toolbox.log_exception(_moduleLogger)
- def on_window_state_change(self, widget, event, *args):
+ def _on_window_state_change(self, widget, event, *args):
if event.new_window_state & gtk.gdk.WINDOW_STATE_FULLSCREEN:
self.window_in_fullscreen = True
else:
self.window_in_fullscreen = False
- def speichereAlles(self, data = None, data2 = None):
- logging.info("Speichere alles")
-
- def ladeAlles(self, data = None, data2 = None):
- logging.info("Lade alles")
-
- def beforeSync(self, data = None, data2 = None):
- logging.info("Lade alles")
-
@gtk_toolbox.log_exception(_moduleLogger)
- def sync_finished(self, data = None, data2 = None):
+ def _on_sync_finished(self, data = None, data2 = None):
self.selection.comboList_changed()
self.selection.comboCategory_changed()
self.liststorehandler.update_list()
- def prepare_sync_dialog(self):
+ def _prepare_sync_dialog(self):
self.sync_dialog = gtk.Dialog(_("Sync"), None, gtk.DIALOG_MODAL | gtk.DIALOG_DESTROY_WITH_PARENT, (gtk.STOCK_OK, gtk.RESPONSE_ACCEPT))
self.sync_dialog.set_position(gtk.WIN_POS_CENTER)
sync = libsync.Sync(self.db, self.window, 50503)
- sync.connect("syncFinished", self.sync_finished)
+ sync.connect("syncFinished", self._on_sync_finished)
self.sync_dialog.vbox.pack_start(sync, True, True, 0)
self.sync_dialog.set_size_request(500, 350)
self.sync_dialog.vbox.show_all()
@gtk_toolbox.log_exception(_moduleLogger)
def sync_notes(self, widget = None, data = None):
- if self.sync_dialog == None:
- self.prepare_sync_dialog()
+ if self.sync_dialog is None:
+ self._prepare_sync_dialog()
self.sync_dialog.run()
self.sync_dialog.hide()
col_dialog.destroy()
@gtk_toolbox.log_exception(_moduleLogger)
- def destroy(self, widget = None, data = None):
+ def _on_destroy(self, widget = None, data = None):
try:
- self.speichereAlles()
self.db.close()
try:
self._osso_c.close()
gtk.main_quit()
@gtk_toolbox.log_exception(_moduleLogger)
- def delete_event(self, widget, event, data = None):
- #print "delete event occurred"
+ def _on_delete_event(self, widget, event, data = None):
return False
- def dlg_delete(self, widget, event, data = None):
- return False
-
- @gtk_toolbox.log_exception(_moduleLogger)
- def show_about(self, widget = None, data = None):
- dialog = gtk.AboutDialog()
- dialog.set_position(gtk.WIN_POS_CENTER)
- dialog.set_name(constants.__pretty_app_name__)
- dialog.set_version(constants.__version__)
- dialog.set_copyright("")
- dialog.set_website("http://axique.de/f = Multilist")
- comments = "%s is a program to handle multiple lists." % constants.__pretty_app_name__
- dialog.set_comments(comments)
- dialog.set_authors(["Christoph Wurstle <n800@axique.net>", "Ed Page <eopage@byu.net> (Blame him for the most recent bugs)"])
- dialog.run()
- dialog.destroy()
-
- def on_info1_activate(self, menuitem):
- self.show_about(menuitem)
-
@gtk_toolbox.log_exception(_moduleLogger)
- def view_sql_history(self, widget = None, data = None, data2 = None):
+ def _on_view_sql_history(self, widget = None, data = None, data2 = None):
sqldiag = sqldialog.SqlDialog(self.db)
res = sqldiag.run()
sqldiag.hide()
sqldiag.destroy()
@gtk_toolbox.log_exception(_moduleLogger)
- def optimizeSQL(self, widget = None, data = None, data2 = None):
+ def _on_optimize_sql(self, widget = None, data = None, data2 = None):
#optimiere sql
self.db.speichereSQL("VACUUM", log = False)
@gtk_toolbox.log_exception(_moduleLogger)
- def select_db_dialog(self, widget = None, data = None, data2 = None):
- if (isHildon == False):
- dlg = gtk.FileChooserDialog(parent = self.window, action = gtk.FILE_CHOOSER_ACTION_SAVE)
- dlg.add_button( gtk.STOCK_CANCEL, gtk.RESPONSE_CANCEL)
- dlg.add_button( gtk.STOCK_OK, gtk.RESPONSE_OK)
- else:
- #dlg = hildon.FileChooserDialog(parent = self.window, action = gtk.FILE_CHOOSER_ACTION_SAVE)
- dlg = hildon.FileChooserDialog(self.window, gtk.FILE_CHOOSER_ACTION_SAVE)
+ def _on_select_db(self, widget = None, data = None, data2 = None):
+ dlg = hildon.FileChooserDialog(parent=self._window, action=gtk.FILE_CHOOSER_ACTION_SAVE)
if self.db.ladeDirekt('datenbank'):
dlg.set_filename(self.db.ladeDirekt('datenbank'))
dlg.set_title(_("Choose your database file"))
- if dlg.run() == gtk.RESPONSE_OK:
- fileName = dlg.get_filename()
- self.db.speichereDirekt('datenbank', fileName)
- self.speichereAlles()
- self.db.openDB()
- self.ladeAlles()
- dlg.destroy()
+ resp = dlg.run()
+ try:
+ if resp == gtk.RESPONSE_OK:
+ fileName = dlg.get_filename()
+ self.db.speichereDirekt('datenbank', fileName)
+ self.db.openDB()
+ finally:
+ dlg.destroy()
+
+ @gtk_toolbox.log_exception(_moduleLogger)
+ def _on_about(self, widget = None, data = None):
+ dialog = gtk.AboutDialog()
+ dialog.set_position(gtk.WIN_POS_CENTER)
+ dialog.set_name(constants.__pretty_app_name__)
+ dialog.set_version(constants.__version__)
+ dialog.set_copyright("")
+ dialog.set_website("http://axique.de/f = Multilist")
+ comments = "%s is a program to handle multiple lists." % constants.__pretty_app_name__
+ dialog.set_comments(comments)
+ dialog.set_authors(["Christoph Wurstle <n800@axique.net>", "Ed Page <eopage@byu.net> (Blame him for the most recent bugs)"])
+ dialog.run()
+ dialog.destroy()
def run_multilist():
projects / multilist / blobdiff