X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=src%2Fmain.cpp;h=008efc7575f511a253492be52dcbff6561edfaaa;hb=0a830a458a7471296caca8c011f3256d56c0f9a0;hp=e25de863634441684fe5669815f81f36b3da3884;hpb=c449f3a0f783b74807783ab9618d4b8232e4fae3;p=minitube

diff --git a/src/main.cpp b/src/main.cpp
index e25de86..008efc7 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -3,30 +3,43 @@
 #include "constants.h"
 #include "MainWindow.h"
 #include "searchparams.h"
-#ifdef APP_MAC_STORE
-#include "local/mac/mac_startup.h"
-#endif
-#ifdef APP_WIN
-#include "local/win/qtwin.h"
+#ifdef Q_WS_MAC
+#include "mac_startup.h"
+#include "macfullscreen.h"
 #endif
+#include "iconloader/qticonloader.h"
 
 int main(int argc, char **argv) {
 
-#ifdef APP_MAC_STORE
+#ifdef Q_WS_MAC
     mac::MacMain();
 #endif
 
     QtSingleApplication app(argc, argv);
-    if (app.sendMessage("Wake up!"))
+    QString message = app.arguments().size() > 1 ? app.arguments().at(1) : "";
+    if (app.sendMessage(message))
         return 0;
 
-    app.setApplicationName(Constants::APP_NAME);
+    app.setApplicationName(Constants::NAME);
     app.setOrganizationName(Constants::ORG_NAME);
     app.setOrganizationDomain(Constants::ORG_DOMAIN);
-#ifndef APP_MAC
+#ifndef APP_WIN
     app.setWheelScrollLines(1);
 #endif
 
+#ifdef APP_MAC
+    app.setAttribute(Qt::AA_NativeWindows);
+    QFile file(":/mac.css");
+    file.open(QFile::ReadOnly);
+    app.setStyleSheet(QLatin1String(file.readAll()));
+#endif
+
+#ifdef APP_WIN
+    QFile file(":/win.css");
+    file.open(QFile::ReadOnly);
+    app.setStyleSheet(QLatin1String(file.readAll()));
+#endif
+
     const QString locale = QLocale::system().name();
 
     // qt translations
@@ -42,7 +55,7 @@ int main(int argc, char **argv) {
     QString dataDir = "";
 #endif
     QString localeDir = qApp->applicationDirPath() + QDir::separator() + "locale";
-    if (!QFile::exists(localeDir)) {
+    if (!QDir(localeDir).exists()) {
         localeDir = dataDir + QDir::separator() + "locale";
     }
     // qDebug() << "Using locale dir" << localeDir << locale;
@@ -52,34 +65,40 @@ int main(int argc, char **argv) {
     QTextCodec::setCodecForTr(QTextCodec::codecForName("utf8"));
 
     MainWindow mainWin;
-    mainWin.setWindowTitle(Constants::APP_NAME);
+    mainWin.setWindowTitle(Constants::NAME);
+
+#ifdef Q_WS_MAC
+    app.setQuitOnLastWindowClosed(false);
+    mac::SetupFullScreenWindow(mainWin.winId());
+#endif
 
 // no window icon on Mac
 #ifndef APP_MAC
-    if (!QFile::exists(dataDir)) {
+    QIcon appIcon;
+    if (QDir(dataDir).exists()) {
+        appIcon = QtIconLoader::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]));
+        }
     }
-    const int iconSizes [] = { 16, 22, 24, 32, 48, 64, 128, 256 };
-    QIcon appIcon;
-    for (int i = 0; i < 8; i++) {
-        QString size = QString::number(iconSizes[i]);
-        QString png = dataDir + "/" + size + "x" + size + "/minitube.png";
-        // qDebug() << png;
-        appIcon.addFile(png, QSize(iconSizes[i], iconSizes[i]));
+    if (appIcon.isNull()) {
+        appIcon.addFile(":/images/app.png");
     }
     mainWin.setWindowIcon(appIcon);
 #endif
 
 #ifdef APP_WIN
-    if (QtWin::isCompositionEnabled()) {
-        QtWin::extendFrameIntoClientArea(&mainWin);
-        mainWin.setContentsMargins(0, 0, 0, 0);
-    }
     app.setFont(QFont("Segoe UI", 9));
 #endif
 
     mainWin.show();
 
+    mainWin.connect(&app, SIGNAL(messageReceived(const QString &)), &mainWin, SLOT(messageReceived(const QString &)));
     app.setActivationWindow(&mainWin, true);
 
     // all string literals are UTF-8
@@ -92,5 +111,8 @@ int main(int argc, char **argv) {
         mainWin.showMedia(searchParams);
     }
 
+    // Seed random number generator
+    qsrand(QDateTime::currentDateTime().toTime_t());
+
     return app.exec();
 }