From 9587dfd4a006c121ceceb068b969093956b24fc0 Mon Sep 17 00:00:00 2001 From: Eric Koegel Date: Fri, 12 Apr 2013 10:53:53 +0300 Subject: Align folder and color style combo boxes Packed the folder, color, and image styles into a GtkTable to align things better. Also removed some unneeded Gtk containers from the glade file and labeled the id's to be more descriptive. --- .../xfdesktop-settings-appearance-frame-ui.glade | 503 +++++++++++---------- 1 file changed, 269 insertions(+), 234 deletions(-) diff --git a/settings/xfdesktop-settings-appearance-frame-ui.glade b/settings/xfdesktop-settings-appearance-frame-ui.glade index d8381905..8f40ae80 100644 --- a/settings/xfdesktop-settings-appearance-frame-ui.glade +++ b/settings/xfdesktop-settings-appearance-frame-ui.glade @@ -34,261 +34,296 @@ 12 6 - + True - 6 + 0 + GTK_SHADOW_NONE - + True - 12 + 6 - + True - 0 - GTK_SHADOW_NONE + 6 - + True - 6 + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + GTK_POLICY_AUTOMATIC + GTK_POLICY_AUTOMATIC + GTK_SHADOW_ETCHED_IN - + True - 6 - - - True - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - GTK_POLICY_AUTOMATIC - GTK_POLICY_AUTOMATIC - GTK_SHADOW_ETCHED_IN - - - True - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - - - - + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + + + + + True + 0 + + + + + True + 8 + 2 + 6 + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + Folder: + True + + + 0 + 1 + 0 + 1 + GTK_SHRINK + GTK_SHRINK + + + + + True + True + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + Add an image to the list + GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER + + + 1 + 2 + 0 + 1 + GTK_FILL|GTK_EXPAND + GTK_SHRINK + + + + + True + + + 4 + 5 + 0 + 1 + GTK_FILL|GTK_EXPAND + GTK_SHRINK + + + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + St_yle: + True + combo_style + + + 5 + 6 + 0 + 1 + GTK_SHRINK + GTK_SHRINK + + + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + Specify how the image will be resized to fit the screen + + + None + Centered + Tiled + Stretched + Scaled + Zoomed + Spanning Screens + + + + 6 + 7 + 0 + 1 + GTK_FILL + GTK_SHRINK + + + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + Color: + True + + + 0 + 1 + 1 + 2 + GTK_SHRINK + GTK_SHRINK + + + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + Specify the style of the color drawn behind the backdrop image + + model2 - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - 3 - - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - Folder: - True - - - False - - - - - True - 0.0 - 0.5 - - - True - True - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - Add an image to the list - GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER - - - - - - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - Specify how the image will be resized to fit the screen - - - None - Centered - Tiled - Stretched - Scaled - Zoomed - Spanning Screens - - - - False - GTK_PACK_END - - - - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - St_yle: - True - combo_style - - - False - GTK_PACK_END - - - - - False - 1 - + + + 0 + + + 1 + 2 + 1 + 2 + GTK_FILL|GTK_EXPAND + GTK_SHRINK + + + + + True + True + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_MOTION_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + Specifies the solid color, or the "left" or "top" color of the gradient + Select First Color + #151522223333 + + + + 2 + 3 + 1 + 2 + GTK_SHRINK + GTK_SHRINK + + + + + True + True + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_MOTION_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + Specifies the "right" or "bottom" color of the gradient + Select Second Color + #151522223333 + + + + 3 + 4 + 1 + 2 + GTK_SHRINK + GTK_SHRINK + + + + + True + True + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + Apply to all _workspaces + True + True + + + 6 + 7 + 1 + 2 + GTK_SHRINK + GTK_SHRINK + + + False + 1 + - - - - - - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - Color: - True - - - False - - - - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - Specify the style of the color drawn behind the backdrop image - - model2 - - - 0 - + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + 4 + + + True + True + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + _Change the background (in minutes): + Automatically select a different background from the current directory after a set number of minutes. + True + True + + + False + + + + + True + False + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + adjustment3 + Number of minutes before a different background is selected. + + + False + 2 + + + + + True + False + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + _Random Order + True + True + + + False + + + + + False + 2 + - - False - - - - - True - True - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_MOTION_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - Specifies the solid color, or the "left" or "top" color of the gradient - Select First Color - #151522223333 - - - - False - - - - - True - True - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_MOTION_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - Specifies the "right" or "bottom" color of the gradient - Select Second Color - #151522223333 - - - - False - - - - - True - True - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - Apply to all _workspaces - True - True - - - False - GTK_PACK_END - - - False - - - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - 4 - - - True - True - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - _Change the background (in minutes): - Automatically select a different background from the current directory after a set number of minutes. - True - True - - - False - - - - - True - False - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - adjustment3 - Number of minutes before a different background is selected. - - - False - 2 - - - - - True - False - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - _Random Order - True - True - - - False - - - - - False - 2 - - -- cgit v1.2.1