Fix: incorrect page title and minor UI fixes
This commit is contained in:
parent
219a29a5de
commit
9e3176998d
7 changed files with 5 additions and 22 deletions
|
|
@ -131,20 +131,7 @@ Page {
|
|||
|
||||
PaddedLabel {
|
||||
horizontalAlignment: Text.AlignLeft
|
||||
textFormat: Text.RichText
|
||||
text: "QHTTPServer - Copyright © 2011-2014 Nikhil Marathe"
|
||||
}
|
||||
|
||||
PaddedLabel {
|
||||
horizontalAlignment: Text.AlignLeft
|
||||
textFormat: Text.RichText
|
||||
text: "Readability.js - Copyright © 2010 Arc90 Inc"
|
||||
}
|
||||
|
||||
PaddedLabel {
|
||||
horizontalAlignment: Text.AlignLeft
|
||||
textFormat: Text.RichText
|
||||
text: "SimpleCrypt - Copyright © 2011 Andre Somers"
|
||||
text: "QHTTPServer \nReadability.js \nSimpleCrypt"
|
||||
}
|
||||
|
||||
Spacer {}
|
||||
|
|
|
|||
|
|
@ -45,7 +45,6 @@ Page {
|
|||
|
||||
function openBrowser(index, link, uid) {
|
||||
entryModel.setData(index, "read", 1, "");
|
||||
notification.show(qsTr("Launching a browser..."));
|
||||
Qt.openUrlExternally(link);
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -112,7 +112,7 @@ Page {
|
|||
if (enabled) {
|
||||
utils.setEntryModel(uid);
|
||||
pageStack.push(Qt.resolvedUrl("EntryPage.qml"),
|
||||
{"title": title.text, "index": model.index, "readlater": false})
|
||||
{"title": title, "index": model.index, "readlater": false})
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -147,7 +147,6 @@ Page {
|
|||
}
|
||||
|
||||
function openUrlEntryInBrowser(url) {
|
||||
notification.show(qsTr("Launching a browser..."));
|
||||
Qt.openUrlExternally(url);
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -25,7 +25,6 @@ Notification {
|
|||
id: root
|
||||
|
||||
expireTimeout: 4000
|
||||
maxContentLines: 10
|
||||
|
||||
function show(bodyText, summaryText, clickedHandler) {
|
||||
//console.log("show: " + bodyText + " " + summaryText)
|
||||
|
|
|
|||
|
|
@ -113,11 +113,12 @@ Page {
|
|||
if (vm == 0) {
|
||||
utils.setFeedModel(uid);
|
||||
pageStack.push(Qt.resolvedUrl("FeedPage.qml"),
|
||||
{"title": title.text, "index": model.index})
|
||||
{"title": title, "index": model.index})
|
||||
} else if (vm == 1) {
|
||||
utils.setEntryModel(uid);
|
||||
console.log()
|
||||
pageStack.push(Qt.resolvedUrl("EntryPage.qml"),
|
||||
{"title": title.text, "readlater": false})
|
||||
{"title": title, "readlater": false})
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -58,7 +58,6 @@ Page {
|
|||
}
|
||||
|
||||
function openUrlEntryInBrowser(url) {
|
||||
notification.show(qsTr("Launching a browser..."))
|
||||
Qt.openUrlExternally(url)
|
||||
}
|
||||
|
||||
|
|
@ -404,7 +403,6 @@ Page {
|
|||
text: qsTr("Browser")
|
||||
icon: "image://icons/icon-m-browser"
|
||||
onClicked: {
|
||||
notification.show(qsTr("Launching a browser..."));
|
||||
var url = view.url.toString().lastIndexOf("about") === 0 ||
|
||||
view.url.length === 0 ? root.onlineUrl : view.url
|
||||
console.log("Opening: " + url)
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue