Merge lp:~osomon/unity-2d/move-properties-to-launcheritem into lp:unity-2d/3.0

[Olivier Tilloy]

[launcher] Moved the progress, counter and emblem properties (and their related visibility properties) to the base LauncherItem class.
The default implementation doesn’t show them, it is meant to be overridden in subclasses.

Note: on top of the refactoring advertised in the commit message, this MR also fixes a bug in the visibility of emblems: in LauncherList.qml, the value of the 'emblem' property was never set correctly, because the condition on noOverlays was the opposite of what is was meant to be.

[Florian Boucault (fboucault)]

Emblems have been deprecated at a design level.

review: Needs Fixing

[Florian Boucault (fboucault)]

> Emblems have been deprecated at a design level.

But it does not hurt to have correct code :) (ignore the needs fixing)

[Olivier Tilloy (osomon)]

Sure, we can remove them in a subsequent merge request, that should be trivial (and removing dead code is always a pleasure).

=== modified file 'launcher/LauncherList.qml'
--- launcher/LauncherList.qml	2011-06-07 16:34:46 +0000
+++ launcher/LauncherList.qml	2011-06-13 08:51:14 +0000
@@ -89,13 +89,12 @@
         launching: item.launching
         pips: Math.min(item.windowCount, 3)
 
-        property bool noOverlays: item.counter == undefined
-        counter: (noOverlays) ? 0 : item.counter
-        counterVisible: (noOverlays) ? false : item.counterVisible
-        progress: (noOverlays) ? 0.0 : item.progress
-        progressBarVisible: (noOverlays) ? false : item.progressBarVisible
-        emblem: (noOverlays && item.emblem) ? "image://icons/" + item.emblem : ""
-        emblemVisible: (noOverlays) ? false : item.emblemVisible
+        counter: item.counter
+        counterVisible: item.counterVisible
+        progress: item.progress
+        progressBarVisible: item.progressBarVisible
+        emblem: item.emblem ? "image://icons/" + item.emblem : ""
+        emblemVisible: item.emblemVisible
 
         shortcutVisible: launcherView.superKeyHeld &&
                          ((item.toString().indexOf("LauncherApplication") == 0 && index <= 9) ||

=== modified file 'libunity-2d-private/Unity2d/launcherapplication.h'
--- libunity-2d-private/Unity2d/launcherapplication.h	2011-06-07 16:34:46 +0000
+++ libunity-2d-private/Unity2d/launcherapplication.h	2011-06-13 08:51:14 +0000
@@ -63,12 +63,6 @@
     Q_PROPERTY(QString desktop_file READ desktop_file WRITE setDesktopFile NOTIFY desktopFileChanged)
     Q_PROPERTY(QString executable READ executable NOTIFY executableChanged)
     Q_PROPERTY(bool has_visible_window READ has_visible_window NOTIFY hasVisibleWindowChanged)
-    Q_PROPERTY(float progress READ progress NOTIFY progressChanged)
-    Q_PROPERTY(bool progressBarVisible READ progressBarVisible NOTIFY progressBarVisibleChanged)
-    Q_PROPERTY(int counter READ counter NOTIFY counterChanged)
-    Q_PROPERTY(QString emblem READ emblem NOTIFY emblemChanged)
-    Q_PROPERTY(bool counterVisible READ counterVisible NOTIFY counterVisibleChanged)
-    Q_PROPERTY(bool emblemVisible READ emblemVisible NOTIFY emblemVisibleChanged)
 
 public:
     LauncherApplication();
@@ -88,12 +82,13 @@
     QString executable() const;
     virtual bool launching() const;
     bool has_visible_window() const;
-    float progress() const;
-    int counter() const;
-    QString emblem() const;
-    bool counterVisible() const;
-    bool progressBarVisible() const;
-    bool emblemVisible() const;
+
+    virtual bool progressBarVisible() const;
+    virtual float progress() const;
+    virtual bool counterVisible() const;
+    virtual int counter() const;
+    virtual bool emblemVisible() const;
+    virtual QString emblem() const;
 
     /* setters */
     void setDesktopFile(const QString& desktop_file);
@@ -118,12 +113,6 @@
     void desktopFileChanged(QString);
     void executableChanged(QString);
     void hasVisibleWindowChanged(bool);
-    void progressBarVisibleChanged(bool);
-    void counterVisibleChanged(bool);
-    void emblemVisibleChanged(bool);
-    void progressChanged(float);
-    void counterChanged(int);
-    void emblemChanged(QString);
 
     void closed();
 

=== modified file 'libunity-2d-private/Unity2d/launcheritem.cpp'
--- libunity-2d-private/Unity2d/launcheritem.cpp	2011-06-07 16:34:46 +0000
+++ libunity-2d-private/Unity2d/launcheritem.cpp	2011-06-13 08:51:14 +0000
@@ -85,3 +85,40 @@
 {
     /* Default to doing nothing. */
 }
+
+bool
+LauncherItem::progressBarVisible() const
+{
+    return false;
+}
+
+float
+LauncherItem::progress() const
+{
+    return 0.0;
+}
+
+bool
+LauncherItem::counterVisible() const
+{
+    return false;
+}
+
+int
+LauncherItem::counter() const
+{
+    return 0;
+}
+
+bool
+LauncherItem::emblemVisible() const
+{
+    return false;
+}
+
+QString
+LauncherItem::emblem() const
+{
+    return QString();
+}
+

=== modified file 'libunity-2d-private/Unity2d/launcheritem.h'
--- libunity-2d-private/Unity2d/launcheritem.h	2011-06-07 16:34:46 +0000
+++ libunity-2d-private/Unity2d/launcheritem.h	2011-06-13 08:51:14 +0000
@@ -43,6 +43,13 @@
     /* Export the menu as a plain QObject so that it can be used from QML */
     Q_PROPERTY(QObject* menu READ menu NOTIFY menuChanged)
 
+    Q_PROPERTY(bool progressBarVisible READ progressBarVisible NOTIFY progressBarVisibleChanged)
+    Q_PROPERTY(float progress READ progress NOTIFY progressChanged)
+    Q_PROPERTY(bool counterVisible READ counterVisible NOTIFY counterVisibleChanged)
+    Q_PROPERTY(int counter READ counter NOTIFY counterChanged)
+    Q_PROPERTY(bool emblemVisible READ emblemVisible NOTIFY emblemVisibleChanged)
+    Q_PROPERTY(QString emblem READ emblem NOTIFY emblemChanged)
+
 public:
     LauncherItem(QObject* parent = 0);
     ~LauncherItem();
@@ -58,6 +65,13 @@
     Qt::Key shortcutKey() const;
     QObject* menu() const;
 
+    virtual bool progressBarVisible() const;
+    virtual float progress() const;
+    virtual bool counterVisible() const;
+    virtual int counter() const;
+    virtual bool emblemVisible() const;
+    virtual QString emblem() const;
+
     /* setters */
     void setShortcutKey(Qt::Key);
 
@@ -80,6 +94,13 @@
     void shortcutKeyChanged(Qt::Key);
     void menuChanged(QObject*);
 
+    void progressBarVisibleChanged(bool);
+    void progressChanged(float);
+    void counterVisibleChanged(bool);
+    void counterChanged(int);
+    void emblemVisibleChanged(bool);
+    void emblemChanged(QString);
+
 public Q_SLOTS:
     /* Default implementation of drag’n’drop handling, should be overridden in
        subclasses to implement custom behaviours. */