From b50074fd3736efdabf18d16a45da1597541505bb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Florian=20M=C3=BCllner?= Date: Tue, 12 Feb 2019 11:09:02 +0100 Subject: [PATCH 1/7] lint: Restrict deprecated Lang API Now that we moved to ES standard replacements, let's make sure they don't creep back in accidentally. https://gitlab.gnome.org/GNOME/gnome-shell-extensions/merge_requests/57 --- lint/eslintrc-shell.json | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/lint/eslintrc-shell.json b/lint/eslintrc-shell.json index 198a7509..9546626b 100644 --- a/lint/eslintrc-shell.json +++ b/lint/eslintrc-shell.json @@ -35,6 +35,19 @@ "afterColon": true } ], + "no-restricted-properties": [ + "error", + { + "object": "Lang", + "property": "bind", + "message": "Please use arrow notation or Function.prototype.bind()." + }, + { + "object": "Lang", + "property": "Class", + "message": "Please use ES6 classes." + } + ], "no-unused-vars": [ "error", { -- GitLab From 78580bc3a84786896b2653287dd9ff04496a2a1f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Florian=20M=C3=BCllner?= Date: Thu, 28 Feb 2019 18:26:00 +0100 Subject: [PATCH 2/7] lint: Remove unused rules We picked those up from Polari, which had those for - object arrays: let foo = [ { bar: 42, quz: true }, { bar: 23, quz: false } ]; - "enums": let Options = { ONE: 0, TWO: 1, THREE: 2 }; We don't have either of those, so drop the rules to minimise divergence with gjs. https://gitlab.gnome.org/GNOME/gnome-shell-extensions/merge_requests/57 --- lint/eslintrc-shell.json | 9 --------- 1 file changed, 9 deletions(-) diff --git a/lint/eslintrc-shell.json b/lint/eslintrc-shell.json index 9546626b..1c602580 100644 --- a/lint/eslintrc-shell.json +++ b/lint/eslintrc-shell.json @@ -20,21 +20,12 @@ 4, { "ignoredNodes": [ - "ArrayExpression > ObjectExpression", "CallExpression[callee.object.name=GObject][callee.property.name=registerClass] > ClassExpression:first-child", "ConditionalExpression" ], "MemberExpression": "off" } ], - "key-spacing": [ - "error", - { - "mode": "minimum", - "beforeColon": false, - "afterColon": true - } - ], "no-restricted-properties": [ "error", { -- GitLab From 9b25a227c62e92f93b913502f3abe2aad78ec78f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Florian=20M=C3=BCllner?= Date: Thu, 28 Feb 2019 18:26:39 +0100 Subject: [PATCH 3/7] style: Don't exempt ternary expressions from indent rule It turns out we can comply with gjs' coding style and still align the branches if line breaks are required, so do that to reduce diversion from the canonical GNOME style. https://gitlab.gnome.org/GNOME/gnome-shell-extensions/merge_requests/57 --- extensions/apps-menu/extension.js | 10 +++++----- extensions/window-list/extension.js | 8 ++++---- lint/eslintrc-legacy.json | 1 - lint/eslintrc-shell.json | 3 +-- 4 files changed, 10 insertions(+), 12 deletions(-) diff --git a/extensions/apps-menu/extension.js b/extensions/apps-menu/extension.js index 171b788c..fb335ccf 100644 --- a/extensions/apps-menu/extension.js +++ b/extensions/apps-menu/extension.js @@ -470,12 +470,12 @@ class ApplicationsButton extends PanelMenu.Button { this._tree.disconnect(this._treeChangedId); this._tree = null; + let handler = Main.sessionMode.hasOverview ? + Main.overview.toggle.bind(Main.overview) : null; Main.wm.setCustomKeybindingHandler('panel-main-menu', Shell.ActionMode.NORMAL | Shell.ActionMode.OVERVIEW, - Main.sessionMode.hasOverview ? - Main.overview.toggle.bind(Main.overview) : - null); + handler); this._desktopTarget.destroy(); } @@ -491,8 +491,8 @@ class ApplicationsButton extends PanelMenu.Button { _onMenuKeyPress(actor, event) { let symbol = event.get_key_symbol(); if (symbol == Clutter.KEY_Left || symbol == Clutter.KEY_Right) { - let direction = symbol == Clutter.KEY_Left ? Gtk.DirectionType.LEFT - : Gtk.DirectionType.RIGHT; + let direction = symbol == Clutter.KEY_Left ? + Gtk.DirectionType.LEFT : Gtk.DirectionType.RIGHT; if (this.menu.actor.navigate_focus(global.stage.key_focus, direction, false)) return true; } diff --git a/extensions/window-list/extension.js b/extensions/window-list/extension.js index cb2edb05..493970a4 100644 --- a/extensions/window-list/extension.js +++ b/extensions/window-list/extension.js @@ -116,15 +116,15 @@ class WindowContextMenu extends PopupMenu.PopupMenu { } _updateMinimizeItem() { - this._minimizeItem.label.text = this._metaWindow.minimized ? _("Unminimize") - : _("Minimize"); + this._minimizeItem.label.text = this._metaWindow.minimized ? + _("Unminimize") : _("Minimize"); } _updateMaximizeItem() { let maximized = this._metaWindow.maximized_vertically && this._metaWindow.maximized_horizontally; - this._maximizeItem.label.text = maximized ? _("Unmaximize") - : _("Maximize"); + this._maximizeItem.label.text = maximized ? + _("Unmaximize") : _("Maximize"); } _onDestroy() { diff --git a/lint/eslintrc-legacy.json b/lint/eslintrc-legacy.json index 0bbbff18..e4b2fb0e 100644 --- a/lint/eslintrc-legacy.json +++ b/lint/eslintrc-legacy.json @@ -5,7 +5,6 @@ 4, { "ignoredNodes": [ - "ConditionalExpression", "CallExpression > ArrowFunctionExpression", "CallExpression[callee.object.name=GObject][callee.property.name=registerClass] > ClassExpression:first-child" ], diff --git a/lint/eslintrc-shell.json b/lint/eslintrc-shell.json index 1c602580..9821bf4a 100644 --- a/lint/eslintrc-shell.json +++ b/lint/eslintrc-shell.json @@ -20,8 +20,7 @@ 4, { "ignoredNodes": [ - "CallExpression[callee.object.name=GObject][callee.property.name=registerClass] > ClassExpression:first-child", - "ConditionalExpression" + "CallExpression[callee.object.name=GObject][callee.property.name=registerClass] > ClassExpression:first-child" ], "MemberExpression": "off" } -- GitLab From 7f8f1234ae16c633a1ed8a2aba56e7a998b5b9ae Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Florian=20M=C3=BCllner?= Date: Thu, 28 Feb 2019 18:34:24 +0100 Subject: [PATCH 4/7] style: Stop using braces for single-line arrow functions Braces are optional for single-line arrow functions, but there's a subtle difference: Without braces, the expression is implicitly used as return value; with braces, the function returns nothing unless there's an explicit return. We currently reflect that in our style by only omitting braces when the function is expected to have a return value, but that's not very obvious, not an important differentiation to make, and not easy to express in an automatic rule. So just omit braces consistently as mandated by gjs' coding style. https://gitlab.gnome.org/GNOME/gnome-shell-extensions/merge_requests/57 --- extensions/apps-menu/extension.js | 6 +++--- extensions/auto-move-windows/extension.js | 4 ++-- extensions/places-menu/placeDisplay.js | 8 ++++---- extensions/window-list/extension.js | 8 ++++---- lint/eslintrc-shell.json | 7 ------- 5 files changed, 13 insertions(+), 20 deletions(-) diff --git a/extensions/apps-menu/extension.js b/extensions/apps-menu/extension.js index fb335ccf..9e78933a 100644 --- a/extensions/apps-menu/extension.js +++ b/extensions/apps-menu/extension.js @@ -529,7 +529,7 @@ class ApplicationsButton extends PanelMenu.Button { Main.wm.setCustomKeybindingHandler('panel-main-menu', Shell.ActionMode.NORMAL | Shell.ActionMode.OVERVIEW, - () => { this.menu.toggle(); }); + () => this.menu.toggle()); } _redisplay() { @@ -616,8 +616,8 @@ class ApplicationsButton extends PanelMenu.Button { style_class: 'vfade' }); this.categoriesScrollBox.set_policy(Gtk.PolicyType.NEVER, Gtk.PolicyType.AUTOMATIC); vscroll = this.categoriesScrollBox.get_vscroll_bar(); - vscroll.connect('scroll-start', () => { this.menu.passEvents = true; }); - vscroll.connect('scroll-stop', () => { this.menu.passEvents = false; }); + vscroll.connect('scroll-start', () => this.menu.passEvents = true); + vscroll.connect('scroll-stop', () => this.menu.passEvents = false); this.leftBox.add(this.categoriesScrollBox, { expand: true, x_fill: true, y_fill: true, y_align: St.Align.START }); diff --git a/extensions/auto-move-windows/extension.js b/extensions/auto-move-windows/extension.js index 35979971..646156aa 100644 --- a/extensions/auto-move-windows/extension.js +++ b/extensions/auto-move-windows/extension.js @@ -125,9 +125,9 @@ function myCheckWorkspaces() { } // make sure the original method only removes empty workspaces at the end - keepAliveWorkspaces.forEach(ws => { ws._keepAliveId = 1; }); + keepAliveWorkspaces.forEach(ws => ws._keepAliveId = 1); prevCheckWorkspaces.call(this); - keepAliveWorkspaces.forEach(ws => { delete ws._keepAliveId; }); + keepAliveWorkspaces.forEach(ws => delete ws._keepAliveId); return false; } diff --git a/extensions/places-menu/placeDisplay.js b/extensions/places-menu/placeDisplay.js index dbd3308c..c1302118 100644 --- a/extensions/places-menu/placeDisplay.js +++ b/extensions/places-menu/placeDisplay.js @@ -45,7 +45,7 @@ class PlaceInfo { } catch (e) { if (e.matches(Gio.IOErrorEnum, Gio.IOErrorEnum.NOT_MOUNTED)) { let source = { - get_icon: () => { return this.icon; } + get_icon: () => this.icon }; let op = new ShellMountOperation.ShellMountOperation(source); this.file.mount_enclosing_volume(0, op.mountOp, null, (file, result) => { @@ -325,7 +325,7 @@ var PlacesManager = class { } _updateSpecials() { - this._places.special.forEach(p => { p.destroy(); }); + this._places.special.forEach(p => p.destroy()); this._places.special = []; let homePath = GLib.get_home_dir(); @@ -367,9 +367,9 @@ var PlacesManager = class { let networkMounts = []; let networkVolumes = []; - this._places.devices.forEach(p => { p.destroy(); }); + this._places.devices.forEach(p => p.destroy()); this._places.devices = []; - this._places.network.forEach(p => { p.destroy(); }); + this._places.network.forEach(p => p.destroy()); this._places.network = []; /* Add standard places */ diff --git a/extensions/window-list/extension.js b/extensions/window-list/extension.js index 493970a4..ff7e774b 100644 --- a/extensions/window-list/extension.js +++ b/extensions/window-list/extension.js @@ -401,13 +401,13 @@ class AppContextMenu extends PopupMenu.PopupMenu { this._minimizeItem = new PopupMenu.PopupMenuItem(_("Minimize all")); this._minimizeItem.connect('activate', () => { - this._appButton.getWindowList().forEach(w => { w.minimize(); }); + this._appButton.getWindowList().forEach(w => w.minimize()); }); this.addMenuItem(this._minimizeItem); this._unminimizeItem = new PopupMenu.PopupMenuItem(_("Unminimize all")); this._unminimizeItem.connect('activate', () => { - this._appButton.getWindowList().forEach(w => { w.unminimize(); }); + this._appButton.getWindowList().forEach(w => w.unminimize()); }); this.addMenuItem(this._unminimizeItem); @@ -538,7 +538,7 @@ class AppButton extends BaseButton { let rect = this._getIconGeometry(); let windows = this.app.get_windows(); - windows.forEach(w => { w.set_icon_geometry(rect); }); + windows.forEach(w => w.set_icon_geometry(rect)); } getWindowList() { @@ -1205,7 +1205,7 @@ class Extension { } _buildWindowLists() { - this._windowLists.forEach(list => { list.actor.destroy(); }); + this._windowLists.forEach(list => list.actor.destroy()); this._windowLists = []; let showOnAllMonitors = this._settings.get_boolean('show-on-all-monitors'); diff --git a/lint/eslintrc-shell.json b/lint/eslintrc-shell.json index 9821bf4a..eb96266a 100644 --- a/lint/eslintrc-shell.json +++ b/lint/eslintrc-shell.json @@ -1,13 +1,6 @@ { "rules": { "arrow-spacing": "error", - "brace-style": [ - "error", - "1tbs", - { - "allowSingleLine": true - } - ], "camelcase": [ "error", { -- GitLab From d34b5030b9b318fcffe38dfc0278d24f0969087b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Florian=20M=C3=BCllner?= Date: Thu, 28 Feb 2019 18:38:10 +0100 Subject: [PATCH 5/7] style: Use a consistent style for array literals Most array literals already use a four-space indent, except the ones in GObject metainfo and function parameters. Reindent those as well to make the style consistent and bring it closer to gjs' coding style. https://gitlab.gnome.org/GNOME/gnome-shell-extensions/merge_requests/57 --- extensions/auto-move-windows/prefs.js | 9 +++++++-- extensions/places-menu/placeDisplay.js | 14 +++++++++++--- lint/eslintrc-legacy.json | 1 - 3 files changed, 18 insertions(+), 6 deletions(-) diff --git a/extensions/auto-move-windows/prefs.js b/extensions/auto-move-windows/prefs.js index fd448f0b..92c3b053 100644 --- a/extensions/auto-move-windows/prefs.js +++ b/extensions/auto-move-windows/prefs.js @@ -34,8 +34,13 @@ const Widget = GObject.registerClass({ this._changedPermitted = false; this._store = new Gtk.ListStore(); - this._store.set_column_types([Gio.AppInfo, GObject.TYPE_STRING, Gio.Icon, GObject.TYPE_INT, - Gtk.Adjustment]); + this._store.set_column_types([ + Gio.AppInfo, + GObject.TYPE_STRING, + Gio.Icon, + GObject.TYPE_INT, + Gtk.Adjustment + ]); let scrolled = new Gtk.ScrolledWindow({ shadow_type: Gtk.ShadowType.IN }); scrolled.set_policy(Gtk.PolicyType.NEVER, Gtk.PolicyType.AUTOMATIC); diff --git a/extensions/places-menu/placeDisplay.js b/extensions/places-menu/placeDisplay.js index c1302118..79d401de 100644 --- a/extensions/places-menu/placeDisplay.js +++ b/extensions/places-menu/placeDisplay.js @@ -298,9 +298,17 @@ var PlacesManager = class { } _connectVolumeMonitorSignals() { - const signals = ['volume-added', 'volume-removed', 'volume-changed', - 'mount-added', 'mount-removed', 'mount-changed', - 'drive-connected', 'drive-disconnected', 'drive-changed']; + const signals = [ + 'volume-added', + 'volume-removed', + 'volume-changed', + 'mount-added', + 'mount-removed', + 'mount-changed', + 'drive-connected', + 'drive-disconnected', + 'drive-changed' + ]; this._volumeMonitorSignals = []; let func = this._updateMounts.bind(this); diff --git a/lint/eslintrc-legacy.json b/lint/eslintrc-legacy.json index e4b2fb0e..8b716511 100644 --- a/lint/eslintrc-legacy.json +++ b/lint/eslintrc-legacy.json @@ -9,7 +9,6 @@ "CallExpression[callee.object.name=GObject][callee.property.name=registerClass] > ClassExpression:first-child" ], "CallExpression": { "arguments": "first" }, - "ArrayExpression": "first", "ObjectExpression": "first", "MemberExpression": "off" } -- GitLab From db35d7ae7cbfd6bba13ca45cf25841fb098bd102 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Florian=20M=C3=BCllner?= Date: Thu, 28 Feb 2019 19:05:48 +0100 Subject: [PATCH 6/7] style: Change indentation style of object literals Instead of keeping the first property on the same line as the opening brace and aligning the properties, use a four-space indent. This brings us closer to gjs' coding style, and as a bonus helps keeping lines in the soft 80 character limit. https://gitlab.gnome.org/GNOME/gnome-shell-extensions/merge_requests/57 --- extensions/apps-menu/extension.js | 74 +++++++++----- extensions/auto-move-windows/prefs.js | 88 +++++++++++------ extensions/drive-menu/extension.js | 12 ++- extensions/places-menu/extension.js | 20 ++-- .../screenshot-window-sizer/extension.js | 11 ++- extensions/window-list/extension.js | 99 ++++++++++++------- extensions/window-list/prefs.js | 28 ++++-- extensions/windowsNavigator/extension.js | 6 +- extensions/workspace-indicator/extension.js | 6 +- extensions/workspace-indicator/prefs.js | 22 +++-- lint/eslintrc-legacy.json | 1 - 11 files changed, 236 insertions(+), 131 deletions(-) diff --git a/extensions/apps-menu/extension.js b/extensions/apps-menu/extension.js index 9e78933a..fb5d6fd3 100644 --- a/extensions/apps-menu/extension.js +++ b/extensions/apps-menu/extension.js @@ -1,8 +1,9 @@ /* -*- mode: js2; js2-basic-offset: 4; indent-tabs-mode: nil -*- */ /* exported init enable disable */ -const { Atk, Clutter, Gio, GLib, GMenu, - GObject, Gtk, Meta, Shell, St } = imports.gi; +const { + Atk, Clutter, Gio, GLib, GMenu, GObject, Gtk, Meta, Shell, St +} = imports.gi; const DND = imports.ui.dnd; const Main = imports.ui.main; const PanelMenu = imports.ui.panelMenu; @@ -44,8 +45,11 @@ class ApplicationMenuItem extends PopupMenu.PopupBaseMenuItem { this._iconBin = new St.Bin(); this.actor.add_child(this._iconBin); - let appLabel = new St.Label({ text: app.get_name(), y_expand: true, - y_align: Clutter.ActorAlign.CENTER }); + let appLabel = new St.Label({ + text: app.get_name(), + y_expand: true, + y_align: Clutter.ActorAlign.CENTER + }); this.actor.add_child(appLabel); this.actor.label_actor = appLabel; @@ -399,9 +403,11 @@ class ApplicationsButton extends PanelMenu.Button { let hbox = new St.BoxLayout({ style_class: 'panel-status-menu-box' }); - this._label = new St.Label({ text: _("Applications"), - y_expand: true, - y_align: Clutter.ActorAlign.CENTER }); + this._label = new St.Label({ + text: _("Applications"), + y_expand: true, + y_align: Clutter.ActorAlign.CENTER + }); hbox.add_child(this._label); hbox.add_child(PopupMenu.arrowIcon(St.Side.BOTTOM)); @@ -457,8 +463,10 @@ class ApplicationsButton extends PanelMenu.Button { } _createVertSeparator() { - let separator = new St.DrawingArea({ style_class: 'calendar-vertical-separator', - pseudo_class: 'highlighted' }); + let separator = new St.DrawingArea({ + style_class: 'calendar-vertical-separator', + pseudo_class: 'highlighted' + }); separator.connect('repaint', this._onVertSepRepaint.bind(this)); return separator; } @@ -600,9 +608,12 @@ class ApplicationsButton extends PanelMenu.Button { this.menu.addMenuItem(section); this.mainBox = new St.BoxLayout({ vertical: false }); this.leftBox = new St.BoxLayout({ vertical: true }); - this.applicationsScrollBox = new St.ScrollView({ x_fill: true, y_fill: false, - y_align: St.Align.START, - style_class: 'apps-menu vfade' }); + this.applicationsScrollBox = new St.ScrollView({ + x_fill: true, + y_fill: false, + y_align: St.Align.START, + style_class: 'apps-menu vfade' + }); this.applicationsScrollBox.set_policy(Gtk.PolicyType.NEVER, Gtk.PolicyType.AUTOMATIC); let vscroll = this.applicationsScrollBox.get_vscroll_bar(); vscroll.connect('scroll-start', () => { @@ -611,21 +622,30 @@ class ApplicationsButton extends PanelMenu.Button { vscroll.connect('scroll-stop', () => { this.menu.passEvents = false; }); - this.categoriesScrollBox = new St.ScrollView({ x_fill: true, y_fill: false, - y_align: St.Align.START, - style_class: 'vfade' }); + this.categoriesScrollBox = new St.ScrollView({ + x_fill: true, + y_fill: false, + y_align: St.Align.START, + style_class: 'vfade' + }); this.categoriesScrollBox.set_policy(Gtk.PolicyType.NEVER, Gtk.PolicyType.AUTOMATIC); vscroll = this.categoriesScrollBox.get_vscroll_bar(); vscroll.connect('scroll-start', () => this.menu.passEvents = true); vscroll.connect('scroll-stop', () => this.menu.passEvents = false); - this.leftBox.add(this.categoriesScrollBox, { expand: true, - x_fill: true, y_fill: true, - y_align: St.Align.START }); + this.leftBox.add(this.categoriesScrollBox, { + expand: true, + x_fill: true, + y_fill: true, + y_align: St.Align.START + }); let activities = new ActivitiesMenuItem(this); - this.leftBox.add(activities.actor, { expand: false, - x_fill: true, y_fill: false, - y_align: St.Align.START }); + this.leftBox.add(activities.actor, { + expand: false, + x_fill: true, + y_fill: false, + y_align: St.Align.START + }); this.applicationsBox = new St.BoxLayout({ vertical: true }); this.applicationsScrollBox.add_actor(this.applicationsBox); @@ -633,8 +653,16 @@ class ApplicationsButton extends PanelMenu.Button { this.categoriesScrollBox.add_actor(this.categoriesBox); this.mainBox.add(this.leftBox); - this.mainBox.add(this._createVertSeparator(), { expand: false, x_fill: false, y_fill: true }); - this.mainBox.add(this.applicationsScrollBox, { expand: true, x_fill: true, y_fill: true }); + this.mainBox.add(this._createVertSeparator(), { + expand: false, + x_fill: false, + y_fill: true + }); + this.mainBox.add(this.applicationsScrollBox, { + expand: true, + x_fill: true, + y_fill: true + }); section.actor.add_actor(this.mainBox); } diff --git a/extensions/auto-move-windows/prefs.js b/extensions/auto-move-windows/prefs.js index 92c3b053..3b3a70e6 100644 --- a/extensions/auto-move-windows/prefs.js +++ b/extensions/auto-move-windows/prefs.js @@ -47,12 +47,18 @@ const Widget = GObject.registerClass({ this.add(scrolled); - 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.DISPLAY_NAME, - title: _("Application") }); + let appColumn = new Gtk.TreeViewColumn({ + expand: true, + sort_column_id: Columns.DISPLAY_NAME, + title: _("Application") + }); let iconRenderer = new Gtk.CellRendererPixbuf; appColumn.pack_start(iconRenderer, false); appColumn.add_attribute(iconRenderer, "gicon", Columns.ICON); @@ -61,8 +67,10 @@ const Widget = GObject.registerClass({ appColumn.add_attribute(nameRenderer, "text", Columns.DISPLAY_NAME); this._treeView.append_column(appColumn); - let workspaceColumn = new Gtk.TreeViewColumn({ title: _("Workspace"), - sort_column_id: Columns.WORKSPACE }); + let workspaceColumn = new Gtk.TreeViewColumn({ + title: _("Workspace"), + sort_column_id: Columns.WORKSPACE + }); let workspaceRenderer = new Gtk.CellRendererSpin({ editable: true }); workspaceRenderer.connect('edited', this._workspaceEdited.bind(this)); workspaceColumn.pack_start(workspaceRenderer, true); @@ -76,13 +84,15 @@ const Widget = GObject.registerClass({ toolbar.get_style_context().add_class(Gtk.STYLE_CLASS_INLINE_TOOLBAR); this.add(toolbar); - let newButton = new Gtk.ToolButton({ icon_name: 'bookmark-new-symbolic', - label: _("Add Rule"), - is_important: true }); + let newButton = new Gtk.ToolButton({ + icon_name: 'bookmark-new-symbolic', + label: _("Add Rule"), + is_important: true + }); newButton.connect('clicked', this._createNew.bind(this)); toolbar.add(newButton); - let delButton = new Gtk.ToolButton({ icon_name: 'edit-delete-symbolic' }); + let delButton = new Gtk.ToolButton({ icon_name: 'edit-delete-symbolic' }); delButton.connect('clicked', this._deleteSelected.bind(this)); toolbar.add(delButton); @@ -97,17 +107,21 @@ const Widget = GObject.registerClass({ } _createNew() { - let dialog = new Gtk.Dialog({ title: _("Create new matching rule"), - transient_for: this.get_toplevel(), - use_header_bar: true, - modal: true }); + let dialog = new Gtk.Dialog({ + title: _("Create new matching rule"), + transient_for: this.get_toplevel(), + use_header_bar: true, + modal: true + }); dialog.add_button(Gtk.STOCK_CANCEL, Gtk.ResponseType.CANCEL); let addButton = 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: 10 }); + let grid = new Gtk.Grid({ + column_spacing: 10, + row_spacing: 15, + margin: 10 + }); dialog._appChooser = new Gtk.AppChooserWidget({ show_all: true }); dialog._appChooser.connect('application-selected', (w, appInfo) => { addButton.sensitive = appInfo && this._checkId(appInfo.get_id()); @@ -116,13 +130,19 @@ const Widget = GObject.registerClass({ addButton.sensitive = appInfo && this._checkId(appInfo.get_id()); grid.attach(dialog._appChooser, 0, 0, 2, 1); - grid.attach(new Gtk.Label({ label: _("Workspace"), - halign: Gtk.Align.END }), 0, 1, 1, 1); - let adjustment = new Gtk.Adjustment({ lower: 1, - upper: WORKSPACE_MAX, - step_increment: 1 }); - dialog._spin = new Gtk.SpinButton({ adjustment: adjustment, - snap_to_ticks: true }); + grid.attach(new Gtk.Label({ + label: _("Workspace"), + halign: Gtk.Align.END + }), 0, 1, 1, 1); + let adjustment = new Gtk.Adjustment({ + lower: 1, + upper: WORKSPACE_MAX, + step_increment: 1 + }); + dialog._spin = new Gtk.SpinButton({ + adjustment: adjustment, + snap_to_ticks: true + }); dialog._spin.set_value(1); grid.attach(dialog._spin, 1, 1, 1, 1); dialog.get_content_area().add(grid); @@ -145,10 +165,12 @@ const Widget = GObject.registerClass({ this._changedPermitted = true; let iter = this._store.append(); - let adj = new Gtk.Adjustment({ lower: 1, - upper: WORKSPACE_MAX, - step_increment: 1, - value: index }); + let adj = new Gtk.Adjustment({ + lower: 1, + upper: WORKSPACE_MAX, + step_increment: 1, + value: index + }); this._store.set(iter, [Columns.APPINFO, Columns.ICON, Columns.DISPLAY_NAME, Columns.WORKSPACE, Columns.ADJUSTMENT], [appInfo, appInfo.get_icon(), appInfo.get_display_name(), index, adj]); @@ -202,10 +224,12 @@ const Widget = GObject.registerClass({ validItems.push(currentItems[i]); let iter = this._store.append(); - let adj = new Gtk.Adjustment({ lower: 1, - upper: WORKSPACE_MAX, - step_increment: 1, - value: index }); + let adj = new Gtk.Adjustment({ + lower: 1, + upper: WORKSPACE_MAX, + step_increment: 1, + value: index + }); this._store.set(iter, [Columns.APPINFO, Columns.ICON, Columns.DISPLAY_NAME, Columns.WORKSPACE, Columns.ADJUSTMENT], [appInfo, appInfo.get_icon(), appInfo.get_display_name(), parseInt(index), adj]); diff --git a/extensions/drive-menu/extension.js b/extensions/drive-menu/extension.js index 4c1fdbf1..47537f5e 100644 --- a/extensions/drive-menu/extension.js +++ b/extensions/drive-menu/extension.js @@ -22,8 +22,10 @@ class MountMenuItem extends PopupMenu.PopupBaseMenuItem { this.mount = mount; - let ejectIcon = new St.Icon({ icon_name: 'media-eject-symbolic', - style_class: 'popup-menu-icon ' }); + let ejectIcon = new St.Icon({ + icon_name: 'media-eject-symbolic', + style_class: 'popup-menu-icon' + }); let ejectButton = new St.Button({ child: ejectIcon }); ejectButton.connect('clicked', this._eject.bind(this)); this.actor.add(ejectButton); @@ -114,8 +116,10 @@ class DriveMenu extends PanelMenu.Button { super._init(0.0, _("Removable devices")); let hbox = new St.BoxLayout({ style_class: 'panel-status-menu-box' }); - let icon = new St.Icon({ icon_name: 'media-eject-symbolic', - style_class: 'system-status-icon' }); + let icon = new St.Icon({ + icon_name: 'media-eject-symbolic', + style_class: 'system-status-icon' + }); hbox.add_child(icon); hbox.add_child(PopupMenu.arrowIcon(St.Side.BOTTOM)); diff --git a/extensions/places-menu/extension.js b/extensions/places-menu/extension.js index b98d3857..11090e18 100644 --- a/extensions/places-menu/extension.js +++ b/extensions/places-menu/extension.js @@ -22,16 +22,20 @@ class PlaceMenuItem extends PopupMenu.PopupBaseMenuItem { super(); this._info = info; - this._icon = new St.Icon({ gicon: info.icon, - icon_size: PLACE_ICON_SIZE }); + this._icon = new St.Icon({ + gicon: info.icon, + icon_size: PLACE_ICON_SIZE + }); this.actor.add_child(this._icon); this._label = new St.Label({ text: info.name, x_expand: true }); this.actor.add_child(this._label); if (info.isRemovable()) { - this._ejectIcon = new St.Icon({ icon_name: 'media-eject-symbolic', - style_class: 'popup-menu-icon ' }); + this._ejectIcon = new St.Icon({ + icon_name: 'media-eject-symbolic', + style_class: 'popup-menu-icon' + }); this._ejectButton = new St.Button({ child: this._ejectIcon }); this._ejectButton.connect('clicked', info.eject.bind(info)); this.actor.add_child(this._ejectButton); @@ -75,9 +79,11 @@ class PlacesMenu extends PanelMenu.Button { super._init(0.0, _("Places")); let hbox = new St.BoxLayout({ style_class: 'panel-status-menu-box' }); - let label = new St.Label({ text: _("Places"), - y_expand: true, - y_align: Clutter.ActorAlign.CENTER }); + let label = new St.Label({ + text: _("Places"), + y_expand: true, + y_align: Clutter.ActorAlign.CENTER + }); hbox.add_child(label); hbox.add_child(PopupMenu.arrowIcon(St.Side.BOTTOM)); this.add_actor(hbox); diff --git a/extensions/screenshot-window-sizer/extension.js b/extensions/screenshot-window-sizer/extension.js index bf31f815..13d29f7c 100644 --- a/extensions/screenshot-window-sizer/extension.js +++ b/extensions/screenshot-window-sizer/extension.js @@ -50,11 +50,12 @@ function flashMessage(message) { text.set_position(monitor.x + Math.floor(monitor.width / 2 - text.width / 2), monitor.y + Math.floor(monitor.height / 2 - text.height / 2)); - Tweener.addTween(text, - { opacity: 0, - time: MESSAGE_FADE_TIME, - transition: 'easeOutQuad', - onComplete: hideMessage }); + Tweener.addTween(text, { + opacity: 0, + time: MESSAGE_FADE_TIME, + transition: 'easeOutQuad', + onComplete: hideMessage + }); } let SIZES = [ diff --git a/extensions/window-list/extension.js b/extensions/window-list/extension.js index ff7e774b..24cd2334 100644 --- a/extensions/window-list/extension.js +++ b/extensions/window-list/extension.js @@ -137,8 +137,11 @@ class WindowContextMenu extends PopupMenu.PopupMenu { class WindowTitle { constructor(metaWindow) { this._metaWindow = metaWindow; - this.actor = new St.BoxLayout({ style_class: 'window-button-box', - x_expand: true, y_expand: true }); + this.actor = new St.BoxLayout({ + style_class: 'window-button-box', + x_expand: true, + y_expand: true + }); this._icon = new St.Bin({ style_class: 'window-button-icon' }); this.actor.add(this._icon); @@ -188,8 +191,10 @@ class WindowTitle { if (app) this._icon.child = app.create_icon_texture(ICON_TEXTURE_SIZE); else - this._icon.child = new St.Icon({ icon_name: 'icon-missing', - icon_size: ICON_TEXTURE_SIZE }); + this._icon.child = new St.Icon({ + icon_name: 'icon-missing', + icon_size: ICON_TEXTURE_SIZE + }); } _onDestroy() { @@ -210,12 +215,13 @@ class BaseButton { this._perMonitor = perMonitor; this._monitorIndex = monitorIndex; - this.actor = new St.Button({ style_class: 'window-button', - x_fill: true, - y_fill: true, - can_focus: true, - button_mask: St.ButtonMask.ONE | - St.ButtonMask.THREE }); + this.actor = new St.Button({ + style_class: 'window-button', + x_fill: true, + y_fill: true, + can_focus: true, + button_mask: St.ButtonMask.ONE | St.ButtonMask.THREE + }); this.actor._delegate = this; this.actor.connect('allocation-changed', @@ -463,21 +469,29 @@ class AppButton extends BaseButton { let stack = new St.Widget({ layout_manager: new Clutter.BinLayout() }); this.actor.set_child(stack); - this._singleWindowTitle = new St.Bin({ x_expand: true, - y_fill: true, - x_align: St.Align.START }); + this._singleWindowTitle = new St.Bin({ + x_expand: true, + y_fill: true, + x_align: St.Align.START + }); stack.add_actor(this._singleWindowTitle); - this._multiWindowTitle = new St.BoxLayout({ style_class: 'window-button-box', - x_expand: true }); + this._multiWindowTitle = new St.BoxLayout({ + style_class: 'window-button-box', + x_expand: true + }); stack.add_actor(this._multiWindowTitle); - this._icon = new St.Bin({ style_class: 'window-button-icon', - child: app.create_icon_texture(ICON_TEXTURE_SIZE) }); + this._icon = new St.Bin({ + style_class: 'window-button-icon', + child: app.create_icon_texture(ICON_TEXTURE_SIZE) + }); this._multiWindowTitle.add(this._icon); - let label = new St.Label({ text: app.get_name(), - y_align: Clutter.ActorAlign.CENTER }); + let label = new St.Label({ + text: app.get_name(), + y_align: Clutter.ActorAlign.CENTER + }); this._multiWindowTitle.add(label); this._multiWindowTitle.label_actor = label; @@ -643,16 +657,21 @@ class WorkspaceIndicator extends PanelMenu.Button { this.add_style_class_name('window-list-workspace-indicator'); this.menu.actor.remove_style_class_name('panel-menu'); - let container = new St.Widget({ layout_manager: new Clutter.BinLayout(), - x_expand: true, y_expand: true }); + let container = new St.Widget({ + layout_manager: new Clutter.BinLayout(), + x_expand: true, + y_expand: true + }); this.add_actor(container); let workspaceManager = global.workspace_manager; this._currentWorkspace = workspaceManager.get_active_workspace().index(); - this.statusLabel = new St.Label({ text: this._getStatusText(), - x_align: Clutter.ActorAlign.CENTER, - y_align: Clutter.ActorAlign.CENTER }); + this.statusLabel = new St.Label({ + text: this._getStatusText(), + x_align: Clutter.ActorAlign.CENTER, + y_align: Clutter.ActorAlign.CENTER + }); container.add_actor(this.statusLabel); this.workspacesItems = []; @@ -761,23 +780,27 @@ class WindowList { this._perMonitor = perMonitor; this._monitor = monitor; - this.actor = new St.Widget({ name: 'panel', - style_class: 'bottom-panel solid', - reactive: true, - track_hover: true, - layout_manager: new Clutter.BinLayout() }); + this.actor = new St.Widget({ + name: 'panel', + style_class: 'bottom-panel solid', + reactive: true, + track_hover: true, + layout_manager: new Clutter.BinLayout() + }); this.actor.connect('destroy', this._onDestroy.bind(this)); let box = new St.BoxLayout({ x_expand: true, y_expand: true }); this.actor.add_actor(box); let layout = new Clutter.BoxLayout({ homogeneous: true }); - this._windowList = new St.Widget({ style_class: 'window-list', - reactive: true, - layout_manager: layout, - x_align: Clutter.ActorAlign.START, - x_expand: true, - y_expand: true }); + this._windowList = new St.Widget({ + style_class: 'window-list', + reactive: true, + layout_manager: layout, + x_align: Clutter.ActorAlign.START, + x_expand: true, + y_expand: true + }); box.add(this._windowList, { expand: true }); this._windowList.connect('style-changed', () => { @@ -805,8 +828,10 @@ class WindowList { this._menuManager = new PopupMenu.PopupMenuManager(this); this._menuManager.addMenu(this._workspaceIndicator.menu); - Main.layoutManager.addChrome(this.actor, { affectsStruts: true, - trackFullscreen: true }); + Main.layoutManager.addChrome(this.actor, { + affectsStruts: true, + trackFullscreen: true + }); Main.uiGroup.set_child_above_sibling(this.actor, Main.layoutManager.panelBox); Main.ctrlAltTabManager.addGroup(this.actor, _("Window List"), 'start-here-symbolic'); diff --git a/extensions/window-list/prefs.js b/extensions/window-list/prefs.js index 59fd6975..3c2960a6 100644 --- a/extensions/window-list/prefs.js +++ b/extensions/window-list/prefs.js @@ -23,15 +23,19 @@ class WindowListPrefsWidget extends Gtk.Grid { this.orientation = Gtk.Orientation.VERTICAL; let groupingLabel = '%s'.format(_("Window Grouping")); - this.add(new Gtk.Label({ label: groupingLabel, use_markup: true, - halign: Gtk.Align.START })); + this.add(new Gtk.Label({ + label: groupingLabel, use_markup: true, + halign: Gtk.Align.START + })); let align = new Gtk.Alignment({ left_padding: 12 }); this.add(align); - let grid = new Gtk.Grid({ orientation: Gtk.Orientation.VERTICAL, - row_spacing: 6, - column_spacing: 6 }); + let grid = new Gtk.Grid({ + orientation: Gtk.Orientation.VERTICAL, + row_spacing: 6, + column_spacing: 6 + }); align.add(grid); this._settings = ExtensionUtils.getSettings(); @@ -54,9 +58,11 @@ class WindowListPrefsWidget extends Gtk.Grid { continue; } - radio = new Gtk.RadioButton({ active: currentMode == mode, - label: label, - group: radio }); + radio = new Gtk.RadioButton({ + active: currentMode == mode, + label: label, + group: radio + }); grid.add(radio); radio.connect('toggled', button => { @@ -65,8 +71,10 @@ class WindowListPrefsWidget extends Gtk.Grid { }); } - let check = new Gtk.CheckButton({ label: _("Show on all monitors"), - margin_top: 6 }); + let check = new Gtk.CheckButton({ + label: _("Show on all monitors"), + margin_top: 6 + }); this._settings.bind('show-on-all-monitors', check, 'active', Gio.SettingsBindFlags.DEFAULT); this.add(check); } diff --git a/extensions/windowsNavigator/extension.js b/extensions/windowsNavigator/extension.js index 13de1bc3..7d58ebe2 100644 --- a/extensions/windowsNavigator/extension.js +++ b/extensions/windowsNavigator/extension.js @@ -229,8 +229,10 @@ function enable() { workspaceInjections['_init'] = injectToFunction(Workspace.Workspace.prototype, '_init', function(metaWorkspace) { if (metaWorkspace && metaWorkspace.index() < 9) { - createdActors.push(this._tip = new St.Label({ style_class: 'extension-windowsNavigator-window-tooltip', - visible: false })); + createdActors.push(this._tip = new St.Label({ + style_class: 'extension-windowsNavigator-window-tooltip', + visible: false + })); this.actor.add_actor(this._tip); let signalId = this.actor.connect('notify::scale-x', () => { diff --git a/extensions/workspace-indicator/extension.js b/extensions/workspace-indicator/extension.js index 9e1dfd70..38ed8703 100644 --- a/extensions/workspace-indicator/extension.js +++ b/extensions/workspace-indicator/extension.js @@ -23,8 +23,10 @@ class WorkspaceIndicator extends PanelMenu.Button { let workspaceManager = global.workspace_manager; this._currentWorkspace = workspaceManager.get_active_workspace().index(); - this.statusLabel = new St.Label({ y_align: Clutter.ActorAlign.CENTER, - text: this._labelText() }); + this.statusLabel = new St.Label({ + y_align: Clutter.ActorAlign.CENTER, + text: this._labelText() + }); this.add_actor(this.statusLabel); diff --git a/extensions/workspace-indicator/prefs.js b/extensions/workspace-indicator/prefs.js index 64a64fdc..ed5c4785 100644 --- a/extensions/workspace-indicator/prefs.js +++ b/extensions/workspace-indicator/prefs.js @@ -127,20 +127,26 @@ class WorkspaceSettingsWidget extends Gtk.Grid { this.margin = 12; this.orientation = Gtk.Orientation.VERTICAL; - this.add(new Gtk.Label({ label: '%s'.format(_("Workspace Names")), - use_markup: true, margin_bottom: 6, - hexpand: true, halign: Gtk.Align.START })); + this.add(new Gtk.Label({ + label: '%s'.format(_("Workspace Names")), + use_markup: true, + margin_bottom: 6, + hexpand: true, + halign: Gtk.Align.START + })); let scrolled = new Gtk.ScrolledWindow({ shadow_type: Gtk.ShadowType.IN }); scrolled.set_policy(Gtk.PolicyType.NEVER, Gtk.PolicyType.AUTOMATIC); this.add(scrolled); this._store = new WorkspaceNameModel(); - this._treeView = new Gtk.TreeView({ model: this._store, - headers_visible: false, - reorderable: true, - hexpand: true, - vexpand: true }); + this._treeView = new Gtk.TreeView({ + model: this._store, + headers_visible: false, + reorderable: true, + hexpand: true, + vexpand: true + }); let column = new Gtk.TreeViewColumn({ title: _("Name") }); let renderer = new Gtk.CellRendererText({ editable: true }); diff --git a/lint/eslintrc-legacy.json b/lint/eslintrc-legacy.json index 8b716511..1c57f080 100644 --- a/lint/eslintrc-legacy.json +++ b/lint/eslintrc-legacy.json @@ -9,7 +9,6 @@ "CallExpression[callee.object.name=GObject][callee.property.name=registerClass] > ClassExpression:first-child" ], "CallExpression": { "arguments": "first" }, - "ObjectExpression": "first", "MemberExpression": "off" } ], -- GitLab From d83d6e857a2b644b3d9b49e41faa808672807859 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Florian=20M=C3=BCllner?= Date: Thu, 28 Feb 2019 19:18:53 +0100 Subject: [PATCH 7/7] style: Use single-quotes for translated strings The coding style of using double quotes for translatable strings and single quotes otherwise is unnecessarily complex and cannot be enforced with an eslint rule. Simply use single quotes consistently for all strings. https://gitlab.gnome.org/GNOME/gnome-shell-extensions/merge_requests/57 --- extensions/apps-menu/extension.js | 6 +++--- extensions/auto-move-windows/prefs.js | 20 ++++++++++---------- extensions/drive-menu/extension.js | 6 +++--- extensions/places-menu/extension.js | 4 ++-- extensions/places-menu/placeDisplay.js | 14 +++++++------- extensions/window-list/extension.js | 20 ++++++++++---------- extensions/window-list/prefs.js | 10 +++++----- extensions/workspace-indicator/extension.js | 2 +- extensions/workspace-indicator/prefs.js | 6 +++--- lint/eslintrc-legacy.json | 3 +-- 10 files changed, 45 insertions(+), 46 deletions(-) diff --git a/extensions/apps-menu/extension.js b/extensions/apps-menu/extension.js index fb5d6fd3..0c991231 100644 --- a/extensions/apps-menu/extension.js +++ b/extensions/apps-menu/extension.js @@ -26,7 +26,7 @@ class ActivitiesMenuItem extends PopupMenu.PopupBaseMenuItem { constructor(button) { super(); this._button = button; - this.actor.add_child(new St.Label({ text: _("Activities Overview") })); + this.actor.add_child(new St.Label({ text: _('Activities Overview') })); } activate(event) { @@ -115,7 +115,7 @@ class CategoryMenuItem extends PopupMenu.PopupBaseMenuItem { if (this._category) name = this._category.get_name(); else - name = _("Favorites"); + name = _('Favorites'); this.actor.add_child(new St.Label({ text: name })); this.actor.connect('motion-event', this._onMotionEvent.bind(this)); @@ -404,7 +404,7 @@ class ApplicationsButton extends PanelMenu.Button { let hbox = new St.BoxLayout({ style_class: 'panel-status-menu-box' }); this._label = new St.Label({ - text: _("Applications"), + text: _('Applications'), y_expand: true, y_align: Clutter.ActorAlign.CENTER }); diff --git a/extensions/auto-move-windows/prefs.js b/extensions/auto-move-windows/prefs.js index 3b3a70e6..f808347c 100644 --- a/extensions/auto-move-windows/prefs.js +++ b/extensions/auto-move-windows/prefs.js @@ -57,25 +57,25 @@ const Widget = GObject.registerClass({ let appColumn = new Gtk.TreeViewColumn({ expand: true, sort_column_id: Columns.DISPLAY_NAME, - title: _("Application") + title: _('Application') }); let iconRenderer = new Gtk.CellRendererPixbuf; appColumn.pack_start(iconRenderer, false); - appColumn.add_attribute(iconRenderer, "gicon", Columns.ICON); + appColumn.add_attribute(iconRenderer, 'gicon', Columns.ICON); let nameRenderer = new Gtk.CellRendererText; appColumn.pack_start(nameRenderer, true); - appColumn.add_attribute(nameRenderer, "text", Columns.DISPLAY_NAME); + appColumn.add_attribute(nameRenderer, 'text', Columns.DISPLAY_NAME); this._treeView.append_column(appColumn); let workspaceColumn = new Gtk.TreeViewColumn({ - title: _("Workspace"), + title: _('Workspace'), sort_column_id: Columns.WORKSPACE }); let workspaceRenderer = new Gtk.CellRendererSpin({ editable: true }); workspaceRenderer.connect('edited', this._workspaceEdited.bind(this)); workspaceColumn.pack_start(workspaceRenderer, true); - workspaceColumn.add_attribute(workspaceRenderer, "adjustment", Columns.ADJUSTMENT); - workspaceColumn.add_attribute(workspaceRenderer, "text", Columns.WORKSPACE); + workspaceColumn.add_attribute(workspaceRenderer, 'adjustment', Columns.ADJUSTMENT); + workspaceColumn.add_attribute(workspaceRenderer, 'text', Columns.WORKSPACE); this._treeView.append_column(workspaceColumn); scrolled.add(this._treeView); @@ -86,7 +86,7 @@ const Widget = GObject.registerClass({ let newButton = new Gtk.ToolButton({ icon_name: 'bookmark-new-symbolic', - label: _("Add Rule"), + label: _('Add Rule'), is_important: true }); newButton.connect('clicked', this._createNew.bind(this)); @@ -108,13 +108,13 @@ const Widget = GObject.registerClass({ _createNew() { let dialog = new Gtk.Dialog({ - title: _("Create new matching rule"), + title: _('Create new matching rule'), transient_for: this.get_toplevel(), use_header_bar: true, modal: true }); dialog.add_button(Gtk.STOCK_CANCEL, Gtk.ResponseType.CANCEL); - let addButton = dialog.add_button(_("Add"), Gtk.ResponseType.OK); + let addButton = dialog.add_button(_('Add'), Gtk.ResponseType.OK); dialog.set_default_response(Gtk.ResponseType.OK); let grid = new Gtk.Grid({ @@ -131,7 +131,7 @@ const Widget = GObject.registerClass({ grid.attach(dialog._appChooser, 0, 0, 2, 1); grid.attach(new Gtk.Label({ - label: _("Workspace"), + label: _('Workspace'), halign: Gtk.Align.END }), 0, 1, 1, 1); let adjustment = new Gtk.Adjustment({ diff --git a/extensions/drive-menu/extension.js b/extensions/drive-menu/extension.js index 47537f5e..51b4aa67 100644 --- a/extensions/drive-menu/extension.js +++ b/extensions/drive-menu/extension.js @@ -97,7 +97,7 @@ class MountMenuItem extends PopupMenu.PopupBaseMenuItem { _reportFailure(exception) { // TRANSLATORS: %s is the filesystem name - let msg = _("Ejecting drive “%s” failed:").format(this.mount.get_name()); + let msg = _('Ejecting drive “%s” failed:').format(this.mount.get_name()); Main.notifyError(msg, exception.message); } @@ -113,7 +113,7 @@ class MountMenuItem extends PopupMenu.PopupBaseMenuItem { let DriveMenu = GObject.registerClass( class DriveMenu extends PanelMenu.Button { _init() { - super._init(0.0, _("Removable devices")); + super._init(0.0, _('Removable devices')); let hbox = new St.BoxLayout({ style_class: 'panel-status-menu-box' }); let icon = new St.Icon({ @@ -140,7 +140,7 @@ class DriveMenu extends PanelMenu.Button { this._monitor.get_mounts().forEach(this._addMount.bind(this)); this.menu.addMenuItem(new PopupMenu.PopupSeparatorMenuItem()); - this.menu.addAction(_("Open Files"), event => { + this.menu.addAction(_('Open Files'), event => { let appSystem = Shell.AppSystem.get_default(); let app = appSystem.lookup_app('org.gnome.Nautilus.desktop'); app.activate_full(-1, event.get_time()); diff --git a/extensions/places-menu/extension.js b/extensions/places-menu/extension.js index 11090e18..c477a4ac 100644 --- a/extensions/places-menu/extension.js +++ b/extensions/places-menu/extension.js @@ -76,11 +76,11 @@ const SECTIONS = [ let PlacesMenu = GObject.registerClass( class PlacesMenu extends PanelMenu.Button { _init() { - super._init(0.0, _("Places")); + super._init(0.0, _('Places')); let hbox = new St.BoxLayout({ style_class: 'panel-status-menu-box' }); let label = new St.Label({ - text: _("Places"), + text: _('Places'), y_expand: true, y_align: Clutter.ActorAlign.CENTER }); diff --git a/extensions/places-menu/placeDisplay.js b/extensions/places-menu/placeDisplay.js index 79d401de..037a3394 100644 --- a/extensions/places-menu/placeDisplay.js +++ b/extensions/places-menu/placeDisplay.js @@ -56,7 +56,7 @@ class PlaceInfo { if (e.matches(Gio.IOErrorEnum, Gio.IOErrorEnum.FAILED_HANDLED)) // e.g. user canceled the password dialog return; - Main.notifyError(_("Failed to mount volume for “%s”").format(this.name), e.message); + Main.notifyError(_('Failed to mount volume for “%s”').format(this.name), e.message); return; } @@ -69,7 +69,7 @@ class PlaceInfo { } }); } else { - Main.notifyError(_("Failed to launch “%s”").format(this.name), e.message); + Main.notifyError(_('Failed to launch “%s”').format(this.name), e.message); } } }; @@ -130,7 +130,7 @@ Signals.addSignalMethods(PlaceInfo.prototype); class RootInfo extends PlaceInfo { _init() { - super._init('devices', Gio.File.new_for_path('/'), _("Computer")); + super._init('devices', Gio.File.new_for_path('/'), _('Computer')); let busName = 'org.freedesktop.hostname1'; let objPath = '/org/freedesktop/hostname1'; @@ -153,7 +153,7 @@ class RootInfo extends PlaceInfo { // GDBusProxy will emit a g-properties-changed when hostname1 goes down // ignore it if (proxy.g_name_owner) { - this.name = proxy.PrettyHostname || _("Computer"); + this.name = proxy.PrettyHostname || _('Computer'); this.emit('changed'); } } @@ -214,7 +214,7 @@ class PlaceDeviceInfo extends PlaceInfo { } _reportFailure(exception) { - let msg = _("Ejecting drive “%s” failed:").format(this._mount.get_name()); + let msg = _('Ejecting drive “%s” failed:').format(this._mount.get_name()); Main.notifyError(msg, exception.message); } } @@ -340,7 +340,7 @@ var PlacesManager = class { this._places.special.push(new PlaceInfo('special', Gio.File.new_for_path(homePath), - _("Home"))); + _('Home'))); let specials = []; let dirs = DEFAULT_DIRECTORIES.slice(); @@ -384,7 +384,7 @@ var PlacesManager = class { this._places.devices.push(new RootInfo()); this._places.network.push(new PlaceInfo('network', Gio.File.new_for_uri('network:///'), - _("Browse Network"), + _('Browse Network'), 'network-workgroup-symbolic')); /* first go through all connected drives */ diff --git a/extensions/window-list/extension.js b/extensions/window-list/extension.js index 24cd2334..9e2ee94c 100644 --- a/extensions/window-list/extension.js +++ b/extensions/window-list/extension.js @@ -97,7 +97,7 @@ class WindowContextMenu extends PopupMenu.PopupMenu { this._updateMaximizeItem.bind(this)); this._updateMaximizeItem(); - this._closeItem = new PopupMenu.PopupMenuItem(_("Close")); + this._closeItem = new PopupMenu.PopupMenuItem(_('Close')); this._closeItem.connect('activate', () => { this._metaWindow.delete(global.get_current_time()); }); @@ -117,14 +117,14 @@ class WindowContextMenu extends PopupMenu.PopupMenu { _updateMinimizeItem() { this._minimizeItem.label.text = this._metaWindow.minimized ? - _("Unminimize") : _("Minimize"); + _('Unminimize') : _('Minimize'); } _updateMaximizeItem() { let maximized = this._metaWindow.maximized_vertically && this._metaWindow.maximized_horizontally; this._maximizeItem.label.text = maximized ? - _("Unmaximize") : _("Maximize"); + _('Unmaximize') : _('Maximize'); } _onDestroy() { @@ -405,19 +405,19 @@ class AppContextMenu extends PopupMenu.PopupMenu { this._appButton = appButton; - this._minimizeItem = new PopupMenu.PopupMenuItem(_("Minimize all")); + this._minimizeItem = new PopupMenu.PopupMenuItem(_('Minimize all')); this._minimizeItem.connect('activate', () => { this._appButton.getWindowList().forEach(w => w.minimize()); }); this.addMenuItem(this._minimizeItem); - this._unminimizeItem = new PopupMenu.PopupMenuItem(_("Unminimize all")); + this._unminimizeItem = new PopupMenu.PopupMenuItem(_('Unminimize all')); this._unminimizeItem.connect('activate', () => { this._appButton.getWindowList().forEach(w => w.unminimize()); }); this.addMenuItem(this._unminimizeItem); - this._maximizeItem = new PopupMenu.PopupMenuItem(_("Maximize all")); + this._maximizeItem = new PopupMenu.PopupMenuItem(_('Maximize all')); this._maximizeItem.connect('activate', () => { this._appButton.getWindowList().forEach(w => { w.maximize(Meta.MaximizeFlags.HORIZONTAL | @@ -426,7 +426,7 @@ class AppContextMenu extends PopupMenu.PopupMenu { }); this.addMenuItem(this._maximizeItem); - this._unmaximizeItem = new PopupMenu.PopupMenuItem(_("Unmaximize all")); + this._unmaximizeItem = new PopupMenu.PopupMenuItem(_('Unmaximize all')); this._unmaximizeItem.connect('activate', () => { this._appButton.getWindowList().forEach(w => { w.unmaximize(Meta.MaximizeFlags.HORIZONTAL | @@ -435,7 +435,7 @@ class AppContextMenu extends PopupMenu.PopupMenu { }); this.addMenuItem(this._unmaximizeItem); - let item = new PopupMenu.PopupMenuItem(_("Close all")); + let item = new PopupMenu.PopupMenuItem(_('Close all')); item.connect('activate', () => { this._appButton.getWindowList().forEach(w => { w.delete(global.get_current_time()); @@ -652,7 +652,7 @@ class AppButton extends BaseButton { let WorkspaceIndicator = GObject.registerClass( class WorkspaceIndicator extends PanelMenu.Button { _init() { - super._init(0.0, _("Workspace Indicator"), true); + super._init(0.0, _('Workspace Indicator'), true); this.setMenu(new PopupMenu.PopupMenu(this, 0.0, St.Side.BOTTOM)); this.add_style_class_name('window-list-workspace-indicator'); this.menu.actor.remove_style_class_name('panel-menu'); @@ -833,7 +833,7 @@ class WindowList { trackFullscreen: true }); Main.uiGroup.set_child_above_sibling(this.actor, Main.layoutManager.panelBox); - Main.ctrlAltTabManager.addGroup(this.actor, _("Window List"), 'start-here-symbolic'); + Main.ctrlAltTabManager.addGroup(this.actor, _('Window List'), 'start-here-symbolic'); this.actor.width = this._monitor.width; this.actor.connect('notify::height', this._updatePosition.bind(this)); diff --git a/extensions/window-list/prefs.js b/extensions/window-list/prefs.js index 3c2960a6..78792b5a 100644 --- a/extensions/window-list/prefs.js +++ b/extensions/window-list/prefs.js @@ -22,7 +22,7 @@ class WindowListPrefsWidget extends Gtk.Grid { this.row_spacing = 6; this.orientation = Gtk.Orientation.VERTICAL; - let groupingLabel = '%s'.format(_("Window Grouping")); + let groupingLabel = '%s'.format(_('Window Grouping')); this.add(new Gtk.Label({ label: groupingLabel, use_markup: true, halign: Gtk.Align.START @@ -44,9 +44,9 @@ class WindowListPrefsWidget extends Gtk.Grid { let modes = range.deep_unpack()[1].deep_unpack(); let modeLabels = { - 'never': _("Never group windows"), - 'auto': _("Group windows when space is limited"), - 'always': _("Always group windows") + 'never': _('Never group windows'), + 'auto': _('Group windows when space is limited'), + 'always': _('Always group windows') }; let radio = null; @@ -72,7 +72,7 @@ class WindowListPrefsWidget extends Gtk.Grid { } let check = new Gtk.CheckButton({ - label: _("Show on all monitors"), + label: _('Show on all monitors'), margin_top: 6 }); this._settings.bind('show-on-all-monitors', check, 'active', Gio.SettingsBindFlags.DEFAULT); diff --git a/extensions/workspace-indicator/extension.js b/extensions/workspace-indicator/extension.js index 38ed8703..3be12686 100644 --- a/extensions/workspace-indicator/extension.js +++ b/extensions/workspace-indicator/extension.js @@ -18,7 +18,7 @@ const WORKSPACE_KEY = 'workspace-names'; let WorkspaceIndicator = GObject.registerClass( class WorkspaceIndicator extends PanelMenu.Button { _init() { - super._init(0.0, _("Workspace Indicator")); + super._init(0.0, _('Workspace Indicator')); let workspaceManager = global.workspace_manager; diff --git a/extensions/workspace-indicator/prefs.js b/extensions/workspace-indicator/prefs.js index ed5c4785..d8640559 100644 --- a/extensions/workspace-indicator/prefs.js +++ b/extensions/workspace-indicator/prefs.js @@ -128,7 +128,7 @@ class WorkspaceSettingsWidget extends Gtk.Grid { this.orientation = Gtk.Orientation.VERTICAL; this.add(new Gtk.Label({ - label: '%s'.format(_("Workspace Names")), + label: '%s'.format(_('Workspace Names')), use_markup: true, margin_bottom: 6, hexpand: true, @@ -148,7 +148,7 @@ class WorkspaceSettingsWidget extends Gtk.Grid { vexpand: true }); - let column = new Gtk.TreeViewColumn({ title: _("Name") }); + let column = new Gtk.TreeViewColumn({ title: _('Name') }); let renderer = new Gtk.CellRendererText({ editable: true }); renderer.connect('edited', this._cellEdited.bind(this)); column.pack_start(renderer, true); @@ -188,7 +188,7 @@ class WorkspaceSettingsWidget extends Gtk.Grid { let iter = this._store.append(); let index = this._store.get_path(iter).get_indices()[0]; - let label = _("Workspace %d").format(index + 1); + let label = _('Workspace %d').format(index + 1); this._store.set(iter, [this._store.Columns.LABEL], [label]); } diff --git a/lint/eslintrc-legacy.json b/lint/eslintrc-legacy.json index 1c57f080..aca79adf 100644 --- a/lint/eslintrc-legacy.json +++ b/lint/eslintrc-legacy.json @@ -11,7 +11,6 @@ "CallExpression": { "arguments": "first" }, "MemberExpression": "off" } - ], - "quotes": "off" + ] } } -- GitLab