diff --git a/ScreenPlay/Resources.qrc b/ScreenPlay/Resources.qrc index 23ba79dd..65880a34 100644 --- a/ScreenPlay/Resources.qrc +++ b/ScreenPlay/Resources.qrc @@ -77,7 +77,6 @@ main.qml qml/Community/Community.qml qml/Community/Feedback.qml - qml/Controls/Slider.qml qml/Create/Create.qml qml/Create/CreateNew.qml qml/Create/CreateUpload.qml @@ -85,21 +84,12 @@ qml/Create/CreateWidget.qml qml/Create/CreateWidgetButton.qml qml/Create/Wizards/CreateWallpaper/CreateWallpaperWizard.qml - qml/FileDropper.qml - qml/FileDropperSingleFile.qml qml/Installed/Installed.qml qml/Installed/InstalledNavigation.qml qml/Installed/InstalledUserHelper.qml qml/Installed/ScreenPlayItem.qml qml/Installed/ScreenPlayItemImage.qml qml/Installed/Sidebar.qml - qml/MonitorSelection.qml - qml/MonitorSelectionItem.qml - qml/Monitors.qml - qml/MonitorsProjectSettingItem.qml - qml/Navigation.qml - qml/NavigationItem.qml - qml/NavigationWallpaperConfiguration.qml qml/Settings/SettingBool.qml qml/Settings/Settings.qml qml/Settings/SettingsButton.qml @@ -107,7 +97,6 @@ qml/Settings/SettingsExpander.qml qml/Settings/SettingsHeader.qml qml/Settings/SettingsHorizontalSeperator.qml - qml/Widgets/Window.qml qml/Workshop/Workshop.qml qtquickcontrols2.conf settings.json @@ -115,7 +104,6 @@ translations/ScreenPlay_en.qm qml/Screen/Screen.qml assets/icons/icon_screen.svg - qml/Background.qml qml/Community/XMLNewsfeed.qml qml/Workshop/WorkshopAvailableTest.qml qml/Workshop/WorkshopLoader.qml @@ -125,5 +113,14 @@ qml/Common/Tag.qml assets/icons/icon_close.svg qml/Common/ImageSelector.qml + qml/Common/Slider.qml + qml/Monitors/Monitors.qml + qml/Monitors/MonitorSelection.qml + qml/Monitors/MonitorSelectionItem.qml + qml/Monitors/MonitorsProjectSettingItem.qml + qml/Common/Background.qml + qml/Navigation/Navigation.qml + qml/Navigation/NavigationItem.qml + qml/Navigation/NavigationWallpaperConfiguration.qml diff --git a/ScreenPlay/main.qml b/ScreenPlay/main.qml index 3c1828a1..e49ce3cd 100644 --- a/ScreenPlay/main.qml +++ b/ScreenPlay/main.qml @@ -5,14 +5,16 @@ import QtQuick.Layouts 1.3 import QtGraphicalEffects 1.0 import Qt.labs.platform 1.0 - import "qml/" +import "qml/Monitors" +import "qml/Common" import "qml/Installed" +import "qml/Navigation" ApplicationWindow { id: window color: "#eeeeee" - // Set visible if the -silent parameter was not set + // Set visible if the -silent parameter was not set (see main.cpp:87). visible: false width: 1400 title: "ScreenPlay 0.2" diff --git a/ScreenPlay/qml/Background.qml b/ScreenPlay/qml/Common/Background.qml similarity index 100% rename from ScreenPlay/qml/Background.qml rename to ScreenPlay/qml/Common/Background.qml diff --git a/ScreenPlay/qml/Controls/Slider.qml b/ScreenPlay/qml/Common/Slider.qml similarity index 100% rename from ScreenPlay/qml/Controls/Slider.qml rename to ScreenPlay/qml/Common/Slider.qml diff --git a/ScreenPlay/qml/Community/Community.qml b/ScreenPlay/qml/Community/Community.qml index 0786941a..be9e9961 100644 --- a/ScreenPlay/qml/Community/Community.qml +++ b/ScreenPlay/qml/Community/Community.qml @@ -224,7 +224,7 @@ Item { icon.width: 16 icon.height: 16 onClicked: Qt.openUrlExternally( - "https://gitlab.com/aimber/ScreenPlay/") + "https://gitlab.com/kelteseth/ScreenPlay/") } Button { text: qsTr("Workshop") diff --git a/ScreenPlay/qml/Controls/Tag.qml b/ScreenPlay/qml/Controls/Tag.qml deleted file mode 100644 index 9c36e13c..00000000 --- a/ScreenPlay/qml/Controls/Tag.qml +++ /dev/null @@ -1,5 +0,0 @@ -import QtQuick 2.0 - -Item { - -} diff --git a/ScreenPlay/qml/Controls/TagField.qml b/ScreenPlay/qml/Controls/TagField.qml deleted file mode 100644 index 9c36e13c..00000000 --- a/ScreenPlay/qml/Controls/TagField.qml +++ /dev/null @@ -1,5 +0,0 @@ -import QtQuick 2.0 - -Item { - -} diff --git a/ScreenPlay/qml/Create/Create.qml b/ScreenPlay/qml/Create/Create.qml index 597f41cd..73776f44 100644 --- a/ScreenPlay/qml/Create/Create.qml +++ b/ScreenPlay/qml/Create/Create.qml @@ -4,7 +4,7 @@ import QtQuick.Controls.Material 2.2 import QtQuick.Particles 2.0 import QtGraphicalEffects 1.0 -import app.screenplay.create 1.0 +import ScreenPlay.Create 1.0 import "Wizards/CreateWallpaper" @@ -237,7 +237,7 @@ Item { icon.width: 16 icon.height: 16 onClicked: Qt.openUrlExternally( - "https://aimber.gitlab.io/ScreenPlayDocs/") + "https://kelteseth.gitlab.io/ScreenPlayDocs/") } Button { text: qsTr("Forums") diff --git a/ScreenPlay/qml/Create/Wizards/CreateWallpaper/CreateWallpaperResult.qml b/ScreenPlay/qml/Create/Wizards/CreateWallpaper/CreateWallpaperResult.qml index 3abeaee1..025f7cf5 100644 --- a/ScreenPlay/qml/Create/Wizards/CreateWallpaper/CreateWallpaperResult.qml +++ b/ScreenPlay/qml/Create/Wizards/CreateWallpaper/CreateWallpaperResult.qml @@ -4,7 +4,7 @@ import QtQuick.Controls 2.2 import QtQuick.Controls.Material 2.3 import Qt.labs.platform 1.0 import QtQuick.Layouts 1.3 -import app.screenplay.create 1.0 +import ScreenPlay.Create 1.0 Item { id: wrapperError diff --git a/ScreenPlay/qml/Create/Wizards/CreateWallpaper/CreateWallpaperVideoImportConvert.qml b/ScreenPlay/qml/Create/Wizards/CreateWallpaper/CreateWallpaperVideoImportConvert.qml index b617bce0..eb7b8211 100644 --- a/ScreenPlay/qml/Create/Wizards/CreateWallpaper/CreateWallpaperVideoImportConvert.qml +++ b/ScreenPlay/qml/Create/Wizards/CreateWallpaper/CreateWallpaperVideoImportConvert.qml @@ -5,7 +5,7 @@ import QtQuick.Controls.Material 2.3 import Qt.labs.platform 1.0 import QtQuick.Layouts 1.12 -import app.screenplay.create 1.0 +import ScreenPlay.Create 1.0 import "../../../Common" diff --git a/ScreenPlay/qml/Create/Wizards/CreateWallpaper/CreateWallpaperWizard.qml b/ScreenPlay/qml/Create/Wizards/CreateWallpaper/CreateWallpaperWizard.qml index 576c7f36..e85469d2 100644 --- a/ScreenPlay/qml/Create/Wizards/CreateWallpaper/CreateWallpaperWizard.qml +++ b/ScreenPlay/qml/Create/Wizards/CreateWallpaper/CreateWallpaperWizard.qml @@ -5,7 +5,7 @@ import QtQuick.Controls.Material 2.3 import Qt.labs.platform 1.0 import QtQuick.Layouts 1.3 -import app.screenplay.create 1.0 +import ScreenPlay.Create 1.0 Item { id: createNew diff --git a/ScreenPlay/qml/FileDropper.qml b/ScreenPlay/qml/FileDropper.qml deleted file mode 100644 index 1dba9d2e..00000000 --- a/ScreenPlay/qml/FileDropper.qml +++ /dev/null @@ -1,117 +0,0 @@ -import QtQuick 2.12 -import QtQuick.Extras 1.4 -import PackageFileHandler 1.0 - -DropArea { - id:dropper - state:"invisible" - - onEntered: { - dropper.state = "visible" - } - - onExited: { - dropper.state = "invisible" - } - - Connections { - target: packageFileHandler - onCurrentLoaderStatusChanged:{ - - } - } - - onDropped: { - var a= packageFileHandler.loadPackageFromLocalZip(drop.urls,".") - - - if(a === -1) { - dropper.state = "badFile" - timer.start() - } else if(a === 0){ - dropper.state = "invisible" - } - - } - - Timer { - id:timer - interval: 1000 - onTriggered: { - dropper.state = "invisible" - timer.stop() - } - } - - - Rectangle { - id:fill - anchors.fill: parent - opacity: .8 - - Picture { - id: picture - x: 332 - y: 208 - anchors.verticalCenter: parent.verticalCenter - anchors.horizontalCenter: parent.horizontalCenter - source: "qrc://assets/icons/icon_settings.svg" - } - } - - Text { - id: text1 - text: qsTr("Bad File!!") - font.pointSize: 24 - opacity: 1 - anchors.horizontalCenter: parent.horizontalCenter - anchors.verticalCenter: parent.verticalCenter - } - states: [ - State { - name: "visible" - }, - State { - name: "invisible" - - PropertyChanges { - target: fill - opacity: 0 - } - - PropertyChanges { - target: text1 - opacity: 0 - } - }, - State { - name: "badFile" - } - ] - - transitions: [ - Transition { - from: "*" - to: "invisible" - - NumberAnimation { - target: fill - property: "opacity" - duration: 200 - easing.type: Easing.OutQuart - } - }, - Transition { - from: "invisible" - to: "visible" - - NumberAnimation { - target: fill - property: "opacity" - duration: 200 - easing.type: Easing.OutQuart - } - } - ] - -} diff --git a/ScreenPlay/qml/FileDropperSingleFile.qml b/ScreenPlay/qml/FileDropperSingleFile.qml deleted file mode 100644 index 31215fb6..00000000 --- a/ScreenPlay/qml/FileDropperSingleFile.qml +++ /dev/null @@ -1,225 +0,0 @@ -import QtQuick 2.12 -import QtQuick.Dialogs 1.2 - -Rectangle { - id: fileDropperSingleFile - - property color background: "white" - property string descriptionTitle: "value" - property url imagePath: "qrc:/assets/icons/icon_plus.svg" - //FIXME in 5.10 with an enum - property bool isVideo: false - property url externalFilePath - property string helpText: "help" - - color: fileDropperSingleFile.background - border.color: "#C2C2C2" - border.width: 2 - radius: 4 - state: "" - - function reset(){ - fileDropperSingleFile.state = "empty" - previewImage.source = "" - videoPreviewLoader.source = "" - } - - onStateChanged: { - if (fileDropperSingleFile.state === "error") { - stateChangedTimer.start() - } - } - Timer { - id: stateChangedTimer - onTriggered: { - fileDropperSingleFile.state = "empty" - } - } - - Image { - id: previewImage - anchors.fill: parent - anchors.margins: 2 - z: 98 - fillMode: Image.PreserveAspectCrop - visible: false - } - - - - Item { - id: column - height: imageIcon.height + txtSplashInput.contentHeight - anchors { - right: parent.right - left: parent.left - verticalCenter: parent.verticalCenter - } - - Image { - id: imageIcon - width: 32 - height: 32 - sourceSize.height: 32 - sourceSize.width: 32 - source: fileDropperSingleFile.imagePath - anchors { - top: parent.top - horizontalCenter: parent.horizontalCenter - } - } - Text { - id: txtSplashInput - text: descriptionTitle - anchors { - top: imageIcon.bottom - topMargin: 10 - horizontalCenter: parent.horizontalCenter - } - height: 40 - font.pointSize: 12 - color: "#626262" - horizontalAlignment: Text.AlignHCenter - font.family: "Libre Baskerville" - font.italic: true - - } - } - Text { - id: helpTextWrapper - color: "#626262" - anchors.fill: parent - anchors.margins: 20 - horizontalAlignment: Text.AlignHCenter - verticalAlignment: Text.AlignVCenter - font.family: "Libre Baskerville" - font.italic: true - wrapMode: Text.WordWrap - font.pointSize: 12 - opacity: 0 - - text: helpText - } - - DropArea { - id: dropper - anchors.fill: parent - focus: true - onEntered: { - fileDropperSingleFile.state = "fileEntered" - } - - onDropped: { - fileDropperSingleFile.state = "fileDropped" - if (drop.hasUrls) { - if (isVideo) { - if (validateVideoFileExtension(drop.urls[0])) { - externalFilePath = drop.urls[0] - videoPreviewLoader.setSource( - "CreateVideoPreviewSmall.qml", { - source: externalFilePath - }) - } - } else { - if (validateImageFileExtension(drop.urls[0])) { - externalFilePath = drop.urls[0] - previewImage.source = drop.urls[0] - previewImage.visible = true - } - } - } - } - - onExited: { - fileDropperSingleFile.state = "empty" - } - - function validateImageFileExtension(filePath) { - var tmp = filePath.split('.').pop() - return tmp === "png" || tmp === "jpg" - } - - function validateVideoFileExtension(filePath) { - var tmp = filePath.split('.').pop() - return tmp === "vp9" || tmp === "mp4" - } - MouseArea { - anchors.fill: parent - focus: true - z: 99 - hoverEnabled: true - onHoveredChanged: { - if (containsMouse && videoPreviewLoader.source.toString() === "") { - fileDropperSingleFile.state = "hover" - } else { - fileDropperSingleFile.state = "" - } - } - } - } - Loader { - id: videoPreviewLoader - asynchronous: true - anchors.fill: parent - anchors.margins: 2 - z: 300 - } - states: [ - State { - name: "fileEntered" - - PropertyChanges { - target: fileDropperSingleFile - color: "#d9d9d9" - } - }, - State { - name: "fileDropped" - - PropertyChanges { - target: fileDropperSingleFile - color: "#ffbf49" - } - }, - State { - name: "empty" - PropertyChanges { - target: fileDropperSingleFile - color: "white" - } - }, - State { - name: "error" - - PropertyChanges { - target: fileDropperSingleFile - color: "#ff4d4d" - } - }, - State { - name: "hover" - PropertyChanges { - target: column - opacity: 0 - } - PropertyChanges { - target: helpTextWrapper - opacity: 1 - } - } - ] - transitions: [ - Transition { - from: "*" - to: "*" - - ColorAnimation { - duration: 200 - } - NumberAnimation { - property: "opacity" - duration: 200 - } - } - ] -} diff --git a/ScreenPlay/qml/Installed/Sidebar.qml b/ScreenPlay/qml/Installed/Sidebar.qml index 6bd9f82a..b50884ad 100644 --- a/ScreenPlay/qml/Installed/Sidebar.qml +++ b/ScreenPlay/qml/Installed/Sidebar.qml @@ -4,7 +4,7 @@ import QtQuick.Controls 2.3 import QtQuick.Extras 1.4 import QtQuick.Controls.Material 2.2 -import "../" +import "../Monitors" Item { id: sidebar diff --git a/ScreenPlay/qml/MonitorSelection.qml b/ScreenPlay/qml/Monitors/MonitorSelection.qml similarity index 100% rename from ScreenPlay/qml/MonitorSelection.qml rename to ScreenPlay/qml/Monitors/MonitorSelection.qml diff --git a/ScreenPlay/qml/MonitorSelectionItem.qml b/ScreenPlay/qml/Monitors/MonitorSelectionItem.qml similarity index 100% rename from ScreenPlay/qml/MonitorSelectionItem.qml rename to ScreenPlay/qml/Monitors/MonitorSelectionItem.qml diff --git a/ScreenPlay/qml/Monitors.qml b/ScreenPlay/qml/Monitors/Monitors.qml similarity index 99% rename from ScreenPlay/qml/Monitors.qml rename to ScreenPlay/qml/Monitors/Monitors.qml index 9b082c13..eb60c588 100644 --- a/ScreenPlay/qml/Monitors.qml +++ b/ScreenPlay/qml/Monitors/Monitors.qml @@ -4,7 +4,7 @@ import QtGraphicalEffects 1.0 import QtQuick.Controls.Material 2.2 import QtQuick.Layouts 1.3 -import "Controls/" as SP +import "../Common/" as SP Item { id: monitors diff --git a/ScreenPlay/qml/MonitorsProjectSettingItem.qml b/ScreenPlay/qml/Monitors/MonitorsProjectSettingItem.qml similarity index 100% rename from ScreenPlay/qml/MonitorsProjectSettingItem.qml rename to ScreenPlay/qml/Monitors/MonitorsProjectSettingItem.qml diff --git a/ScreenPlay/qml/Navigation.qml b/ScreenPlay/qml/Navigation/Navigation.qml similarity index 90% rename from ScreenPlay/qml/Navigation.qml rename to ScreenPlay/qml/Navigation/Navigation.qml index e1916642..ea03682d 100644 --- a/ScreenPlay/qml/Navigation.qml +++ b/ScreenPlay/qml/Navigation/Navigation.qml @@ -3,7 +3,7 @@ import QtQuick.Controls 2.3 import QtGraphicalEffects 1.0 -import "Workshop" +import "../Workshop" Rectangle { id: navigation @@ -14,7 +14,7 @@ Rectangle { signal changePage(string name) - property var navArray: [navCreate, navWorkshop, navInstalled, navSettings, navCommunity, navScreen] + property var navArray: [navCreate, navWorkshop, navInstalled, navSettings, navCommunity] property bool navActive: true Connections { @@ -86,13 +86,6 @@ Rectangle { onPageClicked: navigation.onPageChanged(name) } - NavigationItem { - id: navScreen - state: "inactive" - name: "Screen" - iconSource: "qrc:/assets/icons/icon_screen.svg" - onPageClicked: navigation.onPageChanged(name) - } NavigationItem { id: navCommunity diff --git a/ScreenPlay/qml/NavigationItem.qml b/ScreenPlay/qml/Navigation/NavigationItem.qml similarity index 100% rename from ScreenPlay/qml/NavigationItem.qml rename to ScreenPlay/qml/Navigation/NavigationItem.qml diff --git a/ScreenPlay/qml/NavigationWallpaperConfiguration.qml b/ScreenPlay/qml/Navigation/NavigationWallpaperConfiguration.qml similarity index 100% rename from ScreenPlay/qml/NavigationWallpaperConfiguration.qml rename to ScreenPlay/qml/Navigation/NavigationWallpaperConfiguration.qml diff --git a/ScreenPlay/qml/Widgets/Window.qml b/ScreenPlay/qml/Widgets/Window.qml deleted file mode 100644 index 41973dc0..00000000 --- a/ScreenPlay/qml/Widgets/Window.qml +++ /dev/null @@ -1,59 +0,0 @@ -import QtQuick 2.12 -import QtQuick.Controls 2.0 -import QtQuick.Layouts 1.0 -import QtQuick.Window 2.0 - - -Window { - id: mainWindow - visible: true - width: 640 - - height: 480 - //color: "transparent" - flags: Qt.SplashScreen | Qt.ToolTip | Qt.WindowStaysOnBottomHint - - - Rectangle { - id: rectangle - anchors.fill: parent; - color: "#b31f2934" - anchors.horizontalCenter: parent.horizontalCenter - anchors.verticalCenter: parent.verticalCenter - - Text { - id: text1 - color: "#ffffff" - text: "empty" - font.pointSize: 29 - } - - - } - - MouseArea { - property variant clickPos: "1,1" - anchors.fill: parent; - - - onPressed: { - clickPos = Qt.point(mouse.x,mouse.y) - } - - onPositionChanged: { - var delta = Qt.point(mouse.x-clickPos.x, mouse.y-clickPos.y) - var new_x = mainWindow.x + delta.x - var new_y = mainWindow.y + delta.y - if (new_y <= 0) - mainWindow.visibility = Window.Maximized - else - { - if (mainWindow.visibility === Window.Maximized) - mainWindow.visibility = Window.Windowed - mainWindow.x = new_x - mainWindow.y = new_y - } - } - } - -} diff --git a/ScreenPlay/qml/Workshop/Workshop.qml b/ScreenPlay/qml/Workshop/Workshop.qml index 6a095e56..62020569 100644 --- a/ScreenPlay/qml/Workshop/Workshop.qml +++ b/ScreenPlay/qml/Workshop/Workshop.qml @@ -2,7 +2,7 @@ import QtQuick 2.12 import QtQuick.Controls 2.3 import QtQuick.Controls.Material 2.2 import QtGraphicalEffects 1.0 -import app.screenplay.workshop 1.0 +import ScreenPlay.Workshop 1.0 Item { id: workshop diff --git a/ScreenPlay/qml/Workshop/WorkshopAvailableTest.qml b/ScreenPlay/qml/Workshop/WorkshopAvailableTest.qml index 32b318f3..2c021fbf 100644 --- a/ScreenPlay/qml/Workshop/WorkshopAvailableTest.qml +++ b/ScreenPlay/qml/Workshop/WorkshopAvailableTest.qml @@ -1,5 +1,5 @@ import QtQuick 2.12 -import app.screenplay.workshop 1.0 +import ScreenPlay.Workshop 1.0 Item { diff --git a/ScreenPlay/src/create.cpp b/ScreenPlay/src/create.cpp index a42bb1da..a6aef077 100644 --- a/ScreenPlay/src/create.cpp +++ b/ScreenPlay/src/create.cpp @@ -16,8 +16,8 @@ Create::Create(const shared_ptr& settings, QObject* parent) { qRegisterMetaType(); - qmlRegisterType("app.screenplay.create", 1, 0, "Create"); - qmlRegisterType("app.screenplay.create", 1, 0, "CreateImportVideo"); + qmlRegisterType("ScreenPlay.Create", 1, 0, "Create"); + qmlRegisterType("ScreenPlay.Create", 1, 0, "CreateImportVideo"); } // Constructor for the QMLEngine @@ -26,8 +26,8 @@ Create::Create() , m_settings(nullptr) { qRegisterMetaType(); - qmlRegisterType("app.screenplay.create", 1, 0, "Create"); - qmlRegisterType("app.screenplay.create", 1, 0, "CreateImportVideo"); + qmlRegisterType("ScreenPlay.Create", 1, 0, "Create"); + qmlRegisterType("ScreenPlay.Create", 1, 0, "CreateImportVideo"); } void Create::createWallpaperStart(QString videoPath) diff --git a/ScreenPlay/src/settings.cpp b/ScreenPlay/src/settings.cpp index e1300a79..ff56e9df 100644 --- a/ScreenPlay/src/settings.cpp +++ b/ScreenPlay/src/settings.cpp @@ -134,7 +134,6 @@ Settings::Settings(const shared_ptr& ilm, setupWidgetAndWindowPaths(); } - void Settings::loadActiveProfiles() { QJsonDocument configJsonDocument; @@ -237,7 +236,6 @@ void Settings::setupWidgetAndWindowPaths() QDir SPBaseDir(QDir::currentPath()); #ifdef QT_DEBUG - qDebug() << "Starting in Debug mode!"; if (SPWorkingDir.cdUp()) { #ifdef Q_OS_OSX diff --git a/ScreenPlaySDK/Screenplaysdk.pro b/ScreenPlaySDK/Screenplaysdk.pro index dec2517f..4ba179f3 100644 --- a/ScreenPlaySDK/Screenplaysdk.pro +++ b/ScreenPlaySDK/Screenplaysdk.pro @@ -5,7 +5,7 @@ TARGET = $$qtLibraryTarget($$TARGET) QT += qml quick CONFIG += plugin c++11 -uri = app.screenplay.screenplaysdk +uri = ScreenPlay.screenplaysdk # Input SOURCES += \ diff --git a/ScreenPlaySDK/qmldir b/ScreenPlaySDK/qmldir index 407446e1..a86567ab 100644 --- a/ScreenPlaySDK/qmldir +++ b/ScreenPlaySDK/qmldir @@ -1,2 +1,2 @@ -module app.screenplay.screenplaysdk +module ScreenPlay.screenplaysdk plugin ScreenPlaySDK diff --git a/ScreenPlaySDK/screenplay-sdk_plugin.cpp b/ScreenPlaySDK/screenplay-sdk_plugin.cpp index 05f3157a..f32c3d9f 100644 --- a/ScreenPlaySDK/screenplay-sdk_plugin.cpp +++ b/ScreenPlaySDK/screenplay-sdk_plugin.cpp @@ -5,7 +5,7 @@ void ScreenPlay_SDKPlugin::registerTypes(const char *uri) { - // @uri app.screenplay.screenplaysdk + // @uri ScreenPlay.screenplaysdk qmlRegisterType(uri, 1, 0, "ScreenPlaySDK"); } diff --git a/ScreenPlaySysInfo/ScreenPlaySysInfo.pro b/ScreenPlaySysInfo/ScreenPlaySysInfo.pro index eb0a91d9..c74599bd 100644 --- a/ScreenPlaySysInfo/ScreenPlaySysInfo.pro +++ b/ScreenPlaySysInfo/ScreenPlaySysInfo.pro @@ -4,7 +4,7 @@ QT += qml quick CONFIG += plugin c++11 TARGET = $$qtLibraryTarget($$TARGET) -uri = app.screenplay.sysinfo +uri = ScreenPlay.Sysinfo # Input SOURCES += \ diff --git a/ScreenPlaySysInfo/qmldir b/ScreenPlaySysInfo/qmldir index c4d3e662..1d57f96e 100644 --- a/ScreenPlaySysInfo/qmldir +++ b/ScreenPlaySysInfo/qmldir @@ -1,2 +1,2 @@ -module app.screenplay.sysinfo +module ScreenPlay.Sysinfo plugin ScreenPlaySysInfo diff --git a/ScreenPlaySysInfo/screenplaysysinfo_plugin.cpp b/ScreenPlaySysInfo/screenplaysysinfo_plugin.cpp index 2e7ab605..c26f0072 100644 --- a/ScreenPlaySysInfo/screenplaysysinfo_plugin.cpp +++ b/ScreenPlaySysInfo/screenplaysysinfo_plugin.cpp @@ -13,7 +13,7 @@ QObject* ScreenPlaySysInfoSingleton(QQmlEngine* engine, QJSEngine* scriptEngine) void ScreenPlaySysInfoPlugin::registerTypes(const char* uri) { - // @uri app.screenplay.sysinfo + // @uri ScreenPlay.Sysinfo qmlRegisterSingletonType(uri, 1, 0, "SysInfo", ScreenPlaySysInfoSingleton); } diff --git a/ScreenPlayWidget/mainWidget.qml b/ScreenPlayWidget/mainWidget.qml index 6a7c137b..29c67c6c 100644 --- a/ScreenPlayWidget/mainWidget.qml +++ b/ScreenPlayWidget/mainWidget.qml @@ -1,7 +1,7 @@ import QtQuick 2.12 import QtQuick.Controls 2.3 -import app.screenplay.screenplaysdk 1.0 +import ScreenPlay.screenplaysdk 1.0 Item { id: mainWindow diff --git a/ScreenPlayWindow/mainWindow.qml b/ScreenPlayWindow/mainWindow.qml index 28c352a9..d307ee3f 100644 --- a/ScreenPlayWindow/mainWindow.qml +++ b/ScreenPlayWindow/mainWindow.qml @@ -1,6 +1,6 @@ import QtQuick 2.12 import QtWebEngine 1.8 -import app.screenplay.wallpaper 1.0 +import ScreenPlay.Wallpaper 1.0 Rectangle { id: root diff --git a/ScreenPlayWindow/src/basewindow.cpp b/ScreenPlayWindow/src/basewindow.cpp index 443ae5bf..e592bc5a 100644 --- a/ScreenPlayWindow/src/basewindow.cpp +++ b/ScreenPlayWindow/src/basewindow.cpp @@ -11,7 +11,7 @@ BaseWindow::BaseWindow(QString projectFilePath, QObject* parent) { QApplication::instance()->installEventFilter(this); qRegisterMetaType(); - qmlRegisterType("app.screenplay.wallpaper", 1, 0, "Wallpaper"); + qmlRegisterType("ScreenPlay.Wallpaper", 1, 0, "Wallpaper"); if (projectFilePath == "test") { setType(BaseWindow::WallpaperType::Qml);