git.iko.soy/unity8
on xenial help sign in
Some more cleanups.
commitbc0e8b689be56375c17a0e0233bafac1372d97a8 authorPawel Stolowski <pawel.stolowski@canonical.com> dateThu 6 Jun 2013, 17:55 (13 years ago) parent84132df
4 files changed+7−7
compare with xenial
unifiedsplit
Dash/Dash.qml+3−3 Dash/LensView.qml+1−1 plugins/Unity/plugin.cpp+2−2 plugins/Unity/scopes.h+1−1
Dash/Dash.qml+3−3
@@ -31,7 +31,7 @@ Showable {
3131 height: units.gu(71)
3232
3333 function setCurrentLens(lensId, animate, reset) {
34− var lensIndex = filteredLenses.findFirst(Lenses.RoleId, lensId)
34+ var lensIndex = filteredLenses.findFirst(Scopes.RoleId, lensId)
3535
3636 if (lensIndex == -1) {
3737 console.warn("No match for lens with id: %1".arg(lensId))
@@ -48,12 +48,12 @@ Showable {
4848
4949 SortFilterProxyModel {
5050 id: filteredLenses
51− model: Lenses {
51+ model: Scopes {
5252 id: lenses
5353 }
5454 dynamicSortFilter: true
5555
56− filterRole: Lenses.RoleVisible
56+ filterRole: Scopes.RoleVisible
5757 filterRegExp: RegExp("^true$")
5858 }
5959
Dash/LensView.qml+1−1
@@ -19,7 +19,7 @@ import Utils 0.1
1919import Unity 0.1
2020
2121FocusScope {
22− property Lens lens
22+ property Scope lens
2323 property SortFilterProxyModel categories: categoryFilter
2424 property bool isCurrent
2525 property ListModel searchHistory
plugins/Unity/plugin.cpp+2−2
@@ -40,8 +40,8 @@ static const char* DBUS_SERVICE = "com.canonical.Shell.BottomBarVisibilityCommun
4040void UnityPlugin::registerTypes(const char *uri)
4141{
4242 Q_ASSERT(uri == QLatin1String("Unity"));
43− qmlRegisterType<Scope>(uri, 0, 1, "Lens");
44− qmlRegisterType<Scopes>(uri, 0, 1, "Lenses");
43+ qmlRegisterType<Scope>(uri, 0, 1, "Scope");
44+ qmlRegisterType<Scopes>(uri, 0, 1, "Scopes");
4545 qmlRegisterType<Categories>(uri, 0, 1, "Categories");
4646 qmlRegisterType<CategoryFilter>(uri, 0, 1, "CategoryFilter");
4747 qmlRegisterType<DeeListModel>(uri, 0, 1, "DeeListModel");
plugins/Unity/scopes.h+1−1
@@ -88,4 +88,4 @@ private:
8888 void removeUnityScope(int index);
8989};
9090
91−#endif // LENSES_H
91+#endif // SCOPES_H