BreizhHardware/multi-monitors-add-on
1
0
Fork 0
mirror of https://github.com/BreizhHardware/multi-monitors-add-on.git synced 2026-01-18 16:47:26 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix issues with Gnome 45

Browse Source
This commit is contained in:
Félix MARQUET
2024-04-03 11:31:53 +02:00
parent 747d4a2423
commit 43d9b68be6
8 changed files with 2274 additions and 1804 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
multi-monitors-add-on@breizhhardware/convenience.js
View File

@@ -25,12 +25,11 @@
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
const Gettext = imports.gettext;
const Gio = imports.gi.Gio;
const Config = imports.misc.config;
const ExtensionUtils = imports.misc.extensionUtils;
import { gettext as Gettext } from "resource:///org/gnome/shell/extensions/extension.js";
import Gio from "gi://Gio";
import * as Config from "resource:///org/gnome/shell/misc/config.js";
import * as extension from "./extension.js";
/**
* initTranslations:
* @domain: (optional): the gettext domain to use
@@ -38,20 +37,17 @@ const ExtensionUtils = imports.misc.extensionUtils;
* Initialize Gettext to load translations from extensionsdir/locale.
* If @domain is not provided, it will be taken from metadata['gettext-domain']
*/
function initTranslations(domain) {
let extension = ExtensionUtils.getCurrentExtension();
domain = domain || extension.metadata['gettext-domain'];
export function initTranslations(domain) {
domain = domain || extension.metadata["gettext-domain"];
// check if this extension was built with "make zip-file", and thus
// has the locale files in a subfolder
// otherwise assume that extension has been installed in the
// same prefix as gnome-shell
let localeDir = extension.dir.get_child('locale');
let localeDir = extension.dir.get_child("locale");
if (localeDir.query_exists(null))
Gettext.bindtextdomain(domain, localeDir.get_path());
else
Gettext.bindtextdomain(domain, Config.LOCALEDIR);
else Gettext.bindtextdomain(domain, Config.LOCALEDIR);
}
/**
@@ -62,10 +58,8 @@ function initTranslations(domain) {
* in extensionsdir/schemas. If @schema is not provided, it is taken from
* metadata['settings-schema'].
*/
function getSettings(schema) {
let extension = ExtensionUtils.getCurrentExtension();
schema = schema || extension.metadata['settings-schema'];
export function getSettings(schema) {
schema = schema || extension.metadata["settings-schema"];
const GioSSS = Gio.SettingsSchemaSource;
@@ -74,20 +68,25 @@ function getSettings(schema) {
// otherwise assume that extension has been installed in the
// same prefix as gnome-shell (and therefore schemas are available
// in the standard folders)
let schemaDir = extension.dir.get_child('schemas');
let schemaDir = extension.dir.get_child("schemas");
let schemaSource;
if (schemaDir.query_exists(null))
schemaSource = GioSSS.new_from_directory(schemaDir.get_path(),
schemaSource = GioSSS.new_from_directory(
schemaDir.get_path(),
GioSSS.get_default(),
false);
else
schemaSource = GioSSS.get_default();
false,
);
else schemaSource = GioSSS.get_default();
let schemaObj = schemaSource.lookup(schema, true);
if (!schemaObj)
throw new Error('Schema ' + schema + ' could not be found for extension '
+ extension.metadata.uuid + '. Please check your installation.');
throw new Error(
"Schema " +
schema +
" could not be found for extension " +
extension.metadata.uuid +
". Please check your installation.",
);
return new Gio.Settings({ settings_schema: schemaObj });
}

173
multi-monitors-add-on@breizhhardware/extension.js
View File

@@ -15,35 +15,34 @@ You should have received a copy of the GNU General Public License
along with this program; if not, visit https://www.gnu.org/licenses/.
*/
const { Clutter, Gio } = imports.gi;
import Clutter from "gi://Clutter";
import Gio from "gi://Gio";
const Main = imports.ui.main;
var { ANIMATION_TIME } = imports.ui.overview;
import * as Main from "resource:///org/gnome/shell/ui/main.js";
import { ANIMATION_TIME } from "resource:///org/gnome/shell/ui/overview.js";
import { Extension } from "resource:///org/gnome/shell/extensions/extension.js";
const Config = imports.misc.config;
const GNOME_SHELL_VERSION = Config.PACKAGE_VERSION.split('.');
import * as Config from "resource:///org/gnome/shell/misc/config.js";
const GNOME_SHELL_VERSION = Config.PACKAGE_VERSION.split(".");
const ExtensionUtils = imports.misc.extensionUtils;
const MultiMonitors = ExtensionUtils.getCurrentExtension();
const Convenience = MultiMonitors.imports.convenience;
import * as Convenience from "./convenience.js";
const MMLayout = MultiMonitors.imports.mmlayout;
const MMOverview = MultiMonitors.imports.mmoverview;
const MMIndicator = MultiMonitors.imports.indicator;
import * as MMLayout from "./mmlayout.js";
import * as MMOverview from "./mmoverview.js";
import * as MMIndicator from "./indicator.js";
const OVERRIDE_SCHEMA = 'org.gnome.shell.overrides';
const MUTTER_SCHEMA = 'org.gnome.mutter';
const WORKSPACES_ONLY_ON_PRIMARY_ID = 'workspaces-only-on-primary';
const OVERRIDE_SCHEMA = "org.gnome.shell.overrides";
const MUTTER_SCHEMA = "org.gnome.mutter";
const WORKSPACES_ONLY_ON_PRIMARY_ID = "workspaces-only-on-primary";
const SHOW_INDICATOR_ID = 'show-indicator';
const THUMBNAILS_SLIDER_POSITION_ID = 'thumbnails-slider-position';
const SHOW_INDICATOR_ID = "show-indicator";
const THUMBNAILS_SLIDER_POSITION_ID = "thumbnails-slider-position";
function copyClass (s, d) {
export function copyClass(s, d) {
// global.log(s.name +" > "+ d.name);
if (!s) throw Error(`copyClass s undefined for d ${d.name}`)
if (!s) throw Error(`copyClass s undefined for d ${d.name}`);
let propertyNames = Reflect.ownKeys(s.prototype);
for (let pName of propertyNames.values()) {
// global.log(" ) "+pName.toString());
if (typeof pName === "symbol") continue;
if (d.prototype.hasOwnProperty(pName)) continue;
@@ -52,17 +51,16 @@ function copyClass (s, d) {
// global.log(pName);
let pDesc = Reflect.getOwnPropertyDescriptor(s.prototype, pName);
// global.log(typeof pDesc);
if (typeof pDesc !== 'object') continue;
if (typeof pDesc !== "object") continue;
Reflect.defineProperty(d.prototype, pName, pDesc);
}
};
}
function gnomeShellVersion() {
export function gnomeShellVersion() {
return GNOME_SHELL_VERSION;
}
class MultiMonitorsAddOn {
export class MultiMonitorsAddOn extends Extension {
constructor() {
this._settings = Convenience.getSettings();
// this._ov_settings = new Gio.Settings({ schema: OVERRIDE_SCHEMA });
@@ -79,10 +77,12 @@ class MultiMonitorsAddOn {
_showIndicator() {
if (this._settings.get_boolean(SHOW_INDICATOR_ID)) {
if (!this.mmIndicator) {
this.mmIndicator = Main.panel.addToStatusArea('MultiMonitorsAddOn', new MMIndicator.MultiMonitorsIndicator());
this.mmIndicator = Main.panel.addToStatusArea(
"MultiMonitorsAddOn",
new MMIndicator.MultiMonitorsIndicator(),
);
}
}
else {
} else {
this._hideIndicator();
}
}
@@ -95,7 +95,7 @@ class MultiMonitorsAddOn {
}
_showThumbnailsSlider() {
if (this._settings.get_string(THUMBNAILS_SLIDER_POSITION_ID) === 'none') {
if (this._settings.get_string(THUMBNAILS_SLIDER_POSITION_ID) === "none") {
this._hideThumbnailsSlider();
return;
}
@@ -105,8 +105,7 @@ class MultiMonitorsAddOn {
if (this._mu_settings.get_boolean(WORKSPACES_ONLY_ON_PRIMARY_ID))
this._mu_settings.set_boolean(WORKSPACES_ONLY_ON_PRIMARY_ID, false);
if (Main.mmOverview)
return;
if (Main.mmOverview) return;
Main.mmOverview = [];
for (let idx = 0; idx < Main.layoutManager.monitors.length; idx++) {
@@ -115,10 +114,11 @@ class MultiMonitorsAddOn {
}
}
this.syncWorkspacesActualGeometry = Main.overview.searchController._workspacesDisplay._syncWorkspacesActualGeometry;
Main.overview.searchController._workspacesDisplay._syncWorkspacesActualGeometry = function() {
if (this._inWindowFade)
return;
this.syncWorkspacesActualGeometry =
Main.overview.searchController._workspacesDisplay._syncWorkspacesActualGeometry;
Main.overview.searchController._workspacesDisplay._syncWorkspacesActualGeometry =
function () {
if (this._inWindowFade) return;
const primaryView = this._getPrimaryView();
if (primaryView) {
@@ -130,13 +130,11 @@ class MultiMonitorsAddOn {
}
for (let idx = 0; idx < Main.mmOverview.length; idx++) {
if (!Main.mmOverview[idx])
continue;
if (!Main.mmOverview[idx]._overview)
continue;
const mmView = Main.mmOverview[idx]._overview._controls._workspacesViews;
if (!mmView)
continue;
if (!Main.mmOverview[idx]) continue;
if (!Main.mmOverview[idx]._overview) continue;
const mmView =
Main.mmOverview[idx]._overview._controls._workspacesViews;
if (!mmView) continue;
const mmGeometry = Main.mmOverview[idx].getWorkspacesActualGeometry();
mmView.ease({
@@ -145,19 +143,18 @@ class MultiMonitorsAddOn {
mode: Clutter.AnimationMode.EASE_OUT_QUAD,
});
}
}
};
}
_hideThumbnailsSlider() {
if (!Main.mmOverview)
return;
if (!Main.mmOverview) return;
for (let idx = 0; idx < Main.mmOverview.length; idx++) {
if (Main.mmOverview[idx])
Main.mmOverview[idx].destroy();
if (Main.mmOverview[idx]) Main.mmOverview[idx].destroy();
}
Main.mmOverview = null;
Main.overview.searchController._workspacesDisplay._syncWorkspacesActualGeometry = this.syncWorkspacesActualGeometry;
Main.overview.searchController._workspacesDisplay._syncWorkspacesActualGeometry =
this.syncWorkspacesActualGeometry;
}
_relayout() {
@@ -166,7 +163,18 @@ class MultiMonitorsAddOn {
global.log("pi:" + Main.layoutManager.primaryIndex);
for (let i = 0; i < Main.layoutManager.monitors.length; i++) {
let monitor = Main.layoutManager.monitors[i];
global.log("i:"+i+" x:"+monitor.x+" y:"+monitor.y+" w:"+monitor.width+" h:"+monitor.height);
global.log(
"i:" +
i +
" x:" +
monitor.x +
" y:" +
monitor.y +
" w:" +
monitor.width +
" h:" +
monitor.height,
);
}
this._hideThumbnailsSlider();
this._showThumbnailsSlider();
@@ -176,34 +184,47 @@ class MultiMonitorsAddOn {
_switchOffThumbnails() {
if (
// this._ov_settings.get_boolean(WORKSPACES_ONLY_ON_PRIMARY_ID) ||
this._mu_settings.get_boolean(WORKSPACES_ONLY_ON_PRIMARY_ID))
{
this._settings.set_string(THUMBNAILS_SLIDER_POSITION_ID, 'none');
this._mu_settings.get_boolean(WORKSPACES_ONLY_ON_PRIMARY_ID)
) {
this._settings.set_string(THUMBNAILS_SLIDER_POSITION_ID, "none");
}
}
enable(version) {
global.log("Enable Multi Monitors Add-On ("+version+")...")
global.log("Enable Multi Monitors Add-On (" + version + ")...");
if(Main.panel.statusArea.MultiMonitorsAddOn)
disable();
if (Main.panel.statusArea.MultiMonitorsAddOn) disable();
this._mmMonitors = 0;
// this._switchOffThumbnailsOvId = this._ov_settings.connect('changed::'+WORKSPACES_ONLY_ON_PRIMARY_ID,
// this._switchOffThumbnails.bind(this));
this._switchOffThumbnailsMuId = this._mu_settings.connect('changed::'+WORKSPACES_ONLY_ON_PRIMARY_ID,
this._switchOffThumbnails.bind(this));
this._switchOffThumbnailsMuId = this._mu_settings.connect(
"changed::" + WORKSPACES_ONLY_ON_PRIMARY_ID,
this._switchOffThumbnails.bind(this),
);
this._showIndicatorId = this._settings.connect('changed::'+SHOW_INDICATOR_ID, this._showIndicator.bind(this));
this._showIndicatorId = this._settings.connect(
"changed::" + SHOW_INDICATOR_ID,
this._showIndicator.bind(this),
);
this._showIndicator();
Main.mmLayoutManager = new MMLayout.MultiMonitorsLayoutManager();
this._showPanelId = this._settings.connect('changed::'+MMLayout.SHOW_PANEL_ID, Main.mmLayoutManager.showPanel.bind(Main.mmLayoutManager));
this._showPanelId = this._settings.connect(
"changed::" + MMLayout.SHOW_PANEL_ID,
Main.mmLayoutManager.showPanel.bind(Main.mmLayoutManager),
);
Main.mmLayoutManager.showPanel();
this._thumbnailsSliderPositionId = this._settings.connect('changed::'+THUMBNAILS_SLIDER_POSITION_ID, this._showThumbnailsSlider.bind(this));
this._relayoutId = Main.layoutManager.connect('monitors-changed', this._relayout.bind(this));
this._thumbnailsSliderPositionId = this._settings.connect(
"changed::" + THUMBNAILS_SLIDER_POSITION_ID,
this._showThumbnailsSlider.bind(this),
);
this._relayoutId = Main.layoutManager.connect(
"monitors-changed",
this._relayout.bind(this),
);
this._relayout();
}
@@ -216,7 +237,6 @@ class MultiMonitorsAddOn {
this._settings.disconnect(this._thumbnailsSliderPositionId);
this._settings.disconnect(this._showIndicatorId);
this._hideIndicator();
Main.mmLayoutManager.hidePanel();
@@ -225,14 +245,14 @@ class MultiMonitorsAddOn {
this._hideThumbnailsSlider();
this._mmMonitors = 0;
global.log("Disable Multi Monitors Add-On ...")
global.log("Disable Multi Monitors Add-On ...");
}
}
var multiMonitorsAddOn = null;
var version = null;
function init() {
export function init() {
Convenience.initTranslations();
// fix bug in panel: Destroy function many time added to this same indicator.
@@ -241,8 +261,7 @@ function init() {
if (indicator) {
indicator.container.show();
return null;
}
else {
} else {
let constructor = PANEL_ITEM_IMPLEMENTATIONS[role];
if (!constructor) {
// This icon is not implemented (this is a bug)
@@ -254,38 +273,34 @@ function init() {
return indicator;
};
const metaVersion = MultiMonitors.metadata['version'];
const metaVersion = MultiMonitors.metadata["version"];
if (Number.isFinite(metaVersion)) {
version = 'v'+Math.trunc(metaVersion);
version = "v" + Math.trunc(metaVersion);
switch (Math.round((metaVersion % 1) * 10)) {
case 0:
break;
case 1:
version += '+bugfix';
version += "+bugfix";
break;
case 2:
version += '+develop';
version += "+develop";
break;
default:
version += '+modified';
version += "+modified";
break;
}
}
else
version = metaVersion;
} else version = metaVersion;
}
function enable() {
if (multiMonitorsAddOn !== null)
return;
export function enable() {
if (multiMonitorsAddOn !== null) return;
multiMonitorsAddOn = new MultiMonitorsAddOn();
multiMonitorsAddOn.enable(version);
}
function disable() {
if (multiMonitorsAddOn == null)
return;
export function disable() {
if (multiMonitorsAddOn == null) return;
multiMonitorsAddOn.disable();
multiMonitorsAddOn = null;

76
multi-monitors-add-on@breizhhardware/indicator.js
View File

@@ -15,20 +15,25 @@ You should have received a copy of the GNU General Public License
along with this program; if not, visit https://www.gnu.org/licenses/.
*/
const { St, Gio, GLib, GObject } = imports.gi;
import St from "gi://St";
import Gio from "gi://Gio";
import GLib from "gi://GLib";
import GObject from "gi://GObject";
const Util = imports.misc.util;
const Main = imports.ui.main;
const PanelMenu = imports.ui.panelMenu;
import * as Util from "resource:///org/gnome/shell/misc/util.js";
imports.misc.util;
import * as Main from "resource:///org/gnome/shell/ui/main.js";
import * as PanelMenu from "resource:///org/gnome/shell/ui/panelMenu.js";
const Gettext = imports.gettext.domain('multi-monitors-add-on');
const _ = Gettext.gettext;
const CE = imports.misc.extensionUtils.getCurrentExtension();
const MultiMonitors = CE.imports.extension;
const Convenience = CE.imports.convenience;
const extensionPath = CE.path;
import {
Extension,
gettext as _,
} from "resource:///org/gnome/shell/extensions/extension.js";
import * as MultiMonitors from "./extension.js";
import * as Convenience from "./convenience.js";
const extensionPath = Extension.path;
var MultiMonitorsIndicator = (() => {
export const MultiMonitorsIndicator = (() => {
let MultiMonitorsIndicator = class MultiMonitorsIndicator extends PanelMenu.Button {
_init() {
super._init(0.0, "MultiMonitorsAddOn", false);
@@ -36,12 +41,17 @@ var MultiMonitorsIndicator = (() => {
Convenience.initTranslations();
this.text = null;
this._mmStatusIcon = new St.BoxLayout({ style_class: 'multimonitor-status-indicators-box' });
this._mmStatusIcon = new St.BoxLayout({
style_class: "multimonitor-status-indicators-box",
});
this._mmStatusIcon.hide();
this.add_child(this._mmStatusIcon);
this._leftRightIcon = true;
this.menu.addAction(_("Preferences"), this._onPreferences.bind(this));
this._viewMonitorsId = Main.layoutManager.connect('monitors-changed', this._viewMonitors.bind(this));
this._viewMonitorsId = Main.layoutManager.connect(
"monitors-changed",
this._viewMonitors.bind(this),
);
this._viewMonitors();
}
@@ -51,11 +61,15 @@ var MultiMonitorsIndicator = (() => {
}
_syncIndicatorsVisible() {
this._mmStatusIcon.visible = this._mmStatusIcon.get_children().some(a => a.visible);
this._mmStatusIcon.visible = this._mmStatusIcon
.get_children()
.some((a) => a.visible);
}
_icon_name(icon, iconName) {
icon.set_gicon(Gio.icon_new_for_string(extensionPath+"/icons/"+iconName+".svg"));
icon.set_gicon(
Gio.icon_new_for_string(extensionPath + "/icons/" + iconName + ".svg"),
);
}
_viewMonitors() {
@@ -66,19 +80,22 @@ var MultiMonitorsIndicator = (() => {
global.log("Add Monitors ...");
for (let idx = 0; idx < monitorChange; idx++) {
let icon;
icon = new St.Icon({style_class: 'system-status-icon multimonitor-status-icon'});
icon = new St.Icon({
style_class: "system-status-icon multimonitor-status-icon",
});
this._mmStatusIcon.add_child(icon);
icon.connect('notify::visible', this._syncIndicatorsVisible.bind(this));
icon.connect(
"notify::visible",
this._syncIndicatorsVisible.bind(this),
);
if (this._leftRightIcon)
this._icon_name(icon, 'multi-monitors-l-symbolic');
else
this._icon_name(icon, 'multi-monitors-r-symbolic');
this._icon_name(icon, "multi-monitors-l-symbolic");
else this._icon_name(icon, "multi-monitors-r-symbolic");
this._leftRightIcon = !this._leftRightIcon;
}
this._syncIndicatorsVisible();
}
else if(monitorChange<0){
} else if (monitorChange < 0) {
global.log("Remove Monitors ...");
monitorChange = -monitorChange;
@@ -92,17 +109,18 @@ var MultiMonitorsIndicator = (() => {
}
_onPreferences() {
const uuid = "multi-monitors-add-on@breizhhardware";
const uuid = "multi-monitors-add-on@spin83";
Gio.DBus.session.call(
'org.gnome.Shell.Extensions',
'/org/gnome/Shell/Extensions',
'org.gnome.Shell.Extensions',
'OpenExtensionPrefs',
new GLib.Variant('(ssa{sv})', [uuid, '', {}]),
"org.gnome.Shell.Extensions",
"/org/gnome/Shell/Extensions",
"org.gnome.Shell.Extensions",
"OpenExtensionPrefs",
new GLib.Variant("(ssa{sv})", [uuid, "", {}]),
null,
Gio.DBusCallFlags.NONE,
-1,
null);
null,
);
}
};
return GObject.registerClass(MultiMonitorsIndicator);

305
multi-monitors-add-on@breizhhardware/mmcalendar.js
View File

@@ -15,57 +15,73 @@ You should have received a copy of the GNU General Public License
along with this program; if not, visit https://www.gnu.org/licenses/.
*/
const Signals = imports.signals;
import * as Signals from "resource:///org/gnome/shell/signals.js";
const { St, Gio, Shell, Clutter, GnomeDesktop, Pango, GObject, GLib } = imports.gi;
import St from "gi://St";
import Gio from "gi://Gio";
import GLib from "gi://GLib";
import GObject from "gi://GObject";
import Shell from "gi://Shell";
import Clutter from "gi://Clutter";
import GnomeDesktop from "gi://GnomeDesktop";
import Pango from "gi://Pango";
const Main = imports.ui.main;
const PanelMenu = imports.ui.panelMenu;
const MessageList = imports.ui.messageList;
const DateMenu = imports.ui.dateMenu;
const Calendar = imports.ui.calendar;
const PopupMenu = imports.ui.popupMenu;
import * as Main from "resource:///org/gnome/shell/ui/main.js";
import * as PanelMenu from "resource:///org/gnome/shell/ui/panelMenu.js";
import * as MessageList from "resource:///org/gnome/shell/ui/messageList.js";
import * as DateMenu from "resource:///org/gnome/shell/ui/dateMenu.js";
import * as Calendar from "resource:///org/gnome/shell/ui/calendar.js";
import * as PopupMenu from "resource:///org/gnome/shell/ui/popupMenu.js";
const ExtensionUtils = imports.misc.extensionUtils;
const CE = ExtensionUtils.getCurrentExtension();
const MultiMonitors = CE.imports.extension;
const Convenience = CE.imports.convenience;
import * as MultiMonitors from "./extension.js";
import * as Convenience from "./convenience.js";
// Calendar.DoNotDisturbSwitch is const, so not exported. Either
// <https://gjs.guide/guides/gobject/subclassing.html#gtypename> is untrue, or
// GObject.type_from_name() is broken, so we can't get its constructor via GI
// either. Luckily it's a short class, so we can copy & paste.
const MultiMonitorsDoNotDisturbSwitch = GObject.registerClass(
export const MultiMonitorsDoNotDisturbSwitch = GObject.registerClass(
class MultiMonitorsDoNotDisturbSwitch extends PopupMenu.Switch {
_init() {
this._settings = new Gio.Settings({
schema_id: 'org.gnome.desktop.notifications',
schema_id: "org.gnome.desktop.notifications",
});
super._init(this._settings.get_boolean('show-banners'));
super._init(this._settings.get_boolean("show-banners"));
this._settings.bind('show-banners',
this, 'state',
Gio.SettingsBindFlags.INVERT_BOOLEAN);
this._settings.bind(
"show-banners",
this,
"state",
Gio.SettingsBindFlags.INVERT_BOOLEAN,
);
this.connect('destroy', () => {
this.connect("destroy", () => {
this._settings.run_dispose();
this._settings = null;
});
}
});
},
);
var MultiMonitorsCalendar = (() => {
export const MultiMonitorsCalendar = (() => {
let MultiMonitorsCalendar = class MultiMonitorsCalendar extends St.Widget {
_init() {
this._weekStart = Shell.util_get_week_start();
this._settings = new Gio.Settings({ schema_id: 'org.gnome.desktop.calendar' });
this._settings = new Gio.Settings({
schema_id: "org.gnome.desktop.calendar",
});
this._showWeekdateKeyId = this._settings.connect('changed::%s'.format(Calendar.SHOW_WEEKDATE_KEY), this._onSettingsChange.bind(this));
this._useWeekdate = this._settings.get_boolean(Calendar.SHOW_WEEKDATE_KEY);
this._showWeekdateKeyId = this._settings.connect(
"changed::%s".format(Calendar.SHOW_WEEKDATE_KEY),
this._onSettingsChange.bind(this),
);
this._useWeekdate = this._settings.get_boolean(
Calendar.SHOW_WEEKDATE_KEY,
);
this._headerFormatWithoutYear = _('%OB');
this._headerFormat = _('%OB %Y');
this._headerFormatWithoutYear = _("%OB");
this._headerFormat = _("%OB %Y");
// Start off with the current date
this._selectedDate = new Date();
@@ -73,13 +89,13 @@ var MultiMonitorsCalendar = (() => {
this._shouldDateGrabFocus = false;
super._init({
style_class: 'calendar',
style_class: "calendar",
layout_manager: new Clutter.GridLayout(),
reactive: true,
});
this._buildHeader();
this.connect('destroy', this._onDestroy.bind(this));
this.connect("destroy", this._onDestroy.bind(this));
}
_onDestroy() {
@@ -87,20 +103,25 @@ var MultiMonitorsCalendar = (() => {
}
};
MultiMonitors.copyClass(Calendar.Calendar, MultiMonitorsCalendar);
return GObject.registerClass({
Signals: { 'selected-date-changed': { param_types: [GLib.DateTime.$gtype] } },
}, MultiMonitorsCalendar);
return GObject.registerClass(
{
Signals: {
"selected-date-changed": { param_types: [GLib.DateTime.$gtype] },
},
},
MultiMonitorsCalendar,
);
})();
var MultiMonitorsEventsSection = (() => {
export var MultiMonitorsEventsSection = (() => {
let MultiMonitorsEventsSection = class MultiMonitorsEventsSection extends St.Button {
_init() {
super._init({
style_class: 'events-button',
style_class: "events-button",
can_focus: true,
x_expand: true,
child: new St.BoxLayout({
style_class: 'events-box',
style_class: "events-box",
vertical: true,
x_expand: true,
}),
@@ -113,35 +134,38 @@ var MultiMonitorsEventsSection = (() => {
this._calendarApp = null;
this._title = new St.Label({
style_class: 'events-title',
style_class: "events-title",
});
this.child.add_child(this._title);
this._eventsList = new St.BoxLayout({
style_class: 'events-list',
style_class: "events-list",
vertical: true,
x_expand: true,
});
this.child.add_child(this._eventsList);
this._appSys = Shell.AppSystem.get_default();
this._appInstalledChangedId = this._appSys.connect('installed-changed',
this._appInstalledChanged.bind(this));
this._appInstalledChangedId = this._appSys.connect(
"installed-changed",
this._appInstalledChanged.bind(this),
);
this._appInstalledChanged();
this.connect('destroy', this._onDestroy.bind(this));
this.connect("destroy", this._onDestroy.bind(this));
this._appInstalledChanged();
}
_onDestroy() {
this._appSys.disconnect(this._appInstalledChangedId);
}};
}
};
MultiMonitors.copyClass(DateMenu.EventsSection, MultiMonitorsEventsSection);
return GObject.registerClass(MultiMonitorsEventsSection);
})();
var MultiMonitorsNotificationSection = (() => {
export var MultiMonitorsNotificationSection = (() => {
let MultiMonitorsNotificationSection = class MultiMonitorsNotificationSection extends MessageList.MessageListSection {
_init() {
super._init();
@@ -149,12 +173,15 @@ var MultiMonitorsNotificationSection = (() => {
this._sources = new Map();
this._nUrgent = 0;
this._sourceAddedId = Main.messageTray.connect('source-added', this._sourceAdded.bind(this));
Main.messageTray.getSources().forEach(source => {
this._sourceAddedId = Main.messageTray.connect(
"source-added",
this._sourceAdded.bind(this),
);
Main.messageTray.getSources().forEach((source) => {
this._sourceAdded(Main.messageTray, source);
});
this.connect('destroy', this._onDestroy.bind(this));
this.connect("destroy", this._onDestroy.bind(this));
}
_onDestroy() {
@@ -163,17 +190,21 @@ var MultiMonitorsNotificationSection = (() => {
for ([source, obj] of this._sources.entries()) {
this._onSourceDestroy(source, obj);
}
}};
}
};
MultiMonitors.copyClass(Calendar.NotificationSection, MultiMonitorsNotificationSection);
MultiMonitors.copyClass(
Calendar.NotificationSection,
MultiMonitorsNotificationSection,
);
return GObject.registerClass(MultiMonitorsNotificationSection);
})();
var MultiMonitorsCalendarMessageList = (() => {
export var MultiMonitorsCalendarMessageList = (() => {
let MultiMonitorsCalendarMessageList = class MultiMonitorsCalendarMessageList extends St.Widget {
_init() {
super._init({
style_class: 'message-list',
style_class: "message-list",
layout_manager: new Clutter.BinLayout(),
x_expand: true,
y_expand: true,
@@ -184,23 +215,27 @@ var MultiMonitorsCalendarMessageList = (() => {
this._placeholder = new Calendar.Placeholder();
this.add_actor(this._placeholder);
let box = new St.BoxLayout({ vertical: true,
x_expand: true, y_expand: true });
let box = new St.BoxLayout({
vertical: true,
x_expand: true,
y_expand: true,
});
this.add_actor(box);
this._scrollView = new St.ScrollView({
style_class: 'vfade',
style_class: "vfade",
overlay_scrollbars: true,
x_expand: true, y_expand: true,
x_expand: true,
y_expand: true,
});
this._scrollView.set_policy(St.PolicyType.NEVER, St.PolicyType.AUTOMATIC);
box.add_actor(this._scrollView);
let hbox = new St.BoxLayout({ style_class: 'message-list-controls' });
let hbox = new St.BoxLayout({ style_class: "message-list-controls" });
box.add_child(hbox);
const dndLabel = new St.Label({
text: _('Do Not Disturb'),
text: _("Do Not Disturb"),
y_align: Clutter.ActorAlign.CENTER,
});
hbox.add_child(dndLabel);
@@ -213,42 +248,53 @@ var MultiMonitorsCalendarMessageList = (() => {
label_actor: dndLabel,
});
this._dndSwitch.bind_property('state',
this._dndButton, 'checked',
GObject.BindingFlags.BIDIRECTIONAL | GObject.BindingFlags.SYNC_CREATE);
this._dndSwitch.bind_property(
"state",
this._dndButton,
"checked",
GObject.BindingFlags.BIDIRECTIONAL | GObject.BindingFlags.SYNC_CREATE,
);
hbox.add_child(this._dndButton);
this._clearButton = new St.Button({
style_class: 'message-list-clear-button button',
label: _('Clear'),
style_class: "message-list-clear-button button",
label: _("Clear"),
can_focus: true,
x_expand: true,
x_align: Clutter.ActorAlign.END,
});
this._clearButton.connect('clicked', () => {
this._sectionList.get_children().forEach(s => s.clear());
this._clearButton.connect("clicked", () => {
this._sectionList.get_children().forEach((s) => s.clear());
});
hbox.add_actor(this._clearButton);
this._placeholder.bind_property('visible',
this._clearButton, 'visible',
GObject.BindingFlags.INVERT_BOOLEAN);
this._placeholder.bind_property(
"visible",
this._clearButton,
"visible",
GObject.BindingFlags.INVERT_BOOLEAN,
);
this._sectionList = new St.BoxLayout({ style_class: 'message-list-sections',
this._sectionList = new St.BoxLayout({
style_class: "message-list-sections",
vertical: true,
x_expand: true,
y_expand: true,
y_align: Clutter.ActorAlign.START });
this._sectionList.connect('actor-added', this._sync.bind(this));
this._sectionList.connect('actor-removed', this._sync.bind(this));
y_align: Clutter.ActorAlign.START,
});
this._sectionList.connect("actor-added", this._sync.bind(this));
this._sectionList.connect("actor-removed", this._sync.bind(this));
this._scrollView.add_actor(this._sectionList);
this._notificationSection = new MultiMonitorsNotificationSection();
this._addSection(this._notificationSection);
this._sessionModeUpdatedId = Main.sessionMode.connect('updated', this._sync.bind(this));
this.connect('destroy', this._onDestroy.bind(this));
this._sessionModeUpdatedId = Main.sessionMode.connect(
"updated",
this._sync.bind(this),
);
this.connect("destroy", this._onDestroy.bind(this));
}
_onDestroy() {
@@ -259,13 +305,17 @@ var MultiMonitorsCalendarMessageList = (() => {
_sync() {
if (this._sessionModeUpdatedId === 0) return;
Calendar.CalendarMessageList.prototype._sync.call(this);
}};
}
};
MultiMonitors.copyClass(Calendar.CalendarMessageList, MultiMonitorsCalendarMessageList);
MultiMonitors.copyClass(
Calendar.CalendarMessageList,
MultiMonitorsCalendarMessageList,
);
return GObject.registerClass(MultiMonitorsCalendarMessageList);
})();
var MultiMonitorsMessagesIndicator = (() => {
export var MultiMonitorsMessagesIndicator = (() => {
let MultiMonitorsMessagesIndicator = class MultiMonitorsMessagesIndicator extends St.Icon {
_init() {
super._init({
@@ -279,33 +329,46 @@ var MultiMonitorsMessagesIndicator = (() => {
this._count = 0;
this._settings = new Gio.Settings({
schema_id: 'org.gnome.desktop.notifications',
schema_id: "org.gnome.desktop.notifications",
});
this._settings.connect('changed::show-banners', this._sync.bind(this));
this._settings.connect("changed::show-banners", this._sync.bind(this));
this._sourceAddedId = Main.messageTray.connect('source-added', this._onSourceAdded.bind(this));
this._sourceRemovedId = Main.messageTray.connect('source-removed', this._onSourceRemoved.bind(this));
this._queueChangedId = Main.messageTray.connect('queue-changed', this._updateCount.bind(this));
this._sourceAddedId = Main.messageTray.connect(
"source-added",
this._onSourceAdded.bind(this),
);
this._sourceRemovedId = Main.messageTray.connect(
"source-removed",
this._onSourceRemoved.bind(this),
);
this._queueChangedId = Main.messageTray.connect(
"queue-changed",
this._updateCount.bind(this),
);
let sources = Main.messageTray.getSources();
sources.forEach(source => this._onSourceAdded(null, source));
sources.forEach((source) => this._onSourceAdded(null, source));
this._sync();
this.connect('destroy', () => {
this.connect("destroy", () => {
this._settings.run_dispose();
this._settings = null;
Main.messageTray.disconnect(this._sourceAddedId);
Main.messageTray.disconnect(this._sourceRemovedId);
Main.messageTray.disconnect(this._queueChangedId);
});
}};
}
};
MultiMonitors.copyClass(DateMenu.MessagesIndicator, MultiMonitorsMessagesIndicator);
MultiMonitors.copyClass(
DateMenu.MessagesIndicator,
MultiMonitorsMessagesIndicator,
);
return GObject.registerClass(MultiMonitorsMessagesIndicator);
})();
var MultiMonitorsDateMenuButton = (() => {
export var MultiMonitorsDateMenuButton = (() => {
let MultiMonitorsDateMenuButton = class MultiMonitorsDateMenuButton extends PanelMenu.Button {
_init() {
let hbox;
@@ -313,29 +376,34 @@ var MultiMonitorsDateMenuButton = (() => {
super._init(0.5);
this._clockDisplay = new St.Label({ style_class: 'clock' });
this._clockDisplay = new St.Label({ style_class: "clock" });
this._clockDisplay.clutter_text.y_align = Clutter.ActorAlign.CENTER;
this._clockDisplay.clutter_text.ellipsize = Pango.EllipsizeMode.NONE;
this._indicator = new MultiMonitorsMessagesIndicator();
const indicatorPad = new St.Widget();
this._indicator.bind_property('visible',
indicatorPad, 'visible',
GObject.BindingFlags.SYNC_CREATE);
indicatorPad.add_constraint(new Clutter.BindConstraint({
this._indicator.bind_property(
"visible",
indicatorPad,
"visible",
GObject.BindingFlags.SYNC_CREATE,
);
indicatorPad.add_constraint(
new Clutter.BindConstraint({
source: this._indicator,
coordinate: Clutter.BindCoordinate.SIZE,
}));
}),
);
let box = new St.BoxLayout({ style_class: 'clock-display-box' });
let box = new St.BoxLayout({ style_class: "clock-display-box" });
box.add_actor(indicatorPad);
box.add_actor(this._clockDisplay);
box.add_actor(this._indicator);
this.label_actor = this._clockDisplay;
this.add_actor(box);
this.add_style_class_name('clock-display');
this.add_style_class_name("clock-display");
let layout = new DateMenu.FreezableBinLayout();
let bin = new St.Widget({ layout_manager: layout });
@@ -343,18 +411,18 @@ var MultiMonitorsDateMenuButton = (() => {
bin._delegate = this;
this.menu.box.add_child(bin);
hbox = new St.BoxLayout({ name: 'calendarArea' });
hbox = new St.BoxLayout({ name: "calendarArea" });
bin.add_actor(hbox);
this._calendar = new MultiMonitorsCalendar();
this._calendar.connect('selected-date-changed', (_calendar, datetime) => {
this._calendar.connect("selected-date-changed", (_calendar, datetime) => {
let date = DateMenu._gDateTimeToDate(datetime);
layout.frozen = !DateMenu._isToday(date);
this._eventsItem.setDate(date);
});
this._date = new DateMenu.TodayButton(this._calendar);
this.menu.connect('open-state-changed', (menu, isOpen) => {
this.menu.connect("open-state-changed", (menu, isOpen) => {
// Whenever the menu is opened, select today
if (isOpen) {
let now = new Date();
@@ -369,34 +437,57 @@ var MultiMonitorsDateMenuButton = (() => {
hbox.add_child(this._messageList);
// Fill up the second column
const boxLayout = new DateMenu.CalendarColumnLayout([this._calendar, this._date]);
vbox = new St.Widget({ style_class: 'datemenu-calendar-column',
layout_manager: boxLayout });
const boxLayout = new DateMenu.CalendarColumnLayout([
this._calendar,
this._date,
]);
vbox = new St.Widget({
style_class: "datemenu-calendar-column",
layout_manager: boxLayout,
});
boxLayout.hookup_style(vbox);
hbox.add(vbox);
vbox.add_actor(this._date);
vbox.add_actor(this._calendar);
this._displaysSection = new St.ScrollView({ style_class: 'datemenu-displays-section vfade',
this._displaysSection = new St.ScrollView({
style_class: "datemenu-displays-section vfade",
x_expand: true,
overlay_scrollbars: true });
this._displaysSection.set_policy(St.PolicyType.NEVER, St.PolicyType.EXTERNAL);
overlay_scrollbars: true,
});
this._displaysSection.set_policy(
St.PolicyType.NEVER,
St.PolicyType.EXTERNAL,
);
vbox.add_actor(this._displaysSection);
let displaysBox = new St.BoxLayout({ vertical: true,
let displaysBox = new St.BoxLayout({
vertical: true,
x_expand: true,
style_class: 'datemenu-displays-box' });
style_class: "datemenu-displays-box",
});
this._displaysSection.add_actor(displaysBox);
this._eventsItem = new MultiMonitorsEventsSection();
displaysBox.add_child(this._eventsItem);
this._clock = new GnomeDesktop.WallClock();
this._clock.bind_property('clock', this._clockDisplay, 'text', GObject.BindingFlags.SYNC_CREATE);
this._clockNotifyTimezoneId = this._clock.connect('notify::timezone', this._updateTimeZone.bind(this));
this._clock.bind_property(
"clock",
this._clockDisplay,
"text",
GObject.BindingFlags.SYNC_CREATE,
);
this._clockNotifyTimezoneId = this._clock.connect(
"notify::timezone",
this._updateTimeZone.bind(this),
);
this._sessionModeUpdatedId = Main.sessionMode.connect('updated', this._sessionUpdated.bind(this));
this._sessionModeUpdatedId = Main.sessionMode.connect(
"updated",
this._sessionUpdated.bind(this),
);
this._sessionUpdated();
}
@@ -404,9 +495,9 @@ var MultiMonitorsDateMenuButton = (() => {
Main.sessionMode.disconnect(this._sessionModeUpdatedId);
this._clock.disconnect(this._clockNotifyTimezoneId);
super._onDestroy();
}};
}
};
MultiMonitors.copyClass(DateMenu.DateMenuButton, MultiMonitorsDateMenuButton);
return GObject.registerClass(MultiMonitorsDateMenuButton);
})();

119
multi-monitors-add-on@breizhhardware/mmlayout.js
View File

@@ -2,30 +2,43 @@
* New node file
*/
const { St, Meta } = imports.gi;
import St from "gi://St";
import Meta from "gi://Meta";
const Main = imports.ui.main;
const Panel = imports.ui.panel;
const Layout = imports.ui.layout;
import * as Main from "resource:///org/gnome/shell/ui/main.js";
import * as Panel from "resource:///org/gnome/shell/ui/panel.js";
import * as Layout from "resource:///org/gnome/shell/ui/layout.js";
const Config = imports.misc.config;
import * as Config from "resource:///org/gnome/shell/misc/config.js";
const ExtensionUtils = imports.misc.extensionUtils;
const CE = ExtensionUtils.getCurrentExtension();
const Convenience = CE.imports.convenience;
const MultiMonitors = CE.imports.extension;
const MMPanel = CE.imports.mmpanel;
import {
Extension,
gettext as _,
} from "resource:///org/gnome/shell/extensions/extension.js";
import * as Convenience from "./convenience.js";
import * as MultiMonitors from "./extension.js";
import * as MMPanel from "./mmpanel.js";
var SHOW_PANEL_ID = 'show-panel';
var ENABLE_HOT_CORNERS = 'enable-hot-corners';
var SHOW_PANEL_ID = "show-panel";
var ENABLE_HOT_CORNERS = "enable-hot-corners";
const MultiMonitorsPanelBox = class MultiMonitorsPanelBox {
export const MultiMonitorsPanelBox = class MultiMonitorsPanelBox {
constructor(monitor) {
this.panelBox = new St.BoxLayout({ name: 'panelBox', vertical: true, clip_to_allocation: true });
Main.layoutManager.addChrome(this.panelBox, { affectsStruts: true, trackFullscreen: true });
this.panelBox = new St.BoxLayout({
name: "panelBox",
vertical: true,
clip_to_allocation: true,
});
Main.layoutManager.addChrome(this.panelBox, {
affectsStruts: true,
trackFullscreen: true,
});
this.panelBox.set_position(monitor.x, monitor.y);
this.panelBox.set_size(monitor.width, -1);
Main.uiGroup.set_child_below_sibling(this.panelBox, Main.layoutManager.panelBox);
Main.uiGroup.set_child_below_sibling(
this.panelBox,
Main.layoutManager.panelBox,
);
}
destroy() {
@@ -38,10 +51,12 @@ const MultiMonitorsPanelBox = class MultiMonitorsPanelBox {
}
};
var MultiMonitorsLayoutManager = class MultiMonitorsLayoutManager {
export const class MultiMonitorsLayoutManager {
constructor() {
this._settings = Convenience.getSettings();
this._desktopSettings = Convenience.getSettings("org.gnome.desktop.interface");
this._desktopSettings = Convenience.getSettings(
"org.gnome.desktop.interface",
);
Main.mmPanel = [];
@@ -60,30 +75,37 @@ var MultiMonitorsLayoutManager = class MultiMonitorsLayoutManager {
showPanel() {
if (this._settings.get_boolean(SHOW_PANEL_ID)) {
if (!this._monitorsChangedId) {
this._monitorsChangedId = Main.layoutManager.connect('monitors-changed', this._monitorsChanged.bind(this));
this._monitorsChangedId = Main.layoutManager.connect(
"monitors-changed",
this._monitorsChanged.bind(this),
);
this._monitorsChanged();
}
if (!this._showAppMenuId) {
this._showAppMenuId = this._settings.connect('changed::'+MMPanel.SHOW_APP_MENU_ID, this._showAppMenu.bind(this));
this._showAppMenuId = this._settings.connect(
"changed::" + MMPanel.SHOW_APP_MENU_ID,
this._showAppMenu.bind(this),
);
}
if (!this.statusIndicatorsController) {
this.statusIndicatorsController = new MMPanel.StatusIndicatorsController();
this.statusIndicatorsController =
new MMPanel.StatusIndicatorsController();
}
if (!this._layoutManager_updateHotCorners) {
this._layoutManager_updateHotCorners = Main.layoutManager._updateHotCorners;
this._layoutManager_updateHotCorners =
Main.layoutManager._updateHotCorners;
const _this = this;
Main.layoutManager._updateHotCorners = function () {
this.hotCorners.forEach((corner) => {
if (corner)
corner.destroy();
if (corner) corner.destroy();
});
this.hotCorners = [];
if (!_this._desktopSettings.get_boolean(ENABLE_HOT_CORNERS)) {
this.emit('hot-corners-changed');
this.emit("hot-corners-changed");
return;
}
@@ -99,18 +121,19 @@ var MultiMonitorsLayoutManager = class MultiMonitorsLayoutManager {
this.hotCorners.push(corner);
}
this.emit('hot-corners-changed');
this.emit("hot-corners-changed");
};
if (!this._changedEnableHotCornersId) {
this._changedEnableHotCornersId = this._desktopSettings.connect('changed::'+ENABLE_HOT_CORNERS,
Main.layoutManager._updateHotCorners.bind(Main.layoutManager));
this._changedEnableHotCornersId = this._desktopSettings.connect(
"changed::" + ENABLE_HOT_CORNERS,
Main.layoutManager._updateHotCorners.bind(Main.layoutManager),
);
}
Main.layoutManager._updateHotCorners();
}
}
else {
} else {
this.hidePanel();
}
}
@@ -122,7 +145,8 @@ var MultiMonitorsLayoutManager = class MultiMonitorsLayoutManager {
}
if (this._layoutManager_updateHotCorners) {
Main.layoutManager['_updateHotCorners'] = this._layoutManager_updateHotCorners;
Main.layoutManager["_updateHotCorners"] =
this._layoutManager_updateHotCorners;
this._layoutManager_updateHotCorners = null;
Main.layoutManager._updateHotCorners();
}
@@ -152,7 +176,8 @@ var MultiMonitorsLayoutManager = class MultiMonitorsLayoutManager {
}
_monitorsChanged() {
let monitorChange = Main.layoutManager.monitors.length - this._monitorIds.length -1;
let monitorChange =
Main.layoutManager.monitors.length - this._monitorIds.length - 1;
if (monitorChange < 0) {
for (let idx = 0; idx < -monitorChange; idx++) {
let monitorId = this._monitorIds.pop();
@@ -166,14 +191,26 @@ var MultiMonitorsLayoutManager = class MultiMonitorsLayoutManager {
for (let i = 0; i < Main.layoutManager.monitors.length; i++) {
if (i != Main.layoutManager.primaryIndex) {
let monitor = Main.layoutManager.monitors[i];
let monitorId = "i"+i+"x"+monitor.x+"y"+monitor.y+"w"+monitor.width+"h"+monitor.height;
let monitorId =
"i" +
i +
"x" +
monitor.x +
"y" +
monitor.y +
"w" +
monitor.width +
"h" +
monitor.height;
if (monitorChange > 0 && j == this._monitorIds.length) {
this._monitorIds.push(monitorId);
this._pushPanel(i, monitor);
global.log("new: " + monitorId);
tIndicators = true;
}
else if (this._monitorIds[j]>monitorId || this._monitorIds[j]<monitorId) {
} else if (
this._monitorIds[j] > monitorId ||
this._monitorIds[j] < monitorId
) {
let oldMonitorId = this._monitorIds[j];
this._monitorIds[j] = monitorId;
this.mmPanelBox[j].updatePanel(monitor);
@@ -230,13 +267,15 @@ var MultiMonitorsLayoutManager = class MultiMonitorsLayoutManager {
}
_showAppMenu() {
if (this._settings.get_boolean(MMPanel.SHOW_APP_MENU_ID) && Main.mmPanel.length>0) {
if (
this._settings.get_boolean(MMPanel.SHOW_APP_MENU_ID) &&
Main.mmPanel.length > 0
) {
if (!this.mmappMenu) {
this._changeMainPanelAppMenuButton(MMPanel.MultiMonitorsAppMenuButton);
this.mmappMenu = true;
}
}
else {
} else {
this._hideAppMenu();
}
}
@@ -245,7 +284,7 @@ var MultiMonitorsLayoutManager = class MultiMonitorsLayoutManager {
if (this.mmappMenu) {
this._changeMainPanelAppMenuButton(Panel.AppMenuButton);
this.mmappMenu = false;
Main.panel._updatePanel()
Main.panel._updatePanel();
}
}
}
};

420
multi-monitors-add-on@breizhhardware/mmoverview.js
View File

@@ -15,31 +15,35 @@ You should have received a copy of the GNU General Public License
along with this program; if not, visit https://www.gnu.org/licenses/.
*/
const { Clutter, GObject, St, Shell, GLib, Gio, Meta } = imports.gi;
import Clutter from "gi://Clutter";
import GObject from "gi://GObject";
import St from "gi://St";
import Shell from "gi://Shell";
import GLib from "gi://GLib";
import Gio from "gi://Gio";
import Meta from "gi://Meta";
const Main = imports.ui.main;
const Params = imports.misc.params;
const WorkspaceThumbnail = imports.ui.workspaceThumbnail;
const OverviewControls = imports.ui.overviewControls;
const Overview = imports.ui.overview;
const SearchController = imports.ui.searchController;
const LayoutManager = imports.ui.layout;
const Background = imports.ui.background;
const WorkspacesView = imports.ui.workspacesView;
import * as Main from "resource:///org/gnome/shell/ui/main.js";
import * as Params from "resource:///org/gnome/shell/misc/params.js";
import * as WorkspaceThumbnail from "resource:///org/gnome/shell/ui/workspaceThumbnail.js";
import * as OverviewControls from "resource:///org/gnome/shell/ui/overviewControls.js";
import * as Overview from "resource:///org/gnome/shell/ui/overview.js";
import * as SearchController from "resource:///org/gnome/shell/ui/searchController.js";
import * as LayoutManager from "resource:///org/gnome/shell/ui/layoutManager.js";
import * as Background from "resource:///org/gnome/shell/ui/background.js";
import * as WorkspacesView from "resource:///org/gnome/shell/ui/workspacesView.js";
const ExtensionUtils = imports.misc.extensionUtils;
const CE = ExtensionUtils.getCurrentExtension();
const MultiMonitors = CE.imports.extension;
const Convenience = CE.imports.convenience;
import * as MultiMonitors from "./extension.js";
import * as Convenience from "./convenience.js";
const THUMBNAILS_SLIDER_POSITION_ID = 'thumbnails-slider-position';
const THUMBNAILS_SLIDER_POSITION_ID = "thumbnails-slider-position";
var MultiMonitorsWorkspaceThumbnail = (() => {
export var MultiMonitorsWorkspaceThumbnail = (() => {
let MultiMonitorsWorkspaceThumbnail = class MultiMonitorsWorkspaceThumbnail extends St.Widget {
_init(metaWorkspace, monitorIndex) {
super._init({
clip_to_allocation: true,
style_class: 'workspace-thumbnail',
style_class: "workspace-thumbnail",
});
this._delegate = this;
@@ -51,14 +55,16 @@ var MultiMonitorsWorkspaceThumbnail = (() => {
this._contents = new Clutter.Actor();
this.add_child(this._contents);
this.connect('destroy', this._onDestroy.bind(this));
this.connect("destroy", this._onDestroy.bind(this));
this._createBackground();
let workArea = Main.layoutManager.getWorkAreaForMonitor(this.monitorIndex);
let workArea = Main.layoutManager.getWorkAreaForMonitor(
this.monitorIndex,
);
this.setPorthole(workArea.x, workArea.y, workArea.width, workArea.height);
let windows = global.get_window_actors().filter(actor => {
let windows = global.get_window_actors().filter((actor) => {
let win = actor.meta_window;
return win.located_on_workspace(metaWorkspace);
});
@@ -68,9 +74,10 @@ var MultiMonitorsWorkspaceThumbnail = (() => {
this._allWindows = [];
this._minimizedChangedIds = [];
for (let i = 0; i < windows.length; i++) {
let minimizedChangedId =
windows[i].meta_window.connect('notify::minimized',
this._updateMinimized.bind(this));
let minimizedChangedId = windows[i].meta_window.connect(
"notify::minimized",
this._updateMinimized.bind(this),
);
this._allWindows.push(windows[i].meta_window);
this._minimizedChangedIds.push(minimizedChangedId);
@@ -79,14 +86,22 @@ var MultiMonitorsWorkspaceThumbnail = (() => {
}
// Track window changes
this._windowAddedId = this.metaWorkspace.connect('window-added',
this._windowAdded.bind(this));
this._windowRemovedId = this.metaWorkspace.connect('window-removed',
this._windowRemoved.bind(this));
this._windowEnteredMonitorId = global.display.connect('window-entered-monitor',
this._windowEnteredMonitor.bind(this));
this._windowLeftMonitorId = global.display.connect('window-left-monitor',
this._windowLeftMonitor.bind(this));
this._windowAddedId = this.metaWorkspace.connect(
"window-added",
this._windowAdded.bind(this),
);
this._windowRemovedId = this.metaWorkspace.connect(
"window-removed",
this._windowRemoved.bind(this),
);
this._windowEnteredMonitorId = global.display.connect(
"window-entered-monitor",
this._windowEnteredMonitor.bind(this),
);
this._windowLeftMonitorId = global.display.connect(
"window-left-monitor",
this._windowLeftMonitor.bind(this),
);
this.state = WorkspaceThumbnail.ThumbnailState.NORMAL;
this._slidePosition = 0; // Fully slid in
@@ -94,38 +109,60 @@ var MultiMonitorsWorkspaceThumbnail = (() => {
}
_createBackground() {
this._bgManager = new Background.BackgroundManager({ monitorIndex: this.monitorIndex,
this._bgManager = new Background.BackgroundManager({
monitorIndex: this.monitorIndex,
container: this._contents,
vignette: false });
}};
vignette: false,
});
}
};
MultiMonitors.copyClass(WorkspaceThumbnail.WorkspaceThumbnail, MultiMonitorsWorkspaceThumbnail);
return GObject.registerClass({
MultiMonitors.copyClass(
WorkspaceThumbnail.WorkspaceThumbnail,
MultiMonitorsWorkspaceThumbnail,
);
return GObject.registerClass(
{
Properties: {
'collapse-fraction': GObject.ParamSpec.double(
'collapse-fraction', 'collapse-fraction', 'collapse-fraction',
"collapse-fraction": GObject.ParamSpec.double(
"collapse-fraction",
"collapse-fraction",
"collapse-fraction",
GObject.ParamFlags.READWRITE,
0, 1, 0),
'slide-position': GObject.ParamSpec.double(
'slide-position', 'slide-position', 'slide-position',
0,
1,
0,
),
"slide-position": GObject.ParamSpec.double(
"slide-position",
"slide-position",
"slide-position",
GObject.ParamFlags.READWRITE,
0, 1, 0),
0,
1,
0,
),
},
}, MultiMonitorsWorkspaceThumbnail);
},
MultiMonitorsWorkspaceThumbnail,
);
})();
const MultiMonitorsThumbnailsBox = (() => {
export const MultiMonitorsThumbnailsBox = (() => {
let MultiMonitorsThumbnailsBox = class MultiMonitorsThumbnailsBox extends St.Widget {
_init(scrollAdjustment, monitorIndex) {
super._init({ reactive: true,
style_class: 'workspace-thumbnails',
request_mode: Clutter.RequestMode.WIDTH_FOR_HEIGHT });
super._init({
reactive: true,
style_class: "workspace-thumbnails",
request_mode: Clutter.RequestMode.WIDTH_FOR_HEIGHT,
});
this._delegate = this;
this._monitorIndex = monitorIndex;
let indicator = new St.Bin({ style_class: 'workspace-thumbnail-indicator' });
let indicator = new St.Bin({
style_class: "workspace-thumbnail-indicator",
});
// We don't want the indicator to affect drag-and-drop
Shell.util_set_hidden_from_pick(indicator, true);
@@ -134,12 +171,16 @@ const MultiMonitorsThumbnailsBox = (() => {
this.add_actor(indicator);
// The porthole is the part of the screen we're showing in the thumbnails
this._porthole = { width: global.stage.width, height: global.stage.height,
x: global.stage.x, y: global.stage.y };
this._porthole = {
width: global.stage.width,
height: global.stage.height,
x: global.stage.x,
y: global.stage.y,
};
this._dropWorkspace = -1;
this._dropPlaceholderPos = -1;
this._dropPlaceholder = new St.Bin({ style_class: 'placeholder' });
this._dropPlaceholder = new St.Bin({ style_class: "placeholder" });
this.add_actor(this._dropPlaceholder);
this._spliceIndex = -1;
@@ -155,36 +196,60 @@ const MultiMonitorsThumbnailsBox = (() => {
this._thumbnails = [];
this._showingId = Main.overview.connect('showing',
this._createThumbnails.bind(this));
this._hiddenId = Main.overview.connect('hidden',
this._destroyThumbnails.bind(this));
this._showingId = Main.overview.connect(
"showing",
this._createThumbnails.bind(this),
);
this._hiddenId = Main.overview.connect(
"hidden",
this._destroyThumbnails.bind(this),
);
this._itemDragBeginId = Main.overview.connect('item-drag-begin',
this._onDragBegin.bind(this));
this._itemDragEndId = Main.overview.connect('item-drag-end',
this._onDragEnd.bind(this));
this._itemDragCancelledId = Main.overview.connect('item-drag-cancelled',
this._onDragCancelled.bind(this));
this._windowDragBeginId = Main.overview.connect('window-drag-begin',
this._onDragBegin.bind(this));
this._windowDragEndId = Main.overview.connect('window-drag-end',
this._onDragEnd.bind(this));
this._windowDragCancelledId = Main.overview.connect('window-drag-cancelled',
this._onDragCancelled.bind(this));
this._itemDragBeginId = Main.overview.connect(
"item-drag-begin",
this._onDragBegin.bind(this),
);
this._itemDragEndId = Main.overview.connect(
"item-drag-end",
this._onDragEnd.bind(this),
);
this._itemDragCancelledId = Main.overview.connect(
"item-drag-cancelled",
this._onDragCancelled.bind(this),
);
this._windowDragBeginId = Main.overview.connect(
"window-drag-begin",
this._onDragBegin.bind(this),
);
this._windowDragEndId = Main.overview.connect(
"window-drag-end",
this._onDragEnd.bind(this),
);
this._windowDragCancelledId = Main.overview.connect(
"window-drag-cancelled",
this._onDragCancelled.bind(this),
);
this._settings = new Gio.Settings({ schema_id: WorkspaceThumbnail.MUTTER_SCHEMA });
this._changedDynamicWorkspacesId = this._settings.connect('changed::dynamic-workspaces',
this._updateSwitcherVisibility.bind(this));
this._monitorsChangedId = Main.layoutManager.connect('monitors-changed', () => {
this._destroyThumbnails();
if (Main.overview.visible)
this._createThumbnails();
this._settings = new Gio.Settings({
schema_id: WorkspaceThumbnail.MUTTER_SCHEMA,
});
this._changedDynamicWorkspacesId = this._settings.connect(
"changed::dynamic-workspaces",
this._updateSwitcherVisibility.bind(this),
);
this._workareasChangedPortholeId = global.display.connect('workareas-changed',
this._updatePorthole.bind(this));
this._monitorsChangedId = Main.layoutManager.connect(
"monitors-changed",
() => {
this._destroyThumbnails();
if (Main.overview.visible) this._createThumbnails();
},
);
this._workareasChangedPortholeId = global.display.connect(
"workareas-changed",
this._updatePorthole.bind(this),
);
this._switchWorkspaceNotifyId = 0;
this._nWorkspacesNotifyId = 0;
@@ -193,19 +258,21 @@ const MultiMonitorsThumbnailsBox = (() => {
this._scrollAdjustment = scrollAdjustment;
this._scrollAdjustmentNotifyValueId = this._scrollAdjustment.connect('notify::value', adj => {
this._scrollAdjustmentNotifyValueId = this._scrollAdjustment.connect(
"notify::value",
(adj) => {
let workspaceManager = global.workspace_manager;
let activeIndex = workspaceManager.get_active_workspace_index();
this._animatingIndicator = adj.value !== activeIndex;
if (!this._animatingIndicator)
this._queueUpdateStates();
if (!this._animatingIndicator) this._queueUpdateStates();
this.queue_relayout();
});
},
);
this.connect('destroy', this._onDestroy.bind(this));
this.connect("destroy", this._onDestroy.bind(this));
}
_onDestroy() {
@@ -231,9 +298,16 @@ const MultiMonitorsThumbnailsBox = (() => {
for (let k = start; k < start + count; k++) {
let metaWorkspace = workspaceManager.get_workspace_by_index(k);
let thumbnail = new MultiMonitorsWorkspaceThumbnail(metaWorkspace, this._monitorIndex);
thumbnail.setPorthole(this._porthole.x, this._porthole.y,
this._porthole.width, this._porthole.height);
let thumbnail = new MultiMonitorsWorkspaceThumbnail(
metaWorkspace,
this._monitorIndex,
);
thumbnail.setPorthole(
this._porthole.x,
this._porthole.y,
this._porthole.width,
this._porthole.height,
);
this._thumbnails.push(thumbnail);
this.add_actor(thumbnail);
@@ -259,23 +333,42 @@ const MultiMonitorsThumbnailsBox = (() => {
}
_updatePorthole() {
this._porthole = Main.layoutManager.getWorkAreaForMonitor(this._monitorIndex);
this._porthole = Main.layoutManager.getWorkAreaForMonitor(
this._monitorIndex,
);
this.queue_relayout();
}};
}
};
MultiMonitors.copyClass(WorkspaceThumbnail.ThumbnailsBox, MultiMonitorsThumbnailsBox);
return GObject.registerClass({
MultiMonitors.copyClass(
WorkspaceThumbnail.ThumbnailsBox,
MultiMonitorsThumbnailsBox,
);
return GObject.registerClass(
{
Properties: {
'indicator-y': GObject.ParamSpec.double(
'indicator-y', 'indicator-y', 'indicator-y',
"indicator-y": GObject.ParamSpec.double(
"indicator-y",
"indicator-y",
"indicator-y",
GObject.ParamFlags.READWRITE,
0, Infinity, 0),
'scale': GObject.ParamSpec.double(
'scale', 'scale', 'scale',
0,
Infinity,
0,
),
scale: GObject.ParamSpec.double(
"scale",
"scale",
"scale",
GObject.ParamFlags.READWRITE,
0, Infinity, 0),
0,
Infinity,
0,
),
},
}, MultiMonitorsThumbnailsBox);
},
MultiMonitorsThumbnailsBox,
);
})();
/* This isn't compatible with GNOME 40 and i don't know how to fix it -- TH
@@ -356,7 +449,7 @@ var MultiMonitorsThumbnailsSlider = (() => {
})();
*/
var MultiMonitorsControlsManager = GObject.registerClass(
export var MultiMonitorsControlsManager = GObject.registerClass(
class MultiMonitorsControlsManager extends St.Widget {
_init(index) {
this._monitorIndex = index;
@@ -365,7 +458,7 @@ class MultiMonitorsControlsManager extends St.Widget {
this._fixGeometry = 0;
this._visible = false;
let layout
let layout;
if (OverviewControls.ControlsManagerLayout) {
layout = new OverviewControls.ControlsManagerLayout();
} else {
@@ -378,18 +471,35 @@ class MultiMonitorsControlsManager extends St.Widget {
clip_to_allocation: true,
});
this._workspaceAdjustment = Main.overview._overview._controls._workspaceAdjustment;
this._workspaceAdjustment =
Main.overview._overview._controls._workspaceAdjustment;
this._thumbnailsBox =
new MultiMonitorsThumbnailsBox(this._workspaceAdjustment, this._monitorIndex);
this._thumbnailsBox = new MultiMonitorsThumbnailsBox(
this._workspaceAdjustment,
this._monitorIndex,
);
//this._thumbnailsSlider = new MultiMonitorsThumbnailsSlider(this._thumbnailsBox);
this._searchController = new St.Widget({ visible: false, x_expand: true, y_expand: true, clip_to_allocation: true });
this._pageChangedId = Main.overview.searchController.connect('page-changed', this._setVisibility.bind(this));
this._pageEmptyId = Main.overview.searchController.connect('page-empty', this._onPageEmpty.bind(this));
this._searchController = new St.Widget({
visible: false,
x_expand: true,
y_expand: true,
clip_to_allocation: true,
});
this._pageChangedId = Main.overview.searchController.connect(
"page-changed",
this._setVisibility.bind(this),
);
this._pageEmptyId = Main.overview.searchController.connect(
"page-empty",
this._onPageEmpty.bind(this),
);
this._group = new St.BoxLayout({ name: 'mm-overview-group-'+index,
x_expand: true, y_expand: true });
this._group = new St.BoxLayout({
name: "mm-overview-group-" + index,
x_expand: true,
y_expand: true,
});
this.add_actor(this._group);
this._group.add_child(this._searchController);
@@ -401,11 +511,17 @@ class MultiMonitorsControlsManager extends St.Widget {
//this._thumbnailsSlider.slideOut();
this._thumbnailsBox._updatePorthole();
this.connect('notify::allocation', this._updateSpacerVisibility.bind(this));
this.connect('destroy', this._onDestroy.bind(this));
this.connect(
"notify::allocation",
this._updateSpacerVisibility.bind(this),
);
this.connect("destroy", this._onDestroy.bind(this));
//this._thumbnailsSelectSideId = this._settings.connect('changed::'+THUMBNAILS_SLIDER_POSITION_ID,
// this._thumbnailsSelectSide.bind(this));
this._monitorsChangedId = Main.layoutManager.connect('monitors-changed', this._monitorsChanged.bind(this));
this._monitorsChangedId = Main.layoutManager.connect(
"monitors-changed",
this._monitorsChanged.bind(this),
);
}
_onDestroy() {
@@ -416,7 +532,9 @@ class MultiMonitorsControlsManager extends St.Widget {
}
_monitorsChanged() {
this._primaryMonitorOnTheLeft = Main.layoutManager.monitors[this._monitorIndex].x > Main.layoutManager.primaryMonitor.x;
this._primaryMonitorOnTheLeft =
Main.layoutManager.monitors[this._monitorIndex].x >
Main.layoutManager.primaryMonitor.x;
this._thumbnailsSelectSide();
}
@@ -451,20 +569,24 @@ class MultiMonitorsControlsManager extends St.Widget {
*/
_updateSpacerVisibility() {
if (Main.layoutManager.monitors.length<this._monitorIndex)
return;
if (Main.layoutManager.monitors.length < this._monitorIndex) return;
let top_spacer_height = Main.layoutManager.primaryMonitor.height;
let panelGhost_height = 0;
if (Main.mmOverview[this._monitorIndex]._overview._panelGhost)
panelGhost_height = Main.mmOverview[this._monitorIndex]._overview._panelGhost.get_height();
panelGhost_height =
Main.mmOverview[
this._monitorIndex
]._overview._panelGhost.get_height();
let allocation = Main.overview._overview._controls.allocation;
let primaryControl_height = allocation.get_height();
let bottom_spacer_height = Main.layoutManager.primaryMonitor.height - allocation.y2;
let bottom_spacer_height =
Main.layoutManager.primaryMonitor.height - allocation.y2;
top_spacer_height -= primaryControl_height + panelGhost_height + bottom_spacer_height;
top_spacer_height -=
primaryControl_height + panelGhost_height + bottom_spacer_height;
top_spacer_height = Math.round(top_spacer_height);
let spacer = Main.mmOverview[this._monitorIndex]._overview._spacer;
@@ -481,8 +603,7 @@ class MultiMonitorsControlsManager extends St.Widget {
const width = this._searchController.allocation.get_width();
const height = this._searchController.allocation.get_height();
geometry = { x, y, width, height };
}
else {
} else {
let [x, y] = this.get_transformed_position();
const width = this.allocation.get_width();
let height = this.allocation.get_height();
@@ -490,8 +611,7 @@ class MultiMonitorsControlsManager extends St.Widget {
height += this._spacer_height;
geometry = { x, y, width, height };
}
if (isNaN(geometry.x))
return null;
if (isNaN(geometry.x)) return null;
//global.log("actualG+ i: "+this._monitorIndex+" x: "+geometry.x+" y: "+geometry.y+" width: "+geometry.width+" height: "+geometry.height);
return geometry;
}
@@ -501,8 +621,10 @@ class MultiMonitorsControlsManager extends St.Widget {
// actors will be made visible again when entering the overview
// next time, and animating them while doing so is just
// unnecessary noise
if (!Main.overview.visible ||
(Main.overview.animationInProgress && !Main.overview.visibleTarget))
if (
!Main.overview.visible ||
(Main.overview.animationInProgress && !Main.overview.visibleTarget)
)
return;
let activePage = Main.overview.searchController.getActivePage();
@@ -511,16 +633,13 @@ class MultiMonitorsControlsManager extends St.Widget {
let opacity = null;
if (thumbnailsVisible) {
opacity = 255;
if (this._fixGeometry===1)
this._fixGeometry = 0;
}
else {
if (this._fixGeometry === 1) this._fixGeometry = 0;
} else {
opacity = 0;
this._fixGeometry = 1;
}
if (!this._workspacesViews)
return;
if (!this._workspacesViews) return;
this._workspacesViews.ease({
opacity: opacity,
@@ -535,7 +654,10 @@ class MultiMonitorsControlsManager extends St.Widget {
show() {
this._searchController.visible = true;
this._workspacesViews = Main.overview.searchController._workspacesDisplay._workspacesViews[this._monitorIndex];
this._workspacesViews =
Main.overview.searchController._workspacesDisplay._workspacesViews[
this._monitorIndex
];
this._visible = true;
const geometry = this.getWorkspacesActualGeometry();
@@ -564,7 +686,9 @@ class MultiMonitorsControlsManager extends St.Widget {
this._workspacesViews.ease({
...geometry,
duration: Main.overview.animationInProgress ? Overview.ANIMATION_TIME : 0,
duration: Main.overview.animationInProgress
? Overview.ANIMATION_TIME
: 0,
mode: Clutter.AnimationMode.EASE_OUT_QUAD,
});
}
@@ -572,12 +696,13 @@ class MultiMonitorsControlsManager extends St.Widget {
hide() {
this._visible = false;
this._workspacesViews.opacity = 255;
if (this._fixGeometry===1)
this._fixGeometry = 2;
if (this._fixGeometry === 1) this._fixGeometry = 2;
const geometry = this.getWorkspacesActualGeometry();
this._workspacesViews.ease({
...geometry,
duration: Main.overview.animationInProgress ? Overview.ANIMATION_TIME : 0,
duration: Main.overview.animationInProgress
? Overview.ANIMATION_TIME
: 0,
mode: Clutter.AnimationMode.EASE_OUT_QUAD,
onComplete: () => {
this._searchController.visible = false;
@@ -585,27 +710,29 @@ class MultiMonitorsControlsManager extends St.Widget {
});
this._workspacesViews = null;
}
});
},
);
var MultiMonitorsOverviewActor = GObject.registerClass(
export var MultiMonitorsOverviewActor = GObject.registerClass(
class MultiMonitorsOverviewActor extends St.BoxLayout {
_init(index) {
this._monitorIndex = index;
super._init({
name: 'mm-overview-'+index,
name: "mm-overview-" + index,
/* Translators: This is the main view to select
activities. See also note for "Activities" string. */
accessible_name: _("MMOverview@" + index),
vertical: true,
});
this.add_constraint(new LayoutManager.MonitorConstraint({ index: this._monitorIndex }));
this.add_constraint(
new LayoutManager.MonitorConstraint({ index: this._monitorIndex }),
);
this._panelGhost = null;
if (Main.mmPanel) {
for (let idx in Main.mmPanel) {
if (Main.mmPanel[idx].monitorIndex !== this._monitorIndex)
continue
if (Main.mmPanel[idx].monitorIndex !== this._monitorIndex) continue;
// Add a clone of the panel to the overview so spacing and such is
// automatic
this._panelGhost = new St.Bin({
@@ -626,21 +753,21 @@ class MultiMonitorsOverviewActor extends St.BoxLayout {
// Add our same-line elements after the search entry
this.add_child(this._controls);
}
});
},
);
var MultiMonitorsOverview = class MultiMonitorsOverview {
export var MultiMonitorsOverview = class MultiMonitorsOverview {
constructor(index) {
this.monitorIndex = index;
this._initCalled = true;
this._overview = new MultiMonitorsOverviewActor(this.monitorIndex);
this._overview._delegate = this;
this._overview.connect('destroy', this._onDestroy.bind(this));
this._overview.connect("destroy", this._onDestroy.bind(this));
Main.layoutManager.overviewGroup.add_child(this._overview);
this._showingId = Main.overview.connect('showing', this._show.bind(this));
this._hidingId = Main.overview.connect('hiding', this._hide.bind(this));
this._showingId = Main.overview.connect("showing", this._show.bind(this));
this._hidingId = Main.overview.connect("hiding", this._hide.bind(this));
}
getWorkspacesActualGeometry() {
@@ -672,7 +799,6 @@ var MultiMonitorsOverview = class MultiMonitorsOverview {
}
removeAction(action) {
if (action.get_actor())
this._overview.remove_action(action);
if (action.get_actor()) this._overview.remove_action(action);
}
};

303
multi-monitors-add-on@breizhhardware/mmpanel.js
View File

@@ -15,39 +15,49 @@ You should have received a copy of the GNU General Public License
along with this program; if not, visit https://www.gnu.org/licenses/.
*/
const { St, Shell, Meta, Atk, Clutter, GObject } = imports.gi;
import St from "gi://St";
import Shell from "gi://Shell";
import Meta from "gi://Meta";
import Atk from "gi://Atk";
import Clutter from "gi://Clutter";
import GObject from "gi://GObject";
const Main = imports.ui.main;
const Panel = imports.ui.panel;
const PopupMenu = imports.ui.popupMenu;
const PanelMenu = imports.ui.panelMenu;
const CtrlAltTab = imports.ui.ctrlAltTab;
const ExtensionSystem = imports.ui.extensionSystem;
import * as Main from "resource:///org/gnome/shell/ui/main.js";
import * as Panel from "resource:///org/gnome/shell/ui/panel.js";
import * as PopupMenu from "resource:///org/gnome/shell/ui/popupMenu.js";
import * as PanelMenu from "resource:///org/gnome/shell/ui/panelMenu.js";
import * as CtrlAltTab from "resource:///org/gnome/shell/ui/ctrlAltTab.js";
import * as ExtensionSystem from "resource:///org/gnome/shell/ui/extensionSystem.js";
const ExtensionUtils = imports.misc.extensionUtils;
const CE = ExtensionUtils.getCurrentExtension();
const MultiMonitors = CE.imports.extension;
const Convenience = CE.imports.convenience;
const MMCalendar = CE.imports.mmcalendar;
import * as MultiMonitors from "./extension.js";
import * as Convenience from "./convenience.js";
import * as MMCalendar from "./mmcalendar.js";
const SHOW_ACTIVITIES_ID = 'show-activities';
var SHOW_APP_MENU_ID = 'show-app-menu';
const SHOW_DATE_TIME_ID = 'show-date-time';
const AVAILABLE_INDICATORS_ID = 'available-indicators';
const TRANSFER_INDICATORS_ID = 'transfer-indicators';
const SHOW_ACTIVITIES_ID = "show-activities";
var SHOW_APP_MENU_ID = "show-app-menu";
const SHOW_DATE_TIME_ID = "show-date-time";
const AVAILABLE_INDICATORS_ID = "available-indicators";
const TRANSFER_INDICATORS_ID = "transfer-indicators";
var StatusIndicatorsController = class StatusIndicatorsController {
export var StatusIndicatorsController = class StatusIndicatorsController {
constructor() {
this._transfered_indicators = [];
this._settings = Convenience.getSettings();
this._updatedSessionId = Main.sessionMode.connect('updated', this._updateSessionIndicators.bind(this));
this._updatedSessionId = Main.sessionMode.connect(
"updated",
this._updateSessionIndicators.bind(this),
);
this._updateSessionIndicators();
this._extensionStateChangedId = Main.extensionManager.connect('extension-state-changed',
this._extensionStateChanged.bind(this));
this._extensionStateChangedId = Main.extensionManager.connect(
"extension-state-changed",
this._extensionStateChanged.bind(this),
);
this._transferIndicatorsId = this._settings.connect('changed::'+TRANSFER_INDICATORS_ID,
this.transferIndicators.bind(this));
this._transferIndicatorsId = this._settings.connect(
"changed::" + TRANSFER_INDICATORS_ID,
this.transferIndicators.bind(this),
);
}
destroy() {
@@ -67,8 +77,10 @@ var StatusIndicatorsController = class StatusIndicatorsController {
}
transferIndicators() {
let boxs = ['_leftBox', '_centerBox', '_rightBox'];
let transfers = this._settings.get_value(TRANSFER_INDICATORS_ID).deep_unpack();
let boxs = ["_leftBox", "_centerBox", "_rightBox"];
let transfers = this._settings
.get_value(TRANSFER_INDICATORS_ID)
.deep_unpack();
let show_app_menu = this._settings.get_value(SHOW_APP_MENU_ID);
let transfer_back = this._transfered_indicators.filter((element) => {
@@ -85,13 +97,16 @@ var StatusIndicatorsController = class StatusIndicatorsController {
let panel = this._findPanel(monitor);
boxs.forEach((box) => {
if (Main.panel[box].contains(indicator.container) && panel) {
global.log('a '+box+ " > " + iname + " : "+ monitor);
this._transfered_indicators.push({iname:iname, box:box, monitor:monitor});
global.log("a " + box + " > " + iname + " : " + monitor);
this._transfered_indicators.push({
iname: iname,
box: box,
monitor: monitor,
});
Main.panel[box].remove_child(indicator.container);
if (show_app_menu && box === '_leftBox')
if (show_app_menu && box === "_leftBox")
panel[box].insert_child_at_index(indicator.container, 1);
else
panel[box].insert_child_at_index(indicator.container, 0);
else panel[box].insert_child_at_index(indicator.container, 0);
}
});
}
@@ -109,19 +124,34 @@ var StatusIndicatorsController = class StatusIndicatorsController {
_transferBack(transfer_back, panel) {
transfer_back.forEach((element) => {
this._transfered_indicators.splice(this._transfered_indicators.indexOf(element));
this._transfered_indicators.splice(
this._transfered_indicators.indexOf(element),
);
if (Main.panel.statusArea[element.iname]) {
let indicator = Main.panel.statusArea[element.iname];
if (!panel) {
panel = this._findPanel(element.monitor);
}
if (panel[element.box].contains(indicator.container)) {
global.log("r "+element.box+ " > " + element.iname + " : "+ element.monitor);
global.log(
"r " +
element.box +
" > " +
element.iname +
" : " +
element.monitor,
);
panel[element.box].remove_child(indicator.container);
if (element.box === '_leftBox')
Main.panel[element.box].insert_child_at_index(indicator.container, 1);
if (element.box === "_leftBox")
Main.panel[element.box].insert_child_at_index(
indicator.container,
1,
);
else
Main.panel[element.box].insert_child_at_index(indicator.container, 0);
Main.panel[element.box].insert_child_at_index(
indicator.container,
0,
);
}
}
});
@@ -134,7 +164,7 @@ var StatusIndicatorsController = class StatusIndicatorsController {
_updateSessionIndicators() {
let session_indicators = [];
session_indicators.push('MultiMonitorsAddOn');
session_indicators.push("MultiMonitorsAddOn");
let sessionPanel = Main.sessionMode.panel;
for (let sessionBox in sessionPanel) {
sessionPanel[sessionBox].forEach((sesionIndicator) => {
@@ -152,34 +182,43 @@ var StatusIndicatorsController = class StatusIndicatorsController {
let available_indicators = [];
let statusArea = Main.panel.statusArea;
for (let indicator in statusArea) {
if(statusArea.hasOwnProperty(indicator) && this._session_indicators.indexOf(indicator)<0){
if (
statusArea.hasOwnProperty(indicator) &&
this._session_indicators.indexOf(indicator) < 0
) {
available_indicators.push(indicator);
}
}
if (available_indicators.length != this._available_indicators.length) {
this._available_indicators = available_indicators;
// global.log(this._available_indicators);
this._settings.set_strv(AVAILABLE_INDICATORS_ID, this._available_indicators);
this._settings.set_strv(
AVAILABLE_INDICATORS_ID,
this._available_indicators,
);
}
}
};
var MultiMonitorsAppMenuButton = (() => {
export var MultiMonitorsAppMenuButton = (() => {
let MultiMonitorsAppMenuButton = class MultiMonitorsAppMenuButton extends PanelMenu.Button {
_init(panel) {
if (panel.monitorIndex == undefined)
this._monitorIndex = Main.layoutManager.primaryIndex;
else
this._monitorIndex = panel.monitorIndex;
else this._monitorIndex = panel.monitorIndex;
this._actionOnWorkspaceGroupNotifyId = 0;
this._targetAppGroup = null;
this._lastFocusedWindow = null;
Panel.AppMenuButton.prototype._init.call(this, panel);
this._windowEnteredMonitorId = global.display.connect('window-entered-monitor',
this._windowEnteredMonitor.bind(this));
this._windowLeftMonitorId = global.display.connect('window-left-monitor',
this._windowLeftMonitor.bind(this));
this._windowEnteredMonitorId = global.display.connect(
"window-entered-monitor",
this._windowEnteredMonitor.bind(this),
);
this._windowLeftMonitorId = global.display.connect(
"window-left-monitor",
this._windowLeftMonitor.bind(this),
);
}
_windowEnteredMonitor(metaScreen, monitorIndex, metaWin) {
@@ -209,7 +248,6 @@ var MultiMonitorsAppMenuButton = (() => {
}
_findTargetApp() {
if (this._actionOnWorkspaceGroupNotifyId) {
this._targetAppGroup.disconnect(this._actionOnWorkspaceGroupNotifyId);
this._actionOnWorkspaceGroupNotifyId = 0;
@@ -232,19 +270,18 @@ var MultiMonitorsAppMenuButton = (() => {
this._lastFocusedWindow = win;
// global.log(this._monitorIndex+": focus :"+win.get_title()+" : "+win.has_focus());
return focusedApp;
}
else
groupWindow = true;
}
else {
if(win.has_focus())
groupFocus = true;
} else groupWindow = true;
} else {
if (win.has_focus()) groupFocus = true;
}
if (groupFocus && groupWindow) {
if (focusedApp != this._targetApp) {
this._targetAppGroup = focusedApp;
this._actionOnWorkspaceGroupNotifyId = this._targetAppGroup.connect('notify::action-group',
this._sync.bind(this));
this._actionOnWorkspaceGroupNotifyId =
this._targetAppGroup.connect(
"notify::action-group",
this._sync.bind(this),
);
// global.log(this._monitorIndex+": gConnect :"+win.get_title()+" : "+win.has_focus());
}
break;
@@ -259,13 +296,19 @@ var MultiMonitorsAppMenuButton = (() => {
return this._startingApps[i];
}
if (this._lastFocusedWindow && this._lastFocusedWindow.located_on_workspace(workspace) &&
this._lastFocusedWindow.get_monitor() == this._monitorIndex){
if (
this._lastFocusedWindow &&
this._lastFocusedWindow.located_on_workspace(workspace) &&
this._lastFocusedWindow.get_monitor() == this._monitorIndex
) {
// global.log(this._monitorIndex+": lastFocus :"+this._lastFocusedWindow.get_title());
return tracker.get_window_app(this._lastFocusedWindow);
}
let windows = global.display.get_tab_list(Meta.TabList.NORMAL_ALL, workspace);
let windows = global.display.get_tab_list(
Meta.TabList.NORMAL_ALL,
workspace,
);
for (let i = 0; i < windows.length; i++) {
if (windows[i].get_monitor() == this._monitorIndex) {
@@ -279,8 +322,7 @@ var MultiMonitorsAppMenuButton = (() => {
}
_sync() {
if (!this._switchWorkspaceNotifyId)
return;
if (!this._switchWorkspaceNotifyId) return;
Panel.AppMenuButton.prototype._sync.call(this);
}
@@ -306,7 +348,10 @@ var MultiMonitorsAppMenuButton = (() => {
}
};
MultiMonitors.copyClass(Panel.AppMenuButton, MultiMonitorsAppMenuButton);
return GObject.registerClass({Signals: {'changed': {}},}, MultiMonitorsAppMenuButton);
return GObject.registerClass(
{ Signals: { changed: {} } },
MultiMonitorsAppMenuButton,
);
})();
var MultiMonitorsActivitiesButton = (() => {
@@ -315,22 +360,24 @@ var MultiMonitorsActivitiesButton = (() => {
super._init(0.0, null, true);
this.accessible_role = Atk.Role.TOGGLE_BUTTON;
this.name = 'mmPanelActivities';
this.name = "mmPanelActivities";
/* Translators: If there is no suitable word for "Activities"
in your language, you can use the word for "Overview". */
this._label = new St.Label({ text: _("Activities"),
y_align: Clutter.ActorAlign.CENTER });
this._label = new St.Label({
text: _("Activities"),
y_align: Clutter.ActorAlign.CENTER,
});
this.add_actor(this._label);
this.label_actor = this._label;
this._showingId = Main.overview.connect('showing', () => {
this.add_style_pseudo_class('overview');
this._showingId = Main.overview.connect("showing", () => {
this.add_style_pseudo_class("overview");
this.add_accessible_state(Atk.StateType.CHECKED);
});
this._hidingId = Main.overview.connect('hiding', () => {
this.remove_style_pseudo_class('overview');
this._hidingId = Main.overview.connect("hiding", () => {
this.remove_style_pseudo_class("overview");
this.remove_accessible_state(Atk.StateType.CHECKED);
});
@@ -342,22 +389,24 @@ var MultiMonitorsActivitiesButton = (() => {
Main.overview.disconnect(this._hidingId);
super._onDestroy();
}
}
MultiMonitors.copyClass(Panel.ActivitiesButton, MultiMonitorsActivitiesButton);
};
MultiMonitors.copyClass(
Panel.ActivitiesButton,
MultiMonitorsActivitiesButton,
);
return GObject.registerClass(MultiMonitorsActivitiesButton);
})();
const MULTI_MONITOR_PANEL_ITEM_IMPLEMENTATIONS = {
'activities': MultiMonitorsActivitiesButton,
'appMenu': MultiMonitorsAppMenuButton,
'dateMenu': MMCalendar.MultiMonitorsDateMenuButton,
activities: MultiMonitorsActivitiesButton,
appMenu: MultiMonitorsAppMenuButton,
dateMenu: MMCalendar.MultiMonitorsDateMenuButton,
};
var MultiMonitorsPanel = (() => {
export const MultiMonitorsPanel = (() => {
let MultiMonitorsPanel = class MultiMonitorsPanel extends St.Widget {
_init(monitorIndex, mmPanelBox) {
super._init({ name: 'panel',
reactive: true });
super._init({ name: "panel", reactive: true });
this.monitorIndex = monitorIndex;
@@ -369,43 +418,59 @@ var MultiMonitorsPanel = (() => {
this.menuManager = new PopupMenu.PopupMenuManager(this);
this._leftBox = new St.BoxLayout({ name: 'panelLeft' });
this._leftBox = new St.BoxLayout({ name: "panelLeft" });
this.add_child(this._leftBox);
this._centerBox = new St.BoxLayout({ name: 'panelCenter' });
this._centerBox = new St.BoxLayout({ name: "panelCenter" });
this.add_child(this._centerBox);
this._rightBox = new St.BoxLayout({ name: 'panelRight' });
this._rightBox = new St.BoxLayout({ name: "panelRight" });
this.add_child(this._rightBox);
this._showingId = Main.overview.connect('showing', () => {
this.add_style_pseudo_class('overview');
this._showingId = Main.overview.connect("showing", () => {
this.add_style_pseudo_class("overview");
});
this._hidingId = Main.overview.connect('hiding', () => {
this.remove_style_pseudo_class('overview');
this._hidingId = Main.overview.connect("hiding", () => {
this.remove_style_pseudo_class("overview");
});
mmPanelBox.panelBox.add(this);
Main.ctrlAltTabManager.addGroup(this, _("Top Bar"), 'focus-top-bar-symbolic',
{ sortGroup: CtrlAltTab.SortGroup.TOP });
Main.ctrlAltTabManager.addGroup(
this,
_("Top Bar"),
"focus-top-bar-symbolic",
{ sortGroup: CtrlAltTab.SortGroup.TOP },
);
this._updatedId = Main.sessionMode.connect('updated', this._updatePanel.bind(this));
this._updatedId = Main.sessionMode.connect(
"updated",
this._updatePanel.bind(this),
);
this._workareasChangedId = global.display.connect('workareas-changed', () => this.queue_relayout());
this._workareasChangedId = global.display.connect(
"workareas-changed",
() => this.queue_relayout(),
);
this._updatePanel();
this._settings = Convenience.getSettings();
this._showActivitiesId = this._settings.connect('changed::'+SHOW_ACTIVITIES_ID,
this._showActivities.bind(this));
this._showActivitiesId = this._settings.connect(
"changed::" + SHOW_ACTIVITIES_ID,
this._showActivities.bind(this),
);
this._showActivities();
this._showAppMenuId = this._settings.connect('changed::'+SHOW_APP_MENU_ID,
this._showAppMenu.bind(this));
this._showAppMenuId = this._settings.connect(
"changed::" + SHOW_APP_MENU_ID,
this._showAppMenu.bind(this),
);
this._showAppMenu();
this._showDateTimeId = this._settings.connect('changed::'+SHOW_DATE_TIME_ID,
this._showDateTime.bind(this));
this._showDateTimeId = this._settings.connect(
"changed::" + SHOW_DATE_TIME_ID,
this._showDateTime.bind(this),
);
this._showDateTime();
this.connect('destroy', this._onDestroy.bind(this));
this.connect("destroy", this._onDestroy.bind(this));
}
_onDestroy() {
@@ -422,31 +487,25 @@ var MultiMonitorsPanel = (() => {
}
_showActivities() {
let name = 'activities';
let name = "activities";
if (this._settings.get_boolean(SHOW_ACTIVITIES_ID)) {
if (this.statusArea[name])
this.statusArea[name].visible = true;
}
else {
if (this.statusArea[name])
this.statusArea[name].visible = false;
if (this.statusArea[name]) this.statusArea[name].visible = true;
} else {
if (this.statusArea[name]) this.statusArea[name].visible = false;
}
}
_showDateTime() {
let name = 'dateMenu';
let name = "dateMenu";
if (this._settings.get_boolean(SHOW_DATE_TIME_ID)) {
if (this.statusArea[name])
this.statusArea[name].visible = true;
}
else {
if (this.statusArea[name])
this.statusArea[name].visible = false;
if (this.statusArea[name]) this.statusArea[name].visible = true;
} else {
if (this.statusArea[name]) this.statusArea[name].visible = false;
}
}
_showAppMenu() {
let name = 'appMenu';
let name = "appMenu";
if (this._settings.get_boolean(SHOW_APP_MENU_ID)) {
if (!this.statusArea[name]) {
let indicator = new MultiMonitorsAppMenuButton(this);
@@ -454,8 +513,7 @@ var MultiMonitorsPanel = (() => {
let box = this._leftBox;
this._addToPanelBox(name, indicator, box.get_n_children() + 1, box);
}
}
else {
} else {
if (this.statusArea[name]) {
let indicator = this.statusArea[name];
this.menuManager.removeMenu(indicator.menu);
@@ -475,8 +533,7 @@ var MultiMonitorsPanel = (() => {
_hideIndicators() {
for (let role in MULTI_MONITOR_PANEL_ITEM_IMPLEMENTATIONS) {
let indicator = this.statusArea[role];
if (!indicator)
continue;
if (!indicator) continue;
indicator.container.hide();
}
}
@@ -486,8 +543,7 @@ var MultiMonitorsPanel = (() => {
if (indicator) {
indicator.container.show();
return null;
}
else {
} else {
let constructor = MULTI_MONITOR_PANEL_ITEM_IMPLEMENTATIONS[role];
if (!constructor) {
// This icon is not implemented (this is a bug)
@@ -502,18 +558,23 @@ var MultiMonitorsPanel = (() => {
_getDraggableWindowForPosition(stageX) {
let workspaceManager = global.workspace_manager;
const windows = workspaceManager.get_active_workspace().list_windows();
const allWindowsByStacking =
global.display.sort_windows_by_stacking(windows).reverse();
const allWindowsByStacking = global.display
.sort_windows_by_stacking(windows)
.reverse();
return allWindowsByStacking.find(metaWindow => {
return allWindowsByStacking.find((metaWindow) => {
let rect = metaWindow.get_frame_rect();
return metaWindow.get_monitor() == this.monitorIndex &&
return (
metaWindow.get_monitor() == this.monitorIndex &&
metaWindow.showing_on_its_workspace() &&
metaWindow.get_window_type() != Meta.WindowType.DESKTOP &&
metaWindow.maximized_vertically &&
stageX > rect.x && stageX < rect.x + rect.width;
stageX > rect.x &&
stageX < rect.x + rect.width
);
});
}};
}
};
MultiMonitors.copyClass(Panel.Panel, MultiMonitorsPanel);
return GObject.registerClass(MultiMonitorsPanel);

301
multi-monitors-add-on@breizhhardware/prefs.js
View File

@@ -15,45 +15,42 @@ You should have received a copy of the GNU General Public License
along with this program; if not, visit https://www.gnu.org/licenses/.
*/
imports.gi.versions.Gdk = '3.0';
imports.gi.versions.Gtk = '3.0';
import * as Lang from "resource:///org/gnome/shell/Extensions/js/lang.js";
const Lang = imports.lang;
import GObject from "gi://GObject";
import Gdk from "gi://Gdk";
import Gtk from "gi://Gtk";
import Gio from "gi://Gio";
import GLib from "gi://GLib";
const GObject = imports.gi.GObject;
const Gdk = imports.gi.Gdk;
const Gtk = imports.gi.Gtk;
const Gio = imports.gi.Gio;
const GLib = imports.gi.GLib;
import { gettext as _ } from "resource:///org/gnome/shell/extensions/extension.js";
const Gettext = imports.gettext.domain('multi-monitors-add-on');
const _ = Gettext.gettext;
const ExtensionUtils = imports.misc.extensionUtils;
const MultiMonitors = ExtensionUtils.getCurrentExtension();
import * as MultiMonitors from "./extension.js";
const Convenience = MultiMonitors.imports.convenience;
const SHOW_INDICATOR_ID = 'show-indicator';
const SHOW_PANEL_ID = 'show-panel';
const SHOW_ACTIVITIES_ID = 'show-activities';
const SHOW_APP_MENU_ID = 'show-app-menu';
const SHOW_DATE_TIME_ID = 'show-date-time';
const THUMBNAILS_SLIDER_POSITION_ID = 'thumbnails-slider-position';
const AVAILABLE_INDICATORS_ID = 'available-indicators';
const TRANSFER_INDICATORS_ID = 'transfer-indicators';
const ENABLE_HOT_CORNERS = 'enable-hot-corners';
const SHOW_INDICATOR_ID = "show-indicator";
const SHOW_PANEL_ID = "show-panel";
const SHOW_ACTIVITIES_ID = "show-activities";
const SHOW_APP_MENU_ID = "show-app-menu";
const SHOW_DATE_TIME_ID = "show-date-time";
const THUMBNAILS_SLIDER_POSITION_ID = "thumbnails-slider-position";
const AVAILABLE_INDICATORS_ID = "available-indicators";
const TRANSFER_INDICATORS_ID = "transfer-indicators";
const ENABLE_HOT_CORNERS = "enable-hot-corners";
const Columns = {
INDICATOR_NAME: 0,
MONITOR_NUMBER: 1
MONITOR_NUMBER: 1,
};
var MultiMonitorsPrefsWidget = GObject.registerClass(
class MultiMonitorsPrefsWidget extends Gtk.Grid {
_init() {
super._init({
margin_top: 6, margin_end: 6, margin_bottom: 6, margin_start: 6
margin_top: 6,
margin_end: 6,
margin_bottom: 6,
margin_start: 6,
});
this._numRows = 0;
@@ -61,38 +58,70 @@ class MultiMonitorsPrefsWidget extends Gtk.Grid {
this.set_orientation(Gtk.Orientation.VERTICAL);
this._settings = Convenience.getSettings();
this._desktopSettings = Convenience.getSettings("org.gnome.desktop.interface");
this._desktopSettings = Convenience.getSettings(
"org.gnome.desktop.interface",
);
this._display = Gdk.Display.get_default();
this._monitors = this._display.get_monitors()
this._monitors = this._display.get_monitors();
this._addBooleanSwitch(_('Show Multi Monitors indicator on Top Panel.'), SHOW_INDICATOR_ID);
this._addBooleanSwitch(_('Show Panel on additional monitors.'), SHOW_PANEL_ID);
this._addBooleanSwitch(_('Show Activities-Button on additional monitors.'), SHOW_ACTIVITIES_ID);
this._addBooleanSwitch(_('Show AppMenu-Button on additional monitors.'), SHOW_APP_MENU_ID);
this._addBooleanSwitch(_('Show DateTime-Button on additional monitors.'), SHOW_DATE_TIME_ID);
this._addComboBoxSwitch(_('Show Thumbnails-Slider on additional monitors.'), THUMBNAILS_SLIDER_POSITION_ID, {
none: _('No'),
right: _('On the right'),
left: _('On the left'),
auto: _('Auto')
});
this._addSettingsBooleanSwitch(_('Enable hot corners.'), this._desktopSettings, ENABLE_HOT_CORNERS);
this._addBooleanSwitch(
_("Show Multi Monitors indicator on Top Panel."),
SHOW_INDICATOR_ID,
);
this._addBooleanSwitch(
_("Show Panel on additional monitors."),
SHOW_PANEL_ID,
);
this._addBooleanSwitch(
_("Show Activities-Button on additional monitors."),
SHOW_ACTIVITIES_ID,
);
this._addBooleanSwitch(
_("Show AppMenu-Button on additional monitors."),
SHOW_APP_MENU_ID,
);
this._addBooleanSwitch(
_("Show DateTime-Button on additional monitors."),
SHOW_DATE_TIME_ID,
);
this._addComboBoxSwitch(
_("Show Thumbnails-Slider on additional monitors."),
THUMBNAILS_SLIDER_POSITION_ID,
{
none: _("No"),
right: _("On the right"),
left: _("On the left"),
auto: _("Auto"),
},
);
this._addSettingsBooleanSwitch(
_("Enable hot corners."),
this._desktopSettings,
ENABLE_HOT_CORNERS,
);
this._store = new Gtk.ListStore();
this._store.set_column_types([GObject.TYPE_STRING, GObject.TYPE_INT]);
this._treeView = new Gtk.TreeView({ model: this._store, hexpand: true, vexpand: true });
this._treeView = new Gtk.TreeView({
model: this._store,
hexpand: true,
vexpand: true,
});
this._treeView.get_selection().set_mode(Gtk.SelectionMode.SINGLE);
let appColumn = new Gtk.TreeViewColumn({ expand: true, sort_column_id: Columns.INDICATOR_NAME,
title: _("A list of indicators for transfer to additional monitors.") });
let appColumn = new Gtk.TreeViewColumn({
expand: true,
sort_column_id: Columns.INDICATOR_NAME,
title: _("A list of indicators for transfer to additional monitors."),
});
let nameRenderer = new Gtk.CellRendererText;
let nameRenderer = new Gtk.CellRendererText();
appColumn.pack_start(nameRenderer, true);
appColumn.add_attribute(nameRenderer, "text", Columns.INDICATOR_NAME);
nameRenderer = new Gtk.CellRendererText;
nameRenderer = new Gtk.CellRendererText();
appColumn.pack_start(nameRenderer, true);
appColumn.add_attribute(nameRenderer, "text", Columns.MONITOR_NUMBER);
@@ -102,15 +131,18 @@ class MultiMonitorsPrefsWidget extends Gtk.Grid {
let toolbar = new Gtk.Box({ orientation: Gtk.Orientation.HORIZONTAL });
toolbar.get_style_context().add_class("inline-toolbar");
this._settings.connect('changed::'+TRANSFER_INDICATORS_ID, Lang.bind(this, this._updateIndicators));
this._settings.connect(
"changed::" + TRANSFER_INDICATORS_ID,
Lang.bind(this, this._updateIndicators),
);
this._updateIndicators();
let addTButton = new Gtk.Button({ icon_name: "list-add" });
addTButton.connect('clicked', Lang.bind(this, this._addIndicator));
addTButton.connect("clicked", Lang.bind(this, this._addIndicator));
toolbar.append(addTButton);
let removeTButton = new Gtk.Button({ icon_name: "list-remove" });
removeTButton.connect('clicked', Lang.bind(this, this._removeIndicator));
removeTButton.connect("clicked", Lang.bind(this, this._removeIndicator));
toolbar.append(removeTButton);
this.add(toolbar);
@@ -123,49 +155,74 @@ class MultiMonitorsPrefsWidget extends Gtk.Grid {
_updateIndicators() {
this._store.clear();
let transfers = this._settings.get_value(TRANSFER_INDICATORS_ID).deep_unpack();
let transfers = this._settings
.get_value(TRANSFER_INDICATORS_ID)
.deep_unpack();
for (let indicator in transfers) {
if (transfers.hasOwnProperty(indicator)) {
let monitor = transfers[indicator];
let iter = this._store.append();
this._store.set(iter, [Columns.INDICATOR_NAME, Columns.MONITOR_NUMBER], [indicator, monitor]);
this._store.set(
iter,
[Columns.INDICATOR_NAME, Columns.MONITOR_NUMBER],
[indicator, monitor],
);
}
}
}
_addIndicator() {
let dialog = new Gtk.Dialog({ title: _("Select indicator"),
transient_for: this.get_toplevel(), modal: true });
let dialog = new Gtk.Dialog({
title: _("Select indicator"),
transient_for: this.get_toplevel(),
modal: true,
});
dialog.add_button(Gtk.STOCK_CANCEL, Gtk.ResponseType.CANCEL);
dialog.add_button(_("Add"), Gtk.ResponseType.OK);
dialog.set_default_response(Gtk.ResponseType.OK);
let grid = new Gtk.Grid({ column_spacing: 10, row_spacing: 15,
margin_top: 10, margin_end: 10, margin_bottom: 10, margin_start: 10 });
let grid = new Gtk.Grid({
column_spacing: 10,
row_spacing: 15,
margin_top: 10,
margin_end: 10,
margin_bottom: 10,
margin_start: 10,
});
grid.set_orientation(Gtk.Orientation.VERTICAL);
dialog._store = new Gtk.ListStore();
dialog._store.set_column_types([GObject.TYPE_STRING]);
dialog._treeView = new Gtk.TreeView({ model: dialog._store, hexpand: true, vexpand: true });
dialog._treeView = new Gtk.TreeView({
model: dialog._store,
hexpand: true,
vexpand: true,
});
dialog._treeView.get_selection().set_mode(Gtk.SelectionMode.SINGLE);
let appColumn = new Gtk.TreeViewColumn({ expand: true, sort_column_id: Columns.INDICATOR_NAME,
title: _("Indicators on Top Panel") });
let appColumn = new Gtk.TreeViewColumn({
expand: true,
sort_column_id: Columns.INDICATOR_NAME,
title: _("Indicators on Top Panel"),
});
let nameRenderer = new Gtk.CellRendererText;
let nameRenderer = new Gtk.CellRendererText();
appColumn.pack_start(nameRenderer, true);
appColumn.add_attribute(nameRenderer, "text", Columns.INDICATOR_NAME);
dialog._treeView.append_column(appColumn);
let availableIndicators = () => {
let transfers = this._settings.get_value(TRANSFER_INDICATORS_ID).unpack();
let transfers = this._settings
.get_value(TRANSFER_INDICATORS_ID)
.unpack();
dialog._store.clear();
this._settings.get_strv(AVAILABLE_INDICATORS_ID).forEach((indicator) => {
this._settings
.get_strv(AVAILABLE_INDICATORS_ID)
.forEach((indicator) => {
if (!transfers.hasOwnProperty(indicator)) {
let iter = dialog._store.append();
dialog._store.set(iter, [Columns.INDICATOR_NAME], [indicator]);
@@ -173,37 +230,61 @@ class MultiMonitorsPrefsWidget extends Gtk.Grid {
});
};
let availableIndicatorsId = this._settings.connect('changed::'+AVAILABLE_INDICATORS_ID,
availableIndicators);
let transferIndicatorsId = this._settings.connect('changed::'+TRANSFER_INDICATORS_ID,
availableIndicators);
let availableIndicatorsId = this._settings.connect(
"changed::" + AVAILABLE_INDICATORS_ID,
availableIndicators,
);
let transferIndicatorsId = this._settings.connect(
"changed::" + TRANSFER_INDICATORS_ID,
availableIndicators,
);
availableIndicators.apply(this);
grid.attach(dialog._treeView, 0, 0, 2, 1);
let gHBox = new Gtk.Box({orientation: Gtk.Orientation.HORIZONTAL,
margin_top: 10, margin_end: 10, margin_bottom: 10, margin_start: 10,
spacing: 20, hexpand: true});
let gLabel = new Gtk.Label({label: _('Monitor index:'), halign: Gtk.Align.START});
let gHBox = new Gtk.Box({
orientation: Gtk.Orientation.HORIZONTAL,
margin_top: 10,
margin_end: 10,
margin_bottom: 10,
margin_start: 10,
spacing: 20,
hexpand: true,
});
let gLabel = new Gtk.Label({
label: _("Monitor index:"),
halign: Gtk.Align.START,
});
gHBox.append(gLabel);
dialog._adjustment = new Gtk.Adjustment({lower: 0.0, upper: 0.0, step_increment:1.0});
let spinButton = new Gtk.SpinButton({halign: Gtk.Align.END, adjustment: dialog._adjustment, numeric: 1});
dialog._adjustment = new Gtk.Adjustment({
lower: 0.0,
upper: 0.0,
step_increment: 1.0,
});
let spinButton = new Gtk.SpinButton({
halign: Gtk.Align.END,
adjustment: dialog._adjustment,
numeric: 1,
});
gHBox.append(spinButton);
let monitorsChanged = () => {
let n_monitors = this._monitors.get_n_items() - 1;
dialog._adjustment.set_upper(n_monitors)
dialog._adjustment.set_upper(n_monitors);
dialog._adjustment.set_value(n_monitors);
};
let monitorsChangedId = this._monitors.connect('items-changed', monitorsChanged);
let monitorsChangedId = this._monitors.connect(
"items-changed",
monitorsChanged,
);
monitorsChanged.apply(this);
grid.append(gHBox);
dialog.get_content_area().append(grid);
dialog.connect('response', (dialog, id) => {
dialog.connect("response", (dialog, id) => {
this._monitors.disconnect(monitorsChangedId);
this._settings.disconnect(availableIndicatorsId);
this._settings.disconnect(transferIndicatorsId);
@@ -212,14 +293,21 @@ class MultiMonitorsPrefsWidget extends Gtk.Grid {
return;
}
let [any, model, iter] = dialog._treeView.get_selection().get_selected();
let [any, model, iter] = dialog._treeView
.get_selection()
.get_selected();
if (any) {
let indicator = model.get_value(iter, Columns.INDICATOR_NAME);
let transfers = this._settings.get_value(TRANSFER_INDICATORS_ID).deep_unpack();
let transfers = this._settings
.get_value(TRANSFER_INDICATORS_ID)
.deep_unpack();
if (!transfers.hasOwnProperty(indicator)) {
transfers[indicator] = dialog._adjustment.get_value();
this._settings.set_value(TRANSFER_INDICATORS_ID, new GLib.Variant('a{si}', transfers));
this._settings.set_value(
TRANSFER_INDICATORS_ID,
new GLib.Variant("a{si}", transfers),
);
}
}
@@ -232,22 +320,38 @@ class MultiMonitorsPrefsWidget extends Gtk.Grid {
if (any) {
let indicator = model.get_value(iter, Columns.INDICATOR_NAME);
let transfers = this._settings.get_value(TRANSFER_INDICATORS_ID).deep_unpack();
let transfers = this._settings
.get_value(TRANSFER_INDICATORS_ID)
.deep_unpack();
if (transfers.hasOwnProperty(indicator)) {
delete transfers[indicator];
this._settings.set_value(TRANSFER_INDICATORS_ID, new GLib.Variant('a{si}', transfers));
this._settings.set_value(
TRANSFER_INDICATORS_ID,
new GLib.Variant("a{si}", transfers),
);
}
}
}
_addComboBoxSwitch(label, schema_id, options) {
this._addSettingsComboBoxSwitch(label, this._settings, schema_id, options)
this._addSettingsComboBoxSwitch(
label,
this._settings,
schema_id,
options,
);
}
_addSettingsComboBoxSwitch(label, settings, schema_id, options) {
let gHBox = new Gtk.Box({orientation: Gtk.Orientation.HORIZONTAL,
margin_top: 10, margin_end: 10, margin_bottom: 10, margin_start: 10,
spacing: 20, hexpand: true});
let gHBox = new Gtk.Box({
orientation: Gtk.Orientation.HORIZONTAL,
margin_top: 10,
margin_end: 10,
margin_bottom: 10,
margin_start: 10,
spacing: 20,
hexpand: true,
});
let gLabel = new Gtk.Label({ label: _(label), halign: Gtk.Align.START });
gHBox.append(gLabel);
@@ -260,7 +364,12 @@ class MultiMonitorsPrefsWidget extends Gtk.Grid {
this.add(gHBox);
settings.bind(schema_id, gCBox, 'active-id', Gio.SettingsBindFlags.DEFAULT);
settings.bind(
schema_id,
gCBox,
"active-id",
Gio.SettingsBindFlags.DEFAULT,
);
}
_addBooleanSwitch(label, schema_id) {
@@ -268,24 +377,36 @@ class MultiMonitorsPrefsWidget extends Gtk.Grid {
}
_addSettingsBooleanSwitch(label, settings, schema_id) {
let gHBox = new Gtk.Box({orientation: Gtk.Orientation.HORIZONTAL,
margin_top: 10, margin_end: 10, margin_bottom: 10, margin_start: 10,
spacing: 20, hexpand: true});
let gHBox = new Gtk.Box({
orientation: Gtk.Orientation.HORIZONTAL,
margin_top: 10,
margin_end: 10,
margin_bottom: 10,
margin_start: 10,
spacing: 20,
hexpand: true,
});
let gLabel = new Gtk.Label({ label: _(label), halign: Gtk.Align.START });
gHBox.append(gLabel);
let gSwitch = new Gtk.Switch({ halign: Gtk.Align.END });
gHBox.append(gSwitch);
this.add(gHBox);
settings.bind(schema_id, gSwitch, 'active', Gio.SettingsBindFlags.DEFAULT);
settings.bind(
schema_id,
gSwitch,
"active",
Gio.SettingsBindFlags.DEFAULT,
);
}
});
},
);
function init() {
export function init() {
Convenience.initTranslations();
}
function buildPrefsWidget() {
export function buildPrefsWidget() {
let widget = new MultiMonitorsPrefsWidget();
return widget;