Changeset 143 in tspsg-svn


Ignore:
Timestamp:
Oct 13, 2010, 10:25:51 PM (13 years ago)
Author:
laleppa
Message:

Some small tweaks...

Location:
trunk
Files:
5 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/globals.h

    r141 r143  
    3434        #error You are using Qt version < 4.5 but minimum required version is 4.5.0. Compilation aborted.
    3535#endif
    36 #ifdef QT_NO_SVG
     36#if defined(Q_WS_WINCE_WM) || defined(Q_WS_S60) || defined(Q_WS_MAEMO_5) || defined(Q_WS_SIMULATOR)
     37        //! This is defined on handheld devices (e.g., Windows Mobile, Symbian).
     38        #define HANDHELD
     39        #define QT_NO_STATUSTIP
     40#endif
     41#include <QtGui>
     42#if defined(QT_NO_SVG) && !defined(NOSVG)
    3743        #define NOSVG
    3844#endif
    39 #include <QtGui>
    4045#if !defined(NOSVG)
    4146        #include <QtSvg>
    4247#endif // NOSVG
    43 
    44 #if defined(Q_WS_WINCE_WM) || defined(Q_WS_S60) || defined(Q_WS_MAEMO_5) || defined(Q_WS_SIMULATOR)
    45         //! This is defined on handheld devices (e.g., Windows Mobile, Symbian).
    46         #define HANDHELD
    47 #endif
    4848
    4949#ifndef HANDHELD
  • trunk/src/mainwindow.cpp

    r142 r143  
    12441244        foreach (language, langlist) {
    12451245                a = menuSettingsLanguage->addAction(language.at(2));
     1246#ifndef QT_NO_STATUSTIP
    12461247                a->setStatusTip(language.at(3));
     1248#endif
    12471249#if QT_VERSION >= 0x040600
    12481250                a->setIcon(QIcon::fromTheme(QString("flag-%1").arg(language.at(1)), QIcon(QString(":/images/icons/l10n/flag-%1.png").arg(language.at(1)))));
     
    13351337                a = menuSettingsStyle->addAction(style);
    13361338                a->setData(false);
     1339#ifndef QT_NO_STATUSTIP
    13371340                a->setStatusTip(tr("Set application style to %1").arg(style));
     1341#endif
    13381342                a->setCheckable(true);
    13391343                a->setActionGroup(groupSettingsStyleList);
     
    14401444#ifndef QT_NO_STATUSTIP
    14411445        actionFilePrintPreview->setStatusTip(tr("Preview current solution results before printing"));
    1442 #endif // QT_NO_STATUSTIP
    1443 #ifndef QT_NO_STATUSTIP
    14441446        actionFileExit->setStatusTip(tr("Exit %1").arg(QCoreApplication::applicationName()));
    14451447#endif // QT_NO_STATUSTIP
  • trunk/src/settingsdialog.cpp

    r141 r143  
    3838
    3939        buttonBox->button(QDialogButtonBox::Ok)->setIcon(GET_ICON("dialog-ok"));
     40#ifndef QT_NO_STATUSTIP
    4041        buttonBox->button(QDialogButtonBox::Ok)->setStatusTip(tr("Save new preferences"));
     42#endif
    4143        buttonBox->button(QDialogButtonBox::Ok)->setCursor(QCursor(Qt::PointingHandCursor));
    4244        buttonBox->button(QDialogButtonBox::Cancel)->setIcon(GET_ICON("dialog-cancel"));
     45#ifndef QT_NO_STATUSTIP
    4346        buttonBox->button(QDialogButtonBox::Cancel)->setStatusTip(tr("Close without saving preferences"));
     47#endif
    4448        buttonBox->button(QDialogButtonBox::Cancel)->setCursor(QCursor(Qt::PointingHandCursor));
    4549
     
    219223        connect(buttonColor, SIGNAL(clicked()), SLOT(buttonColorClicked()));
    220224        setWindowFlags(windowFlags() ^ Qt::WindowContextHelpButtonHint);
    221 #ifndef HANDHELD
     225#if !defined(QT_NO_STATUSTIP) && !defined(HANDHELD)
    222226        // Setting initial text of dialog hint label to own status tip text.
    223227        labelHint->setText(labelHint->statusTip());
     
    459463}
    460464
    461 #ifndef HANDHELD
     465#if !defined(QT_NO_STATUSTIP) && !defined(HANDHELD)
    462466bool SettingsDialog::event(QEvent *ev)
    463467{
  • trunk/src/settingsdialog.h

    r141 r143  
    7272        QLabel *labelHint;
    7373
     74#ifndef QT_NO_STATUSTIP
    7475        bool event(QEvent *ev);
     76#endif // QT_NO_STATUSTIP
    7577#endif // Q_WS_WINCE_WM
    7678
  • trunk/tspsg.pro

    r141 r143  
    4747#REVISION = 100
    4848REVISION = $$system(svnversion)
    49 REVISION = $$replace(REVISION,":","")
    50 REVISION = $$replace(REVISION,"M","")
     49isEmpty(REVISION)|eval(REVISION=="exported") {
     50        REVISION = 0
     51} else {
     52        REVISION = $$replace(REVISION,":","")
     53        REVISION = $$replace(REVISION,"M","")
     54}
    5155win32-msvc*|wincewm* {
    5256        VERSION = $$sprintf("%1.%2",$$BUILD_VERSION_MAJOR,$$BUILD_VERSION_MINOR)
Note: See TracChangeset for help on using the changeset viewer.