From 4c101f9b807fbd5e1067ca7254740a4ef1744e68 Mon Sep 17 00:00:00 2001 From: Viktor Odintsev Date: Wed, 28 Jun 2017 22:55:55 +0300 Subject: Port most of GUI stuff to GTK3 --- settings-dialogs/Makefile.am | 12 +- settings-dialogs/common.c | 46 ++++++++ settings-dialogs/common.h | 29 +++++ settings-dialogs/tweaks-settings.c | 11 +- settings-dialogs/workspace-settings.c | 13 ++- settings-dialogs/xfwm4-dialog.glade | 102 ++++++++++------- settings-dialogs/xfwm4-settings.c | 153 +++++++++++++++----------- settings-dialogs/xfwm4-tweaks-dialog.glade | 87 +++++++++------ settings-dialogs/xfwm4-workspace-dialog.glade | 24 ++-- 9 files changed, 324 insertions(+), 153 deletions(-) create mode 100644 settings-dialogs/common.c create mode 100644 settings-dialogs/common.h (limited to 'settings-dialogs') diff --git a/settings-dialogs/Makefile.am b/settings-dialogs/Makefile.am index 424c482b8..4d96f2c3e 100644 --- a/settings-dialogs/Makefile.am +++ b/settings-dialogs/Makefile.am @@ -6,7 +6,9 @@ bin_PROGRAMS = \ xfwm4_workspace_settings_SOURCES = \ workspace-settings.c \ xfwm4-workspace-dialog_ui.h \ - monitor-icon.h + monitor-icon.h \ + common.c \ + common.h xfwm4_workspace_settings_CFLAGS = \ $(GTK_CFLAGS) \ @@ -33,7 +35,9 @@ xfwm4_workspace_settings_LDADD = \ xfwm4_settings_SOURCES = \ xfwm4-settings.c \ xfwm4-settings.h \ - xfwm4-dialog_ui.h + xfwm4-dialog_ui.h \ + common.c \ + common.h xfwm4_settings_CFLAGS = \ $(GTK_CFLAGS) \ @@ -56,7 +60,9 @@ xfwm4_settings_LDADD = \ xfwm4_tweaks_settings_SOURCES = \ tweaks-settings.c \ - xfwm4-tweaks-dialog_ui.h + xfwm4-tweaks-dialog_ui.h \ + common.c \ + common.h xfwm4_tweaks_settings_CFLAGS = \ $(GTK_CFLAGS) \ diff --git a/settings-dialogs/common.c b/settings-dialogs/common.c new file mode 100644 index 000000000..2868108a5 --- /dev/null +++ b/settings-dialogs/common.c @@ -0,0 +1,46 @@ +/* vi:set sw=2 sts=2 ts=2 et ai tw=100: */ +/*- + * Copyright (c) 2017 Viktor Odintsev + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or (at + * your option) any later version. + * + * This program is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., Inc., 51 Franklin Street, Fifth Floor, Boston, + * MA 02110-1301, USA. + */ + +#include + + + +void +xfwm_widget_reparent (GtkWidget *widget, + GtkWidget *new_parent) +{ + GtkWidget *old_parent; + + g_return_if_fail (GTK_IS_WIDGET (widget)); + g_return_if_fail (GTK_IS_CONTAINER (new_parent)); + + old_parent = gtk_widget_get_parent (widget); + + g_return_if_fail (old_parent != NULL); + + if (old_parent != new_parent) + { + g_object_ref (widget); + gtk_container_remove (GTK_CONTAINER (old_parent), widget); + gtk_container_add (GTK_CONTAINER (new_parent), widget); + g_object_unref (widget); + } +} + diff --git a/settings-dialogs/common.h b/settings-dialogs/common.h new file mode 100644 index 000000000..ea8e59faf --- /dev/null +++ b/settings-dialogs/common.h @@ -0,0 +1,29 @@ +/* vi:set sw=2 sts=2 ts=2 et ai tw=100: */ +/*- + * Copyright (c) 2017 Viktor Odintsev + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or (at + * your option) any later version. + * + * This program is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., Inc., 51 Franklin Street, Fifth Floor, Boston, + * MA 02110-1301, USA. + */ + +#ifndef __COMMON_H__ +#define __COMMON_H__ + +#include + +void xfwm_widget_reparent (GtkWidget *widget, + GtkWidget *new_parent); + +#endif /* !__COMMON_H__ */ diff --git a/settings-dialogs/tweaks-settings.c b/settings-dialogs/tweaks-settings.c index 95755ac5d..d3b45c5dd 100644 --- a/settings-dialogs/tweaks-settings.c +++ b/settings-dialogs/tweaks-settings.c @@ -38,12 +38,15 @@ #include #include #include +#include #include #include + #include "xfwm4-tweaks-dialog_ui.h" +#include "common.h" -static GdkNativeWindow opt_socket_id = 0; +static Window opt_socket_id = 0; static gboolean opt_version = FALSE; static const gchar *const modifier_list[] = { @@ -521,7 +524,7 @@ main (int argc, gchar **argv) g_signal_connect (dialog, "response", G_CALLBACK (wm_tweaks_dialog_response), NULL); /* To prevent the settings dialog to be saved in the session */ - gdk_set_sm_client_id ("FAKE ID"); + gdk_x11_set_sm_client_id ("FAKE ID"); gtk_main (); @@ -536,11 +539,11 @@ main (int argc, gchar **argv) /* Get plug child widget */ plug_child = GTK_WIDGET (gtk_builder_get_object (builder, "plug-child")); - gtk_widget_reparent (plug_child, plug); + xfwm_widget_reparent (plug_child, plug); gtk_widget_show (plug_child); /* To prevent the settings dialog to be saved in the session */ - gdk_set_sm_client_id ("FAKE ID"); + gdk_x11_set_sm_client_id ("FAKE ID"); /* Stop startup notification */ gdk_notify_startup_complete (); diff --git a/settings-dialogs/workspace-settings.c b/settings-dialogs/workspace-settings.c index 5b1ca4de1..2e93967b9 100644 --- a/settings-dialogs/workspace-settings.c +++ b/settings-dialogs/workspace-settings.c @@ -26,22 +26,27 @@ #include #include +#include #include +#include + #include #include #include #include #include + #include "xfwm4-workspace-dialog_ui.h" #include "monitor-icon.h" +#include "common.h" #define WORKSPACES_CHANNEL "xfwm4" #define WORKSPACE_NAMES_PROP "/general/workspace_names" #define WORKSPACE_COUNT_PROP "/general/workspace_count" -static GdkNativeWindow opt_socket_id = 0; +static Window opt_socket_id = 0; static gboolean opt_version = FALSE; @@ -435,7 +440,7 @@ main(int argc, gchar **argv) g_signal_connect (dialog, "response", G_CALLBACK (workspace_dialog_response), NULL); /* To prevent the settings dialog to be saved in the session */ - gdk_set_sm_client_id ("FAKE ID"); + gdk_x11_set_sm_client_id ("FAKE ID"); gtk_main (); @@ -448,11 +453,11 @@ main(int argc, gchar **argv) /* Get plug child widget */ plug_child = GTK_WIDGET (gtk_builder_get_object (builder, "plug-child")); - gtk_widget_reparent (plug_child, plug); + xfwm_widget_reparent (plug_child, plug); gtk_widget_show (plug_child); /* To prevent the settings dialog to be saved in the session */ - gdk_set_sm_client_id ("FAKE ID"); + gdk_x11_set_sm_client_id ("FAKE ID"); /* Stop startup notification */ gdk_notify_startup_complete (); diff --git a/settings-dialogs/xfwm4-dialog.glade b/settings-dialogs/xfwm4-dialog.glade index f06460bcb..c848b2878 100644 --- a/settings-dialogs/xfwm4-dialog.glade +++ b/settings-dialogs/xfwm4-dialog.glade @@ -1,7 +1,7 @@ - - + + 5 @@ -39,13 +39,15 @@ dialog Configure window behavior and shortcuts - + True False + vertical - + True False + horizontal end @@ -92,9 +94,10 @@ True 6 - + True False + horizontal 12 12 @@ -145,9 +148,10 @@ - + True False + vertical 6 @@ -240,9 +244,10 @@ 6 12 - + True False + vertical 6 6 @@ -269,9 +274,11 @@ False 6 - + True False + horizontal + 6 Title @@ -317,9 +324,10 @@ False 6 - + True False + horizontal 6 @@ -506,9 +514,10 @@ - + True False + vertical 12 6 @@ -527,9 +536,10 @@ - + True False + vertical 6 @@ -568,9 +578,10 @@ 0 0 - + True False + horizontal 6 @@ -646,9 +657,10 @@ - + True False + vertical 12 6 @@ -665,14 +677,16 @@ 6 12 - + True False + vertical 6 - + True False + horizontal 12 True @@ -737,9 +751,10 @@ False 12 - + True False + horizontal 12 @@ -755,10 +770,10 @@ - + True True - discontinuous + horizontal adjustment1 False @@ -864,9 +879,10 @@ 6 12 - + True False + vertical 6 @@ -885,9 +901,10 @@ - + True False + vertical 6 @@ -910,9 +927,10 @@ False 12 - + True False + horizontal 12 @@ -928,10 +946,10 @@ - + True True - discontinuous + horizontal adjustment2 False @@ -1048,9 +1066,10 @@ - + True False + vertical 12 6 @@ -1067,14 +1086,16 @@ 6 12 - + True False + vertical 6 - + True False + horizontal To screen _borders @@ -1115,9 +1136,10 @@ - + True False + vertical 6 @@ -1140,9 +1162,10 @@ False 12 - + True False + horizontal 12 @@ -1158,10 +1181,10 @@ - + True True - discontinuous + horizontal adjustment3 False False @@ -1234,14 +1257,16 @@ 6 12 - + True False + vertical 6 - + True False + horizontal With the mouse _pointer @@ -1282,9 +1307,10 @@ - + True False + vertical 6 @@ -1308,9 +1334,10 @@ False 12 - + True False + horizontal 12 @@ -1326,10 +1353,10 @@ - + True True - discontinuous + horizontal adjustment4 False False @@ -1402,9 +1429,10 @@ 6 12 - + True False + horizontal When _moving diff --git a/settings-dialogs/xfwm4-settings.c b/settings-dialogs/xfwm4-settings.c index aeee96262..45daa35c1 100644 --- a/settings-dialogs/xfwm4-settings.c +++ b/settings-dialogs/xfwm4-settings.c @@ -37,6 +37,7 @@ #include #include #include +#include #include #include @@ -47,6 +48,7 @@ #include "xfwm4-dialog_ui.h" #include "xfwm4-settings.h" +#include "common.h" @@ -132,6 +134,7 @@ static void xfwm_settings_create_indicator (GtkWidget gint y, gint width, gint height); +static gboolean xfwm_settings_title_button_press_event (GtkWidget *widget); static void xfwm_settings_title_button_drag_data (GtkWidget *widget, GdkDragContext *drag_context, GtkSelectionData *data, @@ -235,7 +238,7 @@ static const MenuTemplate title_align_values[] = { static gboolean opt_version = FALSE; -static GdkNativeWindow opt_socket_id = 0; +static Window opt_socket_id = 0; static GOptionEntry opt_entries[] = { { "socket-id", 's', G_OPTION_FLAG_IN_MAIN, G_OPTION_ARG_INT, &opt_socket_id, N_("Settings manager socket"), N_("SOCKET ID") }, @@ -467,7 +470,7 @@ xfwm_settings_constructed (GObject *object) g_signal_connect (button, "drag_end", G_CALLBACK (xfwm_settings_title_button_drag_end), NULL); g_signal_connect (button, "button_press_event", - G_CALLBACK (xfwm_settings_signal_blocker), NULL); + G_CALLBACK (xfwm_settings_title_button_press_event), NULL); g_signal_connect (button, "enter_notify_event", G_CALLBACK (xfwm_settings_signal_blocker), NULL); g_signal_connect (button, "focus", G_CALLBACK (xfwm_settings_signal_blocker), NULL); @@ -490,7 +493,7 @@ xfwm_settings_constructed (GObject *object) g_signal_connect (button, "drag_end", G_CALLBACK (xfwm_settings_title_button_drag_end), NULL); g_signal_connect (button, "button_press_event", - G_CALLBACK (xfwm_settings_signal_blocker), NULL); + G_CALLBACK (xfwm_settings_title_button_press_event), NULL); g_signal_connect (button, "enter_notify_event", G_CALLBACK (xfwm_settings_signal_blocker), NULL); g_signal_connect (button, "focus", G_CALLBACK (xfwm_settings_signal_blocker), NULL); @@ -514,8 +517,8 @@ xfwm_settings_constructed (GObject *object) /* Set reset button icon */ gtk_button_set_image (GTK_BUTTON (shortcuts_reset_button), - gtk_image_new_from_stock (GTK_STOCK_REVERT_TO_SAVED, - GTK_ICON_SIZE_BUTTON)); + gtk_image_new_from_icon_name ("document-revert", + GTK_ICON_SIZE_BUTTON)); /* Keyboard tab: Shortcuts tree view */ { @@ -842,7 +845,7 @@ xfwm_settings_create_dialog (XfwmSettings *settings) static GtkWidget * xfwm_settings_create_plug (XfwmSettings *settings, - GdkNativeWindow socket_id) + Window socket_id) { GtkWidget *plug; GtkWidget *child; @@ -853,7 +856,7 @@ xfwm_settings_create_plug (XfwmSettings *settings, gtk_widget_show (plug); child = GTK_WIDGET (gtk_builder_get_object (settings->priv->builder, "plug-child")); - gtk_widget_reparent (child, plug); + xfwm_widget_reparent (child, plug); gtk_widget_show (child); return plug; @@ -944,7 +947,7 @@ main (int argc, g_signal_connect (dialog, "response", G_CALLBACK (xfwm_settings_response), NULL); /* To prevent the settings dialog to be saved in the session */ - gdk_set_sm_client_id ("FAKE ID"); + gdk_x11_set_sm_client_id ("FAKE ID"); gtk_main (); @@ -956,7 +959,7 @@ main (int argc, g_signal_connect (plug, "delete-event", G_CALLBACK (gtk_main_quit), NULL); /* To prevent the settings dialog to be saved in the session */ - gdk_set_sm_client_id ("FAKE ID"); + gdk_x11_set_sm_client_id ("FAKE ID"); /* Stop startup notification */ gdk_notify_startup_complete (); @@ -1049,13 +1052,14 @@ xfwm_settings_active_frame_drag_data (GtkWidget *widget, guint timestamp, XfwmSettings *settings) { - GtkWidget *source; - GtkWidget *parent; - GtkWidget *active_box; - GList *children; - GList *iter; - gint xoffset; - gint i; + GtkWidget *source; + GtkWidget *parent; + GtkWidget *active_box; + GList *children; + GList *iter; + GtkAllocation allocation; + gint xoffset; + gint i; g_return_if_fail (XFWM_IS_SETTINGS (settings)); @@ -1070,17 +1074,20 @@ xfwm_settings_active_frame_drag_data (GtkWidget *widget, gtk_box_pack_start (GTK_BOX (active_box), source, info == 3, info == 3, 0); g_object_unref (source); - xoffset = widget->allocation.x; + gtk_widget_get_allocation (widget, &allocation); + + xoffset = allocation.x; children = gtk_container_get_children (GTK_CONTAINER (active_box)); for (i = 0, iter = children; iter != NULL; ++i, iter = g_list_next (iter)) - if (GTK_WIDGET_VISIBLE (iter->data)) - if (x < (GTK_WIDGET (iter->data)->allocation.width / 2 + - GTK_WIDGET (iter->data)->allocation.x - xoffset)) - { + if (gtk_widget_get_visible (GTK_WIDGET (iter->data))) + { + gtk_widget_get_allocation (GTK_WIDGET (iter->data), &allocation); + + if (x < allocation.width / 2 + allocation.x - xoffset) break; - } + } g_list_free (children); @@ -1099,17 +1106,22 @@ xfwm_settings_active_frame_drag_motion (GtkWidget *widget, guint timestamp, XfwmSettings *settings) { - GtkWidget *active_box; - GdkWindow *indicator; - GList *children; - GList *iter; - gint xoffset = widget->allocation.x; - gint height; - gint ix; - gint iy; + GtkWidget *active_box; + GdkWindow *indicator; + GList *children; + GList *iter; + GtkAllocation allocation; + gint xoffset; + gint height; + gint ix; + gint iy; g_return_val_if_fail (XFWM_IS_SETTINGS (settings), FALSE); + gtk_widget_get_allocation (widget, &allocation); + + xoffset = allocation.x; + active_box = GTK_WIDGET (gtk_builder_get_object (settings->priv->builder, "active-box")); children = gtk_container_get_children (GTK_CONTAINER (active_box)); @@ -1117,30 +1129,33 @@ xfwm_settings_active_frame_drag_motion (GtkWidget *widget, ix = INDICATOR_SIZE; for (iter = children; iter != NULL; iter = g_list_next (iter)) { - if (GTK_WIDGET_VISIBLE (iter->data)) + if (gtk_widget_get_visible (GTK_WIDGET (iter->data))) { - if (x < (GTK_WIDGET (iter->data)->allocation.width / 2 + - GTK_WIDGET (iter->data)->allocation.x - xoffset)) + gtk_widget_get_allocation (GTK_WIDGET (iter->data), &allocation); + + if (x < (allocation.width / 2 + allocation.x - xoffset)) { - ix = GTK_WIDGET (iter->data)->allocation.x; + ix = allocation.x; break; } - ix = GTK_WIDGET (iter->data)->allocation.x + GTK_WIDGET (iter->data)->allocation.width; + ix = allocation.x + allocation.width; } } g_list_free (children); + gtk_widget_get_allocation (active_box, &allocation); + ix -= INDICATOR_SIZE / 2 + 1; - iy = active_box->allocation.y - INDICATOR_SIZE / 2 + + iy = allocation.y - INDICATOR_SIZE / 2 + gtk_container_get_border_width (GTK_CONTAINER (active_box)); indicator = g_object_get_data (G_OBJECT (active_box), "indicator_window"); if (G_UNLIKELY (indicator == NULL)) { - height = active_box->allocation.height + INDICATOR_SIZE - + height = allocation.height + INDICATOR_SIZE - gtk_container_get_border_width (GTK_CONTAINER (active_box)) * 2; xfwm_settings_create_indicator (active_box, ix, iy, INDICATOR_SIZE, height); } @@ -1209,11 +1224,11 @@ xfwm_settings_create_indicator (GtkWidget *widget, gint width, gint height) { - GdkWindowAttr attributes; - GdkWindow *indicator; - GdkRegion *shape; - GdkPoint points[9]; - gint attr_mask = GDK_WA_X | GDK_WA_Y | GDK_WA_COLORMAP | GDK_WA_VISUAL; + GdkWindowAttr attributes; + GdkWindow *indicator; + cairo_region_t *shape; + GdkPoint points[9]; + gint attr_mask = GDK_WA_X | GDK_WA_Y | GDK_WA_VISUAL; g_return_if_fail (GTK_IS_WIDGET (widget)); @@ -1225,18 +1240,20 @@ xfwm_settings_create_indicator (GtkWidget *widget, attributes.height = height; attributes.wclass = GDK_INPUT_OUTPUT; attributes.visual = gtk_widget_get_visual (widget); - attributes.colormap = gtk_widget_get_colormap (widget); attributes.window_type = GDK_WINDOW_CHILD; attributes.cursor = NULL; attributes.wmclass_name = NULL; attributes.wmclass_class = NULL; attributes.override_redirect = FALSE; + attributes.type_hint = GDK_WINDOW_TYPE_HINT_NORMAL; + + /* TODO implement a new method of displaying DND */ indicator = gdk_window_new (gtk_widget_get_parent_window (widget), &attributes, attr_mask); gdk_window_set_user_data (indicator, widget); g_object_set_data (G_OBJECT (widget), "indicator_window", indicator); - points[0].x = 0; + /* points[0].x = 0; points[0].y = 0; points[1].x = width; points[1].y = 0; @@ -1256,7 +1273,7 @@ xfwm_settings_create_indicator (GtkWidget *widget, points[8].y = 0; shape = gdk_region_polygon (points, 9, GDK_WINDING_RULE); - gdk_window_shape_combine_region (indicator, shape, 0, 0); + gdk_window_shape_combine_region (indicator, shape, 0, 0);*/ gdk_window_show (indicator); gdk_window_raise (indicator); @@ -1282,6 +1299,23 @@ xfwm_settings_delete_indicator (GtkWidget *widget) +static gboolean +xfwm_settings_title_button_press_event (GtkWidget *widget) +{ + GdkPixbuf *pixbuf; + + g_return_if_fail (GTK_IS_WIDGET (widget)); + + /* set pixbuf before drag begin cause it can be not displayed */ + pixbuf = xfwm_settings_create_icon_from_widget (widget); + gtk_drag_source_set_icon_pixbuf (widget, pixbuf); + g_object_unref (pixbuf); + + return TRUE; +} + + + static void xfwm_settings_title_button_drag_data (GtkWidget *widget, GdkDragContext *drag_context, @@ -1304,14 +1338,8 @@ static void xfwm_settings_title_button_drag_begin (GtkWidget *widget, GdkDragContext *drag_context) { - GdkPixbuf *pixbuf; - g_return_if_fail (GTK_IS_WIDGET (widget)); - pixbuf = xfwm_settings_create_icon_from_widget (widget); - gtk_drag_source_set_icon_pixbuf (widget, pixbuf); - g_object_unref (pixbuf); - gtk_widget_hide (widget); } @@ -1337,14 +1365,16 @@ xfwm_settings_signal_blocker (GtkWidget *widget) static GdkPixbuf * xfwm_settings_create_icon_from_widget (GtkWidget *widget) { - GdkWindow *drawable; + GdkWindow *window; + GtkAllocation allocation; g_return_val_if_fail (GTK_IS_WIDGET (widget), NULL); - drawable = GDK_DRAWABLE (gtk_widget_get_parent_window (widget)); - return gdk_pixbuf_get_from_drawable (NULL, drawable, NULL, - widget->allocation.x, widget->allocation.y, 0, 0, - widget->allocation.width, widget->allocation.height); + gtk_widget_get_allocation (widget, &allocation); + window = gtk_widget_get_parent_window (widget); + return gdk_pixbuf_get_from_window (window, + allocation.x, allocation.y, + allocation.width, allocation.height); } @@ -1893,20 +1923,17 @@ static void xfwm_settings_shortcut_reset_clicked (GtkButton *button, XfwmSettings *settings) { - gint response; + gint confirm; g_return_if_fail (XFWM_IS_SETTINGS (settings)); g_return_if_fail (XFCE_IS_SHORTCUTS_PROVIDER (settings->priv->provider)); - response = xfce_message_dialog (NULL, _("Reset to Defaults"), GTK_STOCK_DIALOG_QUESTION, - _("Reset to Defaults"), + confirm = xfce_dialog_confirm (NULL, "gtk-yes", NULL, _("This will reset all shortcuts to their default " "values. Do you really want to do this?"), - GTK_STOCK_NO, GTK_RESPONSE_NO, - GTK_STOCK_YES, GTK_RESPONSE_YES, - NULL); + _("Reset to Defaults")); - if (G_LIKELY (response == GTK_RESPONSE_YES)) + if (confirm) xfce_shortcuts_provider_reset_to_defaults (settings->priv->provider); } diff --git a/settings-dialogs/xfwm4-tweaks-dialog.glade b/settings-dialogs/xfwm4-tweaks-dialog.glade index abc351972..af8c37389 100644 --- a/settings-dialogs/xfwm4-tweaks-dialog.glade +++ b/settings-dialogs/xfwm4-tweaks-dialog.glade @@ -1,7 +1,7 @@ - - + + 100 @@ -48,13 +48,15 @@ dialog Fine-tune window behaviour and effects - + True False + vertical - + True False + horizontal end @@ -101,9 +103,10 @@ True 6 - + True False + vertical 12 6 @@ -201,9 +204,10 @@ or "skip taskbar" properties set - + True False + vertical 12 6 @@ -239,9 +243,10 @@ or "skip taskbar" properties set - + True False + vertical 6 @@ -263,9 +268,10 @@ or "skip taskbar" properties set 6 12 - + True False + vertical 6 6 @@ -355,15 +361,17 @@ or "skip taskbar" properties set - + True False + vertical 12 6 - + True False + horizontal 12 @@ -543,9 +551,10 @@ or "skip taskbar" properties set - + True False + vertical 12 6 @@ -631,9 +640,10 @@ when switching via keyboard shortcuts - + True False + vertical 12 6 @@ -658,9 +668,10 @@ when switching via keyboard shortcuts 6 12 - + True False + horizontal 12 @@ -676,9 +687,10 @@ when switching via keyboard shortcuts - + True True + horizontal adjustment1 False False @@ -712,9 +724,10 @@ when switching via keyboard shortcuts - + True False + vertical 6 @@ -736,9 +749,10 @@ when switching via keyboard shortcuts 6 12 - + True False + vertical 6 6 @@ -809,9 +823,10 @@ when switching via keyboard shortcuts - + True False + vertical 12 6 @@ -850,9 +865,10 @@ when switching via keyboard shortcuts 6 12 - + True False + vertical 6 @@ -956,9 +972,10 @@ when switching via keyboard shortcuts 2 12 - + True False + horizontal True @@ -973,10 +990,10 @@ when switching via keyboard shortcuts - + True True - discontinuous + horizontal adjustment2 False False @@ -1031,9 +1048,10 @@ when switching via keyboard shortcuts 2 12 - + True False + horizontal True @@ -1048,10 +1066,10 @@ when switching via keyboard shortcuts - + True True - discontinuous + horizontal adjustment3 False False @@ -1106,9 +1124,10 @@ when switching via keyboard shortcuts 2 12 - + True False + horizontal True @@ -1123,10 +1142,10 @@ when switching via keyboard shortcuts - + True True - discontinuous + horizontal adjustment4 False False @@ -1181,9 +1200,10 @@ when switching via keyboard shortcuts 2 12 - + True False + horizontal True @@ -1198,10 +1218,10 @@ when switching via keyboard shortcuts - + True True - discontinuous + horizontal adjustment5 False False @@ -1256,9 +1276,10 @@ when switching via keyboard shortcuts 2 12 - + True False + horizontal True @@ -1273,10 +1294,10 @@ when switching via keyboard shortcuts - + True True - discontinuous + horizontal adjustment6 False False diff --git a/settings-dialogs/xfwm4-workspace-dialog.glade b/settings-dialogs/xfwm4-workspace-dialog.glade index 7b52d0a30..50852b39d 100644 --- a/settings-dialogs/xfwm4-workspace-dialog.glade +++ b/settings-dialogs/xfwm4-workspace-dialog.glade @@ -1,7 +1,7 @@ - - + + 1 @@ -37,9 +37,10 @@ dialog Configure layout, names and margins - + True False + vertical 2 @@ -47,9 +48,10 @@ True 6 - + True False + vertical 6 6 @@ -66,9 +68,10 @@ 6 16 - + True False + horizontal 12 @@ -89,7 +92,7 @@ True True - False + True • False False @@ -187,15 +190,17 @@ - + True False + vertical 6 6 - + True False + horizontal 12 @@ -391,9 +396,10 @@ - + True False + horizontal end -- cgit v1.2.1