Changeset 946f442ab0 in tspsg for src/mainwindow.cpp


Ignore:
Timestamp:
Jan 7, 2010, 3:48:24 PM (14 years ago)
Author:
Oleksii Serdiuk
Branches:
0.1.3.145-beta1-symbian, 0.1.4.170-beta2-bb10, appveyor, imgbot, master, readme
Children:
354e06314f
Parents:
f1fb54b9f7
Message:

+ Added the ability to select between using Native and Qt's File Dialog.

  • Updated translations to reflect changes.
File:
1 edited

Legend:

Unmodified
Added
Removed
  • src/mainwindow.cpp

    rf1fb54b9f7 r946f442ab0  
    6464        connect(spinCities,SIGNAL(valueChanged(int)),this,SLOT(spinCitiesValueChanged(int)));
    6565
    66         if (settings->value("SavePos", false).toBool()) {
     66        if (settings->value("SavePos", DEF_SAVEPOS).toBool()) {
    6767                // Loading of saved window state
    6868                settings->beginGroup("MainWindow");
     
    129129        filters.append(trUtf8("All Files") + " (*)");
    130130
    131 #ifdef Q_OS_WINCE
    132         QString file = QFileDialog::getOpenFileName(this, trUtf8("Task Load"), QString(), filters.join(";;"), NULL, QFileDialog::DontUseNativeDialog);
    133 #else
    134 QString file = QFileDialog::getOpenFileName(this, trUtf8("Task Load"), QString(), filters.join(";;"));
    135 #endif // Q_OS_WINCE
     131QFileDialog::Options opts = settings->value("UseNativeDialogs", DEF_USE_NATIVE_DIALOGS).toBool() ? QFileDialog::Options() : QFileDialog::DontUseNativeDialog;
     132QString file = QFileDialog::getOpenFileName(this, trUtf8("Task Load"), QString(), filters.join(";;"), NULL, opts);
    136133        if (file.isEmpty() || !QFileInfo(file).isFile())
    137134                return;
     
    188185        filters.append(trUtf8("All Files") + " (*)");
    189186
    190 #ifdef Q_OS_WINCE
    191 QString file = QFileDialog::getSaveFileName(this, QString(), selectedFile, filters.join(";;"), NULL, QFileDialog::DontUseNativeDialog);
    192 #else
    193 QString file = QFileDialog::getSaveFileName(this, QString(), selectedFile, filters.join(";;"));
    194 #endif
     187QFileDialog::Options opts = settings->value("UseNativeDialogs", DEF_USE_NATIVE_DIALOGS).toBool() ? QFileDialog::Options() : QFileDialog::DontUseNativeDialog;
     188QString file = QFileDialog::getSaveFileName(this, QString(), selectedFile, filters.join(";;"), NULL, opts);
    195189        if (file.isEmpty())
    196190                return;
     
    421415                        if (n != spinCities->value()) {
    422416                                output.append("<p>" + trUtf8("Step #%1").arg(n++) + "</p>");
    423                                 if (settings->value("Output/ShowMatrix", DEF_SHOW_MATRIX).toBool() && settings->value("Output/UseShowMatrixLimit", DEF_USE_SHOW_MATRIX_LIMIT).toBool() && (spinCities->value() <= settings->value("Output/ShowMatrixCitiesLimit", DEF_SHOW_MATRIX_CITY_LIMIT).toInt())) {
     417                                if (settings->value("Output/ShowMatrix", DEF_SHOW_MATRIX).toBool() && settings->value("Output/UseShowMatrixLimit", DEF_USE_SHOW_MATRIX_LIMIT).toBool() && (spinCities->value() <= settings->value("Output/ShowMatrixLimit", DEF_SHOW_MATRIX_LIMIT).toInt())) {
    424418                                        outputMatrix(*step, output);
    425419                                }
     
    481475{
    482476        setWindowModified(true);
    483         if (settings->value("Autosize",true).toBool()) {
     477        if (settings->value("Autosize", DEF_AUTOSIZE).toBool()) {
    484478                for (int k = tl.row(); k <= br.row(); k++)
    485479                        taskView->resizeRowToContents(k);
     
    508502int count = tspmodel->numCities();
    509503        tspmodel->setNumCities(n);
    510         if ((n > count) && settings->value("Autosize",true).toBool())
     504        if ((n > count) && settings->value("Autosize", DEF_AUTOSIZE).toBool())
    511505                for (int k = count; k < n; k++) {
    512506                        taskView->resizeColumnToContents(k);
     
    525519
    526520        // Saving Main Window state
    527         if (settings->value("SavePos", false).toBool()) {
     521        if (settings->value("SavePos", DEF_SAVEPOS).toBool()) {
    528522                settings->beginGroup("MainWindow");
    529523#ifndef Q_OS_WINCE
     
    730724                file = QFileInfo(fileName).canonicalPath() + "/" + QFileInfo(fileName).completeBaseName() + ".tspt";
    731725
    732 #ifdef Q_OS_WINCE
    733         file = QFileDialog::getSaveFileName(this, trUtf8("Task Save"), file, filters.join(";;"), NULL, QFileDialog::DontUseNativeDialog);
    734 #else
    735         file = QFileDialog::getSaveFileName(this, trUtf8("Task Save"), file, filters.join(";;"));
    736 #endif // Q_OS_WINCE
     726QFileDialog::Options opts = settings->value("UseNativeDialogs", DEF_USE_NATIVE_DIALOGS).toBool() ? QFileDialog::Options() : QFileDialog::DontUseNativeDialog;
     727        file = QFileDialog::getSaveFileName(this, trUtf8("Task Save"), file, filters.join(";;"), NULL, opts);
    737728
    738729        if (file.isEmpty())
Note: See TracChangeset for help on using the changeset viewer.