git.iko.soy/unity8
on xenial help sign in
Clean up a little
9eb4c29Michal Hruby
Dash/Apps/AppsAvailableForDownloadModel.qml+14−7
compare with xenial
unifiedsplit
@@ -15,12 +15,19 @@
15 */
15 */
16
16
17import QtQuick 2.0
17import QtQuick 2.0
18+import "../../Applications"
18
19
20+DesktopFileModel {
21+ baseModel: desktopModel
22+
19−ListModel {
23+ ListModel {
24+ id: desktopModel
25+
20− ListElement { desktopFile: "/usr/share/applications/evernote.desktop"; }
26+ ListElement { desktopFile: "/usr/share/applications/evernote.desktop"; }
21− ListElement { desktopFile: "/usr/share/applications/map.desktop"; }
27+ ListElement { desktopFile: "/usr/share/applications/map.desktop"; }
22− ListElement { desktopFile: "/usr/share/applications/pinterest.desktop"; }
28+ ListElement { desktopFile: "/usr/share/applications/pinterest.desktop"; }
23− ListElement { desktopFile: "/usr/share/applications/soundcloud.desktop"; }
29+ ListElement { desktopFile: "/usr/share/applications/soundcloud.desktop"; }
24− ListElement { desktopFile: "/usr/share/applications/wikipedia.desktop"; }
30+ ListElement { desktopFile: "/usr/share/applications/wikipedia.desktop"; }
25− ListElement { desktopFile: "/usr/share/applications/youtube.desktop"; }
31+ ListElement { desktopFile: "/usr/share/applications/youtube.desktop"; }
32+ }
26}
33}
Dash/Apps/DesktopFileModel.qmlnew file+51
@@ -0,0 +1,51 @@
1+/*
2+ * Copyright (C) 2013 Canonical, Ltd.
3+ *
4+ * This program is free software; you can redistribute it and/or modify
5+ * it under the terms of the GNU General Public License as published by
6+ * the Free Software Foundation; version 3.
7+ *
8+ * This program is distributed in the hope that it will be useful,
9+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
10+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
11+ * GNU General Public License for more details.
12+ *
13+ * You should have received a copy of the GNU General Public License
14+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
15+ */
16+
17+import QtQuick 2.0
18+import "../../Applications"
19+
20+Item {
21+ id: root
22+
23+ property var model: null
24+ property var baseModel: null
25+
26+ ListModel {
27+ id: list
28+
29+ Component.onCompleted: { root.model = list; }
30+ }
31+
32+ Repeater {
33+ model: baseModel
34+ delegate: Item {
35+ Application {
36+ id: application
37+ desktopFile: model.desktopFile
38+ }
39+ Component.onCompleted: {
40+ list.append({"uri": model.desktopFile,
41+ "icon": "../../graphics/applicationIcons/" + application.icon + ".png",
42+ "category": 0,
43+ "mimetype": "application/x-desktop",
44+ "title": application.name,
45+ "comment": "",
46+ "dndUri": model.desktopFile,
47+ "metadata": {}});
48+ }
49+ }
50+ }
51+}
Dash/Apps/FrequentlyUsedAppsModel.qml+13−7
@@ -16,11 +16,17 @@
16
16
17import QtQuick 2.0
17import QtQuick 2.0
18
18
19+DesktopFileModel {
20+ baseModel: desktopModel
21+
19−ListModel {
22+ ListModel {
23+ id: desktopModel
24+
20− ListElement { desktopFile: "/usr/share/applications/camera-app.desktop"; }
25+ ListElement { desktopFile: "/usr/share/applications/camera-app.desktop"; }
21− ListElement { desktopFile: "/usr/share/applications/phone-app.desktop"; }
26+ ListElement { desktopFile: "/usr/share/applications/phone-app.desktop"; }
22− ListElement { desktopFile: "/usr/share/applications/gallery-app.desktop"; }
27+ ListElement { desktopFile: "/usr/share/applications/gallery-app.desktop"; }
23− ListElement { desktopFile: "/usr/share/applications/facebook-webapp.desktop"; }
28+ ListElement { desktopFile: "/usr/share/applications/facebook-webapp.desktop"; }
24− ListElement { desktopFile: "/usr/share/applications/webbrowser-app.desktop"; }
29+ ListElement { desktopFile: "/usr/share/applications/webbrowser-app.desktop"; }
25− ListElement { desktopFile: "/usr/share/applications/gmail-webapp.desktop"; }
30+ ListElement { desktopFile: "/usr/share/applications/gmail-webapp.desktop"; }
31+ }
26}
32}
Dash/DashApps.qml+4−39
@@ -29,43 +29,8 @@ GenericScopeView {
29 property var mainStageApplicationsModel: shell.applicationManager.mainStageApplications
29 property var mainStageApplicationsModel: shell.applicationManager.mainStageApplications
30 property var sideStageApplicationModel: shell.applicationManager.sideStageApplications
30 property var sideStageApplicationModel: shell.applicationManager.sideStageApplications
31
31
32− ListModel {
33− id: frequentlyUsedAppsModel
34− }
35−
36− FrequentlyUsedAppsModel { id: frequentlyUsedAppsBaseModel }
32+ FrequentlyUsedAppsModel { id: frequentlyUsedAppsModel }
37−
38− Repeater {
39− model: frequentlyUsedAppsBaseModel
40− delegate: Item {
41− Application {
42− id: application
43− desktopFile: model.desktopFile
44− }
45− Component.onCompleted: {
46− frequentlyUsedAppsModel.append({"uri": model.desktopFile, "icon": "../../graphics/applicationIcons/" + application.icon + ".png", "title": application.name, "dndUri": model.desktopFile});
47− }
48− }
49− }
50−
51− ListModel {
52− id: appsAvailableForDownloadModel
53− }
54−
55− AppsAvailableForDownloadModel { id: appsAvailableForDownloadBaseModel }
33+ AppsAvailableForDownloadModel { id: appsAvailableForDownloadModel }
56−
57− Repeater {
58− model: appsAvailableForDownloadBaseModel
59− delegate: Item {
60− Application {
61− id: application
62− desktopFile: model.desktopFile
63− }
64− Component.onCompleted: {
65− appsAvailableForDownloadModel.append({"uri": model.desktopFile, "icon": "../../graphics/applicationIcons/" + application.icon + ".png", "title": application.name, "dndUri": model.desktopFile});
66− }
67− }
68− }
69
34
70 ListModel {
35 ListModel {
71 id: runningApplicationsModel
36 id: runningApplicationsModel
@@ -76,8 +41,8 @@ GenericScopeView {
76 }
41 }
77
42
78 onScopeChanged: {
43 onScopeChanged: {
79− scopeView.scope.categories.overrideCategory("recently-used", frequentlyUsedAppsModel);
44+ scopeView.scope.categories.overrideCategory("recently-used", frequentlyUsedAppsModel.model);
80 scopeView.scope.categories.overrideCategory("recent", runningApplicationsModel);
45 scopeView.scope.categories.overrideCategory("recent", runningApplicationsModel);
81− scopeView.scope.categories.overrideCategory("more", appsAvailableForDownloadModel);
46+ scopeView.scope.categories.overrideCategory("more", appsAvailableForDownloadModel.model);
82 }
47 }
83}
48}