Moving checkout all to menu

diff --git a/src/libbottombar.py b/src/libbottombar.py
index b0df0ef..42c80b4 100644 (file)
--- a/src/libbottombar.py
+++ b/src/libbottombar.py
@@ -60,10 +60,6 @@ class Bottombar(gtk.HBox):
                label = gtk.Label("  ")
                self.pack_start(label, expand = True, fill = True, padding = 0)
 
-               button = gtk.Button(_("Checkout all items"))
-               button.connect("clicked", self.checkout_items)
-               self.pack_start(button, expand = False, fill = True, padding = 0)
-
                button = gtk.Button(_("Del item"))
                button.connect("clicked", self.del_item)
                self.pack_start(button, expand = False, fill = True, padding = 0)
@@ -102,21 +98,6 @@ class Bottombar(gtk.HBox):
                        mbox.hide()
                        mbox.destroy()
 
-       @gtk_toolbox.log_exception(_moduleLogger)
-       def checkout_items(self, widget = None, data1 = None, data2 = None):
-               #self.view.del_active_row()
-               mbox = gtk.MessageDialog(None, gtk.DIALOG_MODAL, gtk.MESSAGE_QUESTION, gtk.BUTTONS_YES_NO, (_("Really checkout all items?")))
-               response = mbox.run()
-               mbox.hide()
-               mbox.destroy()
-               if response == gtk.RESPONSE_YES:
-                       self.view.liststorehandler.checkout_rows()
-                       #n = len(self.view.liststorehandler.get_liststore())
-                       #for i in range(n):
-                       #       self.view.liststorehandler.checkout_rows()
-                       #       #print i
-
-       @gtk_toolbox.log_exception(_moduleLogger)
        def rename_category(self, widget = None, data1 = None, data2 = None):
                dialog = gtk.Dialog(_("New category name:"), None, gtk.DIALOG_MODAL | gtk.DIALOG_DESTROY_WITH_PARENT, (gtk.STOCK_CANCEL, gtk.RESPONSE_REJECT, gtk.STOCK_OK, gtk.RESPONSE_ACCEPT))
 
@@ -137,7 +118,6 @@ class Bottombar(gtk.HBox):
                        pass
                dialog.destroy()
 
-       @gtk_toolbox.log_exception(_moduleLogger)
        def rename_list(self, widget = None, data1 = None, data2 = None):
                dialog = gtk.Dialog(_("New list name:"), None, gtk.DIALOG_MODAL | gtk.DIALOG_DESTROY_WITH_PARENT, (gtk.STOCK_CANCEL, gtk.RESPONSE_REJECT, gtk.STOCK_OK, gtk.RESPONSE_ACCEPT))
 

diff --git a/src/multilist_gtk.py b/src/multilist_gtk.py
index f848e0f..17d4e24 100755 (executable)
--- a/src/multilist_gtk.py
+++ b/src/multilist_gtk.py
@@ -123,6 +123,10 @@ class Multilist(hildonize.get_app_class()):
                        categorymenu.append(menu_items)
                        menu_items.connect("activate", self._on_toggle_search)
 
+                       menu_items = gtk.MenuItem(_("Checkout All"))
+                       categorymenu.append(menu_items)
+                       menu_items.connect("activate", self._on_checkout_all)
+
                        category_menu = gtk.MenuItem(_("Category"))
                        category_menu.show()
                        category_menu.set_submenu(categorymenu)
@@ -248,6 +252,10 @@ class Multilist(hildonize.get_app_class()):
                self.ladeAlles()
 
        @gtk_toolbox.log_exception(_moduleLogger)
+       def _on_checkout_all(self, widget):
+               self.liststorehandler.checkout_rows()
+
+       @gtk_toolbox.log_exception(_moduleLogger)
        def _on_search(self, widget):
                self.liststorehandler.get_liststore(self._search.get_search_pattern())