diff --git a/src/qml/EntryListDelegate.qml b/src/qml/EntryListDelegate.qml index 064c46ce..e2223c58 100644 --- a/src/qml/EntryListDelegate.qml +++ b/src/qml/EntryListDelegate.qml @@ -26,18 +26,10 @@ Kirigami.SwipeListItem { bold: !model.entry.read onClicked: { - if(pageStack.depth > 2) + while(pageStack.depth > 2) pageStack.pop() model.entry.read = true pageStack.push("qrc:/EntryPage.qml", {"entry": model.entry}) } } - - actions: [ - Kirigami.Action { - text: i18n("Open in Browser") - icon.name: "globe" - onTriggered: Qt.openUrlExternally(model.entry.link) - } - ] } diff --git a/src/qml/EntryListPage.qml b/src/qml/EntryListPage.qml index fa7e498f..231ba6be 100644 --- a/src/qml/EntryListPage.qml +++ b/src/qml/EntryListPage.qml @@ -37,7 +37,11 @@ Kirigami.ScrollablePage { Kirigami.Action { iconName: "help-about-symbolic" text: i18n("Details") - onTriggered: pageStack.push("qrc:/FeedDetailsPage.qml", {"feed": feed}) + onTriggered: { + while(pageStack.depth > 2) + pageStack.pop() + pageStack.push("qrc:/FeedDetailsPage.qml", {"feed": feed}) + } } ] diff --git a/src/qml/FeedListDelegate.qml b/src/qml/FeedListDelegate.qml index 01ea9171..26b8e5ad 100644 --- a/src/qml/FeedListDelegate.qml +++ b/src/qml/FeedListDelegate.qml @@ -26,6 +26,8 @@ Kirigami.SwipeListItem { onClicked: { lastFeed = model.feed.url + while(pageStack.depth > 1) + pageStack.pop() pageStack.push("qrc:/EntryListPage.qml", {"feed": model.feed}) } }