Changeset 157 in tspsg-svn for trunk


Ignore:
Timestamp:
Mar 22, 2011, 9:31:18 PM (14 years ago)
Author:
laleppa
Message:
  • Improved some error messages: now they are more verbose.
  • Handheld version now includes larger icons (48x48 instead of 32x32).
  • Fixed bug #2: Solution graph is too small on high resolution screens.
Location:
trunk
Files:
15 added
1 deleted
6 edited

Legend:

Unmodified
Added
Removed

  • trunk/install.pri

    r156 r157  
    9595
    9696    share.sources = $$share.files
    97     # qmake for Symbian (as of Qt 4.6.2) has a bug: file masks doesn't work, so we need to specify all files manually
     97    # qmake for Symbian (as of Qt 4.6.2) has a bug: file masks don't work, so we need to specify all files manually
    9898#       l10n.sources = $$[QT_INSTALL_TRANSLATIONS]/qt_ru.qm \
    9999#               $$[QT_INSTALL_TRANSLATIONS]/qt_uk.qm \

  • trunk/resources/handheld.qrc

    r136 r157  
    11<RCC>
    22    <qresource prefix="/images">
    3         <file>icons/32x32/application-exit.png</file>
    4         <file>icons/32x32/dialog-cancel.png</file>
    5         <file>icons/32x32/dialog-ok.png</file>
    6         <file>icons/32x32/document-new.png</file>
    7         <file>icons/32x32/document-open.png</file>
    8         <file>icons/32x32/document-save.png</file>
    9         <file>icons/32x32/document-save-as.png</file>
    10         <file>icons/32x32/format-text-color.png</file>
    11         <file>icons/32x32/go-previous.png</file>
    12         <file>icons/32x32/help-about.png</file>
    13         <file>icons/32x32/help-hint.png</file>
    14         <file>icons/32x32/preferences-desktop-font.png</file>
    15         <file>icons/32x32/preferences-system.png</file>
    16         <file>icons/32x32/roll.png</file>
     3        <file>icons/48x48/application-exit.png</file>
     4        <file>icons/48x48/dialog-cancel.png</file>
     5        <file>icons/48x48/dialog-ok.png</file>
     6        <file>icons/48x48/document-new.png</file>
     7        <file>icons/48x48/document-open.png</file>
     8        <file>icons/48x48/document-save.png</file>
     9        <file>icons/48x48/document-save-as.png</file>
     10        <file>icons/48x48/format-text-color.png</file>
     11        <file>icons/48x48/go-previous.png</file>
     12        <file>icons/48x48/help-about.png</file>
     13        <file>icons/48x48/help-hint.png</file>
     14        <file>icons/48x48/preferences-desktop-font.png</file>
     15        <file>icons/48x48/preferences-system.png</file>
     16        <file>icons/48x48/roll.png</file>
    1717    </qresource>
    1818</RCC>

  • trunk/src/globals.h

    r151 r157  
    143143
    144144#ifdef HANDHELD
    145 #   define ICON_SIZE "32x32"
     145#   define ICON_SIZE "48x48"
    146146#   define ICON_FORMAT "png"
    147147#else

  • trunk/src/mainwindow.cpp

    r154 r157  
    606606    dlg->setWindowTitle(tr("About %1").arg(QCoreApplication::applicationName()));
    607607    dlg->setWindowIcon(GET_ICON("help-about"));
     608
    608609    dlg->setLayout(vb);
    609610
    … …  
    715716            QMessageBox::warning(this, tr("Solution Result"), tr("Unable to find a solution.\nMaybe, this task has no solution."));
    716717        }
    717         pd.setLabelText(tr("Cleaning up..."));
     718        pd.setLabelText(tr("Memory cleanup..."));
    718719        pd.setMaximum(0);
    719720        pd.setCancelButton(NULL);
    … …  
    801802    while ((step->next != SStep::NoNextStep) && (c < spinCities->value())) {
    802803        if (pd.wasCanceled()) {
    803             pd.setLabelText(tr("Cleaning up..."));
     804            pd.setLabelText(tr("Memory cleanup..."));
    804805            pd.setMaximum(0);
    805806            pd.setCancelButton(NULL);
    … …  
    934935        solutionText->moveCursor(QTextCursor::Start);
    935936
    936     pd.setLabelText(tr("Cleaning up..."));
     937    pd.setLabelText(tr("Memory cleanup..."));
    937938    pd.setMaximum(0);
    938939    pd.setCancelButton(NULL);
    … …  
    11061107int r;
    11071108    if (settings->value("Output/HQGraph", DEF_HQ_GRAPH).toBool())
    1108         r = 70;
     1109        r = logicalDpiX() / 1.27;
    11091110    else
    1110         r = 35;
     1111        r = logicalDpiX() / 2.54;
    11111112qreal x, y;
    11121113    if (step != NULL)

  • trunk/src/tspmodel.cpp

    r155 r157  
    376376        return false;
    377377    else if (status == QDataStream::ReadPastEnd)
    378         err = tr("Unexpected end of file.");
     378        err = tr("Unexpected end of file. The file could be corrupted.");
    379379    else if (status == QDataStream::ReadCorruptData)
    380         err = tr("Corrupt data read. File possibly corrupted.");
     380        err = tr("Corrupt data read. The file could be corrupted.");
    381381    else
    382         err = tr("Unknown error.");
     382        err = tr("Unknown error. The file could be corrupted.");
    383383    QApplication::restoreOverrideCursor();
    384384    QApplication::setOverrideCursor(QCursor(Qt::ArrowCursor));
    … …  
    402402        QApplication::restoreOverrideCursor();
    403403        QApplication::setOverrideCursor(QCursor(Qt::ArrowCursor));
    404         QMessageBox::critical(QApplication::activeWindow(), tr("Task Load"), tr("Unable to load task:") + "\n" + tr("File version is newer than application supports.\nPlease, try to update application."));
     404        QMessageBox::critical(QApplication::activeWindow(), tr("Task Load"), tr("Unable to load task:") + "\n"
     405            + tr("File version (%1) is newer than this version of %3 supports (%2).\n"
     406                 "Please, try to update the application. Also, the file might be corrupted.")
     407                 .arg(version).arg(TSPT_VERSION).arg(QApplication::applicationName()));
    405408        QApplication::restoreOverrideCursor();
    406409        return false;
    … …  
    415418    if (loadError(ds->status()))
    416419        return false;
    417     if ((size < 3) || (size > MAX_NUM_CITIES)) {
    418         QApplication::restoreOverrideCursor();
    419         QApplication::setOverrideCursor(QCursor(Qt::ArrowCursor));
    420         QMessageBox::critical(QApplication::activeWindow(), tr("Task Load"), tr("Unable to load task:") + "\n" + tr("Unexpected data read.\nFile is possibly corrupted."));
     420    if (size < 3) {
     421        QApplication::restoreOverrideCursor();
     422        QApplication::setOverrideCursor(QCursor(Qt::ArrowCursor));
     423        QMessageBox::critical(QApplication::activeWindow(), tr("Task Load"), tr("Unable to load task:") + "\n"
     424            + tr("Unexpected data read. The file could be corrupted."));
     425        QApplication::restoreOverrideCursor();
     426        return false;
     427    }
     428    if (size > MAX_NUM_CITIES) {
     429        QApplication::restoreOverrideCursor();
     430        QApplication::setOverrideCursor(QCursor(Qt::ArrowCursor));
     431        QMessageBox::critical(QApplication::activeWindow(), tr("Task Load"), tr("Unable to load task:") + "\n"
     432            + tr("The task contains more cities (%1) than this version of %3 supports (%2).\n"
     433                 "You might be using an old version of the application or the file could be corrupted.")
     434                 .arg(size).arg(MAX_NUM_CITIES).arg(QApplication::applicationName()));
    421435        QApplication::restoreOverrideCursor();
    422436        return false;
    … …  
    458472        QApplication::restoreOverrideCursor();
    459473        QApplication::setOverrideCursor(QCursor(Qt::ArrowCursor));
    460         QMessageBox::critical(QApplication::activeWindow(), tr("Task Load"), tr("Unable to load task:") + "\n" + tr("File version is newer than application supports.\nPlease, try to update application."));
     474        QMessageBox::critical(QApplication::activeWindow(), tr("Task Load"), tr("Unable to load task:") + "\n"
     475            + tr("File version (%1) is newer than this version of %3 supports (%2).\n"
     476                 "Please, try to update the application. Also, the file could be corrupted.")
     477                 .arg(version).arg(TSPT_VERSION).arg(QApplication::applicationName()));
    461478        QApplication::restoreOverrideCursor();
    462479        return false;
    … …  
    470487        QApplication::restoreOverrideCursor();
    471488        QApplication::setOverrideCursor(QCursor(Qt::ArrowCursor));
    472         QMessageBox::critical(QApplication::activeWindow(), tr("Task Load"), tr("Unable to load task:") + "\n" + tr("Unexpected data read.\nFile is possibly corrupted."));
     489        QMessageBox::critical(QApplication::activeWindow(), tr("Task Load"), tr("Unable to load task:") + "\n"
     490            + tr("Unexpected data read. The file could be corrupted."));
    473491        QApplication::restoreOverrideCursor();
    474492        return false;

  • trunk/tspsg.pro

    r156 r157  
    2929QMAKE_TARGET_PRODUCT = TSP Solver and Generator
    3030QMAKE_TARGET_DESCRIPTION = TSPSG: TSP Solver and Generator
    31 QMAKE_TARGET_COPYRIGHT = Copyright © 2010-2011 Oleksii "Lёppa" Serdiuk <contacts[at]oleksii[dot]name>
     31QMAKE_TARGET_COPYRIGHT = Copyright © 2007-2011 Oleksii "Lёppa" Serdiuk <contacts[at]oleksii[dot]name>
    3232
    3333# Versioning
    … …  
    6666macx {
    6767    PRL = $$[QT_INSTALL_LIBS] QtCore.framework QtCore.prl
    68 } else:symbian|maemo* {
     68} else:symbian|maemo*|simulator {
    6969    # Nothing here
    7070} else:unix {
Note: See TracChangeset for help on using the changeset viewer.