re-introducing tabs
This commit is contained in:
parent
0b42349f09
commit
97cb8d41a5
8 changed files with 26 additions and 17 deletions
|
@ -1,10 +1,11 @@
|
|||
1
|
||||
34
|
||||
35
|
||||
icons/bell-slash.png
|
||||
icons/bell.png
|
||||
icons/comments.png
|
||||
icons/default_cover.png
|
||||
icons/globe.png
|
||||
icons/home.png
|
||||
icons/ic_add.png
|
||||
icons/ic_add_bookmarks.png
|
||||
icons/ic_cancel.png
|
||||
|
|
|
@ -216,7 +216,7 @@ NavigationPane {
|
|||
onCreationCompleted: {
|
||||
switch (stream_type) {
|
||||
case "Home":
|
||||
endpoint = "/posts/streams/me";
|
||||
endpoint = "/posts/streams/unified";
|
||||
break;
|
||||
case "Global":
|
||||
default:
|
||||
|
|
Binary file not shown.
Before Width: | Height: | Size: 4.3 KiB After Width: | Height: | Size: 1.4 KiB |
BIN
assets/icons/home.png
Normal file
BIN
assets/icons/home.png
Normal file
Binary file not shown.
After Width: | Height: | Size: 1.1 KiB |
|
@ -39,6 +39,19 @@ TabbedPane {
|
|||
]
|
||||
}
|
||||
|
||||
activeTab: globalStream
|
||||
|
||||
Tab {
|
||||
id: homeStream
|
||||
title: qsTr("Home")
|
||||
delegate: Delegate {
|
||||
StreamTab {
|
||||
stream_type: "Home"
|
||||
}
|
||||
}
|
||||
imageSource: "asset:///icons/home.png"
|
||||
}
|
||||
|
||||
Tab {
|
||||
id: globalStream
|
||||
title: qsTr("Global")
|
||||
|
@ -51,15 +64,4 @@ TabbedPane {
|
|||
imageSource: "asset:///icons/globe.png"
|
||||
}
|
||||
|
||||
// Tab {
|
||||
// id: homeStream
|
||||
// title: qsTr("Home")
|
||||
// delegate: Delegate {
|
||||
// StreamTab {
|
||||
// stream_type: "Home"
|
||||
// }
|
||||
// }
|
||||
// imageSource: "asset:///icons/ic_home.png"
|
||||
// }
|
||||
|
||||
}
|
||||
|
|
2
buildnum
2
buildnum
|
@ -1 +1 @@
|
|||
123
|
||||
126
|
|
@ -78,6 +78,7 @@ config_pri_assets {
|
|||
$$quote($$BASEDIR/assets/icons/comments.png) \
|
||||
$$quote($$BASEDIR/assets/icons/default_cover.png) \
|
||||
$$quote($$BASEDIR/assets/icons/globe.png) \
|
||||
$$quote($$BASEDIR/assets/icons/home.png) \
|
||||
$$quote($$BASEDIR/assets/icons/ic_add.png) \
|
||||
$$quote($$BASEDIR/assets/icons/ic_add_bookmarks.png) \
|
||||
$$quote($$BASEDIR/assets/icons/ic_cancel.png) \
|
||||
|
|
|
@ -139,12 +139,12 @@
|
|||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../assets/StreamTab.qml" line="107"/>
|
||||
<location filename="../assets/StreamTab.qml" line="108"/>
|
||||
<source>Reload</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../assets/StreamTab.qml" line="118"/>
|
||||
<location filename="../assets/StreamTab.qml" line="119"/>
|
||||
<source>Load Older</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
|
@ -157,7 +157,12 @@
|
|||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../assets/main.qml" line="44"/>
|
||||
<location filename="../assets/main.qml" line="46"/>
|
||||
<source>Home</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../assets/main.qml" line="57"/>
|
||||
<source>Global</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
|
|
Reference in a new issue