diff options
| -rw-r--r-- | capplets/windows/mate-window-properties.c | 9 | ||||
| -rw-r--r-- | capplets/windows/mate-window-properties.ui | 68 |
2 files changed, 74 insertions, 3 deletions
diff --git a/capplets/windows/mate-window-properties.c b/capplets/windows/mate-window-properties.c index 6e3bb77e..b2697bd6 100644 --- a/capplets/windows/mate-window-properties.c +++ b/capplets/windows/mate-window-properties.c @@ -49,6 +49,7 @@ #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_SIDE_BY_SIDE_TILING_KEY "side-by-side-tiling" /* keep following enums in sync with marco */ enum @@ -80,6 +81,7 @@ typedef struct static GtkWidget *dialog_win; static GObject *compositing_checkbutton; static GObject *compositing_fast_alt_tab_checkbutton; +static GObject *side_by_side_tiling_checkbutton; static GObject *focus_mode_checkbutton; static GObject *autoraise_checkbutton; static GObject *autoraise_delay_slider; @@ -285,6 +287,7 @@ main (int argc, char **argv) dialog_win = GTK_WIDGET (gtk_builder_get_object (builder, "main-dialog")); compositing_checkbutton = gtk_builder_get_object (builder, "compositing-manager-checkbutton"); compositing_fast_alt_tab_checkbutton = gtk_builder_get_object (builder, "compositing-fast-alt-tab-checkbutton"); + side_by_side_tiling_checkbutton = gtk_builder_get_object (builder, "side-by-side-tiling"); focus_mode_checkbutton = gtk_builder_get_object (builder, "focus-mode-checkbutton"); autoraise_checkbutton = gtk_builder_get_object (builder, "autoraise-checkbutton"); autoraise_delay_slider = gtk_builder_get_object (builder, "autoraise-delay-slider"); @@ -333,6 +336,12 @@ main (int argc, char **argv) "active", G_SETTINGS_BIND_DEFAULT); + g_settings_bind (marco_settings, + MARCO_SIDE_BY_SIDE_TILING_KEY, + side_by_side_tiling_checkbutton, + "active", + G_SETTINGS_BIND_DEFAULT); + g_signal_connect (focus_mode_checkbutton, "toggled", G_CALLBACK (mouse_focus_toggled_callback), NULL); g_signal_connect (marco_settings, "changed::" MARCO_FOCUS_KEY, diff --git a/capplets/windows/mate-window-properties.ui b/capplets/windows/mate-window-properties.ui index 1029fed9..22d658d4 100644 --- a/capplets/windows/mate-window-properties.ui +++ b/capplets/windows/mate-window-properties.ui @@ -11,6 +11,7 @@ <object class="GtkVBox" id="dialog-vbox1"> <property name="visible">True</property> <property name="spacing">2</property> + <child> <object class="GtkVBox" id="vbox1"> <property name="visible">True</property> @@ -106,6 +107,66 @@ <property name="position">0</property> </packing> </child> + + <child> + <object class="GtkVBox" id="vbox12"> + <property name="visible">True</property> + <property name="spacing">6</property> + <child> + <object class="GtkLabel" id="label8"> + <property name="visible">True</property> + <property name="xalign">0</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">False</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkAlignment" id="alignment8"> + <property name="visible">True</property> + <property name="left_padding">12</property> + <child> + <object class="GtkVBox" id="vbox13"> + <property name="visible">True</property> + <property name="spacing">6</property> + <child> + <object class="GtkCheckButton" id="side-by-side-tiling"> + <property name="label" translatable="yes">Enable side by side 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">False</property> + <property name="position">0</property> + </packing> + </child> + </object> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">1</property> + </packing> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">1</property> + </packing> + </child> + <child> <object class="GtkVBox" id="vbox2"> <property name="visible">True</property> @@ -247,7 +308,7 @@ <packing> <property name="expand">False</property> <property name="fill">False</property> - <property name="position">1</property> + <property name="position">2</property> </packing> </child> <child> @@ -322,7 +383,7 @@ <packing> <property name="expand">False</property> <property name="fill">False</property> - <property name="position">2</property> + <property name="position">3</property> </packing> </child> <child> @@ -398,7 +459,7 @@ <packing> <property name="expand">False</property> <property name="fill">False</property> - <property name="position">3</property> + <property name="position">4</property> </packing> </child> </object> @@ -406,6 +467,7 @@ <property name="position">1</property> </packing> </child> + <child internal-child="action_area"> <object class="GtkHButtonBox" id="dialog-action_area1"> <property name="visible">True</property> |