[Xfce4-commits] <xfdesktop:master> Add an info bar to the settings app (Bug 10460)

Eric Koegel noreply at xfce.org
Thu Nov 14 00:38:08 CET 2013


Updating branch refs/heads/master
         to 9a7b5c1381b8047dc97d2080a6274b2d468987e1 (commit)
       from 2456c1974cace0cb0494638146c33a88737cf6a9 (commit)

commit 9a7b5c1381b8047dc97d2080a6274b2d468987e1
Author: Eric Koegel <eric.koegel at gmail.com>
Date:   Wed Nov 13 14:57:11 2013 +0300

    Add an info bar to the settings app (Bug 10460)
    
    The info bar will be used to notify the user that dragging the
    window to another monitor or workspace will allow them to change
    those settings. This should help user's customize those settings.

 settings/main.c                                    |   45 +-
 .../xfdesktop-settings-appearance-frame-ui.glade   |  571 ++++++++++----------
 2 files changed, 332 insertions(+), 284 deletions(-)

diff --git a/settings/main.c b/settings/main.c
index a46d608..d64bf81 100644
--- a/settings/main.c
+++ b/settings/main.c
@@ -99,6 +99,8 @@ typedef struct
      * wnck_screen_get_active_workspace sometimes has to return NULL. */
     gint active_workspace;
 
+    GtkWidget *infobar;
+    GtkWidget *infobar_label;
     GtkWidget *label_header;
     GtkWidget *image_iconview;
     GtkWidget *btn_folder;
@@ -680,6 +682,14 @@ xfdesktop_settings_update_iconview_frame_name(AppearancePanel *panel,
             } else {
                 g_snprintf(buf, sizeof(buf), _("Wallpaper for Monitor %d"), panel->monitor);
             }
+
+            /* This is for the infobar letting the user know how to configure
+             * multiple monitor setups */
+            gtk_label_set_text(GTK_LABEL(panel->infobar_label),
+                               _("You are using more than one display, "
+                                 "move this dialog to the display you "
+                                 "want to edit the settings for."));
+            gtk_widget_set_visible(panel->infobar, TRUE);
         } else {
             /* Multi-monitor per workspace wallpaper */
             if(panel->monitor_name) {
@@ -691,17 +701,36 @@ xfdesktop_settings_update_iconview_frame_name(AppearancePanel *panel,
                            _("Wallpaper for %s on Monitor %d"),
                            workspace_name, panel->monitor);
             }
+
+            /* This is for the infobar letting the user know how to configure
+             * multiple monitor/workspace setups */
+            gtk_label_set_text(GTK_LABEL(panel->infobar_label),
+                               _("You are using more than one display, "
+                                 "move this dialog to the display and "
+                                 "workspace you want to edit the settings for."));
+            gtk_widget_set_visible(panel->infobar, TRUE);
         }
     } else {
         if(gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(panel->chk_apply_to_all))) {
             /* Single monitor and single workspace */
             g_snprintf(buf, sizeof(buf), _("Wallpaper for my desktop"));
+
+            /* No need for the infobar */
+            gtk_widget_set_visible(panel->infobar, FALSE);
         } else {
             /* Single monitor and per workspace wallpaper */
             g_snprintf(buf, sizeof(buf), _("Wallpaper for %s"), workspace_name);
+
+            /* This is for the infobar letting the user know how to configure
+             * multiple workspace setups */
+            gtk_label_set_text(GTK_LABEL(panel->infobar_label),
+                               _("Move this dialog to the workspace you "
+                                 "want to edit the settings for."));
+            gtk_widget_set_visible(panel->infobar, TRUE);
         }
     }
 
+    /* This label is for which workspace/monitor we're on */
     gtk_label_set_text(GTK_LABEL(panel->label_header), buf);
 
     g_free(workspace_name);
@@ -1619,7 +1648,7 @@ xfdesktop_settings_dialog_setup_tabs(GtkBuilder *main_gxml,
     GtkWidget *appearance_container, *chk_custom_font_size,
               *spin_font_size, *w, *box, *spin_icon_size,
               *chk_show_thumbnails, *chk_single_click, *appearance_settings,
-              *chk_show_tooltips, *spin_tooltip_size, *bnt_exit;
+              *chk_show_tooltips, *spin_tooltip_size, *bnt_exit, *content_area;
     GtkBuilder *appearance_gxml;
     AppearancePanel *panel = g_new0(AppearancePanel, 1);
     GError *error = NULL;
@@ -1728,6 +1757,20 @@ xfdesktop_settings_dialog_setup_tabs(GtkBuilder *main_gxml,
     gtk_notebook_set_show_tabs(GTK_NOTEBOOK(appearance_container), FALSE);
 
     /* icon view area */
+    panel->infobar = GTK_WIDGET(gtk_builder_get_object(appearance_gxml,
+                                                       "infobar_header"));
+
+    panel->infobar_label = gtk_label_new("This is some text");
+    gtk_widget_set_no_show_all(panel->infobar, TRUE);
+    gtk_widget_show(panel->infobar_label);
+    gtk_widget_show(panel->infobar);
+    gtk_widget_set_visible(panel->infobar, FALSE);
+
+    /* Add the panel's infobar label to the infobar, with this setup
+     * it's easy to update the text for the infobar. */
+    content_area = gtk_info_bar_get_content_area(GTK_INFO_BAR(panel->infobar));
+    gtk_container_add(GTK_CONTAINER(content_area), panel->infobar_label);
+
     panel->label_header = GTK_WIDGET(gtk_builder_get_object(appearance_gxml,
                                                             "label_header"));
 
diff --git a/settings/xfdesktop-settings-appearance-frame-ui.glade b/settings/xfdesktop-settings-appearance-frame-ui.glade
index 100abea..5679253 100644
--- a/settings/xfdesktop-settings-appearance-frame-ui.glade
+++ b/settings/xfdesktop-settings-appearance-frame-ui.glade
@@ -34,326 +34,331 @@
     <property name="border_width">12</property>
     <property name="left_padding">6</property>
     <child>
-      <object class="GtkAlignment" id="top_padding_alignment">
+      <object class="GtkVBox" id="background_tab_vbox">
         <property name="visible">True</property>
-        <property name="top_padding">6</property>
+        <property name="spacing">6</property>
         <child>
-          <object class="GtkVBox" id="background_tab_vbox">
+          <object class="GtkInfoBar" id="infobar_header">
+            <property name="visible">True</property>
+            <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+            <property name="message-type">GTK_MESSAGE_INFO</property>
+          </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="position">0</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkHBox" id="background_tab_hbox">
             <property name="visible">True</property>
-            <property name="spacing">6</property>
             <child>
-              <object class="GtkHBox" id="background_tab_hbox">
+              <object class="GtkLabel" id="label_header">
                 <property name="visible">True</property>
-                <child>
-                  <object class="GtkLabel" id="label_header">
-                    <property name="visible">True</property>
-                    <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                  </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="position">0</property>
-                  </packing>
-                </child>
+                <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
               </object>
               <packing>
                 <property name="expand">False</property>
-                <property name="position">0</property>
+                <property name="position">1</property>
               </packing>
             </child>
+          </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="position">1</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkScrolledWindow" id="iconview_imagelist_scrolled_window">
+            <property name="visible">True</property>
+            <property name="can_focus">True</property>
+            <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+            <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
+            <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
+            <property name="shadow_type">GTK_SHADOW_ETCHED_IN</property>
             <child>
-              <object class="GtkScrolledWindow" id="iconview_imagelist_scrolled_window">
+              <object class="GtkIconView" id="iconview_imagelist">
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
-                <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
-                <property name="shadow_type">GTK_SHADOW_ETCHED_IN</property>
-                <child>
-                  <object class="GtkIconView" id="iconview_imagelist">
-                    <property name="visible">True</property>
-                    <property name="can_focus">True</property>
-                    <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                  </object>
-                </child>
+              </object>
+            </child>
+          </object>
+          <packing>
+            <property name="expand">True</property>
+            <property name="position">2</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkTable" id="folder_color_and_image_style_table">
+            <property name="visible">True</property>
+            <property name="n-columns">8</property>
+            <property name="n-rows">2</property>
+            <property name="row-spacing">6</property>
+            <property name="column-spacing">12</property>
+            <child>
+              <object class="GtkLabel" id="label_folder">
+                <property name="visible">True</property>
+                <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                <property name="label" translatable="yes">_Folder:</property>
+                <property name="use_underline">True</property>
+                <property name="mnemonic_widget">btn_folder</property>
               </object>
               <packing>
-                <property name="expand">True</property>
-                <property name="position">1</property>
+                <property name="left-attach">0</property>
+                <property name="right-attach">1</property>
+                <property name="top-attach">0</property>
+                <property name="bottom-attach">1</property>
+                <property name="x-options">GTK_SHRINK</property>
+                <property name="y-options">GTK_SHRINK</property>
               </packing>
             </child>
             <child>
-              <object class="GtkTable" id="folder_color_and_image_style_table">
+              <object class="GtkFileChooserButton" id="btn_folder">
                 <property name="visible">True</property>
-                <property name="n-columns">8</property>
-                <property name="n-rows">2</property>
-                <property name="row-spacing">6</property>
-                <property name="column-spacing">12</property>
-                <child>
-                  <object class="GtkLabel" id="label_folder">
-                    <property name="visible">True</property>
-                    <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                    <property name="label" translatable="yes">_Folder:</property>
-                    <property name="use_underline">True</property>
-                    <property name="mnemonic_widget">btn_folder</property>
-                  </object>
-                  <packing>
-                    <property name="left-attach">0</property>
-                    <property name="right-attach">1</property>
-                    <property name="top-attach">0</property>
-                    <property name="bottom-attach">1</property>
-                    <property name="x-options">GTK_SHRINK</property>
-                    <property name="y-options">GTK_SHRINK</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkFileChooserButton" id="btn_folder">
-                    <property name="visible">True</property>
-                    <property name="can_focus">True</property>
-                    <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                    <property name="tooltip-text" translatable="yes">Choose the folder to select wallpapers from</property>
-                    <property name="action">GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER</property>
-                  </object>
-                  <packing>
-                    <property name="left-attach">1</property>
-                    <property name="right-attach">2</property>
-                    <property name="top-attach">0</property>
-                    <property name="bottom-attach">1</property>
-                    <property name="x-options">GTK_FILL|GTK_EXPAND</property>
-                    <property name="y-options">GTK_SHRINK</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkAlignment" id="alignment_spacer">
-                    <property name="visible">True</property>
-                  </object>
-                  <packing>
-                    <property name="left-attach">4</property>
-                    <property name="right-attach">5</property>
-                    <property name="top-attach">0</property>
-                    <property name="bottom-attach">1</property>
-                    <property name="x-options">GTK_FILL|GTK_EXPAND</property>
-                    <property name="y-options">GTK_SHRINK</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkLabel" id="label_style">
-                    <property name="visible">True</property>
-                    <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                    <property name="label" translatable="yes">St_yle:</property>
-                    <property name="use_underline">True</property>
-                    <property name="mnemonic_widget">combo_style</property>
-                  </object>
-                  <packing>
-                    <property name="left-attach">5</property>
-                    <property name="right-attach">6</property>
-                    <property name="top-attach">0</property>
-                    <property name="bottom-attach">1</property>
-                    <property name="x-options">GTK_SHRINK</property>
-                    <property name="y-options">GTK_SHRINK</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkComboBoxText" id="combo_style">
-                    <property name="visible">True</property>
-                    <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                    <property name="tooltip-text" translatable="yes">Specify how the image will be resized to fit the screen</property>
-                    <items>
-                      <item translatable="yes">None</item>
-                      <item translatable="yes">Centered</item>
-                      <item translatable="yes">Tiled</item>
-                      <item translatable="yes">Stretched</item>
-                      <item translatable="yes">Scaled</item>
-                      <item translatable="yes">Zoomed</item>
-                      <item translatable="yes">Spanning Screens</item>
-                    </items>
-                  </object>
-                  <packing>
-                    <property name="left-attach">6</property>
-                    <property name="right-attach">7</property>
-                    <property name="top-attach">0</property>
-                    <property name="bottom-attach">1</property>
-                    <property name="x-options">GTK_FILL</property>
-                    <property name="y-options">GTK_SHRINK</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkLabel" id="label_color">
-                    <property name="visible">True</property>
-                    <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                    <property name="label" translatable="yes">C_olor:</property>
-                    <property name="use_underline">True</property>
-                    <property name="mnemonic_widget">combo_colors</property>
-                  </object>
-                  <packing>
-                    <property name="left-attach">0</property>
-                    <property name="right-attach">1</property>
-                    <property name="top-attach">1</property>
-                    <property name="bottom-attach">2</property>
-                    <property name="x-options">GTK_SHRINK</property>
-                    <property name="y-options">GTK_SHRINK</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkComboBox" id="combo_colors">
-                    <property name="visible">True</property>
-                    <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                    <property name="tooltip-text" translatable="yes">Specify the style of the color drawn behind the backdrop image</property>
-                    <property name="model">model2</property>
-                    <child>
-                      <object class="GtkCellRendererText" id="renderer2"/>
-                      <attributes>
-                        <attribute name="text">0</attribute>
-                      </attributes>
-                    </child>
-                  </object>
-                  <packing>
-                    <property name="left-attach">1</property>
-                    <property name="right-attach">2</property>
-                    <property name="top-attach">1</property>
-                    <property name="bottom-attach">2</property>
-                    <property name="x-options">GTK_FILL|GTK_EXPAND</property>
-                    <property name="y-options">GTK_SHRINK</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkColorButton" id="color1_btn">
-                    <property name="visible">True</property>
-                    <property name="can_focus">True</property>
-                    <property name="receives_default">True</property>
-                    <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_MOTION_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                    <property name="tooltip-text" translatable="yes">Specifies the solid color, or the "left" or "top" color of the gradient</property>
-                    <property name="title" translatable="yes">Select First Color</property>
-                    <property name="color">#151522223333</property>
-                  </object>
-                  <packing>
-                    <property name="left-attach">2</property>
-                    <property name="right-attach">3</property>
-                    <property name="top-attach">1</property>
-                    <property name="bottom-attach">2</property>
-                    <property name="x-options">GTK_SHRINK</property>
-                    <property name="y-options">GTK_SHRINK</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkColorButton" id="color2_btn">
-                    <property name="visible">True</property>
-                    <property name="can_focus">True</property>
-                    <property name="receives_default">True</property>
-                    <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_MOTION_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                    <property name="tooltip-text" translatable="yes">Specifies the "right" or "bottom" color of the gradient</property>
-                    <property name="title" translatable="yes">Select Second Color</property>
-                    <property name="color">#151522223333</property>
-                  </object>
-                  <packing>
-                    <property name="left-attach">3</property>
-                    <property name="right-attach">4</property>
-                    <property name="top-attach">1</property>
-                    <property name="bottom-attach">2</property>
-                    <property name="x-options">GTK_SHRINK</property>
-                    <property name="y-options">GTK_SHRINK</property>
-                  </packing>
-                </child>
+                <property name="can_focus">True</property>
+                <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                <property name="tooltip-text" translatable="yes">Choose the folder to select wallpapers from</property>
+                <property name="action">GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER</property>
+              </object>
+              <packing>
+                <property name="left-attach">1</property>
+                <property name="right-attach">2</property>
+                <property name="top-attach">0</property>
+                <property name="bottom-attach">1</property>
+                <property name="x-options">GTK_FILL|GTK_EXPAND</property>
+                <property name="y-options">GTK_SHRINK</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkAlignment" id="alignment_spacer">
+                <property name="visible">True</property>
+              </object>
+              <packing>
+                <property name="left-attach">4</property>
+                <property name="right-attach">5</property>
+                <property name="top-attach">0</property>
+                <property name="bottom-attach">1</property>
+                <property name="x-options">GTK_FILL|GTK_EXPAND</property>
+                <property name="y-options">GTK_SHRINK</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkLabel" id="label_style">
+                <property name="visible">True</property>
+                <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                <property name="label" translatable="yes">St_yle:</property>
+                <property name="use_underline">True</property>
+                <property name="mnemonic_widget">combo_style</property>
+              </object>
+              <packing>
+                <property name="left-attach">5</property>
+                <property name="right-attach">6</property>
+                <property name="top-attach">0</property>
+                <property name="bottom-attach">1</property>
+                <property name="x-options">GTK_SHRINK</property>
+                <property name="y-options">GTK_SHRINK</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkComboBoxText" id="combo_style">
+                <property name="visible">True</property>
+                <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                <property name="tooltip-text" translatable="yes">Specify how the image will be resized to fit the screen</property>
+                <items>
+                  <item translatable="yes">None</item>
+                  <item translatable="yes">Centered</item>
+                  <item translatable="yes">Tiled</item>
+                  <item translatable="yes">Stretched</item>
+                  <item translatable="yes">Scaled</item>
+                  <item translatable="yes">Zoomed</item>
+                  <item translatable="yes">Spanning Screens</item>
+                </items>
+              </object>
+              <packing>
+                <property name="left-attach">6</property>
+                <property name="right-attach">7</property>
+                <property name="top-attach">0</property>
+                <property name="bottom-attach">1</property>
+                <property name="x-options">GTK_FILL</property>
+                <property name="y-options">GTK_SHRINK</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkLabel" id="label_color">
+                <property name="visible">True</property>
+                <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                <property name="label" translatable="yes">C_olor:</property>
+                <property name="use_underline">True</property>
+                <property name="mnemonic_widget">combo_colors</property>
+              </object>
+              <packing>
+                <property name="left-attach">0</property>
+                <property name="right-attach">1</property>
+                <property name="top-attach">1</property>
+                <property name="bottom-attach">2</property>
+                <property name="x-options">GTK_SHRINK</property>
+                <property name="y-options">GTK_SHRINK</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkComboBox" id="combo_colors">
+                <property name="visible">True</property>
+                <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                <property name="tooltip-text" translatable="yes">Specify the style of the color drawn behind the backdrop image</property>
+                <property name="model">model2</property>
                 <child>
-                  <object class="GtkCheckButton" id="chk_apply_to_all">
-                    <property name="visible">True</property>
-                    <property name="sensitive">True</property>
-                    <property name="can_focus">True</property>
-                    <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                    <property name="label" translatable="yes">Apply to all _workspaces</property>
-                    <property name="use_underline">True</property>
-                    <property name="draw_indicator">True</property>
-                  </object>
-                  <packing>
-                    <property name="left-attach">6</property>
-                    <property name="right-attach">7</property>
-                    <property name="top-attach">1</property>
-                    <property name="bottom-attach">2</property>
-                    <property name="x-options">GTK_SHRINK</property>
-                    <property name="y-options">GTK_SHRINK</property>
-                  </packing>
+                  <object class="GtkCellRendererText" id="renderer2"/>
+                  <attributes>
+                    <attribute name="text">0</attribute>
+                  </attributes>
                 </child>
               </object>
               <packing>
+                <property name="left-attach">1</property>
+                <property name="right-attach">2</property>
+                <property name="top-attach">1</property>
+                <property name="bottom-attach">2</property>
+                <property name="x-options">GTK_FILL|GTK_EXPAND</property>
+                <property name="y-options">GTK_SHRINK</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkColorButton" id="color1_btn">
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="receives_default">True</property>
+                <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_MOTION_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                <property name="tooltip-text" translatable="yes">Specifies the solid color, or the "left" or "top" color of the gradient</property>
+                <property name="title" translatable="yes">Select First Color</property>
+                <property name="color">#151522223333</property>
+              </object>
+              <packing>
+                <property name="left-attach">2</property>
+                <property name="right-attach">3</property>
+                <property name="top-attach">1</property>
+                <property name="bottom-attach">2</property>
+                <property name="x-options">GTK_SHRINK</property>
+                <property name="y-options">GTK_SHRINK</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkColorButton" id="color2_btn">
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="receives_default">True</property>
+                <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_MOTION_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                <property name="tooltip-text" translatable="yes">Specifies the "right" or "bottom" color of the gradient</property>
+                <property name="title" translatable="yes">Select Second Color</property>
+                <property name="color">#151522223333</property>
+              </object>
+              <packing>
+                <property name="left-attach">3</property>
+                <property name="right-attach">4</property>
+                <property name="top-attach">1</property>
+                <property name="bottom-attach">2</property>
+                <property name="x-options">GTK_SHRINK</property>
+                <property name="y-options">GTK_SHRINK</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkCheckButton" id="chk_apply_to_all">
+                <property name="visible">True</property>
+                <property name="sensitive">True</property>
+                <property name="can_focus">True</property>
+                <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                <property name="label" translatable="yes">Apply to all _workspaces</property>
+                <property name="use_underline">True</property>
+                <property name="draw_indicator">True</property>
+              </object>
+              <packing>
+                <property name="left-attach">6</property>
+                <property name="right-attach">7</property>
+                <property name="top-attach">1</property>
+                <property name="bottom-attach">2</property>
+                <property name="x-options">GTK_SHRINK</property>
+                <property name="y-options">GTK_SHRINK</property>
+              </packing>
+            </child>
+          </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="position">3</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkHBox" id="cycle_options_hbox">
+            <property name="visible">True</property>
+            <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+            <property name="spacing">12</property>
+            <child>
+              <object class="GtkCheckButton" id="chk_cycle_backdrop">
+                <property name="visible">True</property>
+                <property name="sensitive">True</property>
+                <property name="can_focus">True</property>
+                <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                <property name="label" translatable="yes">Change the _background </property>
+                <property name="tooltip-text" translatable="yes">Automatically select a different background from the current directory.</property>
+                <property name="use_underline">True</property>
+                <property name="draw_indicator">True</property>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkComboBoxText" id="combo_cycle_backdrop_period">
+                <property name="visible">True</property>
+                <property name="sensitive">False</property>
+                <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                <property name="tooltip-text" translatable="yes">Specify how often the background will change</property>
+                <items>
+                  <item translatable="yes">in seconds:</item>
+                  <item translatable="yes">in minutes:</item>
+                  <item translatable="yes">in hours:</item>
+                  <item translatable="yes">at start up</item>
+                  <item translatable="yes">every hour</item>
+                  <item translatable="yes">every day</item>
+                  <item translatable="yes">chronologically</item>
+                </items>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkSpinButton" id="spin_backdrop_time">
+                <property name="visible">True</property>
+                <property name="sensitive">False</property>
+                <property name="can_focus">True</property>
+                <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                <property name="adjustment">adjustment3</property>
+                <property name="tooltip-text" translatable="yes">Amount of time before a different background is selected.</property>
+              </object>
+              <packing>
                 <property name="expand">False</property>
                 <property name="position">2</property>
               </packing>
             </child>
             <child>
-              <object class="GtkHBox" id="cycle_options_hbox">
+              <object class="GtkCheckButton" id="chk_random_backdrop_order">
                 <property name="visible">True</property>
+                <property name="sensitive">False</property>
+                <property name="can_focus">True</property>
                 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                <property name="spacing">12</property>
-                <child>
-                  <object class="GtkCheckButton" id="chk_cycle_backdrop">
-                    <property name="visible">True</property>
-                    <property name="sensitive">True</property>
-                    <property name="can_focus">True</property>
-                    <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                    <property name="label" translatable="yes">Change the _background </property>
-                    <property name="tooltip-text" translatable="yes">Automatically select a different background from the current directory.</property>
-                    <property name="use_underline">True</property>
-                    <property name="draw_indicator">True</property>
-                  </object>
-                  <packing>
-                    <property name="expand">False</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkComboBoxText" id="combo_cycle_backdrop_period">
-                    <property name="visible">True</property>
-                    <property name="sensitive">False</property>
-                    <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                    <property name="tooltip-text" translatable="yes">Specify how often the background will change</property>
-                    <items>
-                      <item translatable="yes">in seconds:</item>
-                      <item translatable="yes">in minutes:</item>
-                      <item translatable="yes">in hours:</item>
-                      <item translatable="yes">at start up</item>
-                      <item translatable="yes">every hour</item>
-                      <item translatable="yes">every day</item>
-                      <item translatable="yes">chronologically</item>
-                    </items>
-                  </object>
-                  <packing>
-                    <property name="expand">False</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkSpinButton" id="spin_backdrop_time">
-                    <property name="visible">True</property>
-                    <property name="sensitive">False</property>
-                    <property name="can_focus">True</property>
-                    <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                    <property name="adjustment">adjustment3</property>
-                    <property name="tooltip-text" translatable="yes">Amount of time before a different background is selected.</property>
-                  </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="position">2</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkCheckButton" id="chk_random_backdrop_order">
-                    <property name="visible">True</property>
-                    <property name="sensitive">False</property>
-                    <property name="can_focus">True</property>
-                    <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                    <property name="label" translatable="yes">_Random Order</property>
-                    <property name="use_underline">True</property>
-                    <property name="draw_indicator">True</property>
-                    <property name="tooltip-text" translatable="yes">Randomly selects another image from the same directory when the wallpaper is to cycle.</property>
-                  </object>
-                  <packing>
-                    <property name="expand">False</property>
-                  </packing>
-                </child>
+                <property name="label" translatable="yes">_Random Order</property>
+                <property name="use_underline">True</property>
+                <property name="draw_indicator">True</property>
+                <property name="tooltip-text" translatable="yes">Randomly selects another image from the same directory when the wallpaper is to cycle.</property>
               </object>
               <packing>
                 <property name="expand">False</property>
-                <property name="position">5</property>
               </packing>
             </child>
           </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="position">5</property>
+          </packing>
         </child>
       </object>
     </child>


More information about the Xfce4-commits mailing list