f58f482 · unity8 · git.iko.soy

Dash/Apps/DashPluginFilterGrid.qmlnew file+50

compare with xenial

unifiedsplit

@@ -0,0 +1,50 @@

1+/*

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 Ubuntu.Components 0.1

19+import "../../Components"

20+import "../Generic"

21+

22+GenericFilterGrid {

23+ id: filtergrid

24+

25+ delegate: Tile {

26+ id: tile

27+ objectName: "delegate" + index

28+ width: filtergrid.cellWidth

29+ height: filtergrid.cellHeight

30+ text: model.title

31+ imageWidth: filtergrid.iconWidth

32+ imageHeight: filtergrid.iconHeight

33+ source: model.icon

34+ fillMode: Image.PreserveAspectCrop

35+

36+ style: FlatTileStyle {

37+ disabled: model.scopeDisabled

38+ }

39+

40+ onClicked: {

41+ var data = { model: model }

42+ filtergrid.clicked(index, data, tile.y)

43+ }

44+

45+ onPressAndHold: {

46+ var data = { model: model }

47+ filtergrid.pressAndHold(index, data, tile.y)

48+ }

49+ }

50+}

Dash/Generic/TileStyleDashPlugin.qml → Dash/Generic/FlatTileStyle.qmlrenamed+3

@@ -20,6 +20,8 @@ import Ubuntu.Components 0.1

20Item {

21 id: tile

22

23+ property bool disabled: false

24+

23 anchors.fill: parent

25 anchors.fill: parent

24

26

25 Item {

27 Item {

@@ -39,6 +41,7 @@ Item {

39 cache: false

41 cache: false

40 source: styledItem.source

42 source: styledItem.source

41 fillMode: styledItem.fillMode

43 fillMode: styledItem.fillMode

44+ opacity: tile.disabled ? 0.5 : 1.0

42 horizontalAlignment: styledItem.horizontalAlignment

45 horizontalAlignment: styledItem.horizontalAlignment

43 verticalAlignment: styledItem.verticalAlignment

46 verticalAlignment: styledItem.verticalAlignment

44 }

47 }

Dash/Generic/GenericFilterGridDashPlugin.qml → Dash/Generic/WeatherFilterGrid.qmlrenamed+1−1

@@ -32,7 +32,7 @@ GenericFilterGrid {

32 source: model.icon

33 fillMode: Image.PreserveAspectCrop

34

35− style: TileStyleDashPlugin {}

35+ style: FlatTileStyle {}

36

37 onClicked: {

38 var data = { model: model }

Dash/GenericScopeView.qml+2−1

@@ -199,10 +199,11 @@ ScopeView {

199 case "music": return "Music/MusicFilterGrid.qml";

200 case "apps": {

201 if (rendererHint == "toggled")

202− return "Generic/GenericFilterGridDashPlugin.qml";

202+ return "Apps/DashPluginFilterGrid.qml";

203 else

204 return "Generic/GenericFilterGrid.qml";

205 }

206+ case "weather": return "Generic/WeatherFilterGrid.qml";

206 default: return "Generic/GenericFilterGrid.qml";

207 default: return "Generic/GenericFilterGrid.qml";

207 }

208 }

209 }

plugins/Unity/categoryresults.cpp+13

@@ -46,6 +46,7 @@ CategoryResults::CategoryResults(QObject* parent)

46 m_roles[CategoryResults::RoleComment] = "comment";

47 m_roles[CategoryResults::RoleDndUri] = "dndUri";

48 m_roles[CategoryResults::RoleMetadata] = "metadata";

49+ m_roles[CategoryResults::RoleMetadataScopeDisabled] = "scopeDisabled";

49}

50}

50

51

51int CategoryResults::categoryIndex() const

52int CategoryResults::categoryIndex() const

@@ -93,6 +94,18 @@ CategoryResults::data(const QModelIndex& index, int role) const

93 return DeeListModel::data(index, ResultsColumn::DND_URI);

94 return DeeListModel::data(index, ResultsColumn::DND_URI);

94 case RoleMetadata:

95 case RoleMetadata:

95 return DeeListModel::data(index, ResultsColumn::METADATA);

96 return DeeListModel::data(index, ResultsColumn::METADATA);

97+ // nasty hack while we don't support annotated icons

98+ case RoleMetadataScopeDisabled:

99+ {

100+ QVariantHash hash(DeeListModel::data(index, ResultsColumn::METADATA).toHash());

101+ if (hash.contains("content")) {

102+ QVariantHash innerHash(hash["content"].toHash());

103+ if (innerHash.contains("scope_disabled")) {

104+ return innerHash["scope_disabled"];

105+ }

106+ }

107+ return QVariant();

108+ }

96 default:

109 default:

97 return QVariant();

110 return QVariant();

98 }

111 }

plugins/Unity/categoryresults.h+2−1

@@ -43,7 +43,8 @@ public:

43 RoleTitle,

44 RoleComment,

45 RoleDndUri,

46− RoleMetadata

46+ RoleMetadata,

47+ RoleMetadataScopeDisabled

47 };

48 };

48

49

49 QVariant data(const QModelIndex& index, int role = Qt::DisplayRole) const;

50 QVariant data(const QModelIndex& index, int role = Qt::DisplayRole) const;