[gnome-shell] cleanup: Use consistent switch indentation
- From: Georges Basile Stavracas Neto <gbsneto src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-shell] cleanup: Use consistent switch indentation
- Date: Tue, 2 Jul 2019 12:24:34 +0000 (UTC)
commit 6ed5bc2f6cc29deb6f3b367879bd455b2bc068ff
Author: Florian Müllner <fmuellner gnome org>
Date: Fri Feb 1 13:21:00 2019 +0100
cleanup: Use consistent switch indentation
We are currently inconsistent on whether case labels share the same
indentation level as the corresponding switch statement or not. gjs
goes with the default of no additional indentation, so go along with
that.
https://gitlab.gnome.org/GNOME/gnome-shell/merge_requests/608
js/misc/systemActions.js | 36 +++++++++----------
js/ui/altTab.js | 34 +++++++++---------
js/ui/appDisplay.js | 28 +++++++--------
js/ui/audioDeviceSelection.js | 32 ++++++++---------
js/ui/boxpointer.js | 72 ++++++++++++++++++-------------------
js/ui/components/telepathyClient.js | 44 +++++++++++------------
js/ui/dnd.js | 10 +++---
js/ui/endSessionDialog.js | 26 +++++++-------
js/ui/iconGrid.js | 32 ++++++++---------
js/ui/lookingGlass.js | 22 ++++++------
js/ui/magnifier.js | 30 ++++++++--------
js/ui/notificationDaemon.js | 50 +++++++++++++-------------
js/ui/popupMenu.js | 48 ++++++++++++-------------
js/ui/status/network.js | 34 +++++++++---------
js/ui/windowManager.js | 42 +++++++++++-----------
15 files changed, 270 insertions(+), 270 deletions(-)
---
diff --git a/js/misc/systemActions.js b/js/misc/systemActions.js
index d7f88375d..1bc3eabe2 100644
--- a/js/misc/systemActions.js
+++ b/js/misc/systemActions.js
@@ -284,24 +284,24 @@ const SystemActions = GObject.registerClass({
activateAction(id) {
switch (id) {
- case POWER_OFF_ACTION_ID:
- this.activatePowerOff();
- break;
- case LOCK_SCREEN_ACTION_ID:
- this.activateLockScreen();
- break;
- case LOGOUT_ACTION_ID:
- this.activateLogout();
- break;
- case SUSPEND_ACTION_ID:
- this.activateSuspend();
- break;
- case SWITCH_USER_ACTION_ID:
- this.activateSwitchUser();
- break;
- case LOCK_ORIENTATION_ACTION_ID:
- this.activateLockOrientation();
- break;
+ case POWER_OFF_ACTION_ID:
+ this.activatePowerOff();
+ break;
+ case LOCK_SCREEN_ACTION_ID:
+ this.activateLockScreen();
+ break;
+ case LOGOUT_ACTION_ID:
+ this.activateLogout();
+ break;
+ case SUSPEND_ACTION_ID:
+ this.activateSuspend();
+ break;
+ case SWITCH_USER_ACTION_ID:
+ this.activateSwitchUser();
+ break;
+ case LOCK_ORIENTATION_ACTION_ID:
+ this.activateLockOrientation();
+ break;
}
}
diff --git a/js/ui/altTab.js b/js/ui/altTab.js
index 83e26cf8a..2e2f7282d 100644
--- a/js/ui/altTab.js
+++ b/js/ui/altTab.js
@@ -984,23 +984,23 @@ class WindowIcon extends St.BoxLayout {
let scaleFactor = St.ThemeContext.get_for_stage(global.stage).scale_factor;
switch (mode) {
- case AppIconMode.THUMBNAIL_ONLY:
- size = WINDOW_PREVIEW_SIZE;
- this._icon.add_actor(_createWindowClone(mutterWindow, size * scaleFactor));
- break;
-
- case AppIconMode.BOTH:
- size = WINDOW_PREVIEW_SIZE;
- this._icon.add_actor(_createWindowClone(mutterWindow, size * scaleFactor));
-
- if (this.app)
- this._icon.add_actor(this._createAppIcon(this.app,
- APP_ICON_SIZE_SMALL));
- break;
-
- case AppIconMode.APP_ICON_ONLY:
- size = APP_ICON_SIZE;
- this._icon.add_actor(this._createAppIcon(this.app, size));
+ case AppIconMode.THUMBNAIL_ONLY:
+ size = WINDOW_PREVIEW_SIZE;
+ this._icon.add_actor(_createWindowClone(mutterWindow, size * scaleFactor));
+ break;
+
+ case AppIconMode.BOTH:
+ size = WINDOW_PREVIEW_SIZE;
+ this._icon.add_actor(_createWindowClone(mutterWindow, size * scaleFactor));
+
+ if (this.app)
+ this._icon.add_actor(this._createAppIcon(this.app,
+ APP_ICON_SIZE_SMALL));
+ break;
+
+ case AppIconMode.APP_ICON_ONLY:
+ size = APP_ICON_SIZE;
+ this._icon.add_actor(this._createAppIcon(this.app, size));
}
this._icon.set_size(size * scaleFactor, size * scaleFactor);
diff --git a/js/ui/appDisplay.js b/js/ui/appDisplay.js
index d24780d0e..680613025 100644
--- a/js/ui/appDisplay.js
+++ b/js/ui/appDisplay.js
@@ -1331,22 +1331,22 @@ var AppFolderPopup = class AppFolderPopup {
let direction;
let isLtr = Clutter.get_default_text_direction() == Clutter.TextDirection.LTR;
switch (event.get_key_symbol()) {
- case Clutter.Down:
- direction = St.DirectionType.TAB_FORWARD;
- break;
- case Clutter.Right:
- direction = isLtr ? St.DirectionType.TAB_FORWARD :
+ case Clutter.Down:
+ direction = St.DirectionType.TAB_FORWARD;
+ break;
+ case Clutter.Right:
+ direction = isLtr ? St.DirectionType.TAB_FORWARD :
St.DirectionType.TAB_BACKWARD;
- break;
- case Clutter.Up:
- direction = St.DirectionType.TAB_BACKWARD;
- break;
- case Clutter.Left:
- direction = isLtr ? St.DirectionType.TAB_BACKWARD :
+ break;
+ case Clutter.Up:
+ direction = St.DirectionType.TAB_BACKWARD;
+ break;
+ case Clutter.Left:
+ direction = isLtr ? St.DirectionType.TAB_BACKWARD :
St.DirectionType.TAB_FORWARD;
- break;
- default:
- return Clutter.EVENT_PROPAGATE;
+ break;
+ default:
+ return Clutter.EVENT_PROPAGATE;
}
return actor.navigate_focus(null, direction, false);
}
diff --git a/js/ui/audioDeviceSelection.js b/js/ui/audioDeviceSelection.js
index 55eeb2b6c..8ee00025c 100644
--- a/js/ui/audioDeviceSelection.js
+++ b/js/ui/audioDeviceSelection.js
@@ -55,27 +55,27 @@ var AudioDeviceSelectionDialog = GObject.registerClass({
_getDeviceLabel(device) {
switch (device) {
- case AudioDevice.HEADPHONES:
- return _("Headphones");
- case AudioDevice.HEADSET:
- return _("Headset");
- case AudioDevice.MICROPHONE:
- return _("Microphone");
- default:
- return null;
+ case AudioDevice.HEADPHONES:
+ return _("Headphones");
+ case AudioDevice.HEADSET:
+ return _("Headset");
+ case AudioDevice.MICROPHONE:
+ return _("Microphone");
+ default:
+ return null;
}
}
_getDeviceIcon(device) {
switch (device) {
- case AudioDevice.HEADPHONES:
- return 'audio-headphones-symbolic';
- case AudioDevice.HEADSET:
- return 'audio-headset-symbolic';
- case AudioDevice.MICROPHONE:
- return 'audio-input-microphone-symbolic';
- default:
- return null;
+ case AudioDevice.HEADPHONES:
+ return 'audio-headphones-symbolic';
+ case AudioDevice.HEADSET:
+ return 'audio-headset-symbolic';
+ case AudioDevice.MICROPHONE:
+ return 'audio-input-microphone-symbolic';
+ default:
+ return null;
}
}
diff --git a/js/ui/boxpointer.js b/js/ui/boxpointer.js
index a1b0870bf..1edc3dd9e 100644
--- a/js/ui/boxpointer.js
+++ b/js/ui/boxpointer.js
@@ -90,18 +90,18 @@ var BoxPointer = GObject.registerClass({
if (animate & PopupAnimation.SLIDE) {
switch (this._arrowSide) {
- case St.Side.TOP:
- this.translation_y = -rise;
- break;
- case St.Side.BOTTOM:
- this.translation_y = rise;
- break;
- case St.Side.LEFT:
- this.translation_x = -rise;
- break;
- case St.Side.RIGHT:
- this.translation_x = rise;
- break;
+ case St.Side.TOP:
+ this.translation_y = -rise;
+ break;
+ case St.Side.BOTTOM:
+ this.translation_y = rise;
+ break;
+ case St.Side.LEFT:
+ this.translation_x = -rise;
+ break;
+ case St.Side.RIGHT:
+ this.translation_x = rise;
+ break;
}
}
@@ -130,18 +130,18 @@ var BoxPointer = GObject.registerClass({
if (animate & PopupAnimation.SLIDE) {
switch (this._arrowSide) {
- case St.Side.TOP:
- translationY = rise;
- break;
- case St.Side.BOTTOM:
- translationY = -rise;
- break;
- case St.Side.LEFT:
- translationX = rise;
- break;
- case St.Side.RIGHT:
- translationX = -rise;
- break;
+ case St.Side.TOP:
+ translationY = rise;
+ break;
+ case St.Side.BOTTOM:
+ translationY = -rise;
+ break;
+ case St.Side.LEFT:
+ translationX = rise;
+ break;
+ case St.Side.RIGHT:
+ translationX = -rise;
+ break;
}
}
@@ -220,18 +220,18 @@ var BoxPointer = GObject.registerClass({
childBox.x2 = availWidth - borderWidth;
childBox.y2 = availHeight - borderWidth;
switch (this._arrowSide) {
- case St.Side.TOP:
- childBox.y1 += rise;
- break;
- case St.Side.BOTTOM:
- childBox.y2 -= rise;
- break;
- case St.Side.LEFT:
- childBox.x1 += rise;
- break;
- case St.Side.RIGHT:
- childBox.x2 -= rise;
- break;
+ case St.Side.TOP:
+ childBox.y1 += rise;
+ break;
+ case St.Side.BOTTOM:
+ childBox.y2 -= rise;
+ break;
+ case St.Side.LEFT:
+ childBox.x1 += rise;
+ break;
+ case St.Side.RIGHT:
+ childBox.x2 -= rise;
+ break;
}
this.bin.allocate(childBox, flags);
diff --git a/js/ui/components/telepathyClient.js b/js/ui/components/telepathyClient.js
index 08fff1925..3f961aab0 100644
--- a/js/ui/components/telepathyClient.js
+++ b/js/ui/components/telepathyClient.js
@@ -360,28 +360,28 @@ var ChatSource = class extends MessageTray.Source {
let presenceType = this._contact.get_presence_type();
switch (presenceType) {
- case Tp.ConnectionPresenceType.AVAILABLE:
- iconName = 'user-available';
- break;
- case Tp.ConnectionPresenceType.BUSY:
- iconName = 'user-busy';
- break;
- case Tp.ConnectionPresenceType.OFFLINE:
- iconName = 'user-offline';
- break;
- case Tp.ConnectionPresenceType.HIDDEN:
- iconName = 'user-invisible';
- break;
- case Tp.ConnectionPresenceType.AWAY:
- iconName = 'user-away';
- break;
- case Tp.ConnectionPresenceType.EXTENDED_AWAY:
- iconName = 'user-idle';
- break;
- default:
- iconName = 'user-offline';
- }
- return new Gio.ThemedIcon({ name: iconName });
+ case Tp.ConnectionPresenceType.AVAILABLE:
+ iconName = 'user-available';
+ break;
+ case Tp.ConnectionPresenceType.BUSY:
+ iconName = 'user-busy';
+ break;
+ case Tp.ConnectionPresenceType.OFFLINE:
+ iconName = 'user-offline';
+ break;
+ case Tp.ConnectionPresenceType.HIDDEN:
+ iconName = 'user-invisible';
+ break;
+ case Tp.ConnectionPresenceType.AWAY:
+ iconName = 'user-away';
+ break;
+ case Tp.ConnectionPresenceType.EXTENDED_AWAY:
+ iconName = 'user-idle';
+ break;
+ default:
+ iconName = 'user-offline';
+ }
+ return new Gio.ThemedIcon({ name: iconName });
}
_updateAvatarIcon() {
diff --git a/js/ui/dnd.js b/js/ui/dnd.js
index 3f533e9af..e53de0b44 100644
--- a/js/ui/dnd.js
+++ b/js/ui/dnd.js
@@ -561,11 +561,11 @@ var _Draggable = class _Draggable {
let dropFunc = dragMonitors[i].dragDrop;
if (dropFunc)
switch (dropFunc(dropEvent)) {
- case DragDropResult.FAILURE:
- case DragDropResult.SUCCESS:
- return true;
- case DragDropResult.CONTINUE:
- continue;
+ case DragDropResult.FAILURE:
+ case DragDropResult.SUCCESS:
+ return true;
+ case DragDropResult.CONTINUE:
+ continue;
}
}
diff --git a/js/ui/endSessionDialog.js b/js/ui/endSessionDialog.js
index 1c6989b71..74797ae43 100644
--- a/js/ui/endSessionDialog.js
+++ b/js/ui/endSessionDialog.js
@@ -472,19 +472,19 @@ class EndSessionDialog extends ModalDialog.ModalDialog {
// Trigger the offline update as requested
if (this._checkBox.actor.checked) {
switch (signal) {
- case "ConfirmedReboot":
- this._triggerOfflineUpdateReboot(callback);
- break;
- case "ConfirmedShutdown":
- // To actually trigger the offline update, we need to
- // reboot to do the upgrade. When the upgrade is complete,
- // the computer will shut down automatically.
- signal = "ConfirmedReboot";
- this._triggerOfflineUpdateShutdown(callback);
- break;
- default:
- callback();
- break;
+ case "ConfirmedReboot":
+ this._triggerOfflineUpdateReboot(callback);
+ break;
+ case "ConfirmedShutdown":
+ // To actually trigger the offline update, we need to
+ // reboot to do the upgrade. When the upgrade is complete,
+ // the computer will shut down automatically.
+ signal = "ConfirmedReboot";
+ this._triggerOfflineUpdateShutdown(callback);
+ break;
+ default:
+ callback();
+ break;
}
} else {
this._triggerOfflineUpdateCancel(callback);
diff --git a/js/ui/iconGrid.js b/js/ui/iconGrid.js
index 44ccf4dd7..2dfdf5f44 100644
--- a/js/ui/iconGrid.js
+++ b/js/ui/iconGrid.js
@@ -312,14 +312,14 @@ var IconGrid = GObject.registerClass({
let leftEmptySpace;
switch (this._xAlign) {
- case St.Align.START:
- leftEmptySpace = 0;
- break;
- case St.Align.MIDDLE:
- leftEmptySpace = Math.floor((availWidth - usedWidth) / 2);
- break;
- case St.Align.END:
- leftEmptySpace = availWidth - usedWidth;
+ case St.Align.START:
+ leftEmptySpace = 0;
+ break;
+ case St.Align.MIDDLE:
+ leftEmptySpace = Math.floor((availWidth - usedWidth) / 2);
+ break;
+ case St.Align.END:
+ leftEmptySpace = availWidth - usedWidth;
}
let animating = this._clonesAnimating.length > 0;
@@ -806,14 +806,14 @@ var PaginatedIconGrid = GObject.registerClass({
let leftEmptySpace;
switch (this._xAlign) {
- case St.Align.START:
- leftEmptySpace = 0;
- break;
- case St.Align.MIDDLE:
- leftEmptySpace = Math.floor((availWidth - usedWidth) / 2);
- break;
- case St.Align.END:
- leftEmptySpace = availWidth - usedWidth;
+ case St.Align.START:
+ leftEmptySpace = 0;
+ break;
+ case St.Align.MIDDLE:
+ leftEmptySpace = Math.floor((availWidth - usedWidth) / 2);
+ break;
+ case St.Align.END:
+ leftEmptySpace = availWidth - usedWidth;
}
let x = box.x1 + leftEmptySpace + this.leftPadding;
diff --git a/js/ui/lookingGlass.js b/js/ui/lookingGlass.js
index e191b509e..980cdf845 100644
--- a/js/ui/lookingGlass.js
+++ b/js/ui/lookingGlass.js
@@ -688,17 +688,17 @@ var Extensions = class Extensions {
_stateToString(extensionState) {
switch (extensionState) {
- case ExtensionSystem.ExtensionState.ENABLED:
- return _("Enabled");
- case ExtensionSystem.ExtensionState.DISABLED:
- case ExtensionSystem.ExtensionState.INITIALIZED:
- return _("Disabled");
- case ExtensionSystem.ExtensionState.ERROR:
- return _("Error");
- case ExtensionSystem.ExtensionState.OUT_OF_DATE:
- return _("Out of date");
- case ExtensionSystem.ExtensionState.DOWNLOADING:
- return _("Downloading");
+ case ExtensionSystem.ExtensionState.ENABLED:
+ return _("Enabled");
+ case ExtensionSystem.ExtensionState.DISABLED:
+ case ExtensionSystem.ExtensionState.INITIALIZED:
+ return _("Disabled");
+ case ExtensionSystem.ExtensionState.ERROR:
+ return _("Error");
+ case ExtensionSystem.ExtensionState.OUT_OF_DATE:
+ return _("Out of date");
+ case ExtensionSystem.ExtensionState.DOWNLOADING:
+ return _("Downloading");
}
return 'Unknown'; // Not translated, shouldn't appear
}
diff --git a/js/ui/magnifier.js b/js/ui/magnifier.js
index 9e857f1a2..14b73b17c 100644
--- a/js/ui/magnifier.js
+++ b/js/ui/magnifier.js
@@ -1099,21 +1099,21 @@ var ZoomRegion = class ZoomRegion {
*/
setScreenPosition(inPosition) {
switch (inPosition) {
- case GDesktopEnums.MagnifierScreenPosition.FULL_SCREEN:
- this.setFullScreenMode();
- break;
- case GDesktopEnums.MagnifierScreenPosition.TOP_HALF:
- this.setTopHalf();
- break;
- case GDesktopEnums.MagnifierScreenPosition.BOTTOM_HALF:
- this.setBottomHalf();
- break;
- case GDesktopEnums.MagnifierScreenPosition.LEFT_HALF:
- this.setLeftHalf();
- break;
- case GDesktopEnums.MagnifierScreenPosition.RIGHT_HALF:
- this.setRightHalf();
- break;
+ case GDesktopEnums.MagnifierScreenPosition.FULL_SCREEN:
+ this.setFullScreenMode();
+ break;
+ case GDesktopEnums.MagnifierScreenPosition.TOP_HALF:
+ this.setTopHalf();
+ break;
+ case GDesktopEnums.MagnifierScreenPosition.BOTTOM_HALF:
+ this.setBottomHalf();
+ break;
+ case GDesktopEnums.MagnifierScreenPosition.LEFT_HALF:
+ this.setLeftHalf();
+ break;
+ case GDesktopEnums.MagnifierScreenPosition.RIGHT_HALF:
+ this.setRightHalf();
+ break;
}
}
diff --git a/js/ui/notificationDaemon.js b/js/ui/notificationDaemon.js
index 05ebb0068..77960725e 100644
--- a/js/ui/notificationDaemon.js
+++ b/js/ui/notificationDaemon.js
@@ -76,13 +76,13 @@ var FdoNotificationDaemon = class FdoNotificationDaemon {
_fallbackIconForNotificationData(hints) {
let stockIcon;
switch (hints.urgency) {
- case Urgency.LOW:
- case Urgency.NORMAL:
- stockIcon = 'dialog-information';
- break;
- case Urgency.CRITICAL:
- stockIcon = 'dialog-error';
- break;
+ case Urgency.LOW:
+ case Urgency.NORMAL:
+ stockIcon = 'dialog-information';
+ break;
+ case Urgency.CRITICAL:
+ stockIcon = 'dialog-error';
+ break;
}
return new Gio.ThemedIcon({ name: stockIcon });
}
@@ -270,15 +270,15 @@ var FdoNotificationDaemon = class FdoNotificationDaemon {
delete this._notifications[ndata.id];
let notificationClosedReason;
switch (reason) {
- case MessageTray.NotificationDestroyedReason.EXPIRED:
- notificationClosedReason = NotificationClosedReason.EXPIRED;
- break;
- case MessageTray.NotificationDestroyedReason.DISMISSED:
- notificationClosedReason = NotificationClosedReason.DISMISSED;
- break;
- case MessageTray.NotificationDestroyedReason.SOURCE_CLOSED:
- notificationClosedReason = NotificationClosedReason.APP_CLOSED;
- break;
+ case MessageTray.NotificationDestroyedReason.EXPIRED:
+ notificationClosedReason = NotificationClosedReason.EXPIRED;
+ break;
+ case MessageTray.NotificationDestroyedReason.DISMISSED:
+ notificationClosedReason = NotificationClosedReason.DISMISSED;
+ break;
+ case MessageTray.NotificationDestroyedReason.SOURCE_CLOSED:
+ notificationClosedReason = NotificationClosedReason.APP_CLOSED;
+ break;
}
this._emitNotificationClosed(ndata.id, notificationClosedReason);
});
@@ -330,15 +330,15 @@ var FdoNotificationDaemon = class FdoNotificationDaemon {
}
switch (hints.urgency) {
- case Urgency.LOW:
- notification.setUrgency(MessageTray.Urgency.LOW);
- break;
- case Urgency.NORMAL:
- notification.setUrgency(MessageTray.Urgency.NORMAL);
- break;
- case Urgency.CRITICAL:
- notification.setUrgency(MessageTray.Urgency.CRITICAL);
- break;
+ case Urgency.LOW:
+ notification.setUrgency(MessageTray.Urgency.LOW);
+ break;
+ case Urgency.NORMAL:
+ notification.setUrgency(MessageTray.Urgency.NORMAL);
+ break;
+ case Urgency.CRITICAL:
+ notification.setUrgency(MessageTray.Urgency.CRITICAL);
+ break;
}
notification.setResident(!!hints.resident);
// 'transient' is a reserved keyword in JS, so we have to retrieve the value
diff --git a/js/ui/popupMenu.js b/js/ui/popupMenu.js
index cede9633c..1d3be68ba 100644
--- a/js/ui/popupMenu.js
+++ b/js/ui/popupMenu.js
@@ -28,18 +28,18 @@ function isPopupMenuItemVisible(child) {
function arrowIcon(side) {
let iconName;
switch (side) {
- case St.Side.TOP:
- iconName = 'pan-up-symbolic';
- break;
- case St.Side.RIGHT:
- iconName = 'pan-end-symbolic';
- break;
- case St.Side.BOTTOM:
- iconName = 'pan-down-symbolic';
- break;
- case St.Side.LEFT:
- iconName = 'pan-start-symbolic';
- break;
+ case St.Side.TOP:
+ iconName = 'pan-up-symbolic';
+ break;
+ case St.Side.RIGHT:
+ iconName = 'pan-end-symbolic';
+ break;
+ case St.Side.BOTTOM:
+ iconName = 'pan-down-symbolic';
+ break;
+ case St.Side.LEFT:
+ iconName = 'pan-start-symbolic';
+ break;
}
let arrow = new St.Icon({ style_class: 'popup-menu-arrow',
@@ -815,18 +815,18 @@ var PopupMenu = class extends PopupMenuBase {
let navKey;
switch (this._boxPointer.arrowSide) {
- case St.Side.TOP:
- navKey = Clutter.KEY_Down;
- break;
- case St.Side.BOTTOM:
- navKey = Clutter.KEY_Up;
- break;
- case St.Side.LEFT:
- navKey = Clutter.KEY_Right;
- break;
- case St.Side.RIGHT:
- navKey = Clutter.KEY_Left;
- break;
+ case St.Side.TOP:
+ navKey = Clutter.KEY_Down;
+ break;
+ case St.Side.BOTTOM:
+ navKey = Clutter.KEY_Up;
+ break;
+ case St.Side.LEFT:
+ navKey = Clutter.KEY_Right;
+ break;
+ case St.Side.RIGHT:
+ navKey = Clutter.KEY_Left;
+ break;
}
let state = event.get_state();
diff --git a/js/ui/status/network.js b/js/ui/status/network.js
index f81cedaf9..05c830c09 100644
--- a/js/ui/status/network.js
+++ b/js/ui/status/network.js
@@ -1559,29 +1559,29 @@ var DeviceCategory = class extends PopupMenu.PopupMenuSection {
_getSummaryIcon() {
switch (this._category) {
- case NMConnectionCategory.WIRED:
- return 'network-wired-symbolic';
- case NMConnectionCategory.WIRELESS:
- case NMConnectionCategory.WWAN:
- return 'network-wireless-symbolic';
+ case NMConnectionCategory.WIRED:
+ return 'network-wired-symbolic';
+ case NMConnectionCategory.WIRELESS:
+ case NMConnectionCategory.WWAN:
+ return 'network-wireless-symbolic';
}
return '';
}
_getSummaryLabel(nDevices) {
switch (this._category) {
- case NMConnectionCategory.WIRED:
- return ngettext("%s Wired Connection",
- "%s Wired Connections",
- nDevices).format(nDevices);
- case NMConnectionCategory.WIRELESS:
- return ngettext("%s Wi-Fi Connection",
- "%s Wi-Fi Connections",
- nDevices).format(nDevices);
- case NMConnectionCategory.WWAN:
- return ngettext("%s Modem Connection",
- "%s Modem Connections",
- nDevices).format(nDevices);
+ case NMConnectionCategory.WIRED:
+ return ngettext("%s Wired Connection",
+ "%s Wired Connections",
+ nDevices).format(nDevices);
+ case NMConnectionCategory.WIRELESS:
+ return ngettext("%s Wi-Fi Connection",
+ "%s Wi-Fi Connections",
+ nDevices).format(nDevices);
+ case NMConnectionCategory.WWAN:
+ return ngettext("%s Modem Connection",
+ "%s Modem Connections",
+ nDevices).format(nDevices);
}
return '';
}
diff --git a/js/ui/windowManager.js b/js/ui/windowManager.js
index 2ab7f6add..f74cad125 100644
--- a/js/ui/windowManager.js
+++ b/js/ui/windowManager.js
@@ -2080,27 +2080,27 @@ var WindowManager = class {
_startSwitcher(display, window, binding) {
let constructor = null;
switch (binding.get_name()) {
- case 'switch-applications':
- case 'switch-applications-backward':
- case 'switch-group':
- case 'switch-group-backward':
- constructor = AltTab.AppSwitcherPopup;
- break;
- case 'switch-windows':
- case 'switch-windows-backward':
- constructor = AltTab.WindowSwitcherPopup;
- break;
- case 'cycle-windows':
- case 'cycle-windows-backward':
- constructor = AltTab.WindowCyclerPopup;
- break;
- case 'cycle-group':
- case 'cycle-group-backward':
- constructor = AltTab.GroupCyclerPopup;
- break;
- case 'switch-monitor':
- constructor = SwitchMonitor.SwitchMonitorPopup;
- break;
+ case 'switch-applications':
+ case 'switch-applications-backward':
+ case 'switch-group':
+ case 'switch-group-backward':
+ constructor = AltTab.AppSwitcherPopup;
+ break;
+ case 'switch-windows':
+ case 'switch-windows-backward':
+ constructor = AltTab.WindowSwitcherPopup;
+ break;
+ case 'cycle-windows':
+ case 'cycle-windows-backward':
+ constructor = AltTab.WindowCyclerPopup;
+ break;
+ case 'cycle-group':
+ case 'cycle-group-backward':
+ constructor = AltTab.GroupCyclerPopup;
+ break;
+ case 'switch-monitor':
+ constructor = SwitchMonitor.SwitchMonitorPopup;
+ break;
}
if (!constructor)
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
