1
=== modified file 'debian/control'
2
--- debian/control	2014-08-21 04:51:26 +0000
3
+++ debian/control	2014-08-27 13:55:30 +0000
4
@@ -27,7 +27,7 @@
5
27
               qtdeclarative5-doc-html,
27
               qtdeclarative5-doc-html,
6
28
               qtwebkit5-doc-html,
28
               qtwebkit5-doc-html,
7
29
               qtsvg5-doc-html,
29
               qtsvg5-doc-html,
9
30
               libqt5svg5,
30
               libqt5svg5-dev,
10
31
               qtscript5-doc-html,
31
               qtscript5-doc-html,
11
32
               qtmultimedia5-doc-html,
32
               qtmultimedia5-doc-html,
12
33
               unity-action-doc,
33
               unity-action-doc,
13
34
34
14
=== modified file 'modules/Ubuntu/Components/Icon10.qml'
15
--- modules/Ubuntu/Components/Icon10.qml	2014-07-31 14:14:56 +0000
16
+++ modules/Ubuntu/Components/Icon10.qml	2014-08-27 13:55:30 +0000
17
@@ -34,42 +34,14 @@
18
34
    Image {
34
    Image {
19
35
        id: image
35
        id: image
20
36
        objectName: "image"
36
        objectName: "image"
57
37
        anchors.fill: parent
37
        anchors { top: parent.top; bottom: parent.bottom }
58
38
38
        fillMode: Image.PreserveAspectFit;
59
39
        /* Necessary so that icons are not loaded before a size is set. */
39
        sourceSize.height: height
60
40
        source: ""
40
        source: {
61
41
        sourceSize {
41
            if (icon.name)
62
42
            width: 0
42
                return "image://theme/%1".arg(icon.name);
63
43
            height: 0
43
            else if (icon.hasOwnProperty("source"))
64
44
        }
44
                return icon.source;
29
45
30
46
        Component.onCompleted: update()
31
47
        onWidthChanged: update()
32
48
        onHeightChanged: update()
33
49
        Connections {
34
50
            target: icon
35
51
            ignoreUnknownSignals: true
36
52
            onNameChanged: image.update()
37
53
            onSourceChanged: image.update()
38
54
        }
39
55
40
56
        function update() {
41
57
            // only set sourceSize.width, sourceSize.height and source when
42
58
            // icon dimensions are valid, see bug #1349769.
43
59
            if (width > 0 && height > 0
44
60
                    && (icon.name || (icon.hasOwnProperty("source") && icon.source))) {
45
61
                sourceSize.width = width;
46
62
                sourceSize.height = height;
47
63
                if (icon.hasOwnProperty("source")) {
48
64
                    source = icon.source;
49
65
                } else {
50
66
                    source = "image://theme/%1".arg(icon.name);
51
67
                }
52
68
            } else {
53
69
                source = "";
54
70
                sourceSize.width = 0;
55
71
                sourceSize.height = 0;
56
72
            }
65
73
        }
45
        }
66
74
46
67
75
        cache: true
47
        cache: true
68
76
48
69
=== modified file 'modules/Ubuntu/Components/plugin/plugin.pro'
70
--- modules/Ubuntu/Components/plugin/plugin.pro	2014-08-20 13:03:13 +0000
71
+++ modules/Ubuntu/Components/plugin/plugin.pro	2014-08-27 13:55:30 +0000
72
@@ -5,7 +5,11 @@
73
5
5
74
6
TEMPLATE = lib
6
TEMPLATE = lib
75
7
TARGET = ../UbuntuComponents
7
TARGET = ../UbuntuComponents
76
8
<<<<<<< TREE
77
8
QT += core-private qml qml-private quick quick-private gui-private dbus
9
QT += core-private qml qml-private quick quick-private gui-private dbus
78
10
=======
79
11
QT += core-private qml qml-private quick quick-private dbus svg
80
12
>>>>>>> MERGE-SOURCE
81
9
13
82
10
equals(QT_MAJOR_VERSION, 5):lessThan(QT_MINOR_VERSION, 2) {
14
equals(QT_MAJOR_VERSION, 5):lessThan(QT_MINOR_VERSION, 2) {
83
11
    QT += v8-private
15
    QT += v8-private
84
12
16
85
=== modified file 'modules/Ubuntu/Components/plugin/unitythemeiconprovider.cpp'
86
--- modules/Ubuntu/Components/plugin/unitythemeiconprovider.cpp	2014-03-17 14:24:12 +0000
87
+++ modules/Ubuntu/Components/plugin/unitythemeiconprovider.cpp	2014-08-27 13:55:30 +0000
88
@@ -1,5 +1,5 @@
89
1
/*
1
/*
91
2
 * Copyright 2013 Canonical Ltd.
2
 * Copyright 2014 Canonical Ltd.
92
3
 *
3
 *
93
4
 * This program is free software; you can redistribute it and/or modify
4
 * This program is free software; you can redistribute it and/or modify
94
5
 * it under the terms of the GNU Lesser General Public License as published by
5
 * it under the terms of the GNU Lesser General Public License as published by
95
@@ -18,35 +18,234 @@
96
18
18
97
19
#include "unitythemeiconprovider.h"
19
#include "unitythemeiconprovider.h"
98
20
20
100
21
#include <QIcon>
21
#include <QDir>
101
22
#include <QFileInfo>
102
23
#include <QSettings>
103
24
#include <QSvgRenderer>
104
25
#include <QPainter>
105
26
#include <QtDebug>
106
27
107
28
class IconTheme
108
29
{
109
30
public:
110
31
    // Returns the icon theme named @name, creating it if it didn't exist yet.
111
32
    static QSharedPointer<IconTheme> get(const QString &name)
112
33
    {
113
34
        static QHash<QString, QSharedPointer<IconTheme> > themes;
114
35
115
36
        QSharedPointer<IconTheme> theme = themes[name];
116
37
        if (theme.isNull()) {
117
38
            theme = QSharedPointer<IconTheme>(new IconTheme(name));
118
39
            themes[name] = theme;
119
40
        }
120
41
121
42
        return theme;
122
43
    }
123
44
124
45
    // Does a breadth-first search for an icon with any name in @names. Parent
125
46
    // themes are only looked at if the current theme doesn't contain any icon
126
47
    // in @names.
127
48
    QPixmap findBestIcon(const QStringList &names, int size)
128
49
    {
129
50
        Q_FOREACH(const QString &name, names) {
130
51
            QPixmap pixmap = lookupIcon(name, size);
131
52
            if (!pixmap.isNull())
132
53
                return pixmap;
133
54
        }
134
55
135
56
        Q_FOREACH(QSharedPointer<IconTheme> theme, parents) {
136
57
            QPixmap pixmap = theme->findBestIcon(names, size);
137
58
            if (!pixmap.isNull())
138
59
                return pixmap;
139
60
        }
140
61
141
62
        return QPixmap();
142
63
    }
143
64
144
65
private:
145
66
    enum SizeType { Fixed, Scalable, Threshold };
146
67
147
68
    struct Directory {
148
69
        QString path;
149
70
        SizeType sizeType;
150
71
        int size, minSize, maxSize, threshold;
151
72
    };
152
73
153
74
    IconTheme(const QString &name): name(name)
154
75
    {
155
76
        Q_FOREACH(const QByteArray &baseDir, qgetenv("XDG_DATA_DIRS").split(':')) {
156
77
            QDir dir(baseDir + "/icons/" + name);
157
78
            if (dir.exists())
158
79
                baseDirs.append(dir.absolutePath());
159
80
        }
160
81
161
82
        Q_FOREACH(const QString &baseDir, baseDirs) {
162
83
            QString filename = baseDir + "/index.theme";
163
84
            if (QFileInfo::exists(filename)) {
164
85
                QSettings settings(filename, QSettings::IniFormat);
165
86
166
87
                Q_FOREACH(const QString &path, settings.value("Icon Theme/Directories").toStringList()) {
167
88
                    Directory dir;
168
89
                    dir.path = path;
169
90
                    dir.sizeType = sizeTypeFromString(settings.value(path + "/Type", "Fixed").toString());
170
91
                    dir.size = settings.value(path + "/Size", 32).toInt();
171
92
                    dir.minSize = settings.value(path + "/MinSize", 0).toInt();
172
93
                    dir.maxSize = settings.value(path + "/MaxSize", 0).toInt();
173
94
                    dir.threshold = settings.value(path + "/Threshold", 0).toInt();
174
95
                    directories.append(dir);
175
96
                }
176
97
177
98
                Q_FOREACH(const QString &name, settings.value("Icon Theme/Inherits").toStringList())
178
99
                    parents.append(IconTheme::get(name));
179
100
180
101
                // there can only be one index.theme
181
102
                break;
182
103
            }
183
104
        }
184
105
    }
185
106
186
107
    SizeType sizeTypeFromString(const QString &string)
187
108
    {
188
109
        if (string == "Fixed")
189
110
            return Fixed;
190
111
        if (string == "Scalable")
191
112
            return Scalable;
192
113
        if (string == "Threshold")
193
114
            return Threshold;
194
115
        qWarning() << "IconTheme: unknown size type '" << string << "'. Assuming 'Fixed'.";
195
116
        return Fixed;
196
117
    }
197
118
198
119
    static QPixmap loadIcon(const QString &filename, int size)
199
120
    {
200
121
        QPixmap pixmap;
201
122
202
123
        if (filename.endsWith(".png")) {
203
124
            pixmap = QPixmap(filename);
204
125
            if (!pixmap.isNull() && size > 0 && (pixmap.width() != size || pixmap.height() != size))
205
126
                pixmap = pixmap.scaled(size, size, Qt::KeepAspectRatioByExpanding);
206
127
        }
207
128
        else if (filename.endsWith(".svg")) {
208
129
            QSvgRenderer renderer(filename);
209
130
            pixmap = QPixmap(renderer.defaultSize().scaled(size, size, Qt::KeepAspectRatioByExpanding));
210
131
            pixmap.fill(Qt::transparent);
211
132
            QPainter painter(&pixmap);
212
133
            renderer.render(&painter);
213
134
            painter.end();
214
135
        }
215
136
216
137
        return pixmap;
217
138
    }
218
139
219
140
    QString lookupIconFile(const QString &dir, const QString &name)
220
141
    {
221
142
        QString png = QString("%1/%2.png").arg(dir).arg(name);
222
143
        QString svg = QString("%1/%2.svg").arg(dir).arg(name);
223
144
224
145
        Q_FOREACH(const QString &baseDir, baseDirs) {
225
146
            QString filename = baseDir + "/" + png;
226
147
            if (QFileInfo::exists(filename))
227
148
                return filename;
228
149
229
150
            filename = baseDir + "/" + svg;
230
151
            if (QFileInfo::exists(filename))
231
152
                return filename;
232
153
        }
233
154
234
155
        return QString();
235
156
    }
236
157
237
158
    QPixmap lookupIcon(const QString &iconName, int size)
238
159
    {
239
160
        if (size > 0)
240
161
            return lookupBestMatchingIcon(iconName, size);
241
162
        else
242
163
            return lookupLargestIcon(iconName);
243
164
    }
244
165
245
166
    QPixmap lookupBestMatchingIcon(const QString &iconName, int size)
246
167
    {
247
168
        int minDistance = 10000;
248
169
        QString bestFilename;
249
170
250
171
        Q_FOREACH(const Directory &dir, directories) {
251
172
            int dist = directorySizeDistance(dir, size);
252
173
            if (dist >= minDistance)
253
174
                continue;
254
175
255
176
            QString filename = lookupIconFile(dir.path, iconName);
256
177
            if (!filename.isNull()) {
257
178
                minDistance = dist;
258
179
                bestFilename = filename;
259
180
260
181
                // bail out early if we can't get a better size match
261
182
                if (minDistance == 0)
262
183
                    break;
263
184
            }
264
185
        }
265
186
266
187
        if (!bestFilename.isNull())
267
188
            return loadIcon(bestFilename, size);
268
189
269
190
        return QPixmap();
270
191
    }
271
192
272
193
    QPixmap lookupLargestIcon(const QString &iconName)
273
194
    {
274
195
        int maxSize = 0;
275
196
        QString bestFilename;
276
197
277
198
        Q_FOREACH(const Directory &dir, directories) {
278
199
            int size = dir.sizeType == Scalable ? dir.maxSize : dir.size;
279
200
            if (size < maxSize)
280
201
                continue;
281
202
282
203
            QString filename = lookupIconFile(dir.path, iconName);
283
204
            if (!filename.isNull()) {
284
205
                maxSize = size;
285
206
                bestFilename = filename;
286
207
            }
287
208
        }
288
209
289
210
        if (!bestFilename.isNull())
290
211
            return loadIcon(bestFilename, maxSize);
291
212
292
213
        return QPixmap();
293
214
    }
294
215
295
216
    int directorySizeDistance(const Directory &dir, int size)
296
217
    {
297
218
        switch (dir.sizeType) {
298
219
            case Fixed:
299
220
                return qAbs(size - dir.size);
300
221
301
222
            case Scalable:
302
223
                return qAbs(size - qBound(dir.minSize, size, dir.maxSize));
303
224
304
225
            case Threshold:
305
226
                return qAbs(size - qBound(dir.size - dir.threshold, size, dir.size + dir.threshold));
306
227
307
228
            default:
308
229
                return 10000;
309
230
        }
310
231
    }
311
232
312
233
    QString name;
313
234
    QStringList baseDirs;
314
235
    QList<Directory> directories;
315
236
    QList<QSharedPointer<IconTheme> > parents;
316
237
};
317
22
238
318
23
UnityThemeIconProvider::UnityThemeIconProvider():
239
UnityThemeIconProvider::UnityThemeIconProvider():
319
24
  QQuickImageProvider(QQuickImageProvider::Pixmap)
240
  QQuickImageProvider(QQuickImageProvider::Pixmap)
320
25
{
241
{
322
26
    QIcon::setThemeName("suru");
242
    theme = IconTheme::get("suru");
323
27
}
243
}
324
28
244
326
29
QPixmap UnityThemeIconProvider::requestPixmap(const QString &id, QSize *realSize, const QSize &requestedSize)
245
QPixmap UnityThemeIconProvider::requestPixmap(const QString &id, QSize *size, const QSize &requestedSize)
327
30
{
246
{
349
31
    QIcon icon;
247
    int iconSize = qMax(requestedSize.width(), requestedSize.height());
350
32
248
    QPixmap pixmap = theme->findBestIcon(id.split(",", QString::SkipEmptyParts), iconSize);
351
33
    Q_FOREACH (const QString &name, id.split(",", QString::SkipEmptyParts)) {
249
    *size = pixmap.size();
352
34
        icon = QIcon::fromTheme(name);
250
    return pixmap;
332
35
        if (!icon.isNull()) {
333
36
            if (requestedSize.isValid()) {
334
37
                *realSize =requestedSize;
335
38
                return icon.pixmap(requestedSize);
336
39
            } else {
337
40
                QList<QSize> sizes = icon.availableSizes();
338
41
                if (sizes.count() > 0 && sizes.last().isValid()) {
339
42
                    *realSize = sizes.last();
340
43
                } else {
341
44
                    *realSize = QSize(32,32);
342
45
                }
343
46
                return icon.pixmap(*realSize);
344
47
            }
345
48
            break;
346
49
        }
347
50
    }
348
51
    return QPixmap();
353
52
}
251
}
354
53
252
355
=== modified file 'modules/Ubuntu/Components/plugin/unitythemeiconprovider.h'
356
--- modules/Ubuntu/Components/plugin/unitythemeiconprovider.h	2013-08-07 16:13:39 +0000
357
+++ modules/Ubuntu/Components/plugin/unitythemeiconprovider.h	2014-08-27 13:55:30 +0000
358
@@ -26,6 +26,9 @@
359
26
public:
26
public:
360
27
    UnityThemeIconProvider();
27
    UnityThemeIconProvider();
361
28
    QPixmap requestPixmap(const QString &id, QSize *size, const QSize &requestedSize);
28
    QPixmap requestPixmap(const QString &id, QSize *size, const QSize &requestedSize);
362
29
363
30
private:
364
31
    QSharedPointer<class IconTheme> theme;
365
29
};
32
};
366
30
33
367
31
#endif
34
#endif
368
32
35
369
=== modified file 'tests/unit_x11/tst_components/tst_components.cpp'
370
--- tests/unit_x11/tst_components/tst_components.cpp	2013-11-26 12:44:39 +0000
371
+++ tests/unit_x11/tst_components/tst_components.cpp	2014-08-27 13:55:30 +0000
372
@@ -25,7 +25,18 @@
373
25
    Register()
25
    Register()
374
26
    {
26
    {
375
27
        qmlRegisterType<TabsModel>("TestObjects", 0, 1, "TabsModel");
27
        qmlRegisterType<TabsModel>("TestObjects", 0, 1, "TabsModel");
377
28
    }
28
378
29
        savedDataDirs = qgetenv("XDG_DATA_DIRS");
379
30
        qputenv("XDG_DATA_DIRS", "/usr/share");
380
31
    }
381
32
382
33
    ~Register()
383
34
    {
384
35
        qputenv("XDG_DATA_DIRS", savedDataDirs);
385
36
    }
386
37
387
38
private:
388
39
    QByteArray savedDataDirs;
389
29
};
40
};
390
30
41
391
31
Register r;
42
Register r;
392
32
43
393
=== modified file 'tests/unit_x11/tst_components/tst_icon.qml'
394
--- tests/unit_x11/tst_components/tst_icon.qml	2014-07-30 20:20:49 +0000
395
+++ tests/unit_x11/tst_components/tst_icon.qml	2014-08-27 13:55:30 +0000
396
@@ -82,7 +82,7 @@
397
82
82
398
83
            var image = findChild(icon2, "image");
83
            var image = findChild(icon2, "image");
399
84
            compare(image.source,
84
            compare(image.source,
401
85
                    "file:///usr/share/icons/suru/actions/scalable/search.svg",
85
                    "image://theme/search",
402
86
                    "Source of the image should equal icon2.source.");
86
                    "Source of the image should equal icon2.source.");
403
87
        }
87
        }
404
88
    }
88
    }
Reviewer	Review Type	Date Requested	Status
PS Jenkins bot	continuous-integration		Needs Fixing on 2014-08-27
Tim Peeters		2014-08-25	Needs Resubmitting on 2014-08-27
Albert Astals Cid (community)			Needs Information on 2014-08-27
Review via email: mp+232115@code.launchpad.net