Castopod
/
kasts
mirror of https://github.com/KDE/kasts.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Rename main window id to kastsMainWindow instead of root

This commit is contained in:
Bart De Vries 2023-02-10 15:28:53 +01:00
parent 04f44bc078
commit 3f1859e14b
4 changed files with 53 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/qml/Mobile/BottomToolbar.qml
View File

@ -23,7 +23,7 @@ Kirigami.NavigationTabBar {
Kirigami.Action {
icon.name: "view-media-playlist"
text: i18n("Queue")
checked: "QueuePage" === root.currentPage
checked: "QueuePage" === kastsMainWindow.currentPage
onTriggered: {
pushPage("QueuePage");
}
@ -31,7 +31,7 @@ Kirigami.NavigationTabBar {
Kirigami.Action {
icon.name: "bookmarks"
text: i18n("Subscriptions")
checked: "FeedListPage" === root.currentPage
checked: "FeedListPage" === kastsMainWindow.currentPage
onTriggered: {
pushPage("FeedListPage");
}
@ -39,7 +39,7 @@ Kirigami.NavigationTabBar {
Kirigami.Action {
icon.name: "rss"
text: i18n("Episodes")
checked: "EpisodeListPage" === root.currentPage
checked: "EpisodeListPage" === kastsMainWindow.currentPage
onTriggered: {
pushPage("EpisodeListPage")
}
@ -47,7 +47,7 @@ Kirigami.NavigationTabBar {
Kirigami.Action {
icon.name: "settings-configure"
text: i18n("Settings")
checked: "SettingsPage" === root.currentPage
checked: "SettingsPage" === kastsMainWindow.currentPage
onTriggered: {
applicationWindow().pageStack.clear()
applicationWindow().pageStack.push("qrc:/SettingsPage.qml", {}, {

6
src/qml/Mobile/FooterBar.qml
View File

@ -111,11 +111,11 @@ Flickable {
anchors.bottom: parent.bottom
anchors.left: parent.left
anchors.right: parent.right
height: root.height + root.miniplayerSize + contentToPlayerSpacing
height: kastsMainWindow.height + kastsMainWindow.miniplayerSize + contentToPlayerSpacing
spacing: 0
Controls.Control {
implicitHeight: root.miniplayerSize + contentToPlayerSpacing
implicitHeight: kastsMainWindow.miniplayerSize + contentToPlayerSpacing
Layout.fillWidth: true
padding: 0
@ -145,7 +145,7 @@ Flickable {
MinimizedPlayerControls {
id: playControlItem
height: root.miniplayerSize
height: kastsMainWindow.miniplayerSize
focus: true
anchors.left: parent.left
anchors.right: parent.right

24
src/qml/Mobile/MobilePlayerControls.qml
View File

@ -108,14 +108,14 @@ Kirigami.Page {
id: coverImage
anchors {
top: parent.top
bottom: root.isWidescreen ? parent.bottom : undefined
bottom: kastsMainWindow.isWidescreen ? parent.bottom : undefined
left: parent.left
right: root.isWidescreen ? undefined : parent.right
right: kastsMainWindow.isWidescreen ? undefined : parent.right
margins: 0
topMargin: root.isWidescreen ? 0 : (parent.height - Math.min(height, width) - imageLabels.implicitHeight - 2 * parent.textMargin) / 2
topMargin: kastsMainWindow.isWidescreen ? 0 : (parent.height - Math.min(height, width) - imageLabels.implicitHeight - 2 * parent.textMargin) / 2
}
height: Math.min(parent.height - (root.isWidescreen ? 0 : imageLabels.implicitHeight + 2 * parent.textMargin), parent.width)
width: root.isWidescreen ? Math.min(parent.height, parent.width / 2) : Math.min(parent.width, height)
height: Math.min(parent.height - (kastsMainWindow.isWidescreen ? 0 : imageLabels.implicitHeight + 2 * parent.textMargin), parent.width)
width: kastsMainWindow.isWidescreen ? Math.min(parent.height, parent.width / 2) : Math.min(parent.width, height)
ImageWithFallback {
imageSource: AudioManager.entry ? ((chapterModel.currentChapter && chapterModel.currentChapter !== undefined) ? chapterModel.currentChapter.cachedImage : AudioManager.entry.cachedImage) : "no-image"
@ -130,12 +130,12 @@ Kirigami.Page {
Item {
anchors {
top: root.isWidescreen ? parent.top : coverImage.bottom
top: kastsMainWindow.isWidescreen ? parent.top : coverImage.bottom
bottom: parent.bottom
left: root.isWidescreen ? coverImage.right : parent.left
left: kastsMainWindow.isWidescreen ? coverImage.right : parent.left
right: parent.right
leftMargin: root.isWidescreen ? parent.textMargin : 0
topMargin: root.isWidescreen ? 0 : parent.textMargin
leftMargin: kastsMainWindow.isWidescreen ? parent.textMargin : 0
topMargin: kastsMainWindow.isWidescreen ? 0 : parent.textMargin
bottomMargin: 0
}
@ -398,8 +398,8 @@ Kirigami.Page {
}
Loader {
active: !root.isWidescreen
visible: !root.isWidescreen
active: !kastsMainWindow.isWidescreen
visible: !kastsMainWindow.isWidescreen
sourceComponent: slider
Layout.fillWidth: true
Layout.leftMargin: Kirigami.Units.largeSpacing
@ -418,7 +418,7 @@ Kirigami.Page {
font: Kirigami.Theme.smallFont
}
Loader {
active: root.isWidescreen
active: kastsMainWindow.isWidescreen
sourceComponent: slider
Layout.fillWidth: true

68
src/qml/main.qml
View File

@ -17,7 +17,7 @@ import org.kde.kasts.solidextras 1.0
import org.kde.kasts 1.0
Kirigami.ApplicationWindow {
id: root
id: kastsMainWindow
title: "Kasts"
width: Kirigami.Settings.isMobile ? 360 : 800
@ -45,7 +45,7 @@ Kirigami.ApplicationWindow {
property var lastFeed: ""
property string currentPage: ""
property bool isWidescreen: root.width > root.height
property bool isWidescreen: kastsMainWindow.width > kastsMainWindow.height
function getPage(page) {
switch (page) {
@ -68,33 +68,33 @@ Kirigami.ApplicationWindow {
Settings {
id: settings
property alias x: root.x
property alias y: root.y
property alias x: kastsMainWindow.x
property alias y: kastsMainWindow.y
property var mobileWidth
property var mobileHeight
property var desktopWidth
property var desktopHeight
property int headerSize: Kirigami.Units.gridUnit * 5
property alias lastOpenedPage: root.currentPage
property alias lastOpenedPage: kastsMainWindow.currentPage
}
function saveWindowLayout() {
if (Kirigami.Settings.isMobile) {
settings.mobileWidth = root.width;
settings.mobileHeight = root.height;
settings.mobileWidth = kastsMainWindow.width;
settings.mobileHeight = kastsMainWindow.height;
} else {
settings.desktopWidth = root.width;
settings.desktopHeight = root.height;
settings.desktopWidth = kastsMainWindow.width;
settings.desktopHeight = kastsMainWindow.height;
}
}
function restoreWindowLayout() {
if (Kirigami.Settings.isMobile) {
if (settings.mobileWidth) root.width = settings.mobileWidth;
if (settings.mobileHeight) root.height = settings.mobileHeight;
if (settings.mobileWidth) kastsMainWindow.width = settings.mobileWidth;
if (settings.mobileHeight) kastsMainWindow.height = settings.mobileHeight;
} else {
if (settings.desktopWidth) root.width = settings.desktopWidth;
if (settings.desktopHeight) root.height = settings.desktopHeight;
if (settings.desktopWidth) kastsMainWindow.width = settings.desktopWidth;
if (settings.desktopHeight) kastsMainWindow.height = settings.desktopHeight;
}
}
@ -124,7 +124,7 @@ Kirigami.ApplicationWindow {
globalDrawer: sidebar.item
Loader {
id: sidebar
active: !Kirigami.Settings.isMobile || root.isWidescreen
active: !Kirigami.Settings.isMobile || kastsMainWindow.isWidescreen
sourceComponent: Kirigami.OverlayDrawer {
id: drawer
modal: false
@ -134,9 +134,9 @@ Kirigami.ApplicationWindow {
readonly property real pinnedWidth: Kirigami.Units.gridUnit * 3
readonly property real widescreenSmallWidth: Kirigami.Units.gridUnit * 6
readonly property real widescreenBigWidth: Kirigami.Units.gridUnit * 10
readonly property int buttonDisplayMode: root.isWidescreen ? (drawer.height < listViewThreshold ? Kirigami.NavigationTabButton.TextBesideIcon : Kirigami.NavigationTabButton.TextUnderIcon) : Kirigami.NavigationTabButton.IconOnly
readonly property int buttonDisplayMode: kastsMainWindow.isWidescreen ? (drawer.height < listViewThreshold ? Kirigami.NavigationTabButton.TextBesideIcon : Kirigami.NavigationTabButton.TextUnderIcon) : Kirigami.NavigationTabButton.IconOnly
width: root.isWidescreen ? (drawer.height < listViewThreshold ? widescreenBigWidth : widescreenSmallWidth) : pinnedWidth
width: kastsMainWindow.isWidescreen ? (drawer.height < listViewThreshold ? widescreenBigWidth : widescreenSmallWidth) : pinnedWidth
Kirigami.Theme.colorSet: Kirigami.Theme.Window
Kirigami.Theme.inherit: false
@ -238,8 +238,8 @@ Kirigami.ApplicationWindow {
checked: currentPage == "SettingsPage"
onClicked: {
checked = false;
root.pageStack.layers.clear()
root.pageStack.pushDialogLayer("qrc:/SettingsPage.qml", {}, {
kastsMainWindow.pageStack.layers.clear()
kastsMainWindow.pageStack.pushDialogLayer("qrc:/SettingsPage.qml", {}, {
title: i18n("Settings")
})
}
@ -259,16 +259,16 @@ Kirigami.ApplicationWindow {
Connections {
target: AudioManager
function onRaiseWindowRequested() {
root.visible = true;
root.show();
root.raise();
root.requestActivate();
kastsMainWindow.visible = true;
kastsMainWindow.show();
kastsMainWindow.raise();
kastsMainWindow.requestActivate();
}
}
Connections {
target: AudioManager
function onQuitRequested() {
root.close();
kastsMainWindow.close();
}
}
@ -292,7 +292,7 @@ Kirigami.ApplicationWindow {
visible: active
z: (!item || item.contentY === 0) ? -1 : 999
sourceComponent: FooterBar {
contentHeight: root.height * 2
contentHeight: kastsMainWindow.height * 2
focus: true
contentToPlayerSpacing: footer.active ? footer.item.height + 1 : 0
}
@ -313,7 +313,7 @@ Kirigami.ApplicationWindow {
footer: Loader {
visible: active
height: visible ? implicitHeight : 0
active: Kirigami.Settings.isMobile && !root.isWidescreen
active: Kirigami.Settings.isMobile && !kastsMainWindow.isWidescreen
sourceComponent: BottomToolbar {
transparentBackground: footerLoader.active
opacity: (!footerLoader.item || footerLoader.item.contentY === 0) ? 1 : 0
@ -484,12 +484,12 @@ Kirigami.ApplicationWindow {
// Systray implementation
Connections {
target: root
target: kastsMainWindow
function onClosing() {
if (SystrayIcon.available && SettingsManager.showTrayIcon && SettingsManager.minimizeToTray) {
close.accepted = false;
root.hide();
kastsMainWindow.hide();
} else {
close.accepted = true;
Qt.quit();
@ -501,14 +501,14 @@ Kirigami.ApplicationWindow {
target: SystrayIcon
function onRaiseWindow() {
if (root.visible) {
root.visible = false;
root.hide();
if (kastsMainWindow.visible) {
kastsMainWindow.visible = false;
kastsMainWindow.hide();
} else {
root.visible = true;
root.show();
root.raise();
root.requestActivate();
kastsMainWindow.visible = true;
kastsMainWindow.show();
kastsMainWindow.raise();
kastsMainWindow.requestActivate();
}
}
}