diff --git a/Content/wallpaper_interactive/Readme.md b/Content/wallpaper_qml/Readme.md similarity index 100% rename from Content/wallpaper_interactive/Readme.md rename to Content/wallpaper_qml/Readme.md diff --git a/Content/wallpaper_interactive/main.qml b/Content/wallpaper_qml/main.qml similarity index 100% rename from Content/wallpaper_interactive/main.qml rename to Content/wallpaper_qml/main.qml diff --git a/Content/wallpaper_interactive/preview.png b/Content/wallpaper_qml/preview.png similarity index 100% rename from Content/wallpaper_interactive/preview.png rename to Content/wallpaper_qml/preview.png diff --git a/Content/wallpaper_interactive/project.json b/Content/wallpaper_qml/project.json similarity index 100% rename from Content/wallpaper_interactive/project.json rename to Content/wallpaper_qml/project.json diff --git a/Content/wallpaper_landscape/Readme.md b/Content/wallpaper_qml_landscape/Readme.md similarity index 100% rename from Content/wallpaper_landscape/Readme.md rename to Content/wallpaper_qml_landscape/Readme.md diff --git a/Content/wallpaper_landscape/main.qml b/Content/wallpaper_qml_landscape/main.qml similarity index 100% rename from Content/wallpaper_landscape/main.qml rename to Content/wallpaper_qml_landscape/main.qml diff --git a/Content/wallpaper_landscape/preview.png b/Content/wallpaper_qml_landscape/preview.png similarity index 100% rename from Content/wallpaper_landscape/preview.png rename to Content/wallpaper_qml_landscape/preview.png diff --git a/Content/wallpaper_landscape/project.json b/Content/wallpaper_qml_landscape/project.json similarity index 100% rename from Content/wallpaper_landscape/project.json rename to Content/wallpaper_qml_landscape/project.json diff --git a/Content/wallpaper_particles/Readme.md b/Content/wallpaper_qml_particles/Readme.md similarity index 100% rename from Content/wallpaper_particles/Readme.md rename to Content/wallpaper_qml_particles/Readme.md diff --git a/Content/wallpaper_particles/backgroundGlow.png b/Content/wallpaper_qml_particles/backgroundGlow.png similarity index 100% rename from Content/wallpaper_particles/backgroundGlow.png rename to Content/wallpaper_qml_particles/backgroundGlow.png diff --git a/Content/wallpaper_particles/dot.png b/Content/wallpaper_qml_particles/dot.png similarity index 100% rename from Content/wallpaper_particles/dot.png rename to Content/wallpaper_qml_particles/dot.png diff --git a/Content/wallpaper_particles/main.qml b/Content/wallpaper_qml_particles/main.qml similarity index 100% rename from Content/wallpaper_particles/main.qml rename to Content/wallpaper_qml_particles/main.qml diff --git a/Content/wallpaper_particles/preview.png b/Content/wallpaper_qml_particles/preview.png similarity index 100% rename from Content/wallpaper_particles/preview.png rename to Content/wallpaper_qml_particles/preview.png diff --git a/Content/wallpaper_particles/project.json b/Content/wallpaper_qml_particles/project.json similarity index 100% rename from Content/wallpaper_particles/project.json rename to Content/wallpaper_qml_particles/project.json diff --git a/ScreenPlayWallpaper/main.cpp b/ScreenPlayWallpaper/main.cpp index 51efd527..846fd8e9 100644 --- a/ScreenPlayWallpaper/main.cpp +++ b/ScreenPlayWallpaper/main.cpp @@ -48,13 +48,15 @@ int main(int argc, char* argv[]) if (argumentList.length() == 1) { QString exampleContentPath = QString(SCREENPLAY_SOURCE_DIR) + "/Content"; QStringList contentFolder = { - "/wallpaper_video_astronaut_vp9", - "/wallpaper_video_nebula_h264", - "/wallpaper_interactive", - "/wallpaper_landscape", - "/wallpaper_particles" + "/wallpaper_html", // 0 + "/wallpaper_qml", // 1 + "/wallpaper_qml_landscape", // 2 + "/wallpaper_qml_particles", // 3 + "/wallpaper_video_astronaut_vp9", // 4 + "/wallpaper_video_nebula_h264" // 5 }; - QString projectPath = exampleContentPath + contentFolder.at(0); + const int index = 5; + QString projectPath = exampleContentPath + contentFolder.at(index); window.setActiveScreensList({ 0 }); window.setProjectPath(projectPath); diff --git a/ScreenPlayWidget/main.cpp b/ScreenPlayWidget/main.cpp index 161acb9c..098b485e 100644 --- a/ScreenPlayWidget/main.cpp +++ b/ScreenPlayWidget/main.cpp @@ -32,26 +32,30 @@ int main(int argc, char* argv[]) // If we start with only one argument (path, appID, type), // it means we want to test a single widget if (argumentList.length() == 1) { - // WidgetWindow spwmw("test", "appid", "qmlWidget", { 100, 100 }, true); - QString exampleContentPath = QString(SCREENPLAY_SOURCE_DIR) + "/Content"; QStringList contentFolder = { - "/widget_weather", - "/widget_system_stats", // Note: Windows only - "/widget_hello_world", - "/widget_countDown", - "/widget_analogClock", - "/widget_digitalClock", - "/widget_rss_reddit", - "/widget_rss_dw_news", - "/widget_xkcd" + "/widget_weather", // 0 + "/widget_system_stats", // 1 (Note: Windows only) + "/widget_hello_world", // 2 + "/widget_year_count_down", // 3 + "/widget_analog_clock", // 4 + "/widget_digital_clock", // 5 + "/widget_rss_hackernews", // 6 + "/widget_rss_guardian_news", // 7 + "/widget_xkcd" // 8 }; - QString projectPath = exampleContentPath + contentFolder.at(0); + const int index = 5; + QString projectPath = exampleContentPath + contentFolder.at(index); + + // Lets center the widget + const auto* screen = QGuiApplication::screens().at(0); + const int offset = - 200; + QPoint center((screen->size().width() / 2) + offset, (screen->size().height() / 2)+offset); WidgetWindow spwmw(projectPath, "appid", "qmlWidget", - { 0, 0 }, + center, true); return app.exec();