Merge lp:~fboucault/unity-2d/colors_from_icon_in_plugin into lp:unity-2d/3.0

[Florian Boucault]

Moved LauncherView::getColorsFromIcon() into Unity2d QML plugin's newly created IconUtilities class.

[Florian Boucault (fboucault)]

The branch in this MR depends on https://code.launchpad.net/~fboucault/unity-2d/reorg/+merge/63736

[lp:~fboucault/unity-2d/colors_from_icon_in_plugin]

592. By Florian Boucault on 2011-06-15

Merged from trunk

593. By Florian Boucault on 2011-06-15

Properly credited libunity-2d-private/Unity2d/iconutilities.cpp

594. By Florian Boucault on 2011-06-22

Merged from trunk

595. By Florian Boucault on 2011-06-22

Pass the QDeclarativeEngine to IconUtilities thus avoiding the instantiation of IconUtilities from QML.

Unmerged revisions

=== modified file 'debian/changelog'
--- debian/changelog	2011-06-07 15:47:41 +0000
+++ debian/changelog	2011-06-07 22:59:36 +0000
@@ -1,5 +1,6 @@
 unity-2d (3.8.6-0ubuntu2) UNRELEASED; urgency=low
 
+  [ Didier Roche ]
   * debian/control:
     - unity-2d-panel recommends the indicator, not unity-2d
     - appmenu-gtk and appmenu-qt are already provided by indicator-appmenu
@@ -7,7 +8,16 @@
   * debian/libunity-2d-private0.install:
     - install everything in Unity2d private directory
 
- -- Didier Roche <[e-mail]>  Fri, 27 May 2011 11:14:21 +0200
+  [ Florian Boucault ]
+  * debian/unity-2d-launcher.install:
+    - do not install usr/lib/qt4/imports/UnityApplications/ anylonger as all of
+      UnityApplications features have been moved to the Unity2d QML plugin
+      installed by libunity-2d-private0
+  * debian/control:
+    - unity-2d-places and unity-2d-spread do not depend on unity-2d-launcher.
+      All they need is now in libunity-2d-private0.
+
+ -- Florian Boucault <[e-mail]>  Tue, 07 Jun 2011 18:53:52 +0200
 
 unity-2d (3.8.6-0ubuntu1) natty; urgency=low
 

=== modified file 'debian/control'
--- debian/control	2011-05-27 09:34:01 +0000
+++ debian/control	2011-06-07 22:59:36 +0000
@@ -84,7 +84,6 @@
 Architecture: any
 Depends: ${shlibs:Depends},
          ${misc:Depends},
-         unity-2d-launcher,
          libunity-2d-private0,
          libqt4-svg
 Description: Unity 2D Places
@@ -96,7 +95,6 @@
 Architecture: any
 Depends: ${shlibs:Depends},
          ${misc:Depends},
-         unity-2d-launcher,
          libunity-2d-private0,
          libqt4-svg
 Description: Unity 2D Spread

=== modified file 'debian/unity-2d-launcher.install'
--- debian/unity-2d-launcher.install	2011-03-10 14:41:46 +0000
+++ debian/unity-2d-launcher.install	2011-06-07 22:59:36 +0000
@@ -4,7 +4,3 @@
 usr/share/unity-2d/launcher/*.qml
 usr/share/unity-2d/launcher/launchermenu.css
 usr/share/unity-2d/launcher/artwork
-usr/lib/qt4/imports/UnityApplications/libUnityApplications.so.1
-usr/lib/qt4/imports/UnityApplications/libUnityApplications.so.1.0.0
-usr/lib/qt4/imports/UnityApplications/qmldir
-usr/lib/qt4/imports/UnityApplications/libUnityApplications.so

=== modified file 'launcher/CMakeLists.txt'
--- launcher/CMakeLists.txt	2011-03-10 14:41:46 +0000
+++ launcher/CMakeLists.txt	2011-06-07 22:59:36 +0000
@@ -5,7 +5,6 @@
     )
 
 # Source
-add_subdirectory(UnityApplications)
 add_subdirectory(app)
 add_subdirectory(tests)
 

=== modified file 'launcher/Launcher.qml'
--- launcher/Launcher.qml	2011-05-31 11:41:34 +0000
+++ launcher/Launcher.qml	2011-06-07 22:59:36 +0000
@@ -17,7 +17,6 @@
  */
 
 import Qt 4.7
-import UnityApplications 1.0
 import Unity2d 1.0 /* required for drag’n’drop handling */
 
 DropItem {

=== modified file 'launcher/LauncherItem.qml'
--- launcher/LauncherItem.qml	2011-04-28 13:15:50 +0000
+++ launcher/LauncherItem.qml	2011-06-07 22:59:36 +0000
@@ -97,6 +97,10 @@
     signal entered
     signal exited
 
+    IconUtilities {
+        id: iconUtilities
+    }
+
     Item {
         /* The actual item, reparented so its y coordinate can be animated. */
         id: looseItem
@@ -247,7 +251,7 @@
                 function updateColors() {
                     if (!item.backgroundFromIcon) return;
 
-                    var colors = launcherView.getColorsFromIcon(icon.source, icon.sourceSize)
+                    var colors = iconUtilities.getColorsFromIcon(icon.source, icon.sourceSize)
                     if (colors && colors.length > 0) tileBackground.color = colors[0]
                 }
             }

=== modified file 'launcher/LauncherList.qml'
--- launcher/LauncherList.qml	2011-05-02 16:25:49 +0000
+++ launcher/LauncherList.qml	2011-06-07 22:59:36 +0000
@@ -17,7 +17,6 @@
  */
 
 import Qt 4.7
-import UnityApplications 1.0
 import Unity2d 1.0 /* required for drag’n’drop handling */
 
 AutoScrollingListView {

=== removed directory 'launcher/UnityApplications'
=== removed file 'launcher/UnityApplications/CMakeLists.txt'
--- launcher/UnityApplications/CMakeLists.txt	2011-05-19 12:21:03 +0000
+++ launcher/UnityApplications/CMakeLists.txt	1970-01-01 00:00:00 +0000
@@ -1,106 +0,0 @@
-# Dependencies
-pkg_check_modules(QTBAMF REQUIRED libqtbamf)
-pkg_check_modules(QTGCONF REQUIRED libqtgconf)
-pkg_check_modules(QTDEE REQUIRED libqtdee)
-pkg_check_modules(DBUSMENUQT REQUIRED dbusmenu-qt)
-pkg_check_modules(GLIB REQUIRED glib-2.0)
-pkg_check_modules(GDK REQUIRED gdk-2.0)
-pkg_check_modules(GIO REQUIRED gio-2.0)
-pkg_check_modules(WNCK REQUIRED libwnck-1.0)
-pkg_check_modules(STARTUPNOTIFICATION REQUIRED libstartup-notification-1.0)
-pkg_check_modules(INDICATOR REQUIRED indicator)
-
-# Sources
-set(UnityApplications_SRCS
-    iconimageprovider.cpp
-    listaggregatormodel.cpp
-    launcheritem.cpp
-    launcherapplication.cpp
-    launcherapplicationslist.cpp
-    launcherapplicationslistdbus.cpp
-    launcherdevice.cpp
-    launcherdeviceslist.cpp
-    launcherutility.cpp
-    placeentry.cpp
-    place.cpp
-    launcherplaceslist.cpp
-    trash.cpp
-    launchermenu.cpp
-    webfavorite.cpp
-    plugin.cpp
-    workspaces.cpp
-    )
-
-set(UnityApplications_MOC_HDRS
-    listaggregatormodel.h
-    launcheritem.h
-    launcherapplication.h
-    launcherapplicationslist.h
-    launcherapplicationslistdbus.h
-    launcherdevice.h
-    launcherdeviceslist.h
-    launcherutility.h
-    placeentry.h
-    place.h
-    launcherplaceslist.h
-    trash.h
-    launchermenu.h
-    webfavorite.h
-    plugin.h
-    workspaces.h
-    )
-
-qt4_wrap_cpp(UnityApplications_MOC_SRCS ${UnityApplications_MOC_HDRS})
-
-# Build
-add_definitions(-DWNCK_I_KNOW_THIS_IS_UNSTABLE -DSN_API_NOT_YET_FROZEN)
-
-add_library(UnityApplications SHARED ${UnityApplications_SRCS} ${UnityApplications_MOC_SRCS})
-
-set_target_properties(UnityApplications PROPERTIES
-    SOVERSION 1
-    VERSION 1.0.0
-    )
-
-include_directories(
-    ${CMAKE_CURRENT_BINARY_DIR}
-    ${QTBAMF_INCLUDE_DIRS}
-    ${QTGCONF_INCLUDE_DIRS}
-    ${QTDEE_INCLUDE_DIRS}
-    ${DBUSMENUQT_INCLUDE_DIRS}
-    ${GLIB_INCLUDE_DIRS}
-    ${GDK_INCLUDE_DIRS}
-    ${GIO_INCLUDE_DIRS}
-    ${WNCK_INCLUDE_DIRS}
-    ${STARTUPNOTIFICATION_INCLUDE_DIRS}
-    ${INDICATOR_INCLUDE_DIRS}
-    )
-
-target_link_libraries(UnityApplications
-    ${QT_QTCORE_LIBRARIES}
-    ${QT_QTGUI_LIBRARIES}
-    ${QT_QTNETWORK_LIBRARIES}
-    ${QT_QTDECLARATIVE_LIBRARIES}
-    ${QTBAMF_LDFLAGS}
-    ${QTGCONF_LDFLAGS}
-    ${QTDEE_LDFLAGS}
-    ${DBUSMENUQT_LDFLAGS}
-    ${GLIB_LDFLAGS}
-    ${GDK_LDFLAGS}
-    ${GIO_LDFLAGS}
-    ${WNCK_LDFLAGS}
-    ${STARTUPNOTIFICATION_LDFLAGS}
-    ${INDICATOR_LDFLAGS}
-    )
-
-# Install
-set(IMPORT_INSTALL_DIR lib/qt4/imports/UnityApplications)
-
-install(TARGETS UnityApplications
-    LIBRARY DESTINATION ${IMPORT_INSTALL_DIR}
-    )
-
-install(FILES qmldir
-    DESTINATION ${IMPORT_INSTALL_DIR}
-    )
-

=== removed file 'launcher/UnityApplications/plugin.cpp'
--- launcher/UnityApplications/plugin.cpp	2011-01-26 15:28:25 +0000
+++ launcher/UnityApplications/plugin.cpp	1970-01-01 00:00:00 +0000
@@ -1,64 +0,0 @@
-/*
- * Copyright (C) 2010-2011 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/>.
- */
-
-#include "launcherapplication.h"
-#include "place.h"
-#include "placeentry.h"
-#include "launcherdevice.h"
-#include "trash.h"
-#include "workspaces.h"
-#include "listaggregatormodel.h"
-#include "launcherapplicationslist.h"
-#include "launcherdeviceslist.h"
-#include "launcherplaceslist.h"
-#include "iconimageprovider.h"
-#include "plugin.h"
-#include <QtDeclarative/qdeclarative.h>
-#include <QDeclarativeEngine>
-#include <QDeclarativeContext>
-#include <QAbstractListModel>
-
-void UnityApplicationsPlugin::registerTypes(const char *uri)
-{
-    qmlRegisterType<ListAggregatorModel>(uri, 0, 1, "ListAggregatorModel");
-
-    qmlRegisterType<LauncherApplicationsList>(uri, 0, 1, "LauncherApplicationsList");
-    qmlRegisterType<LauncherApplication>(uri, 0, 1, "LauncherApplication");
-
-    qmlRegisterType<LauncherPlacesList>(uri, 0, 1, "LauncherPlacesList");
-    qmlRegisterType<Place>(uri, 0, 1, "Place");
-    qmlRegisterType<PlaceEntry>(uri, 0, 1, "PlaceEntry");
-    /* DeeListModel is exposed to QML by PlaceEntry */
-    qmlRegisterType<DeeListModel>(uri, 0, 1, "DeeListModel");
-
-    qmlRegisterType<LauncherDevicesList>(uri, 0, 1, "LauncherDevicesList");
-    qmlRegisterType<LauncherDevice>(uri, 0, 1, "LauncherDevice");
-
-    qmlRegisterType<Trashes>(uri, 0, 1, "Trashes");
-    qmlRegisterType<Trash>(uri, 0, 1, "Trash");
-
-    qmlRegisterType<WorkspacesList>(uri, 0, 1, "WorkspacesList");
-    qmlRegisterType<Workspaces>(uri, 0, 1, "Workspaces");
-}
-
-void UnityApplicationsPlugin::initializeEngine(QDeclarativeEngine *engine, const char *uri)
-{
-    Q_UNUSED(uri);
-
-    engine->addImageProvider(QString("icons"), new IconImageProvider);
-}
-
-Q_EXPORT_PLUGIN2(UnityApplications, UnityApplicationsPlugin);

=== removed file 'launcher/UnityApplications/plugin.h'
--- launcher/UnityApplications/plugin.h	2011-03-09 13:23:04 +0000
+++ launcher/UnityApplications/plugin.h	1970-01-01 00:00:00 +0000
@@ -1,32 +0,0 @@
-/*
- * Copyright (C) 2010-2011 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/>.
- */
-
-#ifndef UNITYAPPLICATIONSPLUGIN_H
-#define UNITYAPPLICATIONSPLUGIN_H
-
-#include <QtDeclarative/QDeclarativeExtensionPlugin>
-
-class UnityApplicationsPlugin : public QDeclarativeExtensionPlugin
-{
-    Q_OBJECT
-
-public:
-    void registerTypes(const char *uri);
-    void initializeEngine(QDeclarativeEngine *engine, const char *uri);
-};
-
-
-#endif // UNITYAPPLICATIONSPLUGIN_H

=== removed file 'launcher/UnityApplications/qmldir'
--- launcher/UnityApplications/qmldir	2010-09-02 13:59:13 +0000
+++ launcher/UnityApplications/qmldir	1970-01-01 00:00:00 +0000
@@ -1,1 +0,0 @@
-plugin UnityApplications

=== modified file 'launcher/app/launcher.cpp'
--- launcher/app/launcher.cpp	2011-06-07 13:46:38 +0000
+++ launcher/app/launcher.cpp	2011-06-07 22:59:36 +0000
@@ -74,7 +74,7 @@
 
 int main(int argc, char *argv[])
 {
-    /* UnityApplications plugin uses GTK APIs to retrieve theme icons
+    /* Unity2d plugin uses GTK APIs to retrieve theme icons
        (gtk_icon_theme_get_default) and requires a call to gtk_init */
     gtk_init(&argc, &argv);
 

=== modified file 'launcher/app/launcherview.cpp'
--- launcher/app/launcherview.cpp	2011-06-07 13:46:38 +0000
+++ launcher/app/launcherview.cpp	2011-06-07 22:59:36 +0000
@@ -285,57 +285,6 @@
     }
 }
 
-/* Calculates both the background color and the glow color of a launcher tile
-   based on the colors in the specified icon (using the same algorithm as Unity).
-   The values are returned as list where the first item is the background color
-   and the second one is the glow color.
-*/
-QList<QVariant>
-LauncherView::getColorsFromIcon(QUrl source, QSize size) const
-{
-    QList<QVariant> colors;
-
-    // FIXME: we should find a way to avoid reloading the icon
-    QImage icon = engine()->imageProvider("icons")->requestImage(source.path().mid(1), &size, size);
-    if (icon.width() == 0 || icon.height() == 0) {
-        UQ_WARNING << "Unable to load icon in getColorsFromIcon from" << source;
-        return colors;
-    }
-
-    long int rtotal = 0, gtotal = 0, btotal = 0;
-    float total = 0.0f;
-
-    for (int y = 0; y < icon.height(); ++y) {
-        for (int x = 0; x < icon.width(); ++x) {
-            QColor color = QColor::fromRgba(icon.pixel(x, y));
-
-            float saturation = (qMax (color.red(), qMax (color.green(), color.blue())) -
-                                qMin (color.red(), qMin (color.green(), color.blue()))) / 255.0f;
-            float relevance = .1 + .9 * (color.alpha() / 255.0f) * saturation;
-
-            rtotal += (unsigned char) (color.red() * relevance);
-            gtotal += (unsigned char) (color.green() * relevance);
-            btotal += (unsigned char) (color.blue() * relevance);
-
-            total += relevance * 255;
-        }
-    }
-
-    QColor hsv = QColor::fromRgbF(rtotal / total, gtotal / total, btotal / total).toHsv();
-
-    /* Background color is the base color with 0.90f HSV value */
-    hsv.setHsvF(hsv.hueF(),
-                (hsv.saturationF() > .15f) ? 0.65f : hsv.saturationF(),
-                0.90f);
-    colors.append(QVariant::fromValue(hsv.toRgb()));
-
-    /* Glow color is the base color with 1.0f HSV value */
-    hsv.setHsvF(hsv.hueF(), hsv.saturationF(), 1.0f);
-    colors.append(QVariant::fromValue(hsv.toRgb()));
-
-    return colors;
-}
-
 void
 LauncherView::showCommandsPlace()
 {

=== modified file 'launcher/app/launcherview.h'
--- launcher/app/launcherview.h	2011-05-08 13:48:10 +0000
+++ launcher/app/launcherview.h	2011-06-07 22:59:36 +0000
@@ -40,7 +40,6 @@
 
 public:
     explicit LauncherView(QWidget* parent = NULL);
-    Q_INVOKABLE QList<QVariant> getColorsFromIcon(QUrl source, QSize size) const;
     Q_INVOKABLE void onDragEnter(DeclarativeDragDropEvent* event);
     Q_INVOKABLE void onDrop(DeclarativeDragDropEvent* event);
 

=== modified file 'launcher/tests/CMakeLists.txt'
--- launcher/tests/CMakeLists.txt	2011-02-23 17:03:50 +0000
+++ launcher/tests/CMakeLists.txt	2011-06-07 22:59:36 +0000
@@ -7,7 +7,6 @@
         target_link_libraries(${_test}
             ${QT_QTTEST_LIBRARIES}
             uqlauncher
-            UnityApplications
             )
         set(_test_list "${_test_list};${_test}")
     endforeach(_test)
@@ -19,7 +18,6 @@
 
 include_directories(
     ${CMAKE_CURRENT_SOURCE_DIR}/../app
-    ${CMAKE_CURRENT_SOURCE_DIR}/../UnityApplications
     ${CMAKE_CURRENT_BINARY_DIR}
     ${QT_QTTEST_INCLUDE_DIR}
     ${QTGCONF_INCLUDE_DIRS}
@@ -28,7 +26,6 @@
 enable_testing()
 
 launcher_tests(
-    launchermenutest
     launcherviewtest
     )
 

=== modified file 'libunity-2d-private/Unity2d/CMakeLists.txt'
--- libunity-2d-private/Unity2d/CMakeLists.txt	2011-06-07 13:46:38 +0000
+++ libunity-2d-private/Unity2d/CMakeLists.txt	2011-06-07 22:59:36 +0000
@@ -2,6 +2,13 @@
 pkg_check_modules(WNCK REQUIRED libwnck-1.0)
 pkg_check_modules(QTBAMF REQUIRED libqtbamf)
 pkg_check_modules(QTGCONF REQUIRED libqtgconf)
+pkg_check_modules(QTDEE REQUIRED libqtdee)
+pkg_check_modules(DBUSMENUQT REQUIRED dbusmenu-qt)
+pkg_check_modules(GLIB REQUIRED glib-2.0)
+pkg_check_modules(GDK REQUIRED gdk-2.0)
+pkg_check_modules(GIO REQUIRED gio-2.0)
+pkg_check_modules(STARTUPNOTIFICATION REQUIRED libstartup-notification-1.0)
+pkg_check_modules(INDICATOR REQUIRED indicator)
 
 # Sources
 set(unity-2d-private-qml_SRCS
@@ -18,6 +25,23 @@
     dragitem.cpp
     dragitemwithurl.cpp
     dropitem.cpp
+    iconimageprovider.cpp
+    listaggregatormodel.cpp
+    launcheritem.cpp
+    launcherapplication.cpp
+    launcherapplicationslist.cpp
+    launcherapplicationslistdbus.cpp
+    launcherdevice.cpp
+    launcherdeviceslist.cpp
+    launcherutility.cpp
+    placeentry.cpp
+    place.cpp
+    launcherplaceslist.cpp
+    trash.cpp
+    launchermenu.cpp
+    webfavorite.cpp
+    workspaces.cpp
+    iconutilities.cpp
     )
 
 set(unity-2d-private-qml_MOC_HDRS
@@ -32,6 +56,22 @@
     dragitem.h
     dragitemwithurl.h
     dropitem.h
+    listaggregatormodel.h
+    launcheritem.h
+    launcherapplication.h
+    launcherapplicationslist.h
+    launcherapplicationslistdbus.h
+    launcherdevice.h
+    launcherdeviceslist.h
+    launcherutility.h
+    placeentry.h
+    place.h
+    launcherplaceslist.h
+    trash.h
+    launchermenu.h
+    webfavorite.h
+    workspaces.h
+    iconutilities.h
     )
 
 file(GLOB unity-2d-private-qml_QML *.qml)
@@ -40,13 +80,20 @@
 
 # Build
 add_library(unity-2d-private-qml SHARED ${unity-2d-private-qml_SRCS} ${unity-2d-private-qml_MOC_SRCS})
-add_definitions(-DWNCK_I_KNOW_THIS_IS_UNSTABLE)
+add_definitions(-DWNCK_I_KNOW_THIS_IS_UNSTABLE -DSN_API_NOT_YET_FROZEN)
 
 include_directories(
     ${CMAKE_CURRENT_BINARY_DIR}
     ${WNCK_INCLUDE_DIRS}
     ${QTBAMF_INCLUDE_DIRS}
     ${QTGCONF_INCLUDE_DIRS}
+    ${QTDEE_INCLUDE_DIRS}
+    ${DBUSMENUQT_INCLUDE_DIRS}
+    ${GLIB_INCLUDE_DIRS}
+    ${GDK_INCLUDE_DIRS}
+    ${GIO_INCLUDE_DIRS}
+    ${STARTUPNOTIFICATION_INCLUDE_DIRS}
+    ${INDICATOR_INCLUDE_DIRS}
     ${libunity-2d-private_SOURCE_DIR}/src
     )
 
@@ -54,9 +101,18 @@
     ${QT_QTCORE_LIBRARIES}
     ${QT_QTDBUS_LIBRARIES}
     ${QT_QTDECLARATIVE_LIBRARIES}
+    ${QT_QTGUI_LIBRARIES}
+    ${QT_QTNETWORK_LIBRARIES}
     ${WNCK_LDFLAGS}
     ${QTBAMF_LDFLAGS}
     ${QTGCONF_LDFLAGS}
+    ${QTDEE_LDFLAGS}
+    ${DBUSMENUQT_LDFLAGS}
+    ${GLIB_LDFLAGS}
+    ${GDK_LDFLAGS}
+    ${GIO_LDFLAGS}
+    ${STARTUPNOTIFICATION_LDFLAGS}
+    ${INDICATOR_LDFLAGS}
     unity-2d-private
     )
 

=== renamed file 'launcher/UnityApplications/iconimageprovider.cpp' => 'libunity-2d-private/Unity2d/iconimageprovider.cpp'
=== renamed file 'launcher/UnityApplications/iconimageprovider.h' => 'libunity-2d-private/Unity2d/iconimageprovider.h'
=== added file 'libunity-2d-private/Unity2d/iconutilities.cpp'
--- libunity-2d-private/Unity2d/iconutilities.cpp	1970-01-01 00:00:00 +0000
+++ libunity-2d-private/Unity2d/iconutilities.cpp	2011-06-07 22:59:36 +0000
@@ -0,0 +1,82 @@
+/*
+ * Copyright (C) 2011 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/>.
+ */
+
+#include "iconutilities.h"
+
+// libunity-2d
+#include <debug_p.h>
+
+// Qt
+#include <QImage>
+#include <QDeclarativeEngine>
+#include <QDeclarativeContext>
+#include <QDeclarativeImageProvider>
+
+IconUtilities::IconUtilities(QObject *parent) : QObject(parent)
+{
+}
+
+/* Calculates both the background color and the glow color of a launcher tile
+   based on the colors in the specified icon (using the same algorithm as Unity).
+   The values are returned as list where the first item is the background color
+   and the second one is the glow color.
+*/
+QList<QVariant>
+IconUtilities::getColorsFromIcon(QUrl source, QSize size) const
+{
+    QList<QVariant> colors;
+
+    // FIXME: we should find a way to avoid reloading the icon
+    QDeclarativeEngine *engine = QDeclarativeEngine::contextForObject(this)->engine();
+    QImage icon = engine->imageProvider("icons")->requestImage(source.path().mid(1), &size, size);
+    if (icon.width() == 0 || icon.height() == 0) {
+        UQ_WARNING << "Unable to load icon in getColorsFromIcon from" << source;
+        return colors;
+    }
+
+    long int rtotal = 0, gtotal = 0, btotal = 0;
+    float total = 0.0f;
+
+    for (int y = 0; y < icon.height(); ++y) {
+        for (int x = 0; x < icon.width(); ++x) {
+            QColor color = QColor::fromRgba(icon.pixel(x, y));
+
+            float saturation = (qMax (color.red(), qMax (color.green(), color.blue())) -
+                                qMin (color.red(), qMin (color.green(), color.blue()))) / 255.0f;
+            float relevance = .1 + .9 * (color.alpha() / 255.0f) * saturation;
+
+            rtotal += (unsigned char) (color.red() * relevance);
+            gtotal += (unsigned char) (color.green() * relevance);
+            btotal += (unsigned char) (color.blue() * relevance);
+
+            total += relevance * 255;
+        }
+    }
+
+    QColor hsv = QColor::fromRgbF(rtotal / total, gtotal / total, btotal / total).toHsv();
+
+    /* Background color is the base color with 0.90f HSV value */
+    hsv.setHsvF(hsv.hueF(),
+                (hsv.saturationF() > .15f) ? 0.65f : hsv.saturationF(),
+                0.90f);
+    colors.append(QVariant::fromValue(hsv.toRgb()));
+
+    /* Glow color is the base color with 1.0f HSV value */
+    hsv.setHsvF(hsv.hueF(), hsv.saturationF(), 1.0f);
+    colors.append(QVariant::fromValue(hsv.toRgb()));
+
+    return colors;
+}

=== added file 'libunity-2d-private/Unity2d/iconutilities.h'
--- libunity-2d-private/Unity2d/iconutilities.h	1970-01-01 00:00:00 +0000
+++ libunity-2d-private/Unity2d/iconutilities.h	2011-06-07 22:59:36 +0000
@@ -0,0 +1,35 @@
+/*
+ * Copyright (C) 2011 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/>.
+ */
+
+#ifndef ICONUTILITIES_H
+#define ICONUTILITIES_H
+
+#include <QObject>
+#include <QUrl>
+#include <QSize>
+#include <QVariant>
+
+class IconUtilities : public QObject
+{
+    Q_OBJECT
+
+public :
+    explicit IconUtilities(QObject *parent = 0);
+
+    Q_INVOKABLE QList<QVariant> getColorsFromIcon(QUrl source, QSize size) const;
+};
+
+#endif // ICONUTILITIES_H

=== renamed file 'launcher/UnityApplications/launcherapplication.cpp' => 'libunity-2d-private/Unity2d/launcherapplication.cpp'
=== renamed file 'launcher/UnityApplications/launcherapplication.h' => 'libunity-2d-private/Unity2d/launcherapplication.h'
=== renamed file 'launcher/UnityApplications/launcherapplicationslist.cpp' => 'libunity-2d-private/Unity2d/launcherapplicationslist.cpp'
=== renamed file 'launcher/UnityApplications/launcherapplicationslist.h' => 'libunity-2d-private/Unity2d/launcherapplicationslist.h'
=== renamed file 'launcher/UnityApplications/launcherapplicationslistdbus.cpp' => 'libunity-2d-private/Unity2d/launcherapplicationslistdbus.cpp'
=== renamed file 'launcher/UnityApplications/launcherapplicationslistdbus.h' => 'libunity-2d-private/Unity2d/launcherapplicationslistdbus.h'
=== renamed file 'launcher/UnityApplications/launcherdevice.cpp' => 'libunity-2d-private/Unity2d/launcherdevice.cpp'
=== renamed file 'launcher/UnityApplications/launcherdevice.h' => 'libunity-2d-private/Unity2d/launcherdevice.h'
=== renamed file 'launcher/UnityApplications/launcherdeviceslist.cpp' => 'libunity-2d-private/Unity2d/launcherdeviceslist.cpp'
=== renamed file 'launcher/UnityApplications/launcherdeviceslist.h' => 'libunity-2d-private/Unity2d/launcherdeviceslist.h'
=== renamed file 'launcher/UnityApplications/launcheritem.cpp' => 'libunity-2d-private/Unity2d/launcheritem.cpp'
=== renamed file 'launcher/UnityApplications/launcheritem.h' => 'libunity-2d-private/Unity2d/launcheritem.h'
=== renamed file 'launcher/UnityApplications/launchermenu.cpp' => 'libunity-2d-private/Unity2d/launchermenu.cpp'
=== renamed file 'launcher/UnityApplications/launchermenu.h' => 'libunity-2d-private/Unity2d/launchermenu.h'
=== renamed file 'launcher/UnityApplications/launcherplaceslist.cpp' => 'libunity-2d-private/Unity2d/launcherplaceslist.cpp'
=== renamed file 'launcher/UnityApplications/launcherplaceslist.h' => 'libunity-2d-private/Unity2d/launcherplaceslist.h'
=== renamed file 'launcher/UnityApplications/launcherutility.cpp' => 'libunity-2d-private/Unity2d/launcherutility.cpp'
=== renamed file 'launcher/UnityApplications/launcherutility.h' => 'libunity-2d-private/Unity2d/launcherutility.h'
=== renamed file 'launcher/UnityApplications/listaggregatormodel.cpp' => 'libunity-2d-private/Unity2d/listaggregatormodel.cpp'
=== renamed file 'launcher/UnityApplications/listaggregatormodel.h' => 'libunity-2d-private/Unity2d/listaggregatormodel.h'
=== renamed file 'launcher/UnityApplications/place.cpp' => 'libunity-2d-private/Unity2d/place.cpp'
=== renamed file 'launcher/UnityApplications/place.h' => 'libunity-2d-private/Unity2d/place.h'
=== renamed file 'launcher/UnityApplications/placeentry.cpp' => 'libunity-2d-private/Unity2d/placeentry.cpp'
=== renamed file 'launcher/UnityApplications/placeentry.h' => 'libunity-2d-private/Unity2d/placeentry.h'
=== modified file 'libunity-2d-private/Unity2d/plugin.cpp'
--- libunity-2d-private/Unity2d/plugin.cpp	2011-05-18 15:47:16 +0000
+++ libunity-2d-private/Unity2d/plugin.cpp	2011-06-07 22:59:36 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2010 Canonical, Ltd.
+ * Copyright (C) 2010-2011 Canonical, Ltd.
  *
  * Authors:
  *  Florian Boucault <[e-mail]>
@@ -20,8 +20,23 @@
 /* Required otherwise using wnck_set_client_type breaks linking with error:
    undefined reference to `wnck_set_client_type(WnckClientType)'
 */
+extern "C" {
+#include <libwnck/util.h>
+}
+
 #include "plugin.h"
 
+#include "launcherapplication.h"
+#include "place.h"
+#include "placeentry.h"
+#include "launcherdevice.h"
+#include "trash.h"
+#include "workspaces.h"
+#include "listaggregatormodel.h"
+#include "launcherapplicationslist.h"
+#include "launcherdeviceslist.h"
+#include "launcherplaceslist.h"
+#include "iconimageprovider.h"
 #include "blendedimageprovider.h"
 #include "cacheeffect.h"
 #include "qsortfilterproxymodelqml.h"
@@ -31,6 +46,7 @@
 #include "screeninfo.h"
 #include "plugin.h"
 #include "cacheeffect.h"
+#include "iconutilities.h"
 
 #include "mimedata.h"
 #include "dragdropevent.h"
@@ -41,11 +57,9 @@
 #include <QDeclarativeEngine>
 #include <QDeclarativeContext>
 #include <QGraphicsEffect>
+#include <QAbstractListModel>
 
 #undef signals
-extern "C" {
-#include <libwnck/util.h>
-}
 
 #include <X11/Xlib.h>
 
@@ -81,6 +95,29 @@
     qmlRegisterType<DeclarativeDropItem>(uri, 0, 1, "DropItem");
     qmlRegisterType<DeclarativeMimeData>();
     qmlRegisterType<DeclarativeDragDropEvent>();
+
+    qmlRegisterType<ListAggregatorModel>(uri, 0, 1, "ListAggregatorModel");
+
+    qmlRegisterType<LauncherApplicationsList>(uri, 0, 1, "LauncherApplicationsList");
+    qmlRegisterType<LauncherApplication>(uri, 0, 1, "LauncherApplication");
+
+    qmlRegisterType<LauncherPlacesList>(uri, 0, 1, "LauncherPlacesList");
+    qmlRegisterType<Place>(uri, 0, 1, "Place");
+    qmlRegisterType<PlaceEntry>(uri, 0, 1, "PlaceEntry");
+    /* DeeListModel is exposed to QML by PlaceEntry */
+    qmlRegisterType<DeeListModel>(uri, 0, 1, "DeeListModel");
+
+    qmlRegisterType<LauncherDevicesList>(uri, 0, 1, "LauncherDevicesList");
+    qmlRegisterType<LauncherDevice>(uri, 0, 1, "LauncherDevice");
+
+    qmlRegisterType<Trashes>(uri, 0, 1, "Trashes");
+    qmlRegisterType<Trash>(uri, 0, 1, "Trash");
+
+    qmlRegisterType<WorkspacesList>(uri, 0, 1, "WorkspacesList");
+    qmlRegisterType<Workspaces>(uri, 0, 1, "Workspaces");
+
+    qmlRegisterType<IconUtilities>(uri, 0, 1, "IconUtilities");
+
 }
 
 void Unity2dPlugin::initializeEngine(QDeclarativeEngine *engine, const char *uri)
@@ -91,6 +128,7 @@
 
     engine->addImageProvider(QString("blended"), new BlendedImageProvider);
     engine->addImageProvider(QString("window"), new WindowImageProvider);
+    engine->addImageProvider(QString("icons"), new IconImageProvider);
 
     /* ScreenInfo is exposed as a context property as it's a singleton and therefore
        not creatable directly in QML */

=== renamed file 'launcher/UnityApplications/trash.cpp' => 'libunity-2d-private/Unity2d/trash.cpp'
=== renamed file 'launcher/UnityApplications/trash.h' => 'libunity-2d-private/Unity2d/trash.h'
=== renamed file 'launcher/UnityApplications/webfavorite.cpp' => 'libunity-2d-private/Unity2d/webfavorite.cpp'
=== renamed file 'launcher/UnityApplications/webfavorite.h' => 'libunity-2d-private/Unity2d/webfavorite.h'
=== renamed file 'launcher/UnityApplications/workspaces.cpp' => 'libunity-2d-private/Unity2d/workspaces.cpp'
=== renamed file 'launcher/UnityApplications/workspaces.h' => 'libunity-2d-private/Unity2d/workspaces.h'
=== modified file 'libunity-2d-private/tests/CMakeLists.txt'
--- libunity-2d-private/tests/CMakeLists.txt	2011-03-16 15:51:49 +0000
+++ libunity-2d-private/tests/CMakeLists.txt	2011-06-07 22:59:36 +0000
@@ -3,6 +3,7 @@
 
 include_directories(
     ${libunity-2d-private_SOURCE_DIR}/src
+    ${libunity-2d-private_SOURCE_DIR}/Unity2d
     ${CMAKE_CURRENT_BINARY_DIR}
     ${QT_QTTEST_INCLUDE_DIR}
     )
@@ -21,6 +22,7 @@
         target_link_libraries(${_test}
             ${QT_QTTEST_LIBRARIES}
             unity-2d-private
+            unity-2d-private-qml
             )
         set(_test_list "${_test_list};${_test}")
     endforeach(_test)
@@ -34,6 +36,7 @@
     keyboardmodifiersmonitortest
     paneltest
     unity2dtrtest
+    launchermenutest
     )
 
 add_custom_target(unity2dtr_po COMMAND

=== renamed file 'launcher/tests/launchermenutest.cpp' => 'libunity-2d-private/tests/launchermenutest.cpp'
=== modified file 'places/Home.qml'
--- places/Home.qml	2011-05-19 12:05:17 +0000
+++ places/Home.qml	2011-06-07 22:59:36 +0000
@@ -17,8 +17,7 @@
  */
 
 import Qt 4.7
-import UnityApplications 1.0 /* Necessary for the ImageProvider serving image://icons/theme_name/icon_name */
-import Unity2d 1.0 /* Necessary for SortFilterProxyModel */
+import Unity2d 1.0 /* Necessary for SortFilterProxyModel and for the ImageProvider serving image://icons/theme_name/icon_name */
 import Places 1.0 /* Necessary for DashDeclarativeView.*Dash */
 
 Item {

=== modified file 'places/HomeButtonApplication.qml'
--- places/HomeButtonApplication.qml	2011-03-30 10:45:39 +0000
+++ places/HomeButtonApplication.qml	2011-06-07 22:59:36 +0000
@@ -21,7 +21,7 @@
    - ImageProvider serving image://icons/theme_name/icon_name
    - LauncherApplication
 */
-import UnityApplications 1.0
+import Unity2d 1.0
 import gconf 1.0
 
 HomeButton {

=== modified file 'places/HomeShortcuts.qml'
--- places/HomeShortcuts.qml	2011-04-06 14:51:19 +0000
+++ places/HomeShortcuts.qml	2011-06-07 22:59:36 +0000
@@ -17,7 +17,7 @@
  */
 
 import Qt 4.7
-import UnityApplications 1.0 /* Necessary for the ImageProvider serving image://icons/theme_name/icon_name */
+import Unity2d 1.0 /* Necessary for the ImageProvider serving image://icons/theme_name/icon_name */
 
 Flow {
     anchors.fill: parent

=== modified file 'places/RendererGrid.qml'
--- places/RendererGrid.qml	2011-05-18 16:04:47 +0000
+++ places/RendererGrid.qml	2011-06-07 22:59:36 +0000
@@ -17,7 +17,7 @@
  */
 
 import Qt 4.7
-import UnityApplications 1.0 /* Necessary for the ImageProvider serving image://icons */
+import Unity2d 1.0 /* Necessary for the ImageProvider serving image://icons */
 
 /* Renderers typically use a grid layout to render the model. The RendererGrid
    component provides a standard implementation of such a layout where the

=== modified file 'places/app/places.cpp'
--- places/app/places.cpp	2011-06-06 09:23:48 +0000
+++ places/app/places.cpp	2011-06-07 22:59:36 +0000
@@ -81,9 +81,6 @@
     view.engine()->setBaseUrl(QUrl::fromLocalFile(unity2dDirectory() + "/places/"));
 
     if (!isRunningInstalled()) {
-        /* Place.qml imports UnityApplications, which is part of the launcher
-           component… */
-        view.engine()->addImportPath(unity2dDirectory() + "/launcher/");
         /* Place.qml imports Unity2d */
         view.engine()->addImportPath(unity2dDirectory() + "/libunity-2d-private/");
     }

=== modified file 'places/dash.qml'
--- places/dash.qml	2011-05-26 11:44:11 +0000
+++ places/dash.qml	2011-06-07 22:59:36 +0000
@@ -17,9 +17,8 @@
  */
 
 import Qt 4.7
-import UnityApplications 1.0 /* Necessary for LauncherPlacesList */
 import Places 1.0 /* Necessary for DashDeclarativeView.*Dash */
-import Unity2d 1.0 /* Necessary for GnomeBackground */
+import Unity2d 1.0 /* Necessary for GnomeBackground and LauncherPlacesList*/
 
 Item {
     id: dash

=== modified file 'po/unity-2d.pot'
--- po/unity-2d.pot	2011-04-06 21:14:07 +0000
+++ po/unity-2d.pot	2011-06-07 22:59:36 +0000
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: unity-2d\n"
 "Report-Msgid-Bugs-To: https://bugs.launchpad.net/unity-2d/+filebug\n"
-"POT-Creation-Date: 2011-04-06 23:13+0200\n"
+"POT-Creation-Date: 2011-06-07 18:21+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <[e-mail]>\n"
@@ -18,90 +18,94 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
 
-#: places/SearchRefine.qml:61
-msgid "Refine search"
-msgstr ""
-
-#: places/SearchRefine.qml:84
-msgid "Type"
-msgstr ""
-
-#: places/GroupHeader.qml:86
+#: places/GroupHeader.qml:88
+msgid "See one more result"
+msgstr ""
+
+#: places/GroupHeader.qml:90
 #, qt-format
 msgid "See %1 more results"
 msgstr ""
 
-#: places/GroupHeader.qml:86
+#: places/GroupHeader.qml:93
 msgid "See fewer results"
 msgstr ""
 
-#: places/Home.qml:80
-msgid "Shortcuts"
-msgstr ""
-
-#: places/Home.qml:193
+#: places/HomeShortcuts.qml:32
 msgid "Media Apps"
 msgstr ""
 
-#: places/Home.qml:199
+#: places/HomeShortcuts.qml:38
 msgid "Internet Apps"
 msgstr ""
 
-#: places/Home.qml:205
+#: places/HomeShortcuts.qml:44
 msgid "More Apps"
 msgstr ""
 
-#: places/Home.qml:211
+#: places/HomeShortcuts.qml:50
 msgid "Find Files"
 msgstr ""
 
-#: places/Home.qml:218
+#: places/HomeShortcuts.qml:57
 msgid "Browse the Web"
 msgstr ""
 
-#: places/Home.qml:223
+#: places/HomeShortcuts.qml:62
 msgid "View Photos"
 msgstr ""
 
-#: places/Home.qml:228
+#: places/HomeShortcuts.qml:67
 msgid "Check Email"
 msgstr ""
 
-#: places/Home.qml:233
+#: places/HomeShortcuts.qml:72
 msgid "Listen to Music"
 msgstr ""
 
-#: launcher/UnityApplications/trash.cpp:74
+#: places/Home.qml:79
+msgid "Shortcuts"
+msgstr ""
+
+#: places/SearchRefine.qml:61
+msgid "Refine search"
+msgstr ""
+
+#: places/SearchRefine.qml:84
+msgid "Type"
+msgstr ""
+
+#: libunity-2d-private/Unity2d/launcherdevice.cpp:238
+msgid "Eject"
+msgstr ""
+
+#: libunity-2d-private/Unity2d/trash.cpp:125
 msgid "Trash"
 msgstr ""
 
-#: launcher/UnityApplications/trash.cpp:200
+#: libunity-2d-private/Unity2d/trash.cpp:255
 #, c-format, qt-plural-format
 msgid "%n item in trash"
 msgid_plural "%n items in trash"
 msgstr[0] ""
 msgstr[1] ""
 
-#: launcher/UnityApplications/trash.cpp:207
+#: libunity-2d-private/Unity2d/trash.cpp:262
 msgid "Empty Trash"
 msgstr ""
 
-#: launcher/UnityApplications/launcherapplication.cpp:844
+#: libunity-2d-private/Unity2d/workspaces.cpp:73
+msgid "Workspaces"
+msgstr ""
+
+#: libunity-2d-private/Unity2d/launcherapplication.cpp:863
 msgid "Keep In Launcher"
 msgstr ""
 
-#: launcher/UnityApplications/launcherapplication.cpp:844
+#: libunity-2d-private/Unity2d/launcherapplication.cpp:863
 msgid "Remove From Launcher"
 msgstr ""
 
-#: launcher/UnityApplications/launcherapplication.cpp:851
+#: libunity-2d-private/Unity2d/launcherapplication.cpp:870
 msgid "Quit"
 msgstr ""
-
-#: launcher/UnityApplications/workspaces.cpp:70
-msgid "Workspaces"
-msgstr ""
-
-#: launcher/UnityApplications/launcherdevice.cpp:228
-msgid "Eject"
-msgstr ""

=== modified file 'spread/Windows.qml'
--- spread/Windows.qml	2011-04-19 14:11:36 +0000
+++ spread/Windows.qml	2011-06-07 22:59:36 +0000
@@ -18,7 +18,6 @@
 
 import Qt 4.7
 import "utils.js" as Utils
-import UnityApplications 1.0
 import Unity2d 1.0
 
 /* The main component that manages the windows.

=== modified file 'spread/app/spread.cpp'
--- spread/app/spread.cpp	2011-06-06 09:23:48 +0000
+++ spread/app/spread.cpp	2011-06-07 22:59:36 +0000
@@ -34,7 +34,7 @@
 
 int main(int argc, char *argv[])
 {
-    /* UnityApplications plugin uses GTK APIs to retrieve theme icons
+    /* Unity2d plugin uses GTK APIs to retrieve theme icons
        (gtk_icon_theme_get_default) and requires a call to gtk_init */
     gtk_init(&argc, &argv);
 
@@ -72,9 +72,6 @@
     view.engine()->setBaseUrl(QUrl::fromLocalFile(unity2dDirectory() + "/spread/"));
 
     if (!isRunningInstalled()) {
-        /* Spread.qml imports UnityApplications, which is part of the launcher
-           component */
-        view.engine()->addImportPath(unity2dDirectory() + "/launcher/");
         /* Spread.qml imports Unity2d */
         view.engine()->addImportPath(unity2dDirectory() + "/libunity-2d-private/");
     }