diff --git a/src/gui/dbman.py b/src/gui/dbman.py index 5311c0394..34afcc6e4 100644 --- a/src/gui/dbman.py +++ b/src/gui/dbman.py @@ -377,7 +377,7 @@ class DbManager(CLIDbManager): "the database and you break the lock, you may corrupt the " "database."), _("Break lock"), - self.__really_break_lock) + self.__really_break_lock, self.top) def __really_break_lock(self): """ @@ -613,8 +613,7 @@ class DbManager(CLIDbManager): store, node = self.selection.get_selected() path = self.model.get_path(node) self.name_renderer.set_property('editable', True) - self.dblist.set_cursor(path, focus_column=self.column, - start_editing=True) + self.dblist.set_cursor(path, self.column, True) def __repair_db(self, obj): """ @@ -727,8 +726,7 @@ class DbManager(CLIDbManager): self.selection.select_iter(node) path = self.model.get_path(node) self.name_renderer.set_property('editable', True) - self.dblist.set_cursor(path, focus_column=self.column, - start_editing=True) + self.dblist.set_cursor(path, self.column, True) return new_path, title def __drag_data_received(self, widget, context, xpos, ypos, selection, diff --git a/src/gui/filters/sidebar/_sidebarfilter.py b/src/gui/filters/sidebar/_sidebarfilter.py index 4cf52710f..a5c94c75b 100644 --- a/src/gui/filters/sidebar/_sidebarfilter.py +++ b/src/gui/filters/sidebar/_sidebarfilter.py @@ -80,7 +80,7 @@ class SidebarFilter(DbGUIElement): label = Gtk.Label(label=_('Reset')) label.show() hbox.pack_start(image, False, False, 0) - hbox.pack_start(label, False, True) + hbox.pack_start(label, False, True, 0) hbox.set_spacing(4) self.clear_btn.add(hbox) diff --git a/src/gui/glade/dialog.glade b/src/gui/glade/dialog.glade index d8be67ee7..847bc123f 100644 --- a/src/gui/glade/dialog.glade +++ b/src/gui/glade/dialog.glade @@ -1,39 +1,63 @@ - - - + + + False dialog - + True - - + False + vertical + + True + False + end + + + gtk-close + False + True + True + True + False + False + True + + + False + False + 0 + + + + + False + True + end + 0 + + + + + True + False 12 3 3 + 6 + 6 - - True - 0 - 6 - 12 - True - True - - - 2 - 3 - 1 - 2 - GTK_FILL - - + - + + + + True + False 0 gtk-dialog-warning 6 @@ -45,10 +69,10 @@ - + True + False 0 - 6 True True @@ -60,12 +84,15 @@ - - Do not ask again + + Do not show this dialog again + False True True False + False True + 0.5 True @@ -73,7 +100,7 @@ 3 2 3 - GTK_FILL + @@ -81,100 +108,11 @@ - - - - - - - - 1 - - - - - True - end - - - Close _without saving - True - True - True - False - True - - - False - False - 0 - - - - - gtk-cancel - True - True - True - True - True - False - True - - - False - False - 1 - - - - - gtk-save - True - True - True - False - True - - - False - False - 2 - - - - - False - end - 0 - - - - - - button1 - button2 - button3 - - - - dialog - - - True - - - True - 12 - 2 - 3 - - + True + False 0 - 6 12 - True True @@ -186,220 +124,74 @@ - - - True - 0 - gtk-dialog-question - 6 - - - 2 - GTK_FILL - GTK_FILL - - - - - True - 0 - 6 - True - True - - - 2 - 3 - GTK_EXPAND | GTK_SHRINK | GTK_FILL - - - - - - - - - - - - 1 - - - - - True - end - - - gtk-cancel - True - True - True - False - True - - - False - False - 0 - - - - - True - True - True - False - True - - - False - False - 1 - - False - end - 0 + True + 1 - no - okbutton - - - - dialog - - - True - - - True - 12 - 2 - 3 - - - True - 0 - 6 - 12 - True - True - - - 2 - 3 - 1 - 2 - GTK_FILL - - - - - - True - 0 - gtk-dialog-warning - 6 - - - 2 - GTK_FILL - GTK_FILL - - - - - True - 0 - 6 - True - True - - - 2 - 3 - GTK_EXPAND | GTK_SHRINK | GTK_FILL - - - - - - - - - - - - 1 - - - - - True - end - - - True - True - True - False - True - - - False - False - 0 - - - - - True - True - True - False - True - - - False - False - 1 - - - - - False - end - 0 - - - - - - option1 - option2 + button180 + False dialog - + True + False + vertical + + + True + False + end + + + gtk-close + False + True + True + True + False + False + True + + + False + False + 0 + + + + + False + False + end + 0 + + True + False 12 2 3 + + + + + + True + False 0 gtk-dialog-info 6 @@ -413,6 +205,7 @@ True + False 0 6 True @@ -429,8 +222,6 @@ True True - automatic - automatic etched-in @@ -449,42 +240,11 @@ 2 - - - - - - - - - 1 - - - - - True - end - - - gtk-close - True - True - True - False - True - - - False - False - 0 - - False - False - end - 0 + True + 1 @@ -494,121 +254,42 @@ + False dialog - + True - - - True - 12 - 3 - 3 - - - True - 0 - 6 - 24 - True - True - - - 2 - 3 - 1 - 2 - GTK_FILL - - - - - - True - 0 - gtk-dialog-warning - 6 - - - 2 - GTK_FILL - GTK_FILL - - - - - True - 0 - 6 - True - True - - - 2 - 3 - GTK_EXPAND | GTK_SHRINK | GTK_FILL - - - - - - _Use this selection for all missing media files - True - True - False - If you check this button, all the missing media files will be automatically treated according to the currently selected option. No further dialogs will be presented for any missing media files. - True - True - - - 2 - 3 - 2 - 3 - GTK_FILL - - - - - - - - - - - - - - - - - - 1 - - + False + vertical - + True + False end + False True True True False Remove object and all references to it from the database + False True + False 0 0 True + False 2 True + False gtk-delete @@ -620,6 +301,7 @@ True + False _Remove Object True @@ -643,11 +325,13 @@ _Keep Reference + False True True True False Keep reference to the missing file + False True @@ -658,6 +342,7 @@ + False True True True @@ -665,18 +350,22 @@ True False Select replacement for the missing file + False True + False 0 0 True + False 2 True + False gtk-find @@ -688,6 +377,7 @@ True + False _Select File True @@ -711,83 +401,40 @@ False + True end 0 - - - - button8 - button9 - button11 - - - - dialog - - - True - + True + False 12 3 3 - 6 - 6 - - True - 0 - gtk-dialog-warning - 6 - - - 2 - GTK_FILL - GTK_FILL - + - + + + + + + + + + + True + False 0 + 6 + 24 True True - - 2 - 3 - GTK_EXPAND | GTK_SHRINK | GTK_FILL - - - - - - Do not show this dialog again - True - True - False - True - True - - - 1 - 3 - 2 - 3 - - - - - - - True - 0 - 12 - True - 2 3 @@ -798,30 +445,290 @@ - + + True + False + 0 + gtk-dialog-warning + 6 + + + 2 + GTK_FILL + GTK_FILL + - + + True + False + 0 + 6 + True + True + + + 2 + 3 + GTK_EXPAND | GTK_SHRINK | GTK_FILL + + - + + _Use this selection for all missing media files + False + True + True + False + If you check this button, all the missing media files will be automatically treated according to the currently selected option. No further dialogs will be presented for any missing media files. + False + True + 0.5 + True + + + 2 + 3 + 2 + 3 + GTK_FILL + + + False + True 1 + + + + button8 + button9 + button11 + + + + False + dialog + + + True + False + vertical - + True + False end - - gtk-close + + False True True True False + False + True + + + False + False + 0 + + + + + False + True + True + True + False + False + True + + + False + False + 1 + + + + + False + True + end + 0 + + + + + True + False + 12 + 2 + 3 + + + + + + + + + True + False + 0 + 6 + 12 + True + True + + + 2 + 3 + 1 + 2 + GTK_FILL + + + + + + True + False + 0 + gtk-dialog-warning + 6 + + + 2 + GTK_FILL + GTK_FILL + + + + + True + False + 0 + 6 + True + True + + + 2 + 3 + GTK_EXPAND | GTK_SHRINK | GTK_FILL + + + + + + False + True + 1 + + + + + + option1 + option2 + + + + 300 + False + True + True + dialog + + + True + False + vertical + + + True + False + + + True + False + gtk-dialog-question + 6 + + + False + True + 0 + + + + + True + False + vertical + + + True + False + label + + + False + True + 0 + + + + + True + False + 6 + 6 + This is a test of the wrapping ze This is a test of the wrapping ze This is a test of the wrapping ze This is a test of the wrapping ze label + True + True + + + False + True + 1 + + + + + False + True + 1 + + + + + True + True + 0 + + + + + True + False + end + + + gtk-cancel + False + True + True + True + False + False True @@ -830,9 +737,26 @@ 0 + + + False + True + True + True + False + False + True + + + False + False + 1 + + False + True end 0 @@ -840,7 +764,183 @@ - button180 + no + okbutton + + + + False + dialog + + + True + False + vertical + + + True + False + end + + + Close _without saving + False + True + True + True + False + False + True + + + False + False + 0 + + + + + gtk-cancel + False + True + True + True + True + True + False + False + True + + + False + False + 1 + + + + + gtk-save + False + True + True + True + False + False + True + + + False + False + 2 + + + + + False + True + end + 0 + + + + + True + False + 6 + 3 + 3 + + + + + + + + + True + False + 0 + 6 + This is a test of the wrapping ze This is a test of the wrapping ze This is a test of the wrapping ze This is a test of the wrapping ze label + True + True + + + 2 + 3 + 1 + 2 + GTK_FILL + + + + + + True + False + 0 + gtk-dialog-warning + 6 + + + 2 + GTK_FILL + GTK_FILL + + + + + True + False + 0 + 6 + True + True + + + 2 + 3 + GTK_EXPAND | GTK_SHRINK | GTK_FILL + + + + + + Do not ask again + False + True + True + False + False + True + 0.5 + True + + + 1 + 3 + 2 + 3 + GTK_FILL + + + + + + + + + True + True + 1 + + + + + + button1 + button2 + button3