chris/OSCAR-code
1
0
Fork 0
mirror of https://gitlab.com/pholy/OSCAR-code.git synced 2025-04-06 11:10:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix bug in Language selection

Browse Source
This commit is contained in:
Mark Watkins 2013-09-15 15:03:41 +10:00
parent 84f945c5a1
commit 4fd9ef2dd2
2 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
main.cpp
View File

@ -214,7 +214,6 @@ int main(int argc, char *argv[])
qDebug() << "Available Translations"; qDebug() << "Available Translations";
QFileInfoList list=dir.entryInfoList(); QFileInfoList list=dir.entryInfoList();
QString language=PREF[STR_PREF_Language].toString(); QString language=PREF[STR_PREF_Language].toString();
bool langok=false;
QString langfile,langname; QString langfile,langname;
@ -238,16 +237,17 @@ int main(int argc, char *argv[])
} }
} }
if (langfile.isEmpty()) { if (language.isEmpty()) {
langsel.connect(&lang_okbtn,SIGNAL(clicked()),&langsel, SLOT(close())); langsel.connect(&lang_okbtn,SIGNAL(clicked()),&langsel, SLOT(close()));
langsel.exec(); langsel.exec();
langsel.disconnect(&lang_okbtn,SIGNAL(clicked()),&langsel, SLOT(close())); langsel.disconnect(&lang_okbtn,SIGNAL(clicked()),&langsel, SLOT(close()));
langfile=lang_combo.currentText(); langname=lang_combo.currentText();
PREF[STR_PREF_Language]=langfile; langfile=lang_combo.itemData(lang_combo.currentIndex()).toString();
PREF[STR_PREF_Language]=langname;
} }
qDebug() << "Loading Translation" << langfile; qDebug() << "Loading " << langname << " Translation" << langfile;
QTranslator translator; QTranslator translator;
translator.load(langfile,QCoreApplication::applicationDirPath()+"/Translations"); translator.load(langfile,QCoreApplication::applicationDirPath()+"/Translations");

5
mainwindow.cpp
View File

@ -612,7 +612,7 @@ void MainWindow::on_action_About_triggered()
QString msg=QString( QString msg=QString(
"<span style=\"color:#000000; font-weight:600; vertical-align:middle;\">" "<span style=\"color:#000000; font-weight:600; vertical-align:middle;\">"
"<table width=100%><tr><td>" "<table width=100%><tr><td>"
"<p><h1>"+tr("SleepyHead")+" v%1.%2.%3-%4 (%8)</h1></p><font color=black><p>"+tr("Build Date")+": %5 %6<br/>%7<br/>"+tr("Data Folder")+": %9<hr>"+ "<p><h1>"+STR_TR_SleepyHead+" v%1.%2.%3-%4 (%8)</h1></p><font color=black><p>"+tr("Build Date")+": %5 %6<br/>%7<br/>"+tr("Data Folder Location")+": %9<hr>"+
tr("Copyright")+" &copy;2012 Mark Watkins (jedimark) <br> \n"+ tr("Copyright")+" &copy;2012 Mark Watkins (jedimark) <br> \n"+
tr("This software is released under the GNU Public License v3.0<br>")+ tr("This software is released under the GNU Public License v3.0<br>")+
"<hr><p>"+tr("SleepyHead Project Page")+": <a href=\"http://sourceforge.net/projects/sleepyhead\">http://sourceforge.net/projects/sleepyhead</a><br/>"+ "<hr><p>"+tr("SleepyHead Project Page")+": <a href=\"http://sourceforge.net/projects/sleepyhead\">http://sourceforge.net/projects/sleepyhead</a><br/>"+
@ -1095,7 +1095,8 @@ void MainWindow::RestartApplication(bool force_login)
args << "-p"; args << "-p";
if (force_login) args << "-l"; if (force_login) args << "-l";
if (QProcess::startDetached(apppath,args)) { if (QProcess::startDetached(apppath,args)) {
QApplication::instance()->exit(); ::exit(0);
//QApplication::instance()->exit();
} else QMessageBox::warning(this,tr("Gah!"),tr("If you can read this, the restart command didn't work. Your going to have to do it yourself manually."),QMessageBox::Ok); } else QMessageBox::warning(this,tr("Gah!"),tr("If you can read this, the restart command didn't work. Your going to have to do it yourself manually."),QMessageBox::Ok);
#endif #endif
} }