diff --git a/safeeyes/glade/new_break.glade b/safeeyes/glade/new_break.glade index 21e3f52..a379c6e 100644 --- a/safeeyes/glade/new_break.glade +++ b/safeeyes/glade/new_break.glade @@ -20,11 +20,11 @@ ~ along with this program. If not, see . --> - + 100 - 1 - 10 + 1 + 10 @@ -41,110 +41,69 @@ - False New Break - False - True - center-on-parent - 500 - 50 - True - safeeyes - dialog - True - center - + 0 + 1 + 500 + 50 + 1 + safeeyes - True - False - 10 - 10 - 10 - 10 + 1 + 10 + 10 + 10 + 10 vertical 5 - True - False - 0 + 1 - - True - False - 12 + + 1 + 12 + 10 + 5 + 10 + vertical + 3 - - True - False - 10 - 5 - 10 - vertical - 3 + + 1 + 1 + center + 64 + + + + + 1 + 10 + 1 - - True - True + + 1 + start center - 64 + Type - - False - True - 0 - - - True - False - 10 + + end + 1 + lst_break_types + 0 + 0 - - True - False - start - center - Type - - - False - True - 0 - - - - - True - False - lst_break_types - 0 - 0 - - - - 0 - - - - - False - True - end - 1 - + + + 0 + - - False - True - 1 - - - - @@ -152,61 +111,36 @@ - True - False + 1 Break - - False - False - 0 - - - True - False + + 1 10 - True - top - end + 1 + top + end Discard - True - True - True - + 1 + 1 + 1 - - True - True - 0 - Save - True - True - True - True - + 1 + 1 + 1 - - True - True - 1 - - - False - False - 3 - diff --git a/safeeyes/ui/settings_dialog.py b/safeeyes/ui/settings_dialog.py index b972c22..01e9399 100644 --- a/safeeyes/ui/settings_dialog.py +++ b/safeeyes/ui/settings_dialog.py @@ -381,7 +381,6 @@ class PluginSettingsDialog: self.property_controls = [] builder = utility.create_gtk_builder(SETTINGS_DIALOG_PLUGIN_GLADE) - builder.connect_signals(self) self.window = builder.get_object('dialog_settings_plugin') box_settings = builder.get_object('box_settings') self.window.set_title(_('Plugin Settings')) @@ -445,7 +444,7 @@ class PluginSettingsDialog: """ Show the Properties dialog. """ - self.window.show_all() + self.window.present() class BreakSettingsDialog: @@ -646,7 +645,6 @@ class NewBreakDialog: self.on_add = on_add builder = utility.create_gtk_builder(SETTINGS_DIALOG_NEW_BREAK_GLADE) - builder.connect_signals(self) self.window = builder.get_object('dialog_new_break') self.txt_break = builder.get_object('txt_break') self.cmb_type = builder.get_object('cmb_type') @@ -655,6 +653,10 @@ class NewBreakDialog: list_types[0][0] = _(list_types[0][0]) list_types[1][0] = _(list_types[1][0]) + self.window.connect("close-request", self.on_window_delete) + builder.get_object('btn_discard').connect('clicked', self.discard) + builder.get_object('btn_save').connect('clicked', self.save) + # Set the values self.window.set_title(_('New Break')) @@ -688,4 +690,4 @@ class NewBreakDialog: """ Show the Properties dialog. """ - self.window.show_all() + self.window.present()