Fix font on OS X Mavericks

[minitube] / src / main.cpp

diff --git a/src/main.cpp b/src/main.cpp
index 3513dbaa774f5fb1f9b9e8e0796320eb05a185c2..fe894e6ceee24e2105b49295c3d462b358684082 100644 (file)
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -1,10 +1,30 @@
+/* $BEGIN_LICENSE
+
+This file is part of Minitube.
+Copyright 2009, Flavio Tordini <flavio.tordini@gmail.com>
+
+Minitube is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
+
+Minitube is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with Minitube.  If not, see <http://www.gnu.org/licenses/>.
+
+$END_LICENSE */
+
 #include <QtGui>
 #include <qtsingleapplication.h>
 #include "constants.h"
 #include "mainwindow.h"
 #include "searchparams.h"
-#include "iconloader/qticonloader.h"
-#ifndef Q_WS_X11
+#include "utils.h"
+#ifdef APP_EXTRA
 #include "extra.h"
 #endif
 #ifdef Q_WS_MAC
@@ -15,26 +35,28 @@ int main(int argc, char **argv) {
 
 #ifdef Q_WS_MAC
     mac::MacMain();
+    // https://bugreports.qt-project.org/browse/QTBUG-32789
+    QFont::insertSubstitution(".Lucida Grande UI", "Lucida Grande");
 #endif
 
     QtSingleApplication app(argc, argv);
-    QString message = app.arguments().size() > 1 ? app.arguments().at(1) : "";
-    if (message == "--help") {
+    QString message = app.arguments().size() > 1 ? app.arguments().at(1) : QString();
+    if (message == QLatin1String("--help")) {
         MainWindow::printHelp();
         return 0;
     }
     if (app.sendMessage(message))
         return 0;
 
-    app.setApplicationName(Constants::NAME);
-    app.setOrganizationName(Constants::ORG_NAME);
-    app.setOrganizationDomain(Constants::ORG_DOMAIN);
+    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.setAttribute(Qt::AA_DontShowIconsInMenus);
 
-#ifndef Q_WS_X11
+#ifdef APP_EXTRA
     Extra::appSetup(&app);
 #else
     QFile cssFile(":/style.css");
@@ -61,28 +83,25 @@ int main(int argc, char **argv) {
     }
     // qDebug() << "Using locale dir" << localeDir << locale;
     QTranslator translator;
-    translator.load(QLocale::system(), localeDir);
+    translator.load(QLocale::system(), QString(), QString(), localeDir);
     app.installTranslator(&translator);
     QTextCodec::setCodecForTr(QTextCodec::codecForName("utf8"));
 
     MainWindow mainWin;
-    mainWin.setWindowTitle(Constants::NAME);
-
-#ifndef Q_WS_X11
-    Extra::windowSetup(&mainWin);
-#endif
+    mainWin.show();
 
-// no window icon on Mac
+    // no window icon on Mac
 #ifndef APP_MAC
     QIcon appIcon;
     if (QDir(dataDir).exists()) {
-        appIcon = QtIconLoader::icon(Constants::UNIX_NAME);
+        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";
+            QString png = dataDir + "/" + size + "x" + size + "/" +
+                    Constants::UNIX_NAME + ".png";
             appIcon.addFile(png, QSize(iconSizes[i], iconSizes[i]));
         }
     }
@@ -92,25 +111,12 @@ int main(int argc, char **argv) {
     mainWin.setWindowIcon(appIcon);
 #endif
 
-    mainWin.show();
-
-    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);
 
     // all string literals are UTF-8
-    QTextCodec::setCodecForCStrings(QTextCodec::codecForName("UTF-8"));
-
-    if (app.arguments().size() > 1) {
-        QString query = app.arguments().at(1);
-        if (query.startsWith("--")) {
-            mainWin.messageReceived(query);
-            return 0;
-        } else {
-            SearchParams *searchParams = new SearchParams();
-            searchParams->setKeywords(query);
-            mainWin.showMedia(searchParams);
-        }
-    }
+    // QTextCodec::setCodecForCStrings(QTextCodec::codecForName("UTF-8"));
 
     // Seed random number generator
     qsrand(QDateTime::currentDateTime().toTime_t());