diff --git a/ScreenPlay/app.h b/ScreenPlay/app.h index 20055da6..40efdd7a 100644 --- a/ScreenPlay/app.h +++ b/ScreenPlay/app.h @@ -47,8 +47,8 @@ #include #include #include -#include #include +#include #include "src/create.h" #include "src/globalvariables.h" diff --git a/ScreenPlay/main.cpp b/ScreenPlay/main.cpp index 850549c9..28d2f381 100644 --- a/ScreenPlay/main.cpp +++ b/ScreenPlay/main.cpp @@ -36,13 +36,7 @@ #include #include #include -#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0) -#include -#else -#include -#endif - - +#include #include #define DOCTEST_CONFIG_IMPLEMENT @@ -54,6 +48,7 @@ int main(int argc, char* argv[]) Q_INIT_RESOURCE(ScreenPlayQML); Q_INIT_RESOURCE(ScreenPlayAssets); + QtWebEngineQuick::initialize(); QApplication::setAttribute(Qt::AA_ShareOpenGLContexts); QApplication qtGuiApp(argc, argv); diff --git a/ScreenPlay/src/settings.h b/ScreenPlay/src/settings.h index a4409e37..9783baff 100644 --- a/ScreenPlay/src/settings.h +++ b/ScreenPlay/src/settings.h @@ -216,16 +216,14 @@ public slots: const QString homePath = QDir::homePath(); QFile settingsPlist(homePath + "/Library/LaunchAgents/" + plistFileName); if (settingsPlist.exists()) { - if(!settingsPlist.remove()){ + if (!settingsPlist.remove()) { qCritical() << "Unable to remove: " << settingsPlist.fileName(); } } settingsPlist.open(QIODevice::WriteOnly | QIODevice::Truncate); QTextStream out(&settingsPlist); -#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0) - out.setCodec("UTF-8"); -#endif + out.setEncoding(QStringConverter::Utf8); out << settingsPlistContent; settingsPlist.flush(); settingsPlist.close(); diff --git a/ScreenPlay/src/util.cpp b/ScreenPlay/src/util.cpp index 52128e5c..0e7a57d5 100644 --- a/ScreenPlay/src/util.cpp +++ b/ScreenPlay/src/util.cpp @@ -63,9 +63,7 @@ bool Util::writeJsonObjectToFile(const QString& absoluteFilePath, const QJsonObj } QTextStream out(&configTmp); -#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0) - out.setCodec("UTF-8"); -#endif + out.setEncoding(QStringConverter::Utf8); out << QJsonDocument(object).toJson(); configTmp.close(); @@ -255,9 +253,7 @@ bool Util::writeSettings(const QJsonObject& obj, const QString& absolutePath) } QTextStream out(&file); -#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0) - out.setCodec("UTF-8"); -#endif + out.setEncoding(QStringConverter::Utf8); QJsonDocument doc(obj); out << doc.toJson(); @@ -278,9 +274,7 @@ bool Util::writeFile(const QString& text, const QString& absolutePath) } QTextStream out(&file); -#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0) - out.setCodec("UTF-8"); -#endif + out.setEncoding(QStringConverter::Utf8); out << text; file.close(); @@ -300,9 +294,7 @@ bool Util::writeFileFromQrc(const QString& qrcPath, const QString& absolutePath) } QTextStream out(&file); -#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0) - out.setCodec("UTF-8"); -#endif + out.setEncoding(QStringConverter::Utf8); QFile qrc(qrcPath); qrc.open(QIODevice::ReadOnly); diff --git a/ScreenPlay/tests/tst_main.cpp b/ScreenPlay/tests/tst_main.cpp index aa061ae9..33ad5489 100644 --- a/ScreenPlay/tests/tst_main.cpp +++ b/ScreenPlay/tests/tst_main.cpp @@ -40,8 +40,8 @@ #include #include #include -#include #include +#include #define DOCTEST_CONFIG_IMPLEMENT #define DOCTEST_CONFIG_SUPER_FAST_ASSERTS #include @@ -55,7 +55,6 @@ private slots: Q_INIT_RESOURCE(ScreenPlayQML); Q_INIT_RESOURCE(ScreenPlayAssets); - app.init(); m_window = qobject_cast(app.mainWindowEngine()->rootObjects().first()); QVERIFY(m_window); diff --git a/ScreenPlay/translations/ScreenPlay_de.ts b/ScreenPlay/translations/ScreenPlay_de.ts index 5feba97c..4d719132 100644 --- a/ScreenPlay/translations/ScreenPlay_de.ts +++ b/ScreenPlay/translations/ScreenPlay_de.ts @@ -223,7 +223,7 @@ Analyse des Videos schlug Fehl! - + Convert a video to a wallpaper Konvertiere ein Video in ein Hintergrund Live Wallpaper @@ -233,37 +233,37 @@ - + Generating preview video... Generiere Vorschau-Video... - + Name (required!) Name (erforderlich!) - + Description Beschreibung - + Youtube URL YouTube-URL - + Abort Abbrechen - + Save Speichern - + Save Wallpaper... Speicher Wallpaper... @@ -520,7 +520,7 @@ Analyse des Videos schlug Fehl! - + Import a video to a wallpaper Importiere ein Video zu ein Wallpaper @@ -530,37 +530,37 @@ - + Generating preview video... Generiere Vorschau-Video... - + Name (required!) Name (erforderlich!) - + Description Beschreibung - + Youtube URL YouTube-URL - + Abort Abbrechen - + Save Speichern - + Save Wallpaper... Speicher Wallpaper... @@ -601,43 +601,43 @@ Installed - + Refreshing! Aktualisiere! - - + + Pull to refresh! Drücken zum aktualisieren! - + Get more Wallpaper & Widgets via the Steam workshop! Holen dir mehr Wallpaper und Widgets über den Steam-Workshop! - + Open containing folder Enthaltenden Ordner öffnen - + Remove Item - + Remove via Workshop - + Open Workshop Page - + Are you sure you want to delete this item? Bist du dir sicher dass du dieses Item löschen möchtest? @@ -797,12 +797,12 @@ Bitte Konfiguriere deine Wallpaper noch erneut NavigationWallpaperConfiguration - + Configurate active Wallpaper or Widgets Konfiguriere aktive Wallpaper oder Widgets - + No active Wallpaper or Widgets Keine aktiven Wallpaper oder Widgets @@ -810,12 +810,12 @@ Bitte Konfiguriere deine Wallpaper noch erneut PopupOffline - - You need to run Steam for this :) - Steam muss dafür ausgeführt sein :) + + You need to run Steam for this. steamErrorRestart: %1 - steamErrorAPIInit: %2 + - + Back Zurück @@ -920,7 +920,7 @@ Bitte Konfiguriere deine Wallpaper noch erneut ScreenPlayItem - + NEW @@ -986,212 +986,212 @@ Bitte Konfiguriere deine Wallpaper noch erneut - + Important: Changing this directory has no effect on the workshop download path. ScreenPlay only supports having one content folder! Wichtig: Eine Änderung dieses Verzeichnisses hat keine Auswirkungen auf den Download-Pfad des Workshops. ScreenPlay unterstützt nur ein Verzeichnis! - + Language Sprache - + Set the ScreenPlay UI Language Wähle die Sprache des Programms aus - + English - + German Deutsch - + Russian - + French - + Spanish - + Korean - + Vietnamese - + Portuguese (Brazil) - + Theme Thema - + Switch dark/light theme Wechsle Dunkles/Helles Design - + System Default System Standard - + Dark Dunkel - + Light Hell - + Performance Leistung - + Pause wallpaper video rendering while another app is in the foreground Pausiere Wallpaper Video Rendering wenn eine andere App im Vordergrund ist - + We disable the video rendering (not the audio!) for the best performance. If you have problem you can disable this behaviour here. Wallpaper restart required! Wir deaktivieren das Video Rendering (Aber nicht die Sounds) für die beste Leistung. Wenn du damit probleme haben solltest kannst dieses Verhalten hier ausschalten. Ein Neustart wird aber von Nöten sein! - + Logs - + Chinese - Simplified - + Default Fill Mode Standard-Füllmodus - + Set this property to define how the video is scaled to fit the target area. Lege diese Eigenschaft fest, um zu definieren, wie das Video skaliert wird, damit es in den Zielbereich passt. - + Stretch Strecken - + Fill Ausfüllen - + Contain Enthält - + Cover - + Scale-Down Runter Skallieren - + About Über - + Thank you for using ScreenPlay Danke, dass du ScreenPlay verwendest - + Hi, I'm Elias Steurer also known as Kelteseth and I'm the developer of ScreenPlay. Thank you for using my software. You can follow me to receive updates about ScreenPlay here: Moin, ich bin Elias Steurer, auch bekannt als Kelteseth und ich bin der Entwickler von ScreenPlay. Danke, dass du meine Software nutzt. Du kannst mir hier folgen, um Updates über ScreenPlay zu erhalten: - + Version Version - + ScreenPlay Build Version ScreenPlay-Build-Version - + Open Changelog Changelog öffnen - + Third Party Software Software von Drittanbietern - + ScreenPlay would not be possible without the work of others. A big thank you to: ScreenPlay wäre ohne die Arbeit anderer nicht möglich. Ein großes Dankeschön dafür geht an: - + Licenses Lizenzen - + If your ScreenPlay missbehaves this is a good way to look for answers. This shows all logs and warning during runtime. Wenn den ScreenPlay sich falsch verhält, ist hier eine gute Möglichkeit, nach Antworten zu suchen. Hier werden alle Protokolle und Warnungen während der Laufzeit angezeigt. - + Show Logs Zeige Logs - + Data Protection Datenschutz - + We use you data very carefully to improve ScreenPlay. We do not sell or share this (anonymous) information with others! Wir verwenden deine Daten sehr sorgfältig, um ScreenPlay zu verbessern. Wir verkaufen oder teilen diese (anonymen) Informationen nicht mit anderen! - + Privacy Datenschutz @@ -1207,57 +1207,57 @@ Bitte Konfiguriere deine Wallpaper noch erneut Sidebar - + Set Widget - + Headline Überschrift - + Select a Monitor to display the content Wähle einen Monitor zur Anzeige des Inhalts - + Set Volume Audiolautstärke einstellen - + Fill Mode Füll-Modus - + Stretch Strecken - + Fill Ausfüllen - + Contain Enthält - + Cover - + Scale-Down Runter-Skallieren - + Set Wallpaper Wallpaper Festlegen @@ -1307,47 +1307,47 @@ Bitte Konfiguriere deine Wallpaper noch erneut Abonniere - + Tools Overview Werkzeugeübersicht - + Video import and convert (all types) - + Video Import (.webm) Importiere Video (.webm) - + GIF Wallpaper - + QML Wallpaper - + HTML5 Wallpaper - + Website Wallpaper - + QML Widget - + HTML Widget diff --git a/ScreenPlay/translations/ScreenPlay_en.ts b/ScreenPlay/translations/ScreenPlay_en.ts index c589e44c..a725326f 100644 --- a/ScreenPlay/translations/ScreenPlay_en.ts +++ b/ScreenPlay/translations/ScreenPlay_en.ts @@ -211,42 +211,42 @@ - + Convert a video to a wallpaper - + Generating preview video... - + Name (required!) - + Description - + Youtube URL - + Abort - + Save - + Save Wallpaper... @@ -508,42 +508,42 @@ - + Import a video to a wallpaper - + Generating preview video... - + Name (required!) - + Description - + Youtube URL - + Abort - + Save - + Save Wallpaper... @@ -589,43 +589,43 @@ - + Refreshing! - - + + Pull to refresh! - + Get more Wallpaper & Widgets via the Steam workshop! - + Open containing folder - + Remove Item - + Remove via Workshop - + Open Workshop Page - + Are you sure you want to delete this item? @@ -779,12 +779,12 @@ NavigationWallpaperConfiguration - + Configurate active Wallpaper or Widgets - + No active Wallpaper or Widgets @@ -792,12 +792,12 @@ PopupOffline - - You need to run Steam for this :) + + You need to run Steam for this. steamErrorRestart: %1 - steamErrorAPIInit: %2 - + Back @@ -902,7 +902,7 @@ ScreenPlayItem - + NEW @@ -968,212 +968,212 @@ - + Important: Changing this directory has no effect on the workshop download path. ScreenPlay only supports having one content folder! - + Language - + Set the ScreenPlay UI Language - + English - + German - + Chinese - Simplified - + Russian - + French - + Spanish - + Korean - + Vietnamese - + Portuguese (Brazil) - + Theme - + Switch dark/light theme - + System Default - + Dark - + Light - + Performance - + Pause wallpaper video rendering while another app is in the foreground - + We disable the video rendering (not the audio!) for the best performance. If you have problem you can disable this behaviour here. Wallpaper restart required! - + Default Fill Mode - + Set this property to define how the video is scaled to fit the target area. - + Stretch - + Fill - + Contain - + Cover - + Scale-Down - + About - + Thank you for using ScreenPlay - + Hi, I'm Elias Steurer also known as Kelteseth and I'm the developer of ScreenPlay. Thank you for using my software. You can follow me to receive updates about ScreenPlay here: - + Version - + ScreenPlay Build Version - + Open Changelog - + Third Party Software - + ScreenPlay would not be possible without the work of others. A big thank you to: - + Licenses - + Logs - + If your ScreenPlay missbehaves this is a good way to look for answers. This shows all logs and warning during runtime. - + Show Logs - + Data Protection - + We use you data very carefully to improve ScreenPlay. We do not sell or share this (anonymous) information with others! - + Privacy @@ -1189,102 +1189,102 @@ Sidebar - + Tools Overview - + Video import and convert (all types) - + Video Import (.webm) - + GIF Wallpaper - + QML Wallpaper - + HTML5 Wallpaper - + Website Wallpaper - + QML Widget - + HTML Widget - + Set Wallpaper - + Set Widget - + Headline - + Select a Monitor to display the content - + Set Volume - + Fill Mode - + Stretch - + Fill - + Contain - + Cover - + Scale-Down diff --git a/ScreenPlay/translations/ScreenPlay_es.ts b/ScreenPlay/translations/ScreenPlay_es.ts index 59487656..830cb8df 100644 --- a/ScreenPlay/translations/ScreenPlay_es.ts +++ b/ScreenPlay/translations/ScreenPlay_es.ts @@ -227,42 +227,42 @@ - + Convert a video to a wallpaper - + Generating preview video... - + Name (required!) - + Description - + Youtube URL - + Abort - + Save - + Save Wallpaper... @@ -524,42 +524,42 @@ - + Import a video to a wallpaper - + Generating preview video... - + Name (required!) - + Description - + Youtube URL - + Abort - + Save - + Save Wallpaper... @@ -605,43 +605,43 @@ - + Refreshing! - - + + Pull to refresh! - + Get more Wallpaper & Widgets via the Steam workshop! - + Open containing folder - + Remove Item - + Remove via Workshop - + Open Workshop Page - + Are you sure you want to delete this item? @@ -795,12 +795,12 @@ NavigationWallpaperConfiguration - + Configurate active Wallpaper or Widgets - + No active Wallpaper or Widgets @@ -808,12 +808,12 @@ PopupOffline - - You need to run Steam for this :) + + You need to run Steam for this. steamErrorRestart: %1 - steamErrorAPIInit: %2 - + Back @@ -918,7 +918,7 @@ ScreenPlayItem - + NEW @@ -984,212 +984,212 @@ - + Important: Changing this directory has no effect on the workshop download path. ScreenPlay only supports having one content folder! - + Language - + Set the ScreenPlay UI Language - + English - + German - + Chinese - Simplified - + Russian - + French - + Spanish - + Korean - + Vietnamese - + Portuguese (Brazil) - + Theme - + Switch dark/light theme - + System Default - + Dark - + Light - + Performance - + Pause wallpaper video rendering while another app is in the foreground - + We disable the video rendering (not the audio!) for the best performance. If you have problem you can disable this behaviour here. Wallpaper restart required! - + Default Fill Mode - + Set this property to define how the video is scaled to fit the target area. - + Stretch - + Fill - + Contain - + Cover - + Scale-Down - + About - + Thank you for using ScreenPlay - + Hi, I'm Elias Steurer also known as Kelteseth and I'm the developer of ScreenPlay. Thank you for using my software. You can follow me to receive updates about ScreenPlay here: - + Version - + ScreenPlay Build Version - + Open Changelog - + Third Party Software - + ScreenPlay would not be possible without the work of others. A big thank you to: - + Licenses - + Logs - + If your ScreenPlay missbehaves this is a good way to look for answers. This shows all logs and warning during runtime. - + Show Logs - + Data Protection - + We use you data very carefully to improve ScreenPlay. We do not sell or share this (anonymous) information with others! - + Privacy @@ -1205,102 +1205,102 @@ Sidebar - + Tools Overview - + Video import and convert (all types) - + Video Import (.webm) - + GIF Wallpaper - + QML Wallpaper - + HTML5 Wallpaper - + Website Wallpaper - + QML Widget - + HTML Widget - + Set Wallpaper - + Set Widget - + Headline - + Select a Monitor to display the content - + Set Volume - + Fill Mode - + Stretch - + Fill - + Contain - + Cover - + Scale-Down diff --git a/ScreenPlay/translations/ScreenPlay_fr.ts b/ScreenPlay/translations/ScreenPlay_fr.ts index 164a84fa..c4d16193 100644 --- a/ScreenPlay/translations/ScreenPlay_fr.ts +++ b/ScreenPlay/translations/ScreenPlay_fr.ts @@ -211,42 +211,42 @@ - + Convert a video to a wallpaper - + Generating preview video... - + Name (required!) - + Description - + Youtube URL - + Abort - + Save - + Save Wallpaper... @@ -508,42 +508,42 @@ - + Import a video to a wallpaper - + Generating preview video... - + Name (required!) - + Description - + Youtube URL - + Abort - + Save - + Save Wallpaper... @@ -589,43 +589,43 @@ - + Refreshing! - - + + Pull to refresh! - + Get more Wallpaper & Widgets via the Steam workshop! - + Open containing folder - + Remove Item - + Remove via Workshop - + Open Workshop Page - + Are you sure you want to delete this item? @@ -779,12 +779,12 @@ NavigationWallpaperConfiguration - + Configurate active Wallpaper or Widgets - + No active Wallpaper or Widgets @@ -792,12 +792,12 @@ PopupOffline - - You need to run Steam for this :) + + You need to run Steam for this. steamErrorRestart: %1 - steamErrorAPIInit: %2 - + Back @@ -902,7 +902,7 @@ ScreenPlayItem - + NEW @@ -968,212 +968,212 @@ - + Important: Changing this directory has no effect on the workshop download path. ScreenPlay only supports having one content folder! - + Language - + Set the ScreenPlay UI Language - + English - + German - + Chinese - Simplified - + Russian - + French - + Spanish - + Korean - + Vietnamese - + Portuguese (Brazil) - + Theme - + Switch dark/light theme - + System Default - + Dark - + Light - + Performance - + Pause wallpaper video rendering while another app is in the foreground - + We disable the video rendering (not the audio!) for the best performance. If you have problem you can disable this behaviour here. Wallpaper restart required! - + Default Fill Mode - + Set this property to define how the video is scaled to fit the target area. - + Stretch - + Fill - + Contain - + Cover - + Scale-Down - + About - + Thank you for using ScreenPlay - + Hi, I'm Elias Steurer also known as Kelteseth and I'm the developer of ScreenPlay. Thank you for using my software. You can follow me to receive updates about ScreenPlay here: - + Version - + ScreenPlay Build Version - + Open Changelog - + Third Party Software - + ScreenPlay would not be possible without the work of others. A big thank you to: - + Licenses - + Logs - + If your ScreenPlay missbehaves this is a good way to look for answers. This shows all logs and warning during runtime. - + Show Logs - + Data Protection - + We use you data very carefully to improve ScreenPlay. We do not sell or share this (anonymous) information with others! - + Privacy @@ -1189,102 +1189,102 @@ Sidebar - + Tools Overview - + Video import and convert (all types) - + Video Import (.webm) - + GIF Wallpaper - + QML Wallpaper - + HTML5 Wallpaper - + Website Wallpaper - + QML Widget - + HTML Widget - + Set Wallpaper - + Set Widget - + Headline - + Select a Monitor to display the content - + Set Volume - + Fill Mode - + Stretch - + Fill - + Contain - + Cover - + Scale-Down diff --git a/ScreenPlay/translations/ScreenPlay_ko.ts b/ScreenPlay/translations/ScreenPlay_ko.ts index 11abc7ff..9a422195 100644 --- a/ScreenPlay/translations/ScreenPlay_ko.ts +++ b/ScreenPlay/translations/ScreenPlay_ko.ts @@ -227,42 +227,42 @@ - + Convert a video to a wallpaper - + Generating preview video... - + Name (required!) - + Description - + Youtube URL - + Abort - + Save - + Save Wallpaper... @@ -524,42 +524,42 @@ - + Import a video to a wallpaper - + Generating preview video... - + Name (required!) - + Description - + Youtube URL - + Abort - + Save - + Save Wallpaper... @@ -605,43 +605,43 @@ - + Refreshing! - - + + Pull to refresh! - + Get more Wallpaper & Widgets via the Steam workshop! - + Open containing folder - + Remove Item - + Remove via Workshop - + Open Workshop Page - + Are you sure you want to delete this item? @@ -795,12 +795,12 @@ NavigationWallpaperConfiguration - + Configurate active Wallpaper or Widgets - + No active Wallpaper or Widgets @@ -808,12 +808,12 @@ PopupOffline - - You need to run Steam for this :) + + You need to run Steam for this. steamErrorRestart: %1 - steamErrorAPIInit: %2 - + Back @@ -918,7 +918,7 @@ ScreenPlayItem - + NEW @@ -984,212 +984,212 @@ - + Important: Changing this directory has no effect on the workshop download path. ScreenPlay only supports having one content folder! - + Language - + Set the ScreenPlay UI Language - + English - + German - + Chinese - Simplified - + Russian - + French - + Spanish - + Korean - + Vietnamese - + Portuguese (Brazil) - + Theme - + Switch dark/light theme - + System Default - + Dark - + Light - + Performance - + Pause wallpaper video rendering while another app is in the foreground - + We disable the video rendering (not the audio!) for the best performance. If you have problem you can disable this behaviour here. Wallpaper restart required! - + Default Fill Mode - + Set this property to define how the video is scaled to fit the target area. - + Stretch - + Fill - + Contain - + Cover - + Scale-Down - + About - + Thank you for using ScreenPlay - + Hi, I'm Elias Steurer also known as Kelteseth and I'm the developer of ScreenPlay. Thank you for using my software. You can follow me to receive updates about ScreenPlay here: - + Version - + ScreenPlay Build Version - + Open Changelog - + Third Party Software - + ScreenPlay would not be possible without the work of others. A big thank you to: - + Licenses - + Logs - + If your ScreenPlay missbehaves this is a good way to look for answers. This shows all logs and warning during runtime. - + Show Logs - + Data Protection - + We use you data very carefully to improve ScreenPlay. We do not sell or share this (anonymous) information with others! - + Privacy @@ -1205,102 +1205,102 @@ Sidebar - + Tools Overview - + Video import and convert (all types) - + Video Import (.webm) - + GIF Wallpaper - + QML Wallpaper - + HTML5 Wallpaper - + Website Wallpaper - + QML Widget - + HTML Widget - + Set Wallpaper - + Set Widget - + Headline - + Select a Monitor to display the content - + Set Volume - + Fill Mode - + Stretch - + Fill - + Contain - + Cover - + Scale-Down diff --git a/ScreenPlay/translations/ScreenPlay_pt_br.ts b/ScreenPlay/translations/ScreenPlay_pt_br.ts index 3887a1bc..7b250dc5 100644 --- a/ScreenPlay/translations/ScreenPlay_pt_br.ts +++ b/ScreenPlay/translations/ScreenPlay_pt_br.ts @@ -227,42 +227,42 @@ - + Convert a video to a wallpaper - + Generating preview video... - + Name (required!) - + Description - + Youtube URL - + Abort - + Save - + Save Wallpaper... @@ -524,42 +524,42 @@ - + Import a video to a wallpaper - + Generating preview video... - + Name (required!) - + Description - + Youtube URL - + Abort - + Save - + Save Wallpaper... @@ -605,43 +605,43 @@ - + Refreshing! - - + + Pull to refresh! - + Get more Wallpaper & Widgets via the Steam workshop! - + Open containing folder - + Remove Item - + Remove via Workshop - + Open Workshop Page - + Are you sure you want to delete this item? @@ -795,12 +795,12 @@ NavigationWallpaperConfiguration - + Configurate active Wallpaper or Widgets - + No active Wallpaper or Widgets @@ -808,12 +808,12 @@ PopupOffline - - You need to run Steam for this :) + + You need to run Steam for this. steamErrorRestart: %1 - steamErrorAPIInit: %2 - + Back @@ -918,7 +918,7 @@ ScreenPlayItem - + NEW @@ -984,212 +984,212 @@ - + Important: Changing this directory has no effect on the workshop download path. ScreenPlay only supports having one content folder! - + Language - + Set the ScreenPlay UI Language - + English - + German - + Chinese - Simplified - + Russian - + French - + Spanish - + Korean - + Vietnamese - + Portuguese (Brazil) - + Theme - + Switch dark/light theme - + System Default - + Dark - + Light - + Performance - + Pause wallpaper video rendering while another app is in the foreground - + We disable the video rendering (not the audio!) for the best performance. If you have problem you can disable this behaviour here. Wallpaper restart required! - + Default Fill Mode - + Set this property to define how the video is scaled to fit the target area. - + Stretch - + Fill - + Contain - + Cover - + Scale-Down - + About - + Thank you for using ScreenPlay - + Hi, I'm Elias Steurer also known as Kelteseth and I'm the developer of ScreenPlay. Thank you for using my software. You can follow me to receive updates about ScreenPlay here: - + Version - + ScreenPlay Build Version - + Open Changelog - + Third Party Software - + ScreenPlay would not be possible without the work of others. A big thank you to: - + Licenses - + Logs - + If your ScreenPlay missbehaves this is a good way to look for answers. This shows all logs and warning during runtime. - + Show Logs - + Data Protection - + We use you data very carefully to improve ScreenPlay. We do not sell or share this (anonymous) information with others! - + Privacy @@ -1205,102 +1205,102 @@ Sidebar - + Tools Overview - + Video import and convert (all types) - + Video Import (.webm) - + GIF Wallpaper - + QML Wallpaper - + HTML5 Wallpaper - + Website Wallpaper - + QML Widget - + HTML Widget - + Set Wallpaper - + Set Widget - + Headline - + Select a Monitor to display the content - + Set Volume - + Fill Mode - + Stretch - + Fill - + Contain - + Cover - + Scale-Down diff --git a/ScreenPlay/translations/ScreenPlay_ru.ts b/ScreenPlay/translations/ScreenPlay_ru.ts index d659beab..853d99f6 100644 --- a/ScreenPlay/translations/ScreenPlay_ru.ts +++ b/ScreenPlay/translations/ScreenPlay_ru.ts @@ -227,42 +227,42 @@ - + Convert a video to a wallpaper - + Generating preview video... - + Name (required!) - + Description - + Youtube URL - + Abort - + Save - + Save Wallpaper... @@ -524,42 +524,42 @@ - + Import a video to a wallpaper - + Generating preview video... - + Name (required!) - + Description - + Youtube URL - + Abort - + Save - + Save Wallpaper... @@ -605,43 +605,43 @@ - + Refreshing! - - + + Pull to refresh! - + Get more Wallpaper & Widgets via the Steam workshop! - + Open containing folder - + Remove Item - + Remove via Workshop - + Open Workshop Page - + Are you sure you want to delete this item? @@ -795,12 +795,12 @@ NavigationWallpaperConfiguration - + Configurate active Wallpaper or Widgets - + No active Wallpaper or Widgets @@ -808,12 +808,12 @@ PopupOffline - - You need to run Steam for this :) + + You need to run Steam for this. steamErrorRestart: %1 - steamErrorAPIInit: %2 - + Back @@ -918,7 +918,7 @@ ScreenPlayItem - + NEW @@ -984,212 +984,212 @@ - + Important: Changing this directory has no effect on the workshop download path. ScreenPlay only supports having one content folder! - + Language - + Set the ScreenPlay UI Language - + English - + German - + Chinese - Simplified - + Russian - + French - + Spanish - + Korean - + Vietnamese - + Portuguese (Brazil) - + Theme - + Switch dark/light theme - + System Default - + Dark - + Light - + Performance - + Pause wallpaper video rendering while another app is in the foreground - + We disable the video rendering (not the audio!) for the best performance. If you have problem you can disable this behaviour here. Wallpaper restart required! - + Default Fill Mode - + Set this property to define how the video is scaled to fit the target area. - + Stretch - + Fill - + Contain - + Cover - + Scale-Down - + About - + Thank you for using ScreenPlay - + Hi, I'm Elias Steurer also known as Kelteseth and I'm the developer of ScreenPlay. Thank you for using my software. You can follow me to receive updates about ScreenPlay here: - + Version - + ScreenPlay Build Version - + Open Changelog - + Third Party Software - + ScreenPlay would not be possible without the work of others. A big thank you to: - + Licenses - + Logs - + If your ScreenPlay missbehaves this is a good way to look for answers. This shows all logs and warning during runtime. - + Show Logs - + Data Protection - + We use you data very carefully to improve ScreenPlay. We do not sell or share this (anonymous) information with others! - + Privacy @@ -1205,102 +1205,102 @@ Sidebar - + Tools Overview - + Video import and convert (all types) - + Video Import (.webm) - + GIF Wallpaper - + QML Wallpaper - + HTML5 Wallpaper - + Website Wallpaper - + QML Widget - + HTML Widget - + Set Wallpaper - + Set Widget - + Headline - + Select a Monitor to display the content - + Set Volume - + Fill Mode - + Stretch - + Fill - + Contain - + Cover - + Scale-Down diff --git a/ScreenPlay/translations/ScreenPlay_vi.ts b/ScreenPlay/translations/ScreenPlay_vi.ts index aa80fe35..c2eb02b2 100644 --- a/ScreenPlay/translations/ScreenPlay_vi.ts +++ b/ScreenPlay/translations/ScreenPlay_vi.ts @@ -215,42 +215,42 @@ Đã có lỗi xảy ra khi đang xử lý video! - + Convert a video to a wallpaper Chuyển đổi một video sang ảnh động - + Generating preview video... Đang tạo ra video xem trước... - + Name (required!) Tên (bắt buộc!) - + Description Mô tả - + Youtube URL Link YouTube - + Abort Hủy bỏ - + Save Lưu - + Save Wallpaper... Lưu hình nền... @@ -513,43 +513,43 @@ Đã có lỗi xảy ra khi đang xử lý video! - + Import a video to a wallpaper google translate xD Nhập một video vào hình nền - + Generating preview video... Đang tạo ra video xem trước... - + Name (required!) Tên (bắt buộc!) - + Description Mô tả - + Youtube URL Link YouTube - + Abort Hủy bỏ - + Save Lưu - + Save Wallpaper... Lưu hình nền... @@ -595,43 +595,43 @@ - + Refreshing! Đang làm mới! - - + + Pull to refresh! Kéo xuống để làm mới! - + Get more Wallpaper & Widgets via the Steam workshop! Lấy thêm nhiều hình nền & widgets từ Steam Workshop! - + Open containing folder Mở thư mục chứa hình nền. - + Remove Item Xóa hình nền - + Remove via Workshop Xóa nhờ Workshop - + Open Workshop Page Mở trang workshop - + Are you sure you want to delete this item? Bạn có chắc chắn muốn xóa hình nền này không? @@ -789,12 +789,12 @@ NavigationWallpaperConfiguration - + Configurate active Wallpaper or Widgets Thiết lập hình nền hoặc widgets đang hoạt động - + No active Wallpaper or Widgets Không có hình nền hoặc widgets đang hoạt động @@ -802,12 +802,12 @@ PopupOffline - - You need to run Steam for this :) - Bạn cần phải chạy Steam cho việc này (*≧ω≦*) + + You need to run Steam for this. steamErrorRestart: %1 - steamErrorAPIInit: %2 + - + Back Quay lại @@ -913,7 +913,7 @@ ScreenPlayItem - + NEW @@ -979,215 +979,215 @@ Đường dẫn lưu trữ của bạn đang trống! - + Important: Changing this directory has no effect on the workshop download path. ScreenPlay only supports having one content folder! Quan trọng: Thay đổi thư mục này không có hiệu ứng gì ở thư mục tải về của workshop. ScreenPlay chỉ hỗ trợ có một thư mục chứa nội dung! - + Language Ngôn ngữ - + Set the ScreenPlay UI Language Đặt ngôn ngữ của ScreenPlay - + English Tiếng Anh - + German Tiếng Đức - + Chinese - Simplified Tiếng Trung - Giản thể - + Russian Tiếng Nga - + French Tiếng Pháp - + Spanish Tiếng Tây Ban Nha - + Korean Tiếng Hàn Quốc - + Vietnamese Tiếng Việt - + Portuguese (Brazil) Tiếng Bồ Đào Nha (Brazil) - + Theme Chủ đề - + Switch dark/light theme Chuyển chủ để sáng/tôí - + System Default Mặc định theo hệ thống - + Dark Tối - + Light Sáng - + Performance Hiệu suất - + Pause wallpaper video rendering while another app is in the foreground Tạm dừng ảnh nền video khi có một ứng dụng khác đang mở phía trước - + We disable the video rendering (not the audio!) for the best performance. If you have problem you can disable this behaviour here. Wallpaper restart required! gg translate Chúng tôi tắt hiển thị video (không phải âm thanh!) Để có hiệu suất tốt nhất. Nếu bạn gặp sự cố, bạn có thể vô hiệu hóa hành vi này tại đây. Yêu cầu khởi động lại hình nền! - + Default Fill Mode Cách lấp đầy mặc định - + Set this property to define how the video is scaled to fit the target area. google translate Đặt thuộc tính này để xác định cách chia tỷ lệ video để phù hợp với khu vực mục tiêu. - + Stretch Kéo dài - + Fill Lấp đầy - + Contain Chứa đựng - + Cover Bao phủ - + Scale-Down Giảm tỉ lệ - + About Về ứng dụng - + Thank you for using ScreenPlay Cảm ơn bạn vì đã sử dụng ScreenPlay - + Hi, I'm Elias Steurer also known as Kelteseth and I'm the developer of ScreenPlay. Thank you for using my software. You can follow me to receive updates about ScreenPlay here: Chào, tôi là Elias Steurer hay được biết đến là Kelteseth và tôi là người phát triển của ScreenPlay. Cảm ơn bạn đã sử dụng phần mềm của tôi. Bạn có thể theo dõi tôi để nhận được những cập nhật về ScreenPlay tại: - + Version Phiên bản - + ScreenPlay Build Version Bản dựng của ScreenPlay - + Open Changelog Mở nhật kí thay đổi - + Third Party Software Phần mềm của bên thứ ba - + ScreenPlay would not be possible without the work of others. A big thank you to: ScreenPlay sẽ không thể có được nếu như không có thành quả của những người khác. Một lời cảm ơn lớn đến: - + Licenses Bản quyền - + Logs Nhật kí - + If your ScreenPlay missbehaves this is a good way to look for answers. This shows all logs and warning during runtime. Nếu ScreenPlay của bạn hoạt động sai thì đây là một cách tốt để tìm câu trả lời. Ở đây hiện tất cả các nhật kí và cảnh báo trong khi chạy - + Show Logs Hiện nhật kí - + Data Protection Bảo vệ dữ liệu - + We use you data very carefully to improve ScreenPlay. We do not sell or share this (anonymous) information with others! gg translate Chúng tôi sử dụng dữ liệu của bạn rất cẩn thận để cải thiện ScreenPlay. Chúng tôi không bán hoặc chia sẻ thông tin này (ẩn danh) với người khác! - + Privacy Quyền riêng tư @@ -1203,102 +1203,102 @@ Sidebar - + Tools Overview Tổng quan về công cụ - + Video import and convert (all types) Nhập video và chuyển đổi (tất cả các loại) - + Video Import (.webm) Nhập video (.webm) - + GIF Wallpaper Hình nền GIF - + QML Wallpaper Hình nền QML - + HTML5 Wallpaper Hình nền HTML5 - + Website Wallpaper Trang chủ của hình nền - + QML Widget Widget QML - + HTML Widget Widget HTML - + Set Wallpaper Đặt hình nền - + Set Widget Đặt widget - + Headline Tiêu đề - + Select a Monitor to display the content Chọn một màn hình để hiển thị nội dung - + Set Volume Chỉnh âm lượng - + Fill Mode Cách lấp đầy - + Stretch Kéo dài - + Fill Lấp đầy - + Contain Chứa đựng - + Cover Bao phủ - + Scale-Down Giảm tỉ lệ diff --git a/ScreenPlay/translations/ScreenPlay_zh_cn.ts b/ScreenPlay/translations/ScreenPlay_zh_cn.ts index d9270d46..b5e583e7 100644 --- a/ScreenPlay/translations/ScreenPlay_zh_cn.ts +++ b/ScreenPlay/translations/ScreenPlay_zh_cn.ts @@ -213,42 +213,42 @@ 分析视频出错！ - + Convert a video to a wallpaper 将视频转换为壁纸 - + Generating preview video... 生成预览视频... - + Name (required!) 名称（必选） - + Description 简介 - + Youtube URL Youtube 链接 - + Abort 中止 - + Save 保存 - + Save Wallpaper... 保存壁纸... @@ -510,42 +510,42 @@ 分析视频出错！ - + Import a video to a wallpaper 将视频导入为壁纸 - + Generating preview video... 生成预览视频... - + Name (required!) 名称（必选） - + Description 简介 - + Youtube URL Youtube 链接 - + Abort 中止 - + Save 保存 - + Save Wallpaper... 保存壁纸... @@ -586,43 +586,43 @@ Installed - + Refreshing! 刷新中！ - - + + Pull to refresh! 下拉以刷新！ - + Get more Wallpaper & Widgets via the Steam workshop! 从创意工坊获取更多壁纸和物件！ - + Open containing folder 打开文件夹 - + Remove Item 删除物品 - + Remove via Workshop 从创意工坊中删除 - + Open Workshop Page 打开创意工坊页面 - + Are you sure you want to delete this item? 您确定要删除此物品？ @@ -777,12 +777,12 @@ NavigationWallpaperConfiguration - + Configurate active Wallpaper or Widgets 设置活动壁纸或物件 - + No active Wallpaper or Widgets 没有活动壁纸或物件 @@ -790,12 +790,12 @@ PopupOffline - - You need to run Steam for this :) - 使用此功能需运行Steam :) + + You need to run Steam for this. steamErrorRestart: %1 - steamErrorAPIInit: %2 + - + Back 返回 @@ -900,7 +900,7 @@ ScreenPlayItem - + NEW @@ -951,22 +951,22 @@ 选择位置 - + Important: Changing this directory has no effect on the workshop download path. ScreenPlay only supports having one content folder! 注意：修改此目录并不影响创意工坊的下载路径。ScreenPlay仅支持单个内容文件夹！ - + Language 语言 - + Set the ScreenPlay UI Language 设置ScreenPlay界面语言 - + Performance 性能 @@ -986,192 +986,192 @@ 您的存储路径是空的！ - + English 英语 - + German 德语 - + Chinese - Simplified 中文（简体） - + Russian 俄语 - + French 法语 - + Spanish 西班牙语 - + Korean 韩语 - + Vietnamese 越南语 - + Portuguese (Brazil) 英语（巴西） - + Theme 主题 - + Switch dark/light theme 切换到暗/亮主题 - + System Default 跟随系统 - + Dark 暗 - + Light 亮 - + Pause wallpaper video rendering while another app is in the foreground 当其他应用程序在前台时，暂停壁纸视频渲染 - + We disable the video rendering (not the audio!) for the best performance. If you have problem you can disable this behaviour here. Wallpaper restart required! 我们禁用视频渲染（不是音频）以获得最佳性能。如果您有问题，可以在此处禁用此行为。 需要重启壁纸！ - + Default Fill Mode 默认填充模式 - + Set this property to define how the video is scaled to fit the target area. 设置此属性可定义视频的缩放方式以适应目标区域。 - + Stretch 拉伸 - + Fill 填充 - + Contain 适应 - + Cover 平铺 - + Scale-Down 裁剪 - + About 关于 - + Thank you for using ScreenPlay 感谢您的使用 - + Hi, I'm Elias Steurer also known as Kelteseth and I'm the developer of ScreenPlay. Thank you for using my software. You can follow me to receive updates about ScreenPlay here: 您好，我是Elias Steurer，也叫Kelteseth，我是ScreenPlay的开发者。感谢您使用我的软件。您可以在这里关注我，接收ScreenPlay的更新。 - + Version 版本 - + ScreenPlay Build Version ScreenPlay编译版本 - + Open Changelog 打开更改日志。 - + Third Party Software 第三方软件 - + ScreenPlay would not be possible without the work of others. A big thank you to: ScreenPlay离不开一些人的帮助。非常感谢你们： - + Licenses 许可证 - + Logs 日志 - + If your ScreenPlay missbehaves this is a good way to look for answers. This shows all logs and warning during runtime. 如果您的ScreenPlay出错，这是个很好的查错方式。它显示所有的日志和运行时警告。 - + Show Logs 显示日志 - + Data Protection 数据保护 - + We use you data very carefully to improve ScreenPlay. We do not sell or share this (anonymous) information with others! 我们使用您的数据提升ScreenPlay的体验。我们承诺不出售或分享这些匿名信息！ - + Privacy 隐私 @@ -1187,57 +1187,57 @@ Sidebar - + Set Widget 设置物件 - + Headline 标题 - + Select a Monitor to display the content 选择显示此内容的显示器 - + Set Volume 设置音量 - + Fill Mode 填充模式 - + Stretch 拉伸 - + Fill 填充 - + Contain 适应 - + Cover 平铺 - + Scale-Down 裁剪 - + Set Wallpaper 设置壁纸 @@ -1287,47 +1287,47 @@ 订阅 - + Tools Overview 工具概览 - + Video import and convert (all types) - + Video Import (.webm) 视频导入 (.webm) - + GIF Wallpaper GIF 壁纸 - + QML Wallpaper QML 壁纸 - + HTML5 Wallpaper HTML5 壁纸 - + Website Wallpaper 网页壁纸 - + QML Widget QML 部件 - + HTML Widget HTML 部件 diff --git a/ScreenPlayUtil/src/util.cpp b/ScreenPlayUtil/src/util.cpp index 0e73d9b2..bd56101c 100644 --- a/ScreenPlayUtil/src/util.cpp +++ b/ScreenPlayUtil/src/util.cpp @@ -61,9 +61,7 @@ bool writeJsonObjectToFile(const QString& absoluteFilePath, const QJsonObject& o } QTextStream out(&configTmp); -#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0) -out.setCodec("UTF-8"); -#endif + out.setEncoding(QStringConverter::Utf8); out << QJsonDocument(object).toJson(); configTmp.close(); diff --git a/ScreenPlayWallpaper/main.cpp b/ScreenPlayWallpaper/main.cpp index 5dab4421..d8dd11de 100644 --- a/ScreenPlayWallpaper/main.cpp +++ b/ScreenPlayWallpaper/main.cpp @@ -3,12 +3,7 @@ #include #include #include -#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0) -#include -#else #include -#endif - #include "ScreenPlayUtil/util.h" @@ -22,16 +17,9 @@ int main(int argc, char* argv[]) { - //QApplication::setAttribute(Qt::AA_EnableHighDpiScaling); QApplication::setAttribute(Qt::AA_ShareOpenGLContexts); -#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0) - QtWebEngine::initialize(); -#else - QtWebEngineQuick::initialize(); -#endif - QApplication app(argc, argv); // This gives us nice clickable output in QtCreator diff --git a/ScreenPlayWallpaper/src/basewindow.h b/ScreenPlayWallpaper/src/basewindow.h index 8c1534cf..d9e64371 100644 --- a/ScreenPlayWallpaper/src/basewindow.h +++ b/ScreenPlayWallpaper/src/basewindow.h @@ -150,7 +150,7 @@ public slots: virtual void destroyThis() { } virtual void setVisible(bool show) { Q_UNUSED(show) } virtual void messageReceived(QString key, QString value) final; - virtual void clearComponentCache() {} + virtual void clearComponentCache() { } virtual void replaceWallpaper( const QString absolutePath, const QString file, diff --git a/ScreenPlayWidget/main.cpp b/ScreenPlayWidget/main.cpp index 42170886..be3c5418 100644 --- a/ScreenPlayWidget/main.cpp +++ b/ScreenPlayWidget/main.cpp @@ -1,12 +1,13 @@ #include #include #include +#include #include "src/widgetwindow.h" int main(int argc, char* argv[]) { - QApplication::setAttribute(Qt::AA_EnableHighDpiScaling); + QtWebEngineQuick::initialize(); QApplication::setAttribute(Qt::AA_ShareOpenGLContexts); QApplication app(argc, argv); diff --git a/ScreenPlayWorkshop/src/steamworkshop.cpp b/ScreenPlayWorkshop/src/steamworkshop.cpp index f57e598a..9280ba1a 100644 --- a/ScreenPlayWorkshop/src/steamworkshop.cpp +++ b/ScreenPlayWorkshop/src/steamworkshop.cpp @@ -33,7 +33,6 @@ bool SteamWorkshop::init() return false; } - // https://partner.steamgames.com/doc/sdk/api#SteamAPI_RestartAppIfNecessary // checks if your executable was launched through Steam and relaunches it through Steam if it wasn't. // This is optional but highly recommended as the Steam context associated with your application (including your App ID) will not be set up if the user launches the executable directly. If this occurs then SteamAPI_Init will fail and you will be unable to use the Steamworks API. @@ -45,7 +44,6 @@ bool SteamWorkshop::init() m_steamErrorRestart = true; } - QObject::connect(&m_pollTimer, &QTimer::timeout, this, []() { SteamAPI_RunCallbacks(); }); m_pollTimer.start(100);