Merge branch 'ui-improvements' into develop
This commit is contained in:
commit
a59a15b781
7 changed files with 71 additions and 70 deletions
|
@ -35,8 +35,8 @@ import "./lib/API.js" as Logic
|
||||||
|
|
||||||
ApplicationWindow {
|
ApplicationWindow {
|
||||||
id: appWindow
|
id: appWindow
|
||||||
cover: Qt.resolvedUrl("cover/CoverPage.qml")
|
|
||||||
allowedOrientations: defaultAllowedOrientations
|
allowedOrientations: defaultAllowedOrientations
|
||||||
|
cover: Qt.resolvedUrl("cover/CoverPage.qml")
|
||||||
Component.onCompleted: {
|
Component.onCompleted: {
|
||||||
var obj = {}
|
var obj = {}
|
||||||
Logic.mediator.installTo(obj)
|
Logic.mediator.installTo(obj)
|
||||||
|
@ -73,6 +73,7 @@ ApplicationWindow {
|
||||||
//Logic.conf.notificationLastID = 0;
|
//Logic.conf.notificationLastID = 0;
|
||||||
Logic.saveData()
|
Logic.saveData()
|
||||||
}
|
}
|
||||||
|
|
||||||
Connections {
|
Connections {
|
||||||
target: Dbus
|
target: Dbus
|
||||||
onViewtoot: {
|
onViewtoot: {
|
||||||
|
|
|
@ -305,7 +305,7 @@ BackgroundItem {
|
||||||
|
|
||||||
MenuItem {
|
MenuItem {
|
||||||
id: mnuFavourite
|
id: mnuFavourite
|
||||||
visible: model.type !== "follow" || model.status_visibility !== "direct"
|
visible: model.type !== "follow"
|
||||||
text: typeof model.favourited !== "undefined" && model.favourited ? qsTr("Unfavorite") : qsTr("Favorite")
|
text: typeof model.favourited !== "undefined" && model.favourited ? qsTr("Unfavorite") : qsTr("Favorite")
|
||||||
onClicked: {
|
onClicked: {
|
||||||
var status = typeof model.favourited !== "undefined" && model.favourited
|
var status = typeof model.favourited !== "undefined" && model.favourited
|
||||||
|
|
Loading…
Reference in a new issue