git.iko.soy/unity8
on xenial help sign in
Made sure progress is properly exposed in DBus-introspection and fixed other suggestions from MP-comments.
0b22f55Mirco Müller
debian/control+2−2
compare with xenial
unifiedsplit
@@ -101,7 +101,7 @@ Depends: gsettings-desktop-schemas,
101 qtdeclarative5-ubuntu-telephony0.1,
101 qtdeclarative5-ubuntu-telephony0.1,
102 qtdeclarative5-ubuntu-web-plugin,
102 qtdeclarative5-ubuntu-web-plugin,
103 ubuntu-system-settings,
103 ubuntu-system-settings,
104− unity-launcher-impl-8,
104+ unity-launcher-impl-4,
105 unity8-common (= ${source:Version}),
105 unity8-common (= ${source:Version}),
106 unity8-private (= ${binary:Version}),
106 unity8-private (= ${binary:Version}),
107 unity8-private | unity-launcher-impl,
107 unity8-private | unity-launcher-impl,
@@ -189,7 +189,7 @@ Depends: accountsservice-ubuntu-schemas (>= 0.0.3),
189 ${misc:Depends},
189 ${misc:Depends},
190 ${shlibs:Depends},
190 ${shlibs:Depends},
191Provides: unity-launcher-impl,
191Provides: unity-launcher-impl,
192− unity-launcher-impl-8,
192+ unity-launcher-impl-4,
193Description: Unity 8 private libs
193Description: Unity 8 private libs
194 The Unity 8 shell is the primary user interface for Ubuntu devices.
194 The Unity 8 shell is the primary user interface for Ubuntu devices.
195 .
195 .
plugins/Greeter/Unity/Launcher/launchermodelas.cpp+7−7
@@ -200,7 +200,7 @@ void LauncherModel::refresh()
200 Q_FOREACH (LauncherItem* item, m_list) {
200 Q_FOREACH (LauncherItem* item, m_list) {
201 bool found = false;
201 bool found = false;
202 Q_FOREACH(const QVariant &asItem, items) {
202 Q_FOREACH(const QVariant &asItem, items) {
203− QMap<QString, QVariant> cachedMap = asItem.toMap();
203+ QVariantMap cachedMap = asItem.toMap();
204 if (cachedMap.value("id").toString() == item->appId()) {
204 if (cachedMap.value("id").toString() == item->appId()) {
205 // Only keep and update it if we either show unpinned or it is pinned
205 // Only keep and update it if we either show unpinned or it is pinned
206 if (!m_onlyPinned || cachedMap.value("pinned").toBool()) {
206 if (!m_onlyPinned || cachedMap.value("pinned").toBool()) {
@@ -213,11 +213,11 @@ void LauncherModel::refresh()
213 int idx = m_list.indexOf(item);
213 int idx = m_list.indexOf(item);
214 Q_EMIT dataChanged(index(idx),
214 Q_EMIT dataChanged(index(idx),
215 index(idx),
215 index(idx),
216− QVector<int>() << RoleName
216+ {RoleName,
217− << RoleIcon
217+ RoleIcon,
218− << RoleCount
218+ RoleCount,
219− << RoleCountVisible
219+ RoleCountVisible,
220− << RoleProgress);
220+ RoleProgress});
221 }
221 }
222 break;
222 break;
223 }
223 }
@@ -255,7 +255,7 @@ void LauncherModel::refresh()
255 }
255 }
256
256
257 if (itemIndex == -1) {
257 if (itemIndex == -1) {
258− QMap<QString, QVariant> chachedMap = entry.toMap();
258+ QVariantMap chachedMap = entry.toMap();
259 // Need to add it. Just add it into the addedIndex to keep same ordering as the list in AS.
259 // Need to add it. Just add it into the addedIndex to keep same ordering as the list in AS.
260 LauncherItem *item = new LauncherItem(chachedMap.value("id").toString(),
260 LauncherItem *item = new LauncherItem(chachedMap.value("id").toString(),
261 chachedMap.value("name").toString(),
261 chachedMap.value("name").toString(),
plugins/Unity/Launcher/dbusinterface.cpp+1
@@ -66,6 +66,7 @@ QString DBusInterface::introspect(const QString &path) const
66 "<interface name=\"com.canonical.Unity.Launcher.Item\">"
66 "<interface name=\"com.canonical.Unity.Launcher.Item\">"
67 "<property name=\"count\" type=\"i\" access=\"readwrite\" />"
67 "<property name=\"count\" type=\"i\" access=\"readwrite\" />"
68 "<property name=\"countVisible\" type=\"b\" access=\"readwrite\" />"
68 "<property name=\"countVisible\" type=\"b\" access=\"readwrite\" />"
69+ "<property name=\"progress\" type=\"i\" access=\"readwrite\" />"
69 "</interface>";
70 "</interface>";
70 return nodeiface;
71 return nodeiface;
71}
72}