git.iko.soy/unity8
on xenial help sign in
Merge from trunk
commitb75190638b7bf50b4c9dfed7d4269b3bc6305532 authorMichael Terry <michael.terry@canonical.com> dateThu 15 May 2014, 11:04 (12 years ago) parent5499c3f6354081
4 files changed+61−17
compare with xenial
unifiedsplit
debian/changelog+8 plugins/Unity/Indicators/rootactionstate.cpp+7−8 po/ca.po+9−9 tests/plugins/Unity/Indicators/rootactionstatetest.cpp+37
debian/changelog+8
@@ -4,6 +4,14 @@ unity8 (7.87+14.10.20140505-0ubuntu1) UNRELEASED; urgency=medium
44
55 -- Michael Terry <mterry@ubuntu.com> Wed, 02 Apr 2014 14:39:45 -0400
66
7+unity8 (7.86+14.10.20140514.1-0ubuntu1) utopic; urgency=low
8+
9+ [ Antti Kaijanmäki ]
10+ * Indicators/RootActionState: use g_variant_iter_loop to extract
11+ icons.
12+
13+ -- Ubuntu daily release <ps-jenkins@lists.canonical.com> Wed, 14 May 2014 11:43:55 +0000
14+
715unity8 (7.86+14.10.20140513-0ubuntu1) utopic; urgency=low
816
917 [ Andrea Cimitan ]
plugins/Unity/Indicators/rootactionstate.cpp+7−8
@@ -240,19 +240,18 @@ QVariant RootActionState::toQVariant(GVariant* state) const
240240
241241 QStringList icons;
242242
243− if (g_variant_type_is_array(g_variant_get_type(vvalue))) {
244−
245−
246− for (int i = 0, iMax = g_variant_n_children(vvalue); i < iMax; i++) {
247− GVariant *child = g_variant_get_child_value(vvalue, i);
248−
243+ if (g_variant_is_of_type(vvalue, G_VARIANT_TYPE("av"))) {
244+ GVariantIter iter;
245+ GVariant *val = 0;
246+ g_variant_iter_init (&iter, vvalue);
247+ while (g_variant_iter_loop (&iter, "v", &val))
248+ {
249249 // FIXME - should be sending a url.
250− GIcon *gicon = g_icon_deserialize (child);
250+ GIcon *gicon = g_icon_deserialize (val);
251251 if (gicon) {
252252 icons << iconUri(gicon);
253253 g_object_unref (gicon);
254254 }
255− g_variant_unref(child);
256255 }
257256 }
258257 // will overwrite icon.
po/ca.po+9−9
@@ -8,14 +8,14 @@ msgstr ""
88"Project-Id-Version: unity\n"
99"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
1010"POT-Creation-Date: 2014-04-10 11:13-0400\n"
11−"PO-Revision-Date: 2014-01-10 07:45+0000\n"
11+"PO-Revision-Date: 2014-05-14 08:15+0000\n"
1212"Last-Translator: Adolfo Jayme <fitoschido@gmail.com>\n"
1313"Language-Team: Catalan <ca@li.org>\n"
1414"MIME-Version: 1.0\n"
1515"Content-Type: text/plain; charset=UTF-8\n"
1616"Content-Transfer-Encoding: 8bit\n"
17−"X-Launchpad-Export-Date: 2014-05-01 06:43+0000\n"
18−"X-Generator: Launchpad (build 16985)\n"
17+"X-Launchpad-Export-Date: 2014-05-15 06:15+0000\n"
18+"X-Generator: Launchpad (build 17007)\n"
1919
2020#: plugins/Unity/Launcher/launcheritem.cpp:43
2121#: plugins/Unity/Launcher/launcheritem.cpp:73
@@ -84,11 +84,11 @@ msgstr "Cerques recents"
8484
8585#: qml/Components/SeeMore.qml:35
8686msgid "See more"
87−msgstr ""
87+msgstr "Mostra'n més"
8888
8989#: qml/Components/SeeMore.qml:58
9090msgid "See less"
91−msgstr ""
91+msgstr "Mostra'n menys"
9292
9393#: qml/Dash/DashApps.qml:37
9494msgid "Recent"
@@ -97,15 +97,15 @@ msgstr ""
9797#: qml/Dash/PreviewListView.qml:52
9898#, qt-format
9999msgid "%1 Preview"
100−msgstr ""
100+msgstr "Previsualització de %1"
101101
102102#: qml/Dash/Previews/PreviewActionCombo.qml:34
103103msgid "More..."
104−msgstr ""
104+msgstr "Més..."
105105
106106#: qml/Dash/Previews/PreviewActionCombo.qml:34
107107msgid "Less..."
108−msgstr ""
108+msgstr "Menys..."
109109
110110#: qml/Dash/Previews/PreviewRatingInput.qml:81
111111msgid "Rate this"
@@ -162,7 +162,7 @@ msgstr "Mostra la contrasenya"
162162
163163#: qml/Notifications/NotificationMenuItemFactory.qml:103
164164msgid "Please enter SIM PIN"
165−msgstr ""
165+msgstr "Introduïu el PIN de la targeta SIM"
166166
167167#: qml/Panel/SearchIndicator.qml:27
168168msgid "Search"
tests/plugins/Unity/Indicators/rootactionstatetest.cpp+37
@@ -21,6 +21,7 @@
2121
2222#include <unitymenumodel.h>
2323#include <QtTest>
24+#include <gio/gio.h>
2425
2526class RootActionStateTest : public QObject
2627{
@@ -52,6 +53,42 @@ private Q_SLOTS:
5253 QVERIFY(rootState->menu() == NULL);
5354 delete rootState;
5455 }
56+
57+ void testToQVariantIcons()
58+ {
59+ GVariantBuilder builderIcons;
60+ g_variant_builder_init(&builderIcons, G_VARIANT_TYPE("av"));
61+ for (int i = 0; i < 3; i ++) {
62+
63+ GIcon* icon = NULL;
64+ icon = g_icon_new_for_string (QString("testIcon%1").arg(i).toUtf8().constData(), NULL);
65+
66+ g_variant_builder_add(&builderIcons,
67+ "v",
68+ g_icon_serialize (icon));
69+ g_object_unref(icon);
70+ }
71+
72+ GVariantBuilder builderParams;
73+ g_variant_builder_init(&builderParams, G_VARIANT_TYPE_ARRAY);
74+ GVariant* icons = g_variant_builder_end (&builderIcons);
75+ g_variant_ref_sink (icons);
76+ g_variant_builder_add (&builderParams, "{sv}", g_strdup ("icons"), icons, NULL);
77+
78+ GVariant* params = g_variant_builder_end (&builderParams);
79+
80+ RootActionState rootState;
81+ QVariant result = rootState.toQVariant(params);
82+ g_variant_unref(params);
83+
84+ QVariantMap paramResult = result.toMap();
85+ QVERIFY(paramResult.contains("icons"));
86+
87+ QStringList serializedIcons = paramResult["icons"].toStringList();
88+ QVERIFY(serializedIcons[0] == "image://theme/testIcon0");
89+ QVERIFY(serializedIcons[1] == "image://theme/testIcon1");
90+ QVERIFY(serializedIcons[2] == "image://theme/testIcon2");
91+ }
5592};
5693
5794QTEST_GUILESS_MAIN(RootActionStateTest)