git.iko.soy/unity8
on xenial help sign in
Some more cleanups.
bc0e8b6Pawel Stolowski
Dash/Dash.qml+3−3
compare with xenial
unifiedsplit
@@ -31,7 +31,7 @@ Showable {
31 height: units.gu(71)
31 height: units.gu(71)
32
32
33 function setCurrentLens(lensId, animate, reset) {
33 function setCurrentLens(lensId, animate, reset) {
34− var lensIndex = filteredLenses.findFirst(Lenses.RoleId, lensId)
34+ var lensIndex = filteredLenses.findFirst(Scopes.RoleId, lensId)
35
35
36 if (lensIndex == -1) {
36 if (lensIndex == -1) {
37 console.warn("No match for lens with id: %1".arg(lensId))
37 console.warn("No match for lens with id: %1".arg(lensId))
@@ -48,12 +48,12 @@ Showable {
48
48
49 SortFilterProxyModel {
49 SortFilterProxyModel {
50 id: filteredLenses
50 id: filteredLenses
51− model: Lenses {
51+ model: Scopes {
52 id: lenses
52 id: lenses
53 }
53 }
54 dynamicSortFilter: true
54 dynamicSortFilter: true
55
55
56− filterRole: Lenses.RoleVisible
56+ filterRole: Scopes.RoleVisible
57 filterRegExp: RegExp("^true$")
57 filterRegExp: RegExp("^true$")
58 }
58 }
59
59
Dash/LensView.qml+1−1
@@ -19,7 +19,7 @@ import Utils 0.1
19import Unity 0.1
19import Unity 0.1
20
20
21FocusScope {
21FocusScope {
22− property Lens lens
22+ property Scope lens
23 property SortFilterProxyModel categories: categoryFilter
23 property SortFilterProxyModel categories: categoryFilter
24 property bool isCurrent
24 property bool isCurrent
25 property ListModel searchHistory
25 property ListModel searchHistory
plugins/Unity/plugin.cpp+2−2
@@ -40,8 +40,8 @@ static const char* DBUS_SERVICE = "com.canonical.Shell.BottomBarVisibilityCommun
40void UnityPlugin::registerTypes(const char *uri)
40void UnityPlugin::registerTypes(const char *uri)
41{
41{
42 Q_ASSERT(uri == QLatin1String("Unity"));
42 Q_ASSERT(uri == QLatin1String("Unity"));
43− qmlRegisterType<Scope>(uri, 0, 1, "Lens");
43+ qmlRegisterType<Scope>(uri, 0, 1, "Scope");
44− qmlRegisterType<Scopes>(uri, 0, 1, "Lenses");
44+ qmlRegisterType<Scopes>(uri, 0, 1, "Scopes");
45 qmlRegisterType<Categories>(uri, 0, 1, "Categories");
45 qmlRegisterType<Categories>(uri, 0, 1, "Categories");
46 qmlRegisterType<CategoryFilter>(uri, 0, 1, "CategoryFilter");
46 qmlRegisterType<CategoryFilter>(uri, 0, 1, "CategoryFilter");
47 qmlRegisterType<DeeListModel>(uri, 0, 1, "DeeListModel");
47 qmlRegisterType<DeeListModel>(uri, 0, 1, "DeeListModel");
plugins/Unity/scopes.h+1−1
@@ -88,4 +88,4 @@ private:
88 void removeUnityScope(int index);
88 void removeUnityScope(int index);
89};
89};
90
90
91−#endif // LENSES_H
91+#endif // SCOPES_H