jbah.skp/mintmenu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Preferences: Fix keybind widget alignment on main button tab

Browse Source
This commit is contained in:
gm10 2019-02-23 20:06:34 +01:00
parent 8988476df2
commit cca00a0ed1
No known key found for this signature in database
GPG Key ID: A981D4EA8CF993A9
3 changed files with 30 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
usr/lib/linuxmint/mintMenu/keybinding.py
View File

@ -162,19 +162,14 @@ class KeybindingWidget(Gtk.Box):
__gsignals__ = { __gsignals__ = {
'accel-edited': (GObject.SignalFlags.RUN_LAST, None, ()), 'accel-edited': (GObject.SignalFlags.RUN_LAST, None, ()),
} }
def __init__(self, desc): def __init__(self):
super(KeybindingWidget, self).__init__() 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 = Gtk.Button()
self.button.set_tooltip_text(_("Click to set a new accelerator key for opening and closing the menu. ") + 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 Escape or click again to cancel the operation. ") +
_("Press Backspace to clear the existing keybinding.")) _("Press Backspace to clear the existing keybinding."))
self.button.connect("clicked", self.clicked) self.button.connect("clicked", self.clicked)
self.button.set_size_request(200, -1) self.pack_start(self.button, True, True, 0)
self.pack_start(self.button, False, False, 4)
self.show_all() self.show_all()
self.event_id = None self.event_id = None

37
usr/lib/linuxmint/mintMenu/mintMenuConfig.glade
View File

@ -376,18 +376,6 @@
<property name="top_attach">1</property> <property name="top_attach">1</property>
</packing> </packing>
</child> </child>
<child>
<object class="GtkLabel" id="label4">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="halign">start</property>
<property name="label" translatable="yes">Button icon:</property>
</object>
<packing>
<property name="left_attach">0</property>
<property name="top_attach">3</property>
</packing>
</child>
<child> <child>
<object class="GtkBox" id="hbox4"> <object class="GtkBox" id="hbox4">
<property name="visible">True</property> <property name="visible">True</property>
@ -419,11 +407,32 @@
</object> </object>
<packing> <packing>
<property name="left_attach">1</property> <property name="left_attach">1</property>
<property name="top_attach">3</property> <property name="top_attach">2</property>
</packing> </packing>
</child> </child>
<child> <child>
<placeholder/> <object class="GtkLabel" id="label4">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="halign">start</property>
<property name="label" translatable="yes">Button icon:</property>
</object>
<packing>
<property name="left_attach">0</property>
<property name="top_attach">2</property>
</packing>
</child>
<child>
<object class="GtkLabel" id="keybinding_label">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="halign">start</property>
<property name="label" translatable="yes">Keyboard shortcut:</property>
</object>
<packing>
<property name="left_attach">0</property>
<property name="top_attach">3</property>
</packing>
</child> </child>
<child> <child>
<placeholder/> <placeholder/>

8
usr/lib/linuxmint/mintMenu/mintMenuConfig.py
View File

@ -64,9 +64,11 @@ class mintMenuConfig(object):
self.showButtonIcon = self.builder.get_object("showButtonIcon") self.showButtonIcon = self.builder.get_object("showButtonIcon")
self.enableInternetSearch = self.builder.get_object("enableInternetSearch") self.enableInternetSearch = self.builder.get_object("enableInternetSearch")
self.buttonText = self.builder.get_object("buttonText") self.buttonText = self.builder.get_object("buttonText")
self.hotkeyWidget = keybinding.KeybindingWidget(_("Keyboard shortcut:")) self.hotkeyWidget = keybinding.KeybindingWidget()
grid = self.builder.get_object("main_grid") self.builder.get_object("main_grid").attach_next_to(
grid.attach(self.hotkeyWidget, 0, 2, 2, 1) self.hotkeyWidget,
self.builder.get_object("keybinding_label"),
Gtk.PositionType.RIGHT, 1, 1)
self.buttonIcon = self.builder.get_object("buttonIcon") self.buttonIcon = self.builder.get_object("buttonIcon")
self.buttonIconChooser = self.builder.get_object("button_icon_chooser") self.buttonIconChooser = self.builder.get_object("button_icon_chooser")
self.image_filter = Gtk.FileFilter() self.image_filter = Gtk.FileFilter()