diff --git a/Settings.ui b/Settings.ui
index 523235a..8949c9f 100644
--- a/Settings.ui
+++ b/Settings.ui
@@ -298,208 +298,6 @@
-
@@ -4762,6 +4560,7 @@
12
12
12
+ 6
32
-
+
+
+
+ 0
+ 3
+
+
+
+
+
+ 0
+ 2
+
+
+
+
+
+ 1
+ 3
+
+
+
+
+
+ 1
+ 2
+
+
+
+
+
+ 0
+ 1
+
+
+
+
+
@@ -5957,6 +5792,19 @@
0
+
+
+
+ 0
+ 2
+
+
+
+ 1
+ 2
+
+
+
+
1
1
-
+
+
+
+ 1
+ 1
+
+
+
+
+
+ 0
+ 1
+
+
diff --git a/prefs.js b/prefs.js
index b5d37fd..9ae567c 100644
--- a/prefs.js
+++ b/prefs.js
@@ -532,16 +532,6 @@ const Settings = new Lang.Class({
'active',
Gio.SettingsBindFlags.DEFAULT);
- this._settings.bind('multi-monitors',
- this._builder.get_object('multimon_multi_options_button'),
- 'sensitive',
- Gio.SettingsBindFlags.DEFAULT);
-
- this._settings.bind('isolate-monitors',
- this._builder.get_object('multimon_multi_isolate_monitor_switch'),
- 'active',
- Gio.SettingsBindFlags.DEFAULT);
-
this._settings.bind('show-clock-all-monitors',
this._builder.get_object('multimon_multi_show_clock_switch'),
'active',
@@ -552,47 +542,10 @@ const Settings = new Lang.Class({
'active',
Gio.SettingsBindFlags.DEFAULT);
- this._settings.bind('show-favorites-all-monitors',
- this._builder.get_object('multimon_multi_show_favorites_switch'),
- 'active',
- Gio.SettingsBindFlags.DEFAULT);
-
if (monitors.length === 1) {
- this._builder.get_object('multimon_listbox').set_sensitive(false);
this._builder.get_object('multimon_multi_switch').set_active(false);
}
- this._builder.get_object('multimon_multi_options_button').connect('clicked', Lang.bind(this, function() {
- let dialog = new Gtk.Dialog({ title: _('Multi-monitors options'),
- transient_for: this.widget.get_toplevel(),
- use_header_bar: true,
- modal: true });
-
- // GTK+ leaves positive values for application-defined response ids.
- // Use +1 for the reset action
- dialog.add_button(_('Reset to defaults'), 1);
-
- let box = this._builder.get_object('box_multimon_multi_options');
- dialog.get_content_area().add(box);
-
- dialog.connect('response', Lang.bind(this, function(dialog, id) {
- if (id == 1) {
- // restore default settings
- this._settings.set_value('isolate-monitors', this._settings.get_default_value('isolate-monitors'));
- this._settings.set_value('show-favorites-all-monitors', this._settings.get_default_value('show-favorites-all-monitors'));
- this._settings.set_value('show-clock-all-monitors', this._settings.get_default_value('show-clock-all-monitors'));
- this._settings.set_value('show-status-menu-all-monitors', this._settings.get_default_value('show-status-menu-all-monitors'));
- } else {
- // remove the settings box so it doesn't get destroyed;
- dialog.get_content_area().remove(box);
- dialog.destroy();
- }
- return;
- }));
-
- dialog.show_all();
- }));
-
//dynamic opacity
this._settings.bind('trans-use-custom-bg',
this._builder.get_object('trans_bg_switch'),
@@ -1067,6 +1020,16 @@ const Settings = new Lang.Class({
'active',
Gio.SettingsBindFlags.DEFAULT);
+ this._settings.bind('show-favorites-all-monitors',
+ this._builder.get_object('multimon_multi_show_favorites_switch'),
+ 'active',
+ Gio.SettingsBindFlags.DEFAULT);
+
+ this._settings.bind('show-favorites',
+ this._builder.get_object('multimon_multi_show_favorites_switch'),
+ 'sensitive',
+ Gio.SettingsBindFlags.DEFAULT);
+
this._settings.bind('show-running-apps',
this._builder.get_object('show_runnning_apps_switch'),
'active',
@@ -1297,6 +1260,11 @@ const Settings = new Lang.Class({
'active',
Gio.SettingsBindFlags.DEFAULT);
+ this._settings.bind('isolate-monitors',
+ this._builder.get_object('multimon_multi_isolate_monitor_switch'),
+ 'active',
+ Gio.SettingsBindFlags.DEFAULT);
+
this._settings.bind('group-apps',
this._builder.get_object('group_apps_switch'),
'active',
@@ -1782,7 +1750,20 @@ const Settings = new Lang.Class({
}
};
- this._settings.connect('changed::stockgs-keep-top-panel', () => maybeDisableTopPosition());
+ var setGsStockPanelOptions = () => {
+ let keepTopPanel = this._settings.get_boolean('stockgs-keep-top-panel');
+
+ this._builder.get_object('stockgs_top_panel_description')[keepTopPanel ? 'show' : 'hide']();
+ this._builder.get_object('multimon_multi_show_clock_label').set_text(keepTopPanel ? _('Display the clock on additional panels') : _('Display the clock on secondary panels'));
+ this._builder.get_object('multimon_multi_show_status_menu_label').set_text(keepTopPanel ? _('Display the status menu on additional panels') : _('Display the status menu on secondary panels'));
+ };
+
+ this._settings.connect('changed::stockgs-keep-top-panel', () => {
+ setGsStockPanelOptions();
+ maybeDisableTopPosition();
+ });
+
+ setGsStockPanelOptions();
maybeDisableTopPosition();
this._settings.bind('stockgs-panelbtn-click-only',
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 3418d6b..1b80e40 100644
--- a/schemas/org.gnome.shell.extensions.dash-to-panel.gschema.xml
+++ b/schemas/org.gnome.shell.extensions.dash-to-panel.gschema.xml
@@ -458,7 +458,7 @@
Show or hide favorite application icons in the dash
- 300
+ 400
Icon enter display time
Amount of time after entering icon to wait before displaying window preview if icon is not clicked or mouse has not left.