merge master into release_3.0.0dev.

This commit is contained in:
Mark Liversedge
2011-01-22 20:42:00 +00:00
21 changed files with 13474 additions and 1244 deletions

View File

@@ -146,6 +146,10 @@ void ConfigDialog::save_Clicked()
appsettings->setValue(GC_LANG, "it");
else if (configPage->langCombo->currentIndex()==5)
appsettings->setValue(GC_LANG, "de");
else if (configPage->langCombo->currentIndex()==6)
appsettings->setValue(GC_LANG, "ru");
else if (configPage->langCombo->currentIndex()==7)
appsettings->setValue(GC_LANG, "cs");
if (configPage->unitCombo->currentIndex()==0)
appsettings->setValue(GC_UNIT, "Metric");