[Xfce4-commits] <xfdesktop:master> Use a label instead of a frame
Eric Koegel
noreply at xfce.org
Thu Nov 14 00:38:07 CET 2013
Updating branch refs/heads/master
to 2456c1974cace0cb0494638146c33a88737cf6a9 (commit)
from 46c09c3a910df3e71bf9b15f5488c8265816256c (commit)
commit 2456c1974cace0cb0494638146c33a88737cf6a9
Author: Eric Koegel <eric.koegel at gmail.com>
Date: Wed Nov 13 14:54:31 2013 +0300
Use a label instead of a frame
In the xfdesktop-settings app use just a label instead of a frame
above the icon view in the background tab. This will make it look
consistant with the other tabs.
settings/main.c | 11 +-
.../xfdesktop-settings-appearance-frame-ui.glade | 560 ++++++++++----------
settings/xfdesktop-settings-ui.glade | 1 +
3 files changed, 291 insertions(+), 281 deletions(-)
diff --git a/settings/main.c b/settings/main.c
index 050a4d5..a46d608 100644
--- a/settings/main.c
+++ b/settings/main.c
@@ -99,7 +99,7 @@ typedef struct
* wnck_screen_get_active_workspace sometimes has to return NULL. */
gint active_workspace;
- GtkWidget *frame_image_list;
+ GtkWidget *label_header;
GtkWidget *image_iconview;
GtkWidget *btn_folder;
GtkWidget *chk_apply_to_all;
@@ -702,7 +702,7 @@ xfdesktop_settings_update_iconview_frame_name(AppearancePanel *panel,
}
}
- gtk_frame_set_label(GTK_FRAME(panel->frame_image_list), buf);
+ gtk_label_set_text(GTK_LABEL(panel->label_header), buf);
g_free(workspace_name);
}
@@ -1721,9 +1721,6 @@ xfdesktop_settings_dialog_setup_tabs(GtkBuilder *main_gxml,
appearance_settings = GTK_WIDGET(gtk_builder_get_object(appearance_gxml,
"alignment_settings"));
- panel->frame_image_list = GTK_WIDGET(gtk_builder_get_object(appearance_gxml,
- "frame_image_list"));
-
/* Add the background tab widgets to the main window and don't display the
* notebook label/tab */
gtk_notebook_append_page(GTK_NOTEBOOK(appearance_container),
@@ -1731,8 +1728,8 @@ xfdesktop_settings_dialog_setup_tabs(GtkBuilder *main_gxml,
gtk_notebook_set_show_tabs(GTK_NOTEBOOK(appearance_container), FALSE);
/* icon view area */
- panel->frame_image_list = GTK_WIDGET(gtk_builder_get_object(appearance_gxml,
- "frame_image_list"));
+ panel->label_header = GTK_WIDGET(gtk_builder_get_object(appearance_gxml,
+ "label_header"));
panel->image_iconview = GTK_WIDGET(gtk_builder_get_object(appearance_gxml,
"iconview_imagelist"));
diff --git a/settings/xfdesktop-settings-appearance-frame-ui.glade b/settings/xfdesktop-settings-appearance-frame-ui.glade
index a86ed18..100abea 100644
--- a/settings/xfdesktop-settings-appearance-frame-ui.glade
+++ b/settings/xfdesktop-settings-appearance-frame-ui.glade
@@ -34,312 +34,324 @@
<property name="border_width">12</property>
<property name="left_padding">6</property>
<child>
- <object class="GtkFrame" id="frame_image_list">
+ <object class="GtkAlignment" id="top_padding_alignment">
<property name="visible">True</property>
- <property name="label_xalign">0</property>
- <property name="shadow_type">GTK_SHADOW_NONE</property>
+ <property name="top_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="GtkHBox" id="background_tab_hbox">
<property name="visible">True</property>
- <property name="spacing">6</property>
<child>
- <object class="GtkScrolledWindow" id="iconview_imagelist_scrolled_window">
+ <object class="GtkLabel" id="label_header">
<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>
<packing>
- <property name="expand">True</property>
+ <property name="expand">False</property>
<property name="position">0</property>
</packing>
</child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="position">0</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="GtkTable" id="folder_color_and_image_style_table">
+ <object class="GtkIconView" id="iconview_imagelist">
<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>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">True</property>
+ <property name="position">1</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="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="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">2</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>
- <property name="position">1</property>
</packing>
</child>
<child>
- <object class="GtkHBox" id="cycle_options_hbox">
+ <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="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="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>
</object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="position">5</property>
+ </packing>
</child>
</object>
</child>
diff --git a/settings/xfdesktop-settings-ui.glade b/settings/xfdesktop-settings-ui.glade
index fa50ac1..16f7ae8 100644
--- a/settings/xfdesktop-settings-ui.glade
+++ b/settings/xfdesktop-settings-ui.glade
@@ -139,6 +139,7 @@
<object class="GtkNotebook" id="notebook_screens">
<property name="visible">True</property>
<property name="can_focus">True</property>
+ <property name="show-border">False</property>
</object>
</child>
<child type="tab">
More information about the Xfce4-commits
mailing list