Changeset View
Changeset View
Standalone View
Standalone View
src/qml/ElisaMainWindow.qml
| Show First 20 Lines • Show All 51 Lines • ▼ Show 20 Line(s) | 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 { | 60 | Controls1.Action { | ||
| 61 | shortcut: goBackAction.shortcut | 61 | shortcut: goBackAction.shortcut | ||
| 62 | onTriggered: contentView.goBack() | 62 | onTriggered: contentView.goBack() | ||
| 63 | } | 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 | 64 | | |||
| 65 | Controls1.Action { | 65 | Controls1.Action { | ||
| 66 | id: applicationMenuAction | 66 | id: applicationMenuAction | ||
| 67 | text: i18nc("open application menu", "Application Menu") | 67 | text: i18nc("open application menu", "Application Menu") | ||
| 68 | iconName: "application-menu" | 68 | iconName: "application-menu" | ||
| 69 | onTriggered: applicationMenu.popup() | 69 | onTriggered: applicationMenu.popup() | ||
| 70 | } | 70 | } | ||
| 71 | 71 | | |||
| Show All 25 Lines | 85 | Settings { | |||
| 97 | property double playControlItemVolume : 100.0 | 97 | property double playControlItemVolume : 100.0 | ||
| 98 | property bool playControlItemMuted : false | 98 | property bool playControlItemMuted : false | ||
| 99 | 99 | | |||
| 100 | property bool playControlItemRepeat : false | 100 | property bool playControlItemRepeat : false | ||
| 101 | property bool playControlItemShuffle : false | 101 | property bool playControlItemShuffle : false | ||
| 102 | 102 | | |||
| 103 | property bool expandedFilterView: false | 103 | property bool expandedFilterView: false | ||
| 104 | 104 | | |||
| 105 | property bool showPlaylist: true | ||||
| 105 | } | 106 | } | ||
| 106 | 107 | | |||
| 107 | Connections { | 108 | Connections { | ||
| 108 | target: Qt.application | 109 | target: Qt.application | ||
| 109 | onAboutToQuit: | 110 | onAboutToQuit: | ||
| 110 | { | 111 | { | ||
| 111 | persistentSettings.x = mainWindow.x; | 112 | persistentSettings.x = mainWindow.x; | ||
| 112 | persistentSettings.y = mainWindow.y; | 113 | persistentSettings.y = mainWindow.y; | ||
| 113 | persistentSettings.width = mainWindow.width; | 114 | persistentSettings.width = mainWindow.width; | ||
| 114 | persistentSettings.height = mainWindow.height; | 115 | persistentSettings.height = mainWindow.height; | ||
| 115 | 116 | | |||
| 116 | persistentSettings.playListState = elisa.mediaPlayList.persistentState; | 117 | persistentSettings.playListState = elisa.mediaPlayList.persistentState; | ||
| 117 | persistentSettings.audioPlayerState = elisa.audioControl.persistentState | 118 | persistentSettings.audioPlayerState = elisa.audioControl.persistentState | ||
| 118 | 119 | | |||
| 119 | persistentSettings.playControlItemVolume = headerBar.playerControl.volume | 120 | persistentSettings.playControlItemVolume = headerBar.playerControl.volume | ||
| 120 | persistentSettings.playControlItemMuted = headerBar.playerControl.muted | 121 | persistentSettings.playControlItemMuted = headerBar.playerControl.muted | ||
| 121 | 122 | | |||
| 122 | persistentSettings.playControlItemRepeat = headerBar.playerControl.repeat | 123 | persistentSettings.playControlItemRepeat = headerBar.playerControl.repeat | ||
| 123 | persistentSettings.playControlItemShuffle = headerBar.playerControl.shuffle | 124 | persistentSettings.playControlItemShuffle = headerBar.playerControl.shuffle | ||
| 125 | persistentSettings.showPlaylist = contentView.showPlaylist | ||||
| 124 | } | 126 | } | ||
| 125 | } | 127 | } | ||
| 126 | 128 | | |||
| 127 | Loader { | 129 | Loader { | ||
| 128 | id: mprisloader | 130 | id: mprisloader | ||
| 129 | active: false | 131 | active: false | ||
| 130 | 132 | | |||
| 131 | sourceComponent: PlatformIntegration { | 133 | sourceComponent: PlatformIntegration { | ||
| ▲ Show 20 Lines • Show All 121 Lines • ▼ Show 20 Line(s) | 182 | HeaderBar { | |||
| 253 | } | 255 | } | ||
| 254 | } | 256 | } | ||
| 255 | } | 257 | } | ||
| 256 | 258 | | |||
| 257 | ContentView { | 259 | ContentView { | ||
| 258 | id: contentView | 260 | id: contentView | ||
| 259 | Layout.fillHeight: true | 261 | Layout.fillHeight: true | ||
| 260 | Layout.fillWidth: true | 262 | Layout.fillWidth: true | ||
| 263 | showPlaylist: persistentSettings.showPlaylist | ||||
| 261 | } | 264 | } | ||
| 262 | } | 265 | } | ||
| 263 | } | 266 | } | ||
| 264 | 267 | | |||
| 265 | Component.onCompleted: | 268 | Component.onCompleted: | ||
| 266 | { | 269 | { | ||
| 267 | elisa.initialize() | 270 | elisa.initialize() | ||
| 268 | 271 | | |||
| Show All 18 Lines | |||||
This change is breaking the back navigation. Can you put it back ?