← Back to branch summary

~adamreichold/qpdfview/trunk

« back to all changes in this revision

Viewing changes to sources/main.cpp

  • Committer: Adam Reichold
  • Date: 2013-10-13 12:38:36 UTC
  • Revision ID: adamreichold@myopera.com-20131013123836-h66mwm5siwy5ahz3
refactor out loading of translation from main function as well

Show diffs side-by-side

added added

removed removed

Lines of Context:
sources/main.cpp
94
94
 
95
95
static QList< File > files;
96
96
 
 
97
static QTranslator* toolkitTranslator = 0;
 
98
static QTranslator* applicationTranslator = 0;
 
99
 
97
100
static MainWindow* mainWindow = 0;
98
101
 
 
102
static void loadTranslators()
 
103
{
 
104
    toolkitTranslator = new QTranslator(qApp);
 
105
    applicationTranslator = new QTranslator(qApp);
 
106
 
 
107
#if QT_VERSION >= QT_VERSION_CHECK(4,8,0)
 
108
 
 
109
    if(toolkitTranslator->load(QLocale::system(), "qt", "_", QLibraryInfo::location(QLibraryInfo::TranslationsPath))) { qApp->installTranslator(toolkitTranslator); }
 
110
 
 
111
    if(applicationTranslator->load(QLocale::system(), "qpdfview", "_", QDir(QApplication::applicationDirPath()).filePath("data"))) { qApp->installTranslator(applicationTranslator); }
 
112
    else if(applicationTranslator->load(QLocale::system(), "qpdfview", "_", DATA_INSTALL_PATH)) { qApp->installTranslator(applicationTranslator); }
 
113
 
 
114
#else
 
115
 
 
116
    if(toolkitTranslator->load("qt_" + QLocale::system().name(), QLibraryInfo::location(QLibraryInfo::TranslationsPath))) { qApp->installTranslator(toolkitTranslator); }
 
117
 
 
118
    if(applicationTranslator->load("qpdfview_" + QLocale::system().name(), QDir(QApplication::applicationDirPath()).filePath("data"))) { qApp->installTranslator(applicationTranslator); }
 
119
    else if(applicationTranslator->load("qpdfview_" + QLocale::system().name(), DATA_INSTALL_PATH)) { qApp->installTranslator(applicationTranslator); }
 
120
 
 
121
#endif // QT_VERSION
 
122
}
 
123
 
99
124
static void parseCommandLineArguments()
100
125
{
101
126
    bool instanceNameIsNext = false;
427
452
 
428
453
    QApplication::setWindowIcon(QIcon(":icons/qpdfview.svg"));
429
454
 
430
 
    QTranslator toolkitTranslator;
431
 
    QTranslator applicationTranslator;
432
 
 
433
 
#if QT_VERSION >= QT_VERSION_CHECK(4,8,0)
434
 
 
435
 
    if(toolkitTranslator.load(QLocale::system(), "qt", "_", QLibraryInfo::location(QLibraryInfo::TranslationsPath))) { application.installTranslator(&toolkitTranslator); }
436
 
 
437
 
    if(applicationTranslator.load(QLocale::system(), "qpdfview", "_", QDir(QApplication::applicationDirPath()).filePath("data"))) { application.installTranslator(&applicationTranslator); }
438
 
    else if(applicationTranslator.load(QLocale::system(), "qpdfview", "_", DATA_INSTALL_PATH)) { application.installTranslator(&applicationTranslator); }
439
 
 
440
 
#else
441
 
 
442
 
    if(toolkitTranslator.load("qt_" + QLocale::system().name(), QLibraryInfo::location(QLibraryInfo::TranslationsPath))) { application.installTranslator(&toolkitTranslator); }
443
 
 
444
 
    if(applicationTranslator.load("qpdfview_" + QLocale::system().name(), QDir(QApplication::applicationDirPath()).filePath("data"))) { application.installTranslator(&applicationTranslator); }
445
 
    else if(applicationTranslator.load("qpdfview_" + QLocale::system().name(), DATA_INSTALL_PATH)) { application.installTranslator(&applicationTranslator); }
446
 
 
447
 
#endif // QT_VERSION
 
455
    loadTranslators();
448
456
 
449
457
    parseCommandLineArguments();
450
458