diff --git a/README.md b/README.md index 54125b5..e6ccedc 100644 --- a/README.md +++ b/README.md @@ -17,7 +17,7 @@ It might not be that worthy to build a Qt application from ground for such a sma on Debian-based systems: ```bash - sudo apt install --no-install-recommends qt6-base-dev qt6-declarative-dev cmake g++ + sudo apt install --no-install-recommends qt6-base-dev qt6-declarative-dev qml6-module-qtquick qml6-module-qtquick-controls2 qml6-module-qtquick-layouts qml6-module-qtquick-templates qml6-qtqml-workerscript cmake g++ ``` 2. Clone the repository: diff --git a/WallReel/UI/Modules/BottomBar.qml b/WallReel/UI/Modules/BottomBar.qml index 1117fe6..40a5c36 100644 --- a/WallReel/UI/Modules/BottomBar.qml +++ b/WallReel/UI/Modules/BottomBar.qml @@ -56,7 +56,7 @@ Item { displayedText: "Restore" onClicked: root.restoreClicked() - foregroundColor: "#fab387" + foregroundColor: "#D28A25" Binding { target: restoreButton @@ -71,7 +71,7 @@ Item { displayedText: "Confirm" onClicked: root.confirmClicked() - foregroundColor: "#a6e3a1" + foregroundColor: "#459A4E" Binding { target: confirmButton @@ -84,7 +84,7 @@ Item { WRTextButton { displayedText: "Cancel" onClicked: root.cancelClicked() - foregroundColor: "#f38ba8" + foregroundColor: "#D65555" } } diff --git a/WallReel/UI/Modules/ColorControl.qml b/WallReel/UI/Modules/ColorControl.qml index b649d6c..5ed6c0b 100644 --- a/WallReel/UI/Modules/ColorControl.qml +++ b/WallReel/UI/Modules/ColorControl.qml @@ -21,7 +21,7 @@ Item { Component.onCompleted: { paletteCombo.currentIndex = selectedPalette ? availablePalettes.findIndex((p) => { return p.name === selectedPalette.name; - }) : -1; + }) + 1 : 0; colorCombo.currentIndex = selectedColor ? availableColors.findIndex((c) => { return c.name === selectedColor.name; }) + 1 : 0; diff --git a/WallReel/main.cpp b/WallReel/main.cpp index 34fe1a0..100e13d 100644 --- a/WallReel/main.cpp +++ b/WallReel/main.cpp @@ -25,7 +25,12 @@ int main(int argc, char* argv[]) { QApplication a(argc, argv); a.setApplicationName(APP_NAME); a.setApplicationVersion(APP_VERSION); - a.setWindowIcon(QIcon(QString(":/%1.svg").arg(APP_NAME))); +#if QT_VERSION >= QT_VERSION_CHECK(6, 8, 0) + using namespace Qt::StringLiterals; + a.setWindowIcon(QIcon(u":/%1.svg"_s.arg(APP_NAME))); +#else + a.setWindowIcon(QIcon(u":/%1.svg"_qs.arg(APP_NAME))); +#endif { Logger::init(); @@ -60,7 +65,16 @@ int main(int argc, char* argv[]) { &a, []() { QCoreApplication::exit(-1); }, Qt::QueuedConnection); - engine.loadFromModule(UIMODULE_URI, "Main"); + +#if QT_VERSION >= QT_VERSION_CHECK(6, 8, 0) + using namespace Qt::StringLiterals; + engine.loadFromModule(UIMODULE_URI, u"Main"_s); +#elif QT_VERSION >= QT_VERSION_CHECK(6, 5, 0) + engine.loadFromModule(UIMODULE_URI, u"Main"_qs); +#else + engine.addImportPath(u"qrc:/"_qs)); + engine.load(QUrl(u"qrc:/WallReel/UI/Main.qml"_qs)); +#endif bootstrap.start();