From a5ef63e3fea16e3515192d71f7764b16fb76aa50 Mon Sep 17 00:00:00 2001
From: Elias Steurer <i@kelteseth.net>
Date: Sun, 24 May 2020 14:32:07 +0200
Subject: [PATCH] Rename main qml file of wallpaper and widget to match their
 project names

---
 ScreenPlayWallpaper/SPWResources.qrc                  | 2 +-
 ScreenPlayWallpaper/{mainWindow.qml => Wallpaper.qml} | 0
 ScreenPlayWallpaper/src/linuxwindow.cpp               | 2 +-
 ScreenPlayWallpaper/src/macwindow.cpp                 | 2 +-
 ScreenPlayWallpaper/src/winwindow.cpp                 | 2 +-
 ScreenPlayWidget/SPWidgetResources.qrc                | 2 +-
 ScreenPlayWidget/{mainWidget.qml => Widget.qml}       | 0
 ScreenPlayWidget/src/widgetwindow.cpp                 | 2 +-
 8 files changed, 6 insertions(+), 6 deletions(-)
 rename ScreenPlayWallpaper/{mainWindow.qml => Wallpaper.qml} (100%)
 rename ScreenPlayWidget/{mainWidget.qml => Widget.qml} (100%)

diff --git a/ScreenPlayWallpaper/SPWResources.qrc b/ScreenPlayWallpaper/SPWResources.qrc
index 46ff52b1..fb3e04ca 100644
--- a/ScreenPlayWallpaper/SPWResources.qrc
+++ b/ScreenPlayWallpaper/SPWResources.qrc
@@ -1,6 +1,6 @@
 <RCC>
     <qresource prefix="/">
-        <file>mainWindow.qml</file>
+        <file>Wallpaper.qml</file>
         <file>test.qml</file>
         <file>dot.png</file>
         <file>qtquickcontrols2.conf</file>
diff --git a/ScreenPlayWallpaper/mainWindow.qml b/ScreenPlayWallpaper/Wallpaper.qml
similarity index 100%
rename from ScreenPlayWallpaper/mainWindow.qml
rename to ScreenPlayWallpaper/Wallpaper.qml
diff --git a/ScreenPlayWallpaper/src/linuxwindow.cpp b/ScreenPlayWallpaper/src/linuxwindow.cpp
index c35314d5..5a6cd605 100644
--- a/ScreenPlayWallpaper/src/linuxwindow.cpp
+++ b/ScreenPlayWallpaper/src/linuxwindow.cpp
@@ -179,7 +179,7 @@ LinuxWindow::LinuxWindow(QVector<int> activeScreensList, QString projectPath, QS
     // Instead of setting "renderType: Text.NativeRendering" every time
     // we can set it here once :)
     m_window.setTextRenderType(QQuickWindow::TextRenderType::NativeTextRendering);
-    m_window.setSource(QUrl("qrc:/mainWindow.qml"));*/
+    m_window.setSource(QUrl("qrc:/Wallpaper.qml"));*/
 }
 
 void LinuxWindow::setupWallpaperForOneScreen(int activeScreen)
diff --git a/ScreenPlayWallpaper/src/macwindow.cpp b/ScreenPlayWallpaper/src/macwindow.cpp
index 7f877826..3a4b9777 100644
--- a/ScreenPlayWallpaper/src/macwindow.cpp
+++ b/ScreenPlayWallpaper/src/macwindow.cpp
@@ -40,7 +40,7 @@ MacWindow::MacWindow(
 
     // we can set it here once :)
     m_window.setTextRenderType(QQuickWindow::TextRenderType::NativeTextRendering);
-    m_window.setSource(QUrl("qrc:/mainWindow.qml"));
+    m_window.setSource(QUrl("qrc:/Wallpaper.qml"));
 
     MacIntegration* macIntegration = new MacIntegration(this);
     macIntegration->SetBackgroundLevel(&m_window);
diff --git a/ScreenPlayWallpaper/src/winwindow.cpp b/ScreenPlayWallpaper/src/winwindow.cpp
index 6d18e5db..7bcaf109 100644
--- a/ScreenPlayWallpaper/src/winwindow.cpp
+++ b/ScreenPlayWallpaper/src/winwindow.cpp
@@ -132,7 +132,7 @@ WinWindow::WinWindow(
     // we can set it here once :)
 
     m_window.setTextRenderType(QQuickWindow::TextRenderType::NativeTextRendering);
-    m_window.setSource(QUrl("qrc:/mainWindow.qml"));
+    m_window.setSource(QUrl("qrc:/Wallpaper.qml"));
     m_window.hide();
 
     QObject::connect(&m_checkForFullScreenWindowTimer, &QTimer::timeout, this, &WinWindow::checkForFullScreenWindow);
diff --git a/ScreenPlayWidget/SPWidgetResources.qrc b/ScreenPlayWidget/SPWidgetResources.qrc
index 3ab6f4df..d820a046 100644
--- a/ScreenPlayWidget/SPWidgetResources.qrc
+++ b/ScreenPlayWidget/SPWidgetResources.qrc
@@ -2,7 +2,7 @@
     <qresource prefix="/">
         <file>assets/image/noisy-texture-3.png</file>
         <file>test.qml</file>
-        <file>mainWidget.qml</file>
+        <file>Widget.qml</file>
         <file>assets/icons/baseline-close-24px.svg</file>
         <file>assets/icons/baseline-opacity-24px.svg</file>
         <file>assets/icons/baseline-settings-20px.svg</file>
diff --git a/ScreenPlayWidget/mainWidget.qml b/ScreenPlayWidget/Widget.qml
similarity index 100%
rename from ScreenPlayWidget/mainWidget.qml
rename to ScreenPlayWidget/Widget.qml
diff --git a/ScreenPlayWidget/src/widgetwindow.cpp b/ScreenPlayWidget/src/widgetwindow.cpp
index a4a60d6d..4ed6cb67 100644
--- a/ScreenPlayWidget/src/widgetwindow.cpp
+++ b/ScreenPlayWidget/src/widgetwindow.cpp
@@ -54,7 +54,7 @@ WidgetWindow::WidgetWindow(const QString projectPath, const QString appid, const
 
     m_window.setTextRenderType(QQuickWindow::TextRenderType::NativeTextRendering);
     //    m_window.setResizeMode(QQuickView::ResizeMode::SizeViewToRootObject);
-    m_window.setSource(QUrl("qrc:/mainWidget.qml"));
+    m_window.setSource(QUrl("qrc:/Widget.qml"));
     m_window.show();
 }