medvedych/harbour-tooter
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge branch 'master' of https://github.com/molan-git/harbour-tooter

Browse source
This commit is contained in:
molan-git 2020-06-11 14:46:54 +02:00
commit aa2e8d65da
7 changed files with 71 additions and 70 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
qml/harbour-tooterb.qml
View file

@ -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: {

2
qml/pages/components/VisualContainer.qml
View file

@ -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