Changeset cac8759dba in tspsg


Ignore:
Timestamp:
Sep 14, 2010, 8:51:50 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:
f29549ec20
Parents:
a713b103e8
git-author:
Oleksii Serdiuk <contacts@…> (09/14/10 20:51:50)
git-committer:
Oleksii Serdiuk <contacts@…> (06/29/12 19:45:57)
Message:

Moved to using 32x32 icons on handheld platforms and SVG on desktop ones.
This makes handheld version smaller in size.
128x128 PNG icons are still used if CONFIG+=nosvg parameter is given to qmake.

Files:
46 added
7 edited
22 moved

Legend:

Unmodified
Added
Removed

  • install.pri

    ra713b103e8 rcac8759dba  
    5858                        $$[QT_INSTALL_BINS]/libgcc_s_dw2-1.dll
    5959        }
     60        iconengines.files = $$[QT_INSTALL_PLUGINS]/iconengines/qsvgicon$${D}4.dll
     61        iconengines.path = $$PREFIX/TSPSG/iconengines
    6062        imageformats.files = $$[QT_INSTALL_PLUGINS]/imageformats/qjpeg$${D}4.dll \
    6163                $$[QT_INSTALL_PLUGINS]/imageformats/qtiff$${D}4.dll
    6264        imageformats.path = $$PREFIX/TSPSG/imageformats
    63         INSTALLS += imageformats
     65        INSTALLS += iconengines imageformats
    6466}
    6567

  • resources/common.qrc

    ra713b103e8 rcac8759dba  
    22    <qresource prefix="/images">
    33        <file>tspsg.png</file>
    4         <file>icons/application-exit.png</file>
    5         <file>icons/dialog-cancel.png</file>
    6         <file>icons/dialog-ok.png</file>
    7         <file>icons/document-new.png</file>
    8         <file>icons/document-open.png</file>
    9         <file>icons/document-save.png</file>
    10         <file>icons/document-save-as.png</file>
    11         <file>icons/format-text-color.png</file>
    12         <file>icons/go-previous.png</file>
    13         <file>icons/help-about.png</file>
    14         <file>icons/help-hint.png</file>
    15         <file>icons/preferences-desktop-font.png</file>
    16         <file>icons/preferences-system.png</file>
    174        <file>icons/qtlogo-64.png</file>
    18         <file>icons/roll.png</file>
    195    </qresource>
    206    <qresource prefix="/files">

  • resources/desktop.qrc

    ra713b103e8 rcac8759dba  
    11<RCC>
    22    <qresource prefix="/images">
    3         <file>icons/configure-toolbars.png</file>
    4         <file>icons/document-print.png</file>
    5         <file>icons/document-print-preview.png</file>
    6         <file>icons/help-contents.png</file>
    7         <file>icons/help-contextual.png</file>
    8         <file>icons/preferences-desktop-locale.png</file>
    9         <file>icons/preferences-desktop-theme.png</file>
    10         <file>icons/system-software-update.png</file>
    113        <file>icons/l10n/flag-gb.png</file>
    124        <file>icons/l10n/flag-ru.png</file>
    135        <file>icons/l10n/flag-ua.png</file>
     6        <file>icons/128x128/application-exit.png</file>
     7        <file>icons/128x128/configure-toolbars.png</file>
     8        <file>icons/128x128/dialog-cancel.png</file>
     9        <file>icons/128x128/dialog-ok.png</file>
     10        <file>icons/128x128/document-new.png</file>
     11        <file>icons/128x128/document-open.png</file>
     12        <file>icons/128x128/document-print.png</file>
     13        <file>icons/128x128/document-print-preview.png</file>
     14        <file>icons/128x128/document-save.png</file>
     15        <file>icons/128x128/document-save-as.png</file>
     16        <file>icons/128x128/format-text-color.png</file>
     17        <file>icons/128x128/go-previous.png</file>
     18        <file>icons/128x128/help-about.png</file>
     19        <file>icons/128x128/help-contents.png</file>
     20        <file>icons/128x128/help-contextual.png</file>
     21        <file>icons/128x128/help-hint.png</file>
     22        <file>icons/128x128/preferences-desktop-font.png</file>
     23        <file>icons/128x128/preferences-desktop-locale.png</file>
     24        <file>icons/128x128/preferences-desktop-theme.png</file>
     25        <file>icons/128x128/preferences-system.png</file>
     26        <file>icons/128x128/roll.png</file>
     27        <file>icons/128x128/system-software-update.png</file>
    1428    </qresource>
    1529</RCC>

  • src/globals.h

    ra713b103e8 rcac8759dba  
    125125#endif // Q_OS_WIN32
    126126
     127#ifndef DOXYGEN_EXCLUDE
     128
     129#ifdef HANDHELD
     130        #define ICON_SIZE "32x32"
     131        #define ICON_FORMAT "png"
     132#elif !defined(NOSVG)
     133        #define ICON_SIZE "scalable"
     134        #define ICON_FORMAT "svgz"
     135#else
     136        #define ICON_SIZE "128x128"
     137        #define ICON_FORMAT "png"
     138#endif
     139
    127140#if QT_VERSION >= 0x040600
    128         #define GET_ICON(x) QIcon::fromTheme(x, QIcon(":/images/icons/"x".png"))
     141        #define GET_ICON(x) QIcon::fromTheme(x, QIcon(":/images/icons/"ICON_SIZE"/"x"."ICON_FORMAT))
    129142#else
    130         #define GET_ICON(x) QIcon(":/images/icons/"x".png")
     143        #define GET_ICON(x) QIcon(":/images/icons/"ICON_SIZE"/"x"."ICON_FORMAT)
    131144#endif
    132145
    … …  
    148161#endif
    149162
     163#endif // DOXYGEN_EXCLUDE
     164
    150165#endif // GLOBALS_H

  • src/main.cpp

    ra713b103e8 rcac8759dba  
    3434
    3535//#ifdef STATIC_BUILD
     36//      #ifndef NOSVG
     37//              Q_IMPORT_PLUGIN(qsvgicon)
     38//      #endif
    3639//      Q_IMPORT_PLUGIN(qjpeg)
    3740//      Q_IMPORT_PLUGIN(qtiff)

  • tspsg.pri

    ra713b103e8 rcac8759dba  
    4141
    4242!wincewm*:!symbian {
    43         RESOURCES += resources/desktop.qrc
     43        !nosvg {
     44                RESOURCES += resources/desktop-scalable.qrc
     45        } else {
     46                RESOURCES += resources/desktop.qrc
     47        }
     48} else {
     49        RESOURCES += resources/handheld.qrc
    4450}
    4551

  • tspsg.pro

    ra713b103e8 rcac8759dba  
    4040REVISION = $$replace(REVISION,"M","")
    4141#VERSION = $$sprintf("%1.%2.%3.%4",$$BUILD_VERSION_MAJOR,$$BUILD_VERSION_MINOR,$$BUILD_RELEASE,$$REVISION)
    42 win32-msvc* {
     42win32-msvc*|wincewm* {
    4343        VERSION = $$sprintf("%1.%2",$$BUILD_VERSION_MAJOR,$$BUILD_VERSION_MINOR)
    4444} else {
    … …  
    6363include($$join(PRL, "/"))
    6464contains(QMAKE_PRL_CONFIG, static) {
    65 # We "embed" JPEG and TIFF support on static build
     65        # We "embed" SVG icon, JPEG and TIFF support on static build
    6666        DEFINES += STATIC_BUILD
    6767#       QTPLUGIN += qjpeg qtiff
     68#       !nosvg:QTPLUGIN += qsvgicon
    6869}
    6970
Note: See TracChangeset for help on using the changeset viewer.