This is an automated email from the git hooks/post-receive script. o c h o s i p u s h e d a c o m m i t t o b r a n c h m a s t e r in repository xfce/xfce4-settings.
commit 5de3ff9bdd3248dd0433dd1cdbce8b8e96c32afd Author: Simon Steinbeiss <[email protected]> Date: Wed Aug 15 00:43:30 2018 +0200 display: Re-introduce the profile apply button --- dialogs/display-settings/display-dialog.glade | 25 +++++++++++++++++++++---- dialogs/display-settings/main.c | 17 ++++++++++++++++- 2 files changed, 37 insertions(+), 5 deletions(-) diff --git a/dialogs/display-settings/display-dialog.glade b/dialogs/display-settings/display-dialog.glade index 45c8881..d738fef 100644 --- a/dialogs/display-settings/display-dialog.glade +++ b/dialogs/display-settings/display-dialog.glade @@ -13,6 +13,11 @@ <property name="can_focus">False</property> <property name="icon_name">list-add-symbolic</property> </object> + <object class="GtkImage" id="image3"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="icon_name">object-select-symbolic</property> + </object> <object class="XfceTitledDialog" id="display-dialog"> <property name="can_focus">False</property> <property name="title" translatable="yes">Display</property> @@ -118,7 +123,7 @@ <object class="GtkBox"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="halign">end</property> + <property name="halign">start</property> <child> <object class="GtkButton" id="button-profile-delete"> <property name="visible">True</property> @@ -131,8 +136,7 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="pack_type">end</property> - <property name="position">1</property> + <property name="position">0</property> </packing> </child> <child> @@ -147,7 +151,20 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="pack_type">end</property> + <property name="position">1</property> + </packing> + </child> + <child> + <object class="GtkButton" id="button-profile-apply"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <property name="image">image3</property> + <property name="always_show_image">True</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> <property name="position">2</property> </packing> </child> diff --git a/dialogs/display-settings/main.c b/dialogs/display-settings/main.c index a60fac5..92419c6 100644 --- a/dialogs/display-settings/main.c +++ b/dialogs/display-settings/main.c @@ -152,6 +152,7 @@ GtkWidget *apply_button = NULL; GtkWidget *profile_save_button = NULL; GtkWidget *profile_delete_button = NULL; +GtkWidget *profile_apply_button = NULL; static void display_settings_minimal_only_display1_toggled (GtkToggleButton *button, @@ -1485,6 +1486,17 @@ display_settings_profile_save (GtkWidget *widget, GtkBuilder *builder) } static void +display_settings_profile_changed (GtkWidget *widget, GtkBuilder *builder) +{ + GtkWidget *entry = gtk_bin_get_child ((GtkBin*) gtk_builder_get_object (builder, "randr-profile")); + gboolean sensitive = gtk_entry_get_text_length (GTK_ENTRY (entry)); + + gtk_widget_set_sensitive (profile_save_button, sensitive); + gtk_widget_set_sensitive (profile_delete_button, sensitive); + gtk_widget_set_sensitive (profile_apply_button, sensitive); +} + +static void display_settings_profile_apply (GtkWidget *widget, GtkBuilder *builder) { GtkWidget *entry = gtk_bin_get_child ((GtkBin*) gtk_builder_get_object (builder, "randr-profile")); @@ -1631,7 +1643,7 @@ display_settings_dialog_new (GtkBuilder *builder) combobox = gtk_builder_get_object (builder, "randr-profile"); display_settings_combo_box_create (GTK_COMBO_BOX (combobox)); - g_signal_connect (G_OBJECT (combobox), "changed", G_CALLBACK (display_settings_profile_apply), builder); + g_signal_connect (G_OBJECT (combobox), "changed", G_CALLBACK (display_settings_profile_changed), builder); check = gtk_builder_get_object (builder, "minimal-autoshow"); xfconf_g_property_bind (display_channel, "/Notify", G_TYPE_BOOLEAN, check, @@ -1649,6 +1661,9 @@ display_settings_dialog_new (GtkBuilder *builder) gtk_widget_set_sensitive (profile_delete_button, FALSE); g_signal_connect (G_OBJECT (profile_delete_button), "clicked", G_CALLBACK (display_settings_profile_delete), builder); + profile_apply_button = GTK_WIDGET(gtk_builder_get_object (builder, "button-profile-apply")); + gtk_widget_set_sensitive (profile_apply_button, FALSE); + g_signal_connect (G_OBJECT (profile_apply_button), "clicked", G_CALLBACK (display_settings_profile_apply), builder); /* Populate the combobox */ display_settings_combobox_populate (builder); -- To stop receiving notification emails like this one, please contact the administrator of this repository. _______________________________________________ Xfce4-commits mailing list [email protected] https://mail.xfce.org/mailman/listinfo/xfce4-commits
