[Xfce4-commits] [xfce/xfce4-settings] 54/67: display: Show dependency of auto-enable-profiles on minimal-autoshow

[noreply at xfce.org]

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 3363c9845a6595756eb046df1660d31040ad33af
Author: Simon Steinbeiss <simon.steinbeiss at elfenbeinturm.at>
Date:   Sat Sep 1 23:34:19 2018 +0200

    display: Show dependency of auto-enable-profiles on minimal-autoshow
---
 dialogs/display-settings/display-dialog.glade |  2 +-
 dialogs/display-settings/main.c               | 17 +++++++++++++++++
 2 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/dialogs/display-settings/display-dialog.glade b/dialogs/display-settings/display-dialog.glade
index e99021d..b5dc5e2 100644
--- a/dialogs/display-settings/display-dialog.glade
+++ b/dialogs/display-settings/display-dialog.glade
@@ -544,7 +544,7 @@
                       </packing>
                     </child>
                     <child>
-                      <object class="GtkLabel">
+                      <object class="GtkLabel" id="auto-enable-profiles-label">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="margin_left">12</property>
diff --git a/dialogs/display-settings/main.c b/dialogs/display-settings/main.c
index 8128689..4cbaec6 100644
--- a/dialogs/display-settings/main.c
+++ b/dialogs/display-settings/main.c
@@ -1738,6 +1738,20 @@ display_settings_profile_delete (GtkWidget *widget, GtkBuilder *builder)
     }
 }
 
+static gboolean
+display_setting_minimal_autoshow_toggled (GtkSwitch       *widget,
+                                          gboolean         state,
+                                          GtkBuilder      *builder)
+{
+    GObject *auto_enable_profiles;
+    gboolean auto_enable_profiles_setting;
+
+    auto_enable_profiles = gtk_builder_get_object (builder, "auto-enable-profiles");
+    gtk_widget_set_sensitive (GTK_WIDGET (auto_enable_profiles), state);
+    auto_enable_profiles = gtk_builder_get_object (builder, "auto-enable-profiles-label");
+    gtk_widget_set_sensitive (GTK_WIDGET (auto_enable_profiles), state);
+}
+
 static GtkWidget *
 display_settings_dialog_new (GtkBuilder *builder)
 {
@@ -1815,8 +1829,11 @@ display_settings_dialog_new (GtkBuilder *builder)
     g_signal_connect (G_OBJECT (selection), "changed", G_CALLBACK (display_settings_profile_changed), builder);
 
     check = gtk_builder_get_object (builder, "minimal-autoshow");
+    g_signal_connect (G_OBJECT (check), "state-set", G_CALLBACK (display_setting_minimal_autoshow_toggled), builder);
     xfconf_g_property_bind (display_channel, "/Notify", G_TYPE_BOOLEAN, check,
                             "active");
+    /* Correctly initiate the state of the auto-enable-profiles setting based on minimal-autoshow */
+    display_setting_minimal_autoshow_toggled ((GTK_SWITCH (check)), gtk_switch_get_active (GTK_SWITCH (check)), builder);
 
     apply_button = GTK_WIDGET (gtk_builder_get_object (builder, "apply"));
     g_signal_connect (G_OBJECT (apply_button), "clicked", G_CALLBACK (display_setting_apply), builder);

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.