git.iko.soy/unity8
on xenial help sign in
merge trunk
commit0d92b08ec156a92dfe87c60b0e5eebade368a017 authorLukáš Tinkl <lukas.tinkl@canonical.com> dateMon 7 Nov 2016, 14:13 (10 years ago) parent8df145070b74db
8 files changed+57−27
compare with xenial
unifiedsplit
debian/changelog+7 debian/control+3−3 plugins/Unity/Indicators/modelprinter.cpp+19−4 plugins/Unity/Indicators/modelprinter.h+2−1 po/nl.po+3−3 po/pl.po+3−3 po/unity8.pot+13−13 qml/Panel/Indicators/MenuItemFactory.qml+7
debian/changelog+7
@@ -1,3 +1,10 @@
1+unity8 (8.14+17.04.20161027-0ubuntu1) zesty; urgency=medium
2+
3+ * MenuItemFactory: activate item on calendar selection change (LP:
4+ #1541125)
5+
6+ -- Marco Trevisan (Treviño) <mail@3v1n0.net> Thu, 27 Oct 2016 12:32:25 +0000
7+
18unity8 (8.14+17.04.20161024-0ubuntu1) zesty; urgency=medium
29
310 [ Albert Astals Cid ]
debian/control+3−3
@@ -28,7 +28,7 @@ Build-Depends: cmake,
2828 libpam0g-dev,
2929 libpay2-dev,
3030 libpulse-dev,
31− libqmenumodel-dev (>= 0.2.9),
31+ libqmenumodel-dev (>= 0.2.10),
3232 libqt5svg5-dev,
3333 libqt5xmlpatterns5-dev,
3434 libsystemsettings-dev,
@@ -79,7 +79,7 @@ X-Ubuntu-Use-Langpack: yes
7979
8080Package: indicators-client
8181Architecture: any
82−Depends: qmenumodel-qml (>= 0.2.9),
82+Depends: qmenumodel-qml (>= 0.2.10),
8383 qml-module-ubuntu-components (>= 1.3.2030) | qml-module-ubuntu-components-gles (>= 1.3.2030),
8484 unity8 (= ${binary:Version}),
8585 ${misc:Depends},
@@ -118,7 +118,7 @@ Depends: dmz-cursor-theme,
118118 gsettings-desktop-schemas,
119119 libcap2-bin,
120120 libglib2.0-bin,
121− qmenumodel-qml (>= 0.2.9),
121+ qmenumodel-qml (>= 0.2.10),
122122 qml-module-biometryd,
123123 qml-module-qt-labs-folderlistmodel,
124124 qml-module-qtquick-xmllistmodel,
plugins/Unity/Indicators/modelprinter.cpp+19−4
@@ -105,12 +105,25 @@ QString ModelPrinter::getRowSring(UnityMenuModel* sourceModel, int row, int dept
105105
106106 Q_FOREACH(int role, roles) {
107107 const QByteArray& roleName = roleNames[role];
108− stream << tabify(depth) << getVariantString(roleName, sourceModel->get(row, roleName));
108+ stream << getVariantString(roleName, sourceModel->get(row, roleName), depth);
109109 }
110110 return str;
111111}
112112
113−QString ModelPrinter::getVariantString(const QString& roleName, const QVariant &vData) const
113+QString ModelPrinter::getVariantString(const QVariant& vData) const
114+{
115+ if (vData.type() == QVariant::List) {
116+ QStringList strList;
117+ for (const auto& v : vData.toList())
118+ strList.append(getVariantString(v));
119+
120+ return '[' + strList.join(", ") + ']';
121+ }
122+
123+ return vData.toString();
124+}
125+
126+QString ModelPrinter::getVariantString(const QString& roleName, const QVariant &vData, int depth) const
114127{
115128 QString str;
116129 QTextStream stream(&str);
@@ -119,18 +132,20 @@ QString ModelPrinter::getVariantString(const QString& roleName, const QVariant &
119132 QMapIterator<QString, QVariant> iter(vData.toMap());
120133 while (iter.hasNext()) {
121134 iter.next();
135+ stream << tabify(depth);
122136 stream << roleName
123137 << "."
124138 << iter.key()
125139 << ": "
126− << iter.value().toString()
140+ << getVariantString(iter.value())
127141 << endl;
128142 }
129143 }
130144 else {
145+ stream << tabify(depth);
131146 stream << roleName
132147 << ": "
133− << vData.toString()
148+ << getVariantString(vData)
134149 << endl;
135150 }
136151 return str;
plugins/Unity/Indicators/modelprinter.h+2−1
@@ -46,7 +46,8 @@ Q_SIGNALS:
4646private:
4747 QString getModelDataString(UnityMenuModel* sourceModel, int level);
4848 QString getRowSring(UnityMenuModel* sourceModel, int index, int depth) const;
49− QString getVariantString(const QString& roleName, const QVariant &vData) const;
49+ QString getVariantString(const QString& roleName, const QVariant &vData, int depth) const;
50+ QString getVariantString(const QVariant&) const;
5051
5152 UnityMenuModel* m_model;
5253 QList<UnityMenuModel*> m_children;
po/nl.po+3−3
@@ -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: 2016-10-24 11:37+0000\n"
11−"PO-Revision-Date: 2016-10-31 17:11+0000\n"
11+"PO-Revision-Date: 2016-11-01 08:29+0000\n"
1212"Last-Translator: Hannie Dumoleyn <Unknown>\n"
1313"Language-Team: Dutch <nl@li.org>\n"
1414"MIME-Version: 1.0\n"
1515"Content-Type: text/plain; charset=UTF-8\n"
1616"Content-Transfer-Encoding: 8bit\n"
1717"Plural-Forms: nplurals=2; plural=n != 1;\n"
18−"X-Launchpad-Export-Date: 2016-11-01 06:11+0000\n"
18+"X-Launchpad-Export-Date: 2016-11-02 06:51+0000\n"
1919"X-Generator: Launchpad (build 18246)\n"
2020
2121#: plugins/LightDM/Greeter.cpp:123
@@ -497,7 +497,7 @@ msgstr "Er wordt niets afgespeeld"
497497msgid "%1 hour"
498498msgid_plural "%1 hours"
499499msgstr[0] "%1 uur"
500−msgstr[1] "%1 uren"
500+msgstr[1] "%1 uur"
501501
502502#: qml/Panel/Indicators/MenuItemFactory.qml:920
503503#, qt-format
po/pl.po+3−3
@@ -8,7 +8,7 @@ msgstr ""
88"Project-Id-Version: unity\n"
99"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
1010"POT-Creation-Date: 2016-10-24 11:37+0000\n"
11−"PO-Revision-Date: 2016-06-22 13:51+0000\n"
11+"PO-Revision-Date: 2016-11-01 15:06+0000\n"
1212"Last-Translator: Krzysztof Tataradziński <Unknown>\n"
1313"Language-Team: Polish <pl@li.org>\n"
1414"MIME-Version: 1.0\n"
@@ -16,7 +16,7 @@ msgstr ""
1616"Content-Transfer-Encoding: 8bit\n"
1717"Plural-Forms: nplurals=3; plural=n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 "
1818"|| n%100>=20) ? 1 : 2;\n"
19−"X-Launchpad-Export-Date: 2016-10-28 05:54+0000\n"
19+"X-Launchpad-Export-Date: 2016-11-02 06:51+0000\n"
2020"X-Generator: Launchpad (build 18246)\n"
2121
2222#: plugins/LightDM/Greeter.cpp:123
@@ -468,7 +468,7 @@ msgstr ""
468468
469469#: qml/Greeter/SessionsList.qml:122
470470msgid "Select desktop environment"
471−msgstr ""
471+msgstr "Wybierz środowisko graficzne"
472472
473473#: qml/Notifications/NotificationMenuItemFactory.qml:124
474474msgid "Show password"
po/unity8.pot+13−13
@@ -8,7 +8,7 @@ msgid ""
88msgstr ""
99"Project-Id-Version: unity8\n"
1010"Report-Msgid-Bugs-To: \n"
11−"POT-Creation-Date: 2016-10-24 11:37+0000\n"
11+"POT-Creation-Date: 2016-10-27 12:32+0000\n"
1212"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
1313"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
1414"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -477,62 +477,62 @@ msgstr ""
477477msgid "Conference"
478478msgstr ""
479479
480−#: qml/Panel/Indicators/MenuItemFactory.qml:788
480+#: qml/Panel/Indicators/MenuItemFactory.qml:795
481481msgid "Nothing is playing"
482482msgstr ""
483483
484−#: qml/Panel/Indicators/MenuItemFactory.qml:916
484+#: qml/Panel/Indicators/MenuItemFactory.qml:923
485485#, qt-format
486486msgid "%1 hour"
487487msgid_plural "%1 hours"
488488msgstr[0] ""
489489msgstr[1] ""
490490
491−#: qml/Panel/Indicators/MenuItemFactory.qml:920
491+#: qml/Panel/Indicators/MenuItemFactory.qml:927
492492#, qt-format
493493msgid "%1 minute"
494494msgid_plural "%1 minutes"
495495msgstr[0] ""
496496msgstr[1] ""
497497
498−#: qml/Panel/Indicators/MenuItemFactory.qml:925
498+#: qml/Panel/Indicators/MenuItemFactory.qml:932
499499#, qt-format
500500msgid "%1 second"
501501msgid_plural "%1 seconds"
502502msgstr[0] ""
503503msgstr[1] ""
504504
505−#: qml/Panel/Indicators/MenuItemFactory.qml:928
505+#: qml/Panel/Indicators/MenuItemFactory.qml:935
506506msgid "0 seconds"
507507msgstr ""
508508
509509#. Translators: String like "1 hour, 2 minutes, 3 seconds remaining"
510−#: qml/Panel/Indicators/MenuItemFactory.qml:930
510+#: qml/Panel/Indicators/MenuItemFactory.qml:937
511511#, qt-format
512512msgid "%1 remaining"
513513msgstr ""
514514
515−#: qml/Panel/Indicators/MenuItemFactory.qml:936
515+#: qml/Panel/Indicators/MenuItemFactory.qml:943
516516msgid "In queue…"
517517msgstr ""
518518
519−#: qml/Panel/Indicators/MenuItemFactory.qml:940
519+#: qml/Panel/Indicators/MenuItemFactory.qml:947
520520msgid "Downloading"
521521msgstr ""
522522
523−#: qml/Panel/Indicators/MenuItemFactory.qml:942
523+#: qml/Panel/Indicators/MenuItemFactory.qml:949
524524msgid "Paused, tap to resume"
525525msgstr ""
526526
527−#: qml/Panel/Indicators/MenuItemFactory.qml:944
527+#: qml/Panel/Indicators/MenuItemFactory.qml:951
528528msgid "Canceled"
529529msgstr ""
530530
531−#: qml/Panel/Indicators/MenuItemFactory.qml:946
531+#: qml/Panel/Indicators/MenuItemFactory.qml:953
532532msgid "Finished"
533533msgstr ""
534534
535−#: qml/Panel/Indicators/MenuItemFactory.qml:948
535+#: qml/Panel/Indicators/MenuItemFactory.qml:955
536536msgid "Failed, tap to retry"
537537msgstr ""
538538
qml/Panel/Indicators/MenuItemFactory.qml+7
@@ -508,6 +508,13 @@ Item {
508508 objectName: "calendarMenu"
509509 highlightWhenPressed: false
510510 focus: true
511+
512+ property var menuModel: menuFactory.menuModel
513+ property int menuIndex: -1
514+
515+ onSelectedDateChanged: {
516+ menuModel.activate(menuIndex, selectedDate.getTime() / 1000 | 0)
517+ }
511518 }
512519 }
513520