From 8795029fecb6e273d426761ad5c9f21eff0d9690 Mon Sep 17 00:00:00 2001 From: namedkitten Date: Tue, 12 May 2020 14:43:06 +0100 Subject: [PATCH] Move controls to seporate folder. --- src/qml/MainMenu.qml | 1 - .../{ => Controls}/BackwardButton.qml | 0 .../{ => Controls}/ForwardButton.qml | 0 .../{ => Controls}/FullscreenButton.qml | 0 .../{ => Controls}/PlayPauseButton.qml | 0 .../{ => Controls}/PlaylistNextButton.qml | 0 .../{ => Controls}/PlaylistPrevButton.qml | 0 .../{ => Controls}/SettingsButton.qml | 0 .../{ => Controls}/SmoothButton.qml | 0 .../UIComponents/{ => Controls}/SpeedText.qml | 0 .../UIComponents/{ => Controls}/TimeLabel.qml | 0 .../{ => Controls}/VerticalVolume.qml | 0 .../{ => Controls}/VideoProgress.qml | 0 .../{ => Controls}/VolumeButton.qml | 0 .../{ => Controls}/VolumeSlider.qml | 0 src/qml/qml.qrc | 28 +++++++++---------- 16 files changed, 14 insertions(+), 15 deletions(-) rename src/qml/UIComponents/{ => Controls}/BackwardButton.qml (100%) rename src/qml/UIComponents/{ => Controls}/ForwardButton.qml (100%) rename src/qml/UIComponents/{ => Controls}/FullscreenButton.qml (100%) rename src/qml/UIComponents/{ => Controls}/PlayPauseButton.qml (100%) rename src/qml/UIComponents/{ => Controls}/PlaylistNextButton.qml (100%) rename src/qml/UIComponents/{ => Controls}/PlaylistPrevButton.qml (100%) rename src/qml/UIComponents/{ => Controls}/SettingsButton.qml (100%) rename src/qml/UIComponents/{ => Controls}/SmoothButton.qml (100%) rename src/qml/UIComponents/{ => Controls}/SpeedText.qml (100%) rename src/qml/UIComponents/{ => Controls}/TimeLabel.qml (100%) rename src/qml/UIComponents/{ => Controls}/VerticalVolume.qml (100%) rename src/qml/UIComponents/{ => Controls}/VideoProgress.qml (100%) rename src/qml/UIComponents/{ => Controls}/VolumeButton.qml (100%) rename src/qml/UIComponents/{ => Controls}/VolumeSlider.qml (100%) diff --git a/src/qml/MainMenu.qml b/src/qml/MainMenu.qml index c43c55b..cead35d 100644 --- a/src/qml/MainMenu.qml +++ b/src/qml/MainMenu.qml @@ -8,7 +8,6 @@ import "codes.js" as LanguageCodes MenuBar { id: menuBar - //width: parent.width height: mainWindow.virtualHeight / 32 function anythingOpen() { for (var i = 0, len = menuBar.count; i < len; i++) { diff --git a/src/qml/UIComponents/BackwardButton.qml b/src/qml/UIComponents/Controls/BackwardButton.qml similarity index 100% rename from src/qml/UIComponents/BackwardButton.qml rename to src/qml/UIComponents/Controls/BackwardButton.qml diff --git a/src/qml/UIComponents/ForwardButton.qml b/src/qml/UIComponents/Controls/ForwardButton.qml similarity index 100% rename from src/qml/UIComponents/ForwardButton.qml rename to src/qml/UIComponents/Controls/ForwardButton.qml diff --git a/src/qml/UIComponents/FullscreenButton.qml b/src/qml/UIComponents/Controls/FullscreenButton.qml similarity index 100% rename from src/qml/UIComponents/FullscreenButton.qml rename to src/qml/UIComponents/Controls/FullscreenButton.qml diff --git a/src/qml/UIComponents/PlayPauseButton.qml b/src/qml/UIComponents/Controls/PlayPauseButton.qml similarity index 100% rename from src/qml/UIComponents/PlayPauseButton.qml rename to src/qml/UIComponents/Controls/PlayPauseButton.qml diff --git a/src/qml/UIComponents/PlaylistNextButton.qml b/src/qml/UIComponents/Controls/PlaylistNextButton.qml similarity index 100% rename from src/qml/UIComponents/PlaylistNextButton.qml rename to src/qml/UIComponents/Controls/PlaylistNextButton.qml diff --git a/src/qml/UIComponents/PlaylistPrevButton.qml b/src/qml/UIComponents/Controls/PlaylistPrevButton.qml similarity index 100% rename from src/qml/UIComponents/PlaylistPrevButton.qml rename to src/qml/UIComponents/Controls/PlaylistPrevButton.qml diff --git a/src/qml/UIComponents/SettingsButton.qml b/src/qml/UIComponents/Controls/SettingsButton.qml similarity index 100% rename from src/qml/UIComponents/SettingsButton.qml rename to src/qml/UIComponents/Controls/SettingsButton.qml diff --git a/src/qml/UIComponents/SmoothButton.qml b/src/qml/UIComponents/Controls/SmoothButton.qml similarity index 100% rename from src/qml/UIComponents/SmoothButton.qml rename to src/qml/UIComponents/Controls/SmoothButton.qml diff --git a/src/qml/UIComponents/SpeedText.qml b/src/qml/UIComponents/Controls/SpeedText.qml similarity index 100% rename from src/qml/UIComponents/SpeedText.qml rename to src/qml/UIComponents/Controls/SpeedText.qml diff --git a/src/qml/UIComponents/TimeLabel.qml b/src/qml/UIComponents/Controls/TimeLabel.qml similarity index 100% rename from src/qml/UIComponents/TimeLabel.qml rename to src/qml/UIComponents/Controls/TimeLabel.qml diff --git a/src/qml/UIComponents/VerticalVolume.qml b/src/qml/UIComponents/Controls/VerticalVolume.qml similarity index 100% rename from src/qml/UIComponents/VerticalVolume.qml rename to src/qml/UIComponents/Controls/VerticalVolume.qml diff --git a/src/qml/UIComponents/VideoProgress.qml b/src/qml/UIComponents/Controls/VideoProgress.qml similarity index 100% rename from src/qml/UIComponents/VideoProgress.qml rename to src/qml/UIComponents/Controls/VideoProgress.qml diff --git a/src/qml/UIComponents/VolumeButton.qml b/src/qml/UIComponents/Controls/VolumeButton.qml similarity index 100% rename from src/qml/UIComponents/VolumeButton.qml rename to src/qml/UIComponents/Controls/VolumeButton.qml diff --git a/src/qml/UIComponents/VolumeSlider.qml b/src/qml/UIComponents/Controls/VolumeSlider.qml similarity index 100% rename from src/qml/UIComponents/VolumeSlider.qml rename to src/qml/UIComponents/Controls/VolumeSlider.qml diff --git a/src/qml/qml.qrc b/src/qml/qml.qrc index 261e3fa..eff501e 100644 --- a/src/qml/qml.qrc +++ b/src/qml/qml.qrc @@ -10,20 +10,20 @@ NiconicoButtonLayout.qml RoosterTeethButtonLayout.qml UIComponents/MenuTitleBar.qml - UIComponents/SmoothButton.qml - UIComponents/VerticalVolume.qml - UIComponents/SpeedText.qml - UIComponents/ForwardButton.qml - UIComponents/BackwardButton.qml - UIComponents/PlaylistPrevButton.qml - UIComponents/PlayPauseButton.qml - UIComponents/VideoProgress.qml - UIComponents/VolumeButton.qml - UIComponents/VolumeSlider.qml - UIComponents/TimeLabel.qml - UIComponents/SettingsButton.qml - UIComponents/FullscreenButton.qml - UIComponents/PlaylistNextButton.qml + UIComponents/Controls/SmoothButton.qml + UIComponents/Controls/VerticalVolume.qml + UIComponents/Controls/SpeedText.qml + UIComponents/Controls/ForwardButton.qml + UIComponents/Controls/BackwardButton.qml + UIComponents/Controls/PlaylistPrevButton.qml + UIComponents/Controls/PlayPauseButton.qml + UIComponents/Controls/VideoProgress.qml + UIComponents/Controls/VolumeButton.qml + UIComponents/Controls/VolumeSlider.qml + UIComponents/Controls/TimeLabel.qml + UIComponents/Controls/SettingsButton.qml + UIComponents/Controls/FullscreenButton.qml + UIComponents/Controls/PlaylistNextButton.qml Utils/codes.js Utils/Translator.qml Utils/translations.js