Unity 8

Merge lp:~3v1n0/unity8/calendar-day-selection into lp:unity8

  1. calendar-day-selection
  2. Merge into trunk
Proposed by Marco Trevisan (Treviño)
Status: Merged
Approved by: Albert Astals Cid
Approved revision: 2480
Merged at revision: 2671
Proposed branch: lp:~3v1n0/unity8/calendar-day-selection
Merge into: lp:unity8
Prerequisite: lp:~3v1n0/unity8/menuitems-slots-cleanup
Diff against target: 116 lines (+31/-8)
4 files modified
debian/control (+3/-3)
plugins/Unity/Indicators/modelprinter.cpp (+19/-4)
plugins/Unity/Indicators/modelprinter.h (+2/-1)
qml/Panel/Indicators/MenuItemFactory.qml (+7/-0)
To merge this branch: bzr merge lp:~3v1n0/unity8/calendar-day-selection
Reviewer Review Type Date Requested Status
Unity8 CI Bot continuous-integration Needs Fixing
Albert Astals Cid (community) Abstain
Lukáš Tinkl (community) Approve
Ubuntu Unity PS integration team Pending
Review via email: mp+308535@code.launchpad.net

Commit message

MenuItemFactory: activate item on calendar selection change

This informs the indicator-datetime to update the list of the upcoming events

Description of the change

Prereq-archive: ppa:ci-train-ppa-service/2081

Making day selection work in the calendar, some features in the linked bug are depeneding on new design instead.

 * Are there any related MPs required for this MP to build/function as expected? Please list.

https://code.launchpad.net/~3v1n0/qmenumodel/variant-string-parser/+merge/308529

 * Did you perform an exploratory manual test run of your code change and any related functionality?

Yes

 * If you changed the packaging (debian), did you subscribe the ubuntu-unity team to this MP?

Done

 * If you changed the UI, has there been a design review?

N/A

To post a comment you must log in.
Revision history for this message
Unity8 CI Bot (unity8-ci-bot) wrote :

FAILED: Continuous integration, rev:2475
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/2386/
Executed test runs:
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build/3137/console
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/3165
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=vivid+overlay/3021/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/3021/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=yakkety/3021/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=vivid+overlay/3021/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/3021/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=yakkety/3021/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=vivid+overlay/3021/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/3021/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=yakkety/3021/console

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/2386/rebuild

review: Needs Fixing (continuous-integration)
Revision history for this message
Unity8 CI Bot (unity8-ci-bot) wrote :

FAILED: Continuous integration, rev:2477
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/2401/
Executed test runs:
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build/3154/console
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/3182
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=vivid+overlay/3038/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/3038/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=yakkety/3038/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=vivid+overlay/3038/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/3038/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=yakkety/3038/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=vivid+overlay/3038/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/3038/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=yakkety/3038/console

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/2401/rebuild

review: Needs Fixing (continuous-integration)
Revision history for this message
Unity8 CI Bot (unity8-ci-bot) wrote :

FAILED: Continuous integration, rev:2479
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/2402/
Executed test runs:
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build/3155/console
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/3183
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=vivid+overlay/3039/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/3039/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=yakkety/3039/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=vivid+overlay/3039/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/3039/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=yakkety/3039/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=vivid+overlay/3039/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/3039/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=yakkety/3039/console

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/2402/rebuild

review: Needs Fixing (continuous-integration)
Revision history for this message
Lukáš Tinkl (lukas-kde) wrote :

Worth mentioning in the description that this also needs https://code.launchpad.net/~3v1n0/ubuntu-settings-components/new-calendar-design/+merge/307976

Revision history for this message
Lukáš Tinkl (lukas-kde) wrote :

- qtdeclarative5-ubuntu-settings-components (>= 0.10),
+ qtdeclarative5-ubuntu-settings-components (>= 0.9),

Why this?

review: Needs Information
Revision history for this message
Lukáš Tinkl (lukas-kde) wrote :

Nope.... :/

activating doesn't work due to: file:///usr/share/unity8//Panel/Indicators/MenuItemFactory.qml:516: TypeError: Property 'activateByVariantString' of object UnityMenuModel(0x35c8c70)

review: Needs Fixing
Revision history for this message
Lukáš Tinkl (lukas-kde) wrote :

OK, was missing one more changed file, so yeah this works fine. My only objection would be this change:

- qtdeclarative5-ubuntu-settings-components (>= 0.10),
+ qtdeclarative5-ubuntu-settings-components (>= 0.9),

review: Needs Information
Revision history for this message
Lukáš Tinkl (lukas-kde) wrote :

Works as expected, thanks!

review: Approve
Revision history for this message
Unity8 CI Bot (unity8-ci-bot) wrote :

FAILED: Continuous integration, rev:2479
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/2445/
Executed test runs:
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build/3212
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=vivid+overlay,testname=qmluitests.sh/1838
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=xenial+overlay,testname=qmluitests.sh/1838
    UNSTABLE: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=zesty,testname=qmluitests.sh/1838
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/3240
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=vivid+overlay/3095
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=vivid+overlay/3095/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/3095
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/3095/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=zesty/3095
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=zesty/3095/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=vivid+overlay/3095
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=vivid+overlay/3095/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/3095
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/3095/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=zesty/3095
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=zesty/3095/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=vivid+overlay/3095
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=vivid+overlay/3095/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/3095
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/3095/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=zesty/3095
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=zesty/3095/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/2445/rebuild

review: Needs Fixing (continuous-integration)
Revision history for this message
Albert Astals Cid (aacid) wrote :

Text conflict in debian/control
1 conflicts encountered.

Note: Was already top approved.

review: Needs Fixing
lp:~3v1n0/unity8/calendar-day-selection updated
2480. By Marco Trevisan (Treviño)

Merging with trunk

Revision history for this message
Marco Trevisan (Treviño) (3v1n0) wrote :

> Text conflict in debian/control
> 1 conflicts encountered.
>
> Note: Was already top approved.

Fixed

Revision history for this message
Albert Astals Cid (aacid) :
review: Abstain
Revision history for this message
Unity8 CI Bot (unity8-ci-bot) wrote :

FAILED: Continuous integration, rev:2480
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/2450/
Executed test runs:
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build/3220
    UNSTABLE: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=vivid+overlay,testname=qmluitests.sh/1846
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=xenial+overlay,testname=qmluitests.sh/1846
    UNSTABLE: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=zesty,testname=qmluitests.sh/1846
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/3248
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=vivid+overlay/3103
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=vivid+overlay/3103/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/3103
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/3103/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=zesty/3103
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=zesty/3103/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=vivid+overlay/3103
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=vivid+overlay/3103/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/3103
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/3103/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=zesty/3103
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=zesty/3103/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=vivid+overlay/3103
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=vivid+overlay/3103/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/3103
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/3103/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=zesty/3103
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=zesty/3103/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/2450/rebuild

review: Needs Fixing (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/control'
2--- debian/control 2016-10-24 11:35:31 +0000
3+++ debian/control 2016-10-27 12:26:34 +0000
4@@ -28,7 +28,7 @@
5 libpam0g-dev,
6 libpay2-dev,
7 libpulse-dev,
8- libqmenumodel-dev (>= 0.2.9),
9+ libqmenumodel-dev (>= 0.2.10),
10 libqt5svg5-dev,
11 libqt5xmlpatterns5-dev,
12 libsystemsettings-dev,
13@@ -79,7 +79,7 @@
14
15 Package: indicators-client
16 Architecture: any
17-Depends: qmenumodel-qml (>= 0.2.9),
18+Depends: qmenumodel-qml (>= 0.2.10),
19 qml-module-ubuntu-components (>= 1.3.2030) | qml-module-ubuntu-components-gles (>= 1.3.2030),
20 unity8 (= ${binary:Version}),
21 ${misc:Depends},
22@@ -118,7 +118,7 @@
23 gsettings-desktop-schemas,
24 libcap2-bin,
25 libglib2.0-bin,
26- qmenumodel-qml (>= 0.2.9),
27+ qmenumodel-qml (>= 0.2.10),
28 qml-module-biometryd,
29 qml-module-qt-labs-folderlistmodel,
30 qml-module-qtquick-xmllistmodel,
31
32=== modified file 'plugins/Unity/Indicators/modelprinter.cpp'
33--- plugins/Unity/Indicators/modelprinter.cpp 2015-09-14 09:11:08 +0000
34+++ plugins/Unity/Indicators/modelprinter.cpp 2016-10-27 12:26:34 +0000
35@@ -105,12 +105,25 @@
36
37 Q_FOREACH(int role, roles) {
38 const QByteArray& roleName = roleNames[role];
39- stream << tabify(depth) << getVariantString(roleName, sourceModel->get(row, roleName));
40+ stream << getVariantString(roleName, sourceModel->get(row, roleName), depth);
41 }
42 return str;
43 }
44
45-QString ModelPrinter::getVariantString(const QString& roleName, const QVariant &vData) const
46+QString ModelPrinter::getVariantString(const QVariant& vData) const
47+{
48+ if (vData.type() == QVariant::List) {
49+ QStringList strList;
50+ for (const auto& v : vData.toList())
51+ strList.append(getVariantString(v));
52+
53+ return '[' + strList.join(", ") + ']';
54+ }
55+
56+ return vData.toString();
57+}
58+
59+QString ModelPrinter::getVariantString(const QString& roleName, const QVariant &vData, int depth) const
60 {
61 QString str;
62 QTextStream stream(&str);
63@@ -119,18 +132,20 @@
64 QMapIterator<QString, QVariant> iter(vData.toMap());
65 while (iter.hasNext()) {
66 iter.next();
67+ stream << tabify(depth);
68 stream << roleName
69 << "."
70 << iter.key()
71 << ": "
72- << iter.value().toString()
73+ << getVariantString(iter.value())
74 << endl;
75 }
76 }
77 else {
78+ stream << tabify(depth);
79 stream << roleName
80 << ": "
81- << vData.toString()
82+ << getVariantString(vData)
83 << endl;
84 }
85 return str;
86
87=== modified file 'plugins/Unity/Indicators/modelprinter.h'
88--- plugins/Unity/Indicators/modelprinter.h 2015-11-21 22:41:41 +0000
89+++ plugins/Unity/Indicators/modelprinter.h 2016-10-27 12:26:34 +0000
90@@ -46,7 +46,8 @@
91 private:
92 QString getModelDataString(UnityMenuModel* sourceModel, int level);
93 QString getRowSring(UnityMenuModel* sourceModel, int index, int depth) const;
94- QString getVariantString(const QString& roleName, const QVariant &vData) const;
95+ QString getVariantString(const QString& roleName, const QVariant &vData, int depth) const;
96+ QString getVariantString(const QVariant&) const;
97
98 UnityMenuModel* m_model;
99 QList<UnityMenuModel*> m_children;
100
101=== modified file 'qml/Panel/Indicators/MenuItemFactory.qml'
102--- qml/Panel/Indicators/MenuItemFactory.qml 2016-09-22 22:19:13 +0000
103+++ qml/Panel/Indicators/MenuItemFactory.qml 2016-10-27 12:26:34 +0000
104@@ -508,6 +508,13 @@
105 objectName: "calendarMenu"
106 highlightWhenPressed: false
107 focus: true
108+
109+ property var menuModel: menuFactory.menuModel
110+ property int menuIndex: -1
111+
112+ onSelectedDateChanged: {
113+ menuModel.activate(menuIndex, selectedDate.getTime() / 1000 | 0)
114+ }
115 }
116 }
117

Subscribers

People subscribed via source and target branches