Changeset 769 for trunk/demos/embedded


Ignore:
Timestamp:
Aug 2, 2010, 9:27:30 PM (15 years ago)
Author:
Dmitry A. Kuminov
Message:

trunk: Merged in qt 4.6.3 sources from branches/vendor/nokia/qt.

Location:
trunk
Files:
12 edited
2 copied

Legend:

Unmodified
Added
Removed

  • trunk

  • trunk/demos/embedded/anomaly/anomaly.pro

    r651 r769  
    2828    include($$QT_SOURCE_TREE/demos/symbianpkgrules.pri)
    2929    HEADERS += $$QT_SOURCE_TREE/examples/network/qftp/sym_iap_util.h
    30     LIBS += -lesock -linsock -lconnmon
     30    LIBS += -lesock -lcommdb -linsock # For IAP selection
    3131    TARGET.CAPABILITY = NetworkServices
    3232    TARGET.EPOCHEAPSIZE = 0x20000 0x2000000

  • trunk/demos/embedded/anomaly/src/BrowserView.cpp

    r651 r769  
    8383    connect(m_controlStrip, SIGNAL(backClicked()), m_webView, SLOT(back()));
    8484    connect(m_controlStrip, SIGNAL(forwardClicked()), m_webView, SLOT(forward()));
     85    connect(m_controlStrip, SIGNAL(closeClicked()), qApp, SLOT(quit()));
    8586
    8687    QPalette pal = m_webView->palette();

  • trunk/demos/embedded/anomaly/src/ControlStrip.cpp

    r651 r769  
    5151    backPixmap.load(":/images/go-previous.png");
    5252    forwardPixmap.load(":/images/go-next.png");
     53    closePixmap.load(":/images/button-close.png");
    5354}
    5455
    … …  
    6667{
    6768    int h = height();
     69    int spacing = qMin(h, (width() - h * 4) / 3);
    6870    int x = event->pos().x();
    6971
    … …  
    7577
    7678    if (x > width() - h) {
     79        emit closeClicked();
     80        event->accept();
     81        return;
     82    }
     83
     84    if ((x < width() - (h + spacing)) && (x > width() - (h * 2 + spacing))) {
    7785        emit forwardClicked();
    7886        event->accept();
    … …  
    8088    }
    8189
    82     if ((x < width() - 2 * h) && (x > width() - 3 * h)) {
     90    if ((x < width() - (h * 2 + spacing * 2)) && (x > width() - (h * 3 + spacing * 2))) {
    8391        emit backClicked();
    8492        event->accept();
    … …  
    9098{
    9199    int h = height();
    92     int s = (h - menuPixmap.height()) / 2;
     100    int spacing = qMin(h, (width() - h * 4) / 3);
     101    int s = (height() - menuPixmap.height()) / 2;
    93102
    94103    QPainter p(this);
    … …  
    96105    p.setCompositionMode(QPainter::CompositionMode_SourceOver);
    97106    p.drawPixmap(s, s, menuPixmap);
    98     p.drawPixmap(width() - 3 * h + s, s, backPixmap);
    99     p.drawPixmap(width() - h + s, s, forwardPixmap);
     107    p.drawPixmap(width() - h + s, s, closePixmap);
     108    p.drawPixmap(width() - (h * 2 + spacing) + s, s, forwardPixmap);
     109    p.drawPixmap(width() - (h * 3 + spacing * 2) + s, s, backPixmap);
     110
    100111    p.end();
    101112}

  • trunk/demos/embedded/anomaly/src/ControlStrip.h

    r651 r769  
    5959    void backClicked();
    6060    void forwardClicked();
     61    void closeClicked();
    6162
    6263protected:
    … …  
    6869    QPixmap backPixmap;
    6970    QPixmap forwardPixmap;
     71    QPixmap closePixmap;
    7072};
    7173

  • trunk/demos/embedded/anomaly/src/anomaly.qrc

    r561 r769  
    66        <file>images/list-add.png</file>
    77        <file>images/list-remove.png</file>
     8        <file>images/button-close.png</file>
    89    </qresource>
    910</RCC>

  • trunk/demos/embedded/desktopservices/contenttab.cpp

    r651 r769  
    115115{
    116116    switch (event->key()) {
    117     case Qt::Key_Up:
    118         if (currentRow() == 0) {
    119             setCurrentRow(count() - 1);
    120         } else {
    121             setCurrentRow(currentRow() - 1);
    122         }
    123         break;
    124     case Qt::Key_Down:
    125         if (currentRow() == (count() - 1)) {
    126             setCurrentRow(0);
    127         } else {
    128             setCurrentRow(currentRow() + 1);
    129         }
    130         break;
    131117    case Qt::Key_Select:
    132118        openItem(currentItem());

  • trunk/demos/embedded/flightinfo/flightinfo.pro

    r561 r769  
    1010    include($$QT_SOURCE_TREE/demos/symbianpkgrules.pri)
    1111    HEADERS += $$QT_SOURCE_TREE/examples/network/qftp/sym_iap_util.h
    12     LIBS += -lesock  -lconnmon -linsock
     12    LIBS += -lesock -lcommdb -linsock # For IAP selection
    1313    TARGET.CAPABILITY = NetworkServices
    1414}

  • trunk/demos/embedded/fluidlauncher/config_s60/config.xml

    r561 r769  
    2121    <example filename="digiflip" name="Flipping Clock" image="screenshots/digiflip.png"/>
    2222    <example filename="qmediaplayer" name="Media Player" image="screenshots/mediaplayer.png" args="-small-screen"/>
     23    <example filename="spectrum" name="Spectrum Analyzer" image="screenshots/spectrum.png" args="-small-screen"/>
    2324  </demos>
    2425  <slideshow timeout="60000" interval="10000">

  • trunk/demos/embedded/fluidlauncher/fluidlauncher.pro

    r651 r769  
    9898    contains(QT_CONFIG, phonon) {
    9999        reg_resource.sources += $${EPOCROOT}$$HW_ZDIR$$REG_RESOURCE_IMPORT_DIR/qmediaplayer_reg.rsc
     100    }
     101
     102    contains(QT_CONFIG, multimedia) {
     103        reg_resource.sources += $${EPOCROOT}$$HW_ZDIR$$REG_RESOURCE_IMPORT_DIR/spectrum_reg.rsc
    100104    }
    101105
    … …  
    165169            $${EPOCROOT}$$HW_ZDIR$$APP_RESOURCE_DIR/anomaly.mif
    166170
    167         # Since Fluidlauncher itself doesn't link webkit, we won't get dependency automatically
    168         executables.pkg_prerules += \
    169             "; Dependency to Qt Webkit" \
    170             "(0x200267C2), $${QT_MAJOR_VERSION}, $${QT_MINOR_VERSION}, $${QT_PATCH_VERSION},  {\"QtWebKit\"}"
     171        isEmpty(QT_LIBINFIX) {
     172            # Since Fluidlauncher itself doesn't link webkit, we won't get dependency automatically
     173            executables.pkg_prerules += \
     174                "; Dependency to Qt Webkit" \
     175                "(0x200267C2), $${QT_MAJOR_VERSION}, $${QT_MINOR_VERSION}, $${QT_PATCH_VERSION},  {\"QtWebKit\"}"
     176        }
    171177    }
    172178
    … …  
    176182        mifs.sources += \
    177183            $${EPOCROOT}$$HW_ZDIR$$APP_RESOURCE_DIR/qmediaplayer.mif
     184    }
     185
     186    contains(QT_CONFIG, multimedia) {
     187        executables.sources += spectrum.exe fftreal.dll
     188        resource.sources += $${EPOCROOT}$$HW_ZDIR$$APP_RESOURCE_DIR/spectrum.rsc
     189        mifs.sources += \
     190            $${EPOCROOT}$$HW_ZDIR$$APP_RESOURCE_DIR/spectrum.mif
    178191    }
    179192

  • trunk/demos/embedded/lightmaps/lightmaps.pro

    r561 r769  
    77    include($$QT_SOURCE_TREE/demos/symbianpkgrules.pri)
    88    HEADERS += $$QT_SOURCE_TREE/examples/network/qftp/sym_iap_util.h
    9     LIBS += -lesock  -lconnmon -linsock
     9    LIBS += -lesock -lcommdb -linsock # For IAP selection
    1010    TARGET.CAPABILITY = NetworkServices
    1111    TARGET.EPOCHEAPSIZE = 0x20000 0x2000000

  • trunk/demos/embedded/weatherinfo/weatherinfo.pro

    r561 r769  
    99    include($$QT_SOURCE_TREE/demos/symbianpkgrules.pri)
    1010    HEADERS += $$QT_SOURCE_TREE/examples/network/qftp/sym_iap_util.h
    11     LIBS += -lesock -lconnmon -linsock
     11    LIBS += -lesock -lcommdb -linsock # For IAP selection
    1212    TARGET.CAPABILITY = NetworkServices
    1313}
Note: See TracChangeset for help on using the changeset viewer.