Windows 11 theme is broken under Windows 11

Signed-off-by: Raul Metsma <[email protected]>

Application.cpp

@@ -19,7 +19,6 @@
 
 #include "Application.h"
 
-#include "common/Common.h"
 #include "idupdater.h"
 #include "ScheduledUpdateTask.h"
 
@@ -38,6 +37,8 @@
 #include <userenv.h>
 #include <wtsapi32.h>
 
+using namespace Qt::StringLiterals;
+
 int main( int argc, char *argv[] )
 {
 	return Application( argc, argv ).run();
@@ -48,7 +49,7 @@ int main( int argc, char *argv[] )
 Application::Application( int &argc, char **argv )
 :	QtSingleApplication( argc, argv )
 {
-	log.setFileName(QDir::tempPath() + QStringLiteral("/id-updater.log"));
+	log.setFileName(QDir::tempPath() + u"/id-updater.log"_s);
 	if( log.exists() && log.open( QFile::WriteOnly|QFile::Append ) )
 		qInstallMessageHandler( msgHandler );
 
@@ -57,27 +58,28 @@ Application::Application( int &argc, char **argv )
 	QTranslator *t = new QTranslator( this );
 	QString lang;
 	auto languages = QLocale().uiLanguages().first();
-	if(languages.contains(QLatin1String("et"), Qt::CaseInsensitive))
-		lang = QStringLiteral("et");
-	else if(languages.contains(QLatin1String("ru"), Qt::CaseInsensitive))
-		lang = QStringLiteral("ru");
+	if(languages.contains("et"_L1, Qt::CaseInsensitive))
+		lang = u"et"_s;
+	else if(languages.contains("ru"_L1, Qt::CaseInsensitive))
+		lang = u"ru"_s;
 	else
-		lang = QStringLiteral("en");
-	void(qt->load(QStringLiteral(":/qtbase_%1.qm").arg(lang)));
-	void(common->load(QStringLiteral(":/common_%1.qm").arg(lang)));
-	void(t->load(QStringLiteral(":/idupdater_%1.qm").arg(lang)));
+		lang = u"en"_s;
+	void(qt->load(":/qtbase_%1.qm"_L1.arg(lang)));
+	void(common->load(":/common_%1.qm"_L1.arg(lang)));
+	void(t->load(":/idupdater_%1.qm"_L1.arg(lang)));
 	installTranslator( qt );
 	installTranslator( common );
 	installTranslator( t );
 #ifdef NDEBUG
 	setLibraryPaths({ applicationDirPath() });
 #endif
-	setWindowIcon(QIcon(QStringLiteral(":/appicon.png")));
-	setApplicationName(QStringLiteral("id-updater"));
-	setApplicationVersion(QStringLiteral( "%1.%2.%3.%4" )
+	setWindowIcon(QIcon(u":/appicon.png"_s));
+	setApplicationName(u"id-updater"_s);
+	setApplicationVersion(u"%1.%2.%3.%4"_s
 		.arg( MAJOR_VER ).arg( MINOR_VER ).arg( RELEASE_VER ).arg( BUILD_VER ) );
-	setOrganizationDomain(QStringLiteral("ria.ee"));
-	setOrganizationName(QStringLiteral("RIA"));
+	setOrganizationDomain(u"ria.ee"_s);
+	setOrganizationName(u"RIA"_s);
+	setStyle(u"windowsvista"_s);
 	QNetworkProxyFactory::setUseSystemConfiguration(true);
 }
 
@@ -90,15 +92,15 @@ Application::~Application()
 int Application::confTask( const QStringList &args ) const
 {
 	ScheduledUpdateTask task;
-	if(args.contains(QStringLiteral("-status")))
+	if(args.contains("-status"_L1))
 		return task.status();
-	if(args.contains(QStringLiteral("-daily")))
+	if(args.contains("-daily"_L1))
 		return task.configure(ScheduledUpdateTask::DAILY);
-	if(args.contains(QStringLiteral("-weekly")))
+	if(args.contains("-weekly"_L1))
 		return task.configure(ScheduledUpdateTask::WEEKLY);
-	if(args.contains(QStringLiteral("-monthly")))
+	if(args.contains("-monthly"_L1))
 		return task.configure(ScheduledUpdateTask::MONTHLY);
-	if(args.contains(QStringLiteral("-remove")))
+	if(args.contains("-remove"_L1))
 		task.remove();
 	return true;
 }
@@ -168,27 +170,27 @@ void Application::messageReceived( const QString &str )
 
 void Application::msgHandler( QtMsgType type, const QMessageLogContext &, const QString &msg )
 {
-	QFile *log = &qobject_cast<Application*>(qApp->instance())->log;
-	log->write(QDateTime::currentDateTime().toString(QStringLiteral("yyyy-MM-dd hh:mm:ss:zzz ")).toUtf8());
+	QFile *log = &qobject_cast<Application*>(qApp)->log;
+	log->write(QDateTime::currentDateTime().toString(u"yyyy-MM-dd hh:mm:ss:zzz "_s).toUtf8());
 	switch( type )
 	{
-	case QtDebugMsg: log->write(QStringLiteral("DBG: %1\n").arg(msg).toUtf8()); break;
-	case QtInfoMsg: log->write(QStringLiteral("INF: %1\n").arg(msg).toUtf8()); break;
-	case QtWarningMsg: log->write(QStringLiteral("WRN: %1\n").arg(msg).toUtf8()); break;
-	case QtCriticalMsg: log->write(QStringLiteral("CRI: %1\n").arg( msg).toUtf8()); break;
-	case QtFatalMsg: log->write(QStringLiteral("FAT: %1\n").arg(msg).toUtf8()); abort();
+	case QtDebugMsg: log->write("DBG: %1\n"_L1.arg(msg).toUtf8()); break;
+	case QtInfoMsg: log->write("INF: %1\n"_L1.arg(msg).toUtf8()); break;
+	case QtWarningMsg: log->write("WRN: %1\n"_L1.arg(msg).toUtf8()); break;
+	case QtCriticalMsg: log->write("CRI: %1\n"_L1.arg( msg).toUtf8()); break;
+	case QtFatalMsg: log->write("FAT: %1\n"_L1.arg(msg).toUtf8()); abort();
 	}
 }
 
 void Application::printHelp()
 {
-	QMessageBox::information(nullptr, QStringLiteral("ID Updater"), QStringLiteral(
+	QMessageBox::information(nullptr, u"ID Updater"_s,
 		"<table><tr><td>-help</td><td>%1</td></tr>"
 		"<tr><td>-autoupdate</td><td>%2</td></tr>"
 		"<tr><td>-autoclose</td><td>%3</td></tr>"
 		"<tr><td>-task</td><td>%4</td></tr>"
 		"<tr><td colspan=\"2\">-daily|-monthly|-weekly|-remove</td></tr>"
-		"<tr><td colspan=\"2\">%6</td></tr></table>").arg(
+		"<tr><td colspan=\"2\">%6</td></tr></table>"_L1.arg(
 		tr("this help"),
 		tr("update automatically"),
 		tr("close automatically when no updates are available"),