[gnome-panel/wip/muktupavels/alignment: 18/20] toplevel: remove expand key bindings



commit 56c0cb7fd29b187abb0c7a6717dc5ae6ee0a1df7
Author: Alberts Muktupāvels <alberts muktupavels gmail com>
Date:   Sun Feb 16 13:01:45 2020 +0200

    toplevel: remove expand key bindings
    
    Expand and panel position related settings will be replaced with
    new single setting - alignment.

 gnome-panel/panel-bindings.c |  3 ---
 gnome-panel/panel-toplevel.c | 63 --------------------------------------------
 gnome-panel/panel-toplevel.h |  3 ---
 3 files changed, 69 deletions(-)
---
diff --git a/gnome-panel/panel-bindings.c b/gnome-panel/panel-bindings.c
index f16b7bb98..ad0ec8756 100644
--- a/gnome-panel/panel-bindings.c
+++ b/gnome-panel/panel-bindings.c
@@ -50,9 +50,6 @@ static GSettings *keybindings = NULL;
 
 static PanelBinding bindings [] = {
        { GNOME_DESKTOP_WM_KEYBINDINGS_ACTIVATE_WINDOW_MENU_KEY, "popup-panel-menu", NULL },
-       { GNOME_DESKTOP_WM_KEYBINDINGS_TOGGLE_MAXIMIZED_KEY,     "toggle-expand",    NULL },
-       { GNOME_DESKTOP_WM_KEYBINDINGS_MAXIMIZE_KEY,             "expand",           NULL },
-       { GNOME_DESKTOP_WM_KEYBINDINGS_UNMAXIMIZE_KEY,           "unexpand",         NULL },
        { GNOME_DESKTOP_WM_KEYBINDINGS_TOGGLE_SHADED_KEY,        "toggle-hidden",    NULL },
        { GNOME_DESKTOP_WM_KEYBINDINGS_BEGIN_MOVE_KEY,           "begin-move",       NULL },
        { GNOME_DESKTOP_WM_KEYBINDINGS_BEGIN_RESIZE_KEY,         "begin-resize",     NULL },
diff --git a/gnome-panel/panel-toplevel.c b/gnome-panel/panel-toplevel.c
index 880c8e676..7351772f1 100644
--- a/gnome-panel/panel-toplevel.c
+++ b/gnome-panel/panel-toplevel.c
@@ -196,9 +196,6 @@ enum {
        HIDE_SIGNAL,
        UNHIDE_SIGNAL,
        POPUP_PANEL_MENU_SIGNAL,
-       TOGGLE_EXPAND_SIGNAL,
-       EXPAND_SIGNAL,
-       UNEXPAND_SIGNAL,
        TOGGLE_HIDDEN_SIGNAL,
        BEGIN_MOVE_SIGNAL,
        BEGIN_RESIZE_SIGNAL,
@@ -2315,30 +2312,6 @@ panel_toplevel_popup_panel_menu (PanelToplevel *toplevel)
        return retval;
 }
 
-static gboolean
-panel_toplevel_toggle_expand (PanelToplevel *toplevel)
-{
-       panel_toplevel_set_expand (toplevel, !toplevel->priv->expand);
-
-       return TRUE;
-}
-
-static gboolean
-panel_toplevel_expand (PanelToplevel *toplevel)
-{
-       panel_toplevel_set_expand (toplevel, TRUE);
-
-       return TRUE;
-}
-
-static gboolean
-panel_toplevel_unexpand (PanelToplevel *toplevel)
-{
-       panel_toplevel_set_expand (toplevel, FALSE);
-
-       return TRUE;
-}
-
 static gboolean
 panel_toplevel_toggle_hidden (PanelToplevel *toplevel)
 {
@@ -3622,9 +3595,6 @@ panel_toplevel_class_init (PanelToplevelClass *klass)
        klass->hiding           = NULL;
        klass->unhiding         = NULL;
        klass->popup_panel_menu = panel_toplevel_popup_panel_menu;
-       klass->toggle_expand    = panel_toplevel_toggle_expand;
-       klass->expand           = panel_toplevel_expand;
-       klass->unexpand         = panel_toplevel_unexpand;
        klass->toggle_hidden    = panel_toplevel_toggle_hidden;
        klass->begin_move       = panel_toplevel_begin_move;
        klass->begin_resize     = panel_toplevel_begin_resize;
@@ -3883,39 +3853,6 @@ panel_toplevel_class_init (PanelToplevelClass *klass)
                              G_TYPE_BOOLEAN,
                              0);
 
-       toplevel_signals [TOGGLE_EXPAND_SIGNAL] =
-               g_signal_new ("toggle-expand",
-                             G_TYPE_FROM_CLASS (gobject_class),
-                             G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION,
-                             G_STRUCT_OFFSET (PanelToplevelClass, toggle_expand),
-                             NULL,
-                             NULL,
-                             NULL,
-                             G_TYPE_BOOLEAN,
-                             0);
-
-       toplevel_signals [EXPAND_SIGNAL] =
-               g_signal_new ("expand",
-                             G_TYPE_FROM_CLASS (gobject_class),
-                             G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION,
-                             G_STRUCT_OFFSET (PanelToplevelClass, expand),
-                             NULL,
-                             NULL,
-                             NULL,
-                             G_TYPE_BOOLEAN,
-                             0);
-
-       toplevel_signals [UNEXPAND_SIGNAL] =
-               g_signal_new ("unexpand",
-                             G_TYPE_FROM_CLASS (gobject_class),
-                             G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION,
-                             G_STRUCT_OFFSET (PanelToplevelClass, unexpand),
-                             NULL,
-                             NULL,
-                             NULL,
-                             G_TYPE_BOOLEAN,
-                             0);
-
        toplevel_signals [TOGGLE_HIDDEN_SIGNAL] =
                g_signal_new ("toggle-hidden",
                              G_TYPE_FROM_CLASS (gobject_class),
diff --git a/gnome-panel/panel-toplevel.h b/gnome-panel/panel-toplevel.h
index 7487f1601..1c0ee0990 100644
--- a/gnome-panel/panel-toplevel.h
+++ b/gnome-panel/panel-toplevel.h
@@ -58,9 +58,6 @@ struct _PanelToplevelClass {
 
        /* key bindings */
        gboolean  (*popup_panel_menu) (PanelToplevel *toplevel);
-       gboolean  (*toggle_expand)    (PanelToplevel *toplevel);
-       gboolean  (*expand)           (PanelToplevel *toplevel);
-       gboolean  (*unexpand)         (PanelToplevel *toplevel);
        gboolean  (*toggle_hidden)    (PanelToplevel *toplevel);
        gboolean  (*begin_move)       (PanelToplevel *toplevel);
        gboolean  (*begin_resize)     (PanelToplevel *toplevel);


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]