diff --git a/glade/config.glade b/glade/config.glade index b0fe9dc..ac55982 100644 --- a/glade/config.glade +++ b/glade/config.glade @@ -1,526 +1,892 @@ - - - + + + - - 550 - 400 - Preferences - pyGTKtalog - True - GDK_WINDOW_TYPE_HINT_NORMAL - - - True - - - 168 - True - True - 140 - - - True - True - GTK_POLICY_AUTOMATIC - GTK_POLICY_AUTOMATIC - GTK_SHADOW_IN - - - True - True - False - True - - - - - - False - - - - - True - - - True - 3 - 3 - True - - - False - False - - - - - True - True - GTK_POLICY_AUTOMATIC - GTK_POLICY_AUTOMATIC - - - True - - - True - - - 1 - - - True - 5 - 0 - - - True - True - 5 - 12 - - - True - 5 - 2 - 3 - 3 - 3 - - - True - 0 - Mount point: - mnt_entry - - - GTK_FILL - - - - - - 100 - True - True - - - 1 - 2 - - - - - - True - True - Browse... - True - - - - - 2 - 3 - GTK_FILL - - - - - - 100 - True - True - - - 1 - 2 - 1 - 2 - - - - - - True - True - Browse... - True - - - - - 2 - 3 - 1 - 2 - GTK_FILL - - - - - - True - 0 - Eject program: - ejt_entry - - - 1 - 2 - GTK_FILL - - - - - - - - - - True - <b>CD/DVD drive options</b> - True - - - label_item - - - - - - - - - 1 - - - True - 5 - 0 - - - True - True - 5 - 12 - - - True - - - True - True - Save main window size - True - True - - - False - False - - - - - True - True - Save paned window sizes - True - True - - - False - False - 1 - - - - - True - True - Eject CD/DVD after scan - True - True - - - False - False - 2 - - - - - - - - - True - <b>General options</b> - True - - - label_item - - - - - - - True - 5 - 0 - - - True - True - 5 - 12 - - - True - - - True - True - Possible export to XLS - True - True - - - False - False - - - - - - - - - True - <b>Misc</b> - True - - - label_item - - - - - 1 - - - - - True - 5 - 0 - - - True - True - 5 - 12 - - - True - - - True - True - Confirm quit if there are unsaved data - True - True - - - False - False - - - - - True - True - Confirm "new" if there are unsaved data - True - True - - - False - False - 1 - - - - - True - True - Warn about mount/umount errors - True - True - - - False - False - 2 - - - - - - - - - True - <b>Confirmations</b> - True - - - label_item - - - - - 2 - - - - - 1 - - - - - 1 - - - True - 5 - 0 - - - True - True - 5 - 12 - - - True - - - True - True - Create thumbnails for images - True - True - - - False - False - - - - - True - True - Scan EXIF data - True - True - - - False - False - 1 - - - - - True - True - Include gThumb image description - True - True - - - False - False - 2 - - - - - - - - - True - <b>Scan options</b> - True - - - label_item - - - - - - - 2 - - - - - - - - - 1 - - - - - - - 2 - - - - - True - GTK_BUTTONBOX_END - - - True - True - True - gtk-cancel - True - -6 - - - - - - True - True - True - gtk-save - True - -5 - - - - 1 - - - - - False - GTK_PACK_END - - - - - + + + 550 + 400 + Preferences - pyGTKtalog + GTK_WINDOW_TOPLEVEL + GTK_WIN_POS_NONE + True + True + False + True + False + False + GDK_WINDOW_TYPE_HINT_NORMAL + GDK_GRAVITY_NORTH_WEST + True + False + True + + + + True + False + 0 + + + + True + GTK_BUTTONBOX_END + + + + True + True + True + gtk-cancel + True + GTK_RELIEF_NORMAL + True + -6 + + + + + + + True + True + True + gtk-save + True + GTK_RELIEF_NORMAL + True + -5 + + + + + + 0 + False + True + GTK_PACK_END + + + + + + 168 + True + True + 140 + + + + True + True + GTK_POLICY_AUTOMATIC + GTK_POLICY_AUTOMATIC + GTK_SHADOW_IN + GTK_CORNER_TOP_LEFT + + + + True + True + False + True + False + True + False + False + False + + + + + + True + False + + + + + + True + False + 0 + + + + True + + False + True + GTK_JUSTIFY_LEFT + False + False + 0.5 + 0.5 + 3 + 3 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + 0 + False + False + + + + + + True + True + GTK_POLICY_AUTOMATIC + GTK_POLICY_AUTOMATIC + GTK_SHADOW_NONE + GTK_CORNER_TOP_LEFT + + + + True + GTK_SHADOW_IN + + + + True + False + 0 + + + + 1 + False + 0 + + + + 5 + True + 0 + 0.5 + GTK_SHADOW_ETCHED_IN + + + + 5 + True + True + 0.5 + 0.5 + 1 + 1 + 0 + 0 + 12 + 0 + + + + 5 + True + 2 + 3 + False + 3 + 3 + + + + True + Mount point: + False + False + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 0 + 0 + mnt_entry + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + 0 + 1 + 0 + 1 + + + + + + + + 100 + True + True + True + True + 0 + + True + * + False + + + 1 + 2 + 0 + 1 + + + + + + + True + True + Browse... + True + GTK_RELIEF_NORMAL + True + + + + + 2 + 3 + 0 + 1 + + + + + + + + 100 + True + True + True + True + 0 + + True + * + False + + + 1 + 2 + 1 + 2 + + + + + + + True + True + Browse... + True + GTK_RELIEF_NORMAL + True + + + + + 2 + 3 + 1 + 2 + + + + + + + + True + Eject program: + False + False + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 0 + 0 + ejt_entry + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + 0 + 1 + 1 + 2 + + + + + + + + + + + + True + <b>CD/DVD drive options</b> + False + True + GTK_JUSTIFY_LEFT + False + False + 0.5 + 0.5 + 0 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + label_item + + + + + 0 + True + True + + + + + 0 + True + True + + + + + + 1 + False + 0 + + + + 5 + True + 0 + 0.5 + GTK_SHADOW_ETCHED_IN + + + + 5 + True + True + 0.5 + 0.5 + 1 + 1 + 0 + 0 + 12 + 0 + + + + True + False + 0 + + + + True + True + Save main window size + True + GTK_RELIEF_NORMAL + True + False + False + True + + + 0 + False + False + + + + + + True + True + Save paned window sizes + True + GTK_RELIEF_NORMAL + True + False + False + True + + + 0 + False + False + + + + + + True + True + Eject CD/DVD after scan + True + GTK_RELIEF_NORMAL + True + False + False + True + + + 0 + False + False + + + + + + + + + + True + <b>General options</b> + False + True + GTK_JUSTIFY_LEFT + False + False + 0.5 + 0.5 + 0 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + label_item + + + + + 0 + True + True + + + + + + 5 + True + 0 + 0.5 + GTK_SHADOW_ETCHED_IN + + + + 5 + True + True + 0.5 + 0.5 + 1 + 1 + 0 + 0 + 12 + 0 + + + + True + False + 0 + + + + True + True + Possible export to XLS + True + GTK_RELIEF_NORMAL + True + False + False + True + + + 0 + False + False + + + + + + + + + + True + <b>Misc</b> + False + True + GTK_JUSTIFY_LEFT + False + False + 0.5 + 0.5 + 0 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + label_item + + + + + 0 + True + True + + + + + + 5 + True + 0 + 0.5 + GTK_SHADOW_ETCHED_IN + + + + 5 + True + True + 0.5 + 0.5 + 1 + 1 + 0 + 0 + 12 + 0 + + + + True + False + 0 + + + + True + True + Confirm quit if there are unsaved data + True + GTK_RELIEF_NORMAL + True + False + False + True + + + 0 + False + False + + + + + + True + True + Confirm "new" if there are unsaved data + True + GTK_RELIEF_NORMAL + True + False + False + True + + + 0 + False + False + + + + + + True + True + Warn about mount/umount errors + True + GTK_RELIEF_NORMAL + True + False + False + True + + + 0 + False + False + + + + + + True + True + Warn on delete + True + GTK_RELIEF_NORMAL + True + False + False + True + + + 0 + False + False + + + + + + + + + + True + <b>Confirmations</b> + False + True + GTK_JUSTIFY_LEFT + False + False + 0.5 + 0.5 + 0 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + label_item + + + + + 0 + True + True + + + + + 0 + True + True + + + + + + 1 + False + 0 + + + + 5 + True + 0 + 0.5 + GTK_SHADOW_ETCHED_IN + + + + 5 + True + True + 0.5 + 0.5 + 1 + 1 + 0 + 0 + 12 + 0 + + + + True + False + 0 + + + + True + True + Create thumbnails for images + True + GTK_RELIEF_NORMAL + True + False + False + True + + + 0 + False + False + + + + + + True + True + Scan EXIF data + True + GTK_RELIEF_NORMAL + True + False + False + True + + + 0 + False + False + + + + + + True + True + Include gThumb image description + True + GTK_RELIEF_NORMAL + True + False + False + True + + + 0 + False + False + + + + + + + + + + True + <b>Scan options</b> + False + True + GTK_JUSTIFY_LEFT + False + False + 0.5 + 0.5 + 0 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + label_item + + + + + 0 + True + True + + + + + 0 + True + True + + + + + + + + + 0 + True + True + + + + + True + True + + + + + 0 + True + True + + + + + + diff --git a/src/controllers/c_config.py b/src/controllers/c_config.py index da2ba98..1f6d075 100644 --- a/src/controllers/c_config.py +++ b/src/controllers/c_config.py @@ -25,6 +25,7 @@ class ConfigController(Controller): self.view['ch_xls'].set_active(self.model.confd['exportxls']) self.view['ch_quit'].set_active(self.model.confd['confirmquit']) self.view['ch_wrnmount'].set_active(self.model.confd['mntwarn']) + self.view['ch_wrndel'].set_active(self.model.confd['delwarn']) self.view['ch_warnnew'].set_active(self.model.confd['confirmabandon']) self.view['ch_thumb'].set_active(self.model.confd['pil']) self.view['ch_exif'].set_active(self.model.confd['exif']) @@ -66,6 +67,7 @@ class ConfigController(Controller): self.model.confd['exportxls'] = self.view['ch_xls'].get_active() self.model.confd['confirmquit'] = self.view['ch_quit'].get_active() self.model.confd['mntwarn'] = self.view['ch_wrnmount'].get_active() + self.model.confd['delwarn'] = self.view['ch_wrndel'].get_active() self.model.confd['confirmabandon'] = self.view['ch_warnnew'].get_active() self.model.confd['pil'] = self.view['ch_thumb'].get_active() self.model.confd['exif'] = self.view['ch_exif'].get_active() diff --git a/src/models/m_config.py b/src/models/m_config.py index 601ef76..89d62c1 100644 --- a/src/models/m_config.py +++ b/src/models/m_config.py @@ -54,6 +54,7 @@ class ConfigModel(Model): 'confirmabandon':True, 'showtoolbar':True, 'showstatusbar':True, + 'delwarn':True, } dictconf = { @@ -70,6 +71,7 @@ class ConfigModel(Model): "image support":"pil", 'confirm quit':'confirmquit', 'warn mount/umount errors':'mntwarn', + 'warn on delete':'delwarn', 'confirm abandon current catalog':'confirmabandon', 'show toolbar':'showtoolbar', 'show statusbar and progress bar':'showstatusbar', @@ -85,6 +87,7 @@ class ConfigModel(Model): 'exif', 'confirmquit', 'mntwarn', + 'delwarn', 'confirmabandon', 'showtoolbar', 'showstatusbar',