summaryrefslogtreecommitdiff
authormickeyl <mickeyl>2005-02-19 17:18:27 (UTC)
committer mickeyl <mickeyl>2005-02-19 17:18:27 (UTC)
commitbe32e0c045814142954ac37c89715313633d6aa2 (patch) (unidiff)
tree93a6fc7a84b4073fb04cc0b3377c4bb7e11bd091
parentb7bf9c7acdc010eb30bc246372efb0d1b394166a (diff)
downloadopie-be32e0c045814142954ac37c89715313633d6aa2.zip
opie-be32e0c045814142954ac37c89715313633d6aa2.tar.gz
opie-be32e0c045814142954ac37c89715313633d6aa2.tar.bz2
make inline image support optional
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--ChangeLog3
-rw-r--r--Rules.make3
-rw-r--r--config.in4
-rw-r--r--library/resource.cpp34
4 files changed, 38 insertions, 6 deletions
diff --git a/ChangeLog b/ChangeLog
index c39e7ce..86d9766 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,226 +1,227 @@
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)
93 * Ported brightnessapplet from Qtopia 1.7 (mickeyl) 94 * Ported brightnessapplet from Qtopia 1.7 (mickeyl)
94 * Opie-Eye got a Digital Camera File Backend (alwin,zecke) 95 * Opie-Eye got a Digital Camera File Backend (alwin,zecke)
95 * Support for Tuxpad1 of Tradesquare.NL (mickeyl,zecke) 96 * Support for Tuxpad1 of Tradesquare.NL (mickeyl,zecke)
96 * Opie-Console use Custom Font and Size in a Profile (harlekin) 97 * Opie-Console use Custom Font and Size in a Profile (harlekin)
97 * Opie-Console transparently log the Output and Input to a file (harlekin) 98 * Opie-Console transparently log the Output and Input to a file (harlekin)
98 * Added new O-menu icon to lock the PDA immediately: opie-lockapplet (clem) 99 * Added new O-menu icon to lock the PDA immediately: opie-lockapplet (clem)
99 * Opie-Security now hides the plugin-based authentication tabs if no auth. plugin package is installed (clem) 100 * Opie-Security now hides the plugin-based authentication tabs if no auth. plugin package is installed (clem)
100 * Opie-Security gained a 'test authentication' button (clem) 101 * Opie-Security gained a 'test authentication' button (clem)
101 * Opie-Eye got a more unique layout (menubar), a slideshow, user can setup some defaults 102 * Opie-Eye got a more unique layout (menubar), a slideshow, user can setup some defaults
102 * Opie-Mail improve the handling of POP mail boxes (alwin) 103 * Opie-Mail improve the handling of POP mail boxes (alwin)
103 * Both Opie-Eye and Opie-Mail were greatly improved due the hard work of Rajko Albrecht(alwin) 104 * Both Opie-Eye and Opie-Mail were greatly improved due the hard work of Rajko Albrecht(alwin)
104 * Opie IRC - backports of the 'NeIRC fork' (zecke) 105 * Opie IRC - backports of the 'NeIRC fork' (zecke)
105 106
106 Fixed Bugs 107 Fixed Bugs
107 ---------- 108 ----------
108 * #501 - Pickboard is able to show 'Umlaute' (TT,zecke) 109 * #501 - Pickboard is able to show 'Umlaute' (TT,zecke)
109 * #608 - Make Opie usable for left handed users (zecke) 110 * #608 - Make Opie usable for left handed users (zecke)
110 * #957 - Import of VCards/VTodos/VEvents with BASE64 encoding (ljp,zecke) 111 * #957 - Import of VCards/VTodos/VEvents with BASE64 encoding (ljp,zecke)
111 * #1245 - Opie-Go 'paused' (zecke) 112 * #1245 - Opie-Go 'paused' (zecke)
112 * #1358 - DocTab didn't show any MimeTypes (was fixed earlier) (zecke) 113 * #1358 - DocTab didn't show any MimeTypes (was fixed earlier) (zecke)
113 * #1380 - QDateBookAccess::remove() doesn't remove entries (eilers, zecke) 114 * #1380 - QDateBookAccess::remove() doesn't remove entries (eilers, zecke)
114 * #1395 - Build VNC Backend with gcc3.4 115 * #1395 - Build VNC Backend with gcc3.4
115 * #1440 - The icon of opie-mobilemsg is missing (CoreDump) 116 * #1440 - The icon of opie-mobilemsg is missing (CoreDump)
116 * #1426 - Add missing opie-bartender Icon (CoreDump) 117 * #1426 - Add missing opie-bartender Icon (CoreDump)
117 * #1445 - Opie-Sheet Has No Icon (CoreDump) 118 * #1445 - Opie-Sheet Has No Icon (CoreDump)
118 * #1448 - Brightness Applet added (mickeyl) 119 * #1448 - Brightness Applet added (mickeyl)
119 * #1450 - ZSame didn't clear the bonus item after winning a game (zecke) 120 * #1450 - ZSame didn't clear the bonus item after winning a game (zecke)
120 * #1482 - Fix OFileSelector to be able to sort by size (zecke) 121 * #1482 - Fix OFileSelector to be able to sort by size (zecke)
121 * n.a. - Opie-mail: fixed some crasher, some layout-problems 122 * n.a. - Opie-mail: fixed some crasher, some layout-problems
122 * n.a. - Converted applications to not hardcode /opt/QtPalmtop but to use QPEApplication::qpeDir (zecke) 123 * n.a. - Converted applications to not hardcode /opt/QtPalmtop but to use QPEApplication::qpeDir (zecke)
123 * n.a. - Converted usage of qpeDir() not to include a '/' as first charachter of the string (zecke) 124 * n.a. - Converted usage of qpeDir() not to include a '/' as first charachter of the string (zecke)
124 * n.a. - Build system: Enable distcc and ccache when crosscompiling too, and use them everywhere we can (clem) 125 * n.a. - Build system: Enable distcc and ccache when crosscompiling too, and use them everywhere we can (clem)
125 * n.a. - Build system: Fix deps in several config.in (and fix scripts/deps.pl too) to stop breaking builds, especially with make -j highNumber (clem) 126 * n.a. - Build system: Fix deps in several config.in (and fix scripts/deps.pl too) to stop breaking builds, especially with make -j highNumber (clem)
126 * n.a. - Removed hardcoded icon size in a couple of applets (mickeyl) 127 * n.a. - Removed hardcoded icon size in a couple of applets (mickeyl)
127 128
128 Internal 129 Internal
129 -------- 130 --------
130 * Opie-Qashmoney has been moved to unsupported (mickeyl) 131 * Opie-Qashmoney has been moved to unsupported (mickeyl)
131 * Opie-Ubrowser has been moved to unsupported (mickeyl) 132 * Opie-Ubrowser has been moved to unsupported (mickeyl)
132 133
133 2004-09-17Opie 1.1.6 134 2004-09-17Opie 1.1.6
134 135
135 New Features 136 New Features
136 ------------ 137 ------------
137 * Fifteen gained configurable number of items (zecke) 138 * Fifteen gained configurable number of items (zecke)
138 * Fifteen can have custom background images (zecke) 139 * Fifteen can have custom background images (zecke)
139 * Added daemonizing capabilities to QWS Server [via Qt/Embedded] (mickeyl) 140 * Added daemonizing capabilities to QWS Server [via Qt/Embedded] (mickeyl)
140 * Integrated the new security framework into libopie2 (zecke,clem) 141 * Integrated the new security framework into libopie2 (zecke,clem)
141 * Converted the launcher to use the new security framework (zecke) 142 * Converted the launcher to use the new security framework (zecke)
142 * Backup can now handle custom locations for backup and restore (ar) 143 * Backup can now handle custom locations for backup and restore (ar)
143 * Implemented right-on-hold feedback (wimpie,zecke) 144 * Implemented right-on-hold feedback (wimpie,zecke)
144 * Lots of new features in opie-reader (tim,pohly) 145 * Lots of new features in opie-reader (tim,pohly)
145 * Build system cleanups (schurig) 146 * Build system cleanups (schurig)
146 147
147 Fixed Bugs 148 Fixed Bugs
148 -------- 149 --------
149 * #1005 - Fixed backup to CompactFlash (ar) 150 * #1005 - Fixed backup to CompactFlash (ar)
150 * #1167 - Fixed Opie write crashing on more text than one page (ar) 151 * #1167 - Fixed Opie write crashing on more text than one page (ar)
151 * #1225 - Fixed repeated light flashing on Zaurus with keyz (mickeyl) 152 * #1225 - Fixed repeated light flashing on Zaurus with keyz (mickeyl)
152 * #1359 - Fixed bookmarks in Gutenbrowser (ljp) 153 * #1359 - Fixed bookmarks in Gutenbrowser (ljp)
153 * #1361 - Fixed auto upercase in Opie-Addressbook (eilers) 154 * #1361 - Fixed auto upercase in Opie-Addressbook (eilers)
154 * #1370 - Pimconverter now reacts on cancel key (eilers) 155 * #1370 - Pimconverter now reacts on cancel key (eilers)
155 * #1376 - Bring back the capslock/numlock display (zecke) 156 * #1376 - Bring back the capslock/numlock display (zecke)
156 * #1383 - Language settings now warns about losing open apps (Markus Litz) 157 * #1383 - Language settings now warns about losing open apps (Markus Litz)
157 * #1393 - Fixed line wrap issues in opie-console for the default profile (mickeyl) 158 * #1393 - Fixed line wrap issues in opie-console for the default profile (mickeyl)
158 * #1394 - Fixed oversized headline in opie-login (coredump) 159 * #1394 - Fixed oversized headline in opie-login (coredump)
159 * #1396 - Opie-console captures the escape key and vim is working (zecke) 160 * #1396 - Opie-console captures the escape key and vim is working (zecke)
160 * #1401 - Scrollbar is now only visible if necessary in DocTab (mickeyl) 161 * #1401 - Scrollbar is now only visible if necessary in DocTab (mickeyl)
161 162
162 2004-07-06Opie 1.1.4 163 2004-07-06Opie 1.1.4
163 164
164 New Features 165 New Features
165 ------------ 166 ------------
166 * Added four themes courtesy Robert Griebl (http://www.softforge.de/zstyle) 167 * Added four themes courtesy Robert Griebl (http://www.softforge.de/zstyle)
167 * Added Conversion tool for pim-data (eilers) 168 * Added Conversion tool for pim-data (eilers)
168 * Introduced new OPimAccessFactory and OBackendFactory which simplyfies database access (eilers) 169 * Introduced new OPimAccessFactory and OBackendFactory which simplyfies database access (eilers)
169 * Modified the PIM API for providing generic use of OPimRecords (eilers) 170 * Modified the PIM API for providing generic use of OPimRecords (eilers)
170 * Clicking on the application symbol now iterates over the application's top level widgets if already raised (zecke) 171 * Clicking on the application symbol now iterates over the application's top level widgets if already raised (zecke)
171 172
172 Fixed Bugs 173 Fixed Bugs
173 -------- 174 --------
174 * #1068 - Country Drop Down Box Off Screen 175 * #1068 - Country Drop Down Box Off Screen
175 * #1291 - Opie tinykate does not open .desktop files (ar) 176 * #1291 - Opie tinykate does not open .desktop files (ar)
176 * #1291 - Opie sheet not saving correctly (ar) 177 * #1291 - Opie sheet not saving correctly (ar)
177 * #1294 - Opie does not know about British Summer Time 178 * #1294 - Opie does not know about British Summer Time
178 * #1314 - Drawpad initialization (mickeyl) 179 * #1314 - Drawpad initialization (mickeyl)
179 * #1317 - Packagemanager crashes on hold-down or install (chicken) 180 * #1317 - Packagemanager crashes on hold-down or install (chicken)
180 * #1321 - Batteryapplet graphic glitch (harlekin) 181 * #1321 - Batteryapplet graphic glitch (harlekin)
181 * #1324 - ZSafe not starting up (mickeyl) 182 * #1324 - ZSafe not starting up (mickeyl)
182 * #1328 - Personal Home Address fields is trimmed to 1char (eilers) 183 * #1328 - Personal Home Address fields is trimmed to 1char (eilers)
183 * #1327 - Opie-mail ipk does not depend on libopiedb2 (chicken) 184 * #1327 - Opie-mail ipk does not depend on libopiedb2 (chicken)
184 * #1345 - Networksettingsplugin wlan plugin dependency on libpcap0 (mickeyl) 185 * #1345 - Networksettingsplugin wlan plugin dependency on libpcap0 (mickeyl)
185 * #1348 - Datebook dependency on libopiedb2 (chicken) 186 * #1348 - Datebook dependency on libopiedb2 (chicken)
186 * #1328 - Switched SQLDatabase and VCards char encoding from latin1 to unicode (eilers) 187 * #1328 - Switched SQLDatabase and VCards char encoding from latin1 to unicode (eilers)
187 188
188 2004-04-25Opie 1.1.3 189 2004-04-25Opie 1.1.3
189 190
190 * Introduced first implementation of SQL-Support using SQLite (eilers) 191 * Introduced first implementation of SQL-Support using SQLite (eilers)
191 * Added a new Gutenberg Project reader app - opie-gutenbrowser (ljp) 192 * Added a new Gutenberg Project reader app - opie-gutenbrowser (ljp)
192 * Added a real system graffiti character set (brad) 193 * Added a real system graffiti character set (brad)
193 * Added Generic Keyconfig Widget (zecke) 194 * Added Generic Keyconfig Widget (zecke)
194 * Improved Screenshotapplet and Drawpad integration. You can now open a screenshot in drawpad and take notes (zecke) 195 * Improved Screenshotapplet and Drawpad integration. You can now open a screenshot in drawpad and take notes (zecke)
195 * Added new Bible reader app - opie-dagger (drw) 196 * Added new Bible reader app - opie-dagger (drw)
196 * Added a new Image Viewer. Work is ongoing (zecke,alwin) 197 * Added a new Image Viewer. Work is ongoing (zecke,alwin)
197 * Added namespace usage in libopie2 and everywhere (zecke,alwin) 198 * Added namespace usage in libopie2 and everywhere (zecke,alwin)
198 * Enabled the possibility to pass command line arguments to applications (mickeyl) 199 * Enabled the possibility to pass command line arguments to applications (mickeyl)
199 * Added an about applet showing some credits and information about Opie (mickeyl) 200 * Added an about applet showing some credits and information about Opie (mickeyl)
200 * Added benchmarking functionality to sysinfo (mickeyl) 201 * Added benchmarking functionality to sysinfo (mickeyl)
201 * Added applet and configuration application for switching hardware keyboard layouts (alwin) 202 * Added applet and configuration application for switching hardware keyboard layouts (alwin)
202 * Ported applications from libopie1 to libopie2* (drw,ar,alwin) 203 * Ported applications from libopie1 to libopie2* (drw,ar,alwin)
203 * Imported fullscreen and font improvements from the Qkonsole fork to embeddedkonsole (waspe) 204 * Imported fullscreen and font improvements from the Qkonsole fork to embeddedkonsole (waspe)
204 * Clean-up of package information in control files (drw) 205 * Clean-up of package information in control files (drw)
205 * Repaired mediummount which was broken since integrating the quicklauncher (alwin) 206 * Repaired mediummount which was broken since integrating the quicklauncher (alwin)
206 * Improved big-screen support (zecke,ar) 207 * Improved big-screen support (zecke,ar)
207 * Improved multikeyboard support, added keyboard layout switching applet (mouse) 208 * Improved multikeyboard support, added keyboard layout switching applet (mouse)
208 * Added a new mail client based on libetpan (harlekin,alwin,jgf) 209 * Added a new mail client based on libetpan (harlekin,alwin,jgf)
209 * Added new package manager - opie-packagemanager (drw) 210 * Added new package manager - opie-packagemanager (drw)
210 * Improved light-n-power for C7x0 (mickeyl) 211 * Improved light-n-power for C7x0 (mickeyl)
211 * Added automatic rotation support for C7x0 (treke) 212 * Added automatic rotation support for C7x0 (treke)
212 * Split libopie1 up into a set of smaller - functionally grouped - libraries (mickeyl) 213 * Split libopie1 up into a set of smaller - functionally grouped - libraries (mickeyl)
213 * Added scanning the wireless network neighbourhood to networksettings (mickeyl) 214 * Added scanning the wireless network neighbourhood to networksettings (mickeyl)
214 215
215 2003-11-29Opie 1.0.3 216 2003-11-29Opie 1.0.3
216 217
217 * Released as Version 1.0.3 218 * Released as Version 1.0.3
218 * Improved i18n (various contributors) 219 * Improved i18n (various contributors)
219 * Reduced application startup time by integrating the TT quicklauncher (zecke,harlekin) 220 * Reduced application startup time by integrating the TT quicklauncher (zecke,harlekin)
220 * Made the Documents Tab optional (mickeyl) 221 * Made the Documents Tab optional (mickeyl)
221 * Integrated basic support for HP iPAQ 54xx and the Jornada 5xx (chicken) 222 * Integrated basic support for HP iPAQ 54xx and the Jornada 5xx (chicken)
222 223
223 2003-08-04Opie 1.0.0 224 2003-08-04Opie 1.0.0
224 225
225 * Released as Version 1.0.0 226 * Released as Version 1.0.0
226 * Including a PPP module for easy dial up (tille,harlekin,zecke) 227 * Including a PPP module for easy dial up (tille,harlekin,zecke)
diff --git a/Rules.make b/Rules.make
index 64237cf..df1e6e5 100644
--- a/Rules.make
+++ b/Rules.make
@@ -1,313 +1,316 @@
1.phony: force 1.phony: force
2force: 2force:
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
10ifneq ($(CONFIG_THREADED),) 10ifneq ($(CONFIG_THREADED),)
11 echo CONFIG += thread >> $@ 11 echo CONFIG += thread >> $@
12else 12else
13 echo CONFIG -= thread >> $@ 13 echo CONFIG -= thread >> $@
14endif 14endif
15# added for auto stripped build 15# added for auto stripped build
16ifneq ($(CONFIG_STRIP),) 16ifneq ($(CONFIG_STRIP),)
17 echo CONFIG += strip >> $@ 17 echo CONFIG += strip >> $@
18endif 18endif
19ifneq ($(CONFIG_DEBUG),) 19ifneq ($(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 >> $@
24else 24else
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" >> $@
28endif 28endif
29ifeq ($(CONFIG_STATIC),y) 29ifeq ($(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 \} >> $@
33endif 33endif
34ifeq ($(filter 3.%,$(QTE_VERSION)),) # not qt3 34ifeq ($(filter 3.%,$(QTE_VERSION)),) # not qt3
35 echo CONFIG -= qt3 >> $@ 35 echo CONFIG -= qt3 >> $@
36else 36else
37 echo CONFIG += qt3 >> $@ 37 echo CONFIG += qt3 >> $@
38endif 38endif
39ifneq ($(CONFIG_QUICK_LAUNCH),) 39ifneq ($(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 \} >> $@
46else 46else
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 \} >> $@
51endif 51endif
52ifeq ($(CONFIG_SQL_PIM_BACKEND),y) 52ifeq ($(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) >> $@
54else 54else
55 echo ENABLE_SQL_PIM_BACKEND=n >> $@ 55 echo ENABLE_SQL_PIM_BACKEND=n >> $@
56endif 56endif
57ifeq ($(CONFIG_OPIELOGIN_USEPAM),y) 57ifeq ($(CONFIG_OPIELOGIN_USEPAM),y)
58 echo CONFIG += OPIELOGIN_USEPAM >> $@ 58 echo CONFIG += OPIELOGIN_USEPAM >> $@
59endif 59endif
60ifeq ($(CONFIG_LIBQPE_WITHROHFEEDBACK),y) 60ifeq ($(CONFIG_LIBQPE_WITHROHFEEDBACK),y)
61 echo CONFIG += LIBQPE_WITHROHFEEDBACK >> $@ 61 echo CONFIG += LIBQPE_WITHROHFEEDBACK >> $@
62endif 62endif
63ifeq ($(CONFIG_LIBQPE_NO_INLINE_IMAGES),y)
64 echo DEFINES += LIBQPE_NO_INLINE_IMAGES >> $@
65endif
63ifeq ($(CONFIG_OPIE_NO_BUILTIN_SHUTDOWN),y) 66ifeq ($(CONFIG_OPIE_NO_BUILTIN_SHUTDOWN),y)
64 echo DEFINES += OPIE_NO_BUILTIN_SHUTDOWN >> $@ 67 echo DEFINES += OPIE_NO_BUILTIN_SHUTDOWN >> $@
65endif 68endif
66ifeq ($(CONFIG_OPIE_NO_BUILTIN_CALIBRATE),y) 69ifeq ($(CONFIG_OPIE_NO_BUILTIN_CALIBRATE),y)
67 echo DEFINES += OPIE_NO_BUILTIN_CALIBRATE >> $@ 70 echo DEFINES += OPIE_NO_BUILTIN_CALIBRATE >> $@
68endif 71endif
69ifeq ($(CONFIG_USE_REALTIME_AUDIO_THREAD),y) 72ifeq ($(CONFIG_USE_REALTIME_AUDIO_THREAD),y)
70 echo DEFINES += USE_REALTIME_AUDIO_THREAD >> $@ 73 echo DEFINES += USE_REALTIME_AUDIO_THREAD >> $@
71endif 74endif
72ifeq ($(CONFIG_USE_FILE_NOTIFICATION),y) 75ifeq ($(CONFIG_USE_FILE_NOTIFICATION),y)
73 echo DEFINES += USE_FILE_NOTIFICATION >> $@ 76 echo DEFINES += USE_FILE_NOTIFICATION >> $@
74endif 77endif
75ifeq ($(CONFIG_QT_QWS_ALLOW_CLOCK),y) 78ifeq ($(CONFIG_QT_QWS_ALLOW_CLOCK),y)
76 echo DEFINES += QT_QWS_ALLOW_OVERCLOCK >> $@ 79 echo DEFINES += QT_QWS_ALLOW_OVERCLOCK >> $@
77endif 80endif
78ifeq ($(CONFIG_OPIE_NEW_ALLOC),y) 81ifeq ($(CONFIG_OPIE_NEW_ALLOC),y)
79 echo DEFINES += OPIE_NEW_MALLOC >> $@ 82 echo DEFINES += OPIE_NEW_MALLOC >> $@
80endif 83endif
81ifeq ($(CONFIG_OPIE_NO_SOUND_PCM_READ_BITS),y) 84ifeq ($(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 >> $@
83endif 86endif
84 echo DEFINES += OPIE_SOUND_FRAGMENT_SHIFT=$(CONFIG_OPIE_SOUND_FRAGMENT_SHIFT) >> $@ 87 echo DEFINES += OPIE_SOUND_FRAGMENT_SHIFT=$(CONFIG_OPIE_SOUND_FRAGMENT_SHIFT) >> $@
85ifeq ($(CONFIG_OPIE_WE_VERSION_OVERRIDE),y) 88ifeq ($(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) >> $@
87endif 90endif
88ifeq ($(CONFIG_OPIE_TASKBAR_LOCK_KEY_STATE),y) 91ifeq ($(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...
92ifeq ($(CONFIG_LIBETPAN_DEP),y) 95ifeq ($(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) >> $@
95endif 98endif
96ifeq ($(CONFIG_LIBPCAP_DEP),y) 99ifeq ($(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) >> $@
99endif 102endif
100ifeq ($(CONFIG_LIBSQLITE_DEP),y) 103ifeq ($(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) >> $@
103endif 106endif
104ifeq ($(CONFIG_LIBXINE_DEP),y) 107ifeq ($(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) >> $@
107endif 110endif
108ifeq ($(CONFIG_LIBBLUEZ_DEP),y) 111ifeq ($(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) >> $@
111endif 114endif
112ifeq ($(CONFIG_LIBIPK_DEP),y) 115ifeq ($(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) >> $@
115endif 118endif
116ifeq ($(CONFIG_LIBSDK_DEP),y) 119ifeq ($(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) >> $@
119endif 122endif
120ifeq ($(CONFIG_LIBSWORD_DEP),y) 123ifeq ($(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) >> $@
123endif 126endif
124ifeq ($(CONFIG_LIBFREETYPE2_DEP),y) 127ifeq ($(CONFIG_LIBFREETYPE2_DEP),y)
125 echo LIBFREETYPE2_INC_DIR = $(CONFIG_LIBFREETYPE2_INC_DIR) >> $@ 128 echo LIBFREETYPE2_INC_DIR = $(CONFIG_LIBFREETYPE2_INC_DIR) >> $@
126endif 129endif
127$(TOPDIR)/.depends : $(shell if [ -e $(TOPDIR)/config.in ]\; then echo $(TOPDIR)/config.in\; fi\;) $(TOPDIR)/.config $(TOPDIR)/packages 130$(TOPDIR)/.depends : $(shell if [ -e $(TOPDIR)/config.in ]\; then echo $(TOPDIR)/config.in\; fi\;) $(TOPDIR)/.config $(TOPDIR)/packages
128 @echo Generating dependency information... 131 @echo Generating dependency information...
129# add to subdir-y, and add descend rules 132# add to subdir-y, and add descend rules
130 @cat $(TOPDIR)/packages | grep -v '^#' | \ 133 @cat $(TOPDIR)/packages | grep -v '^#' | \
131 awk '{print \ 134 awk '{print \
132 ".PHONY : " $$2 "\n" \ 135 ".PHONY : " $$2 "\n" \
133 "subdir-$$(" $$1 ") += " $$2 "\n\n"; \ 136 "subdir-$$(" $$1 ") += " $$2 "\n\n"; \
134 print $$2 " : " $$2 "/Makefile\n\t+$$(call descend,$$@,$(filter-out $$@,$$(filter-out $$@,$$(MAKECMDGOALS))))\n"; }' > $(TOPDIR)/.depends 137 print $$2 " : " $$2 "/Makefile\n\t+$$(call descend,$$@,$(filter-out $$@,$$(filter-out $$@,$$(MAKECMDGOALS))))\n"; }' > $(TOPDIR)/.depends
135 cat $(TOPDIR)/packages | grep -v '^#' | \ 138 cat $(TOPDIR)/packages | grep -v '^#' | \
136 perl -ne '($$cfg, $$dir, $$pro) = $$_ =~ /^(\S+)\s+(\S+)\s+(\S+)/; if ( -e "$$dir/$$pro" ) { print "$$dir/Makefile : $$dir/$$pro \$$(QMAKE) \$$(OPIEDIR)/gen.pro \$$(OPIEDIR)/.config\n\t\$$(call makefilegen,\$$@)\n\n"; }' \ 139 perl -ne '($$cfg, $$dir, $$pro) = $$_ =~ /^(\S+)\s+(\S+)\s+(\S+)/; if ( -e "$$dir/$$pro" ) { print "$$dir/Makefile : $$dir/$$pro \$$(QMAKE) \$$(OPIEDIR)/gen.pro \$$(OPIEDIR)/.config\n\t\$$(call makefilegen,\$$@)\n\n"; }' \
137 >> $(TOPDIR)/.depends 140 >> $(TOPDIR)/.depends
138# interpackage dependency generation 141# interpackage dependency generation
139 @cat $(TOPDIR)/packages | \ 142 @cat $(TOPDIR)/packages | \
140 $(TOPDIR)/scripts/deps.pl >> $(TOPDIR)/.depends 143 $(TOPDIR)/scripts/deps.pl >> $(TOPDIR)/.depends
141 144
142$(TOPDIR)/.depends.cfgs: 145$(TOPDIR)/.depends.cfgs:
143# config.in interdependencies 146# config.in interdependencies
144 @echo $(configs) | sed -e 's,/config.in,,g' | ( for i in `cat`; do echo $$i; done ) > dirs 147 @echo $(configs) | sed -e 's,/config.in,,g' | ( for i in `cat`; do echo $$i; done ) > dirs
145 @cat dirs | ( for i in `cat`; do if [ "`cat dirs|grep $$i 2>/dev/null|wc -l`" -ne "1" ]; then deps=`cat dirs|grep $$i| grep -v "^$$i$$"|for i in \`cat|sed -e's,^$(TOPDIR)/,$$(TOPDIR)/,g'\`; do echo $$i/config.in; done`; echo `echo $$i/config.in|sed -e 's,^$(TOPDIR)/,$$(TOPDIR)/,'` : $$deps; fi; done ) >> $@ 148 @cat dirs | ( for i in `cat`; do if [ "`cat dirs|grep $$i 2>/dev/null|wc -l`" -ne "1" ]; then deps=`cat dirs|grep $$i| grep -v "^$$i$$"|for i in \`cat|sed -e's,^$(TOPDIR)/,$$(TOPDIR)/,g'\`; do echo $$i/config.in; done`; echo `echo $$i/config.in|sed -e 's,^$(TOPDIR)/,$$(TOPDIR)/,'` : $$deps; fi; done ) >> $@
146 @-rm -f dirs 149 @-rm -f dirs
147 150
148$(QTDIR)/stamp-headers : 151$(QTDIR)/stamp-headers :
149 @-rm -f $(QTDIR)/stamp-headers* 152 @-rm -f $(QTDIR)/stamp-headers*
150 ( cd $(QTDIR)/include; \ 153 ( cd $(QTDIR)/include; \
151 $(patsubst %,ln -sf ../src/kernel/%;,qgfx_qws.h qwsmouse_qws.h \ 154 $(patsubst %,ln -sf ../src/kernel/%;,qgfx_qws.h qwsmouse_qws.h \
152 qcopchannel_qws.h qwindowsystem_qws.h \ 155 qcopchannel_qws.h qwindowsystem_qws.h \
153 qfontmanager_qws.h qwsdefaultdecoration_qws.h)) 156 qfontmanager_qws.h qwsdefaultdecoration_qws.h))
154 touch $@ 157 touch $@
155 158
156$(QTDIR)/stamp-headers-x11 : 159$(QTDIR)/stamp-headers-x11 :
157 @-rm -f $(QTDIR)/stamp-headers* 160 @-rm -f $(QTDIR)/stamp-headers*
158 cd $(QTDIR)/include; $(patsubst %,ln -sf $(OPIEDIR)/x11/libqpe-x11/qt/%;,qgfx_qws.h qwsmouse_qws.h qcopchannel_qws.h qwindowsystem_qws.h qfontmanager_qws.h qwsdefaultdecoration_qws.h) 161 cd $(QTDIR)/include; $(patsubst %,ln -sf $(OPIEDIR)/x11/libqpe-x11/qt/%;,qgfx_qws.h qwsmouse_qws.h qcopchannel_qws.h qwindowsystem_qws.h qfontmanager_qws.h qwsdefaultdecoration_qws.h)
159 touch $@ 162 touch $@
160 163
161$(OPIEDIR)/stamp-headers : 164$(OPIEDIR)/stamp-headers :
162 @-rm -f $(OPIEDIR)/stamp-headers* 165 @-rm -f $(OPIEDIR)/stamp-headers*
163 mkdir -p $(TOPDIR)/include/qpe \ 166 mkdir -p $(TOPDIR)/include/qpe \
164 $(TOPDIR)/include/qtopia \ 167 $(TOPDIR)/include/qtopia \
165 $(TOPDIR)/include/opie \ 168 $(TOPDIR)/include/opie \
166 $(TOPDIR)/include/opie2 \ 169 $(TOPDIR)/include/opie2 \
167 $(TOPDIR)/include/opie2/private \ 170 $(TOPDIR)/include/opie2/private \
168 $(TOPDIR)/include/qtopia/private \ 171 $(TOPDIR)/include/qtopia/private \
169 $(TOPDIR)/include/sl 172 $(TOPDIR)/include/sl
170 ( cd include/qpe && rm -f *.h; ln -sf ../../library/*.h .; ln -sf ../../library/backend/*.h .; rm -f *_p.h; ) 173 ( cd include/qpe && rm -f *.h; ln -sf ../../library/*.h .; ln -sf ../../library/backend/*.h .; rm -f *_p.h; )
171 ( cd include/qtopia && rm -f *.h; ln -sf ../../library/*.h .; ) 174 ( cd include/qtopia && rm -f *.h; ln -sf ../../library/*.h .; )
172 ( cd include/qtopia/private && rm -f *.h; ln -sf ../../../library/backend/*.h .; ) 175 ( cd include/qtopia/private && rm -f *.h; ln -sf ../../../library/backend/*.h .; )
173 # libopie2 176 # libopie2
174 ( cd include/opie2 && ln -sf ../../libopie2/opiecore/*.h .; ) 177 ( cd include/opie2 && ln -sf ../../libopie2/opiecore/*.h .; )
175 ( cd include/opie2 && ln -sf ../../libopie2/opiecore/device/*.h .; ) 178 ( cd include/opie2 && ln -sf ../../libopie2/opiecore/device/*.h .; )
176 ( cd include/opie2 && ln -sf ../../libopie2/opiemm/*.h .; ) 179 ( cd include/opie2 && ln -sf ../../libopie2/opiemm/*.h .; )
177 ( cd include/opie2 && ln -sf ../../libopie2/opiedb/*.h .; ) 180 ( cd include/opie2 && ln -sf ../../libopie2/opiedb/*.h .; )
178 ( cd include/opie2 && ln -sf ../../libopie2/opienet/*.h .; ) 181 ( cd include/opie2 && ln -sf ../../libopie2/opienet/*.h .; )
179 ( cd include/opie2 && ln -sf ../../libopie2/opiepim/*.h .; ) 182 ( cd include/opie2 && ln -sf ../../libopie2/opiepim/*.h .; )
180 ( cd include/opie2 && ln -sf ../../libopie2/opiepim/core/*.h .; ) 183 ( cd include/opie2 && ln -sf ../../libopie2/opiepim/core/*.h .; )
181 ( cd include/opie2 && ln -sf ../../libopie2/opiepim/backend/*.h .; ) 184 ( cd include/opie2 && ln -sf ../../libopie2/opiepim/backend/*.h .; )
182 ( cd include/opie2/private && ln -sf ../../../libopie2/opiepim/private/*.h .; ) 185 ( cd include/opie2/private && ln -sf ../../../libopie2/opiepim/private/*.h .; )
183 ( cd include/opie2 && ln -sf ../../libopie2/opiepim/ui/*.h .; ) 186 ( cd include/opie2 && ln -sf ../../libopie2/opiepim/ui/*.h .; )
184 ( cd include/opie2 && ln -sf ../../libopie2/opieui/*.h .; ) 187 ( cd include/opie2 && ln -sf ../../libopie2/opieui/*.h .; )
185 ( cd include/opie2 && ln -sf ../../libopie2/opieui/fileselector/*.h .; ) 188 ( cd include/opie2 && ln -sf ../../libopie2/opieui/fileselector/*.h .; )
186 ( cd include/opie2 && ln -sf ../../libopie2/opieui/big-screen/*.h .; ) 189 ( cd include/opie2 && ln -sf ../../libopie2/opieui/big-screen/*.h .; )
187 ( cd include/opie2 && ln -sf ../../libopie2/opiesecurity/*.h .; ) 190 ( cd include/opie2 && ln -sf ../../libopie2/opiesecurity/*.h .; )
188 # auxilliary libraries 191 # auxilliary libraries
189 ( cd include/opie2 && ln -sf ../../libqtaux/*.h .; ) 192 ( cd include/opie2 && ln -sf ../../libqtaux/*.h .; )
190 ( cd include/sl && ln -sf ../../libslcompat/*.h .; ) 193 ( cd include/sl && ln -sf ../../libslcompat/*.h .; )
191 ( cd include/ && ln -sf ../noncore/net/ftplib/*.h .; ) 194 ( cd include/ && ln -sf ../noncore/net/ftplib/*.h .; )
192 ( cd include/ && ln -sf ../inputmethods/pickboard/pickboardcfg.h .; ) 195 ( cd include/ && ln -sf ../inputmethods/pickboard/pickboardcfg.h .; )
193 ( cd include/ && ln -sf ../inputmethods/pickboard/pickboardpicks.h .; ) 196 ( cd include/ && ln -sf ../inputmethods/pickboard/pickboardpicks.h .; )
194 # all 197 # all
195 ( cd include/opie2; for generatedHeader in `cd ../../libopie2/opieui; ls *.ui | sed -e "s,\.ui,\.h,g"`; do \ 198 ( cd include/opie2; for generatedHeader in `cd ../../libopie2/opieui; ls *.ui | sed -e "s,\.ui,\.h,g"`; do \
196 ln -sf ../../libopie2/opieui/$$generatedHeader $$generatedHeader; done ) 199 ln -sf ../../libopie2/opieui/$$generatedHeader $$generatedHeader; done )
197 ( cd include/opie2; for generatedHeader in `cd ../../libopie2/opiepim/ui; ls *.ui | sed -e "s,\.ui,\.h,g"`; do \ 200 ( cd include/opie2; for generatedHeader in `cd ../../libopie2/opiepim/ui; ls *.ui | sed -e "s,\.ui,\.h,g"`; do \
198 ln -sf ../../libopie2/opiepim/ui/$$generatedHeader $$generatedHeader; done ) 201 ln -sf ../../libopie2/opiepim/ui/$$generatedHeader $$generatedHeader; done )
199 ln -sf ../../library/custom.h $(TOPDIR)/include/qpe/custom.h 202 ln -sf ../../library/custom.h $(TOPDIR)/include/qpe/custom.h
200 touch $@ 203 touch $@
201 204
202$(OPIEDIR)/stamp-headers-x11 : 205$(OPIEDIR)/stamp-headers-x11 :
203 @-rm -f $(OPIEDIR)/stamp-headers* 206 @-rm -f $(OPIEDIR)/stamp-headers*
204 mkdir -p $(TOPDIR)/include/qpe $(TOPDIR)/include/qtopia \ 207 mkdir -p $(TOPDIR)/include/qpe $(TOPDIR)/include/qtopia \
205 $(TOPDIR)/include/opie $(TOPDIR)/include/qtopia/private 208 $(TOPDIR)/include/opie $(TOPDIR)/include/qtopia/private
206 ( cd include/qpe && rm -f *.h; ln -sf ../../library/*.h .; ln -sf ../../library/backend/*.h .; rm -f *_p.h; ) 209 ( cd include/qpe && rm -f *.h; ln -sf ../../library/*.h .; ln -sf ../../library/backend/*.h .; rm -f *_p.h; )
207 ( cd include/qtopia && rm -f *.h; ln -sf ../../library/*.h .; ) 210 ( cd include/qtopia && rm -f *.h; ln -sf ../../library/*.h .; )
208 ( cd include/qtopia/private && rm -f *.h; ln -sf ../../../library/backend/*.h .; ) 211 ( cd include/qtopia/private && rm -f *.h; ln -sf ../../../library/backend/*.h .; )
209 ( cd include/opie && rm -f *.h; ln -sf ../../libopie/*.h .; rm -f *_p.h; ) 212 ( cd include/opie && rm -f *.h; ln -sf ../../libopie/*.h .; rm -f *_p.h; )
210 ( cd include/opie && ln -sf ../../libsql/*.h .; ) 213 ( cd include/opie && ln -sf ../../libsql/*.h .; )
211 ( cd include/opie && ln -sf ../../libopie/pim/*.h .; ) 214 ( cd include/opie && ln -sf ../../libopie/pim/*.h .; )
212 ( cd include/opie; for generatedHeader in `cd ../../libopie; ls *.ui | sed -e "s,\.ui,\.h,g"`; do \ 215 ( cd include/opie; for generatedHeader in `cd ../../libopie; ls *.ui | sed -e "s,\.ui,\.h,g"`; do \
213 ln -sf ../../libopie/$$generatedHeader $$generatedHeader; done ) 216 ln -sf ../../libopie/$$generatedHeader $$generatedHeader; done )
214 ln -sf ../../library/custom.h $(TOPDIR)/include/qpe/custom.h 217 ln -sf ../../library/custom.h $(TOPDIR)/include/qpe/custom.h
215 ( cd include/qpe; ln -sf ../../x11/libqpe-x11/qpe/*.h .; ) 218 ( cd include/qpe; ln -sf ../../x11/libqpe-x11/qpe/*.h .; )
216 touch $@ 219 touch $@
217 220
218$(TOPDIR)/library/custom.h : $(TOPDIR)/.config 221$(TOPDIR)/library/custom.h : $(TOPDIR)/.config
219 @-rm -f $@ 222 @-rm -f $@
220 @$(if $(patsubst "%",%,$(CONFIG_CUSTOMFILE)),\ 223 @$(if $(patsubst "%",%,$(CONFIG_CUSTOMFILE)),\
221 ln -sf $(patsubst "%",%,$(CONFIG_CUSTOMFILE)) $@) 224 ln -sf $(patsubst "%",%,$(CONFIG_CUSTOMFILE)) $@)
222 @touch $@ 225 @touch $@
223 226
224$(TOPDIR)/scripts/lxdialog/lxdialog $(TOPDIR)/scripts/kconfig/mconf $(TOPDIR)/scripts/kconfig/conf $(TOPDIR)/scripts/kconfig/qconf $(TOPDIR)/scripts/kconfig/libkconfig.so $(TOPDIR)/scripts/kconfig/gconf $(TOPDIR)/qmake/qmake: 227$(TOPDIR)/scripts/lxdialog/lxdialog $(TOPDIR)/scripts/kconfig/mconf $(TOPDIR)/scripts/kconfig/conf $(TOPDIR)/scripts/kconfig/qconf $(TOPDIR)/scripts/kconfig/libkconfig.so $(TOPDIR)/scripts/kconfig/gconf $(TOPDIR)/qmake/qmake:
225 +$(call descend,$(shell dirname $@),$(shell basename $@)) 228 +$(call descend,$(shell dirname $@),$(shell basename $@))
226 229
227menuconfig: $(TOPDIR)/scripts/lxdialog/lxdialog $(TOPDIR)/scripts/kconfig/mconf ./config.in 230menuconfig: $(TOPDIR)/scripts/lxdialog/lxdialog $(TOPDIR)/scripts/kconfig/mconf ./config.in
228 $(TOPDIR)/scripts/kconfig/mconf ./config.in 231 $(TOPDIR)/scripts/kconfig/mconf ./config.in
229 @touch ./.config.stamp 232 @touch ./.config.stamp
230 233
231xconfig: $(TOPDIR)/scripts/kconfig/qconf $(TOPDIR)/scripts/kconfig/libkconfig.so ./config.in 234xconfig: $(TOPDIR)/scripts/kconfig/qconf $(TOPDIR)/scripts/kconfig/libkconfig.so ./config.in
232 $(TOPDIR)/scripts/kconfig/qconf ./config.in 235 $(TOPDIR)/scripts/kconfig/qconf ./config.in
233 @touch .config.stamp 236 @touch .config.stamp
234 237
235gconfig: $(TOPDIR)/scripts/kconfig/gconf $(TOPDIR)/scripts/kconfig/libkconfig.so ./config.in 238gconfig: $(TOPDIR)/scripts/kconfig/gconf $(TOPDIR)/scripts/kconfig/libkconfig.so ./config.in
236 $(TOPDIR)/scripts/kconfig/gconf ./config.in 239 $(TOPDIR)/scripts/kconfig/gconf ./config.in
237 @touch .config.stamp 240 @touch .config.stamp
238 241
239config: $(TOPDIR)/scripts/kconfig/conf ./config.in 242config: $(TOPDIR)/scripts/kconfig/conf ./config.in
240 $(TOPDIR)/scripts/kconfig/conf ./config.in 243 $(TOPDIR)/scripts/kconfig/conf ./config.in
241 @touch .config.stamp 244 @touch .config.stamp
242 245
243oldconfig: $(TOPDIR)/scripts/kconfig/conf ./config.in 246oldconfig: $(TOPDIR)/scripts/kconfig/conf ./config.in
244 $(TOPDIR)/scripts/kconfig/conf -o ./config.in 247 $(TOPDIR)/scripts/kconfig/conf -o ./config.in
245 @touch .config.stamp 248 @touch .config.stamp
246 249
247randconfig: $(TOPDIR)/scripts/kconfig/conf ./config.in 250randconfig: $(TOPDIR)/scripts/kconfig/conf ./config.in
248 $(TOPDIR)/scripts/kconfig/conf -r ./config.in 251 $(TOPDIR)/scripts/kconfig/conf -r ./config.in
249 @touch .config.stamp 252 @touch .config.stamp
250 253
251allyesconfig: $(TOPDIR)/scripts/kconfig/conf ./config.in 254allyesconfig: $(TOPDIR)/scripts/kconfig/conf ./config.in
252 $(TOPDIR)/scripts/kconfig/conf -y ./config.in 255 $(TOPDIR)/scripts/kconfig/conf -y ./config.in
253 @touch .config.stamp 256 @touch .config.stamp
254 257
255allnoconfig: $(TOPDIR)/scripts/kconfig/conf ./config.in 258allnoconfig: $(TOPDIR)/scripts/kconfig/conf ./config.in
256 $(TOPDIR)/scripts/kconfig/conf -n ./config.in 259 $(TOPDIR)/scripts/kconfig/conf -n ./config.in
257 @touch .config.stamp 260 @touch .config.stamp
258 261
259defconfig: $(TOPDIR)/scripts/kconfig/conf ./config.in 262defconfig: $(TOPDIR)/scripts/kconfig/conf ./config.in
260 $(TOPDIR)/scripts/kconfig/conf -d ./config.in 263 $(TOPDIR)/scripts/kconfig/conf -d ./config.in
261 @touch .config.stamp 264 @touch .config.stamp
262 265
263$(TOPDIR)/qmake/qmake : $(TOPDIR)/mkspecs/default 266$(TOPDIR)/qmake/qmake : $(TOPDIR)/mkspecs/default
264 267
265$(TOPDIR)/mkspecs/default : 268$(TOPDIR)/mkspecs/default :
266 ln -sf linux-g++ $@ 269 ln -sf linux-g++ $@
267 270
268$(TOPDIR)/scripts/subst : force 271$(TOPDIR)/scripts/subst : force
269 @( \ 272 @( \
270 echo 's,\$$QPE_VERSION,$(QPE_VERSION),g'; \ 273 echo 's,\$$QPE_VERSION,$(QPE_VERSION),g'; \
271 echo 's,\$$OPIE_VERSION,$(OPIE_VERSION),g'; \ 274 echo 's,\$$OPIE_VERSION,$(OPIE_VERSION),g'; \
272 echo 's,\$$QTE_VERSION,$(QTE_VERSION),g'; \ 275 echo 's,\$$QTE_VERSION,$(QTE_VERSION),g'; \
273 echo 's,\$$QTE_REVISION,$(QTE_REVISION),g'; \ 276 echo 's,\$$QTE_REVISION,$(QTE_REVISION),g'; \
274 echo 's,\$$SUB_VERSION,$(SUB_VERSION),g'; \ 277 echo 's,\$$SUB_VERSION,$(SUB_VERSION),g'; \
275 echo 's,\$$EXTRAVERSION,$(EXTRAVERSION),g'; \ 278 echo 's,\$$EXTRAVERSION,$(EXTRAVERSION),g'; \
276 echo 's,\$$QTE_BASEVERSION,$(QTE_BASEVERSION),g'; \ 279 echo 's,\$$QTE_BASEVERSION,$(QTE_BASEVERSION),g'; \
277 ) > $@ || ( rm -f $@; exit 1 ) 280 ) > $@ || ( rm -f $@; exit 1 )
278 281
279$(TOPDIR)/scripts/filesubst : force 282$(TOPDIR)/scripts/filesubst : force
280 @( \ 283 @( \
281 echo 's,\$$OPIEDIR/root/,/,g'; \ 284 echo 's,\$$OPIEDIR/root/,/,g'; \
282 echo 's,$(OPIEDIR)/root/,/,g'; \ 285 echo 's,$(OPIEDIR)/root/,/,g'; \
283 echo 's,\$$OPIEDIR,$(prefix),g'; \ 286 echo 's,\$$OPIEDIR,$(prefix),g'; \
284 echo 's,$(OPIEDIR),$(prefix),g'; \ 287 echo 's,$(OPIEDIR),$(prefix),g'; \
285 echo 's,\$$QTDIR,$(prefix),g'; \ 288 echo 's,\$$QTDIR,$(prefix),g'; \
286 echo 's,$(QTDIR),$(prefix),g'; \ 289 echo 's,$(QTDIR),$(prefix),g'; \
287 echo 's,^\(\./\)*root/,/,g'; \ 290 echo 's,^\(\./\)*root/,/,g'; \
288 echo 's,^\(\./\)*etc/,$(prefix)/etc/,g'; \ 291 echo 's,^\(\./\)*etc/,$(prefix)/etc/,g'; \
289 echo 's,^\(\./\)*lib/,$(prefix)/lib/,g'; \ 292 echo 's,^\(\./\)*lib/,$(prefix)/lib/,g'; \
290 echo 's,^\(\./\)*bin/,$(prefix)/bin/,g'; \ 293 echo 's,^\(\./\)*bin/,$(prefix)/bin/,g'; \
291 echo 's,^\(\./\)*pics/,$(prefix)/pics/,g'; \ 294 echo 's,^\(\./\)*pics/,$(prefix)/pics/,g'; \
292 echo 's,^\(\./\)*sounds/,$(prefix)/sounds/,g'; \ 295 echo 's,^\(\./\)*sounds/,$(prefix)/sounds/,g'; \
293 echo 's,^\(\./\)*i18n/,$(prefix)/i18n/,g'; \ 296 echo 's,^\(\./\)*i18n/,$(prefix)/i18n/,g'; \
294 echo 's,^\(\./\)*plugins/,$(prefix)/plugins/,g'; \ 297 echo 's,^\(\./\)*plugins/,$(prefix)/plugins/,g'; \
295 echo 's,^\(\./\)*apps/,$(prefix)/apps/,g'; \ 298 echo 's,^\(\./\)*apps/,$(prefix)/apps/,g'; \
296 echo 's,^\(\./\)*share/,$(prefix)/share/,g'; \ 299 echo 's,^\(\./\)*share/,$(prefix)/share/,g'; \
297 echo 's,^\(\./\)*i18n/,$(prefix)/i18n/,g'; \ 300 echo 's,^\(\./\)*i18n/,$(prefix)/i18n/,g'; \
298 echo 's,^\(\./\)*help/,$(prefix)/help/,g'; \ 301 echo 's,^\(\./\)*help/,$(prefix)/help/,g'; \
299 ) > $@ || ( rm -f $@; exit 1 ) 302 ) > $@ || ( rm -f $@; exit 1 )
300 303
301## general rules ## 304## general rules ##
302 305
303define descend 306define descend
304 $(MAKE) $(if $(QMAKE),QMAKE=$(QMAKE)) -C $(1) $(2) 307 $(MAKE) $(if $(QMAKE),QMAKE=$(QMAKE)) -C $(1) $(2)
305endef 308endef
306 309
307define makefilegen 310define makefilegen
308 cd $(if $(1),$(dir $(1))); $(TOPDIR)/qmake/qmake $(3) -o $(if $(1),$(notdir $(1))) $(word 3,$(shell grep "[[:space:]]$(patsubst %/Makefile,%,$(1))[[:space:]]" $(OPIEDIR)/packages)) 311 cd $(if $(1),$(dir $(1))); $(TOPDIR)/qmake/qmake $(3) -o $(if $(1),$(notdir $(1))) $(word 3,$(shell grep "[[:space:]]$(patsubst %/Makefile,%,$(1))[[:space:]]" $(OPIEDIR)/packages))
309endef 312endef
310 313
311define makecfg 314define makecfg
312 $(TOPDIR)/scripts/makecfg.pl $1 $(OPIEDIR) 315 $(TOPDIR)/scripts/makecfg.pl $1 $(OPIEDIR)
313endef 316endef
diff --git a/config.in b/config.in
index e9ffed2..228e682 100644
--- a/config.in
+++ b/config.in
@@ -1,280 +1,284 @@
1mainmenu "Opie Configuration" 1mainmenu "Opie Configuration"
2 2
3menu "Build Parameters" 3menu "Build Parameters"
4 4
5choice 5choice
6 prompt "Target Machine" 6 prompt "Target Machine"
7 default TARGET_X86 7 default TARGET_X86
8 help 8 help
9 Please select the architecture of the machine you will be 9 Please select the architecture of the machine you will be
10 building the OpenZaurus buildroot for. 10 building the OpenZaurus buildroot for.
11 11
12 config TARGET_X86 12 config TARGET_X86
13 boolean "Intel X86" 13 boolean "Intel X86"
14 14
15 config TARGET_MACOSX 15 config TARGET_MACOSX
16 boolean "Mac OS X (DARWIN)" 16 boolean "Mac OS X (DARWIN)"
17 17
18 config TARGET_SHARP 18 config TARGET_SHARP
19 boolean "Sharp Zaurus w/ SA1100 (5000 and 5500)" 19 boolean "Sharp Zaurus w/ SA1100 (5000 and 5500)"
20 20
21 config TARGET_C700 21 config TARGET_C700
22 boolean "Sharp Zaurus w/ PXA25x (5600, C7x0, C8x0)" 22 boolean "Sharp Zaurus w/ PXA25x (5600, C7x0, C8x0)"
23 23
24 config TARGET_OE 24 config TARGET_OE
25 boolean "OpenEmbedded w/ OE build dir set below" 25 boolean "OpenEmbedded w/ OE build dir set below"
26 26
27 config TARGET_IPAQ 27 config TARGET_IPAQ
28 boolean "iPAQ" 28 boolean "iPAQ"
29 29
30 config TARGET_RAMSES 30 config TARGET_RAMSES
31 boolean "Ramses" 31 boolean "Ramses"
32 32
33 config TARGET_SIMPAD 33 config TARGET_SIMPAD
34 boolean "SIMpad" 34 boolean "SIMpad"
35 35
36 config TARGET_YOPY 36 config TARGET_YOPY
37 boolean "Yopy 3500/3700" 37 boolean "Yopy 3500/3700"
38endchoice 38endchoice
39 39
40config OE_BUILD_DIR 40config OE_BUILD_DIR
41 depends TARGET_OE 41 depends TARGET_OE
42 string "OE build directory" 42 string "OE build directory"
43 default ">>>set OpenEmbedded build directory here<<<" 43 default ">>>set OpenEmbedded build directory here<<<"
44 44
45config OE_HOST_SYS 45config OE_HOST_SYS
46 depends TARGET_OE 46 depends TARGET_OE
47 string "OE host system" 47 string "OE host system"
48 default "i686-linux" 48 default "i686-linux"
49 49
50config OE_TARGET_SYS 50config OE_TARGET_SYS
51 depends TARGET_OE 51 depends TARGET_OE
52 string "OE target system" 52 string "OE target system"
53 default "arm-linux" 53 default "arm-linux"
54 54
55config OPTIMIZE 55config OPTIMIZE
56 boolean "Use optimizations" 56 boolean "Use optimizations"
57 default "y" if ! TARGET_X86 57 default "y" if ! TARGET_X86
58 58
59config THREADED 59config THREADED
60 boolean "Enable threaded build" 60 boolean "Enable threaded build"
61 default "n" 61 default "n"
62 62
63config STATIC 63config STATIC
64 boolean "Build static libraries" 64 boolean "Build static libraries"
65 default "n" 65 default "n"
66 66
67config DEBUG 67config DEBUG
68 boolean "Enable debug builds" 68 boolean "Enable debug builds"
69 default n 69 default n
70 70
71config RELEASE 71config RELEASE
72 bool 72 bool
73 default y 73 default y
74 depends !DEBUG 74 depends !DEBUG
75 75
76config QUICK_LAUNCH 76config QUICK_LAUNCH
77 boolean "Enable Quick Launch" 77 boolean "Enable Quick Launch"
78 default n if TARGET_X86 78 default n if TARGET_X86
79 default y if ! TARGET_X86 79 default y if ! TARGET_X86
80 80
81config QUICKLAUNCH_PATH 81config QUICKLAUNCH_PATH
82 string "Path to quicklauncher" 82 string "Path to quicklauncher"
83 default "./quicklauncher" if TARGET_X86 83 default "./quicklauncher" if TARGET_X86
84 default "/opt/QtPalmtop/bin/quicklauncher" if ! TARGET_X86 84 default "/opt/QtPalmtop/bin/quicklauncher" if ! TARGET_X86
85 85
86config SPECFILE 86config SPECFILE
87 string 87 string
88 default "qws/linux-generic-g++" if TARGET_X86 && (! X11) 88 default "qws/linux-generic-g++" if TARGET_X86 && (! X11)
89 default "linux-g++" if TARGET_X86 && X11 89 default "linux-g++" if TARGET_X86 && X11
90 default "qws/linux-sharp-g++" if TARGET_SHARP && (! X11) 90 default "qws/linux-sharp-g++" if TARGET_SHARP && (! X11)
91 default "linux-g++" if TARGET_SHARP && X11 91 default "linux-g++" if TARGET_SHARP && X11
92 default "qws/linux-ipaq-g++" if TARGET_IPAQ && (! X11) 92 default "qws/linux-ipaq-g++" if TARGET_IPAQ && (! X11)
93 default "linux-g++" if TARGET_IPAQ && X11 93 default "linux-g++" if TARGET_IPAQ && X11
94 default "qws/linux-ramses-g++" if TARGET_RAMSES && (! X11) 94 default "qws/linux-ramses-g++" if TARGET_RAMSES && (! X11)
95 default "linux-g++" if TARGET_RAMSES && X11 95 default "linux-g++" if TARGET_RAMSES && X11
96 default "qws/linux-simpad-g++" if TARGET_SIMPAD && (! X11) 96 default "qws/linux-simpad-g++" if TARGET_SIMPAD && (! X11)
97 default "linux-g++" if TARGET_SIMPAD && X11 97 default "linux-g++" if TARGET_SIMPAD && X11
98 default "qws/linux-yopy-g++" if TARGET_YOPY && (! X11) 98 default "qws/linux-yopy-g++" if TARGET_YOPY && (! X11)
99 default "qws/macx-generic-g++" if TARGET_MACOSX && (! X11) 99 default "qws/macx-generic-g++" if TARGET_MACOSX && (! X11)
100 default "qws/linux-oe-g++" if TARGET_OE && (!X11) 100 default "qws/linux-oe-g++" if TARGET_OE && (!X11)
101 101
102config CUSTOMFILE 102config CUSTOMFILE
103 string 103 string
104 default "custom-ipaq.h" if TARGET_IPAQ 104 default "custom-ipaq.h" if TARGET_IPAQ
105 default "custom-sharp.h" if TARGET_SHARP 105 default "custom-sharp.h" if TARGET_SHARP
106 default "custom-ramses.h" if TARGET_RAMSES 106 default "custom-ramses.h" if TARGET_RAMSES
107 default "custom-ipaq.h" if TARGET_SIMPAD 107 default "custom-ipaq.h" if TARGET_SIMPAD
108 default "custom-yopy.h" if TARGET_YOPY 108 default "custom-yopy.h" if TARGET_YOPY
109 109
110config OPTIMIZATIONS 110config 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
120config EXPERIMENTAL 120config 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
124config USE_CCACHE 124config USE_CCACHE
125 bool "Use ccache, if available?" 125 bool "Use ccache, if available?"
126 default y 126 default y
127 127
128endmenu 128endmenu
129 129
130menu "Configuration" 130menu "Configuration"
131config OPIE_NO_BUILTIN_SHUTDOWN 131config 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
135config OPIE_NO_BUILTIN_CALIBRATE 135config 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
140config OPIE_SOUND_FRAGMENT_SHIFT 140config 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
145config USE_REALTIME_AUDIO_THREAD 145config 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
150config QT_QWS_ALLOW_OVERCLOCK 150config 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
155config USE_FILE_NOTIFICATION 155config 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
159config OPIE_NEW_ALLOC 159config 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
164config OPIE_TASKBAR_LOCK_KEY_STATE 164config 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
169config LIBQPE_WITHROHFEEDBACK 169config 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
173config LIBQPE_NO_INLINE_IMAGES
174 boolean "Build libqpe without inline images"
175 default y
176
173config OPIE_NO_SOUND_PCM_READ_BITS 177config 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
177endmenu 181endmenu
178 182
179menu "Dependencies" 183menu "Dependencies"
180 source dependencies.in 184 source dependencies.in
181endmenu 185endmenu
182 186
183menu "Base" 187menu "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
198endmenu 202endmenu
199 203
200comment "" 204comment ""
201 205
202menu "Applets" 206menu "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
205endmenu 209endmenu
206 210
207menu "Apps" 211menu "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
210endmenu 214endmenu
211 215
212menu "Communications and Networking" 216menu "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
215endmenu 219endmenu
216 220
217menu "Games" 221menu "Games"
218 source noncore/games/config.in 222 source noncore/games/config.in
219endmenu 223endmenu
220 224
221menu "Graphics and Multimedia" 225menu "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
226endmenu 230endmenu
227 231
228menu "Input methods" 232menu "Input methods"
229 source inputmethods/config.in 233 source inputmethods/config.in
230endmenu 234endmenu
231 235
232menu "Pim" 236menu "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
237 source core/pim/today/plugins/config.in 241 source core/pim/today/plugins/config.in
238endmenu 242endmenu
239 243
240menu "Settings" 244menu "Settings"
241 source core/settings/config.in 245 source core/settings/config.in
242 source noncore/settings/config.in 246 source noncore/settings/config.in
243 source noncore/securityplugins/config.in 247 source noncore/securityplugins/config.in
244endmenu 248endmenu
245 249
246menu "Theming" 250menu "Theming"
247 comment "Decorations ---" 251 comment "Decorations ---"
248 source noncore/decorations/config.in 252 source noncore/decorations/config.in
249 comment "Styles ---" 253 comment "Styles ---"
250 source noncore/styles/config.in 254 source noncore/styles/config.in
251endmenu 255endmenu
252 256
253menu "Tools" 257menu "Tools"
254 source noncore/tools/config.in 258 source noncore/tools/config.in
255endmenu 259endmenu
256 260
257menu "Development" 261menu "Development"
258 source development/keyview/config.in 262 source development/keyview/config.in
259 #source development/debugviewer/config.in 263 #source development/debugviewer/config.in
260endmenu 264endmenu
261 265
262menu "Examples" 266menu "Examples"
263 config EXAMPLES 267 config EXAMPLES
264 boolean "Compile Example Application" 268 boolean "Compile Example Application"
265 source examples/config.in 269 source examples/config.in
266endmenu 270endmenu
267 271
268comment "" 272comment ""
269 273
270menu "Unsupported / Unmaintained" 274menu "Unsupported / Unmaintained"
271 source noncore/unsupported/config.in 275 source noncore/unsupported/config.in
272endmenu 276endmenu
273 277
274comment "" 278comment ""
275 depends on EXPERIMENTAL 279 depends on EXPERIMENTAL
276menu "Experimental" 280menu "Experimental"
277 depends on EXPERIMENTAL 281 depends on EXPERIMENTAL
278 source libslcompat/config.in 282 source libslcompat/config.in
279 source core/qws/config.in 283 source core/qws/config.in
280endmenu 284endmenu
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
32namespace { 33namespace {
33#include "inlinepics_p.h" 34#include "inlinepics_p.h"
34} 35}
36#endif
35 37
36static bool g_notUseSet = ::getenv("OVERWRITE_ICON_SET"); 38static 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>
63QPixmap Resource::loadPixmap( const QString &pix ) 65QPixmap 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*/
83QBitmap Resource::loadBitmap( const QString &pix ) 85QBitmap 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*/
96QString Resource::findPixmap( const QString &pix ) 98QString 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*/
140QString Resource::findSound( const QString &name ) 152QString 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*/
154QStringList Resource::allSounds() 166QStringList 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
164static QImage load_image(const QString &name) 176static 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*/
193QImage Resource::loadImage( const QString &name) 217QImage 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*/