diff --git a/panel.js b/panel.js index abfdb97..22f9f0f 100644 --- a/panel.js +++ b/panel.js @@ -217,7 +217,6 @@ export var Panel = GObject.registerClass({ this.panel.add_child(this.taskbar.actor); - this._setAppmenuVisible(SETTINGS.get_boolean('show-appmenu')); this._setShowDesktopButton(true); this._setAllocationMap(); @@ -330,7 +329,6 @@ export var Panel = GObject.registerClass({ this._signalsHandler.destroy(); this.panel.remove_child(this.taskbar.actor); - this._setAppmenuVisible(false); if (this.intellihide) { this.intellihide.destroy(); @@ -514,11 +512,6 @@ export var Panel = GObject.registerClass({ ], () => this.taskbar.resetAppIcons() ], - [ - SETTINGS, - 'changed::show-appmenu', - () => this._setAppmenuVisible(SETTINGS.get_boolean('show-appmenu')) - ], [ SETTINGS, [ @@ -1012,22 +1005,6 @@ export var Panel = GObject.registerClass({ this._unmappedButtons.splice(this._unmappedButtons.indexOf(actor), 1); } - _setAppmenuVisible(isVisible) { - let parent; - let appMenu = this.statusArea.appMenu; - - if(appMenu) - parent = appMenu.container.get_parent(); - - if (parent) { - parent.remove_child(appMenu.container); - } - - if (isVisible && appMenu) { - this._leftBox.insert_child_above(appMenu.container, null); - } - } - _formatVerticalClock() { // https://github.com/GNOME/gnome-desktop/blob/master/libgnome-desktop/gnome-wall-clock.c#L310 if (this.statusArea.dateMenu) { diff --git a/prefs.js b/prefs.js index cd7acc5..2e78629 100644 --- a/prefs.js +++ b/prefs.js @@ -1312,11 +1312,6 @@ const Preferences = class { 'sensitive', Gio.SettingsBindFlags.DEFAULT); - this._settings.bind('show-appmenu', - this._builder.get_object('show_appmenu_switch'), - 'active', - Gio.SettingsBindFlags.DEFAULT); - this._settings.bind('show-window-previews', this._builder.get_object('show_window_previews_switch'), 'active', @@ -1903,6 +1898,7 @@ const Preferences = class { this._settings.set_value('secondarymenu-contains-showdetails', this._settings.get_default_value('secondarymenu-contains-showdetails')); }); + // TODO setting secondarymenu-contains-appmenu is not being used anywhere this._settings.bind('secondarymenu-contains-appmenu', this._builder.get_object('secondarymenu_appmenu_switch'), 'active', diff --git a/schemas/org.gnome.shell.extensions.dash-to-panel.gschema.xml b/schemas/org.gnome.shell.extensions.dash-to-panel.gschema.xml index 7e8ea3a..9e9fb6f 100644 --- a/schemas/org.gnome.shell.extensions.dash-to-panel.gschema.xml +++ b/schemas/org.gnome.shell.extensions.dash-to-panel.gschema.xml @@ -429,11 +429,6 @@ Show desktop animation time Window fade animation time when showing the destop - - false - Show appMenu button - Show appMenu on the right hand side of the panel - true Show window preview diff --git a/ui/SettingsBehavior.ui b/ui/SettingsBehavior.ui index 18db943..677f38a 100644 --- a/ui/SettingsBehavior.ui +++ b/ui/SettingsBehavior.ui @@ -43,18 +43,6 @@ - - - Show <i>AppMenu</i> button - Top Bar > Show App Menu must be enabled in Tweak Tool - - - center - - - - - Ungroup applications