New upstream version 3.4

[minitube] / src / main.cpp

diff --git a/src/main.cpp b/src/main.cpp
index 131c17cb664a031c7ec0f676ab1a6319d2815fa6..e2a0c4450f6b8c145b651f11cd41c7fd455478cd 100644 (file)
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -18,15 +18,14 @@ along with Minitube.  If not, see <http://www.gnu.org/licenses/>.
 
 $END_LICENSE */
 
-#include <QtGui>
-#if QT_VERSION >= 0x050000
+#include <QtNetwork>
 #include <QtWidgets>
-#endif
-#include <qtsingleapplication.h>
+
 #include "constants.h"
+#include "iconutils.h"
 #include "mainwindow.h"
 #include "searchparams.h"
-#include "iconutils.h"
+#include <qtsingleapplication.h>
 #ifdef APP_EXTRA
 #include "extra.h"
 #endif
@@ -34,20 +33,20 @@ $END_LICENSE */
 #include "mac_startup.h"
 #endif
 
-void showWindow(QtSingleApplication &app, const QString &dataDir) {
+void showWindow(QtSingleApplication &app, const QString &pkgDataDir) {
     MainWindow *mainWin = new MainWindow();
-    mainWin->show();
 
 #ifndef APP_MAC
     QIcon appIcon;
-    if (QDir(dataDir).exists()) {
+    if (!pkgDataDir.isEmpty()) {
         appIcon = IconUtils::icon(Constants::UNIX_NAME);
     } else {
         QString dataDir = qApp->applicationDirPath() + "/data";
-        const int iconSizes [] = { 16, 22, 32, 48, 64, 128, 256, 512 };
+        const int iconSizes[] = {16, 22, 32, 48, 64, 128, 256, 512};
         for (int i = 0; i < 8; i++) {
             QString size = QString::number(iconSizes[i]);
-            QString png = dataDir + "/" + size + "x" + size + "/" + Constants::UNIX_NAME + ".png";
+            QString png = dataDir + '/' + size + 'x' + size + '/' + Constants::UNIX_NAME +
+                          QLatin1String(".png");
             appIcon.addFile(png, QSize(iconSizes[i], iconSizes[i]));
         }
     }
@@ -55,35 +54,52 @@ void showWindow(QtSingleApplication &app, const QString &dataDir) {
     mainWin->setWindowIcon(appIcon);
 #endif
 
-    mainWin->connect(&app, SIGNAL(messageReceived(const QString &)),
-                    mainWin, SLOT(messageReceived(const QString &)));
+    mainWin->connect(&app, SIGNAL(messageReceived(const QString &)), mainWin,
+                     SLOT(messageReceived(const QString &)));
     app.setActivationWindow(mainWin, true);
+
+    mainWin->show();
 }
 
 int main(int argc, char **argv) {
+#ifndef Q_NO_DEBUG_OUTPUT
+    qSetMessagePattern("[%{function}] %{message}");
+#endif
+
+#ifdef MEDIA_MPV
+    QSurfaceFormat format = QSurfaceFormat::defaultFormat();
+#ifdef APP_MAC
+    format.setMajorVersion(4);
+    format.setMinorVersion(1);
+#endif
+    format.setProfile(QSurfaceFormat::CoreProfile);
+    QSurfaceFormat::setDefaultFormat(format);
+#endif
 
 #ifdef Q_OS_MAC
     mac::MacMain();
-    // QFont::insertSubstitution(".Helvetica Neue DeskInterface", "Helvetica Neue");
 #endif
 
+    QCoreApplication::setAttribute(Qt::AA_EnableHighDpiScaling);
+
     QtSingleApplication app(argc, argv);
-    QString message = app.arguments().size() > 1 ? app.arguments().at(1) : QString();
-    if (message == QLatin1String("--help")) {
-        MainWindow::printHelp();
-        return 0;
+    QString message;
+    if (app.arguments().size() > 1) {
+        message = app.arguments().at(1);
+        if (message == QLatin1String("--help")) {
+            MainWindow::printHelp();
+            return 0;
+        }
     }
-    if (app.sendMessage(message))
-        return 0;
+    if (app.sendMessage(message)) return 0;
 
     app.setApplicationName(Constants::NAME);
     app.setOrganizationName(Constants::ORG_NAME);
     app.setOrganizationDomain(Constants::ORG_DOMAIN);
     app.setApplicationVersion(Constants::VERSION);
     app.setAttribute(Qt::AA_DontShowIconsInMenus);
-#ifndef APP_WIN
     app.setWheelScrollLines(1);
-#endif
+    app.setAttribute(Qt::AA_UseHighDpiPixmaps);
 
 #ifdef APP_EXTRA
     Extra::appSetup(&app);
@@ -92,46 +108,37 @@ int main(int argc, char **argv) {
     cssFile.open(QFile::ReadOnly);
     QString styleSheet = QLatin1String(cssFile.readAll());
     app.setStyleSheet(styleSheet);
+    cssFile.close();
 #endif
 
     // qt translations
     QTranslator qtTranslator;
-    qtTranslator.load("qt_" + QLocale::system().name(),
+    qtTranslator.load(QLatin1String("qt_") + QLocale::system().name(),
                       QLibraryInfo::location(QLibraryInfo::TranslationsPath));
     app.installTranslator(&qtTranslator);
 
-    // app translations
+    QString pkgDataDir;
 #ifdef PKGDATADIR
-    QString dataDir = QLatin1String(PKGDATADIR);
-#else
-    QString dataDir = "";
+    pkgDataDir = QLatin1String(PKGDATADIR);
 #endif
+
+    // app translations
 #ifdef APP_MAC
-    QString localeDir = qApp->applicationDirPath() + "/../Resources/locale";
+    QString localeDir = qApp->applicationDirPath() + QLatin1String("/../Resources/locale");
 #else
-    QString localeDir = qApp->applicationDirPath() + "/locale";
+    QString localeDir = qApp->applicationDirPath() + QLatin1String("/locale");
 #endif
     if (!QDir(localeDir).exists()) {
-        localeDir = dataDir + "/locale";
+        localeDir = pkgDataDir + QLatin1String("/locale");
     }
-    // qDebug() << "Using locale dir" << localeDir << locale;
+    qDebug() << "Using locale dir" << localeDir << QLocale::system();
     QTranslator translator;
     translator.load(QLocale::system(), QString(), QString(), localeDir);
     app.installTranslator(&translator);
-#if QT_VERSION < 0x050000
-    QTextCodec::setCodecForTr(QTextCodec::codecForName("utf8"));
-#endif
-
-    // Seed random number generator
-    qsrand(QDateTime::currentDateTime().toTime_t());
 
-    // all string literals are UTF-8
-    // QTextCodec::setCodecForCStrings(QTextCodec::codecForName("UTF-8"));
+    QNetworkProxyFactory::setUseSystemConfiguration(true);
 
-#ifdef APP_INTEGRITY
-    if (Extra::integrityCheck())
-#endif
-        showWindow(app, dataDir);
+    showWindow(app, pkgDataDir);
 
     return app.exec();
 }