Changeset View
Changeset View
Standalone View
Standalone View
src/qml/ElisaMainWindow.qml
| Show All 24 Lines | |||||
| 25 | import org.kde.elisa 1.0 | 25 | import org.kde.elisa 1.0 | ||
| 26 | import Qt.labs.settings 1.0 | 26 | import Qt.labs.settings 1.0 | ||
| 27 | 27 | | |||
| 28 | ApplicationWindow { | 28 | ApplicationWindow { | ||
| 29 | id: mainWindow | 29 | id: mainWindow | ||
| 30 | 30 | | |||
| 31 | visible: true | 31 | visible: true | ||
| 32 | 32 | | |||
| 33 | minimumWidth: 1100 | 33 | minimumWidth: contentView.showPlaylist ? 1100 : 700 | ||
| 34 | minimumHeight: 600 | 34 | minimumHeight: 600 | ||
| 35 | 35 | | |||
| 36 | LayoutMirroring.enabled: Qt.application.layoutDirection == Qt.RightToLeft | 36 | LayoutMirroring.enabled: Qt.application.layoutDirection == Qt.RightToLeft | ||
| 37 | LayoutMirroring.childrenInherit: true | 37 | LayoutMirroring.childrenInherit: true | ||
| 38 | 38 | | |||
| 39 | x: persistentSettings.x | 39 | x: persistentSettings.x | ||
| 40 | y: persistentSettings.y | 40 | y: persistentSettings.y | ||
| 41 | width: persistentSettings.width | 41 | width: persistentSettings.width | ||
| Show All 10 Lines | 51 | onTriggered: { | |||
| 52 | if ( persistentSettings.expandedFilterView == true) | 52 | if ( persistentSettings.expandedFilterView == true) | ||
| 53 | { | 53 | { | ||
| 54 | persistentSettings.expandedFilterView = false | 54 | persistentSettings.expandedFilterView = false | ||
| 55 | } else { | 55 | } else { | ||
| 56 | persistentSettings.expandedFilterView = true | 56 | persistentSettings.expandedFilterView = true | ||
| 57 | } | 57 | } | ||
| 58 | } | 58 | } | ||
| 59 | } | 59 | } | ||
| 60 | Controls1.Action { | | |||
| 61 | shortcut: goBackAction.shortcut | | |||
| 62 | onTriggered: contentView.goBack() | | |||
| 63 | } | | |||
mgallien: This change is breaking the back navigation. Can you put it back ? | |||||
januz: lol why did I delete that? Thanks for catching it | |||||
| 64 | 60 | | |||
| 65 | Controls1.Action { | 61 | Controls1.Action { | ||
| 66 | id: applicationMenuAction | 62 | id: applicationMenuAction | ||
| 67 | text: i18nc("open application menu", "Application Menu") | 63 | text: i18nc("open application menu", "Application Menu") | ||
| 68 | iconName: "application-menu" | 64 | iconName: "application-menu" | ||
| 69 | onTriggered: applicationMenu.popup() | 65 | onTriggered: applicationMenu.popup() | ||
| 70 | } | 66 | } | ||
| 71 | 67 | | |||
| Show All 25 Lines | 81 | Settings { | |||
| 97 | property double playControlItemVolume : 100.0 | 93 | property double playControlItemVolume : 100.0 | ||
| 98 | property bool playControlItemMuted : false | 94 | property bool playControlItemMuted : false | ||
| 99 | 95 | | |||
| 100 | property bool playControlItemRepeat : false | 96 | property bool playControlItemRepeat : false | ||
| 101 | property bool playControlItemShuffle : false | 97 | property bool playControlItemShuffle : false | ||
| 102 | 98 | | |||
| 103 | property bool expandedFilterView: false | 99 | property bool expandedFilterView: false | ||
| 104 | 100 | | |||
| 101 | property bool showPlaylist: true | ||||
| 105 | } | 102 | } | ||
| 106 | 103 | | |||
| 107 | Connections { | 104 | Connections { | ||
| 108 | target: Qt.application | 105 | target: Qt.application | ||
| 109 | onAboutToQuit: | 106 | onAboutToQuit: | ||
| 110 | { | 107 | { | ||
| 111 | persistentSettings.x = mainWindow.x; | 108 | persistentSettings.x = mainWindow.x; | ||
| 112 | persistentSettings.y = mainWindow.y; | 109 | persistentSettings.y = mainWindow.y; | ||
| 113 | persistentSettings.width = mainWindow.width; | 110 | persistentSettings.width = mainWindow.width; | ||
| 114 | persistentSettings.height = mainWindow.height; | 111 | persistentSettings.height = mainWindow.height; | ||
| 115 | 112 | | |||
| 116 | persistentSettings.playListState = elisa.mediaPlayList.persistentState; | 113 | persistentSettings.playListState = elisa.mediaPlayList.persistentState; | ||
| 117 | persistentSettings.audioPlayerState = elisa.audioControl.persistentState | 114 | persistentSettings.audioPlayerState = elisa.audioControl.persistentState | ||
| 118 | 115 | | |||
| 119 | persistentSettings.playControlItemVolume = headerBar.playerControl.volume | 116 | persistentSettings.playControlItemVolume = headerBar.playerControl.volume | ||
| 120 | persistentSettings.playControlItemMuted = headerBar.playerControl.muted | 117 | persistentSettings.playControlItemMuted = headerBar.playerControl.muted | ||
| 121 | 118 | | |||
| 122 | persistentSettings.playControlItemRepeat = headerBar.playerControl.repeat | 119 | persistentSettings.playControlItemRepeat = headerBar.playerControl.repeat | ||
| 123 | persistentSettings.playControlItemShuffle = headerBar.playerControl.shuffle | 120 | persistentSettings.playControlItemShuffle = headerBar.playerControl.shuffle | ||
| 121 | persistentSettings.showPlaylist = contentView.showPlaylist | ||||
| 124 | } | 122 | } | ||
| 125 | } | 123 | } | ||
| 126 | 124 | | |||
| 127 | Loader { | 125 | Loader { | ||
| 128 | id: mprisloader | 126 | id: mprisloader | ||
| 129 | active: false | 127 | active: false | ||
| 130 | 128 | | |||
| 131 | sourceComponent: PlatformIntegration { | 129 | sourceComponent: PlatformIntegration { | ||
| ▲ Show 20 Lines • Show All 121 Lines • ▼ Show 20 Line(s) | 178 | HeaderBar { | |||
| 253 | } | 251 | } | ||
| 254 | } | 252 | } | ||
| 255 | } | 253 | } | ||
| 256 | 254 | | |||
| 257 | ContentView { | 255 | ContentView { | ||
| 258 | id: contentView | 256 | id: contentView | ||
| 259 | Layout.fillHeight: true | 257 | Layout.fillHeight: true | ||
| 260 | Layout.fillWidth: true | 258 | Layout.fillWidth: true | ||
| 259 | showPlaylist: persistentSettings.showPlaylist | ||||
| 261 | } | 260 | } | ||
| 262 | } | 261 | } | ||
| 263 | } | 262 | } | ||
| 264 | 263 | | |||
| 265 | Component.onCompleted: | 264 | Component.onCompleted: | ||
| 266 | { | 265 | { | ||
| 267 | elisa.initialize() | 266 | elisa.initialize() | ||
| 268 | 267 | | |||
| Show All 18 Lines | |||||
This change is breaking the back navigation. Can you put it back ?