author | mickeyl <mickeyl> | 2005-02-19 17:18:27 (UTC) |
---|---|---|
committer | mickeyl <mickeyl> | 2005-02-19 17:18:27 (UTC) |
commit | be32e0c045814142954ac37c89715313633d6aa2 (patch) (unidiff) | |
tree | 93a6fc7a84b4073fb04cc0b3377c4bb7e11bd091 | |
parent | b7bf9c7acdc010eb30bc246372efb0d1b394166a (diff) | |
download | opie-be32e0c045814142954ac37c89715313633d6aa2.zip opie-be32e0c045814142954ac37c89715313633d6aa2.tar.gz opie-be32e0c045814142954ac37c89715313633d6aa2.tar.bz2 |
make inline image support optional
-rw-r--r-- | ChangeLog | 3 | ||||
-rw-r--r-- | Rules.make | 3 | ||||
-rw-r--r-- | config.in | 4 | ||||
-rw-r--r-- | library/resource.cpp | 34 |
4 files changed, 38 insertions, 6 deletions
@@ -1,92 +1,93 @@ | |||
1 | 2005-??-??Opie 1.2.0 | 1 | 2005-??-??Opie 1.2.0 |
2 | 2 | ||
3 | New Features | 3 | New Features |
4 | ------------ | 4 | ------------ |
5 | * Launcher: Support a static background pixmap (mickeyl) | 5 | * Launcher: Support a static background pixmap (mickeyl) |
6 | * LauncherSettings: Choose whether to have a static background pixmap (mickeyl) | 6 | * LauncherSettings: Choose whether to have a static background pixmap (mickeyl) |
7 | 7 | ||
8 | Fixed Bugs | 8 | Fixed Bugs |
9 | ---------- | 9 | ---------- |
10 | * #1236 - VCards contained empty home and work address entries causing Palms to crash (eilers) | 10 | * #1236 - VCards contained empty home and work address entries causing Palms to crash (eilers) |
11 | * #1472 - Opie textedit now check for unsaved changes on ESC key (ljp) | 11 | * #1472 - Opie textedit now check for unsaved changes on ESC key (ljp) |
12 | * #1474 - Implement GUI for Scrollbars on the Left in Appearance (zecke) | 12 | * #1474 - Implement GUI for Scrollbars on the Left in Appearance (zecke) |
13 | * #1482 - Fix double '/' in paths (zecke) | 13 | * #1482 - Fix double '/' in paths (zecke) |
14 | * #1536 - Autosave of custom locations in opie backup (ar) | 14 | * #1536 - Autosave of custom locations in opie backup (ar) |
15 | * #1539 - Fixed displaying too long path in the delete dialog in opie-eye (zecke) | 15 | * #1539 - Fixed displaying too long path in the delete dialog in opie-eye (zecke) |
16 | * #1540 - Implemented deletion of DocLnks in opie-eye (zecke) | 16 | * #1540 - Implemented deletion of DocLnks in opie-eye (zecke) |
17 | * #1542 - Fix Todo crash when priority < 1 or > 5 (drw) | 17 | * #1542 - Fix Todo crash when priority < 1 or > 5 (drw) |
18 | * #1550 - Browse for alarm sound start in QPEDIR/sounds/ (zecke) | 18 | * #1550 - Browse for alarm sound start in QPEDIR/sounds/ (zecke) |
19 | * #1554 - Fixed Opie-Console name in .desktop file (mickeyl) | 19 | * #1554 - Fixed Opie-Console name in .desktop file (mickeyl) |
20 | * #1556 - Start to look for sound files in /opt/QtPalmtop/sounds (zecke) | 20 | * #1556 - Start to look for sound files in /opt/QtPalmtop/sounds (zecke) |
21 | * #1558 - Fixed opie-login breaking opie startup (mickeyl) | 21 | * #1558 - Fixed opie-login breaking opie startup (mickeyl) |
22 | * #1570 - Confirmation needed befor Restore a backup and overwrite local data (ar) | 22 | * #1570 - Confirmation needed befor Restore a backup and overwrite local data (ar) |
23 | * n.a. - PackageManager - fixed where last package in status file was not shown as installed when it should be (drw) | 23 | * n.a. - PackageManager - fixed where last package in status file was not shown as installed when it should be (drw) |
24 | 24 | ||
25 | Internal | 25 | Internal |
26 | -------- | 26 | -------- |
27 | * Work around bug in Qt/Embedded 2.3.10: qt_version() returns 231 (mickeyl) | 27 | * Worked around bug in Qt/Embedded 2.3.10: qt_version() returns 231 (mickeyl) |
28 | * Killed the need for weak symbols in QtE (zecke) | 28 | * Killed the need for weak symbols in QtE (zecke) |
29 | * Added optional building libqpe without inline images (mickeyl) | ||
29 | 30 | ||
30 | 2005-02-03Opie 1.1.9 | 31 | 2005-02-03Opie 1.1.9 |
31 | 32 | ||
32 | New Features | 33 | New Features |
33 | ------------ | 34 | ------------ |
34 | * Number of icon columns in Launcher is customizable through Launcher.conf (hrw,zecke,mickeyl) | 35 | * Number of icon columns in Launcher is customizable through Launcher.conf (hrw,zecke,mickeyl) |
35 | * Number of icon columns in Launcher is customizable through LauncherSettings (mickeyl) | 36 | * Number of icon columns in Launcher is customizable through LauncherSettings (mickeyl) |
36 | * Usability enhancements in OpieIRC (skyhusker) | 37 | * Usability enhancements in OpieIRC (skyhusker) |
37 | 38 | ||
38 | Fixed Bugs | 39 | Fixed Bugs |
39 | ---------- | 40 | ---------- |
40 | * #1501 - Fixed bug in todo sql backend (eilers) | 41 | * #1501 - Fixed bug in todo sql backend (eilers) |
41 | * #1505 - Added more Swap sizes in memoryapplet (mickeyl) | 42 | * #1505 - Added more Swap sizes in memoryapplet (mickeyl) |
42 | * #1525 - Hopefully fixed double alarms and not removing alarms set with the Clock application (zecke) | 43 | * #1525 - Hopefully fixed double alarms and not removing alarms set with the Clock application (zecke) |
43 | * #1533 - Security Owner Dialog (shown in case of unsuccessfull authentiacation) wasn't able to display information in non latin1 encoding (zecke) | 44 | * #1533 - Security Owner Dialog (shown in case of unsuccessfull authentiacation) wasn't able to display information in non latin1 encoding (zecke) |
44 | * n.a. - Removed hard coded font sizes in a couple of inputmethods (mickeyl) | 45 | * n.a. - Removed hard coded font sizes in a couple of inputmethods (mickeyl) |
45 | * n.a. - Removed MediumDlg appearing prior to FirstUsage wizard (i.e. calibration) (mickeyl) | 46 | * n.a. - Removed MediumDlg appearing prior to FirstUsage wizard (i.e. calibration) (mickeyl) |
46 | * n.a. - Fixed numerous buglets in OpieIRC (skyhusker) | 47 | * n.a. - Fixed numerous buglets in OpieIRC (skyhusker) |
47 | 48 | ||
48 | Internal | 49 | Internal |
49 | -------- | 50 | -------- |
50 | * Added the Qtopia 1.7 SDK macros for quick-apps to easa compilation of 3rd party apps against our headers (mickeyl) | 51 | * Added the Qtopia 1.7 SDK macros for quick-apps to easa compilation of 3rd party apps against our headers (mickeyl) |
51 | * You can now use the Opie build system in combination with a OpenEmbedded staging area which makes a nice cross development environment (mickeyl) | 52 | * You can now use the Opie build system in combination with a OpenEmbedded staging area which makes a nice cross development environment (mickeyl) |
52 | * Made Opie compilable with Qt/Embedded 2.3.10 (ar) | 53 | * Made Opie compilable with Qt/Embedded 2.3.10 (ar) |
53 | * Changed Launcher to get default orientation from ODevice w/ QWS_DISPLAY overriding (mickeyl) | 54 | * Changed Launcher to get default orientation from ODevice w/ QWS_DISPLAY overriding (mickeyl) |
54 | * Build tree cleanups (mickeyl) | 55 | * Build tree cleanups (mickeyl) |
55 | 56 | ||
56 | 2004-11-26Opie 1.1.8 | 57 | 2004-11-26Opie 1.1.8 |
57 | 58 | ||
58 | New Features | 59 | New Features |
59 | ------------ | 60 | ------------ |
60 | * PackageManager supports installation of local ipkg files (drw) | 61 | * PackageManager supports installation of local ipkg files (drw) |
61 | * PackageManager supports linking of applications to root (drw) | 62 | * PackageManager supports linking of applications to root (drw) |
62 | * PackageManager supports src/gz feeds (drw,wimpie) | 63 | * PackageManager supports src/gz feeds (drw,wimpie) |
63 | * Added a syslog information tab to sysinfo (mickeyl) | 64 | * Added a syslog information tab to sysinfo (mickeyl) |
64 | * Added new, more consistent, PIM icons + a GIMP teplate (ar) | 65 | * Added new, more consistent, PIM icons + a GIMP teplate (ar) |
65 | 66 | ||
66 | Fixed Bugs | 67 | Fixed Bugs |
67 | ---------- | 68 | ---------- |
68 | * #1017 - Tetrix doesn't display correctly for high resolution screens (drw) | 69 | * #1017 - Tetrix doesn't display correctly for high resolution screens (drw) |
69 | * #1269 - VCards were imported into personal area if it was activated (eilers) | 70 | * #1269 - VCards were imported into personal area if it was activated (eilers) |
70 | * #1464 - Packagemanager dont set active filter after install a package (drw) | 71 | * #1464 - Packagemanager dont set active filter after install a package (drw) |
71 | * #1479 - Improved VCard-Parser to import VCards created by Evolution 2 and Apple Addressbook (eilers) | 72 | * #1479 - Improved VCard-Parser to import VCards created by Evolution 2 and Apple Addressbook (eilers) |
72 | * #1493 - Fixed one column layout bug of the launcher (hrw) | 73 | * #1493 - Fixed one column layout bug of the launcher (hrw) |
73 | * n.a. - PackageManager - (Minor UI tweak) in filter dialog, when option is enabled, set focus to widget that corresponds to that option (drw) | 74 | * n.a. - PackageManager - (Minor UI tweak) in filter dialog, when option is enabled, set focus to widget that corresponds to that option (drw) |
74 | * n.a. - PackageManager - (Minor UI tweak) fix double entry in source feed configuration when adding a new feed (drw) | 75 | * n.a. - PackageManager - (Minor UI tweak) fix double entry in source feed configuration when adding a new feed (drw) |
75 | * n.a. - Battery Applet - fix sizing of battery info popup (drw,mickeyl) | 76 | * n.a. - Battery Applet - fix sizing of battery info popup (drw,mickeyl) |
76 | 77 | ||
77 | Internal | 78 | Internal |
78 | -------- | 79 | -------- |
79 | * Moved libopie1 to unsupported (mickeyl) | 80 | * Moved libopie1 to unsupported (mickeyl) |
80 | * Implemented generic queryByExample() with incremental searching. A lot of internal changes of the Pim2-library (eilers) | 81 | * Implemented generic queryByExample() with incremental searching. A lot of internal changes of the Pim2-library (eilers) |
81 | * Added fast and full featured and incremental sorted() for SQL addressbook backend (eilers) | 82 | * Added fast and full featured and incremental sorted() for SQL addressbook backend (eilers) |
82 | 83 | ||
83 | 2004-11-14Opie 1.1.7 | 84 | 2004-11-14Opie 1.1.7 |
84 | 85 | ||
85 | New Features | 86 | New Features |
86 | ------------ | 87 | ------------ |
87 | * libOpieDB now uses SQLite V3 instead V2. Remember to upgrade your database files! (eilers) | 88 | * libOpieDB now uses SQLite V3 instead V2. Remember to upgrade your database files! (eilers) |
88 | * Backup now uses the busy indicator when backing up and restore (ar) | 89 | * Backup now uses the busy indicator when backing up and restore (ar) |
89 | * OpiePlayer2 gained adding of Directories to the playlist (zecke) | 90 | * OpiePlayer2 gained adding of Directories to the playlist (zecke) |
90 | * OpiePlayer2 better error handling (zecke) | 91 | * OpiePlayer2 better error handling (zecke) |
91 | * OpiePlayer2 progress indication while streaming (zecke) | 92 | * OpiePlayer2 progress indication while streaming (zecke) |
92 | * OpiePlayer2 ported to use libxine 1.0.0-rc6a (brad,zecke) | 93 | * OpiePlayer2 ported to use libxine 1.0.0-rc6a (brad,zecke) |
@@ -1,126 +1,129 @@ | |||
1 | .phony: force | 1 | .phony: force |
2 | force: | 2 | force: |
3 | 3 | ||
4 | $(configs) : | 4 | $(configs) : |
5 | $(call makecfg,$@) | 5 | $(call makecfg,$@) |
6 | 6 | ||
7 | $(TOPDIR)/gen.pro : $(TOPDIR)/.config | 7 | $(TOPDIR)/gen.pro : $(TOPDIR)/.config |
8 | echo > $@ | 8 | echo > $@ |
9 | # added for threaded version | 9 | # added for threaded version |
10 | ifneq ($(CONFIG_THREADED),) | 10 | ifneq ($(CONFIG_THREADED),) |
11 | echo CONFIG += thread >> $@ | 11 | echo CONFIG += thread >> $@ |
12 | else | 12 | else |
13 | echo CONFIG -= thread >> $@ | 13 | echo CONFIG -= thread >> $@ |
14 | endif | 14 | endif |
15 | # added for auto stripped build | 15 | # added for auto stripped build |
16 | ifneq ($(CONFIG_STRIP),) | 16 | ifneq ($(CONFIG_STRIP),) |
17 | echo CONFIG += strip >> $@ | 17 | echo CONFIG += strip >> $@ |
18 | endif | 18 | endif |
19 | ifneq ($(CONFIG_DEBUG),) | 19 | ifneq ($(CONFIG_DEBUG),) |
20 | echo CONFIG += debug >> $@ | 20 | echo CONFIG += debug >> $@ |
21 | echo CONFIG -= release >> $@ | 21 | echo CONFIG -= release >> $@ |
22 | echo DEFINES += "QT_COMPONENT_DEBUG=2" >> $@ | 22 | echo DEFINES += "QT_COMPONENT_DEBUG=2" >> $@ |
23 | echo DEFINES += QT_DEBUG >> $@ | 23 | echo DEFINES += QT_DEBUG >> $@ |
24 | else | 24 | else |
25 | echo CONFIG -= debug >> $@ | 25 | echo CONFIG -= debug >> $@ |
26 | echo CONFIG += release >> $@ | 26 | echo CONFIG += release >> $@ |
27 | echo DEFINES += "OPIE_NO_DEBUG" >> $@ | 27 | echo DEFINES += "OPIE_NO_DEBUG" >> $@ |
28 | endif | 28 | endif |
29 | ifeq ($(CONFIG_STATIC),y) | 29 | ifeq ($(CONFIG_STATIC),y) |
30 | echo !contains\( TARGET,qpe \) \{ >> $@ | 30 | echo !contains\( TARGET,qpe \) \{ >> $@ |
31 | echo CONFIG += staticlib >> $@ | 31 | echo CONFIG += staticlib >> $@ |
32 | echo \} >> $@ | 32 | echo \} >> $@ |
33 | endif | 33 | endif |
34 | ifeq ($(filter 3.%,$(QTE_VERSION)),) # not qt3 | 34 | ifeq ($(filter 3.%,$(QTE_VERSION)),) # not qt3 |
35 | echo CONFIG -= qt3 >> $@ | 35 | echo CONFIG -= qt3 >> $@ |
36 | else | 36 | else |
37 | echo CONFIG += qt3 >> $@ | 37 | echo CONFIG += qt3 >> $@ |
38 | endif | 38 | endif |
39 | ifneq ($(CONFIG_QUICK_LAUNCH),) | 39 | ifneq ($(CONFIG_QUICK_LAUNCH),) |
40 | echo contains\( CONFIG, quick-app \) \{ >> $@ | 40 | echo contains\( CONFIG, quick-app \) \{ >> $@ |
41 | echo CONFIG -= staticlib >> $@ | 41 | echo CONFIG -= staticlib >> $@ |
42 | echo CONFIG -= quick-app >> $@ | 42 | echo CONFIG -= quick-app >> $@ |
43 | echo CONFIG += quick-app-lib >> $@ | 43 | echo CONFIG += quick-app-lib >> $@ |
44 | echo QUICKLAUNCH_PATH = $(CONFIG_QUICKLAUNCH_PATH) >> $@ | 44 | echo QUICKLAUNCH_PATH = $(CONFIG_QUICKLAUNCH_PATH) >> $@ |
45 | echo \} >> $@ | 45 | echo \} >> $@ |
46 | else | 46 | else |
47 | echo contains\( CONFIG, quick-app \) \{ >> $@ | 47 | echo contains\( CONFIG, quick-app \) \{ >> $@ |
48 | echo CONFIG -= quick-app >> $@ | 48 | echo CONFIG -= quick-app >> $@ |
49 | echo CONFIG += quick-app-bin >> $@ | 49 | echo CONFIG += quick-app-bin >> $@ |
50 | echo \} >> $@ | 50 | echo \} >> $@ |
51 | endif | 51 | endif |
52 | ifeq ($(CONFIG_SQL_PIM_BACKEND),y) | 52 | ifeq ($(CONFIG_SQL_PIM_BACKEND),y) |
53 | echo ENABLE_SQL_PIM_BACKEND=$(CONFIG_SQL_PIM_BACKEND) >> $@ | 53 | echo ENABLE_SQL_PIM_BACKEND=$(CONFIG_SQL_PIM_BACKEND) >> $@ |
54 | else | 54 | else |
55 | echo ENABLE_SQL_PIM_BACKEND=n >> $@ | 55 | echo ENABLE_SQL_PIM_BACKEND=n >> $@ |
56 | endif | 56 | endif |
57 | ifeq ($(CONFIG_OPIELOGIN_USEPAM),y) | 57 | ifeq ($(CONFIG_OPIELOGIN_USEPAM),y) |
58 | echo CONFIG += OPIELOGIN_USEPAM >> $@ | 58 | echo CONFIG += OPIELOGIN_USEPAM >> $@ |
59 | endif | 59 | endif |
60 | ifeq ($(CONFIG_LIBQPE_WITHROHFEEDBACK),y) | 60 | ifeq ($(CONFIG_LIBQPE_WITHROHFEEDBACK),y) |
61 | echo CONFIG += LIBQPE_WITHROHFEEDBACK >> $@ | 61 | echo CONFIG += LIBQPE_WITHROHFEEDBACK >> $@ |
62 | endif | 62 | endif |
63 | ifeq ($(CONFIG_LIBQPE_NO_INLINE_IMAGES),y) | ||
64 | echo DEFINES += LIBQPE_NO_INLINE_IMAGES >> $@ | ||
65 | endif | ||
63 | ifeq ($(CONFIG_OPIE_NO_BUILTIN_SHUTDOWN),y) | 66 | ifeq ($(CONFIG_OPIE_NO_BUILTIN_SHUTDOWN),y) |
64 | echo DEFINES += OPIE_NO_BUILTIN_SHUTDOWN >> $@ | 67 | echo DEFINES += OPIE_NO_BUILTIN_SHUTDOWN >> $@ |
65 | endif | 68 | endif |
66 | ifeq ($(CONFIG_OPIE_NO_BUILTIN_CALIBRATE),y) | 69 | ifeq ($(CONFIG_OPIE_NO_BUILTIN_CALIBRATE),y) |
67 | echo DEFINES += OPIE_NO_BUILTIN_CALIBRATE >> $@ | 70 | echo DEFINES += OPIE_NO_BUILTIN_CALIBRATE >> $@ |
68 | endif | 71 | endif |
69 | ifeq ($(CONFIG_USE_REALTIME_AUDIO_THREAD),y) | 72 | ifeq ($(CONFIG_USE_REALTIME_AUDIO_THREAD),y) |
70 | echo DEFINES += USE_REALTIME_AUDIO_THREAD >> $@ | 73 | echo DEFINES += USE_REALTIME_AUDIO_THREAD >> $@ |
71 | endif | 74 | endif |
72 | ifeq ($(CONFIG_USE_FILE_NOTIFICATION),y) | 75 | ifeq ($(CONFIG_USE_FILE_NOTIFICATION),y) |
73 | echo DEFINES += USE_FILE_NOTIFICATION >> $@ | 76 | echo DEFINES += USE_FILE_NOTIFICATION >> $@ |
74 | endif | 77 | endif |
75 | ifeq ($(CONFIG_QT_QWS_ALLOW_CLOCK),y) | 78 | ifeq ($(CONFIG_QT_QWS_ALLOW_CLOCK),y) |
76 | echo DEFINES += QT_QWS_ALLOW_OVERCLOCK >> $@ | 79 | echo DEFINES += QT_QWS_ALLOW_OVERCLOCK >> $@ |
77 | endif | 80 | endif |
78 | ifeq ($(CONFIG_OPIE_NEW_ALLOC),y) | 81 | ifeq ($(CONFIG_OPIE_NEW_ALLOC),y) |
79 | echo DEFINES += OPIE_NEW_MALLOC >> $@ | 82 | echo DEFINES += OPIE_NEW_MALLOC >> $@ |
80 | endif | 83 | endif |
81 | ifeq ($(CONFIG_OPIE_NO_SOUND_PCM_READ_BITS),y) | 84 | ifeq ($(CONFIG_OPIE_NO_SOUND_PCM_READ_BITS),y) |
82 | echo DEFINES += OPIE_NO_SOUND_PCM_READ_BITS >> $@ | 85 | echo DEFINES += OPIE_NO_SOUND_PCM_READ_BITS >> $@ |
83 | endif | 86 | endif |
84 | echo DEFINES += OPIE_SOUND_FRAGMENT_SHIFT=$(CONFIG_OPIE_SOUND_FRAGMENT_SHIFT) >> $@ | 87 | echo DEFINES += OPIE_SOUND_FRAGMENT_SHIFT=$(CONFIG_OPIE_SOUND_FRAGMENT_SHIFT) >> $@ |
85 | ifeq ($(CONFIG_OPIE_WE_VERSION_OVERRIDE),y) | 88 | ifeq ($(CONFIG_OPIE_WE_VERSION_OVERRIDE),y) |
86 | echo DEFINES += OPIE_WE_VERSION=$(CONFIG_OPIE_WE_VERSION) >> $@ | 89 | echo DEFINES += OPIE_WE_VERSION=$(CONFIG_OPIE_WE_VERSION) >> $@ |
87 | endif | 90 | endif |
88 | ifeq ($(CONFIG_OPIE_TASKBAR_LOCK_KEY_STATE),y) | 91 | ifeq ($(CONFIG_OPIE_TASKBAR_LOCK_KEY_STATE),y) |
89 | echo DEFINES += OPIE_TASKBAR_LOCK_KEY_STATE >> $@ | 92 | echo DEFINES += OPIE_TASKBAR_LOCK_KEY_STATE >> $@ |
90 | endif | 93 | endif |
91 | # Write LIB dirs and INC dirs... | 94 | # Write LIB dirs and INC dirs... |
92 | ifeq ($(CONFIG_LIBETPAN_DEP),y) | 95 | ifeq ($(CONFIG_LIBETPAN_DEP),y) |
93 | echo LIBETPAN_LIB_DIR = $(CONFIG_LIBETPAN_LIB_DIR) >> $@ | 96 | echo LIBETPAN_LIB_DIR = $(CONFIG_LIBETPAN_LIB_DIR) >> $@ |
94 | echo LIBETPAN_INC_DIR = $(CONFIG_LIBETPAN_INC_DIR) >> $@ | 97 | echo LIBETPAN_INC_DIR = $(CONFIG_LIBETPAN_INC_DIR) >> $@ |
95 | endif | 98 | endif |
96 | ifeq ($(CONFIG_LIBPCAP_DEP),y) | 99 | ifeq ($(CONFIG_LIBPCAP_DEP),y) |
97 | echo LIBPCAP_LIB_DIR = $(CONFIG_LIBPCAP_LIB_DIR) >> $@ | 100 | echo LIBPCAP_LIB_DIR = $(CONFIG_LIBPCAP_LIB_DIR) >> $@ |
98 | echo LIBPCAP_INC_DIR = $(CONFIG_LIBPCAP_INC_DIR) >> $@ | 101 | echo LIBPCAP_INC_DIR = $(CONFIG_LIBPCAP_INC_DIR) >> $@ |
99 | endif | 102 | endif |
100 | ifeq ($(CONFIG_LIBSQLITE_DEP),y) | 103 | ifeq ($(CONFIG_LIBSQLITE_DEP),y) |
101 | echo LIBSQLITE_LIB_DIR = $(CONFIG_LIBSQLITE_LIB_DIR) >> $@ | 104 | echo LIBSQLITE_LIB_DIR = $(CONFIG_LIBSQLITE_LIB_DIR) >> $@ |
102 | echo LIBSQLITE_INC_DIR = $(CONFIG_LIBSQLITE_INC_DIR) >> $@ | 105 | echo LIBSQLITE_INC_DIR = $(CONFIG_LIBSQLITE_INC_DIR) >> $@ |
103 | endif | 106 | endif |
104 | ifeq ($(CONFIG_LIBXINE_DEP),y) | 107 | ifeq ($(CONFIG_LIBXINE_DEP),y) |
105 | echo LIBXINE_LIB_DIR = $(CONFIG_LIBXINE_LIB_DIR) >> $@ | 108 | echo LIBXINE_LIB_DIR = $(CONFIG_LIBXINE_LIB_DIR) >> $@ |
106 | echo LIBXINE_INC_DIR = $(CONFIG_LIBXINE_INC_DIR) >> $@ | 109 | echo LIBXINE_INC_DIR = $(CONFIG_LIBXINE_INC_DIR) >> $@ |
107 | endif | 110 | endif |
108 | ifeq ($(CONFIG_LIBBLUEZ_DEP),y) | 111 | ifeq ($(CONFIG_LIBBLUEZ_DEP),y) |
109 | echo LIBBLUEZ_LIB_DIR = $(CONFIG_LIBBLUEZ_LIB_DIR) >> $@ | 112 | echo LIBBLUEZ_LIB_DIR = $(CONFIG_LIBBLUEZ_LIB_DIR) >> $@ |
110 | echo LIBBLUEZ_INC_DIR = $(CONFIG_LIBBLUEZ_INC_DIR) >> $@ | 113 | echo LIBBLUEZ_INC_DIR = $(CONFIG_LIBBLUEZ_INC_DIR) >> $@ |
111 | endif | 114 | endif |
112 | ifeq ($(CONFIG_LIBIPK_DEP),y) | 115 | ifeq ($(CONFIG_LIBIPK_DEP),y) |
113 | echo LIBIPK_LIB_DIR = $(CONFIG_LIBIPK_LIB_DIR) >> $@ | 116 | echo LIBIPK_LIB_DIR = $(CONFIG_LIBIPK_LIB_DIR) >> $@ |
114 | echo LIBIPK_INC_DIR = $(CONFIG_LIBIPK_INC_DIR) >> $@ | 117 | echo LIBIPK_INC_DIR = $(CONFIG_LIBIPK_INC_DIR) >> $@ |
115 | endif | 118 | endif |
116 | ifeq ($(CONFIG_LIBSDK_DEP),y) | 119 | ifeq ($(CONFIG_LIBSDK_DEP),y) |
117 | echo LIBSDL_LIB_DIR = $(CONFIG_LIBSDL_LIB_DIR) >> $@ | 120 | echo LIBSDL_LIB_DIR = $(CONFIG_LIBSDL_LIB_DIR) >> $@ |
118 | echo LIBSDL_INC_DIR = $(CONFIG_LIBSDL_INC_DIR) >> $@ | 121 | echo LIBSDL_INC_DIR = $(CONFIG_LIBSDL_INC_DIR) >> $@ |
119 | endif | 122 | endif |
120 | ifeq ($(CONFIG_LIBSWORD_DEP),y) | 123 | ifeq ($(CONFIG_LIBSWORD_DEP),y) |
121 | echo LIBSWORD_LIB_DIR = $(CONFIG_LIBSWORD_LIB_DIR) >> $@ | 124 | echo LIBSWORD_LIB_DIR = $(CONFIG_LIBSWORD_LIB_DIR) >> $@ |
122 | echo LIBSWORD_INC_DIR = $(CONFIG_LIBSWORD_INC_DIR) >> $@ | 125 | echo LIBSWORD_INC_DIR = $(CONFIG_LIBSWORD_INC_DIR) >> $@ |
123 | endif | 126 | endif |
124 | ifeq ($(CONFIG_LIBFREETYPE2_DEP),y) | 127 | ifeq ($(CONFIG_LIBFREETYPE2_DEP),y) |
125 | echo LIBFREETYPE2_INC_DIR = $(CONFIG_LIBFREETYPE2_INC_DIR) >> $@ | 128 | echo LIBFREETYPE2_INC_DIR = $(CONFIG_LIBFREETYPE2_INC_DIR) >> $@ |
126 | endif | 129 | endif |
@@ -109,128 +109,132 @@ config CUSTOMFILE | |||
109 | 109 | ||
110 | config OPTIMIZATIONS | 110 | config OPTIMIZATIONS |
111 | string "Optimization flags" | 111 | string "Optimization flags" |
112 | depends OPTIMIZE | 112 | depends OPTIMIZE |
113 | default "-march=armv4 -mtune=strongarm1100 -mapcs-32 -fexpensive-optimizations -fomit-frame-pointer -O2" if TARGET_IPAQ | 113 | default "-march=armv4 -mtune=strongarm1100 -mapcs-32 -fexpensive-optimizations -fomit-frame-pointer -O2" if TARGET_IPAQ |
114 | default "-march=armv4 -mtune=strongarm1100 -mapcs-32 -fexpensive-optimizations -fomit-frame-pointer -O2" if TARGET_YOPY | 114 | default "-march=armv4 -mtune=strongarm1100 -mapcs-32 -fexpensive-optimizations -fomit-frame-pointer -O2" if TARGET_YOPY |
115 | default "-march=armv4 -mtune=strongarm1100 -mapcs-32 -fexpensive-optimizations -fomit-frame-pointer -O2" if TARGET_SHARP | 115 | default "-march=armv4 -mtune=strongarm1100 -mapcs-32 -fexpensive-optimizations -fomit-frame-pointer -O2" if TARGET_SHARP |
116 | default "-march=armv4 -mtune=strongarm1100 -mapcs-32 -fexpensive-optimizations -fomit-frame-pointer -O2" if TARGET_RAMSES | 116 | default "-march=armv4 -mtune=strongarm1100 -mapcs-32 -fexpensive-optimizations -fomit-frame-pointer -O2" if TARGET_RAMSES |
117 | default "-march=armv4 -mtune=strongarm1100 -mapcs-32 -fexpensive-optimizations -fomit-frame-pointer -O2" if TARGET_SIMPAD | 117 | default "-march=armv4 -mtune=strongarm1100 -mapcs-32 -fexpensive-optimizations -fomit-frame-pointer -O2" if TARGET_SIMPAD |
118 | default "-march=armv5te -mtune=xscale -mapcs-32 -fexpensive-optimizations -fomit-frame-pointer -O2" if TARGET_C700 | 118 | default "-march=armv5te -mtune=xscale -mapcs-32 -fexpensive-optimizations -fomit-frame-pointer -O2" if TARGET_C700 |
119 | 119 | ||
120 | config EXPERIMENTAL | 120 | config EXPERIMENTAL |
121 | bool "Prompt for development and/or incomplete items" | 121 | bool "Prompt for development and/or incomplete items" |
122 | default y | 122 | default y |
123 | 123 | ||
124 | config USE_CCACHE | 124 | config USE_CCACHE |
125 | bool "Use ccache, if available?" | 125 | bool "Use ccache, if available?" |
126 | default y | 126 | default y |
127 | 127 | ||
128 | endmenu | 128 | endmenu |
129 | 129 | ||
130 | menu "Configuration" | 130 | menu "Configuration" |
131 | config OPIE_NO_BUILTIN_SHUTDOWN | 131 | config OPIE_NO_BUILTIN_SHUTDOWN |
132 | boolean "Disable the built in shutdown application" | 132 | boolean "Disable the built in shutdown application" |
133 | default y | 133 | default y |
134 | 134 | ||
135 | config OPIE_NO_BUILTIN_CALIBRATE | 135 | config OPIE_NO_BUILTIN_CALIBRATE |
136 | boolean "Disable the built in calibrate application" | 136 | boolean "Disable the built in calibrate application" |
137 | default y if TARGET_YOPY | 137 | default y if TARGET_YOPY |
138 | default n if ! TARGET_YOPY | 138 | default n if ! TARGET_YOPY |
139 | 139 | ||
140 | config OPIE_SOUND_FRAGMENT_SHIFT | 140 | config OPIE_SOUND_FRAGMENT_SHIFT |
141 | string "The sound fragment used in Opie Player I" | 141 | string "The sound fragment used in Opie Player I" |
142 | default "14" if TARGET_IPAQ | 142 | default "14" if TARGET_IPAQ |
143 | default "16" if ! TARGET_IPAQ | 143 | default "16" if ! TARGET_IPAQ |
144 | 144 | ||
145 | config USE_REALTIME_AUDIO_THREAD | 145 | config USE_REALTIME_AUDIO_THREAD |
146 | boolean "Use a realtime thread in Opie Player I" | 146 | boolean "Use a realtime thread in Opie Player I" |
147 | default y if TARGET_IPAQ || TARGET_SIMPAD || TARGET_RAMSES || TARGET_SHARP | 147 | default y if TARGET_IPAQ || TARGET_SIMPAD || TARGET_RAMSES || TARGET_SHARP |
148 | default n if ! (TARGET_IPAQ || TARGET_SIMPAD || TARGET_RAMSES || TARGET_SHARP) | 148 | default n if ! (TARGET_IPAQ || TARGET_SIMPAD || TARGET_RAMSES || TARGET_SHARP) |
149 | 149 | ||
150 | config QT_QWS_ALLOW_OVERCLOCK | 150 | config QT_QWS_ALLOW_OVERCLOCK |
151 | boolean "Allow the user to overclock the device" | 151 | boolean "Allow the user to overclock the device" |
152 | depends TARGET_RAMSES | 152 | depends TARGET_RAMSES |
153 | default n | 153 | default n |
154 | 154 | ||
155 | config USE_FILE_NOTIFICATION | 155 | config USE_FILE_NOTIFICATION |
156 | boolean "Substitute (some) polling interfaces with OFileNotifier" | 156 | boolean "Substitute (some) polling interfaces with OFileNotifier" |
157 | default y | 157 | default y |
158 | 158 | ||
159 | config OPIE_NEW_ALLOC | 159 | config OPIE_NEW_ALLOC |
160 | boolean "Use malloc and free for the implementation" | 160 | boolean "Use malloc and free for the implementation" |
161 | default y if TARGET_RAMSES || TARGET_IPAQ || TARGET_SIMPAD || TARGET_SHARP | 161 | default y if TARGET_RAMSES || TARGET_IPAQ || TARGET_SIMPAD || TARGET_SHARP |
162 | default n if ! (TARGET_IPAQ || TARGET_SIMPAD || TARGET_RAMSES || TARGET_SHARP) | 162 | default n if ! (TARGET_IPAQ || TARGET_SIMPAD || TARGET_RAMSES || TARGET_SHARP) |
163 | 163 | ||
164 | config OPIE_TASKBAR_LOCK_KEY_STATE | 164 | config OPIE_TASKBAR_LOCK_KEY_STATE |
165 | boolean "Have a KeyLock state indicator on the taskbar" | 165 | boolean "Have a KeyLock state indicator on the taskbar" |
166 | default y if TARGET_SHARP | 166 | default y if TARGET_SHARP |
167 | default n if !TARGET_SHARP | 167 | default n if !TARGET_SHARP |
168 | 168 | ||
169 | config LIBQPE_WITHROHFEEDBACK | 169 | config LIBQPE_WITHROHFEEDBACK |
170 | boolean "Build libqpe with Right-On-Hold feedback" | 170 | boolean "Build libqpe with Right-On-Hold feedback" |
171 | default y | 171 | default y |
172 | 172 | ||
173 | config LIBQPE_NO_INLINE_IMAGES | ||
174 | boolean "Build libqpe without inline images" | ||
175 | default y | ||
176 | |||
173 | config OPIE_NO_SOUND_PCM_READ_BITS | 177 | config OPIE_NO_SOUND_PCM_READ_BITS |
174 | boolean "There is not a pcm_read_bits io control" | 178 | boolean "There is not a pcm_read_bits io control" |
175 | default y if TARGET_SHARP | 179 | default y if TARGET_SHARP |
176 | default n if ! TARGET_SHARP | 180 | default n if ! TARGET_SHARP |
177 | endmenu | 181 | endmenu |
178 | 182 | ||
179 | menu "Dependencies" | 183 | menu "Dependencies" |
180 | source dependencies.in | 184 | source dependencies.in |
181 | endmenu | 185 | endmenu |
182 | 186 | ||
183 | menu "Base" | 187 | menu "Base" |
184 | choice | 188 | choice |
185 | prompt "Qpe Library Selection" | 189 | prompt "Qpe Library Selection" |
186 | default LIBQPE | 190 | default LIBQPE |
187 | source library/config.in | 191 | source library/config.in |
188 | source x11/config.in | 192 | source x11/config.in |
189 | endchoice | 193 | endchoice |
190 | source libopie2/config.in | 194 | source libopie2/config.in |
191 | source libqtaux/config.in | 195 | source libqtaux/config.in |
192 | source rsync/config.in | 196 | source rsync/config.in |
193 | source core/opie-login/config.in | 197 | source core/opie-login/config.in |
194 | source core/opiealarm/config.in | 198 | source core/opiealarm/config.in |
195 | source core/tools/quicklauncher/config.in | 199 | source core/tools/quicklauncher/config.in |
196 | source core/launcher/config.in | 200 | source core/launcher/config.in |
197 | source core/symlinker/config.in | 201 | source core/symlinker/config.in |
198 | endmenu | 202 | endmenu |
199 | 203 | ||
200 | comment "" | 204 | comment "" |
201 | 205 | ||
202 | menu "Applets" | 206 | menu "Applets" |
203 | source core/applets/config.in | 207 | source core/applets/config.in |
204 | source noncore/applets/config.in | 208 | source noncore/applets/config.in |
205 | endmenu | 209 | endmenu |
206 | 210 | ||
207 | menu "Apps" | 211 | menu "Apps" |
208 | source core/apps/config.in | 212 | source core/apps/config.in |
209 | source noncore/apps/config.in | 213 | source noncore/apps/config.in |
210 | endmenu | 214 | endmenu |
211 | 215 | ||
212 | menu "Communications and Networking" | 216 | menu "Communications and Networking" |
213 | source noncore/comm/config.in | 217 | source noncore/comm/config.in |
214 | source noncore/net/config.in | 218 | source noncore/net/config.in |
215 | endmenu | 219 | endmenu |
216 | 220 | ||
217 | menu "Games" | 221 | menu "Games" |
218 | source noncore/games/config.in | 222 | source noncore/games/config.in |
219 | endmenu | 223 | endmenu |
220 | 224 | ||
221 | menu "Graphics and Multimedia" | 225 | menu "Graphics and Multimedia" |
222 | source freetype/config.in | 226 | source freetype/config.in |
223 | source noncore/graphics/config.in | 227 | source noncore/graphics/config.in |
224 | source core/multimedia/config.in | 228 | source core/multimedia/config.in |
225 | source noncore/multimedia/config.in | 229 | source noncore/multimedia/config.in |
226 | endmenu | 230 | endmenu |
227 | 231 | ||
228 | menu "Input methods" | 232 | menu "Input methods" |
229 | source inputmethods/config.in | 233 | source inputmethods/config.in |
230 | endmenu | 234 | endmenu |
231 | 235 | ||
232 | menu "Pim" | 236 | menu "Pim" |
233 | source core/obex/config.in | 237 | source core/obex/config.in |
234 | source core/pim/config.in | 238 | source core/pim/config.in |
235 | comment "Today Plugins ---" | 239 | comment "Today Plugins ---" |
236 | source noncore/todayplugins/config.in | 240 | source noncore/todayplugins/config.in |
diff --git a/library/resource.cpp b/library/resource.cpp index b31876f..3b5e9ec 100644 --- a/library/resource.cpp +++ b/library/resource.cpp | |||
@@ -1,235 +1,259 @@ | |||
1 | /********************************************************************** | 1 | /********************************************************************** |
2 | ** Copyright (C) 2000-2002 Trolltech AS. All rights reserved. | 2 | ** Copyright (C) 2000-2002 Trolltech AS. All rights reserved. |
3 | ** | 3 | ** |
4 | ** This file is part of the Qtopia Environment. | 4 | ** This file is part of the Qtopia Environment. |
5 | ** | 5 | ** |
6 | ** This file may be distributed and/or modified under the terms of the | 6 | ** This file may be distributed and/or modified under the terms of the |
7 | ** GNU General Public License version 2 as published by the Free Software | 7 | ** GNU General Public License version 2 as published by the Free Software |
8 | ** Foundation and appearing in the file LICENSE.GPL included in the | 8 | ** Foundation and appearing in the file LICENSE.GPL included in the |
9 | ** packaging of this file. | 9 | ** packaging of this file. |
10 | ** | 10 | ** |
11 | ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE | 11 | ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE |
12 | ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. | 12 | ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. |
13 | ** | 13 | ** |
14 | ** See http://www.trolltech.com/gpl/ for GPL licensing information. | 14 | ** See http://www.trolltech.com/gpl/ for GPL licensing information. |
15 | ** | 15 | ** |
16 | ** Contact info@trolltech.com if any conditions of this licensing are | 16 | ** Contact info@trolltech.com if any conditions of this licensing are |
17 | ** not clear to you. | 17 | ** not clear to you. |
18 | ** | 18 | ** |
19 | **********************************************************************/ | 19 | **********************************************************************/ |
20 | 20 | ||
21 | #define QTOPIA_INTERNAL_MIMEEXT | 21 | #define QTOPIA_INTERNAL_MIMEEXT |
22 | #include <qpe/qpeapplication.h> | 22 | #include <qpe/qpeapplication.h> |
23 | #include "resource.h" | 23 | #include "resource.h" |
24 | #include "mimetype.h" | 24 | #include "mimetype.h" |
25 | #include <qdir.h> | 25 | #include <qdir.h> |
26 | #include <qpixmapcache.h> | 26 | #include <qpixmapcache.h> |
27 | 27 | ||
28 | // this namespace is just a workaround for a gcc bug | 28 | // this namespace is just a workaround for a gcc bug |
29 | // gcc exports inline functions in the generated file | 29 | // gcc exports inline functions in the generated file |
30 | // inlinepics_p.h | 30 | // inlinepics_p.h |
31 | 31 | ||
32 | #ifndef LIBQPE_NO_INLINE_IMAGES | ||
32 | namespace { | 33 | namespace { |
33 | #include "inlinepics_p.h" | 34 | #include "inlinepics_p.h" |
34 | } | 35 | } |
36 | #endif | ||
35 | 37 | ||
36 | static bool g_notUseSet = ::getenv("OVERWRITE_ICON_SET"); | 38 | static bool g_notUseSet = ::getenv("OVERWRITE_ICON_SET"); |
37 | 39 | ||
38 | /*! | 40 | /*! |
39 | \class Resource resource.h | 41 | \class Resource resource.h |
40 | \brief The Resource class provides access to named resources. | 42 | \brief The Resource class provides access to named resources. |
41 | 43 | ||
42 | The resources may be provided from files or other sources. | 44 | The resources may be provided from files or other sources. |
43 | 45 | ||
44 | The allSounds() function returns a list of all the sounds available. | 46 | The allSounds() function returns a list of all the sounds available. |
45 | A particular sound can be searched for using findSound(). | 47 | A particular sound can be searched for using findSound(). |
46 | 48 | ||
47 | Images can be loaded with loadImage(), loadPixmap(), loadBitmap() | 49 | Images can be loaded with loadImage(), loadPixmap(), loadBitmap() |
48 | and loadIconSet(). | 50 | and loadIconSet(). |
49 | 51 | ||
50 | \ingroup qtopiaemb | 52 | \ingroup qtopiaemb |
51 | */ | 53 | */ |
52 | 54 | ||
53 | /*! | 55 | /*! |
54 | \fn Resource::Resource() | 56 | \fn Resource::Resource() |
55 | \internal | 57 | \internal |
56 | */ | 58 | */ |
57 | 59 | ||
58 | /*! | 60 | /*! |
59 | Returns the QPixmap called \a pix. You should avoid including | 61 | Returns the QPixmap called \a pix. You should avoid including |
60 | any filename type extension (e.g. .png, .xpm). | 62 | any filename type extension (e.g. .png, .xpm). |
61 | */ | 63 | */ |
62 | #include <stdio.h> | 64 | #include <stdio.h> |
63 | QPixmap Resource::loadPixmap( const QString &pix ) | 65 | QPixmap Resource::loadPixmap( const QString &pix ) |
64 | { | 66 | { |
65 | QPixmap pm; // null pixmap | 67 | QPixmap pm; // null pixmap |
66 | QString key="QPE_"+pix; | 68 | QString key="QPE_"+pix; |
67 | if ( !QPixmapCache::find(key,pm) ) { | 69 | if ( !QPixmapCache::find(key,pm) ) { |
68 | QImage I = loadImage(pix); | 70 | QImage I = loadImage(pix); |
69 | if( I.isNull() ) { | 71 | if( I.isNull() ) { |
70 | qWarning( "Could not load %s", pix.latin1() ); | 72 | qWarning( "Could not load %s", pix.latin1() ); |
71 | } else { | 73 | } else { |
72 | pm.convertFromImage(I); | 74 | pm.convertFromImage(I); |
73 | QPixmapCache::insert(key,pm); | 75 | QPixmapCache::insert(key,pm); |
74 | } | 76 | } |
75 | } | 77 | } |
76 | return pm; | 78 | return pm; |
77 | } | 79 | } |
78 | 80 | ||
79 | /*! | 81 | /*! |
80 | Returns the QBitmap called \a pix. You should avoid including | 82 | Returns the QBitmap called \a pix. You should avoid including |
81 | any filename type extension (e.g. .png, .xpm). | 83 | any filename type extension (e.g. .png, .xpm). |
82 | */ | 84 | */ |
83 | QBitmap Resource::loadBitmap( const QString &pix ) | 85 | QBitmap Resource::loadBitmap( const QString &pix ) |
84 | { | 86 | { |
85 | QBitmap bm; | 87 | QBitmap bm; |
86 | bm = loadPixmap(pix); | 88 | bm = loadPixmap(pix); |
87 | return bm; | 89 | return bm; |
88 | } | 90 | } |
89 | 91 | ||
90 | /*! | 92 | /*! |
91 | Returns the filename of a pixmap called \a pix. You should avoid including | 93 | Returns the filename of a pixmap called \a pix. You should avoid including |
92 | any filename type extension (e.g. .png, .xpm). | 94 | any filename type extension (e.g. .png, .xpm). |
93 | 95 | ||
94 | Normally you will use loadPixmap() rather than this function. | 96 | Normally you will use loadPixmap() rather than this function. |
95 | */ | 97 | */ |
96 | QString Resource::findPixmap( const QString &pix ) | 98 | QString Resource::findPixmap( const QString &pix ) |
97 | { | 99 | { |
98 | QString picsPath = QPEApplication::qpeDir() + "pics/"; | 100 | QString picsPath = QPEApplication::qpeDir() + "pics/"; |
99 | |||
100 | QString f; | 101 | QString f; |
101 | 102 | ||
102 | // Common case optimizations... | 103 | // Common case optimizations... |
103 | f = picsPath + pix + ".png"; | 104 | f = picsPath + pix + ".png"; |
104 | if ( QFile( f ).exists() ) | 105 | if ( QFile( f ).exists() ) |
105 | return f; | 106 | return f; |
106 | f = picsPath + pix + ".xpm"; | 107 | f = picsPath + pix + ".xpm"; |
107 | if ( QFile( f ).exists() ) | 108 | if ( QFile( f ).exists() ) |
108 | return f; | 109 | return f; |
109 | 110 | ||
111 | #ifdef LIBQPE_NO_INLINE_IMAGES | ||
112 | QString picsPathInline = picsPath + "inline/"; | ||
113 | // Common case optimizations... | ||
114 | f = picsPathInline + pix + ".png"; | ||
115 | if ( QFile( f ).exists() ) | ||
116 | return f; | ||
117 | f = picsPathInline + pix + ".xpm"; | ||
118 | if ( QFile( f ).exists() ) | ||
119 | return f; | ||
120 | #endif | ||
121 | |||
110 | // All formats... | 122 | // All formats... |
111 | QStrList fileFormats = QImageIO::inputFormats(); | 123 | QStrList fileFormats = QImageIO::inputFormats(); |
112 | QString ff = fileFormats.first(); | 124 | QString ff = fileFormats.first(); |
113 | while ( fileFormats.current() ) { | 125 | while ( fileFormats.current() ) { |
114 | QStringList exts = MimeType("image/"+ff.lower()).extensions(); | 126 | QStringList exts = MimeType("image/"+ff.lower()).extensions(); |
115 | for ( QStringList::ConstIterator it = exts.begin(); it!=exts.end(); ++it ) { | 127 | for ( QStringList::ConstIterator it = exts.begin(); it!=exts.end(); ++it ) { |
116 | QString f = picsPath + pix + "." + *it; | 128 | QString f = picsPath + pix + "." + *it; |
117 | if ( QFile(f).exists() ) | 129 | if ( QFile(f).exists() ) |
118 | return f; | 130 | return f; |
119 | } | 131 | } |
120 | ff = fileFormats.next(); | 132 | ff = fileFormats.next(); |
121 | } | 133 | } |
122 | 134 | ||
123 | // Finally, no (or existing) extension... | 135 | // Finally, no (or existing) extension... |
124 | if ( QFile( picsPath + pix ).exists() ) | 136 | if ( QFile( picsPath + pix ).exists() ) |
125 | return picsPath + pix; | 137 | return picsPath + pix; |
126 | 138 | ||
127 | //qDebug("Cannot find pixmap: %s", pix.latin1()); | 139 | //qDebug("Cannot find pixmap: %s", pix.latin1()); |
128 | return QString(); | 140 | return QString(); |
129 | } | 141 | } |
130 | 142 | ||
131 | /*! | 143 | /*! |
132 | Returns a sound file for a sound called \a name. | 144 | Returns a sound file for a sound called \a name. |
133 | 145 | ||
134 | You should avoid including any filename type extension (e.g. .wav), | 146 | You should avoid including any filename type extension (e.g. .wav), |
135 | as the system will search for only those fileformats which are supported | 147 | as the system will search for only those fileformats which are supported |
136 | by the library. | 148 | by the library. |
137 | 149 | ||
138 | Currently, only WAV files are supported. | 150 | Currently, only WAV files are supported. |
139 | */ | 151 | */ |
140 | QString Resource::findSound( const QString &name ) | 152 | QString Resource::findSound( const QString &name ) |
141 | { | 153 | { |
142 | QString picsPath = QPEApplication::qpeDir() + "sounds/"; | 154 | QString picsPath = QPEApplication::qpeDir() + "sounds/"; |
143 | 155 | ||
144 | QString result; | 156 | QString result; |
145 | if ( QFile( (result = picsPath + name + ".wav") ).exists() ) | 157 | if ( QFile( (result = picsPath + name + ".wav") ).exists() ) |
146 | return result; | 158 | return result; |
147 | 159 | ||
148 | return QString(); | 160 | return QString(); |
149 | } | 161 | } |
150 | 162 | ||
151 | /*! | 163 | /*! |
152 | Returns a list of all sound names. | 164 | Returns a list of all sound names. |
153 | */ | 165 | */ |
154 | QStringList Resource::allSounds() | 166 | QStringList Resource::allSounds() |
155 | { | 167 | { |
156 | QDir resourcedir( QPEApplication::qpeDir() + "sounds/", "*.wav" ); | 168 | QDir resourcedir( QPEApplication::qpeDir() + "sounds/", "*.wav" ); |
157 | QStringList entries = resourcedir.entryList(); | 169 | QStringList entries = resourcedir.entryList(); |
158 | QStringList result; | 170 | QStringList result; |
159 | for (QStringList::Iterator i=entries.begin(); i != entries.end(); ++i) | 171 | for (QStringList::Iterator i=entries.begin(); i != entries.end(); ++i) |
160 | result.append((*i).replace(QRegExp("\\.wav"),"")); | 172 | result.append((*i).replace(QRegExp("\\.wav"),"")); |
161 | return result; | 173 | return result; |
162 | } | 174 | } |
163 | 175 | ||
164 | static QImage load_image(const QString &name) | 176 | static QImage load_image(const QString &name) |
165 | { | 177 | { |
178 | QImage img; | ||
179 | |||
166 | if (g_notUseSet ) { | 180 | if (g_notUseSet ) { |
167 | // try file | 181 | // try file |
168 | QImage img; | ||
169 | QString f = Resource::findPixmap(name); | 182 | QString f = Resource::findPixmap(name); |
170 | if ( !f.isEmpty() ) | 183 | if ( !f.isEmpty() ) |
171 | img.load(f); | 184 | img.load(f); |
185 | #ifndef LIBQPE_NO_INLINE_IMAGES | ||
172 | if (img.isNull() ) | 186 | if (img.isNull() ) |
173 | img = qembed_findImage(name.latin1() ); | 187 | img = qembed_findImage(name.latin1() ); |
188 | #endif | ||
174 | return img; | 189 | return img; |
175 | } | 190 | } |
176 | else{ | 191 | else{ |
177 | QImage img = qembed_findImage(name.latin1()); | 192 | #ifndef LIBQPE_NO_INLINE_IMAGES |
178 | 193 | img = qembed_findImage(name.latin1()); | |
179 | if ( img.isNull() ) { | 194 | #else |
195 | QString f = Resource::findPixmap( "/inline/" + name ); | ||
196 | if ( !f.isEmpty() ) | ||
197 | { | ||
198 | img.load(f); | ||
199 | return img; | ||
200 | } | ||
201 | #endif | ||
202 | if ( img.isNull() ) | ||
203 | { | ||
180 | // No inlined image, try file | 204 | // No inlined image, try file |
181 | QString f = Resource::findPixmap(name); | 205 | QString f = Resource::findPixmap(name); |
182 | if ( !f.isEmpty() ) | 206 | if ( !f.isEmpty() ) |
183 | img.load(f); | 207 | img.load(f); |
184 | } | 208 | } |
185 | return img; | 209 | return img; |
186 | } | 210 | } |
187 | } | 211 | } |
188 | 212 | ||
189 | /*! | 213 | /*! |
190 | Returns the QImage called \a name. You should avoid including | 214 | Returns the QImage called \a name. You should avoid including |
191 | any filename type extension (e.g. .png, .xpm). | 215 | any filename type extension (e.g. .png, .xpm). |
192 | */ | 216 | */ |
193 | QImage Resource::loadImage( const QString &name) | 217 | QImage Resource::loadImage( const QString &name) |
194 | { | 218 | { |
195 | #ifndef QT_NO_DEPTH_32// have alpha-blended pixmaps | 219 | #ifndef QT_NO_DEPTH_32// have alpha-blended pixmaps |
196 | static QImage last_enabled; | 220 | static QImage last_enabled; |
197 | static QString last_enabled_name; | 221 | static QString last_enabled_name; |
198 | if ( name == last_enabled_name ) | 222 | if ( name == last_enabled_name ) |
199 | return last_enabled; | 223 | return last_enabled; |
200 | #endif | 224 | #endif |
201 | QImage img = load_image(name); | 225 | QImage img = load_image(name); |
202 | #ifndef QT_NO_DEPTH_32// have alpha-blended pixmaps | 226 | #ifndef QT_NO_DEPTH_32// have alpha-blended pixmaps |
203 | if ( img.isNull() ) { | 227 | if ( img.isNull() ) { |
204 | // No file, try generating | 228 | // No file, try generating |
205 | if ( name[name.length()-1]=='d' && name.right(9)=="_disabled" ) { | 229 | if ( name[name.length()-1]=='d' && name.right(9)=="_disabled" ) { |
206 | last_enabled_name = name.left(name.length()-9); | 230 | last_enabled_name = name.left(name.length()-9); |
207 | last_enabled = load_image(last_enabled_name); | 231 | last_enabled = load_image(last_enabled_name); |
208 | if ( last_enabled.isNull() ) { | 232 | if ( last_enabled.isNull() ) { |
209 | last_enabled_name = QString::null; | 233 | last_enabled_name = QString::null; |
210 | } else { | 234 | } else { |
211 | img.detach(); | 235 | img.detach(); |
212 | img.create( last_enabled.width(), last_enabled.height(), 32 ); | 236 | img.create( last_enabled.width(), last_enabled.height(), 32 ); |
213 | for ( int y = 0; y < img.height(); y++ ) { | 237 | for ( int y = 0; y < img.height(); y++ ) { |
214 | for ( int x = 0; x < img.width(); x++ ) { | 238 | for ( int x = 0; x < img.width(); x++ ) { |
215 | QRgb p = last_enabled.pixel( x, y ); | 239 | QRgb p = last_enabled.pixel( x, y ); |
216 | int a = qAlpha(p)/3; | 240 | int a = qAlpha(p)/3; |
217 | int g = qGray(qRed(p),qGreen(p),qBlue(p)); | 241 | int g = qGray(qRed(p),qGreen(p),qBlue(p)); |
218 | img.setPixel( x, y, qRgba(g,g,g,a) ); | 242 | img.setPixel( x, y, qRgba(g,g,g,a) ); |
219 | } | 243 | } |
220 | } | 244 | } |
221 | img.setAlphaBuffer( TRUE ); | 245 | img.setAlphaBuffer( TRUE ); |
222 | } | 246 | } |
223 | } | 247 | } |
224 | } | 248 | } |
225 | #endif | 249 | #endif |
226 | return img; | 250 | return img; |
227 | } | 251 | } |
228 | 252 | ||
229 | /*! | 253 | /*! |
230 | \fn QIconSet Resource::loadIconSet( const QString &name ) | 254 | \fn QIconSet Resource::loadIconSet( const QString &name ) |
231 | 255 | ||
232 | Returns a QIconSet for the pixmap named \a name. A disabled icon is | 256 | Returns a QIconSet for the pixmap named \a name. A disabled icon is |
233 | generated that conforms to the Qtopia look & feel. You should avoid | 257 | generated that conforms to the Qtopia look & feel. You should avoid |
234 | including any filename type extension (eg. .png, .xpm). | 258 | including any filename type extension (eg. .png, .xpm). |
235 | */ | 259 | */ |