diff --git a/src/resources.qrc b/src/resources.qrc index c11b893c..8fee937a 100644 --- a/src/resources.qrc +++ b/src/resources.qrc @@ -1,60 +1,59 @@ qml/MediaPlayerControl.qml qml/RatingStar.qml qml/MediaPlayListView.qml qml/ElisaMainWindow.qml qml/ApplicationMenu.qml qml/HeaderBar.qml qml/ContextView.qml qml/ContentView.qml qml/DraggableItem.qml qml/NavigationActionBar.qml qml/PlayListEntry.qml qml/Theme.qml qml/PlatformIntegration.qml qml/LabelWithToolTip.qml qml/TrackImportNotification.qml qml/MediaTrackMetadataView.qml qml/GridBrowserView.qml qml/GridBrowserDelegate.qml qml/ListBrowserView.qml qml/ListBrowserDelegate.qml qml/FileBrowserView.qml qtquickcontrols2.conf background.png qml/BaseTheme.qml qml/ScrollHelper.qml qml/FlatButtonWithToolTip.qml qml/DataGridView.qml qml/DataListView.qml qml/PlayListBasicView.qml qml/SimplePlayListView.qml qml/ViewSelector.qml qml/BasicPlayListAlbumHeader.qml qml/MetaDataDelegate.qml qml/ImageWithFallback.qml qml/EditableMetaDataDelegate.qml qml/ViewSelectorDelegate.qml qml/HeaderFooterToolbar.qml qml/TracksDiscHeader.qml qml/NativeApplicationMenu.qml qml/ElisaConfigurationDialog.qml qml/FileScanningConfiguration.qml qml/GeneralConfiguration.qml windows/WindowsTheme.qml windows/PlatformIntegration.qml - windows/LabelWithToolTip.qml android/ElisaMainWindow.qml android/AndroidTheme.qml android/PlatformIntegration.qml android/AlbumsView.qml android/ArtistsView.qml android/TracksView.qml android/GenresView.qml diff --git a/src/windows/LabelWithToolTip.qml b/src/windows/LabelWithToolTip.qml deleted file mode 100644 index 6130af8a..00000000 --- a/src/windows/LabelWithToolTip.qml +++ /dev/null @@ -1,47 +0,0 @@ -/* - * Copyright 2017 Matthieu Gallien - * - * This program is free software: you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 3 of the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public License - * along with this program. If not, see . - */ - -import QtQuick 2.7 -import QtQuick.Controls 2.2 -import QtGraphicalEffects 1.0 -import QtQuick.Window 2.2 -import org.kde.kirigami 2.5 as Kirigami - -Label { - id: theLabel - - Loader { - anchors.fill: parent - - active: theLabel.truncated - visible: theLabel.truncated - - MouseArea { - anchors.fill: parent - hoverEnabled: true - - ToolTip { - delay: Qt.styleHints.mousePressAndHoldInterval - visible: parent.containsMouse && theLabel.truncated - text: theLabel.text - - enter: Transition { NumberAnimation { properties: "opacity"; easing.type: Easing.InOutQuad; from: 0.0; to: 1.0; duration: Kirigami.Units.longDuration; } } - exit: Transition { NumberAnimation { properties: "opacity"; easing.type: Easing.InOutQuad; from: 1.0; to: 0.0; duration: Kirigami.Units.longDuration; } } - } - } - } -} diff --git a/src/windows/PlatformIntegration.qml b/src/windows/PlatformIntegration.qml index 8ac05474..8018c3cf 100644 --- a/src/windows/PlatformIntegration.qml +++ b/src/windows/PlatformIntegration.qml @@ -1,79 +1,81 @@ /* * Copyright 2017 Matthieu Gallien * * This program is free software: you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either * version 3 of the License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public License * along with this program. If not, see . */ import QtQuick 2.0 import org.kde.elisa 1.0 import QtWinExtras 1.0 Item { id: rootItem property var playListModel property var audioPlayerManager property var player property var headerBarManager property var manageMediaPlayerControl property alias showProgressOnTaskBar: progressBar.active + property var elisaMainWindow + property bool showSystemTrayIcon signal raisePlayer() Theme { id: elisaTheme } Loader { id: progressBar sourceComponent: taskBarComponent } Component { id:taskBarComponent TaskbarButton { progress.minimum: 0 progress.maximum: player.duration progress.value: player.position progress.visible: manageMediaPlayerControl.musicPlaying overlay.iconSource: (manageMediaPlayerControl.musicPlaying ? Qt.resolvedUrl(elisaTheme.playingIndicatorIcon) : Qt.resolvedUrl(elisaTheme.pausedIndicatorIcon)) } } ThumbnailToolBar { iconicThumbnailSource: (headerBarManager.image.toString() !== '' ? headerBarManager.image : Qt.resolvedUrl(elisaTheme.albumCover)) ThumbnailToolButton { iconSource: Qt.resolvedUrl(LayoutMirroring.enabled ? elisaTheme.skipForwardIcon : elisaTheme.skipBackwardIcon) onClicked: playListModel.skipPreviousTrack() enabled: manageMediaPlayerControl.skipBackwardControlEnabled } ThumbnailToolButton { iconSource: (manageMediaPlayerControl.musicPlaying ? Qt.resolvedUrl(elisaTheme.pauseIcon) : Qt.resolvedUrl(elisaTheme.playIcon)) onClicked: audioPlayerManager.playPause() enabled: manageMediaPlayerControl.playControlEnabled } ThumbnailToolButton { iconSource: Qt.resolvedUrl(LayoutMirroring.enabled ? elisaTheme.skipBackwardIcon : elisaTheme.skipForwardIcon) onClicked: playListModel.skipNextTrack() enabled: manageMediaPlayerControl.skipForwardControlEnabled } } }