Merge lp:~unity-2d-team/unity-2d/hud-redesign into lp:unity-2d

[Gerry Boland]

[hud] Redesign for hide-mode=0 case. Launcher's BFB icon replaced with one specified by HUD.

BFB icon animation left for later commit.

[hud] Redesign for hide-mode=0 case. Launcher's BFB icon replaced with one specified by HUD.

BFB icon animation left for later commit.

[Albert Astals Cid (aacid)]

Tests are missing

There is a behaviour change, previous if:
 * Focus firefox
 * Show hud
 * Type some of the firefox menu items
 * Press down arrow
 * Firefox icon shown
But if you do this with this code i get the "unknown icon"

[Albert Astals Cid (aacid)]

One more thing: Is it the left pip you have to enable when opening the hud? With the dash we enable the right one

[Albert Astals Cid (aacid)]

Set as need fixing as per previous comments

review: Needs Fixing

[Albert Astals Cid (aacid)]

You can see the new looks on the attachments at https://bugs.launchpad.net/unity-2d/+bug/948960
Launcher Always visible https://bugs.launchpad.net/unity-2d/+bug/948960/+attachment/2987713/+files/hidemode0.png
Launcher Autohide https://bugs.launchpad.net/unity-2d/+bug/948960/+attachment/2987713/+files/hidemode0.png

[Albert Astals Cid (aacid)]

Autohide is https://launchpadlibrarian.net/99612519/hidemode1.png

[Albert Astals Cid (aacid)]

Looks good from a code POV, needs design approval

review: Approve

[Andrea Cimitan (cimi)]

I think design is definitely an improvement.
In case we will notice something that requires tweak we will file new bugs for them.

review: Approve (desing)

[Albert Astals Cid (aacid)]

UIFe approved at https://bugs.launchpad.net/ubuntu/+source/unity-2d/+bug/971603

[Unity Merger (unity-merger)]

No commit message specified.

=== modified file 'shell/HudLoader.qml'
--- shell/HudLoader.qml	2012-03-30 13:44:54 +0000
+++ shell/HudLoader.qml	2012-04-02 09:17:20 +0000
@@ -27,9 +27,15 @@
 
     source: "hud/Hud.qml"
     anchors.top: parent != undefined ? parent.top : undefined
-    x: Utils.isLeftToRight() ? 0 : shell.width - width
+    x: {
+        if (launcher2dConfiguration.hideMode == 0) {
+            return Utils.isLeftToRight() ? launcherLoader.width : (parent != undefined ? parent.width - width - launcherLoader.width : 0)
+        } else {
+            return Utils.isLeftToRight() ? 0 : (parent != undefined ? parent.width - width : 0)
+        }
+    }
     onLoaded: item.focus = true
     visible: item.active
     focus: item.active
-    width: Math.min(shell.width, 1061)
+    width: Math.min(shell.width, (launcher2dConfiguration.hideMode == 0) ? 1061 - launcherLoader.width : 1061)
 }

=== modified file 'shell/Shell.qml'
--- shell/Shell.qml	2012-03-30 13:44:54 +0000
+++ shell/Shell.qml	2012-04-02 09:17:20 +0000
@@ -58,7 +58,7 @@
     }
 
     onHudLoaderChanged: {
-        if (shellManager.hudActive) {
+        if (shellManager.hudActive && launcher2dConfiguration.hideMode != 0) {
             if (hudLoader == undefined)
             {
                 launcherLoader.visibilityController.endForceHidden("hud")
@@ -144,11 +144,11 @@
                 if (dashLoader != undefined && dashLoader.item.active) {
                     dashLoader.item.active = false
                 }
-                if (hudLoader != undefined) {
+                if (hudLoader != undefined && launcher2dConfiguration.hideMode != 0) {
                     launcherLoader.visibilityController.beginForceHidden("hud")
                 }
             } else {
-                if (hudLoader != undefined) {
+                if (hudLoader != undefined && launcher2dConfiguration.hideMode != 0) {
                     launcherLoader.visibilityController.endForceHidden("hud")
                 }
             }

=== modified file 'shell/hud/Hud.qml'
--- shell/hud/Hud.qml	2012-03-30 13:44:54 +0000
+++ shell/hud/Hud.qml	2012-04-02 09:17:20 +0000
@@ -35,6 +35,7 @@
     property int resultHeight: 42
 
     property bool animating: heightAnimation.running
+    property string appIcon: ""
 
     height: layout.childrenRect.height + layout.anchors.bottomMargin + 10
 
@@ -56,6 +57,7 @@
     onActiveChanged: {
         if (active) {
             shellManager.hudShell.forceActivateWindow()
+            appIcon = getActiveWindowIcon()
             resultList.focus = true
         } else {
             hudModel.endSearch()
@@ -90,6 +92,11 @@
         active = false
     }
 
+    function getActiveWindowIcon() {
+        return activeWindow.icon ? "image://icons/" + activeWindow.icon
+                                 : "image://icons/unknown"
+    }
+
     property variant hudModel: Hud {}
 
     Background {
@@ -129,37 +136,37 @@
 
             anchors.left: parent.left
             anchors.top: parent.top
-            width: 65
+            width: (launcher2dConfiguration.hideMode == 0) ? 0 : launcherLoader.width
+            visible: (launcher2dConfiguration.hideMode != 0)
+
+            IconTile {
+                id: iconTile
+
+                anchors.top: parent.top
+                anchors.topMargin: 5
+                anchors.left: parent.left
+                anchors.leftMargin: 5
+                width: 54
+                height: 54
+
+                source: appIcon
+
+                tileBackgroundImage: "../launcher/artwork/squircle_base_54.png"
+                tileShineImage: "../launcher/artwork/squircle_shine_54.png"
+                selectedTileBackgroundImage: "../launcher/artwork/squircle_base_selected_54.png"
+            }
 
             Image {
                 id: pip
 
                 anchors.verticalCenter: iconTile.verticalCenter
-                anchors.horizontalCenterOffset: -1
-                anchors.left: parent.left
+                anchors.right: tile.right
                 mirror: Utils.isRightToLeft()
 
                 source: "image://blended/%1color=%2alpha=%3"
-                        .arg("launcher/artwork/launcher_arrow_ltr.png")
+                        .arg("launcher/artwork/launcher_arrow_rtl.png")
                         .arg("lightgrey").arg(1.0)
             }
-
-            IconTile {
-                id: iconTile
-
-                anchors.top: parent.top
-                anchors.topMargin: 5
-                anchors.left: parent.left
-                anchors.leftMargin: 5
-                width: 54
-                height: 54
-
-                source: (resultList.currentItem != null && resultList.count > 0)
-                        ? "image://icons/" + resultList.currentItem.icon
-                        : (activeWindow.icon
-                           ? "image://icons/" + activeWindow.icon
-                           : "image://icons/unknown")
-            }
         }
 
         /* Unhandled keys will always be forwarded to the search bar. That way
@@ -229,6 +236,14 @@
 
                     onClicked: executeResult(resultId)
                 }
+
+                onCurrentItemChanged: {
+                    if (currentItem != null && count > 0) {
+                        appIcon = "image://icons/" + (currentItem.icon ? currentItem.icon : "unknown")
+                    } else {
+                        appIcon = getActiveWindowIcon()
+                    }
+                }
             }
         }
     }

=== modified file 'shell/launcher/Launcher.qml'
--- shell/launcher/Launcher.qml	2012-03-30 13:44:54 +0000
+++ shell/launcher/Launcher.qml	2012-04-02 09:17:20 +0000
@@ -83,7 +83,9 @@
         height: parent.height
         anchors.right: Utils.isLeftToRight() ? parent.right : undefined
         anchors.left:  Utils.isLeftToRight() ? undefined : parent.left
-        visible: shellManager.dashActive && shellManager.dashShell == declarativeView
+        visible: (shellManager.hudActive && shellManager.hudShell == declarativeView)
+                  || (shellManager.dashActive && shellManager.dashShell == declarativeView)
+
         source: "artwork/border.png"
         fillMode: Image.Stretch
     }

=== modified file 'shell/launcher/LauncherItem.qml'
--- shell/launcher/LauncherItem.qml	2012-03-30 13:44:54 +0000
+++ shell/launcher/LauncherItem.qml	2012-04-02 09:17:20 +0000
@@ -61,7 +61,7 @@
     property int selectionOutlineSize
     property alias name: looseItem.objectName
     property string desktopFile: ""
-    property alias icon: icon.source
+    property string icon: "image://icons/unknown"
     property alias urgentAnimation: urgentAnimation
     property bool running: false
     property bool active: false
@@ -84,6 +84,9 @@
     property alias shortcutVisible: shortcut.visible
     property alias shortcutText: shortcutText.text
 
+    property bool beHudItem: shellManager.hudActive && shellManager.hudShell == declarativeView
+                             && isBfb && launcher2dConfiguration.hideMode == 0
+
     property bool isBeingDragged: false
     property int dragPosition
 
@@ -139,11 +142,13 @@
             mirror: Utils.isRightToLeft()
 
             source: "image://blended/%1color=%2alpha=%3"
-                  .arg("launcher/artwork/launcher_arrow_" + (activeOnThisScreen ? "" : "outline_" ) + "rtl.png")
+                  .arg("launcher/artwork/launcher_arrow_" 
+                       + (activeOnThisScreen || beHudItem ? "" : "outline_" ) 
+                       + "rtl.png")
                   .arg("lightgrey")
                   .arg(1.0)
 
-            visible: active && (looseItem.state != "beingDragged")
+            visible: (active && (looseItem.state != "beingDragged")) || beHudItem
         }
 
         /* This is the area on the left of the tile where the pips/arrow end up.
@@ -200,6 +205,7 @@
                 activeFocus: item.activeFocus
                 backgroundFromIcon: item.backgroundFromIcon
 
+                source: (beHudItem && hudLoader) ? hudLoader.item.appIcon : item.icon
                 tileBackgroundImage: (item.isBfb) ? "../launcher/artwork/squircle_base_54.png" : ""
                 tileShineImage: (item.isBfb) ? "../launcher/artwork/squircle_shine_54.png" : ""
                 selectedTileBackgroundImage: (item.isBfb) ? "../launcher/artwork/squircle_base_selected_54.png" : ""

=== modified file 'tests/hud/hud_show_hide_tests.rb'
--- tests/hud/hud_show_hide_tests.rb	2012-03-07 15:33:29 +0000
+++ tests/hud/hud_show_hide_tests.rb	2012-04-02 09:17:20 +0000
@@ -26,15 +26,23 @@
 
 ############################# Test Suite #############################
 context "HUD Show and Hide tests" do
+  hide_mode = 0
 
   # Run once at the beginning of this test suite
   startup do
     $SUT.execute_shell_command 'killall unity-2d-shell'
     $SUT.execute_shell_command 'killall unity-2d-shell'
+
+    # Save current hide-mode
+    hide_mode = $SUT.execute_shell_command 'gsettings get com.canonical.Unity2d.Launcher hide-mode'
+    # Set hide-mode to 1 (auto-hide)
+    $SUT.execute_shell_command 'gsettings set com.canonical.Unity2d.Launcher hide-mode 1'
   end
 
   # Run once at the end of this test suite
   shutdown do
+    # Restore hide-mode to original setting
+    $SUT.execute_shell_command 'gsettings set com.canonical.Unity2d.Launcher hide-mode ' + hide_mode
   end
 
   # Run before each test case begins

=== added file 'tests/hud/hud_show_hide_tests_hide-mode0.rb'
--- tests/hud/hud_show_hide_tests_hide-mode0.rb	1970-01-01 00:00:00 +0000
+++ tests/hud/hud_show_hide_tests_hide-mode0.rb	2012-04-02 09:17:20 +0000
@@ -0,0 +1,183 @@
+#!/usr/bin/env ruby1.8
+=begin
+/*
+ * This file is part of unity-2d
+ *
+ * Copyright 2012 Canonical Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+=end
+
+require '../run-tests.rb' unless $INIT_COMPLETED
+require 'xdo/xwindow'
+require 'xdo/keyboard'
+require 'xdo/mouse'
+require 'tmpwindow'
+
+############################# Test Suite #############################
+context "HUD Show and Hide tests" do
+  hide_mode = 0
+
+  # Run once at the beginning of this test suite
+  startup do
+    $SUT.execute_shell_command 'killall unity-2d-shell'
+    $SUT.execute_shell_command 'killall unity-2d-shell'
+
+    # Save current hide-mode
+    hide_mode = $SUT.execute_shell_command 'gsettings get com.canonical.Unity2d.Launcher hide-mode'
+    # Set hide-mode to 0 (fixed)
+    $SUT.execute_shell_command 'gsettings set com.canonical.Unity2d.Launcher hide-mode 0'
+  end
+
+  # Run once at the end of this test suite
+  shutdown do
+    # Restore hide-mode to original setting
+    $SUT.execute_shell_command 'gsettings set com.canonical.Unity2d.Launcher hide-mode ' + hide_mode
+  end
+
+  # Run before each test case begins
+  setup do
+    #Ensure mouse out of the way
+    XDo::Mouse.move(500,500,10,true)
+
+    # Execute the application 
+    @app = $SUT.run( :name => UNITY_2D_SHELL,
+                     :arguments => "-testability", 
+                     :sleeptime => 2 )
+    # Make certain application is ready for testing
+    verify{ @app.LauncherLoader() }
+  end
+
+  # Run after each test case completes
+  teardown do
+    TmpWindow.close_all_windows
+    #Need to kill Shell as it does not shutdown when politely asked
+    $SUT.execute_shell_command 'pkill -nf unity-2d-shell'
+  end
+
+  #####################################################################################
+  # Test cases
+
+  # Test case objectives:
+  #   * Check the HUD displays with the Alt key
+  # Pre-conditions
+  #   * None
+  # Test steps
+  #   * Check HUD closed
+  #   * Tap the Alt key
+  #   * Check HUD open
+  #   * Tap Alt key
+  #   * Check HUD closed
+  # Post-conditions
+  #   * None
+  # References
+  #   * None
+  test "HUD reveals and hides with Alt key tap" do
+    verify_not(1, 'HUD should be hidden at startup') {
+      @app.Hud()
+    }
+
+    XDo::Keyboard.alt
+    verify_equal('true', TIMEOUT, 'HUD should be visible, as the Alt key was tapped') {
+      @app.Hud()['active']
+    }
+
+    XDo::Keyboard.alt
+    verify_not(1, 'HUD should be hidden, as the Alt key should dismiss it') {
+      @app.Hud()
+    }
+  end
+
+  # Test case objectives:
+  #   * Check the Launcher does not hide when the HUD opens
+  # Pre-conditions
+  #   * None
+  # Test steps
+  #   * Check HUD closed
+  #   * Tap the Alt key
+  #   * Check Launcher remains on screen
+  # Post-conditions
+  #   * None
+  # References
+  #   * None
+  test "HUD does not make Launcher hide" do
+    verify_not(1, 'HUD should be hidden at startup') {
+      @app.Hud()
+    }
+    
+    XDo::Keyboard.alt
+    verify_equal( 0, TIMEOUT, 'Launcher hid when HUD activated, should be visible' ) {
+      @app.Launcher()['x_absolute'].to_i
+    }
+  end
+
+  # Test case objectives:
+  #   * Check the Launcher's BFB icon replaced when the HUD opens
+  # Pre-conditions
+  #   * Terminal window open & focused
+  # Test steps
+  #   * Check HUD closed
+  #   * Tap the Alt key
+  #   * Check Launcher's BFB icon changes to a squircle with the terminal icon inside
+  # Post-conditions
+  #   * None
+  # References
+  #   * None
+  test "Launcher's BFB icon replaced when HUD opens" do
+    TmpWindow.open_window_at(100, 100)
+
+    verify_not(1, 'HUD should be hidden at startup') {
+      @app.Hud()
+    }
+    
+    XDo::Keyboard.alt
+    verify_equal('image://icons/utilities-terminal', TIMEOUT, 'BFB icon should have changed to Terminal icon' ) {
+      @app.LauncherList( :name => 'main' ) \
+          .LauncherList( :isBfb => true ) \
+          .QDeclarativeImage( :name => 'icon' )['source']
+    }
+  end
+
+  # Test case objectives:
+  #   * Check the Launcher's BFB icon replaced by icon for first resuls (not necessarily the active
+  #     application icon) when the HUD opens
+  # Pre-conditions
+  #   * Terminal window open & focused
+  # Test steps
+  #   * Check HUD closed
+  #   * Tap the Alt key
+  #   * Type "bluetooth"   #assuming as this is a trademark this string is not localised in menus
+  #   * Check Launcher's BFB icon is the bluetooth icon
+  # Post-conditions
+  #   * None
+  # References
+  #   * None
+  test "Launcher's BFB icon replaced when HUD opens" do
+    TmpWindow.open_window_at(100, 100)
+
+    verify_not(1, 'HUD should be hidden at startup') {
+      @app.Hud()
+    }
+    
+    XDo::Keyboard.alt
+    XDo::Keyboard.simulate 'bluetooth'
+    verify(TIMEOUT, 'BFB icon should have changed to Bluetooth icon' ) {
+      icon = @app.LauncherList( :name => 'main' ) \
+                 .LauncherList( :isBfb => true ) \
+                 .QDeclarativeImage( :name => 'icon' )['source']
+      icon == 'image://icons/bluetooth-active' || icon == 'image://icons/bluetooth-disabled' \
+            || icon == 'image://icons/bluetooth-paired'
+    }
+  end
+end