git.iko.soy/unity8
on xenial help sign in
update column and category ids
commitc61aa9caaf49cb49bb53cfaa3503e4159316c582 authorMichał Sawicz <michal.sawicz@canonical.com> dateFri 14 Jun 2013, 22:57 (13 years ago) parentc4f013a
5 files changed+9−9
compare with xenial
unifiedsplit
Dash/Apps/ApplicationsFilterGrid.qml+1−1 Dash/DashMusic.qml+1−1 Dash/DashVideos.qml+3−3 Dash/Music/MusicFilterGrid.qml+2−2 Dash/Video/VideosFilterGrid.qml+2−2
Dash/Apps/ApplicationsFilterGrid.qml+1−1
@@ -47,7 +47,7 @@ FilterGrid {
4747
4848 width: filterGrid.cellWidth
4949 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
5151 imageWidth: units.gu(8)
5252 imageHeight: units.gu(7.5)
5353 source: icon.indexOf("/") == -1 ? "image://gicon/" + icon : icon
Dash/DashMusic.qml+1−1
@@ -59,7 +59,7 @@ ScopeView {
5959
6060 function getRenderer(categoryId) {
6161 switch (categoryId) {
62− case 0: return musicCarousel
62+ case 1: return musicCarousel
6363 default: return musicFilterGrid
6464 }
6565 }
Dash/DashVideos.qml+3−3
@@ -60,7 +60,7 @@ ScopeView {
6060
6161 function getRenderer(categoryId) {
6262 switch (categoryId) {
63− case 0: return videosCarousel
63+ case 1: return videosCarousel
6464 default: return videosFilterGrid
6565 }
6666 }
@@ -127,9 +127,9 @@ ScopeView {
127127 var dataItem;
128128 // VideosCarousel and VideosFilterGrid have different
129129 // clicked signals, accomodate for that
130− if (categoryId == 0) {
130+ if (categoryId == 1) {
131131 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}
133133 } else {
134134 dataItem = data;
135135 }
Dash/Music/MusicFilterGrid.qml+2−2
@@ -38,8 +38,8 @@ FilterGrid {
3838 height: filterGrid.cellHeight
3939 iconWidth: filterGrid.iconWidth
4040 iconHeight: filterGrid.iconHeight
41− artist: model.column_4
42− album: model.column_5
41+ artist: model.column_5
42+ album: model.column_6
4343 source: model.column_1
4444 onClicked: {
4545 filterGrid.clicked(index);
Dash/Video/VideosFilterGrid.qml+2−2
@@ -37,14 +37,14 @@ FilterGrid {
3737 objectName: "delegate" + index
3838 width: filtergrid.cellWidth
3939 height: filtergrid.cellHeight
40− text: model.column_4
40+ text: model.column_5
4141 imageWidth: filtergrid.iconWidth
4242 imageHeight: filtergrid.iconHeight
4343 source: model.column_1
4444 fillMode: Image.PreserveAspectCrop
4545 onClicked: {
4646 var fileUri = model.column_0.replace(/^[^:]+:/, "")
47− var data = {fileUri: fileUri, nfoUri: model.column_5}
47+ var data = {fileUri: fileUri, nfoUri: model.column_6}
4848 filtergrid.clicked(index, data, tile.y);
4949 }
5050 }