Fixing a bug with renaming lists and fixing modality up

diff --git a/src/libbottombar.py b/src/libbottombar.py
index f5698a8..5160886 100644 (file)
--- a/src/libbottombar.py
+++ b/src/libbottombar.py
@@ -63,9 +63,10 @@ class Bottombar(gtk.VBox):
 
        @gtk_toolbox.log_exception(_moduleLogger)
        def new_item(self, widget = None, data1 = None, data2 = None):
+               window = gtk_toolbox.find_parent_window(self)
                dialog = gtk.Dialog(
                        _("New item name:"),
-                       None,
+                       window,
                        gtk.DIALOG_MODAL | gtk.DIALOG_DESTROY_WITH_PARENT,
                        (gtk.STOCK_CANCEL, gtk.RESPONSE_REJECT, gtk.STOCK_OK, gtk.RESPONSE_ACCEPT)
                )
@@ -81,15 +82,16 @@ class Bottombar(gtk.VBox):
 
        @gtk_toolbox.log_exception(_moduleLogger)
        def del_item(self, widget = None, data1 = None, data2 = None):
+               window = gtk_toolbox.find_parent_window(self)
                path, col = self.view.treeview.get_cursor()
                if path is None:
-                       mbox = gtk.MessageDialog(None, gtk.DIALOG_MODAL, gtk.MESSAGE_ERROR, gtk.BUTTONS_OK, _("No item selected!"))
+                       mbox = gtk.MessageDialog(window, gtk.DIALOG_MODAL, gtk.MESSAGE_ERROR, gtk.BUTTONS_OK, _("No item selected!"))
                        response = mbox.run()
                        mbox.hide()
                        mbox.destroy()
                        return
 
-               mbox = gtk.MessageDialog(None, gtk.DIALOG_MODAL, gtk.MESSAGE_QUESTION, gtk.BUTTONS_YES_NO, _("Delete current item?"))
+               mbox = gtk.MessageDialog(window, gtk.DIALOG_MODAL, gtk.MESSAGE_QUESTION, gtk.BUTTONS_YES_NO, _("Delete current item?"))
                response = mbox.run()
                mbox.hide()
                mbox.destroy()
@@ -97,9 +99,10 @@ class Bottombar(gtk.VBox):
                        self.view.del_active_row()
 
        def rename_category(self, widget = None, data1 = None, data2 = None):
+               window = gtk_toolbox.find_parent_window(self)
                dialog = gtk.Dialog(
                        _("New category name:"),
-                       None,
+                       window,
                        gtk.DIALOG_MODAL | gtk.DIALOG_DESTROY_WITH_PARENT,
                        (gtk.STOCK_CANCEL, gtk.RESPONSE_REJECT, gtk.STOCK_OK, gtk.RESPONSE_ACCEPT)
                )
@@ -117,14 +120,14 @@ class Bottombar(gtk.VBox):
                dialog.destroy()
 
        def rename_list(self, widget = None, data1 = None, data2 = None):
+               window = gtk_toolbox.find_parent_window(self)
                dialog = gtk.Dialog(
                        _("New list name:"),
-                       None,
+                       window,
                        gtk.DIALOG_MODAL | gtk.DIALOG_DESTROY_WITH_PARENT,
                        (gtk.STOCK_CANCEL, gtk.RESPONSE_REJECT, gtk.STOCK_OK, gtk.RESPONSE_ACCEPT)
                )
 
-               dialog.set_position(gtk.WIN_POS_CENTER)
                entryKlasse = gtk.Entry()
                entryKlasse.set_text(self.view.liststorehandler.selection.get_list())
                dialog.vbox.pack_start(entryKlasse, True, True, 0)

diff --git a/src/libliststorehandler.py b/src/libliststorehandler.py
index 1c8ebb9..04fe392 100644 (file)
--- a/src/libliststorehandler.py
+++ b/src/libliststorehandler.py
@@ -171,7 +171,7 @@ class Liststorehandler(object):
        def rename_category(self, new_name):
                sql = "UPDATE items SET category = ? WHERE list = ? AND category = ?"
                self.db.speichereSQL(sql, (new_name, self.selection.get_list(), self.selection.get_category()))
-               self.selection.comboList_changed()
+               self.selection.update_categories()
                self.selection.set_category(new_name)
 
        def rename_list(self, new_name):

diff --git a/src/libselection.py b/src/libselection.py
index 6bccf4e..893e481 100644 (file)
--- a/src/libselection.py
+++ b/src/libselection.py
@@ -86,7 +86,7 @@ class Selection(gtk.HBox):
                else:
                        self.__listButton.set_label(self.__lists[0])
 
-               self._update_categories()
+               self.update_categories()
 
        @gtk_toolbox.log_exception(_moduleLogger)
        def _on_category_selector(self, *args):
@@ -100,7 +100,7 @@ class Selection(gtk.HBox):
                self.set_category(userSelection)
                self.emit("changed", "category", "")
                self.db.speichereDirekt("comboCategoryText"+self.__listButton.get_label(), self.__categoryButton.get_label())
-               self._update_categories()
+               self.update_categories()
 
        @gtk_toolbox.log_exception(_moduleLogger)
        def _on_list_selector(self, *args):
@@ -113,12 +113,12 @@ class Selection(gtk.HBox):
                )
                self.set_list(userSelection)
 
-               self._update_categories()
+               self.update_categories()
 
                self.emit("changed", "list", "")
                self.db.speichereDirekt("comboListText", self.__listButton.get_label())
 
-       def _update_categories(self):
+       def update_categories(self):
                del self.__categories[:]
 
                sql = "SELECT DISTINCT category FROM items WHERE list = ? ORDER BY category"