diff --git a/ovos_plugin_common_play/ocp/__init__.py b/ovos_plugin_common_play/ocp/__init__.py index 1a96f04e..7368b97e 100644 --- a/ovos_plugin_common_play/ocp/__init__.py +++ b/ovos_plugin_common_play/ocp/__init__.py @@ -1,21 +1,15 @@ -import time -from os.path import join, dirname, isfile -from threading import Event, Lock +from os.path import join, dirname from typing import Optional, List -from ovos_config import Configuration -from ovos_plugin_common_play.ocp.gui import OCPMediaPlayerGUI -from ovos_plugin_common_play.ocp.player import OCPMediaPlayer -from ovos_utils.gui import can_use_gui + +from ovos_plugin_manager.ocp import load_stream_extractors from ovos_utils.log import LOG from ovos_utils.messagebus import Message - -from padacioso import IntentContainer - from ovos_workshop.app import OVOSAbstractApplication -from ovos_workshop.decorators.ocp import * -from ovos_plugin_manager.ocp import load_stream_extractors +from ovos_workshop.decorators import homescreen_app from ovos_plugin_common_play.ocp.constants import OCP_ID +from ovos_plugin_common_play.ocp.gui import OCPMediaPlayerGUI +from ovos_plugin_common_play.ocp.player import OCPMediaPlayer class OCP(OVOSAbstractApplication): @@ -79,14 +73,13 @@ def handle_get_SEIs(self, message): xtract = load_stream_extractors() # @lru_cache, its a lazy loaded singleton self.bus.emit(message.response({"SEI": xtract.supported_seis})) + @homescreen_app(icon="OCP.png", name="OCP") def handle_home(self, message=None): """ Handle ovos.common_play.home Messages and show the homescreen @param message: message associated with request """ - # homescreen / launch from .desktop self.gui.show_home(app_mode=True) def default_shutdown(self): self.player.shutdown() - diff --git a/ovos_plugin_common_play/ocp/gui.py b/ovos_plugin_common_play/ocp/gui.py index b458fdb7..ec07f7e5 100644 --- a/ovos_plugin_common_play/ocp/gui.py +++ b/ovos_plugin_common_play/ocp/gui.py @@ -26,7 +26,7 @@ def __init__(self, bus=None): # the skill_id is chosen so the namespace matches the regular bus api # ie, the gui event "XXX" is sent in the bus as "ovos.common_play.XXX" gui_config = Configuration().get("gui") or {} - ui_dirs = {"qt5": f"{dirname(__file__)}/res/ui"} + ui_dirs = {"qt5": f"{dirname(__file__)}/res/gui/qt5"} super(OCPMediaPlayerGUI, self).__init__(bus=bus, skill_id=OCP_ID, ui_directories=ui_dirs, diff --git a/ovos_plugin_common_play/ocp/res/desktop/OCP.desktop b/ovos_plugin_common_play/ocp/res/desktop/OCP.desktop deleted file mode 100644 index 778539f9..00000000 --- a/ovos_plugin_common_play/ocp/res/desktop/OCP.desktop +++ /dev/null @@ -1,18 +0,0 @@ -[Desktop Entry] -X-DBUS-StartupType=None -X-KDE-StartupNotify=false -Version=1.0 -Terminal=false -Type=Application -Name=OCP -Exec=mycroft-gui-app --hideTextInput --skill=ovos.common_play.home -Icon=OCP -Categories=VoiceApp -StartupNotify=false - - - - - - - diff --git a/ovos_plugin_common_play/ocp/res/desktop/OCP.png b/ovos_plugin_common_play/ocp/res/gui/OCP.png similarity index 100% rename from ovos_plugin_common_play/ocp/res/desktop/OCP.png rename to ovos_plugin_common_play/ocp/res/gui/OCP.png diff --git a/ovos_plugin_common_play/ocp/res/ui/+mediacenter/AudioPlayerControl.qml b/ovos_plugin_common_play/ocp/res/gui/qt5/+mediacenter/AudioPlayerControl.qml similarity index 100% rename from ovos_plugin_common_play/ocp/res/ui/+mediacenter/AudioPlayerControl.qml rename to ovos_plugin_common_play/ocp/res/gui/qt5/+mediacenter/AudioPlayerControl.qml diff --git a/ovos_plugin_common_play/ocp/res/ui/+mediacenter/Disambiguation.qml b/ovos_plugin_common_play/ocp/res/gui/qt5/+mediacenter/Disambiguation.qml similarity index 100% rename from ovos_plugin_common_play/ocp/res/ui/+mediacenter/Disambiguation.qml rename to ovos_plugin_common_play/ocp/res/gui/qt5/+mediacenter/Disambiguation.qml diff --git a/ovos_plugin_common_play/ocp/res/ui/+mediacenter/Home.qml b/ovos_plugin_common_play/ocp/res/gui/qt5/+mediacenter/Home.qml similarity index 100% rename from ovos_plugin_common_play/ocp/res/ui/+mediacenter/Home.qml rename to ovos_plugin_common_play/ocp/res/gui/qt5/+mediacenter/Home.qml diff --git a/ovos_plugin_common_play/ocp/res/ui/+mediacenter/NowPlayingHomeBar.qml b/ovos_plugin_common_play/ocp/res/gui/qt5/+mediacenter/NowPlayingHomeBar.qml similarity index 100% rename from ovos_plugin_common_play/ocp/res/ui/+mediacenter/NowPlayingHomeBar.qml rename to ovos_plugin_common_play/ocp/res/gui/qt5/+mediacenter/NowPlayingHomeBar.qml diff --git a/ovos_plugin_common_play/ocp/res/ui/+mediacenter/OCPSkillsView.qml b/ovos_plugin_common_play/ocp/res/gui/qt5/+mediacenter/OCPSkillsView.qml similarity index 100% rename from ovos_plugin_common_play/ocp/res/ui/+mediacenter/OCPSkillsView.qml rename to ovos_plugin_common_play/ocp/res/gui/qt5/+mediacenter/OCPSkillsView.qml diff --git a/ovos_plugin_common_play/ocp/res/ui/+mediacenter/OVOSSeekControl.qml b/ovos_plugin_common_play/ocp/res/gui/qt5/+mediacenter/OVOSSeekControl.qml similarity index 100% rename from ovos_plugin_common_play/ocp/res/ui/+mediacenter/OVOSSeekControl.qml rename to ovos_plugin_common_play/ocp/res/gui/qt5/+mediacenter/OVOSSeekControl.qml diff --git a/ovos_plugin_common_play/ocp/res/ui/+mediacenter/OVOSSeekControlQtAv.qml b/ovos_plugin_common_play/ocp/res/gui/qt5/+mediacenter/OVOSSeekControlQtAv.qml similarity index 100% rename from ovos_plugin_common_play/ocp/res/ui/+mediacenter/OVOSSeekControlQtAv.qml rename to ovos_plugin_common_play/ocp/res/gui/qt5/+mediacenter/OVOSSeekControlQtAv.qml diff --git a/ovos_plugin_common_play/ocp/res/ui/+mediacenter/OVOSSyncPlayer.qml b/ovos_plugin_common_play/ocp/res/gui/qt5/+mediacenter/OVOSSyncPlayer.qml similarity index 100% rename from ovos_plugin_common_play/ocp/res/ui/+mediacenter/OVOSSyncPlayer.qml rename to ovos_plugin_common_play/ocp/res/gui/qt5/+mediacenter/OVOSSyncPlayer.qml diff --git a/ovos_plugin_common_play/ocp/res/ui/+mediacenter/OVOSVideoPlayer.qml b/ovos_plugin_common_play/ocp/res/gui/qt5/+mediacenter/OVOSVideoPlayer.qml similarity index 100% rename from ovos_plugin_common_play/ocp/res/ui/+mediacenter/OVOSVideoPlayer.qml rename to ovos_plugin_common_play/ocp/res/gui/qt5/+mediacenter/OVOSVideoPlayer.qml diff --git a/ovos_plugin_common_play/ocp/res/ui/+mediacenter/OVOSVideoPlayerQtAv.qml b/ovos_plugin_common_play/ocp/res/gui/qt5/+mediacenter/OVOSVideoPlayerQtAv.qml similarity index 100% rename from ovos_plugin_common_play/ocp/res/ui/+mediacenter/OVOSVideoPlayerQtAv.qml rename to ovos_plugin_common_play/ocp/res/gui/qt5/+mediacenter/OVOSVideoPlayerQtAv.qml diff --git a/ovos_plugin_common_play/ocp/res/ui/+mediacenter/OVOSWebPlayer.qml b/ovos_plugin_common_play/ocp/res/gui/qt5/+mediacenter/OVOSWebPlayer.qml similarity index 100% rename from ovos_plugin_common_play/ocp/res/ui/+mediacenter/OVOSWebPlayer.qml rename to ovos_plugin_common_play/ocp/res/gui/qt5/+mediacenter/OVOSWebPlayer.qml diff --git a/ovos_plugin_common_play/ocp/res/ui/+mediacenter/PlayerLoader.qml b/ovos_plugin_common_play/ocp/res/gui/qt5/+mediacenter/PlayerLoader.qml similarity index 100% rename from ovos_plugin_common_play/ocp/res/ui/+mediacenter/PlayerLoader.qml rename to ovos_plugin_common_play/ocp/res/gui/qt5/+mediacenter/PlayerLoader.qml diff --git a/ovos_plugin_common_play/ocp/res/ui/+mediacenter/Playlist.qml b/ovos_plugin_common_play/ocp/res/gui/qt5/+mediacenter/Playlist.qml similarity index 100% rename from ovos_plugin_common_play/ocp/res/ui/+mediacenter/Playlist.qml rename to ovos_plugin_common_play/ocp/res/gui/qt5/+mediacenter/Playlist.qml diff --git a/ovos_plugin_common_play/ocp/res/ui/+mediacenter/Search.qml b/ovos_plugin_common_play/ocp/res/gui/qt5/+mediacenter/Search.qml similarity index 100% rename from ovos_plugin_common_play/ocp/res/ui/+mediacenter/Search.qml rename to ovos_plugin_common_play/ocp/res/gui/qt5/+mediacenter/Search.qml diff --git a/ovos_plugin_common_play/ocp/res/ui/+mediacenter/SuggestionsView.qml b/ovos_plugin_common_play/ocp/res/gui/qt5/+mediacenter/SuggestionsView.qml similarity index 100% rename from ovos_plugin_common_play/ocp/res/ui/+mediacenter/SuggestionsView.qml rename to ovos_plugin_common_play/ocp/res/gui/qt5/+mediacenter/SuggestionsView.qml diff --git a/ovos_plugin_common_play/ocp/res/ui/+mediacenter/VideoPlayerControl.qml b/ovos_plugin_common_play/ocp/res/gui/qt5/+mediacenter/VideoPlayerControl.qml similarity index 100% rename from ovos_plugin_common_play/ocp/res/ui/+mediacenter/VideoPlayerControl.qml rename to ovos_plugin_common_play/ocp/res/gui/qt5/+mediacenter/VideoPlayerControl.qml diff --git a/ovos_plugin_common_play/ocp/res/ui/AudioPlayerControl.qml b/ovos_plugin_common_play/ocp/res/gui/qt5/AudioPlayerControl.qml similarity index 100% rename from ovos_plugin_common_play/ocp/res/ui/AudioPlayerControl.qml rename to ovos_plugin_common_play/ocp/res/gui/qt5/AudioPlayerControl.qml diff --git a/ovos_plugin_common_play/ocp/res/ui/ConfigDelegateLayoutItem.qml b/ovos_plugin_common_play/ocp/res/gui/qt5/ConfigDelegateLayoutItem.qml similarity index 100% rename from ovos_plugin_common_play/ocp/res/ui/ConfigDelegateLayoutItem.qml rename to ovos_plugin_common_play/ocp/res/gui/qt5/ConfigDelegateLayoutItem.qml diff --git a/ovos_plugin_common_play/ocp/res/ui/ConfigOptionDelegate.qml b/ovos_plugin_common_play/ocp/res/gui/qt5/ConfigOptionDelegate.qml similarity index 100% rename from ovos_plugin_common_play/ocp/res/ui/ConfigOptionDelegate.qml rename to ovos_plugin_common_play/ocp/res/gui/qt5/ConfigOptionDelegate.qml diff --git a/ovos_plugin_common_play/ocp/res/ui/ConfigSliderDelegate.qml b/ovos_plugin_common_play/ocp/res/gui/qt5/ConfigSliderDelegate.qml similarity index 100% rename from ovos_plugin_common_play/ocp/res/ui/ConfigSliderDelegate.qml rename to ovos_plugin_common_play/ocp/res/gui/qt5/ConfigSliderDelegate.qml diff --git a/ovos_plugin_common_play/ocp/res/ui/ConfigSwitchDelegate.qml b/ovos_plugin_common_play/ocp/res/gui/qt5/ConfigSwitchDelegate.qml similarity index 100% rename from ovos_plugin_common_play/ocp/res/ui/ConfigSwitchDelegate.qml rename to ovos_plugin_common_play/ocp/res/gui/qt5/ConfigSwitchDelegate.qml diff --git a/ovos_plugin_common_play/ocp/res/ui/Disambiguation.qml b/ovos_plugin_common_play/ocp/res/gui/qt5/Disambiguation.qml similarity index 100% rename from ovos_plugin_common_play/ocp/res/ui/Disambiguation.qml rename to ovos_plugin_common_play/ocp/res/gui/qt5/Disambiguation.qml diff --git a/ovos_plugin_common_play/ocp/res/ui/GenericCloseControl.qml b/ovos_plugin_common_play/ocp/res/gui/qt5/GenericCloseControl.qml similarity index 100% rename from ovos_plugin_common_play/ocp/res/ui/GenericCloseControl.qml rename to ovos_plugin_common_play/ocp/res/gui/qt5/GenericCloseControl.qml diff --git a/ovos_plugin_common_play/ocp/res/ui/Home.qml b/ovos_plugin_common_play/ocp/res/gui/qt5/Home.qml similarity index 100% rename from ovos_plugin_common_play/ocp/res/ui/Home.qml rename to ovos_plugin_common_play/ocp/res/gui/qt5/Home.qml diff --git a/ovos_plugin_common_play/ocp/res/ui/NowPlayingHomeBar.qml b/ovos_plugin_common_play/ocp/res/gui/qt5/NowPlayingHomeBar.qml similarity index 100% rename from ovos_plugin_common_play/ocp/res/ui/NowPlayingHomeBar.qml rename to ovos_plugin_common_play/ocp/res/gui/qt5/NowPlayingHomeBar.qml diff --git a/ovos_plugin_common_play/ocp/res/ui/OCPSkillsView.qml b/ovos_plugin_common_play/ocp/res/gui/qt5/OCPSkillsView.qml similarity index 100% rename from ovos_plugin_common_play/ocp/res/ui/OCPSkillsView.qml rename to ovos_plugin_common_play/ocp/res/gui/qt5/OCPSkillsView.qml diff --git a/ovos_plugin_common_play/ocp/res/ui/OVOSSeekControl.qml b/ovos_plugin_common_play/ocp/res/gui/qt5/OVOSSeekControl.qml similarity index 100% rename from ovos_plugin_common_play/ocp/res/ui/OVOSSeekControl.qml rename to ovos_plugin_common_play/ocp/res/gui/qt5/OVOSSeekControl.qml diff --git a/ovos_plugin_common_play/ocp/res/ui/OVOSSeekControlQtAv.qml b/ovos_plugin_common_play/ocp/res/gui/qt5/OVOSSeekControlQtAv.qml similarity index 100% rename from ovos_plugin_common_play/ocp/res/ui/OVOSSeekControlQtAv.qml rename to ovos_plugin_common_play/ocp/res/gui/qt5/OVOSSeekControlQtAv.qml diff --git a/ovos_plugin_common_play/ocp/res/ui/OVOSSyncPlayer.qml b/ovos_plugin_common_play/ocp/res/gui/qt5/OVOSSyncPlayer.qml similarity index 100% rename from ovos_plugin_common_play/ocp/res/ui/OVOSSyncPlayer.qml rename to ovos_plugin_common_play/ocp/res/gui/qt5/OVOSSyncPlayer.qml diff --git a/ovos_plugin_common_play/ocp/res/ui/OVOSVideoPlayer.qml b/ovos_plugin_common_play/ocp/res/gui/qt5/OVOSVideoPlayer.qml similarity index 100% rename from ovos_plugin_common_play/ocp/res/ui/OVOSVideoPlayer.qml rename to ovos_plugin_common_play/ocp/res/gui/qt5/OVOSVideoPlayer.qml diff --git a/ovos_plugin_common_play/ocp/res/ui/OVOSVideoPlayerQtAv.qml b/ovos_plugin_common_play/ocp/res/gui/qt5/OVOSVideoPlayerQtAv.qml similarity index 100% rename from ovos_plugin_common_play/ocp/res/ui/OVOSVideoPlayerQtAv.qml rename to ovos_plugin_common_play/ocp/res/gui/qt5/OVOSVideoPlayerQtAv.qml diff --git a/ovos_plugin_common_play/ocp/res/ui/OVOSWebPlayer.qml b/ovos_plugin_common_play/ocp/res/gui/qt5/OVOSWebPlayer.qml similarity index 100% rename from ovos_plugin_common_play/ocp/res/ui/OVOSWebPlayer.qml rename to ovos_plugin_common_play/ocp/res/gui/qt5/OVOSWebPlayer.qml diff --git a/ovos_plugin_common_play/ocp/res/ui/PlayerLoader.qml b/ovos_plugin_common_play/ocp/res/gui/qt5/PlayerLoader.qml similarity index 100% rename from ovos_plugin_common_play/ocp/res/ui/PlayerLoader.qml rename to ovos_plugin_common_play/ocp/res/gui/qt5/PlayerLoader.qml diff --git a/ovos_plugin_common_play/ocp/res/ui/Playlist.qml b/ovos_plugin_common_play/ocp/res/gui/qt5/Playlist.qml similarity index 100% rename from ovos_plugin_common_play/ocp/res/ui/Playlist.qml rename to ovos_plugin_common_play/ocp/res/gui/qt5/Playlist.qml diff --git a/ovos_plugin_common_play/ocp/res/ui/Search.qml b/ovos_plugin_common_play/ocp/res/gui/qt5/Search.qml similarity index 100% rename from ovos_plugin_common_play/ocp/res/ui/Search.qml rename to ovos_plugin_common_play/ocp/res/gui/qt5/Search.qml diff --git a/ovos_plugin_common_play/ocp/res/ui/SuggestionsView.qml b/ovos_plugin_common_play/ocp/res/gui/qt5/SuggestionsView.qml similarity index 100% rename from ovos_plugin_common_play/ocp/res/ui/SuggestionsView.qml rename to ovos_plugin_common_play/ocp/res/gui/qt5/SuggestionsView.qml diff --git a/ovos_plugin_common_play/ocp/res/ui/VideoPlayerControl.qml b/ovos_plugin_common_play/ocp/res/gui/qt5/VideoPlayerControl.qml similarity index 100% rename from ovos_plugin_common_play/ocp/res/ui/VideoPlayerControl.qml rename to ovos_plugin_common_play/ocp/res/gui/qt5/VideoPlayerControl.qml diff --git a/ovos_plugin_common_play/ocp/res/ui/animations/installing.json b/ovos_plugin_common_play/ocp/res/gui/qt5/animations/installing.json similarity index 100% rename from ovos_plugin_common_play/ocp/res/ui/animations/installing.json rename to ovos_plugin_common_play/ocp/res/gui/qt5/animations/installing.json diff --git a/ovos_plugin_common_play/ocp/res/ui/animations/status-fail.json b/ovos_plugin_common_play/ocp/res/gui/qt5/animations/status-fail.json similarity index 100% rename from ovos_plugin_common_play/ocp/res/ui/animations/status-fail.json rename to ovos_plugin_common_play/ocp/res/gui/qt5/animations/status-fail.json diff --git a/ovos_plugin_common_play/ocp/res/ui/busy.qml b/ovos_plugin_common_play/ocp/res/gui/qt5/busy.qml similarity index 100% rename from ovos_plugin_common_play/ocp/res/ui/busy.qml rename to ovos_plugin_common_play/ocp/res/gui/qt5/busy.qml diff --git a/ovos_plugin_common_play/ocp/res/ui/code/helper.js b/ovos_plugin_common_play/ocp/res/gui/qt5/code/helper.js similarity index 100% rename from ovos_plugin_common_play/ocp/res/ui/code/helper.js rename to ovos_plugin_common_play/ocp/res/gui/qt5/code/helper.js diff --git a/ovos_plugin_common_play/ocp/res/ui/code/nav.js b/ovos_plugin_common_play/ocp/res/gui/qt5/code/nav.js similarity index 100% rename from ovos_plugin_common_play/ocp/res/ui/code/nav.js rename to ovos_plugin_common_play/ocp/res/gui/qt5/code/nav.js diff --git a/ovos_plugin_common_play/ocp/res/ui/delegates/GridSkillCard.qml b/ovos_plugin_common_play/ocp/res/gui/qt5/delegates/GridSkillCard.qml similarity index 100% rename from ovos_plugin_common_play/ocp/res/ui/delegates/GridSkillCard.qml rename to ovos_plugin_common_play/ocp/res/gui/qt5/delegates/GridSkillCard.qml diff --git a/ovos_plugin_common_play/ocp/res/ui/delegates/qmldir b/ovos_plugin_common_play/ocp/res/gui/qt5/delegates/qmldir similarity index 100% rename from ovos_plugin_common_play/ocp/res/ui/delegates/qmldir rename to ovos_plugin_common_play/ocp/res/gui/qt5/delegates/qmldir diff --git a/ovos_plugin_common_play/ocp/res/ui/images/back.png b/ovos_plugin_common_play/ocp/res/gui/qt5/images/back.png similarity index 100% rename from ovos_plugin_common_play/ocp/res/ui/images/back.png rename to ovos_plugin_common_play/ocp/res/gui/qt5/images/back.png diff --git a/ovos_plugin_common_play/ocp/res/ui/images/back.svg b/ovos_plugin_common_play/ocp/res/gui/qt5/images/back.svg similarity index 100% rename from ovos_plugin_common_play/ocp/res/ui/images/back.svg rename to ovos_plugin_common_play/ocp/res/gui/qt5/images/back.svg diff --git a/ovos_plugin_common_play/ocp/res/ui/images/history.png b/ovos_plugin_common_play/ocp/res/gui/qt5/images/history.png similarity index 100% rename from ovos_plugin_common_play/ocp/res/ui/images/history.png rename to ovos_plugin_common_play/ocp/res/gui/qt5/images/history.png diff --git a/ovos_plugin_common_play/ocp/res/ui/images/home.png b/ovos_plugin_common_play/ocp/res/gui/qt5/images/home.png similarity index 100% rename from ovos_plugin_common_play/ocp/res/ui/images/home.png rename to ovos_plugin_common_play/ocp/res/gui/qt5/images/home.png diff --git a/ovos_plugin_common_play/ocp/res/ui/images/information.png b/ovos_plugin_common_play/ocp/res/gui/qt5/images/information.png similarity index 100% rename from ovos_plugin_common_play/ocp/res/ui/images/information.png rename to ovos_plugin_common_play/ocp/res/gui/qt5/images/information.png diff --git a/ovos_plugin_common_play/ocp/res/ui/images/media-album-track.svg b/ovos_plugin_common_play/ocp/res/gui/qt5/images/media-album-track.svg similarity index 100% rename from ovos_plugin_common_play/ocp/res/ui/images/media-album-track.svg rename to ovos_plugin_common_play/ocp/res/gui/qt5/images/media-album-track.svg diff --git a/ovos_plugin_common_play/ocp/res/ui/images/media-fullscreen.svg b/ovos_plugin_common_play/ocp/res/gui/qt5/images/media-fullscreen.svg similarity index 100% rename from ovos_plugin_common_play/ocp/res/ui/images/media-fullscreen.svg rename to ovos_plugin_common_play/ocp/res/gui/qt5/images/media-fullscreen.svg diff --git a/ovos_plugin_common_play/ocp/res/ui/images/media-mute.svg b/ovos_plugin_common_play/ocp/res/gui/qt5/images/media-mute.svg similarity index 100% rename from ovos_plugin_common_play/ocp/res/ui/images/media-mute.svg rename to ovos_plugin_common_play/ocp/res/gui/qt5/images/media-mute.svg diff --git a/ovos_plugin_common_play/ocp/res/ui/images/media-next.svg b/ovos_plugin_common_play/ocp/res/gui/qt5/images/media-next.svg similarity index 100% rename from ovos_plugin_common_play/ocp/res/ui/images/media-next.svg rename to ovos_plugin_common_play/ocp/res/gui/qt5/images/media-next.svg diff --git a/ovos_plugin_common_play/ocp/res/ui/images/media-pause.svg b/ovos_plugin_common_play/ocp/res/gui/qt5/images/media-pause.svg similarity index 100% rename from ovos_plugin_common_play/ocp/res/ui/images/media-pause.svg rename to ovos_plugin_common_play/ocp/res/gui/qt5/images/media-pause.svg diff --git a/ovos_plugin_common_play/ocp/res/ui/images/media-play.svg b/ovos_plugin_common_play/ocp/res/gui/qt5/images/media-play.svg similarity index 100% rename from ovos_plugin_common_play/ocp/res/ui/images/media-play.svg rename to ovos_plugin_common_play/ocp/res/gui/qt5/images/media-play.svg diff --git a/ovos_plugin_common_play/ocp/res/ui/images/media-playback-pause.svg b/ovos_plugin_common_play/ocp/res/gui/qt5/images/media-playback-pause.svg similarity index 100% rename from ovos_plugin_common_play/ocp/res/ui/images/media-playback-pause.svg rename to ovos_plugin_common_play/ocp/res/gui/qt5/images/media-playback-pause.svg diff --git a/ovos_plugin_common_play/ocp/res/ui/images/media-playback-start.svg b/ovos_plugin_common_play/ocp/res/gui/qt5/images/media-playback-start.svg similarity index 100% rename from ovos_plugin_common_play/ocp/res/ui/images/media-playback-start.svg rename to ovos_plugin_common_play/ocp/res/gui/qt5/images/media-playback-start.svg diff --git a/ovos_plugin_common_play/ocp/res/ui/images/media-playback-stop.svg b/ovos_plugin_common_play/ocp/res/gui/qt5/images/media-playback-stop.svg similarity index 100% rename from ovos_plugin_common_play/ocp/res/ui/images/media-playback-stop.svg rename to ovos_plugin_common_play/ocp/res/gui/qt5/images/media-playback-stop.svg diff --git a/ovos_plugin_common_play/ocp/res/ui/images/media-playlist-play.svg b/ovos_plugin_common_play/ocp/res/gui/qt5/images/media-playlist-play.svg similarity index 100% rename from ovos_plugin_common_play/ocp/res/ui/images/media-playlist-play.svg rename to ovos_plugin_common_play/ocp/res/gui/qt5/images/media-playlist-play.svg diff --git a/ovos_plugin_common_play/ocp/res/ui/images/media-playlist-repeat-track.svg b/ovos_plugin_common_play/ocp/res/gui/qt5/images/media-playlist-repeat-track.svg similarity index 100% rename from ovos_plugin_common_play/ocp/res/ui/images/media-playlist-repeat-track.svg rename to ovos_plugin_common_play/ocp/res/gui/qt5/images/media-playlist-repeat-track.svg diff --git a/ovos_plugin_common_play/ocp/res/ui/images/media-playlist-repeat.svg b/ovos_plugin_common_play/ocp/res/gui/qt5/images/media-playlist-repeat.svg similarity index 100% rename from ovos_plugin_common_play/ocp/res/ui/images/media-playlist-repeat.svg rename to ovos_plugin_common_play/ocp/res/gui/qt5/images/media-playlist-repeat.svg diff --git a/ovos_plugin_common_play/ocp/res/ui/images/media-playlist-shuffle.svg b/ovos_plugin_common_play/ocp/res/gui/qt5/images/media-playlist-shuffle.svg similarity index 100% rename from ovos_plugin_common_play/ocp/res/ui/images/media-playlist-shuffle.svg rename to ovos_plugin_common_play/ocp/res/gui/qt5/images/media-playlist-shuffle.svg diff --git a/ovos_plugin_common_play/ocp/res/ui/images/media-previous.svg b/ovos_plugin_common_play/ocp/res/gui/qt5/images/media-previous.svg similarity index 100% rename from ovos_plugin_common_play/ocp/res/ui/images/media-previous.svg rename to ovos_plugin_common_play/ocp/res/gui/qt5/images/media-previous.svg diff --git a/ovos_plugin_common_play/ocp/res/ui/images/media-repeat-playlist.svg b/ovos_plugin_common_play/ocp/res/gui/qt5/images/media-repeat-playlist.svg similarity index 100% rename from ovos_plugin_common_play/ocp/res/ui/images/media-repeat-playlist.svg rename to ovos_plugin_common_play/ocp/res/gui/qt5/images/media-repeat-playlist.svg diff --git a/ovos_plugin_common_play/ocp/res/ui/images/media-repeat-track.svg b/ovos_plugin_common_play/ocp/res/gui/qt5/images/media-repeat-track.svg similarity index 100% rename from ovos_plugin_common_play/ocp/res/ui/images/media-repeat-track.svg rename to ovos_plugin_common_play/ocp/res/gui/qt5/images/media-repeat-track.svg diff --git a/ovos_plugin_common_play/ocp/res/ui/images/media-repeat.svg b/ovos_plugin_common_play/ocp/res/gui/qt5/images/media-repeat.svg similarity index 100% rename from ovos_plugin_common_play/ocp/res/ui/images/media-repeat.svg rename to ovos_plugin_common_play/ocp/res/gui/qt5/images/media-repeat.svg diff --git a/ovos_plugin_common_play/ocp/res/ui/images/media-seek-backward.svg b/ovos_plugin_common_play/ocp/res/gui/qt5/images/media-seek-backward.svg similarity index 100% rename from ovos_plugin_common_play/ocp/res/ui/images/media-seek-backward.svg rename to ovos_plugin_common_play/ocp/res/gui/qt5/images/media-seek-backward.svg diff --git a/ovos_plugin_common_play/ocp/res/ui/images/media-seek-forward.svg b/ovos_plugin_common_play/ocp/res/gui/qt5/images/media-seek-forward.svg similarity index 100% rename from ovos_plugin_common_play/ocp/res/ui/images/media-seek-forward.svg rename to ovos_plugin_common_play/ocp/res/gui/qt5/images/media-seek-forward.svg diff --git a/ovos_plugin_common_play/ocp/res/ui/images/media-skip-backward.svg b/ovos_plugin_common_play/ocp/res/gui/qt5/images/media-skip-backward.svg similarity index 100% rename from ovos_plugin_common_play/ocp/res/ui/images/media-skip-backward.svg rename to ovos_plugin_common_play/ocp/res/gui/qt5/images/media-skip-backward.svg diff --git a/ovos_plugin_common_play/ocp/res/ui/images/media-skip-forward.svg b/ovos_plugin_common_play/ocp/res/gui/qt5/images/media-skip-forward.svg similarity index 100% rename from ovos_plugin_common_play/ocp/res/ui/images/media-skip-forward.svg rename to ovos_plugin_common_play/ocp/res/gui/qt5/images/media-skip-forward.svg diff --git a/ovos_plugin_common_play/ocp/res/ui/images/media-stop.svg b/ovos_plugin_common_play/ocp/res/gui/qt5/images/media-stop.svg similarity index 100% rename from ovos_plugin_common_play/ocp/res/ui/images/media-stop.svg rename to ovos_plugin_common_play/ocp/res/gui/qt5/images/media-stop.svg diff --git a/ovos_plugin_common_play/ocp/res/ui/images/media-unmute.svg b/ovos_plugin_common_play/ocp/res/gui/qt5/images/media-unmute.svg similarity index 100% rename from ovos_plugin_common_play/ocp/res/ui/images/media-unmute.svg rename to ovos_plugin_common_play/ocp/res/gui/qt5/images/media-unmute.svg diff --git a/ovos_plugin_common_play/ocp/res/ui/images/ocp-dark.png b/ovos_plugin_common_play/ocp/res/gui/qt5/images/ocp-dark.png similarity index 100% rename from ovos_plugin_common_play/ocp/res/ui/images/ocp-dark.png rename to ovos_plugin_common_play/ocp/res/gui/qt5/images/ocp-dark.png diff --git a/ovos_plugin_common_play/ocp/res/ui/images/ocp-light.png b/ovos_plugin_common_play/ocp/res/gui/qt5/images/ocp-light.png similarity index 100% rename from ovos_plugin_common_play/ocp/res/ui/images/ocp-light.png rename to ovos_plugin_common_play/ocp/res/gui/qt5/images/ocp-light.png diff --git a/ovos_plugin_common_play/ocp/res/ui/images/ocp.png b/ovos_plugin_common_play/ocp/res/gui/qt5/images/ocp.png similarity index 100% rename from ovos_plugin_common_play/ocp/res/ui/images/ocp.png rename to ovos_plugin_common_play/ocp/res/gui/qt5/images/ocp.png diff --git a/ovos_plugin_common_play/ocp/res/ui/images/ocp_bg.png b/ovos_plugin_common_play/ocp/res/gui/qt5/images/ocp_bg.png similarity index 100% rename from ovos_plugin_common_play/ocp/res/ui/images/ocp_bg.png rename to ovos_plugin_common_play/ocp/res/gui/qt5/images/ocp_bg.png diff --git a/ovos_plugin_common_play/ocp/res/ui/images/search.png b/ovos_plugin_common_play/ocp/res/gui/qt5/images/search.png similarity index 100% rename from ovos_plugin_common_play/ocp/res/ui/images/search.png rename to ovos_plugin_common_play/ocp/res/gui/qt5/images/search.png diff --git a/ovos_plugin_common_play/ocp/res/ui/images/spinner.gif b/ovos_plugin_common_play/ocp/res/gui/qt5/images/spinner.gif similarity index 100% rename from ovos_plugin_common_play/ocp/res/ui/images/spinner.gif rename to ovos_plugin_common_play/ocp/res/gui/qt5/images/spinner.gif diff --git a/ovos_plugin_common_play/ocp/res/ui/qmldir b/ovos_plugin_common_play/ocp/res/gui/qt5/qmldir similarity index 100% rename from ovos_plugin_common_play/ocp/res/ui/qmldir rename to ovos_plugin_common_play/ocp/res/gui/qt5/qmldir diff --git a/ovos_plugin_common_play/ocp/res/ui/views/GridTileView.qml b/ovos_plugin_common_play/ocp/res/gui/qt5/views/GridTileView.qml similarity index 100% rename from ovos_plugin_common_play/ocp/res/ui/views/GridTileView.qml rename to ovos_plugin_common_play/ocp/res/gui/qt5/views/GridTileView.qml diff --git a/ovos_plugin_common_play/ocp/res/ui/views/TileView.qml b/ovos_plugin_common_play/ocp/res/gui/qt5/views/TileView.qml similarity index 100% rename from ovos_plugin_common_play/ocp/res/ui/views/TileView.qml rename to ovos_plugin_common_play/ocp/res/gui/qt5/views/TileView.qml diff --git a/ovos_plugin_common_play/ocp/res/ui/views/qmldir b/ovos_plugin_common_play/ocp/res/gui/qt5/views/qmldir similarity index 100% rename from ovos_plugin_common_play/ocp/res/ui/views/qmldir rename to ovos_plugin_common_play/ocp/res/gui/qt5/views/qmldir diff --git a/requirements/requirements.txt b/requirements/requirements.txt index 4e015a00..67143451 100644 --- a/requirements/requirements.txt +++ b/requirements/requirements.txt @@ -1,6 +1,6 @@ ovos-plugin-manager>=0.0.26,<1.0.0 ovos_bus_client>=0.0.7,<2.0.0 ovos-utils>=0.1.0,<1.0.0 -ovos-workshop>=0.0.16,<3.0.0 +ovos-workshop>=2.4.2,<3.0.0 padacioso>=0.1.1,<2.0.0 dbus-next diff --git a/test/unittests/test_ocp_player.py b/test/unittests/test_ocp_player.py index 3d9185a1..4bad3422 100644 --- a/test/unittests/test_ocp_player.py +++ b/test/unittests/test_ocp_player.py @@ -58,7 +58,7 @@ def test_00_player_init(self): from ovos_plugin_common_play.ocp.media import NowPlaying, Playlist from ovos_plugin_common_play.ocp.mpris import MprisPlayerCtl from ovos_bus_client.apis.ocp import ClassicAudioServiceInterface - from ovos_workshop import OVOSAbstractApplication + from ovos_workshop.app import OVOSAbstractApplication self.assertIsInstance(self.player, OVOSAbstractApplication) self.assertIsInstance(self.player.gui, OCPMediaPlayerGUI)