Merge lp:~uriboni/unity-2d/unity-2d-libunity2dprivate-util into lp:unity-2d/3.0

[Ugo Riboni]

[libunity2dprivate] Add a small singleton Util class where to add all otherwise unrelated utility functions. Replace ScreenInfo::currentTime with Util::currentTime.

Add to libunity2dprivate a small singleton class where to add all otherwise unrelated utility functions.
One of these is currentTime, which was previously living in ScreenInfo but clearly didn't belong there.
Therefore I removed it from ScreenInfo and fixed all the places where it was used to use the one from Util.

[Alberto Mardegan (mardy)]

Hi Ugo!
  There's some unused code in there: the scaleSize() method.
But I think we can do without this class at all, and just use Javascript's Date() class:
http://www.w3schools.com/jsref/jsref_gettime.asp

review: Needs Fixing

[Ugo Riboni (uriboni)]

The unused method is something I use in another project and Florian said he was ok having available in case unity-2d wanted to use it to simplify some calculations.

However considering your good tip about the JS functions, and the fact I can probably export that scale function in some other way, I think this MR is not worth it anymore and I'll cancel it.

I'll submit later the MR about using the JS funtions for currentTime.

Unmerged revisions

687. By Ugo Riboni on 2011-08-24

Remove currentTime from ScreenInfo and use the new currentTime from Util instead

686. By Ugo Riboni on 2011-08-24

Add a new singleton class where to collect miscellaneous utility methods.

=== modified file 'libunity-2d-private/Unity2d/plugin.cpp'
--- libunity-2d-private/Unity2d/plugin.cpp	2011-08-23 09:42:44 +0000
+++ libunity-2d-private/Unity2d/plugin.cpp	2011-08-24 11:24:23 +0000
@@ -54,6 +54,7 @@
 #include "dragitemwithurl.h"
 #include "dropitem.h"
 #include "launcherdropitem.h"
+#include "util.h"
 
 #include "config.h"
 
@@ -149,6 +150,7 @@
        not creatable directly in QML */
     engine->rootContext()->setContextProperty("screen", ScreenInfo::instance());
     engine->rootContext()->setContextProperty("iconUtilities", new IconUtilities(engine));
+    engine->rootContext()->setContextProperty("util", Util::instance());
 
     /* Critically important to set the client type to pager because wnck
        will pass that type over to the window manager through XEvents.

=== modified file 'libunity-2d-private/src/CMakeLists.txt'
--- libunity-2d-private/src/CMakeLists.txt	2011-08-16 10:40:14 +0000
+++ libunity-2d-private/src/CMakeLists.txt	2011-08-24 11:24:23 +0000
@@ -54,6 +54,7 @@
     launcherdropitem.cpp
     iconutilities.cpp
     panelapplet.cpp
+    util.cpp
     )
 
 # Build

=== modified file 'libunity-2d-private/src/screeninfo.cpp'
--- libunity-2d-private/src/screeninfo.cpp	2011-07-29 13:49:34 +0000
+++ libunity-2d-private/src/screeninfo.cpp	2011-08-24 11:24:23 +0000
@@ -61,14 +61,6 @@
     }
 }
 
-/* FIXME: This should be removed when we find a cleaner way to bypass the
-   QML Image cache. See SpreadWindow.qml and WindowImageProvider::requestImage
-   for details. */
-QString ScreenInfo::currentTime()
-{
-    return QString::number(time(NULL));
-}
-
 QRect ScreenInfo::availableGeometry() const
 {
     return QApplication::desktop()->availableGeometry(QX11Info::appScreen());

=== modified file 'libunity-2d-private/src/screeninfo.h'
--- libunity-2d-private/src/screeninfo.h	2011-07-29 13:49:34 +0000
+++ libunity-2d-private/src/screeninfo.h	2011-08-24 11:24:23 +0000
@@ -27,11 +27,6 @@
 public:
     static ScreenInfo* instance();
 
-    /* The following method doesn't strictly belong to a "screen" class
-       logically. It would be perhaps more appropriate to make an
-       "utility" class for it, but this will do for now. */
-    Q_INVOKABLE QString currentTime();
-
     /* Getters */
     WorkspacesInfo *workspaces() { return &m_workspacesInfo; }
     unsigned int activeWindow() const { return m_activeWindow; }

=== added file 'libunity-2d-private/src/util.cpp'
--- libunity-2d-private/src/util.cpp	1970-01-01 00:00:00 +0000
+++ libunity-2d-private/src/util.cpp	2011-08-24 11:24:23 +0000
@@ -0,0 +1,27 @@
+#include "util.h"
+#include <QDateTime>
+
+Util::Util(QObject *parent) :
+    QObject(parent)
+{
+}
+
+Util* Util::instance()
+{
+    static Util* singleton = new Util();
+    return singleton;
+}
+
+QSize Util::scaleSize(QSize original, QSize scaleTo)
+{
+    original.scale(scaleTo, Qt::KeepAspectRatio);
+    return original;
+}
+
+/* FIXME: This exists only to bypass the QML Image cache.
+   See WindowImageProvider::requestImage for details. */
+QString Util::currentTime() {
+    return QString::number(QDateTime::currentMSecsSinceEpoch());
+}
+
+#include "util.moc"

=== added file 'libunity-2d-private/src/util.h'
--- libunity-2d-private/src/util.h	1970-01-01 00:00:00 +0000
+++ libunity-2d-private/src/util.h	2011-08-24 11:24:23 +0000
@@ -0,0 +1,22 @@
+#ifndef UTIL_H
+#define UTIL_H
+
+#include <QObject>
+#include <QSize>
+
+class Util : public QObject
+{
+    Q_OBJECT
+
+private:
+    explicit Util(QObject *parent = 0);
+
+public:
+    static Util* instance();
+    
+    Q_INVOKABLE QSize scaleSize(QSize original, QSize scaleTo);
+    Q_INVOKABLE QString currentTime();
+
+};
+
+#endif // UTIL_H

=== modified file 'places/dash.qml'
--- places/dash.qml	2011-08-23 17:02:22 +0000
+++ places/dash.qml	2011-08-24 11:24:23 +0000
@@ -130,7 +130,7 @@
                 property variant timeAtActivation
                 Connections {
                     target: declarativeView
-                    onActiveChanged: blurredBackground.timeAtActivation = screen.currentTime()
+                    onActiveChanged: blurredBackground.timeAtActivation = util.currentTime()
                 }
 
                 /* Use an image of the root window which essentially is a

=== modified file 'spread/Window.qml'
--- spread/Window.qml	2011-06-23 17:08:53 +0000
+++ spread/Window.qml	2011-08-24 11:24:23 +0000
@@ -77,7 +77,7 @@
         */
         source: "image://window/" + windowInfo.decoratedXid + "|"
                                   + windowInfo.contentXid + "@"
-                                  + screen.currentTime()
+                                  + util.currentTime()
 
         /* Disabled during animations for performance reasons */
         smooth: !animating