X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=src%2Fmain.cpp;h=26768f0f64ce5f56bc381da84c4e72fdd36a65f9;hb=refs%2Fheads%2Fmaster;hp=95e9f128e4ee03dde7f3b782c0ec2ed89cf5b10f;hpb=d1f8234fe0884e05dd95a1c4876ec6e29d7d9f2b;p=minitube
diff --git a/src/main.cpp b/src/main.cpp
index 95e9f12..26768f0 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -18,41 +18,90 @@ along with Minitube. If not, see .
$END_LICENSE */
-#include
-#include
+#include
+#include
+
#include "constants.h"
+#include "iconutils.h"
+#include "updateutils.h"
+
#include "mainwindow.h"
#include "searchparams.h"
-#include "utils.h"
+#include
#ifdef APP_EXTRA
#include "extra.h"
#endif
-#ifdef Q_WS_MAC
+#ifdef Q_OS_MAC
#include "mac_startup.h"
#endif
+void showWindow(QtSingleApplication &app, const QString &pkgDataDir) {
+ MainWindow *mainWin = new MainWindow();
+
+#ifndef APP_MAC
+ QIcon appIcon;
+ 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};
+ for (int i = 0; i < 8; i++) {
+ QString size = QString::number(iconSizes[i]);
+ QString png = dataDir + '/' + size + 'x' + size + '/' + Constants::UNIX_NAME +
+ QLatin1String(".png");
+ appIcon.addFile(png, QSize(iconSizes[i], iconSizes[i]));
+ }
+ }
+ if (appIcon.isNull()) appIcon.addFile(":/images/app.png");
+ mainWin->setWindowIcon(appIcon);
+#endif
+
+ 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 QT_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_WS_MAC
+#ifdef Q_OS_MAC
mac::MacMain();
#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(QLatin1String(Constants::NAME));
- app.setOrganizationName(QLatin1String(Constants::ORG_NAME));
- app.setOrganizationDomain(QLatin1String(Constants::ORG_DOMAIN));
-#ifndef APP_WIN
- app.setWheelScrollLines(1);
-#endif
+ app.setApplicationName(Constants::NAME);
+ app.setOrganizationName(Constants::ORG_NAME);
+ app.setOrganizationDomain(Constants::ORG_DOMAIN);
+ app.setApplicationVersion(Constants::VERSION);
app.setAttribute(Qt::AA_DontShowIconsInMenus);
+ app.setWheelScrollLines(1);
+ app.setAttribute(Qt::AA_UseHighDpiPixmaps);
#ifdef APP_EXTRA
Extra::appSetup(&app);
@@ -61,63 +110,41 @@ 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);
+ pkgDataDir = QLatin1String(PKGDATADIR);
+#endif
+
+ // app translations
+#ifdef APP_MAC
+ QString localeDir = qApp->applicationDirPath() + QLatin1String("/../Resources/locale");
#else
- QString dataDir = "";
+ QString localeDir = qApp->applicationDirPath() + QLatin1String("/locale");
#endif
- QString localeDir = qApp->applicationDirPath() + "/locale";
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);
- QTextCodec::setCodecForTr(QTextCodec::codecForName("utf8"));
-
- MainWindow mainWin;
- mainWin.show();
- // no window icon on Mac
-#ifndef APP_MAC
- QIcon appIcon;
- if (QDir(dataDir).exists()) {
- appIcon = Utils::icon(Constants::UNIX_NAME);
- } else {
- dataDir = qApp->applicationDirPath() + "/data";
- 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";
- appIcon.addFile(png, QSize(iconSizes[i], iconSizes[i]));
- }
- }
- if (appIcon.isNull()) {
- appIcon.addFile(":/images/app.png");
- }
- mainWin.setWindowIcon(appIcon);
-#endif
+ QNetworkProxyFactory::setUseSystemConfiguration(true);
- mainWin.connect(&app, SIGNAL(messageReceived(const QString &)),
- &mainWin, SLOT(messageReceived(const QString &)));
- app.setActivationWindow(&mainWin, true);
+ IconUtils::setSizes({16, 24, 32, 88, 128});
- // all string literals are UTF-8
- // QTextCodec::setCodecForCStrings(QTextCodec::codecForName("UTF-8"));
+ UpdateUtils::init();
- // Seed random number generator
- qsrand(QDateTime::currentDateTime().toTime_t());
+ showWindow(app, pkgDataDir);
return app.exec();
}