implement maximize

Whoops, forgot this one.

configure.ac

@@ -78,7 +78,7 @@ GOBJECT_INTROSPECTION_MIN_VERSION=0.10.1
 GJS_MIN_VERSION=1.39.0
 MUTTER_MIN_VERSION=3.17.3
 GTK_MIN_VERSION=3.15.0
-GIO_MIN_VERSION=2.37.0
+GIO_MIN_VERSION=2.45.3
 LIBECAL_MIN_VERSION=3.5.3
 LIBEDATASERVER_MIN_VERSION=3.13.90
 TELEPATHY_GLIB_MIN_VERSION=0.17.5

js/ui/panel.js

@@ -697,7 +697,6 @@ const AggregateMenu = new Lang.Class({
         this.menu.addMenuItem(this._location.menu);
         this.menu.addMenuItem(this._rfkill.menu);
         this.menu.addMenuItem(this._power.menu);
-        this.menu.addMenuItem(new PopupMenu.PopupSeparatorMenuItem());
         this.menu.addMenuItem(this._system.menu);
     },
 });

js/ui/popupMenu.js

@@ -1059,11 +1059,6 @@ const PopupSubMenuMenuItem = new Lang.Class({
         let expander = new St.Bin({ style_class: 'popup-menu-item-expander' });
         this.actor.add(expander, { expand: true });
 
-        this.status = new St.Label({ style_class: 'popup-status-menu-item',
-                                     y_expand: true,
-                                     y_align: Clutter.ActorAlign.CENTER });
-        this.actor.add_child(this.status);
-
         this._triangle = arrowIcon(St.Side.RIGHT);
         this._triangle.pivot_point = new Clutter.Point({ x: 0.5, y: 0.6 });
 

js/ui/status/bluetooth.js

@@ -101,8 +101,8 @@ const Indicator = new Lang.Class({
         this._item.actor.visible = this._proxy.BluetoothHasAirplaneMode && !this._proxy.BluetoothAirplaneMode;
 
         if (nDevices > 0)
-            this._item.status.text = ngettext("%d Connected Device", "%d Connected Devices", nDevices).format(nDevices);
+            this._item.label.text = ngettext("%d Connected Device", "%d Connected Devices", nDevices).format(nDevices);
         else
-            this._item.status.text = _("Not Connected");
+            this._item.label.text = _("Not Connected");
     },
 });

js/ui/status/location.js

@@ -68,7 +68,7 @@ const Indicator = new Lang.Class({
         this._agent = Gio.DBusExportedObject.wrapJSObject(AgentIface, this);
         this._agent.export(Gio.DBus.system, '/org/freedesktop/GeoClue2/Agent');
 
-        this._item.status.text = _("Enabled");
+        this._item.label.text = _("Location Services in Use");
         this._onOffAction = this._item.menu.addAction(_("Disable"), Lang.bind(this, this._onOnOffAction));
         this._item.menu.addSettingsAction(_("Privacy Settings"), 'gnome-privacy-panel.desktop');
 
@@ -112,7 +112,6 @@ const Indicator = new Lang.Class({
 
         this._indicator.visible = this._proxy.InUse;
         this._item.actor.visible = this._indicator.visible;
-        this._updateMenuLabels();
     },
 
     _connectToGeoclue: function() {
@@ -171,19 +170,7 @@ const Indicator = new Lang.Class({
         this.menu.setSensitive(sensitive);
     },
 
-    _updateMenuLabels: function() {
-        if (this._settings.get_boolean(ENABLED)) {
-            this._item.status.text = this._indicator.visible ? _("In Use") : _("Enabled");
-            this._onOffAction.label.text = _("Disable");
-        } else {
-            this._item.status.text = _("Disabled");
-            this._onOffAction.label.text = _("Enable");
-        }
-    },
-
     _onMaxAccuracyLevelChanged: function() {
-        this._updateMenuLabels();
-
         // Gotta ensure geoclue is up and we are registered as agent to it
         // before we emit the notify for this property change.
         if (!this._connectToGeoclue())

js/ui/status/network.js

@@ -257,16 +257,8 @@ const NMConnectionSection = new Lang.Class({
         this._radioSection.actor.visible = (nItems > 1);
         this._labelSection.actor.visible = (nItems == 1);
 
-        this.item.status.text = this._getStatus();
+        this.item.label.text = this._getStatus();
         this.item.icon.icon_name = this._getMenuIcon();
-
-        // desc can be undefined at cold-plug, before we called
-        // NMGtk.disambiguate_device_names() at least once
-        let desc = this._getDescription();
-        if (desc)
-            this.item.label.text = desc;
-        else
-            this.item.label.text = '';
     },
 
     _getMenuIcon: function() {
@@ -1282,9 +1274,8 @@ const NMDeviceWireless = new Lang.Class({
         this._toggleItem.label.text = this._client.wireless_enabled ? _("Turn Off") : _("Turn On");
         this._toggleItem.actor.visible = this._client.wireless_hardware_enabled;
 
-        this.item.status.text = this._getStatus();
         this.item.icon.icon_name = this._getMenuIcon();
-        this.item.label.text = this._description;
+        this.item.label.text = this._getStatus();
     },
 
     setDeviceDescription: function(desc) {

js/ui/status/power.js

@@ -112,12 +112,6 @@ const Indicator = new Lang.Class({
         this._item.icon.icon_name = icon;
 
         // The status label
-        this._item.status.text = this._getStatus();
+        this._item.label.text = this._getStatus();
-
-        // The sub-menu heading
-        if (this._proxy.Type == UPower.DeviceKind.UPS)
-            this._item.label.text = _("UPS");
-        else
-            this._item.label.text = _("Battery");
     },
 });

js/ui/status/rfkill.js

@@ -85,9 +85,8 @@ const Indicator = new Lang.Class({
         // The menu only appears when airplane mode is on, so just
         // statically build it as if it was on, rather than dynamically
         // changing the menu contents.
-        this._item = new PopupMenu.PopupSubMenuMenuItem(_("Airplane Mode"), true);
+        this._item = new PopupMenu.PopupSubMenuMenuItem(_("Airplane Mode On"), true);
         this._item.icon.icon_name = 'airplane-mode-symbolic';
-        this._item.status.text = _("On");
         this._offItem = this._item.menu.addAction(_("Turn Off"), Lang.bind(this, function() {
             this._manager.airplaneMode = false;
         }));

js/ui/windowManager.js

@@ -19,8 +19,6 @@ const Tweener = imports.ui.tweener;
 const WindowMenu = imports.ui.windowMenu;
 
 const SHELL_KEYBINDINGS_SCHEMA = 'org.gnome.shell.keybindings';
-const MAXIMIZE_WINDOW_ANIMATION_TIME = 0.15;
-const UNMAXIMIZE_WINDOW_ANIMATION_TIME = 0.15;
 const MINIMIZE_WINDOW_ANIMATION_TIME = 0.2;
 const SHOW_WINDOW_ANIMATION_TIME = 0.15;
 const DIALOG_SHOW_WINDOW_ANIMATION_TIME = 0.1;
@@ -217,7 +215,8 @@ const WorkspaceTracker = new Lang.Class({
 
     _getWorkspaceSettings: function() {
         let settings = global.get_overrides_settings();
-        if (settings.settings_schema.list_keys().indexOf('dynamic-workspaces') > -1)
+        if (settings &&
+            settings.settings_schema.list_keys().indexOf('dynamic-workspaces') > -1)
             return settings;
         return new Gio.Settings({ schema_id: 'org.gnome.mutter' });
     },
@@ -623,8 +622,7 @@ const WindowManager = new Lang.Class({
 
         this._minimizing = [];
         this._unminimizing = [];
-        this._maximizing = [];
+        this._sizeChanging = [];
-        this._unmaximizing = [];
         this._mapping = [];
         this._destroying = [];
         this._movingWindow = null;
@@ -639,8 +637,7 @@ const WindowManager = new Lang.Class({
         this._shellwm.connect('kill-switch-workspace', Lang.bind(this, this._switchWorkspaceDone));
         this._shellwm.connect('kill-window-effects', Lang.bind(this, function (shellwm, actor) {
             this._minimizeWindowDone(shellwm, actor);
-            this._maximizeWindowDone(shellwm, actor);
+            this._sizeChangeWindowDone(shellwm, actor);
-            this._unmaximizeWindowDone(shellwm, actor);
             this._mapWindowDone(shellwm, actor);
             this._destroyWindowDone(shellwm, actor);
         }));
@@ -651,8 +648,7 @@ const WindowManager = new Lang.Class({
         this._shellwm.connect('show-window-menu', Lang.bind(this, this._showWindowMenu));
         this._shellwm.connect('minimize', Lang.bind(this, this._minimizeWindow));
         this._shellwm.connect('unminimize', Lang.bind(this, this._unminimizeWindow));
-        this._shellwm.connect('maximize', Lang.bind(this, this._maximizeWindow));
+        this._shellwm.connect('size-change', Lang.bind(this, this._sizeChangeWindow));
-        this._shellwm.connect('unmaximize', Lang.bind(this, this._unmaximizeWindow));
         this._shellwm.connect('map', Lang.bind(this, this._mapWindow));
         this._shellwm.connect('destroy', Lang.bind(this, this._destroyWindow));
         this._shellwm.connect('filter-keybinding', Lang.bind(this, this._filterKeybinding));
@@ -1162,22 +1158,62 @@ const WindowManager = new Lang.Class({
         }
     },
 
+    _sizeChangeWindow : function(shellwm, actor, whichChange, oldFrameRect, oldBufferRect) {
+        let types = [Meta.WindowType.NORMAL];
+        if (!this._shouldAnimateActor(actor, types)) {
+            shellwm.completed_size_change(actor);
+            return;
+        }
 
-    _maximizeWindow : function(shellwm, actor, targetX, targetY, targetWidth, targetHeight) {
+        this._sizeChanging.push(actor);
-        shellwm.completed_maximize(actor);
+
+        let targetRect = actor.meta_window.get_frame_rect();
+
+        // The actor is in its old, "frozen" state. The borders that we have here
+        // are the difference between the frame and buffer rects. Offset the target
+        // with the same difference so it lines up nicely.
+        targetRect.x += oldBufferRect.x - oldFrameRect.x;
+        targetRect.y += oldBufferRect.y - oldFrameRect.y;
+
+        let frameX2 = oldFrameRect.x + oldFrameRect.width;
+        let bufferX2 = oldBufferRect.x + oldBufferRect.width;
+        targetRect.width += bufferX2 - frameX2;
+
+        let frameY2 = oldFrameRect.y + oldFrameRect.width;
+        let bufferY2 = oldBufferRect.y + oldBufferRect.width;
+        targetRect.width += bufferY2 - frameY2;
+
+        let scaleX = targetRect.width / actor.width;
+        let scaleY = targetRect.height / actor.height;
+
+        Tweener.addTween(actor,
+                         { x: targetRect.x,
+                           y: targetRect.y,
+                           scale_x: scaleX,
+                           scale_y: scaleY,
+                           time: WINDOW_ANIMATION_TIME,
+                           transition: 'easeOutQuad',
+                           onComplete: () => { this._sizeChangeWindowDone(shellwm, actor); },
+                           onOverwrite: () => { this._sizeChangeWindowOverwritten(shellwm, actor); },
+                         });
     },
 
-    _maximizeWindowDone : function(shellwm, actor) {
+    _sizeChangeWindowDone: function(shellwm, actor) {
-    },
+        if (!this._removeEffect(this._sizeChanging, actor))
+            return;
 
-    _maximizeWindowOverwrite : function(shellwm, actor) {
+        Tweener.removeTweens(actor);
-    },
 
-    _unmaximizeWindow : function(shellwm, actor, targetX, targetY, targetWidth, targetHeight) {
+        actor.scale_x = 1;
-        shellwm.completed_unmaximize(actor);
+        actor.scale_y = 1;
-    },
 
-    _unmaximizeWindowDone : function(shellwm, actor) {
+        shellwm.completed_size_change(actor);
+    },
+    _sizeChangeWindowOverwritten: function(shellwm, actor) {
+        if (!this._removeEffect(this._sizeChanging, actor))
+            return;
+
+        shellwm.completed_size_change(actor);
     },
 
     _hasAttachedDialogs: function(window, ignoreWindow) {

po/de.po

@@ -21,8 +21,8 @@ msgstr ""
 "Project-Id-Version: gnome-shell master\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-"
 "shell&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2015-05-25 08:02+0000\n"
+"POT-Creation-Date: 2015-07-03 08:08+0000\n"
-"PO-Revision-Date: 2015-05-25 13:57+0100\n"
+"PO-Revision-Date: 2015-07-03 19:24+0100\n"
 "Last-Translator: Benjamin Steinwender <b@stbe.at>\n"
 "Language-Team: Deutsch <gnome-de@gnome.org>\n"
 "Language: de_DE\n"
@@ -30,7 +30,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Poedit 1.7.1\n"
+"X-Generator: Poedit 1.8.1\n"
 
 #: ../data/50-gnome-shell-system.xml.in.h:1
 msgid "System"
@@ -355,17 +355,17 @@ msgstr "Sitzung wählen"
 msgid "Not listed?"
 msgstr "Nicht aufgeführt?"
 
-#: ../js/gdm/loginDialog.js:840
+#: ../js/gdm/loginDialog.js:847
 #, javascript-format
 msgid "(e.g., user or %s)"
 msgstr "(z.B. Benutzer oder %s)"
 
-#: ../js/gdm/loginDialog.js:845 ../js/ui/components/networkAgent.js:271
+#: ../js/gdm/loginDialog.js:852 ../js/ui/components/networkAgent.js:271
 #: ../js/ui/components/networkAgent.js:289
 msgid "Username: "
 msgstr "Benutzername:"
 
-#: ../js/gdm/loginDialog.js:1173
+#: ../js/gdm/loginDialog.js:1180
 msgid "Login Window"
 msgstr "Anmeldefenster"
 
@@ -459,31 +459,31 @@ msgstr "%e. %B %Y, %H:%M"
 msgid "Web Authentication Redirect"
 msgstr "Umleitung zu einer Internet-Anmeldung"
 
-#: ../js/ui/appDisplay.js:788
+#: ../js/ui/appDisplay.js:789
 msgid "Frequently used applications will appear here"
 msgstr "Häufig genutzte Anwendungen werden hier erscheinen"
 
-#: ../js/ui/appDisplay.js:908
+#: ../js/ui/appDisplay.js:909
 msgid "Frequent"
 msgstr "Häufig"
 
-#: ../js/ui/appDisplay.js:915
+#: ../js/ui/appDisplay.js:916
 msgid "All"
 msgstr "Alle"
 
-#: ../js/ui/appDisplay.js:1844
+#: ../js/ui/appDisplay.js:1845
 msgid "New Window"
 msgstr "Neues Fenster"
 
-#: ../js/ui/appDisplay.js:1872 ../js/ui/dash.js:289
+#: ../js/ui/appDisplay.js:1873 ../js/ui/dash.js:289
 msgid "Remove from Favorites"
 msgstr "Aus Favoriten entfernen"
 
-#: ../js/ui/appDisplay.js:1878
+#: ../js/ui/appDisplay.js:1879
 msgid "Add to Favorites"
 msgstr "Zu Favoriten hinzufügen"
 
-#: ../js/ui/appDisplay.js:1888
+#: ../js/ui/appDisplay.js:1889
 msgid "Show Details"
 msgstr "Details anzeigen"
 
@@ -506,7 +506,7 @@ msgid "Display Settings"
 msgstr "Anzeigeeinstellungen"
 
 #: ../js/ui/backgroundMenu.js:22 ../js/ui/panel.js:650
-#: ../js/ui/status/system.js:334
+#: ../js/ui/status/system.js:357
 msgid "Settings"
 msgstr "Einstellungen"
 
@@ -924,7 +924,7 @@ msgstr "Installieren"
 msgid "Download and install “%s” from extensions.gnome.org?"
 msgstr "»%s« von extensions.gnome.org herunterladen und installieren?"
 
-#: ../js/ui/keyboard.js:718 ../js/ui/status/keyboard.js:713
+#: ../js/ui/keyboard.js:747 ../js/ui/status/keyboard.js:713
 msgid "Keyboard"
 msgstr "Tastatur"
 
@@ -989,7 +989,7 @@ msgstr "Quelle zeigen"
 msgid "Web Page"
 msgstr "Webseite"
 
-#: ../js/ui/messageTray.js:1506
+#: ../js/ui/messageTray.js:1486
 msgid "System Information"
 msgstr "Systeminformationen"
 
@@ -1031,7 +1031,7 @@ msgstr "toggle-switch-intl"
 msgid "Enter a Command"
 msgstr "Bitte geben Sie einen Befehl ein"
 
-#: ../js/ui/runDialog.js:110 ../js/ui/windowMenu.js:153
+#: ../js/ui/runDialog.js:110 ../js/ui/windowMenu.js:162
 msgid "Close"
 msgstr "Schließen"
 
@@ -1062,7 +1062,7 @@ msgid_plural "%d new notifications"
 msgstr[0] "%d neue Benachrichtigung"
 msgstr[1] "%d neue Benachrichtigungen"
 
-#: ../js/ui/screenShield.js:432 ../js/ui/status/system.js:342
+#: ../js/ui/screenShield.js:432 ../js/ui/status/system.js:365
 msgid "Lock"
 msgstr "Sperren"
 
@@ -1398,23 +1398,23 @@ msgstr "Flugzeugmodus"
 msgid "On"
 msgstr "An"
 
-#: ../js/ui/status/system.js:314
+#: ../js/ui/status/system.js:337
 msgid "Switch User"
 msgstr "Benutzer wechseln"
 
-#: ../js/ui/status/system.js:319
+#: ../js/ui/status/system.js:342
 msgid "Log Out"
 msgstr "Abmelden"
 
-#: ../js/ui/status/system.js:338
+#: ../js/ui/status/system.js:361
 msgid "Orientation Lock"
 msgstr "Hoch-/Querformats-Fixierung"
 
-#: ../js/ui/status/system.js:346
+#: ../js/ui/status/system.js:369
 msgid "Suspend"
 msgstr "In Bereitschaft versetzen"
 
-#: ../js/ui/status/system.js:349
+#: ../js/ui/status/system.js:372
 msgid "Power Off"
 msgstr "Ausschalten"
 
@@ -1446,7 +1446,7 @@ msgstr "Anwendungen"
 msgid "Search"
 msgstr "Suchen"
 
-#: ../js/ui/windowAttentionHandler.js:19
+#: ../js/ui/windowAttentionHandler.js:20
 #, javascript-format
 msgid "“%s” is ready"
 msgstr "»%s« ist bereit"
@@ -1475,7 +1475,7 @@ msgstr[1] "Die Änderungen der Einstellungen werden in %d Sekunden zurückgesetz
 
 #. Translators: This represents the size of a window. The first number is
 #. * the width of the window and the second is the height. */
-#: ../js/ui/windowManager.js:613
+#: ../js/ui/windowManager.js:605
 #, javascript-format
 msgid "%d x %d"
 msgstr "%d x %d"
@@ -1512,27 +1512,35 @@ msgstr "Immer im Vordergrund"
 msgid "Always on Visible Workspace"
 msgstr "Immer auf der sichtbaren Arbeitsfläche"
 
-#: ../js/ui/windowMenu.js:106
+#: ../js/ui/windowMenu.js:105
+msgid "Move to Workspace Left"
+msgstr "Eine Arbeitsfläche nach links bewegen"
+
+#: ../js/ui/windowMenu.js:110
+msgid "Move to Workspace Right"
+msgstr "Eine Arbeitsfläche nach rechts bewegen"
+
+#: ../js/ui/windowMenu.js:115
 msgid "Move to Workspace Up"
 msgstr "Eine Arbeitsfläche nach oben verschieben"
 
-#: ../js/ui/windowMenu.js:111
+#: ../js/ui/windowMenu.js:120
 msgid "Move to Workspace Down"
 msgstr "Eine Arbeitsfläche nach unten verschieben"
 
-#: ../js/ui/windowMenu.js:127
+#: ../js/ui/windowMenu.js:136
 msgid "Move to Monitor Up"
 msgstr "Auf den Bildschirm nach oben verschieben"
 
-#: ../js/ui/windowMenu.js:133
+#: ../js/ui/windowMenu.js:142
 msgid "Move to Monitor Down"
 msgstr "Auf den Bildschirm nach unten verschieben"
 
-#: ../js/ui/windowMenu.js:139
+#: ../js/ui/windowMenu.js:148
 msgid "Move to Monitor Left"
 msgstr "Auf den Bildschirm nach links verschieben"
 
-#: ../js/ui/windowMenu.js:145
+#: ../js/ui/windowMenu.js:154
 msgid "Move to Monitor Right"
 msgstr "Auf den Bildschirm nach rechts verschieben"
 
@@ -1589,11 +1597,11 @@ msgstr "Unbekannt"
 msgid "Failed to launch “%s”"
 msgstr "»%s« konnte nicht gestartet werden"
 
-#: ../src/shell-keyring-prompt.c:714
+#: ../src/shell-keyring-prompt.c:742
 msgid "Passwords do not match."
 msgstr "Passwörter stimmen nicht überein."
 
-#: ../src/shell-keyring-prompt.c:722
+#: ../src/shell-keyring-prompt.c:750
 msgid "Password cannot be blank"
 msgstr "Es muss ein Passwort angegeben werden"
 

po/pt.po

@@ -13,7 +13,7 @@ msgstr ""
 "Project-Id-Version: 3.14\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-"
 "shell&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2015-06-07 20:05+0000\n"
+"POT-Creation-Date: 2015-07-03 20:04+0000\n"
 "PO-Revision-Date: 2015-06-08 08:32+0100\n"
 "Last-Translator: Bruno Ramalhete <bram.512@gmail.com>\n"
 "Language-Team: Portuguese <gnome_pt@yahoogroups.com>\n"
@@ -30,8 +30,6 @@ msgid "System"
 msgstr "Sistema"
 
 #: ../data/50-gnome-shell-system.xml.in.h:2
-#| msgid "%d new notification"
-#| msgid_plural "%d new notifications"
 msgid "Show the notification list"
 msgstr "Mostrar lista de notificação"
 
@@ -212,12 +210,10 @@ msgid "Keybinding to open the Activities Overview."
 msgstr "Atalho de teclado para abrir a vista geral de atividades."
 
 #: ../data/org.gnome.shell.gschema.xml.in.in.h:25
-#| msgid "Keybinding to toggle the visibility of the message tray"
 msgid "Keybinding to toggle the visibility of the notification list"
 msgstr "Atalho de teclado para alternar a visibilidade da lista de notificação"
 
 #: ../data/org.gnome.shell.gschema.xml.in.in.h:26
-#| msgid "Keybinding to toggle the visibility of the message tray."
 msgid "Keybinding to toggle the visibility of the notification list."
 msgstr ""
 "Atalho de teclado para alternar a visibilidade da lista de notificação."
@@ -349,17 +345,17 @@ msgstr "Escolher sessão"
 msgid "Not listed?"
 msgstr "Não está listada?"
 
-#: ../js/gdm/loginDialog.js:840
+#: ../js/gdm/loginDialog.js:847
 #, javascript-format
 msgid "(e.g., user or %s)"
 msgstr "(por ex., utilizador ou %s)"
 
-#: ../js/gdm/loginDialog.js:845 ../js/ui/components/networkAgent.js:271
+#: ../js/gdm/loginDialog.js:852 ../js/ui/components/networkAgent.js:271
 #: ../js/ui/components/networkAgent.js:289
 msgid "Username: "
 msgstr "Utilizador: "
 
-#: ../js/gdm/loginDialog.js:1173
+#: ../js/gdm/loginDialog.js:1180
 msgid "Login Window"
 msgstr "Janela de início de sessão"
 
@@ -452,31 +448,31 @@ msgstr "%B %d %Y, %l∶%M %p"
 msgid "Web Authentication Redirect"
 msgstr "Autenticação Web redirecionada"
 
-#: ../js/ui/appDisplay.js:788
+#: ../js/ui/appDisplay.js:789
 msgid "Frequently used applications will appear here"
 msgstr "As aplicações frequentemente utilizadas aparecem aqui"
 
-#: ../js/ui/appDisplay.js:908
+#: ../js/ui/appDisplay.js:909
 msgid "Frequent"
 msgstr "Frequentes"
 
-#: ../js/ui/appDisplay.js:915
+#: ../js/ui/appDisplay.js:916
 msgid "All"
 msgstr "Todas"
 
-#: ../js/ui/appDisplay.js:1844
+#: ../js/ui/appDisplay.js:1845
 msgid "New Window"
 msgstr "Nova janela"
 
-#: ../js/ui/appDisplay.js:1872 ../js/ui/dash.js:289
+#: ../js/ui/appDisplay.js:1873 ../js/ui/dash.js:289
 msgid "Remove from Favorites"
 msgstr "Remover dos favoritos"
 
-#: ../js/ui/appDisplay.js:1878
+#: ../js/ui/appDisplay.js:1879
 msgid "Add to Favorites"
 msgstr "Adicionar aos favoritos"
 
-#: ../js/ui/appDisplay.js:1888
+#: ../js/ui/appDisplay.js:1889
 msgid "Show Details"
 msgstr "Mostrar detalhes"
 
@@ -495,7 +491,6 @@ msgid "Change Background…"
 msgstr "Alterar o fundo…"
 
 #: ../js/ui/backgroundMenu.js:21
-#| msgid "Privacy Settings"
 msgid "Display Settings"
 msgstr "Definições de ecrã"
 
@@ -599,7 +594,6 @@ msgid "Notifications"
 msgstr "Notificações"
 
 #: ../js/ui/calendar.js:1765
-#| msgid "Notifications"
 msgid "No Notifications"
 msgstr "Sem notificações"
 
@@ -760,7 +754,6 @@ msgstr "Traço"
 #. * shown - it is shown just below the time in the shell (e.g. "Tue 9:29 AM").
 #. */
 #: ../js/ui/dateMenu.js:73
-#| msgid "%A %B %e, %Y"
 msgid "%B %e %Y"
 msgstr "%B %e %Y"
 
@@ -769,7 +762,6 @@ msgstr "%B %e %Y"
 #. * date, e.g. "Tuesday February 17 2015".
 #. */
 #: ../js/ui/dateMenu.js:80
-#| msgid "%A %B %e, %Y"
 msgid "%A %B %e %Y"
 msgstr "%A %B %e %Y"
 
@@ -778,7 +770,6 @@ msgid "Add world clocks…"
 msgstr "Adicionar relógios do mundo"
 
 #: ../js/ui/dateMenu.js:161
-#| msgid "Open Clocks"
 msgid "World Clocks"
 msgstr "Relógios do mundo"
 
@@ -929,7 +920,6 @@ msgstr "Teclado"
 
 #. translators: 'Hide' is a verb */
 #: ../js/ui/legacyTray.js:66
-#| msgid "Hide Text"
 msgid "Hide tray"
 msgstr "Ocultar tabuleiro"
 
@@ -989,7 +979,7 @@ msgstr "Ver fonte"
 msgid "Web Page"
 msgstr "Página Web"
 
-#: ../js/ui/messageTray.js:1506
+#: ../js/ui/messageTray.js:1486
 msgid "System Information"
 msgstr "Informação do sistema"
 
@@ -1031,7 +1021,7 @@ msgstr "toggle-switch-us"
 msgid "Enter a Command"
 msgstr "Insira um comando"
 
-#: ../js/ui/runDialog.js:110 ../js/ui/windowMenu.js:153
+#: ../js/ui/runDialog.js:110 ../js/ui/windowMenu.js:162
 msgid "Close"
 msgstr "Fechar"
 
@@ -1440,7 +1430,7 @@ msgstr "Aplicações"
 msgid "Search"
 msgstr "Procurar"
 
-#: ../js/ui/windowAttentionHandler.js:19
+#: ../js/ui/windowAttentionHandler.js:20
 #, javascript-format
 msgid "“%s” is ready"
 msgstr "“%s” está pronto"
@@ -1506,29 +1496,36 @@ msgstr "Sempre no topo"
 msgid "Always on Visible Workspace"
 msgstr "Sempre na área de trabalho visível"
 
-#: ../js/ui/windowMenu.js:106
+#: ../js/ui/windowMenu.js:105#| msgid "Move to Workspace Up"
+msgid "Move to Workspace Left"
+msgstr "Mover para a área de trabalho esquerda"
+
+#: ../js/ui/windowMenu.js:110
+#| msgid "Move to Workspace Up"
+msgid "Move to Workspace Right"
+msgstr "Mover para a área de trabalho direita"
+
+#: ../js/ui/windowMenu.js:115
 msgid "Move to Workspace Up"
 msgstr "Mover para a área de trabalho acima"
 
-#: ../js/ui/windowMenu.js:111
+#: ../js/ui/windowMenu.js:120
 msgid "Move to Workspace Down"
 msgstr "Mover para a área de trabalho abaixo"
 
-#: ../js/ui/windowMenu.js:127
+#: ../js/ui/windowMenu.js:136
-#| msgid "Move to Workspace Up"
 msgid "Move to Monitor Up"
 msgstr "Mover para o monitor acima"
 
-#: ../js/ui/windowMenu.js:133
+#: ../js/ui/windowMenu.js:142
-#| msgid "Move to Workspace Down"
 msgid "Move to Monitor Down"
 msgstr "Mover para o monitor abaixo"
 
-#: ../js/ui/windowMenu.js:139
+#: ../js/ui/windowMenu.js:148
 msgid "Move to Monitor Left"
 msgstr "Mover para o monitor à esquerda"
 
-#: ../js/ui/windowMenu.js:145
+#: ../js/ui/windowMenu.js:154
 msgid "Move to Monitor Right"
 msgstr "Mover para o monitor à direita"
 
@@ -1585,11 +1582,11 @@ msgstr "Desconhecida"
 msgid "Failed to launch “%s”"
 msgstr "Falha ao iniciar “%s”"
 
-#: ../src/shell-keyring-prompt.c:714
+#: ../src/shell-keyring-prompt.c:742
 msgid "Passwords do not match."
 msgstr "As senhas não coincidem."
 
-#: ../src/shell-keyring-prompt.c:722
+#: ../src/shell-keyring-prompt.c:750
 msgid "Password cannot be blank"
 msgstr "A senha não pode estar vazia"
 
@@ -2040,3 +2037,4 @@ msgstr "O diálogo de autenticação foi fechado pelo utilizador"
 #~ "O nome do ficheiro da transmissão de ecrã gravada será um nome único "
 #~ "baseado na data atual e utilizará esta extensão. Deverá ser alterada "
 #~ "quando se gravar para um formato de conteúdo diferente."
+

src/gnome-shell-plugin.c

@@ -42,18 +42,11 @@ static void gnome_shell_plugin_minimize         (MetaPlugin          *plugin,
                                                  MetaWindowActor     *actor);
 static void gnome_shell_plugin_unminimize       (MetaPlugin          *plugin,
                                                  MetaWindowActor     *actor);
-static void gnome_shell_plugin_maximize         (MetaPlugin          *plugin,
+static void gnome_shell_plugin_size_change      (MetaPlugin          *plugin,
                                                  MetaWindowActor     *actor,
-                                                 gint                 x,
+                                                 MetaSizeChange       which_change,
-                                                 gint                 y,
+                                                 MetaRectangle       *old_rect,
-                                                 gint                 width,
+                                                 MetaRectangle       *new_rect);
-                                                 gint                 height);
-static void gnome_shell_plugin_unmaximize       (MetaPlugin          *plugin,
-                                                 MetaWindowActor     *actor,
-                                                 gint                 x,
-                                                 gint                 y,
-                                                 gint                 width,
-                                                 gint                 height);
 static void gnome_shell_plugin_map              (MetaPlugin          *plugin,
                                                  MetaWindowActor     *actor);
 static void gnome_shell_plugin_destroy          (MetaPlugin          *plugin,
@@ -134,8 +127,7 @@ gnome_shell_plugin_class_init (GnomeShellPluginClass *klass)
   plugin_class->map              = gnome_shell_plugin_map;
   plugin_class->minimize         = gnome_shell_plugin_minimize;
   plugin_class->unminimize       = gnome_shell_plugin_unminimize;
-  plugin_class->maximize         = gnome_shell_plugin_maximize;
+  plugin_class->size_change      = gnome_shell_plugin_size_change;
-  plugin_class->unmaximize       = gnome_shell_plugin_unmaximize;
   plugin_class->destroy          = gnome_shell_plugin_destroy;
 
   plugin_class->switch_workspace = gnome_shell_plugin_switch_workspace;
@@ -281,27 +273,13 @@ gnome_shell_plugin_unminimize (MetaPlugin         *plugin,
 }
 
 static void
-gnome_shell_plugin_maximize (MetaPlugin         *plugin,
+gnome_shell_plugin_size_change (MetaPlugin         *plugin,
                                 MetaWindowActor    *actor,
-                             gint                x,
+                                MetaSizeChange      which_change,
-                             gint                y,
+                                MetaRectangle      *old_frame_rect,
-                             gint                width,
+                                MetaRectangle      *old_buffer_rect)
-                             gint                height)
 {
-  _shell_wm_maximize (get_shell_wm (),
+  _shell_wm_size_change (get_shell_wm (), actor, which_change, old_frame_rect, old_buffer_rect);
-                      actor, x, y, width, height);
-}
-
-static void
-gnome_shell_plugin_unmaximize (MetaPlugin         *plugin,
-                               MetaWindowActor    *actor,
-                               gint                x,
-                               gint                y,
-                               gint                width,
-                               gint                height)
-{
-  _shell_wm_unmaximize (get_shell_wm (),
-                        actor, x, y, width, height);
 }
 
 static void

src/shell-wm-private.h

@@ -12,18 +12,11 @@ void _shell_wm_minimize   (ShellWM         *wm,
                            MetaWindowActor *actor);
 void _shell_wm_unminimize (ShellWM         *wm,
                            MetaWindowActor *actor);
-void _shell_wm_maximize   (ShellWM         *wm,
+void _shell_wm_size_change(ShellWM         *wm,
                            MetaWindowActor *actor,
-                           gint             x,
+                           MetaSizeChange   which_change,
-                           gint             y,
+                           MetaRectangle   *old_rect,
-                           gint             width,
+                           MetaRectangle   *new_rect);
-                           gint             height);
-void _shell_wm_unmaximize (ShellWM         *wm,
-                           MetaWindowActor *actor,
-                           gint             x,
-                           gint             y,
-                           gint             width,
-                           gint             height);
 void _shell_wm_map        (ShellWM         *wm,
                            MetaWindowActor *actor);
 void _shell_wm_destroy    (ShellWM         *wm,

src/shell-wm.c

@@ -4,6 +4,7 @@
 
 #include <string.h>
 
+#include <meta/meta-enum-types.h>
 #include <meta/keybindings.h>
 
 #include "shell-wm-private.h"
@@ -20,8 +21,7 @@ enum
 {
   MINIMIZE,
   UNMINIMIZE,
-  MAXIMIZE,
+  SIZE_CHANGE,
-  UNMAXIMIZE,
   MAP,
   DESTROY,
   SWITCH_WORKSPACE,
@@ -74,22 +74,14 @@ shell_wm_class_init (ShellWMClass *klass)
                   NULL, NULL, NULL,
                   G_TYPE_NONE, 1,
                   META_TYPE_WINDOW_ACTOR);
-  shell_wm_signals[MAXIMIZE] =
+  shell_wm_signals[SIZE_CHANGE] =
-    g_signal_new ("maximize",
+    g_signal_new ("size-change",
                   G_TYPE_FROM_CLASS (klass),
                   G_SIGNAL_RUN_LAST,
                   0,
                   NULL, NULL, NULL,
-                  G_TYPE_NONE, 5,
+                  G_TYPE_NONE, 4,
-                  META_TYPE_WINDOW_ACTOR, G_TYPE_INT, G_TYPE_INT, G_TYPE_INT, G_TYPE_INT);
+                  META_TYPE_WINDOW_ACTOR, META_TYPE_SIZE_CHANGE, META_TYPE_RECTANGLE, META_TYPE_RECTANGLE);
-  shell_wm_signals[UNMAXIMIZE] =
-    g_signal_new ("unmaximize",
-                  G_TYPE_FROM_CLASS (klass),
-                  G_SIGNAL_RUN_LAST,
-                  0,
-                  NULL, NULL, NULL,
-                  G_TYPE_NONE, 5,
-                  META_TYPE_WINDOW_ACTOR, G_TYPE_INT, G_TYPE_INT, G_TYPE_INT, G_TYPE_INT);
   shell_wm_signals[MAP] =
     g_signal_new ("map",
                   G_TYPE_FROM_CLASS (klass),
@@ -220,32 +212,11 @@ shell_wm_completed_unminimize (ShellWM         *wm,
   meta_plugin_unminimize_completed (wm->plugin, actor);
 }
 
-/**
- * shell_wm_completed_maximize:
- * @wm: the ShellWM
- * @actor: the MetaWindowActor actor
- *
- * The plugin must call this when it has completed a window maximize effect.
- **/
 void
-shell_wm_completed_maximize (ShellWM         *wm,
+shell_wm_completed_size_change (ShellWM         *wm,
                                 MetaWindowActor *actor)
 {
-  meta_plugin_maximize_completed (wm->plugin, actor);
+  meta_plugin_size_change_completed (wm->plugin, actor);
-}
-
-/**
- * shell_wm_completed_unmaximize:
- * @wm: the ShellWM
- * @actor: the MetaWindowActor actor
- *
- * The plugin must call this when it has completed a window unmaximize effect.
- **/
-void
-shell_wm_completed_unmaximize (ShellWM         *wm,
-                               MetaWindowActor *actor)
-{
-  meta_plugin_unmaximize_completed (wm->plugin, actor);
 }
 
 /**
@@ -359,25 +330,13 @@ _shell_wm_unminimize (ShellWM         *wm,
 }
 
 void
-_shell_wm_maximize (ShellWM         *wm,
+_shell_wm_size_change (ShellWM         *wm,
                        MetaWindowActor *actor,
-                    int              target_x,
+                       MetaSizeChange   which_change,
-                    int              target_y,
+                       MetaRectangle   *old_frame_rect,
-                    int              target_width,
+                       MetaRectangle   *old_buffer_rect)
-                    int              target_height)
 {
-  g_signal_emit (wm, shell_wm_signals[MAXIMIZE], 0, actor, target_x, target_y, target_width, target_height);
+  g_signal_emit (wm, shell_wm_signals[SIZE_CHANGE], 0, actor, which_change, old_frame_rect, old_buffer_rect);
-}
-
-void
-_shell_wm_unmaximize (ShellWM         *wm,
-                      MetaWindowActor *actor,
-                      int              target_x,
-                      int              target_y,
-                      int              target_width,
-                      int              target_height)
-{
-  g_signal_emit (wm, shell_wm_signals[UNMAXIMIZE], 0, actor, target_x, target_y, target_width, target_height);
 }
 
 void

src/shell-wm.h

@@ -31,9 +31,7 @@ void     shell_wm_completed_minimize         (ShellWM         *wm,
                                               MetaWindowActor *actor);
 void     shell_wm_completed_unminimize       (ShellWM         *wm,
                                               MetaWindowActor *actor);
-void     shell_wm_completed_maximize         (ShellWM         *wm,
+void     shell_wm_completed_size_change      (ShellWM         *wm,
-                                              MetaWindowActor *actor);
-void     shell_wm_completed_unmaximize       (ShellWM         *wm,
                                               MetaWindowActor *actor);
 void     shell_wm_completed_map              (ShellWM         *wm,
                                               MetaWindowActor *actor);