From: Flavio Tordini Date: Wed, 11 Nov 2009 20:31:13 +0000 (+0100) Subject: No window icon on the Mac X-Git-Tag: 0.8~14 X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=995649b07b99611da0acd0b900b8ea2fb6e3c074;p=minitube No window icon on the Mac --- diff --git a/src/main.cpp b/src/main.cpp index f4772c6..1c2b0be 100755 --- a/src/main.cpp +++ b/src/main.cpp @@ -12,12 +12,15 @@ int main(int argc, char **argv) { app.setApplicationName(Constants::APP_NAME); app.setOrganizationName(Constants::ORG_NAME); app.setOrganizationDomain(Constants::ORG_DOMAIN); +#ifndef Q_WS_MAC + app.setWheelScrollLines(1); +#endif - QString locale = QLocale::system().name(); + const QString locale = QLocale::system().name(); // qt translations QTranslator qtTranslator; - qtTranslator.load("qt_" + QLocale::system().name(), + qtTranslator.load("qt_" + locale, QLibraryInfo::location(QLibraryInfo::TranslationsPath)); app.installTranslator(&qtTranslator); @@ -37,6 +40,7 @@ int main(int argc, char **argv) { MainWindow mainWin; mainWin.setWindowTitle(Constants::APP_NAME); +#ifndef Q_WS_MAC if (!QFile::exists(dataDir)) { dataDir = qApp->applicationDirPath() + "/data"; } @@ -50,6 +54,7 @@ int main(int argc, char **argv) { // appIcon.addPixmap(QPixmap(png)); } mainWin.setWindowIcon(appIcon); +#endif mainWin.show();