diff -up gnome-tweaks-3.28.1/gtweak/tweaks/tweak_group_top_bar.py.drop-app-menu-option gnome-tweaks-3.28.1/gtweak/tweaks/tweak_group_top_bar.py --- gnome-tweaks-3.28.1/gtweak/tweaks/tweak_group_top_bar.py.drop-app-menu-option 2019-07-04 11:57:08.757232549 +0200 +++ gnome-tweaks-3.28.1/gtweak/tweaks/tweak_group_top_bar.py 2019-07-04 11:58:58.306231034 +0200 @@ -4,60 +4,13 @@ import gtweak from gtweak.gshellwrapper import GnomeShellFactory -from gtweak.widgets import ListBoxTweakGroup, GSettingsSwitchTweak, GetterSetterSwitchTweak, Title, _GSettingsTweak -from gtweak.utils import XSettingsOverrides +from gtweak.widgets import ListBoxTweakGroup, GSettingsSwitchTweak, Title _shell = GnomeShellFactory().get_shell() _shell_loaded = _shell is not None -class ApplicationMenuTweak(GetterSetterSwitchTweak): - def __init__(self, **options): - self._xsettings = XSettingsOverrides() - name = _("Application Menu") - GetterSetterSwitchTweak.__init__(self, name, **options) - - _GSettingsTweak.__init__(self, - name, - "org.gnome.desktop.wm.preferences", - "button-layout", - loaded=_shell_loaded, - **options) - - def get_active(self): - return self._xsettings.get_shell_shows_app_menu() - - def set_active(self, v): - self._xsettings.set_shell_shows_app_menu(v) - - if v: - self.notify_logout() - return - val = self.settings.get_string(self.key_name) - if "appmenu" in val: - self.notify_logout() - return - else: - (left, colon, right) = val.partition(":") - - if "close" in right: - rsplit = right.split(",") - rsplit = [x for x in rsplit if x in ["minimize", "maximize", "close"]] - rsplit.append("appmenu") - rsplit.sort(key=lambda x: ["appmenu", "minimize", "maximize", "close"].index(x)) - self.settings.set_string(self.key_name, left + colon + ",".join(rsplit)) - - else: - rsplit = left.split(",") - rsplit = [x for x in rsplit if x in ["minimize", "maximize", "close"]] - rsplit.append("appmenu") - rsplit.sort(key=lambda x: ["close", "minimize", "maximize", "appmenu"].index(x)) - self.settings.set_string(self.key_name, ",".join(rsplit) + colon + right) - self.notify_logout() - - TWEAK_GROUPS = [ ListBoxTweakGroup(_("Top Bar"), - ApplicationMenuTweak(), GSettingsSwitchTweak(_("Battery Percentage"),"org.gnome.desktop.interface", "show-battery-percentage", loaded=_shell_loaded), # Requires patch from https://bugzilla.gnome.org/688320 GSettingsSwitchTweak(_("Activities Overview Hot Corner"),"org.gnome.shell", "enable-hot-corners", loaded=_shell_loaded),