git.iko.soy/unity8
on xenial help sign in
Kill unused ApplicationsFilterGrid.qml
7ef50f7Albert Astals
Dash/Apps/ApplicationsFilterGrid.qmldeleted−64
compare with xenial
unifiedsplit
@@ -1,64 +0,0 @@
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 "../../Components"
19−import "../../Applications"
20−
21−FilterGrid {
22− id: filtergrid
23−
24− filter: false
25− minimumHorizontalSpacing: units.gu(0.5)
26− maximumNumberOfColumns: 6
27− delegateWidth: units.gu(11)
28− delegateHeight: units.gu(9.5)
29− verticalSpacing: units.gu(2)
30−
31− signal clicked(int index, real itemY)
32− signal pressAndHold(int index, real itemY)
33−
34− delegate: Tile {
35− id: tile
36− objectName: "delegate" + index
37− Application {
38− id: application
39− desktopFile: model.dndUri ? stripProtocol(model.dndUri) : model.desktopFile // FIXME: this is temporary
40−
41− function stripProtocol(uri) {
42− var chunks = uri.split('file://')
43− return chunks[chunks.length-1]
44− }
45− }
46−
47− property string icon: model.icon ? model.icon : "../../graphics/applicationIcons/" + application.icon + ".png" // FIXME: this is temporary
48−
49− width: filtergrid.cellWidth
50− height: filtergrid.cellHeight
51− text: model.title ? model.title : application.name // FIXME: this is temporary
52− imageWidth: units.gu(8)
53− imageHeight: units.gu(7.5)
54− source: icon
55−
56− onClicked: {
57− filtergrid.clicked(index, tile.y)
58− }
59−
60− onPressAndHold: {
61− filtergrid.pressAndHold(index, tile.y)
62− }
63− }
64−}
tests/autopilot/unity8/shell/emulators/main_window.py−6
@@ -67,12 +67,6 @@ class MainWindow(object):
67 def get_dash(self):
67 def get_dash(self):
68 return self.app.select_single(Dash)
68 return self.app.select_single(Dash)
69
69
70− def get_dash_home_applications_grid(self):
71− return self.app.select_single(
72− "ApplicationsFilterGrid",
73− objectName="dashHomeApplicationsGrid"
74− )
75−
76 def get_bottombar(self):
70 def get_bottombar(self):
77 return self.app.select_single("Bottombar")
71 return self.app.select_single("Bottombar")
78
72
tests/qmltests/Dash/tst_FilterGrids.qml+1−2
@@ -108,8 +108,7 @@ Rectangle {
108 function test_clicked_signal_data() {
108 function test_clicked_signal_data() {
109 return [
109 return [
110 {tag: "VideoFilterGrid", component: "Video/VideoFilterGrid.qml"},
110 {tag: "VideoFilterGrid", component: "Video/VideoFilterGrid.qml"},
111− {tag: "MusicFilterGrid", component: "Music/MusicFilterGrid.qml"},
111+ {tag: "MusicFilterGrid", component: "Music/MusicFilterGrid.qml"}
112− {tag: "ApplicationsFilterGrid", component: "Apps/ApplicationsFilterGrid.qml"}
113 ]
112 ]
114 }
113 }
115
114