|
|
@ -225,7 +225,6 @@ void UBApplication::setupTranslators(QStringList args) |
|
|
|
forcedLanguage = setLanguage; |
|
|
|
forcedLanguage = setLanguage; |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
QStringList availablesTranslations = UBPlatformUtils::availableTranslations(); |
|
|
|
|
|
|
|
QString language(""); |
|
|
|
QString language(""); |
|
|
|
|
|
|
|
|
|
|
|
if(!forcedLanguage.isEmpty()) |
|
|
|
if(!forcedLanguage.isEmpty()) |
|
|
@ -362,14 +361,13 @@ int UBApplication::exec(const QString& pFileToImport) |
|
|
|
boardController->setupLayout(); |
|
|
|
boardController->setupLayout(); |
|
|
|
|
|
|
|
|
|
|
|
if (pFileToImport.length() > 0) |
|
|
|
if (pFileToImport.length() > 0) |
|
|
|
{ |
|
|
|
|
|
|
|
UBApplication::applicationController->importFile(pFileToImport); |
|
|
|
UBApplication::applicationController->importFile(pFileToImport); |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
#if defined(Q_WS_MAC) |
|
|
|
#if defined(Q_WS_MAC) |
|
|
|
static AEEventHandlerUPP ub_proc_ae_handlerUPP = AEEventHandlerUPP(ub_appleEventProcessor); |
|
|
|
static AEEventHandlerUPP ub_proc_ae_handlerUPP = AEEventHandlerUPP(ub_appleEventProcessor); |
|
|
|
AEInstallEventHandler(kCoreEventClass, kAEReopenApplication, ub_proc_ae_handlerUPP, SRefCon(UBApplication::applicationController), true); |
|
|
|
AEInstallEventHandler(kCoreEventClass, kAEReopenApplication, ub_proc_ae_handlerUPP, SRefCon(UBApplication::applicationController), true); |
|
|
|
#endif |
|
|
|
#endif |
|
|
|
|
|
|
|
|
|
|
|
if (UBSettings::settings()->appStartMode->get() == "Desktop") |
|
|
|
if (UBSettings::settings()->appStartMode->get() == "Desktop") |
|
|
|
applicationController->showDesktop(); |
|
|
|
applicationController->showDesktop(); |
|
|
|
else |
|
|
|
else |
|
|
|