summaryrefslogtreecommitdiff
path: root/capplets/windows
diff options
context:
space:
mode:
authormbkma <[email protected]>2020-10-25 11:37:53 +0100
committerraveit65 <[email protected]>2020-11-10 21:52:39 +0100
commitb3e41fff05d2c4ecf717abb3abc3d66a51c1d650 (patch)
tree0a8050258d32f265d2f58fc3f58074bf6d30c41c /capplets/windows
parent69cf7ff68d735a2a119d15c7a7b581136d345489 (diff)
downloadmate-control-center-b3e41fff05d2c4ecf717abb3abc3d66a51c1d650.tar.bz2
mate-control-center-b3e41fff05d2c4ecf717abb3abc3d66a51c1d650.tar.xz
mcc: windows-applet: Rewrite windows-properties.ui and add new settings.
Diffstat (limited to 'capplets/windows')
-rw-r--r--capplets/windows/mate-window-properties.c150
-rw-r--r--capplets/windows/window-properties.ui876
2 files changed, 500 insertions, 526 deletions
diff --git a/capplets/windows/mate-window-properties.c b/capplets/windows/mate-window-properties.c
index ee9eb541..8cb185e0 100644
--- a/capplets/windows/mate-window-properties.c
+++ b/capplets/windows/mate-window-properties.c
@@ -40,16 +40,20 @@
#include "capplet-util.h"
#define MARCO_SCHEMA "org.mate.Marco.general"
+
+#define MARCO_CENTER_NEW_WINDOWS_KEY "center-new-windows"
+#define MARCO_ALLOW_TILING_KEY "allow-tiling"
+#define MARCO_SHOW_TAB_BORDER_KEY "show-tab-border"
+#define MARCO_BUTTON_LAYOUT_KEY "button-layout"
+#define MARCO_DOUBLE_CLICK_TITLEBAR_KEY "action-double-click-titlebar"
#define MARCO_FOCUS_KEY "focus-mode"
#define MARCO_AUTORAISE_KEY "auto-raise"
#define MARCO_AUTORAISE_DELAY_KEY "auto-raise-delay"
+#define MARCO_REDUCED_RESOURCES_KEY "reduced-resources"
#define MARCO_MOUSE_MODIFIER_KEY "mouse-button-modifier"
-#define MARCO_DOUBLE_CLICK_TITLEBAR_KEY "action-double-click-titlebar"
+
#define MARCO_COMPOSITING_MANAGER_KEY "compositing-manager"
#define MARCO_COMPOSITING_FAST_ALT_TAB_KEY "compositing-fast-alt-tab"
-#define MARCO_ALLOW_TILING_KEY "allow-tiling"
-#define MARCO_CENTER_NEW_WINDOWS_KEY "center-new-windows"
-#define MARCO_BUTTON_LAYOUT_KEY "button-layout"
#define MARCO_BUTTON_LAYOUT_RIGHT "menu:minimize,maximize,close"
#define MARCO_BUTTON_LAYOUT_LEFT "close,minimize,maximize:"
@@ -66,6 +70,7 @@ enum
ACTION_TITLEBAR_LOWER,
ACTION_TITLEBAR_MENU
};
+
enum
{
FOCUS_MODE_CLICK,
@@ -82,19 +87,24 @@ typedef struct
} MouseClickModifier;
static GtkWidget *dialog_win;
-static GtkWidget *compositing_checkbutton;
-static GtkWidget *compositing_fast_alt_tab_checkbutton;
-static GtkWidget *allow_tiling_checkbutton;
+
+/* General */
static GtkWidget *center_new_windows_checkbutton;
+static GtkWidget *allow_tiling_checkbutton;
+static GtkWidget *show_tab_border_checkbutton;
+static GtkWidget *titlebar_layout_optionmenu;
+static GtkWidget *double_click_titlebar_optionmenu;
static GtkWidget *focus_mode_checkbutton;
static GtkWidget *focus_mode_mouse_checkbutton;
static GtkWidget *autoraise_checkbutton;
-static GtkWidget *autoraise_delay_slider;
-static GtkWidget *autoraise_delay_hbox;
-static GtkWidget *double_click_titlebar_optionmenu;
-static GtkWidget *titlebar_layout_optionmenu;
+static GtkWidget *autoraise_delay_spinbutton;
+static GtkWidget *reduced_resources_checkbutton;
static GtkWidget *alt_click_vbox;
+/* Compositing Manager */
+static GtkWidget *compositing_checkbutton;
+static GtkWidget *compositing_fast_alt_tab_checkbutton;
+
static GSettings *marco_settings;
static MouseClickModifier *mouse_modifiers = NULL;
@@ -107,18 +117,20 @@ update_sensitivity (void)
{
gchar *str;
- gtk_widget_set_sensitive (GTK_WIDGET (compositing_fast_alt_tab_checkbutton),
+ gtk_widget_set_sensitive (compositing_fast_alt_tab_checkbutton,
g_settings_get_boolean (marco_settings, MARCO_COMPOSITING_MANAGER_KEY));
- gtk_widget_set_sensitive (GTK_WIDGET (focus_mode_mouse_checkbutton),
+ gtk_widget_set_sensitive (allow_tiling_checkbutton,
+ !g_settings_get_boolean (marco_settings, MARCO_REDUCED_RESOURCES_KEY));
+ gtk_widget_set_sensitive (focus_mode_mouse_checkbutton,
g_settings_get_enum (marco_settings, MARCO_FOCUS_KEY) != FOCUS_MODE_CLICK);
- gtk_widget_set_sensitive (GTK_WIDGET (autoraise_checkbutton),
+ gtk_widget_set_sensitive (autoraise_checkbutton,
g_settings_get_enum (marco_settings, MARCO_FOCUS_KEY) != FOCUS_MODE_CLICK);
- gtk_widget_set_sensitive (GTK_WIDGET (autoraise_delay_hbox),
+ gtk_widget_set_sensitive (autoraise_delay_spinbutton,
g_settings_get_enum (marco_settings, MARCO_FOCUS_KEY) != FOCUS_MODE_CLICK &&
g_settings_get_boolean (marco_settings, MARCO_AUTORAISE_KEY));
str = g_settings_get_string (marco_settings, MARCO_BUTTON_LAYOUT_KEY);
- gtk_widget_set_sensitive (GTK_WIDGET (titlebar_layout_optionmenu),
+ gtk_widget_set_sensitive (titlebar_layout_optionmenu,
g_strcmp0 (str, MARCO_BUTTON_LAYOUT_LEFT) == 0 ||
g_strcmp0 (str, MARCO_BUTTON_LAYOUT_RIGHT) == 0);
g_free (str);
@@ -167,12 +179,12 @@ mouse_focus_changed_callback (GSettings *settings,
}
static void
-autoraise_delay_value_changed_callback (GtkWidget *slider,
- void *data)
+autoraise_delay_spinbutton_value_callback (GtkWidget *spinbutton,
+ void *data)
{
g_settings_set_int (marco_settings,
MARCO_AUTORAISE_DELAY_KEY,
- gtk_range_get_value (GTK_RANGE (slider)) * 1000);
+ gtk_spin_button_get_value (GTK_SPIN_BUTTON (spinbutton)) * 1000);
}
static void
@@ -292,7 +304,6 @@ response_cb (GtkWidget *dialog_win,
int
main (int argc, char **argv)
{
- GError *error = NULL;
GtkBuilder *builder;
GdkScreen *screen;
GtkWidget *nb;
@@ -315,21 +326,12 @@ main (int argc, char **argv)
return 1;
}
- marco_settings = g_settings_new (MARCO_SCHEMA);
-
- builder = gtk_builder_new ();
- if (gtk_builder_add_from_resource (builder, "/org/mate/mcc/windows/window-properties.ui", &error) == 0) {
- g_warning ("Could not load UI: %s", error->message);
- g_error_free (error);
- g_object_unref (marco_settings);
- g_object_unref (builder);
- return -1;
- }
+ builder = gtk_builder_new_from_resource ("/org/mate/mcc/windows/window-properties.ui");
gtk_builder_add_callback_symbols (builder,
"on_dialog_win_response", G_CALLBACK (response_cb),
- "on_autoraise_delay_slider_value_changed", G_CALLBACK (autoraise_delay_value_changed_callback),
"on_double_click_titlebar_optionmenu_changed", G_CALLBACK (double_click_titlebar_changed_callback),
+ "on_autoraise_delay_spinbutton_value_changed", G_CALLBACK (autoraise_delay_spinbutton_value_callback),
"on_titlebar_layout_optionmenu_changed", G_CALLBACK (titlebar_layout_changed_callback),
"on_focus_mode_checkbutton_toggled", G_CALLBACK (mouse_focus_toggled_callback),
"on_focus_mode_mouse_checkbutton_toggled", G_CALLBACK (mouse_focus_toggled_callback),
@@ -337,46 +339,42 @@ main (int argc, char **argv)
gtk_builder_connect_signals (builder, NULL);
+ #define GET_WIDGET(x) GTK_WIDGET(gtk_builder_get_object(builder, x))
+
/* Window */
- dialog_win = GTK_WIDGET (gtk_builder_get_object (builder, "dialog_win"));
+ dialog_win = GET_WIDGET ("dialog_win");
/* Notebook */
- nb = GTK_WIDGET (gtk_builder_get_object (builder, "nb"));
+ nb = GET_WIDGET ("nb");
gtk_widget_add_events (nb, GDK_SCROLL_MASK);
g_signal_connect (nb,
"scroll-event",
G_CALLBACK (capplet_notebook_scroll_event_cb),
NULL);
- /* Compositing manager */
- compositing_checkbutton = GTK_WIDGET (gtk_builder_get_object (builder, "compositing_checkbutton"));
- compositing_fast_alt_tab_checkbutton = GTK_WIDGET (gtk_builder_get_object (builder, "compositing_fast_alt_tab_checkbutton"));
-
- /* Titlebar buttons */
- titlebar_layout_optionmenu = GTK_WIDGET (gtk_builder_get_object (builder, "titlebar_layout_optionmenu"));
-
- /* New Windows */
- center_new_windows_checkbutton = GTK_WIDGET (gtk_builder_get_object (builder, "center_new_windows_checkbutton"));
-
- /* Window Snapping */
- allow_tiling_checkbutton = GTK_WIDGET (gtk_builder_get_object (builder, "allow_tiling_checkbutton"));
-
- /* Window Selection */
- focus_mode_checkbutton = GTK_WIDGET (gtk_builder_get_object (builder, "focus_mode_checkbutton"));
- focus_mode_mouse_checkbutton = GTK_WIDGET (gtk_builder_get_object (builder, "focus_mode_mouse_checkbutton"));
- autoraise_checkbutton = GTK_WIDGET (gtk_builder_get_object (builder, "autoraise_checkbutton"));
- autoraise_delay_hbox = GTK_WIDGET (gtk_builder_get_object (builder, "autoraise_delay_hbox"));
- autoraise_delay_slider = GTK_WIDGET (gtk_builder_get_object (builder, "autoraise_delay_slider"));
-
- /* Titlebar Action */
- double_click_titlebar_optionmenu = GTK_WIDGET (gtk_builder_get_object (builder, "double_click_titlebar_optionmenu"));
-
- /* Movement Key */
- alt_click_vbox = GTK_WIDGET (gtk_builder_get_object (builder, "alt_click_vbox"));
-
+ /* General */
+ center_new_windows_checkbutton = GET_WIDGET ("center_new_windows_checkbutton");
+ allow_tiling_checkbutton = GET_WIDGET ("allow_tiling_checkbutton");
+ show_tab_border_checkbutton = GET_WIDGET ("show_tab_border_checkbutton");
+ titlebar_layout_optionmenu = GET_WIDGET ("titlebar_layout_optionmenu");
+ double_click_titlebar_optionmenu = GET_WIDGET ("double_click_titlebar_optionmenu");
+ focus_mode_checkbutton = GET_WIDGET ("focus_mode_checkbutton");
+ focus_mode_mouse_checkbutton = GET_WIDGET ("focus_mode_mouse_checkbutton");
+ autoraise_checkbutton = GET_WIDGET ("autoraise_checkbutton");
+ autoraise_delay_spinbutton = GET_WIDGET ("autoraise_delay_spinbutton");
+ reduced_resources_checkbutton = GET_WIDGET ("reduced_resources_checkbutton");
+ alt_click_vbox = GET_WIDGET ("alt_click_vbox");
+
+ /* Composition Manager */
+ compositing_checkbutton = GET_WIDGET ("compositing_checkbutton");
+ compositing_fast_alt_tab_checkbutton = GET_WIDGET ("compositing_fast_alt_tab_checkbutton");
g_object_unref (builder);
+ #undef GET_WIDGET
+
+ /* Load settings */
+ marco_settings = g_settings_new (MARCO_SCHEMA);
reload_mouse_modifiers ();
@@ -389,32 +387,45 @@ main (int argc, char **argv)
g_settings_get_enum (marco_settings, MARCO_DOUBLE_CLICK_TITLEBAR_KEY));
set_alt_click_value ();
- gtk_range_set_value (GTK_RANGE (autoraise_delay_slider),
- g_settings_get_int (marco_settings, MARCO_AUTORAISE_DELAY_KEY) / 1000.0);
+
gtk_combo_box_set_active (GTK_COMBO_BOX (double_click_titlebar_optionmenu),
g_settings_get_enum (marco_settings, MARCO_DOUBLE_CLICK_TITLEBAR_KEY));
+ /* General */
g_settings_bind (marco_settings,
- MARCO_COMPOSITING_MANAGER_KEY,
- compositing_checkbutton,
+ MARCO_CENTER_NEW_WINDOWS_KEY,
+ center_new_windows_checkbutton,
"active",
G_SETTINGS_BIND_DEFAULT);
g_settings_bind (marco_settings,
- MARCO_COMPOSITING_FAST_ALT_TAB_KEY,
- compositing_fast_alt_tab_checkbutton,
+ MARCO_ALLOW_TILING_KEY,
+ allow_tiling_checkbutton,
"active",
G_SETTINGS_BIND_DEFAULT);
g_settings_bind (marco_settings,
- MARCO_ALLOW_TILING_KEY,
- allow_tiling_checkbutton,
+ MARCO_SHOW_TAB_BORDER_KEY,
+ show_tab_border_checkbutton,
"active",
G_SETTINGS_BIND_DEFAULT);
g_settings_bind (marco_settings,
- MARCO_CENTER_NEW_WINDOWS_KEY,
- center_new_windows_checkbutton,
+ MARCO_REDUCED_RESOURCES_KEY,
+ reduced_resources_checkbutton,
+ "active",
+ G_SETTINGS_BIND_DEFAULT);
+
+ /* Composition Manager */
+ g_settings_bind (marco_settings,
+ MARCO_COMPOSITING_MANAGER_KEY,
+ compositing_checkbutton,
+ "active",
+ G_SETTINGS_BIND_DEFAULT);
+
+ g_settings_bind (marco_settings,
+ MARCO_COMPOSITING_FAST_ALT_TAB_KEY,
+ compositing_fast_alt_tab_checkbutton,
"active",
G_SETTINGS_BIND_DEFAULT);
@@ -427,7 +438,6 @@ main (int argc, char **argv)
"active",
G_SETTINGS_BIND_DEFAULT);
-
g_signal_connect (G_OBJECT (dialog_win), "destroy",
G_CALLBACK (gtk_main_quit), NULL);
diff --git a/capplets/windows/window-properties.ui b/capplets/windows/window-properties.ui
index 67d37b6f..0f634059 100644
--- a/capplets/windows/window-properties.ui
+++ b/capplets/windows/window-properties.ui
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.22.0
+<!-- Generated with glade 3.38.1
window-properties.ui - MATE window properties dialog
Copyright (C) MATE Developers
@@ -21,61 +21,60 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
Author: Robert Buj
-->
-<interface>
+<interface domain="">
<requires lib="gtk+" version="3.22"/>
<!-- interface-license-type gplv2 -->
<!-- interface-name window-properties.ui -->
<!-- interface-description MATE window properties dialog -->
<!-- interface-copyright MATE Developers -->
<!-- interface-authors Robert Buj -->
- <object class="GtkAdjustment" id="autoraise_delay_slider_adj">
+ <object class="GtkAdjustment" id="adjustment1">
<property name="upper">10</property>
- <property name="step_increment">0.20000000000000001</property>
+ <property name="value">1</property>
+ <property name="step-increment">0.1</property>
+ <property name="page-increment">10</property>
</object>
<object class="GtkImage" id="image_help_browser">
<property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="icon_name">help-browser</property>
+ <property name="can-focus">False</property>
+ <property name="icon-name">help-browser</property>
</object>
<object class="GtkImage" id="image_window_close">
<property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="icon_name">window-close</property>
+ <property name="can-focus">False</property>
+ <property name="icon-name">window-close</property>
</object>
<object class="GtkDialog" id="dialog_win">
- <property name="can_focus">False</property>
+ <property name="can-focus">False</property>
<property name="title" translatable="yes">Window Preferences</property>
<property name="resizable">False</property>
<property name="modal">True</property>
- <property name="icon_name">preferences-system-windows</property>
- <property name="type_hint">dialog</property>
+ <property name="icon-name">preferences-system-windows</property>
+ <property name="type-hint">normal</property>
<signal name="response" handler="on_dialog_win_response" swapped="no"/>
<child internal-child="vbox">
- <object class="GtkBox">
- <property name="can_focus">False</property>
- <property name="margin_start">12</property>
- <property name="margin_end">12</property>
- <property name="margin_top">12</property>
- <property name="margin_bottom">12</property>
+ <object class="GtkBox" id="main_vbox">
+ <property name="visible">True</property>
+ <property name="can-focus">False</property>
<property name="orientation">vertical</property>
- <property name="spacing">12</property>
<child internal-child="action_area">
<object class="GtkButtonBox">
- <property name="can_focus">False</property>
- <property name="layout_style">end</property>
+ <property name="visible">True</property>
+ <property name="can-focus">False</property>
+ <property name="layout-style">end</property>
<child>
<object class="GtkButton" id="button_help_browser">
<property name="label" translatable="yes">_Help</property>
<property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">True</property>
+ <property name="can-focus">True</property>
+ <property name="receives-default">True</property>
<property name="image">image_help_browser</property>
- <property name="use_underline">True</property>
- <property name="always_show_image">True</property>
+ <property name="use-underline">True</property>
+ <property name="always-show-image">True</property>
</object>
<packing>
- <property name="expand">True</property>
- <property name="fill">True</property>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
<property name="position">0</property>
</packing>
</child>
@@ -83,15 +82,15 @@ Author: Robert Buj
<object class="GtkButton" id="button_window_close">
<property name="label" translatable="yes">_Close</property>
<property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">True</property>
+ <property name="can-focus">True</property>
+ <property name="receives-default">True</property>
<property name="image">image_window_close</property>
- <property name="use_underline">True</property>
- <property name="always_show_image">True</property>
+ <property name="use-underline">True</property>
+ <property name="always-show-image">True</property>
</object>
<packing>
- <property name="expand">True</property>
- <property name="fill">True</property>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
<property name="position">1</property>
</packing>
</child>
@@ -99,113 +98,108 @@ Author: Robert Buj
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
+ <property name="pack-type">end</property>
<property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkNotebook" id="nb">
<property name="visible">True</property>
- <property name="can_focus">True</property>
+ <property name="can-focus">True</property>
+ <property name="border-width">6</property>
<child>
- <object class="GtkBox" id="general_vbox">
+ <object class="GtkBox" id="windows_vbox">
<property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="margin_start">12</property>
- <property name="margin_end">12</property>
- <property name="margin_top">12</property>
- <property name="margin_bottom">12</property>
+ <property name="can-focus">False</property>
+ <property name="border-width">12</property>
<property name="orientation">vertical</property>
- <property name="spacing">12</property>
+ <property name="spacing">18</property>
<child>
- <object class="GtkFrame">
+ <object class="GtkBox" id="position_and_behaviour_main_vbox">
<property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label_xalign">0</property>
- <property name="shadow_type">none</property>
+ <property name="can-focus">False</property>
+ <property name="orientation">vertical</property>
+ <property name="spacing">6</property>
<child>
- <object class="GtkAlignment">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="left_padding">12</property>
- <child>
- <object class="GtkBox">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="orientation">vertical</property>
- <property name="spacing">6</property>
- <child>
- <object class="GtkCheckButton" id="compositing_checkbutton">
- <property name="label" translatable="yes">Enable software _compositing window manager</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="use_underline">True</property>
- <property name="draw_indicator">True</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkCheckButton" id="compositing_fast_alt_tab_checkbutton">
- <property name="label" translatable="yes">Disable _thumbnails in Alt-Tab</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="use_underline">True</property>
- <property name="draw_indicator">True</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">1</property>
- </packing>
- </child>
- </object>
- </child>
- </object>
- </child>
- <child type="label">
- <object class="GtkLabel">
+ <object class="GtkLabel" id="position_and_behavior_label">
<property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="margin_bottom">12</property>
- <property name="label" translatable="yes">Compositing Manager</property>
+ <property name="can-focus">False</property>
+ <property name="halign">start</property>
+ <property name="label" translatable="yes">Position and Behaviour</property>
<attributes>
<attribute name="weight" value="bold"/>
</attributes>
</object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
</child>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkFrame">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label_xalign">0</property>
- <property name="shadow_type">none</property>
<child>
- <object class="GtkAlignment">
+ <object class="GtkBox" id="position_and_behavior_vbox">
<property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="left_padding">12</property>
+ <property name="can-focus">False</property>
+ <property name="margin-start">6</property>
+ <property name="orientation">vertical</property>
+ <property name="spacing">6</property>
+ <child>
+ <object class="GtkCheckButton" id="center_new_windows_checkbutton">
+ <property name="label" translatable="yes">Center _new windows</property>
+ <property name="visible">True</property>
+ <property name="can-focus">True</property>
+ <property name="receives-default">False</property>
+ <property name="use-underline">True</property>
+ <property name="draw-indicator">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkCheckButton" id="allow_tiling_checkbutton">
+ <property name="label" translatable="yes">Enable window _tiling</property>
+ <property name="visible">True</property>
+ <property name="can-focus">True</property>
+ <property name="receives-default">False</property>
+ <property name="use-underline">True</property>
+ <property name="draw-indicator">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">2</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkCheckButton" id="show_tab_border_checkbutton">
+ <property name="label" translatable="yes">Show window border in Alt-Tab</property>
+ <property name="visible">True</property>
+ <property name="can-focus">True</property>
+ <property name="receives-default">False</property>
+ <property name="use-underline">True</property>
+ <property name="draw-indicator">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">3</property>
+ </packing>
+ </child>
<child>
- <object class="GtkBox">
+ <object class="GtkBox" id="position_of_titlebar_buttons_hbox">
<property name="visible">True</property>
- <property name="can_focus">False</property>
+ <property name="can-focus">False</property>
<property name="spacing">6</property>
<child>
- <object class="GtkLabel">
+ <object class="GtkLabel" id="position_of_titlebar_buttons_label">
<property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label" translatable="yes">Position:</property>
+ <property name="can-focus">False</property>
+ <property name="label" translatable="yes">_Position of titlebar buttons:</property>
+ <property name="use-underline">True</property>
+ <property name="mnemonic-widget">titlebar_layout_optionmenu</property>
</object>
<packing>
<property name="expand">False</property>
@@ -216,7 +210,7 @@ Author: Robert Buj
<child>
<object class="GtkComboBoxText" id="titlebar_layout_optionmenu">
<property name="visible">True</property>
- <property name="can_focus">False</property>
+ <property name="can-focus">False</property>
<items>
<item translatable="yes">Right</item>
<item translatable="yes">Left</item>
@@ -230,74 +224,24 @@ Author: Robert Buj
</packing>
</child>
</object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">7</property>
+ </packing>
</child>
- </object>
- </child>
- <child type="label">
- <object class="GtkLabel">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="margin_bottom">12</property>
- <property name="label" translatable="yes">Titlebar Buttons</property>
- <attributes>
- <attribute name="weight" value="bold"/>
- </attributes>
- </object>
- </child>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">1</property>
- </packing>
- </child>
- </object>
- </child>
- <child type="tab">
- <object class="GtkLabel">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label" translatable="yes">General</property>
- </object>
- <packing>
- <property name="tab_fill">False</property>
- </packing>
- </child>
- <child>
- <object class="GtkBox" id="behaviour_vbox">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="margin_start">12</property>
- <property name="margin_end">12</property>
- <property name="margin_top">12</property>
- <property name="margin_bottom">12</property>
- <property name="orientation">vertical</property>
- <property name="spacing">12</property>
- <child>
- <object class="GtkFrame">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label_xalign">0</property>
- <property name="shadow_type">none</property>
- <child>
- <object class="GtkAlignment">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="left_padding">12</property>
<child>
- <object class="GtkBox">
+ <object class="GtkBox" id="double_click_titlebar_action_hbox">
<property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="orientation">vertical</property>
+ <property name="can-focus">False</property>
+ <property name="spacing">6</property>
<child>
- <object class="GtkCheckButton" id="focus_mode_checkbutton">
- <property name="label" translatable="yes">_Select windows when the mouse moves over them</property>
+ <object class="GtkLabel" id="double_click_titlebar_label">
<property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="use_underline">True</property>
- <property name="draw_indicator">True</property>
- <signal name="toggled" handler="on_focus_mode_checkbutton_toggled" swapped="no"/>
+ <property name="can-focus">False</property>
+ <property name="label" translatable="yes">_Double-click titlebar action:</property>
+ <property name="use-underline">True</property>
+ <property name="mnemonic-widget">double_click_titlebar_optionmenu</property>
</object>
<packing>
<property name="expand">False</property>
@@ -306,111 +250,18 @@ Author: Robert Buj
</packing>
</child>
<child>
- <object class="GtkBox">
+ <object class="GtkComboBoxText" id="double_click_titlebar_optionmenu">
<property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="margin_start">12</property>
- <property name="margin_end">12</property>
- <property name="margin_top">12</property>
- <property name="orientation">vertical</property>
- <property name="spacing">6</property>
- <child>
- <object class="GtkCheckButton" id="focus_mode_mouse_checkbutton">
- <property name="label" translatable="yes">U_nselect windows when the mouse leaves them</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="use_underline">True</property>
- <property name="draw_indicator">True</property>
- <signal name="toggled" handler="on_focus_mode_mouse_checkbutton_toggled" swapped="no"/>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkBox">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="orientation">vertical</property>
- <child>
- <object class="GtkCheckButton" id="autoraise_checkbutton">
- <property name="label" translatable="yes">_Raise selected windows after an interval</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="use_underline">True</property>
- <property name="draw_indicator">True</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkBox" id="autoraise_delay_hbox">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="margin_start">6</property>
- <property name="margin_end">6</property>
- <property name="margin_top">6</property>
- <property name="spacing">6</property>
- <child>
- <object class="GtkAccelLabel">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label" translatable="yes">_Interval before raising:</property>
- <property name="use_underline">True</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkScale" id="autoraise_delay_slider">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="adjustment">autoraise_delay_slider_adj</property>
- <property name="round_digits">1</property>
- <signal name="value-changed" handler="on_autoraise_delay_slider_value_changed" swapped="no"/>
- </object>
- <packing>
- <property name="expand">True</property>
- <property name="fill">True</property>
- <property name="position">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label" translatable="yes">seconds</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">2</property>
- </packing>
- </child>
- </object>
- <packing>
- <property name="expand">True</property>
- <property name="fill">True</property>
- <property name="position">1</property>
- </packing>
- </child>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">1</property>
- </packing>
- </child>
+ <property name="can-focus">False</property>
+ <items>
+ <item translatable="yes">Roll up</item>
+ <item translatable="yes">Maximize</item>
+ <item translatable="yes">Maximize Horizontally</item>
+ <item translatable="yes">Maximize Vertically</item>
+ <item translatable="yes">Minimize</item>
+ <item translatable="yes">None</item>
+ </items>
+ <signal name="changed" handler="on_double_click_titlebar_optionmenu_changed" swapped="no"/>
</object>
<packing>
<property name="expand">False</property>
@@ -419,19 +270,18 @@ Author: Robert Buj
</packing>
</child>
</object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">8</property>
+ </packing>
</child>
</object>
- </child>
- <child type="label">
- <object class="GtkLabel">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="margin_bottom">12</property>
- <property name="label" translatable="yes">Window Selection</property>
- <attributes>
- <attribute name="weight" value="bold"/>
- </attributes>
- </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">2</property>
+ </packing>
</child>
</object>
<packing>
@@ -441,270 +291,381 @@ Author: Robert Buj
</packing>
</child>
<child>
- <object class="GtkFrame">
+ <object class="GtkBox" id="window_selection_main_vbox">
<property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label_xalign">0</property>
- <property name="shadow_type">none</property>
+ <property name="can-focus">False</property>
+ <property name="orientation">vertical</property>
+ <property name="spacing">6</property>
+ <child>
+ <object class="GtkLabel" id="window_selection_label">
+ <property name="visible">True</property>
+ <property name="can-focus">False</property>
+ <property name="halign">start</property>
+ <property name="label" translatable="yes">Window Selection</property>
+ <attributes>
+ <attribute name="weight" value="bold"/>
+ </attributes>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
<child>
- <object class="GtkAlignment">
+ <object class="GtkBox" id="window_selection_vbox">
<property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="left_padding">12</property>
+ <property name="can-focus">False</property>
+ <property name="margin-start">6</property>
+ <property name="orientation">vertical</property>
+ <property name="spacing">6</property>
+ <child>
+ <object class="GtkCheckButton" id="focus_mode_checkbutton">
+ <property name="label" translatable="yes">_Select windows when the mouse moves over them</property>
+ <property name="visible">True</property>
+ <property name="can-focus">True</property>
+ <property name="receives-default">False</property>
+ <property name="use-underline">True</property>
+ <property name="draw-indicator">True</property>
+ <signal name="toggled" handler="on_focus_mode_checkbutton_toggled" swapped="no"/>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkCheckButton" id="focus_mode_mouse_checkbutton">
+ <property name="label" translatable="yes">U_nselect windows when the mouse leaves them</property>
+ <property name="visible">True</property>
+ <property name="can-focus">True</property>
+ <property name="receives-default">False</property>
+ <property name="margin-start">12</property>
+ <property name="use-underline">True</property>
+ <property name="draw-indicator">True</property>
+ <signal name="toggled" handler="on_focus_mode_mouse_checkbutton_toggled" swapped="no"/>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
<child>
- <object class="GtkBox">
+ <object class="GtkBox" id="autoraise_delay_hbox">
<property name="visible">True</property>
- <property name="can_focus">False</property>
+ <property name="can-focus">False</property>
+ <property name="margin-start">12</property>
<property name="spacing">6</property>
<child>
- <object class="GtkAccelLabel">
+ <object class="GtkCheckButton" id="autoraise_checkbutton">
+ <property name="label" translatable="yes">_Raise selected windows after</property>
<property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label" translatable="yes">_Double-click titlebar to perform this action:</property>
- <property name="use_underline">True</property>
+ <property name="can-focus">True</property>
+ <property name="receives-default">False</property>
+ <property name="use-underline">True</property>
+ <property name="draw-indicator">True</property>
</object>
<packing>
<property name="expand">False</property>
- <property name="fill">True</property>
+ <property name="fill">False</property>
<property name="position">0</property>
</packing>
</child>
<child>
- <object class="GtkComboBoxText" id="double_click_titlebar_optionmenu">
+ <object class="GtkSpinButton" id="autoraise_delay_spinbutton">
<property name="visible">True</property>
- <property name="can_focus">False</property>
- <items>
- <item translatable="yes">Roll up</item>
- <item translatable="yes">Maximize</item>
- <item translatable="yes">Maximize Horizontally</item>
- <item translatable="yes">Maximize Vertically</item>
- <item translatable="yes">Minimize</item>
- <item translatable="yes">None</item>
- </items>
- <signal name="changed" handler="on_double_click_titlebar_optionmenu_changed" swapped="no"/>
+ <property name="can-focus">True</property>
+ <property name="text" translatable="yes">1,0</property>
+ <property name="adjustment">adjustment1</property>
+ <property name="climb-rate">0.1</property>
+ <property name="digits">1</property>
+ <property name="snap-to-ticks">True</property>
+ <property name="numeric">True</property>
+ <property name="value">1</property>
+ <signal name="value-changed" handler="on_autoraise_delay_spinbutton_value_changed" swapped="no"/>
</object>
<packing>
<property name="expand">False</property>
- <property name="fill">True</property>
+ <property name="fill">False</property>
<property name="position">1</property>
</packing>
</child>
+ <child>
+ <object class="GtkLabel">
+ <property name="visible">True</property>
+ <property name="can-focus">False</property>
+ <property name="label" translatable="yes">seconds</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">2</property>
+ </packing>
+ </child>
</object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">2</property>
+ </packing>
</child>
</object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
</child>
- <child type="label">
- <object class="GtkLabel">
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkBox" id="performance_main_vbox">
+ <property name="visible">True</property>
+ <property name="can-focus">False</property>
+ <property name="orientation">vertical</property>
+ <property name="spacing">6</property>
+ <child>
+ <object class="GtkLabel" id="performance_label">
<property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="margin_bottom">12</property>
- <property name="label" translatable="yes">Titlebar Action</property>
+ <property name="can-focus">False</property>
+ <property name="halign">start</property>
+ <property name="label" translatable="yes">Performance</property>
<attributes>
<attribute name="weight" value="bold"/>
</attributes>
</object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkBox" id="performance_vbox">
+ <property name="visible">True</property>
+ <property name="can-focus">False</property>
+ <property name="margin-start">6</property>
+ <property name="orientation">vertical</property>
+ <property name="spacing">6</property>
+ <child>
+ <object class="GtkCheckButton" id="reduced_resources_checkbutton">
+ <property name="label" translatable="yes">Use reduced resources</property>
+ <property name="visible">True</property>
+ <property name="can-focus">True</property>
+ <property name="receives-default">False</property>
+ <property name="use-underline">True</property>
+ <property name="draw-indicator">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">2</property>
+ </packing>
</child>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
- <property name="position">1</property>
+ <property name="position">2</property>
</packing>
</child>
<child>
- <object class="GtkFrame">
+ <object class="GtkBox" id="movement_key_main_vbox">
<property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label_xalign">0</property>
- <property name="shadow_type">none</property>
+ <property name="can-focus">False</property>
+ <property name="orientation">vertical</property>
+ <property name="spacing">6</property>
+ <child>
+ <object class="GtkLabel" id="movement_key__label">
+ <property name="visible">True</property>
+ <property name="can-focus">False</property>
+ <property name="halign">start</property>
+ <property name="label" translatable="yes">Movement Key</property>
+ <attributes>
+ <attribute name="weight" value="bold"/>
+ </attributes>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
<child>
- <object class="GtkAlignment">
+ <object class="GtkBox" id="movement_key_vbox">
<property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="left_padding">12</property>
+ <property name="can-focus">False</property>
+ <property name="margin-start">6</property>
+ <property name="orientation">vertical</property>
+ <property name="spacing">6</property>
+ <child>
+ <object class="GtkLabel">
+ <property name="visible">True</property>
+ <property name="can-focus">False</property>
+ <property name="label" translatable="yes">To move a window, press-and-hold this key then grab the window:</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
<child>
- <object class="GtkBox">
+ <object class="GtkBox" id="alt_click_vbox">
<property name="visible">True</property>
- <property name="can_focus">False</property>
+ <property name="can-focus">False</property>
<property name="orientation">vertical</property>
<property name="spacing">6</property>
<child>
- <object class="GtkLabel">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label" translatable="yes">To move a window, press-and-hold this key then grab the window:</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkBox" id="alt_click_vbox">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="orientation">vertical</property>
- <property name="spacing">6</property>
- <child>
- <placeholder/>
- </child>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">1</property>
- </packing>
+ <placeholder/>
</child>
</object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
</child>
</object>
- </child>
- <child type="label">
- <object class="GtkLabel">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="margin_bottom">12</property>
- <property name="label" translatable="yes">Movement Key</property>
- <attributes>
- <attribute name="weight" value="bold"/>
- </attributes>
- </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">2</property>
+ </packing>
</child>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
- <property name="position">2</property>
+ <property name="position">3</property>
</packing>
</child>
</object>
- <packing>
- <property name="position">1</property>
- </packing>
</child>
<child type="tab">
- <object class="GtkLabel">
+ <object class="GtkLabel" id="general_label">
<property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label" translatable="yes">Behaviour</property>
+ <property name="can-focus">False</property>
+ <property name="label" translatable="yes">General</property>
</object>
<packing>
- <property name="position">1</property>
- <property name="tab_fill">False</property>
+ <property name="tab-fill">False</property>
</packing>
</child>
<child>
- <object class="GtkBox" id="placement_vbox">
+ <object class="GtkBox" id="compositing_manager_vbox">
<property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="margin_start">12</property>
- <property name="margin_end">12</property>
- <property name="margin_top">12</property>
- <property name="margin_bottom">12</property>
+ <property name="can-focus">False</property>
+ <property name="border-width">13</property>
<property name="orientation">vertical</property>
- <property name="spacing">12</property>
+ <property name="spacing">18</property>
<child>
- <object class="GtkFrame">
+ <object class="GtkBox" id="software_compositing_main_vbox">
<property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label_xalign">0</property>
- <property name="shadow_type">none</property>
+ <property name="can-focus">False</property>
+ <property name="orientation">vertical</property>
+ <property name="spacing">6</property>
<child>
- <object class="GtkAlignment">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="left_padding">12</property>
- <child>
- <object class="GtkCheckButton" id="center_new_windows_checkbutton">
- <property name="label" translatable="yes">Center _new windows</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="use_underline">True</property>
- <property name="draw_indicator">True</property>
- </object>
- </child>
- </object>
- </child>
- <child type="label">
- <object class="GtkLabel">
+ <object class="GtkLabel" id="software_compositing_label">
<property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="margin_bottom">12</property>
- <property name="label" translatable="yes">New Windows</property>
+ <property name="can-focus">False</property>
+ <property name="halign">start</property>
+ <property name="label" translatable="yes">Software Compositing</property>
<attributes>
<attribute name="weight" value="bold"/>
</attributes>
</object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
</child>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkFrame">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label_xalign">0</property>
- <property name="shadow_type">none</property>
<child>
- <object class="GtkAlignment">
+ <object class="GtkBox" id="software_compositing_vbox">
<property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="left_padding">12</property>
+ <property name="can-focus">False</property>
+ <property name="margin-start">6</property>
+ <property name="orientation">vertical</property>
+ <property name="spacing">6</property>
<child>
- <object class="GtkCheckButton" id="allow_tiling_checkbutton">
- <property name="label" translatable="yes">Enable window _tiling</property>
+ <object class="GtkCheckButton" id="compositing_checkbutton">
+ <property name="label" translatable="yes">Enable software _compositing window manager</property>
<property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="use_underline">True</property>
- <property name="draw_indicator">True</property>
+ <property name="can-focus">True</property>
+ <property name="receives-default">False</property>
+ <property name="use-underline">True</property>
+ <property name="draw-indicator">True</property>
</object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">2</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkCheckButton" id="compositing_fast_alt_tab_checkbutton">
+ <property name="label" translatable="yes">Disable _thumbnails in Alt-Tab</property>
+ <property name="visible">True</property>
+ <property name="can-focus">True</property>
+ <property name="receives-default">False</property>
+ <property name="margin-start">12</property>
+ <property name="use-underline">True</property>
+ <property name="draw-indicator">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">3</property>
+ </packing>
</child>
</object>
- </child>
- <child type="label">
- <object class="GtkLabel">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="margin_bottom">12</property>
- <property name="label" translatable="yes">Window Snapping</property>
- <attributes>
- <attribute name="weight" value="bold"/>
- </attributes>
- </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
</child>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
- <property name="position">1</property>
+ <property name="position">0</property>
</packing>
</child>
</object>
<packing>
- <property name="position">2</property>
+ <property name="position">1</property>
</packing>
</child>
<child type="tab">
- <object class="GtkLabel">
+ <object class="GtkLabel" id="compositing_manager_label">
<property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label" translatable="yes">Placement</property>
+ <property name="can-focus">False</property>
+ <property name="label" translatable="yes">Compositing Manager</property>
</object>
<packing>
- <property name="position">2</property>
- <property name="tab_fill">False</property>
+ <property name="position">1</property>
+ <property name="tab-fill">False</property>
</packing>
</child>
</object>
<packing>
- <property name="expand">True</property>
+ <property name="expand">False</property>
<property name="fill">True</property>
<property name="position">1</property>
</packing>
@@ -715,8 +676,11 @@ Author: Robert Buj
<action-widget response="-11">button_help_browser</action-widget>
<action-widget response="-7">button_window_close</action-widget>
</action-widgets>
- <child type="titlebar">
- <placeholder/>
- </child>
+ </object>
+ <object class="GtkSizeGroup" id="sizegroup_position_behaviour">
+ <widgets>
+ <widget name="position_of_titlebar_buttons_label"/>
+ <widget name="double_click_titlebar_label"/>
+ </widgets>
</object>
</interface>