[Xfce4-commits] [xfce/xfce4-settings] 07/67: display: Include profiles in the minimal dialog

[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 55e68517d2efa571588e7f54cadde9a11608874e
Author: Simon Steinbeiss <simon.steinbeiss at elfenbeinturm.at>
Date:   Thu Aug 9 02:07:23 2018 +0200

    display: Include profiles in the minimal dialog
---
 dialogs/display-settings/main.c                       | 13 +++++++++----
 dialogs/display-settings/minimal-display-dialog.glade | 17 ++++++++++++++---
 2 files changed, 23 insertions(+), 7 deletions(-)

diff --git a/dialogs/display-settings/main.c b/dialogs/display-settings/main.c
index 513a42e..e6828fb 100644
--- a/dialogs/display-settings/main.c
+++ b/dialogs/display-settings/main.c
@@ -1221,9 +1221,9 @@ get_profiles (void)
     /* get all display connectors in combination with their respective edids */
     for (m = 0; m < xfce_randr->noutput; ++m)
     {
-      edid = xfce_randr_get_edid (xfce_randr, m);
-      output_info_name = xfce_randr_get_output_info_name (xfce_randr, m);
-      display_infos[m] = g_strdup_printf ("%s/%s", output_info_name, edid);
+        edid = xfce_randr_get_edid (xfce_randr, m);
+        output_info_name = xfce_randr_get_output_info_name (xfce_randr, m);
+        display_infos[m] = g_strdup_printf ("%s/%s", output_info_name, edid);
     }
 
     /* get all profiles */
@@ -3238,9 +3238,14 @@ display_settings_show_minimal_dialog (GdkDisplay *display)
         extend_right = gtk_builder_get_object (builder, "extend_right");
         only_display2 = gtk_builder_get_object (builder, "display2");
         advanced = gtk_builder_get_object (builder, "advanced_button");
-        auto_button = gtk_builder_get_object (builder, "auto_button");
+        auto_button = gtk_builder_get_object (builder, "randr-profile");
         fake_button = gtk_builder_get_object (builder, "fake_button");
 
+        display_settings_combo_box_create (GTK_COMBO_BOX (auto_button));
+        /* Populate the combobox */
+        display_settings_combobox_populate (builder);
+        profile_combobox_populate (builder);
+
         gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (fake_button), TRUE);
 
         label = gtk_builder_get_object (builder, "label1");
diff --git a/dialogs/display-settings/minimal-display-dialog.glade b/dialogs/display-settings/minimal-display-dialog.glade
index a444641..bd73cf0 100644
--- a/dialogs/display-settings/minimal-display-dialog.glade
+++ b/dialogs/display-settings/minimal-display-dialog.glade
@@ -189,11 +189,22 @@
               </packing>
             </child>
             <child>
-              <object class="GtkButton" id="auto_button">
-                <property name="label" translatable="yes">Auto</property>
+              <object class="GtkComboBox" id="randr-profile">
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
-                <property name="receives_default">True</property>
+                <property name="hexpand">True</property>
+                <property name="has_entry">True</property>
+                <property name="entry_text_column">0</property>
+                <child internal-child="entry">
+                  <object class="GtkEntry">
+                    <property name="can_focus">True</property>
+                    <property name="primary_icon_activatable">False</property>
+                    <property name="secondary_icon_activatable">False</property>
+                    <property name="primary_icon_sensitive">False</property>
+                    <property name="secondary_icon_sensitive">False</property>
+                    <property name="input_purpose">name</property>
+                  </object>
+                </child>
               </object>
               <packing>
                 <property name="expand">True</property>

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