Changeset 6beb157497 in tspsg for src/mainwindow.cpp
- Timestamp:
- Feb 23, 2010, 11:17:48 PM (14 years ago)
- Branches:
- 0.1.3.145-beta1-symbian, 0.1.4.170-beta2-bb10, appveyor, imgbot, master, readme
- Children:
- b2bf8e3b6b
- Parents:
- 11086c2def
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
src/mainwindow.cpp
r11086c2def r6beb157497 64 64 connect(spinCities,SIGNAL(valueChanged(int)),this,SLOT(spinCitiesValueChanged(int))); 65 65 66 #if !defined(Q_OS_WINCE) && !defined(Q_OS_SYMBIAN) 66 67 if (settings->value("SavePos", DEF_SAVEPOS).toBool()) { 67 68 // Loading of saved window state 68 69 settings->beginGroup("MainWindow"); 69 #ifndef Q_OS_WINCE70 70 restoreGeometry(settings->value("Geometry").toByteArray()); 71 #endif // Q_OS_WINCE72 71 restoreState(settings->value("State").toByteArray()); 73 72 settings->endGroup(); 74 #ifndef Q_OS_WINCE75 73 } else { 76 74 // Centering main window … … 78 76 rect.moveCenter(QApplication::desktop()->availableGeometry(this).center()); 79 77 setGeometry(rect); 78 } 79 #else 80 setWindowState(windowState() | Qt::WindowMaximized); 80 81 #endif // Q_OS_WINCE 81 }82 82 83 83 tspmodel = new CTSPModel(this); … … 297 297 //! \todo TODO: Normal about window :-) 298 298 QString title; 299 #if def Q_OS_WINCE299 #if defined(Q_OS_WINCE) || defined(Q_OS_SYMBIAN) 300 300 title += QString::fromUtf8("<b>TSPSG<br>TSP Solver and Generator</b><br>"); 301 301 #else … … 455 455 output.append("<p> " + solver.getSortedPath() + "</p>"); 456 456 if (isInteger(step->price)) 457 output.append("<p>" + tr("The price is <b>%n</b> unit(s).", "", step->price) + "</p>");457 output.append("<p>" + tr("The price is <b>%n</b> unit(s).", "", qRound(step->price)) + "</p>"); 458 458 else 459 459 output.append("<p>" + tr("The price is <b>%1</b> units.").arg(step->price, 0, 'f', settings->value("Task/FractionalAccuracy", DEF_FRACTIONAL_ACCURACY).toInt()) + "</p>"); … … 531 531 if (settings->value("SavePos", DEF_SAVEPOS).toBool()) { 532 532 settings->beginGroup("MainWindow"); 533 #if ndef Q_OS_WINCE533 #if !defined(Q_OS_WINCE) && !defined(Q_OS_SYMBIAN) 534 534 settings->setValue("Geometry", saveGeometry()); 535 535 #endif // Q_OS_WINCE … … 555 555 void MainWindow::loadLangList() 556 556 { 557 QSettings langinfo(PATH_I18N"/languages.ini", QSettings::IniFormat);557 QSettings langinfo(PATH_I18N"/languages.ini", QSettings::IniFormat); 558 558 #if QT_VERSION >= 0x040500 559 559 // In Qt < 4.5 QSettings doesn't have method setIniCodec. 560 560 langinfo.setIniCodec("UTF-8"); 561 561 #endif 562 QDir dir(PATH_I18N, "*.qm",QDir::Name | QDir::IgnoreCase,QDir::Files);562 QDir dir(PATH_I18N, "*.qm", QDir::Name | QDir::IgnoreCase, QDir::Files); 563 563 if (!dir.exists()) 564 564 return; … … 571 571 if (!lang.completeBaseName().startsWith("qt_") && lang.completeBaseName().compare("en")) { 572 572 #if QT_VERSION >= 0x040500 573 a = menuSettingsLanguage->addAction(langinfo.value(lang.completeBaseName() + "/NativeName", lang.completeBaseName()).toString());573 a = menuSettingsLanguage->addAction(langinfo.value(lang.completeBaseName() + "/NativeName", lang.completeBaseName()).toString()); 574 574 #else 575 575 // We use Name if Qt < 4.5 because NativeName is in UTF-8, QSettings 576 576 // reads .ini file as ASCII and there is no way to set file encoding. 577 a = menuSettingsLanguage->addAction(langinfo.value(lang.completeBaseName() + "/Name", lang.completeBaseName()).toString());577 a = menuSettingsLanguage->addAction(langinfo.value(lang.completeBaseName() + "/Name", lang.completeBaseName()).toString()); 578 578 #endif 579 579 a->setData(lang.completeBaseName()); 580 580 a->setCheckable(true); 581 581 a->setActionGroup(groupSettingsLanguageList); 582 if (settings->value("Language", QLocale::system().name()).toString().startsWith(lang.completeBaseName()))582 if (settings->value("Language", QLocale::system().name()).toString().startsWith(lang.completeBaseName())) 583 583 a->setChecked(true); 584 584 } … … 592 592 QString lng = lang; 593 593 if (lng.isEmpty()) { 594 ad = settings->value("Language", "").toString().isEmpty();595 lng = settings->value("Language", QLocale::system().name()).toString();594 ad = settings->value("Language", "").toString().isEmpty(); 595 lng = settings->value("Language", QLocale::system().name()).toString(); 596 596 } 597 597 static QTranslator *qtTranslator; // Qt library translator … … 613 613 // Trying to load system Qt library translation... 614 614 qtTranslator = new QTranslator(this); 615 if (qtTranslator->load("qt_" + lng, QLibraryInfo::location(QLibraryInfo::TranslationsPath)))615 if (qtTranslator->load("qt_" + lng, QLibraryInfo::location(QLibraryInfo::TranslationsPath))) 616 616 qApp->installTranslator(qtTranslator); 617 617 else { 618 618 // No luck. Let's try to load a bundled one. 619 if (qtTranslator->load("qt_" + lng, PATH_I18N))619 if (qtTranslator->load("qt_" + lng, PATH_I18N)) 620 620 qApp->installTranslator(qtTranslator); 621 621 else { … … 628 628 // Now let's load application translation. 629 629 translator = new QTranslator(this); 630 if (translator->load(lng, PATH_I18N))630 if (translator->load(lng, PATH_I18N)) 631 631 qApp->installTranslator(translator); 632 632 else { … … 634 634 translator = NULL; 635 635 if (!ad) 636 QMessageBox (QMessageBox::Warning,tr("Language Change"),tr("Unable to load translation language."),QMessageBox::Ok,this).exec();636 QMessageBox::warning(this, tr("Language Change"), tr("Unable to load translation language.")); 637 637 return false; 638 638 } … … 761 761 #endif 762 762 763 #if ndef Q_OS_WINCE763 #if !defined(Q_OS_WINCE) && !defined(Q_OS_SYMBIAN) 764 764 QStatusBar *statusbar = new QStatusBar(this); 765 765 statusbar->setObjectName("statusbar"); … … 771 771 #endif // Q_OS_WINCE 772 772 773 //! \hack HACK: A little hack for toolbar icons to have a sane size. 773 774 #ifdef Q_OS_WINCE 774 //! \hack HACK: A little hack for toolbar icons to have a sane size.775 775 toolBar->setIconSize(QSize(logicalDpiX() / 4, logicalDpiY() / 4)); 776 #elif defined(Q_OS_SYMBIAN) 777 toolBar->setIconSize(QSize(logicalDpiX() / 5, logicalDpiY() / 5)); 776 778 #endif // Q_OS_WINCE 777 779
Note: See TracChangeset
for help on using the changeset viewer.