Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Multimedia
Elisa
Commits
955394a0
Commit
955394a0
authored
Aug 29, 2020
by
Nate Graham
Browse files
Bump Qt dependency to 5.14 and fix deprecation warnings
parent
e8149224
Changes
8
Hide whitespace changes
Inline
Side-by-side
CMakeLists.txt
View file @
955394a0
...
...
@@ -17,7 +17,7 @@ project(elisa
set
(
CMAKE_CXX_STANDARD_REQUIRED ON
)
set
(
CMAKE_CXX_STANDARD 17
)
set
(
REQUIRED_QT_VERSION
"5.1
2
.0"
)
set
(
REQUIRED_QT_VERSION
"5.1
4
.0"
)
find_package
(
Qt5
${
REQUIRED_QT_VERSION
}
CONFIG REQUIRED Core Network Qml Quick Test Sql Multimedia Svg Gui Widgets QuickTest Concurrent QuickControls2
)
find_package
(
Qt5Core
${
REQUIRED_QT_VERSION
}
CONFIG REQUIRED Private
)
...
...
src/qml/ContextView.qml
View file @
955394a0
...
...
@@ -276,7 +276,7 @@ FocusScope {
Connections
{
target
:
ElisaApplication
onMusicManagerChanged
:
{
function
onMusicManagerChanged
()
{
metaDataModel
.
initializeByIdAndUrl
(
trackType
,
databaseId
,
fileUrl
)
}
}
...
...
src/qml/DataGridView.qml
View file @
955394a0
...
...
@@ -105,7 +105,9 @@ FocusScope {
Connections
{
target
:
ElisaApplication
onMusicManagerChanged
:
initializeModel
()
function
onMusicManagerChanged
()
{
initializeModel
()
}
}
Component.onCompleted
:
{
...
...
src/qml/DataListView.qml
View file @
955394a0
...
...
@@ -234,13 +234,15 @@ FocusScope {
Connections
{
target
:
ElisaApplication
onMusicManagerChanged
:
initializeModel
()
function
onMusicManagerChanged
()
{
initializeModel
()
}
}
Connections
{
target
:
listView
.
navigationBar
onCreateRadio
:
{
function
onCreateRadio
()
{
openCreateRadioView
()
}
}
...
...
src/qml/ElisaMainWindow.qml
View file @
955394a0
...
...
@@ -103,7 +103,7 @@ ApplicationWindow {
Connections
{
target
:
headerBar
.
playerControl
onOpenMenu
:
{
function
onOpenMenu
()
{
if
(
applicationMenu
.
visible
)
{
applicationMenu
.
close
()
}
else
{
...
...
@@ -114,8 +114,7 @@ ApplicationWindow {
Connections
{
target
:
Qt
.
application
onAboutToQuit
:
{
function
onAboutToQuit
()
{
persistentSettings
.
x
=
mainWindow
.
x
;
persistentSettings
.
y
=
mainWindow
.
y
;
persistentSettings
.
width
=
mainWindow
.
width
;
...
...
@@ -149,7 +148,7 @@ ApplicationWindow {
showSystemTrayIcon
:
ElisaApplication
.
showSystemTrayIcon
elisaMainWindow
:
mainWindow
onRaisePlayer
:
{
function
onRaisePlayer
()
{
mainWindow
.
visible
=
true
mainWindow
.
raise
()
mainWindow
.
requestActivate
()
...
...
@@ -160,8 +159,12 @@ ApplicationWindow {
Connections
{
target
:
ElisaApplication
.
audioPlayer
onVolumeChanged
:
headerBar
.
playerControl
.
volume
=
ElisaApplication
.
audioPlayer
.
volume
onMutedChanged
:
headerBar
.
playerControl
.
muted
=
ElisaApplication
.
audioPlayer
.
muted
function
onVolumeChanged
()
{
headerBar
.
playerControl
.
volume
=
ElisaApplication
.
audioPlayer
.
volume
}
function
onMutedChanged
()
{
headerBar
.
playerControl
.
muted
=
ElisaApplication
.
audioPlayer
.
muted
}
}
Rectangle
{
...
...
src/qml/MediaPlayListView.qml
View file @
955394a0
...
...
@@ -69,21 +69,23 @@ FocusScope {
Connections
{
target
:
ElisaApplication
.
mediaPlayListProxyModel
onPlayListLoadFailed
:
{
function
onPlayListLoadFailed
()
{
showPlayListNotification
(
i18nc
(
"
Message when playlist load failed
"
,
"
Loading failed
"
),
Kirigami
.
MessageType
.
Error
,
retryLoadAction
)
}
}
Connections
{
target
:
ElisaApplication
.
mediaPlayListProxyModel
onDisplayUndoNotification
:
{
function
onDisplayUndoNotification
()
{
showPlayListNotification
(
i18nc
(
"
Playlist cleared
"
,
"
Playlist cleared
"
),
Kirigami
.
MessageType
.
Information
,
undoAction
)
}
}
Connections
{
target
:
ElisaApplication
.
mediaPlayListProxyModel
onHideUndoNotification
:
hideNotification
()
function
onHideUndoNotification
()
{
hideNotification
()
}
}
id
:
topItem
...
...
src/qml/PlatformIntegration.qml
View file @
955394a0
...
...
@@ -26,7 +26,7 @@ Item {
Connections
{
target
:
elisaMainWindow
onClosing
:
{
function
onClosing
()
{
if
(
systemTrayIcon
.
available
&&
showSystemTrayIcon
&&
!
forceCloseWindow
)
{
close
.
accepted
=
false
elisaMainWindow
.
hide
()
...
...
@@ -37,7 +37,7 @@ Item {
Connections
{
target
:
ElisaApplication
onCommitDataRequest
:
{
function
onCommitDataRequest
()
{
forceCloseWindow
=
true
}
}
...
...
src/qml/ViewSelector.qml
View file @
955394a0
...
...
@@ -104,7 +104,7 @@ FocusScope {
Connections
{
target
:
ElisaApplication
onInitializationDone
:
{
function
onInitializationDone
()
{
viewModeView
.
currentIndex
=
3
}
}
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment