1
0
mirror of https://gitlab.com/kelteseth/ScreenPlay.git synced 2024-11-22 10:42:29 +01:00

Rename main qml file of wallpaper and widget to match their project names

This commit is contained in:
Elias Steurer 2020-05-24 14:32:07 +02:00
parent 23a2e5eb42
commit a5ef63e3fe
8 changed files with 6 additions and 6 deletions

View File

@ -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>

View File

@ -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)

View File

@ -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);

View File

@ -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);

View File

@ -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>

View File

@ -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();
}