Merge lp:~aacid/unity-2d/unity-2d_panel-newbuttons into lp:unity-2d

[Albert Astals Cid]

[panel] New artwork for the panel-dash buttons

[lp:~aacid/unity-2d/unity-2d_panel-newbuttons]

890. By Albert Astals Cid on 2012-02-03

merge

891. By Albert Astals Cid on 2012-02-03

merge

892. By Albert Astals Cid on 2012-02-06

merge

[Gerry Boland (gerboland)]

Hey, the assets were updated again!

See https://code.launchpad.net/~cimi/unity/new-dash-buttons/+merge/90719

review: Needs Fixing

[lp:~aacid/unity-2d/unity-2d_panel-newbuttons]

893. By Albert Astals Cid on 2012-02-07

New resources

894. By Albert Astals Cid on 2012-02-07

New verification images for the new assets

[Albert Astals Cid (aacid)]

New assets and tests pushed

[lp:~aacid/unity-2d/unity-2d_panel-newbuttons]

895. By Albert Astals Cid on 2012-02-07

Forgot to add those files :-/

[Gerry Boland (gerboland)]

Oh all good, thank you

review: Approve

=== modified file 'debian/unity-2d-panel.install.in'
--- debian/unity-2d-panel.install.in	2011-11-09 22:26:57 +0000
+++ debian/unity-2d-panel.install.in	2012-02-07 15:52:43 +0000
@@ -1,3 +1,4 @@
 @DEBIAN_INSTALL_PREFIX@/@CMAKE_INSTALL_BINDIR@/unity-2d-panel
 @DEBIAN_INSTALL_PREFIX@/@CMAKE_INSTALL_LIBDIR@/unity-2d/plugins/panel/libpanelplugin-*.so*
 @DEBIAN_INSTALL_PREFIX@/@CMAKE_INSTALL_DATADIR@/applications/unity-2d-panel.desktop
+@DEBIAN_INSTALL_PREFIX@/@CMAKE_INSTALL_DATADIR@/unity-2d/panel/applets/appname/artwork/*.png

=== modified file 'panel/applets/appname/CMakeLists.txt'
--- panel/applets/appname/CMakeLists.txt	2011-11-09 21:28:49 +0000
+++ panel/applets/appname/CMakeLists.txt	2012-02-07 15:52:43 +0000
@@ -49,3 +49,7 @@
 install(TARGETS panelplugin-appname
         LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}/unity-2d/plugins/panel
        )
+
+install(DIRECTORY artwork
+    DESTINATION ${UNITY_2D_DIR}/panel/applets/appname
+    )

=== modified file 'panel/applets/appname/appnameapplet.cpp'
--- panel/applets/appname/appnameapplet.cpp	2012-01-24 13:03:34 +0000
+++ panel/applets/appname/appnameapplet.cpp	2012-02-07 15:52:43 +0000
@@ -23,6 +23,7 @@
 #include "appnameapplet.h"
 
 // Local
+#include "config.h"
 #include "croppedlabel.h"
 #include "menubarwidget.h"
 #include "panelstyle.h"
@@ -62,6 +63,7 @@
 public:
     WindowButton(const PanelStyle::WindowButtonType& buttonType, QWidget* parent = 0)
     : QAbstractButton(parent)
+    , m_isDashButton(false)
     , m_initialized(false)
     {
         setButtonType(buttonType);
@@ -76,10 +78,12 @@
 
     void setButtonType(const PanelStyle::WindowButtonType& buttonType)
     {
-        if (m_initialized && m_buttonType == buttonType) return;
+        if (m_initialized && m_buttonType == buttonType) {
+            return;
+        }
 
         m_buttonType = buttonType;
-        loadPixmaps();
+        loadPixmaps(false);
         update();
     }
 
@@ -88,11 +92,21 @@
         return m_normalPix.size();
     }
 
+    void setIsDashButton(bool isDashButton)
+    {
+        if (m_initialized && m_isDashButton == isDashButton) {
+            return;
+        }
+
+        m_isDashButton = isDashButton;
+        update();
+    }
+
 protected:
     bool event(QEvent* ev)
     {
         if (ev->type() == QEvent::PaletteChange) {
-            loadPixmaps();
+            loadPixmaps(true);
         }
         return QAbstractButton::event(ev);
     }
@@ -103,14 +117,14 @@
         QPixmap pix;
         if (isEnabled()) {
             if (isDown()) {
-                pix = m_downPix;
+                pix = (m_isDashButton) ? m_dash_downPix : m_downPix;
             } else if (underMouse()) {
-                pix = m_hoverPix;
+                pix = (m_isDashButton) ? m_dash_hoverPix : m_hoverPix;
             } else {
-                pix = m_normalPix;
+                pix = (m_isDashButton) ? m_dash_normalPix : m_normalPix;
             }
         } else {
-            pix = m_normalPix;
+            pix = (m_isDashButton) ? m_dash_normalPix : m_normalPix;
         }
         int posX;
         if (m_buttonType == PanelStyle::CloseWindowButton) {
@@ -123,17 +137,49 @@
 
 private:
     PanelStyle::WindowButtonType m_buttonType;
+    bool m_isDashButton;
     QPixmap m_normalPix;
     QPixmap m_hoverPix;
     QPixmap m_downPix;
+    QPixmap m_dash_normalPix;
+    QPixmap m_dash_hoverPix;
+    QPixmap m_dash_downPix;
     bool m_initialized;
 
-    void loadPixmaps()
+    void loadPixmaps(bool loadOnlyStylePixmaps)
     {
         PanelStyle* style = PanelStyle::instance();
         m_normalPix = style->windowButtonPixmap(m_buttonType, PanelStyle::NormalState);
         m_hoverPix = style->windowButtonPixmap(m_buttonType, PanelStyle::PrelightState);
         m_downPix = style->windowButtonPixmap(m_buttonType, PanelStyle::PressedState);
+
+        if (!loadOnlyStylePixmaps) {
+            loadDashPixmaps(m_buttonType);
+        }
+    }
+
+    void loadDashPixmaps(PanelStyle::WindowButtonType buttonType)
+    {
+        QString iconPath = unity2dDirectory() + "/panel/applets/appname/artwork/";
+
+        switch (buttonType) {
+        case PanelStyle::CloseWindowButton:
+            iconPath += "close_dash";
+            break;
+        case PanelStyle::MinimizeWindowButton:
+            iconPath += "minimize_dash";
+            break;
+        case PanelStyle::UnmaximizeWindowButton:
+            iconPath += "unmaximize_dash";
+            break;
+        case PanelStyle::MaximizeWindowButton:
+            iconPath += "maximize_dash";
+            break;
+        }
+
+        m_dash_normalPix.load(iconPath + ".png");
+        m_dash_hoverPix.load(iconPath + "_prelight.png");
+        m_dash_downPix.load(iconPath + "_pressed.png");
     }
 };
 
@@ -178,8 +224,11 @@
         layout->setMargin(0);
         layout->setSpacing(0);
         m_closeButton = new WindowButton(PanelStyle::CloseWindowButton);
+        m_closeButton->setObjectName("AppNameApplet::CloseButton");
         m_minimizeButton = new WindowButton(PanelStyle::MinimizeWindowButton);
+        m_minimizeButton->setObjectName("AppNameApplet::MinimizeButton");
         m_maximizeButton = new WindowButton(PanelStyle::UnmaximizeWindowButton);
+        m_maximizeButton->setObjectName("AppNameApplet::MaximizeButton");
         layout->addWidget(m_closeButton);
         layout->addWidget(m_minimizeButton);
         layout->addWidget(m_maximizeButton);
@@ -269,13 +318,18 @@
     bool showDesktopLabel = !app;
 
     d->m_windowButtonWidget->setVisible(showWindowButtons);
+    d->m_maximizeButton->setIsDashButton(dashIsVisible);
     d->m_maximizeButton->setButtonType(isMaximized ?
                                        PanelStyle::UnmaximizeWindowButton :
                                        PanelStyle::MaximizeWindowButton);
     /* disable the minimize button for the dash */
     d->m_minimizeButton->setEnabled(!dashIsVisible);
+    d->m_minimizeButton->setIsDashButton(dashIsVisible);
     /* and the maximize button, if the dash is not resizeable */
     d->m_maximizeButton->setEnabled(!dashIsVisible || dashCanResize);
+    d->m_maximizeButton->setIsDashButton(dashIsVisible);
+    /* make sure we use the right button for dash */
+    d->m_closeButton->setIsDashButton(dashIsVisible);
 
     if (showAppLabel || showDesktopLabel || dashIsVisible) {
         d->m_label->setVisible(true);

=== added directory 'panel/applets/appname/artwork'
=== added file 'panel/applets/appname/artwork/close_dash.png'
Binary files panel/applets/appname/artwork/close_dash.png	1970-01-01 00:00:00 +0000 and panel/applets/appname/artwork/close_dash.png	2012-02-07 15:52:43 +0000 differ
=== added file 'panel/applets/appname/artwork/close_dash_prelight.png'
Binary files panel/applets/appname/artwork/close_dash_prelight.png	1970-01-01 00:00:00 +0000 and panel/applets/appname/artwork/close_dash_prelight.png	2012-02-07 15:52:43 +0000 differ
=== added file 'panel/applets/appname/artwork/close_dash_pressed.png'
Binary files panel/applets/appname/artwork/close_dash_pressed.png	1970-01-01 00:00:00 +0000 and panel/applets/appname/artwork/close_dash_pressed.png	2012-02-07 15:52:43 +0000 differ
=== added file 'panel/applets/appname/artwork/maximize_dash.png'
Binary files panel/applets/appname/artwork/maximize_dash.png	1970-01-01 00:00:00 +0000 and panel/applets/appname/artwork/maximize_dash.png	2012-02-07 15:52:43 +0000 differ
=== added file 'panel/applets/appname/artwork/maximize_dash_prelight.png'
Binary files panel/applets/appname/artwork/maximize_dash_prelight.png	1970-01-01 00:00:00 +0000 and panel/applets/appname/artwork/maximize_dash_prelight.png	2012-02-07 15:52:43 +0000 differ
=== added file 'panel/applets/appname/artwork/maximize_dash_pressed.png'
Binary files panel/applets/appname/artwork/maximize_dash_pressed.png	1970-01-01 00:00:00 +0000 and panel/applets/appname/artwork/maximize_dash_pressed.png	2012-02-07 15:52:43 +0000 differ
=== added file 'panel/applets/appname/artwork/minimize_dash.png'
Binary files panel/applets/appname/artwork/minimize_dash.png	1970-01-01 00:00:00 +0000 and panel/applets/appname/artwork/minimize_dash.png	2012-02-07 15:52:43 +0000 differ
=== added file 'panel/applets/appname/artwork/minimize_dash_prelight.png'
Binary files panel/applets/appname/artwork/minimize_dash_prelight.png	1970-01-01 00:00:00 +0000 and panel/applets/appname/artwork/minimize_dash_prelight.png	2012-02-07 15:52:43 +0000 differ
=== added file 'panel/applets/appname/artwork/minimize_dash_pressed.png'
Binary files panel/applets/appname/artwork/minimize_dash_pressed.png	1970-01-01 00:00:00 +0000 and panel/applets/appname/artwork/minimize_dash_pressed.png	2012-02-07 15:52:43 +0000 differ
=== added file 'panel/applets/appname/artwork/unmaximize_dash.png'
Binary files panel/applets/appname/artwork/unmaximize_dash.png	1970-01-01 00:00:00 +0000 and panel/applets/appname/artwork/unmaximize_dash.png	2012-02-07 15:52:43 +0000 differ
=== added file 'panel/applets/appname/artwork/unmaximize_dash_prelight.png'
Binary files panel/applets/appname/artwork/unmaximize_dash_prelight.png	1970-01-01 00:00:00 +0000 and panel/applets/appname/artwork/unmaximize_dash_prelight.png	2012-02-07 15:52:43 +0000 differ
=== added file 'panel/applets/appname/artwork/unmaximize_dash_pressed.png'
Binary files panel/applets/appname/artwork/unmaximize_dash_pressed.png	1970-01-01 00:00:00 +0000 and panel/applets/appname/artwork/unmaximize_dash_pressed.png	2012-02-07 15:52:43 +0000 differ
=== modified file 'tests/misc/lib/definitions.rb'
--- tests/misc/lib/definitions.rb	2012-01-26 12:54:51 +0000
+++ tests/misc/lib/definitions.rb	2012-02-07 15:52:43 +0000
@@ -1,3 +1,5 @@
 
 LAUNCHER_WIDTH = 65
 PANEL_HEIGHT = 24
+DASH_MIN_SCREEN_WIDTH = 1280
+DASH_MIN_SCREEN_HEIGHT = 1084

=== added directory 'tests/panel/verification'
=== added file 'tests/panel/verification/dash_close_button.png'
Binary files tests/panel/verification/dash_close_button.png	1970-01-01 00:00:00 +0000 and tests/panel/verification/dash_close_button.png	2012-02-07 15:52:43 +0000 differ
=== added file 'tests/panel/verification/dash_close_button_over.png'
Binary files tests/panel/verification/dash_close_button_over.png	1970-01-01 00:00:00 +0000 and tests/panel/verification/dash_close_button_over.png	2012-02-07 15:52:43 +0000 differ
=== added file 'tests/panel/verification/dash_close_button_pressed.png'
Binary files tests/panel/verification/dash_close_button_pressed.png	1970-01-01 00:00:00 +0000 and tests/panel/verification/dash_close_button_pressed.png	2012-02-07 15:52:43 +0000 differ
=== added file 'tests/panel/verification/dash_maximize_button.png'
Binary files tests/panel/verification/dash_maximize_button.png	1970-01-01 00:00:00 +0000 and tests/panel/verification/dash_maximize_button.png	2012-02-07 15:52:43 +0000 differ
=== added file 'tests/panel/verification/dash_maximize_button_fullscreen.png'
Binary files tests/panel/verification/dash_maximize_button_fullscreen.png	1970-01-01 00:00:00 +0000 and tests/panel/verification/dash_maximize_button_fullscreen.png	2012-02-07 15:52:43 +0000 differ
=== added file 'tests/panel/verification/dash_maximize_button_fullscreen_over.png'
Binary files tests/panel/verification/dash_maximize_button_fullscreen_over.png	1970-01-01 00:00:00 +0000 and tests/panel/verification/dash_maximize_button_fullscreen_over.png	2012-02-07 15:52:43 +0000 differ
=== added file 'tests/panel/verification/dash_maximize_button_fullscreen_pressed.png'
Binary files tests/panel/verification/dash_maximize_button_fullscreen_pressed.png	1970-01-01 00:00:00 +0000 and tests/panel/verification/dash_maximize_button_fullscreen_pressed.png	2012-02-07 15:52:43 +0000 differ
=== added file 'tests/panel/verification/dash_maximize_button_over.png'
Binary files tests/panel/verification/dash_maximize_button_over.png	1970-01-01 00:00:00 +0000 and tests/panel/verification/dash_maximize_button_over.png	2012-02-07 15:52:43 +0000 differ
=== added file 'tests/panel/verification/dash_maximize_button_pressed.png'
Binary files tests/panel/verification/dash_maximize_button_pressed.png	1970-01-01 00:00:00 +0000 and tests/panel/verification/dash_maximize_button_pressed.png	2012-02-07 15:52:43 +0000 differ
=== added file 'tests/panel/verification/dash_minimize_button.png'
Binary files tests/panel/verification/dash_minimize_button.png	1970-01-01 00:00:00 +0000 and tests/panel/verification/dash_minimize_button.png	2012-02-07 15:52:43 +0000 differ
=== added file 'tests/panel/visual_verification.rb'
--- tests/panel/visual_verification.rb	1970-01-01 00:00:00 +0000
+++ tests/panel/visual_verification.rb	2012-02-07 15:52:43 +0000
@@ -0,0 +1,151 @@
+#!/usr/bin/env ruby1.8
+=begin
+/*
+ * This file is part of unity-2d
+ *
+ * Copyright 2012 Canonical Ltd.
+ *
+ * Authors:
+ * - Albert Astals Cid <[e-mail]>
+ *
+ * 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/keyboard'
+require 'xdo/mouse'
+require 'xdo/xwindow'
+
+############################# Test Suite #############################
+context "Panel visual verification tests" do
+  pwd = File.expand_path(File.dirname(__FILE__)) + '/'
+  old_value = ""
+
+  def dash_always_fullscreen
+    out = XDo::XWindow.display_geometry()
+    width = out[0]
+    height = out[1]
+    return width < DASH_MIN_SCREEN_WIDTH && height < DASH_MIN_SCREEN_HEIGHT
+  end
+
+  # Run once at the beginning of this test suite
+  startup do
+    old_value = $SUT.execute_shell_command 'gsettings get com.canonical.Unity2d.Dash full-screen'
+    $SUT.execute_shell_command 'gsettings set com.canonical.Unity2d.Dash full-screen false'
+
+    $SUT.execute_shell_command 'killall unity-2d-panel'
+    $SUT.execute_shell_command 'killall unity-2d-panel'
+
+    $SUT.execute_shell_command 'killall unity-2d-launcher'
+    $SUT.execute_shell_command 'killall unity-2d-launcher'
+  end
+
+  # Run once at the end of this test suite
+  shutdown do
+      $SUT.execute_shell_command 'gsettings set com.canonical.Unity2d.Dash full-screen ' + old_value
+  end
+
+  # Run before each test case begins
+  setup do
+    # Execute the application 
+    @app = $SUT.run( :name => UNITY_2D_PANEL,
+                     :arguments => "-testability",
+                     :sleeptime => 2 )
+
+    @launcher = $SUT.run( :name => UNITY_2D_LAUNCHER,
+                       :arguments => "-testability",
+                       :sleeptime => 2 )
+
+  end
+
+  # Run after each test case completes
+  teardown do
+    $SUT.execute_shell_command 'pkill -nf unity-2d-panel'
+    $SUT.execute_shell_command 'pkill -nf unity-2d-launcher'
+  end
+
+  #####################################################################################
+  # Test cases
+
+  test "Visually compare dash buttons with reference" do
+    XDo::Mouse.move(100, 100, 0, true)
+    XDo::Keyboard.simulate('{SUPER}')
+
+    closeButton = @app.AppNameApplet().QAbstractButton( :name => 'AppNameApplet::CloseButton' )
+    verify_true( TIMEOUT, 'close button not matching reference image' ) {
+      closeButton.find_on_screen(pwd + 'verification/dash_close_button.png') != nil
+    }
+
+    closeButton.move_mouse
+    verify_true( TIMEOUT, 'close button not matching reference image' ) {
+      closeButton.find_on_screen(pwd + 'verification/dash_close_button_over.png') != nil
+    }
+
+    minimizeButton = @app.AppNameApplet().QAbstractButton( :name => 'AppNameApplet::MinimizeButton' )
+    verify_true( TIMEOUT, 'minimize button not matching reference image' ) {
+      minimizeButton.find_on_screen(pwd + 'verification/dash_minimize_button.png') != nil
+    }
+
+    maximizeButton = @app.AppNameApplet().QAbstractButton( :name => 'AppNameApplet::MaximizeButton' )
+    if dash_always_fullscreen
+      verify_true( TIMEOUT, 'maximize button fullscreen not matching reference image' ) {
+        maximizeButton.find_on_screen(pwd + 'verification/dash_maximize_button_fullscreen.png') != nil
+      }
+
+      maximizeButton.move_mouse
+      verify_true( TIMEOUT, 'maximize button fullscreen not matching reference image' ) {
+        maximizeButton.find_on_screen(pwd + 'verification/dash_maximize_button_fullscreen_over.png') != nil
+      }
+    else
+      verify_true( TIMEOUT, 'maximize button not matching reference image' ) {
+        maximizeButton.find_on_screen(pwd + 'verification/dash_maximize_button.png') != nil
+      }
+
+      maximizeButton.move_mouse()
+      verify_true( TIMEOUT, 'maximize button not matching reference image' ) {
+        maximizeButton.find_on_screen(pwd + 'verification/dash_maximize_button_over.png') != nil
+      }
+
+      XDo::Mouse.down()
+      verify_true( TIMEOUT, 'maximize button pressed not matching reference image' ) {
+        maximizeButton.find_on_screen(pwd + 'verification/dash_maximize_button_pressed.png') != nil
+      }
+      XDo::Mouse.up()
+
+      minimizeButton.move_mouse() # move mouse away
+
+      verify_true( TIMEOUT, 'maximize button fullscreen not matching reference image' ) {
+        maximizeButton.find_on_screen(pwd + 'verification/dash_maximize_button_fullscreen.png') != nil
+      }
+
+      maximizeButton.move_mouse()
+      verify_true( TIMEOUT, 'maximize button fullscreen not matching reference image' ) {
+        maximizeButton.find_on_screen(pwd + 'verification/dash_maximize_button_fullscreen_over.png') != nil
+      }
+
+      XDo::Mouse.down()
+      verify_true( TIMEOUT, 'maximize button fullscreen pressed not matching reference image' ) {
+        maximizeButton.find_on_screen(pwd + 'verification/dash_maximize_button_fullscreen_pressed.png') != nil
+      }
+      XDo::Mouse.up()
+    end
+
+    closeButton.move_mouse()
+    XDo::Mouse.down()
+    verify_true( TIMEOUT, 'close button pressed not matching reference image' ) {
+      closeButton.find_on_screen(pwd + 'verification/dash_close_button_pressed.png') != nil
+    }
+    XDo::Mouse.up()
+  end
+end

=== modified file 'tests/places/fullscreen.rb'
--- tests/places/fullscreen.rb	2012-01-31 15:13:25 +0000
+++ tests/places/fullscreen.rb	2012-02-07 15:52:43 +0000
@@ -38,8 +38,6 @@
 
   DASH_FULLSCREEN_KEY = '/com/canonical/unity-2d/dash/full-screen'
   DASH_FORMFACTOR_KEY = '/com/canonical/unity-2d/form-factor'
-  DASH_MIN_SCREEN_WIDTH = 1280;
-  DASH_MIN_SCREEN_HEIGHT = 1084;
 
   # Run once at the beginning of this test suite
   startup do