Merge lp:~aacid/unity-2d/icon_change_update into lp:unity-2d

[Albert Astals Cid]

[shell] Refresh icon tiles on theme change

[shell] Refresh icon tiles on theme change

[lp:~aacid/unity-2d/icon_change_update]

1112. By Albert Astals Cid on 2012-05-29

test

=== modified file 'shell/app/shellmanager.cpp'
--- shell/app/shellmanager.cpp	2012-04-26 08:14:26 +0000
+++ shell/app/shellmanager.cpp	2012-05-29 15:24:19 +0000
@@ -62,6 +62,7 @@
 static const char* HUD_SHORTCUT_KEY = "/apps/compiz-1/plugins/unityshell/screen0/options/show_hud";
 
 GOBJECT_CALLBACK1(activeWorkspaceChangedCB, "onActiveWorkspaceChanged");
+GOBJECT_CALLBACK0(iconThemeChangedCB, "onIconThemeChanged");
 
 struct ShellManagerPrivate
 {
@@ -334,11 +335,13 @@
     updateDashAlwaysFullScreen();
 
     g_signal_connect(G_OBJECT(wnck_screen_get_default()), "active_workspace_changed", G_CALLBACK(activeWorkspaceChangedCB), this);
+    g_signal_connect(G_OBJECT(gtk_icon_theme_get_default()), "changed", G_CALLBACK(iconThemeChangedCB), this);
 }
 
 ShellManager::~ShellManager()
 {
     g_signal_handlers_disconnect_by_func(G_OBJECT(wnck_screen_get_default()), gpointer(activeWorkspaceChangedCB), this);
+    g_signal_handlers_disconnect_by_func(G_OBJECT(gtk_icon_theme_get_default()), gpointer(iconThemeChangedCB), this);
 
     qDeleteAll(d->m_viewList);
     delete d;
@@ -492,6 +495,11 @@
     Q_EMIT lastFocusedWindowChanged(d->m_last_focused_window);
 }
 
+void ShellManager::onIconThemeChanged()
+{
+    Q_EMIT iconThemeChanged();
+}
+
 void ShellManager::onHudActivationShortcutChanged()
 {
     // TODO It might make sense to abstract this logic

=== modified file 'shell/app/shellmanager.h'
--- shell/app/shellmanager.h	2012-04-02 14:03:32 +0000
+++ shell/app/shellmanager.h	2012-05-29 15:24:19 +0000
@@ -101,6 +101,7 @@
     void dashActivateHome();
     void dashActivateLens(const QString& lensId);
     void toggleHud();
+    void iconThemeChanged();
 
 private Q_SLOTS:
     void onScreenCountChanged(int);
@@ -119,6 +120,8 @@
 
     void onHudActivationShortcutChanged();
 
+    void onIconThemeChanged();
+
 private:
     Q_DISABLE_COPY(ShellManager)
     ShellManagerPrivate * const d;

=== modified file 'shell/common/IconTile.qml'
--- shell/common/IconTile.qml	2012-04-03 15:11:46 +0000
+++ shell/common/IconTile.qml	2012-05-29 15:24:19 +0000
@@ -70,6 +70,7 @@
 
         sourceSize.width: 48
         sourceSize.height: 48
+        cache: false
 
         /* Whenever one of the parameters used in calculating the background color of
            the icon changes, recalculate its value */

=== modified file 'shell/launcher/LauncherItem.qml'
--- shell/launcher/LauncherItem.qml	2012-04-18 16:33:22 +0000
+++ shell/launcher/LauncherItem.qml	2012-05-29 15:24:19 +0000
@@ -197,6 +197,8 @@
 
             /* This draws the icon, the tile background and the sheen on top */
             IconTile {
+                property bool refreshingIcon: false
+
                 id: icon
                 width: item.tileSize
                 height: item.tileSize
@@ -205,7 +207,7 @@
                 activeFocus: declarativeView.focus && item.activeFocus
                 backgroundFromIcon: item.backgroundFromIcon
 
-                source: (beHudItem && hudLoader) ? hudLoader.item.appIcon : item.icon
+                source: refreshingIcon ? "image://icons/unknown" : ((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" : ""
@@ -219,6 +221,14 @@
                     alwaysRunToEnd: true
                     running: launching
                 }
+
+                Connections {
+                    target: shellManager
+                    onIconThemeChanged: {
+                        icon.refreshingIcon = true
+                        icon.refreshingIcon = false
+                    }
+                }
             }
 
             /* This image appears only while launching, and pulses in and out in counterpoint

=== modified file 'tests/manual-tests/launcher.txt'
--- tests/manual-tests/launcher.txt	2012-05-25 07:20:58 +0000
+++ tests/manual-tests/launcher.txt	2012-05-29 15:24:19 +0000
@@ -190,3 +190,9 @@
 
 Verify there is no "Unity 2d Shell" tile in the launcher
 ----
+ * Open a terminal
+ * Open the system settings
+ * Change the icon theme from Ambience to High Constrast
+
+Verify the icon of the terminal is updated
+----