Updating branch refs/heads/andrzejr/deskbar-github to ec72a5650af6f975c7ef95ced9c90f0b1a751f68 (commit) from 538f824051976053b17e306fa3f77295458ba6a0 (commit)
commit ec72a5650af6f975c7ef95ced9c90f0b1a751f68 Author: Andrzej <ndrwr...@gmail.com> Date: Mon Dec 12 02:28:51 2011 +0900 tasklist: removed option (and the underlying property) "rotate buttons in vertical panel". It was no longer used (replaced with the deskbar panel mode). plugins/tasklist/tasklist-dialog.glade | 15 +------------ plugins/tasklist/tasklist-widget.c | 37 -------------------------------- plugins/tasklist/tasklist.c | 2 - 3 files changed, 1 insertions(+), 53 deletions(-) diff --git a/plugins/tasklist/tasklist-dialog.glade b/plugins/tasklist/tasklist-dialog.glade index 21e24cc..db6db74 100644 --- a/plugins/tasklist/tasklist-dialog.glade +++ b/plugins/tasklist/tasklist-dialog.glade @@ -73,19 +73,6 @@ </packing> </child> <child> - <object class="GtkCheckButton" id="rotate-vertically"> - <property name="label" translatable="yes">Ro_tate buttons in vertical panel</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="position">3</property> - </packing> - </child> - <child> <object class="GtkHBox" id="hbox2"> <property name="visible">True</property> <property name="spacing">12</property> @@ -119,7 +106,7 @@ </child> </object> <packing> - <property name="position">4</property> + <property name="position">3</property> </packing> </child> </object> diff --git a/plugins/tasklist/tasklist-widget.c b/plugins/tasklist/tasklist-widget.c index ab0818b..5ee7cad 100644 --- a/plugins/tasklist/tasklist-widget.c +++ b/plugins/tasklist/tasklist-widget.c @@ -94,7 +94,6 @@ enum PROP_SHOW_WIREFRAMES, PROP_SHOW_HANDLE, PROP_SORT_ORDER, - PROP_ROTATE_VERTICALLY, PROP_WINDOW_SCROLLING }; @@ -150,9 +149,6 @@ struct _XfceTasklist * tasklist */ guint only_minimized : 1; - /* if we rotate buttons in a vertical panel */ - guint rotate_vertically : 1; - /* number of rows of window buttons */ guint nrows; @@ -347,8 +343,6 @@ static void xfce_tasklist_set_show_wireframes (XfceTa gboolean show_wireframes); static void xfce_tasklist_set_grouping (XfceTasklist *tasklist, XfceTasklistGrouping grouping); -static void xfce_tasklist_set_rotate_vertically (XfceTasklist *tasklist, - gboolean rotate_vertically); G_DEFINE_TYPE (XfceTasklist, xfce_tasklist, GTK_TYPE_CONTAINER) @@ -460,13 +454,6 @@ xfce_tasklist_class_init (XfceTasklistClass *klass) EXO_PARAM_READWRITE)); g_object_class_install_property (gobject_class, - PROP_ROTATE_VERTICALLY, - g_param_spec_boolean ("rotate-vertically", - NULL, NULL, - TRUE, - EXO_PARAM_READWRITE)); - - g_object_class_install_property (gobject_class, PROP_WINDOW_SCROLLING, g_param_spec_boolean ("window-scrolling", NULL, NULL, @@ -547,7 +534,6 @@ xfce_tasklist_init (XfceTasklist *tasklist) tasklist->show_labels = TRUE; tasklist->show_wireframes = FALSE; tasklist->show_handle = TRUE; - tasklist->rotate_vertically = TRUE; tasklist->all_monitors = TRUE; tasklist->window_scrolling = TRUE; xfce_tasklist_geometry_set_invalid (tasklist); @@ -632,10 +618,6 @@ xfce_tasklist_get_property (GObject *object, g_value_set_uint (value, tasklist->sort_order); break; - case PROP_ROTATE_VERTICALLY: - g_value_set_boolean (value, tasklist->rotate_vertically); - break; - case PROP_WINDOW_SCROLLING: g_value_set_boolean (value, tasklist->window_scrolling); break; @@ -706,10 +688,6 @@ xfce_tasklist_set_property (GObject *object, } break; - case PROP_ROTATE_VERTICALLY: - xfce_tasklist_set_rotate_vertically (tasklist, g_value_get_boolean (value)); - break; - case PROP_WINDOW_SCROLLING: tasklist->window_scrolling = g_value_get_boolean (value); break; @@ -3834,21 +3812,6 @@ xfce_tasklist_update_orientation (XfceTasklist *tasklist) -static void -xfce_tasklist_set_rotate_vertically (XfceTasklist *tasklist, - gboolean rotate_vertically) -{ - panel_return_if_fail (XFCE_IS_TASKLIST (tasklist)); - - if (tasklist->rotate_vertically != rotate_vertically) - { - tasklist->rotate_vertically = rotate_vertically; - xfce_tasklist_update_orientation (tasklist); - } -} - - - void xfce_tasklist_set_nrows (XfceTasklist *tasklist, guint nrows) diff --git a/plugins/tasklist/tasklist.c b/plugins/tasklist/tasklist.c index bf0bb43..4ee9289 100644 --- a/plugins/tasklist/tasklist.c +++ b/plugins/tasklist/tasklist.c @@ -140,7 +140,6 @@ tasklist_plugin_construct (XfcePanelPlugin *panel_plugin) { "show-wireframes", G_TYPE_BOOLEAN }, { "show-handle", G_TYPE_BOOLEAN }, { "sort-order", G_TYPE_UINT }, - { "rotate-vertically", G_TYPE_BOOLEAN }, { "window-scrolling", G_TYPE_BOOLEAN }, { NULL } }; @@ -248,7 +247,6 @@ tasklist_plugin_configure_plugin (XfcePanelPlugin *panel_plugin) TASKLIST_DIALOG_BIND ("include-all-workspaces", "active") TASKLIST_DIALOG_BIND ("include-all-monitors", "active") TASKLIST_DIALOG_BIND ("flat-buttons", "active") - TASKLIST_DIALOG_BIND ("rotate-vertically", "active") TASKLIST_DIALOG_BIND_INV ("switch-workspace-on-unminimize", "active") TASKLIST_DIALOG_BIND ("show-only-minimized", "active") TASKLIST_DIALOG_BIND ("show-wireframes", "active") _______________________________________________ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits