git.iko.soy/unity8
on xenial help sign in
update column and category ids
c61aa9cMichał Sawicz
Dash/Apps/ApplicationsFilterGrid.qml+1−1
compare with xenial
unifiedsplit
@@ -47,7 +47,7 @@ FilterGrid {
47
47
48 width: filterGrid.cellWidth
48 width: filterGrid.cellWidth
49 height: filterGrid.cellHeight
49 height: filterGrid.cellHeight
50− text: model.column_4 ? model.column_4 : application.name // FIXME: this is temporary
50+ text: model.column_5 ? model.column_5 : application.name // FIXME: this is temporary
51 imageWidth: units.gu(8)
51 imageWidth: units.gu(8)
52 imageHeight: units.gu(7.5)
52 imageHeight: units.gu(7.5)
53 source: icon.indexOf("/") == -1 ? "image://gicon/" + icon : icon
53 source: icon.indexOf("/") == -1 ? "image://gicon/" + icon : icon
Dash/DashMusic.qml+1−1
@@ -59,7 +59,7 @@ ScopeView {
59
59
60 function getRenderer(categoryId) {
60 function getRenderer(categoryId) {
61 switch (categoryId) {
61 switch (categoryId) {
62− case 0: return musicCarousel
62+ case 1: return musicCarousel
63 default: return musicFilterGrid
63 default: return musicFilterGrid
64 }
64 }
65 }
65 }
Dash/DashVideos.qml+3−3
@@ -60,7 +60,7 @@ ScopeView {
60
60
61 function getRenderer(categoryId) {
61 function getRenderer(categoryId) {
62 switch (categoryId) {
62 switch (categoryId) {
63− case 0: return videosCarousel
63+ case 1: return videosCarousel
64 default: return videosFilterGrid
64 default: return videosFilterGrid
65 }
65 }
66 }
66 }
@@ -127,9 +127,9 @@ ScopeView {
127 var dataItem;
127 var dataItem;
128 // VideosCarousel and VideosFilterGrid have different
128 // VideosCarousel and VideosFilterGrid have different
129 // clicked signals, accomodate for that
129 // clicked signals, accomodate for that
130− if (categoryId == 0) {
130+ if (categoryId == 1) {
131 var fileUri = delegateItem.model.column_0.replace(/^[^:]+:/, "")
131 var fileUri = delegateItem.model.column_0.replace(/^[^:]+:/, "")
132− dataItem = {fileUri: fileUri, nfoUri: delegateItem.model.column_5}
132+ dataItem = {fileUri: fileUri, nfoUri: delegateItem.model.column_6}
133 } else {
133 } else {
134 dataItem = data;
134 dataItem = data;
135 }
135 }
Dash/Music/MusicFilterGrid.qml+2−2
@@ -38,8 +38,8 @@ FilterGrid {
38 height: filterGrid.cellHeight
38 height: filterGrid.cellHeight
39 iconWidth: filterGrid.iconWidth
39 iconWidth: filterGrid.iconWidth
40 iconHeight: filterGrid.iconHeight
40 iconHeight: filterGrid.iconHeight
41− artist: model.column_4
41+ artist: model.column_5
42− album: model.column_5
42+ album: model.column_6
43 source: model.column_1
43 source: model.column_1
44 onClicked: {
44 onClicked: {
45 filterGrid.clicked(index);
45 filterGrid.clicked(index);
Dash/Video/VideosFilterGrid.qml+2−2
@@ -37,14 +37,14 @@ FilterGrid {
37 objectName: "delegate" + index
37 objectName: "delegate" + index
38 width: filtergrid.cellWidth
38 width: filtergrid.cellWidth
39 height: filtergrid.cellHeight
39 height: filtergrid.cellHeight
40− text: model.column_4
40+ text: model.column_5
41 imageWidth: filtergrid.iconWidth
41 imageWidth: filtergrid.iconWidth
42 imageHeight: filtergrid.iconHeight
42 imageHeight: filtergrid.iconHeight
43 source: model.column_1
43 source: model.column_1
44 fillMode: Image.PreserveAspectCrop
44 fillMode: Image.PreserveAspectCrop
45 onClicked: {
45 onClicked: {
46 var fileUri = model.column_0.replace(/^[^:]+:/, "")
46 var fileUri = model.column_0.replace(/^[^:]+:/, "")
47− var data = {fileUri: fileUri, nfoUri: model.column_5}
47+ var data = {fileUri: fileUri, nfoUri: model.column_6}
48 filtergrid.clicked(index, data, tile.y);
48 filtergrid.clicked(index, data, tile.y);
49 }
49 }
50 }
50 }