From 7fa91f721e6844ab169c948c57b4a6e5b64d5cc0 Mon Sep 17 00:00:00 2001 From: Clement Lefebvre Date: Tue, 14 May 2019 14:09:45 +0100 Subject: [PATCH] Configuration screen: Fix alignmnents and margins Credits to: https://github.com/linuxmint/mintmenu/pull/222 https://github.com/linuxmint/mintmenu/pull/224 --- usr/lib/linuxmint/mintMenu/keybinding.py | 9 +- .../linuxmint/mintMenu/mintMenuConfig.glade | 231 ++++++++---------- usr/lib/linuxmint/mintMenu/mintMenuConfig.py | 7 +- 3 files changed, 113 insertions(+), 134 deletions(-) diff --git a/usr/lib/linuxmint/mintMenu/keybinding.py b/usr/lib/linuxmint/mintMenu/keybinding.py index 0f80731..a3bc421 100644 --- a/usr/lib/linuxmint/mintMenu/keybinding.py +++ b/usr/lib/linuxmint/mintMenu/keybinding.py @@ -162,19 +162,14 @@ class KeybindingWidget(Gtk.Box): __gsignals__ = { 'accel-edited': (GObject.SignalFlags.RUN_LAST, None, ()), } - def __init__(self, desc): + def __init__(self): super(KeybindingWidget, self).__init__() - self.desc = desc - self.label = Gtk.Label(desc) - if self.desc != "": - self.pack_start(self.label, False, False, 0) self.button = Gtk.Button() self.button.set_tooltip_text(_("Click to set a new accelerator key for opening and closing the menu. ") + _("Press Escape or click again to cancel the operation. ") + _("Press Backspace to clear the existing keybinding.")) self.button.connect("clicked", self.clicked) - self.button.set_size_request(200, -1) - self.pack_start(self.button, False, False, 4) + self.pack_start(self.button, True, True, 0) self.show_all() self.event_id = None diff --git a/usr/lib/linuxmint/mintMenu/mintMenuConfig.glade b/usr/lib/linuxmint/mintMenu/mintMenuConfig.glade index 1385230..271e206 100644 --- a/usr/lib/linuxmint/mintMenu/mintMenuConfig.glade +++ b/usr/lib/linuxmint/mintMenu/mintMenuConfig.glade @@ -319,10 +319,7 @@ True False - 10 - 10 - 10 - 10 + 10 0 none @@ -385,14 +382,14 @@ 0 - 3 + 2 True False - 7 + 6 True @@ -419,11 +416,20 @@ 1 - 3 + 2 - + + True + False + start + Keyboard shortcut: + + + 0 + 3 + @@ -447,109 +453,76 @@ True False - 10 - 10 - 10 - 10 + 10 0 none - + True False + vertical 5 - + + Show applications plugin True - False - vertical - 5 - - - Always start with favorites pane - True - True - False - start - True - - - False - False - 0 - - - - - Show applications plugin - True - True - False - start - True - - - False - False - 1 - - - - - Show system plugin - True - True - False - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - start - True - - - False - False - 2 - - - - - Show places plugin - True - True - False - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - start - True - - - False - False - 3 - - - - - Show recently used applications and documents plugin - True - True - False - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - start - True - - - False - False - 4 - - - - - + True + False + start + True False - True - 0 + False + 1 + + + + + Show system plugin + True + True + False + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + start + True + + + False + False + 2 + + + + + Show places plugin + True + True + False + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + start + True + + + False + False + 3 + + + + + Show recently used applications and documents plugin + True + True + False + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + start + True + + + False + False + 4 @@ -575,18 +548,16 @@ True False - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - 10 - 10 - 10 - 10 + 10 0 none True False - 2 + True + True + 5 10 @@ -708,18 +679,13 @@ True False - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - 10 - 10 - 10 - 10 + 10 0 none True False - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK 5 10 @@ -928,10 +894,7 @@ True False GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - 10 - 10 - 10 - 10 + 10 0 none @@ -1012,6 +975,21 @@ 2 + + + Always start with favorites pane + True + True + False + start + True + + + 0 + 3 + 2 + + @@ -1035,10 +1013,7 @@ True False - 10 - 10 - 10 - 10 + 10 0 none @@ -1046,6 +1021,7 @@ True False vertical + 5 True @@ -1144,7 +1120,10 @@ True False + 5 + 10 vertical + 5 Computer @@ -1298,6 +1277,7 @@ False vertical 5 + expand gtk-new @@ -1339,6 +1319,7 @@ True False vertical + expand gtk-go-up @@ -1380,6 +1361,7 @@ True False vertical + expand gtk-remove @@ -1449,10 +1431,7 @@ True False - 10 - 10 - 10 - 10 + 10 0 none @@ -1460,6 +1439,7 @@ True False vertical + 5 True @@ -1558,7 +1538,10 @@ True False + 5 + 10 vertical + 5 Software Manager diff --git a/usr/lib/linuxmint/mintMenu/mintMenuConfig.py b/usr/lib/linuxmint/mintMenu/mintMenuConfig.py index 2971482..e1ba198 100755 --- a/usr/lib/linuxmint/mintMenu/mintMenuConfig.py +++ b/usr/lib/linuxmint/mintMenu/mintMenuConfig.py @@ -64,9 +64,10 @@ class mintMenuConfig(object): self.showButtonIcon = self.builder.get_object("showButtonIcon") self.enableInternetSearch = self.builder.get_object("enableInternetSearch") self.buttonText = self.builder.get_object("buttonText") - self.hotkeyWidget = keybinding.KeybindingWidget(_("Keyboard shortcut:")) - grid = self.builder.get_object("main_grid") - grid.attach(self.hotkeyWidget, 0, 2, 2, 1) + self.hotkeyWidget = keybinding.KeybindingWidget() + self.builder.get_object("main_grid").attach_next_to(self.hotkeyWidget, + self.builder.get_object("keybinding_label"), + Gtk.PositionType.RIGHT, 1, 1) self.buttonIcon = self.builder.get_object("buttonIcon") self.buttonIconChooser = self.builder.get_object("button_icon_chooser") self.image_filter = Gtk.FileFilter()