8 files changed, 260 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog
index 185fd13..8806d99 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,356 +1,357 @@
        2005-??-??Opie 1.2.2
        
        
        New Features
        ------------
        * Appearance: Added configuration options to set smallIconSize, bigIconSize, useBigPixmaps (hrw, drw)
        * Opie-Notes: Notes application based on NoteZ (hrw)
        * OPIE-PackageManager: Added two configuration options: "Force recursive", "Verbose fetch" (hrw)
+        * Added hardware support for HTC Universal (ljp)
+        
        Fixed Bugs
        ----------
        * #1695 - Date selector use too small fontsize on VGA screen (hrw)
        * #1686 - opie-console lack UI setting for switching scrollbar (hrw)
        * #1647 - Opie-console doesn't respect scroll-bar on left side (hrw)
        * #1624 - Button settngs changes are applied only after restart (hrw)
        * #1492 - Backup and Restore does not show list of backups to restore on start (hrw)
        * n.a.  - remove hardcoded font size from wellenreiter (hrw)
        * n.a.  - added patch to build QT/E 2.3.10 with gcc 4.x.x (hrw)
        * n.a.  - make blue-pin UI resizable to looks good in any resolution (hrw)
        * n.a.  - fix a problem with vCard send to Sony Ericsson k600i (ar)
        * n.a.  - add a patch to build Qt/E 2.3.10 on amd64 with gcc 4.x.x (ar)
        * n.a.  - Opie-console fallback to FixedFont settings from qpe.conf in config (hrw)
        * n.a.  - Set version to 1.2.1 in About applet (hrw)
        * n.a.  - add firstusage and background pictures for 480x640 devices (mickeyl)
        Internal
        --------
        * libopiecore: /etc/oz_version renamed to /etc/openzaurus-version (hrw)
        * libopiecore: SL6000 (tosa) now uses corgi-bl (Dirk Opfer)
        
        2005-09-11Opie 1.2.1
        
        
        New Features
        ------------
        * OpieStumbler: Scans WiFi networks using the wireless extension scanning (skyhusker)
        * Opie-Reader: Support for document formats ArriereGo and Reb, add flite output (tim,pohly)
        * Opie-Networksettings: Add support for wlan-ng devices and improve WEP handling (Dirk Opfer)
        * Wellenreiter: Remove Joining networks - use OpieStumbler for that (mickeyl)
        * Opie-Mobilemsg has gone unsupported - it never really worked and there will be a replacement (mickeyl)
        * Opie-Tabmanager has gone unsupported - it barely works and there is not much of a use of it anyway (mickeyl)
        * Checkbook: Added configuration option to use smaller font for checkbook transaction tab (hrw)
        * ZSafe: Made UI conform to Opie standards (drw)
        * Today Addressbook plugin: Fixed configuration to show/not show birthdays, use checkboxes for selection (hrw)
        * Opie-Console: Read initial fixed font configuration from qpe.conf (mickeyl)
        * Opie-PcmciaApplet: Configure insert/resume actions and bind unsupported cards (mickeyl)
        * SysInfo: Remove CPU tab and add Devices tab instead (mickeyl)
        * Opie-smb: Added Opie front end for Samba (ljp)
        * Opie-Bluetooth: Replace obex send implementation and patch libopieobex and the bluetoothapplet (Michael Haynie)
        * Opieplayer: rudimentary podcast support (ljp)
        
        Fixed Bugs
        ----------
        * #1377 - Suspend Powermanagement when switched to another VT (mickeyl)
                - We actually suspend the complete Opie now in that case.
        * #1384 - Battery status updated improperly when charging (skyhusker)
        * #1476 - Wrong order of application entries in the O-menu (skyhusker)
        * #1514 - Remove usage of cardmon/pcmcia picture in applications. pcmcia is now an inline picture (mickeyl)
                * #1535- Missing line break and unnecessary location shown with Today-Calendar plugin (deller)
        * #1543 - Time Settings: "predict" tab is displayed twice after reopen (hrw)
        * #1546 - Battery applet popup is not always large enough to show jacket remaining info (skyhusker)
        * #1557 - Light&Power-Settings don't store warning intervall and warning levels (skyhusker)
        * #1565 - crash-fix in odevice.cpp while scanning the distribution table (deller)
        * #1614 - Make Opie-console start in $HOME instead of / (skyhusker)
        * #1635 - opie-today, datebook-plugin does not show notes (skyhusker)
        * #1665 - Opie-IRC displays the host prepended to the message when peer is using and ipv6 address (skyhusker)
                * #1666 - Opie-IRC does not allow to add !channels in config asautojoin ones (skyhusker)
        * #1667 - Opie-IRC does not show messages from !channel (skyhusker)
        * #1679 - Security PIN plugin is QVGA sized (hrw)
        * #1682 - Properly resize tab control in OTabWidget (drw)
        * n.a.  - always show volume and wireless applet popups inside visible screen (deller)
        * n.a.  - scale O-Menu-Applets appropriately (mickeyl)
        * n.a.  - libopienet: fix bugs in wireless scanning and setting SSID (skyhusker)
        * n.a.  - Wellenreiter: relax WE version matching test a bit (mickeyl)
        * n.a.  - scale BluezApplet appropriately and use larger icons (mickeyl)
        * n.a.  - memoryapplet: fix crash in memoryapplet on kernels without swap support (seneca cunningham)
        * n.a.  - networksettings: ignore hostap control interfaces wifi* (mickeyl)
        * n.a.  - Today Addressbook plugin fix configuration to show/not show birthdays, use checkboxes for selection (hrw)
        * n.a.  - remove hardcoded font size from netsystemtime (hrw)
        * n.a.  - remove hardcoded font size from checkbook graphs (hrw)
        * n.a.  - Dagger - fixes for Sword 1.5.8, morph tag x-refs, closing last tab crash (drw)
        
        Internal
        --------
        * Make BluezApplet use OTaskbarApplet (mickeyl)
        * libopiecore: rewrite OFileNotification to use the Linux 2.6 inotify interface (mickeyl)
        * libopiecore: add ODirNotification - recursive directory notifications (mickeyl)
        * libopienet: Skip hostap control interfaces 'wifi' and improve robustness in ONetworkInterface (mickeyl)
        * libopieui: Remove OVersatileView and OVersatileViewItem (mickeyl)
        * libopienet: Miscellaneous API cleanups (mickeyl)
        * libopiecore: Add linux pcmcia system abstraction classes (mickeyl)
        * libopiecore: ODevice now knows the default gfx driver to use (mteira,mickeyl)
        * libopiecore: Add support for the Sharp SL-C3100 "Borzoi" (mickeyl)
        * libopiecore: Add support for the new Linux Inputsystem Switches type [necessary for auto rotation in 2.6.13] (mickeyl)
        * Remove assumptions about default gfx driver ("Transformed") all over the place (mteira,mickeyl)
        * Fix / Optimize number of scanned directories (ljp)
        * Use five point mouse calibration to make calibrated mouse drivers work on newer Zaurii (rp,mickeyl)
        2005-03-25Opie 1.2.0
        Fixed Bugs
        ----------
        * #1613 - AdvancedFM - scale toolbar icons appropriately (drw)
        * #1620 - OFileSelector - show the button on press and not on press on hold (alwin)
        * #1473 - Opie-Eye - Same as #1620 but we lack a common FileSystem Button class (zecke)
        * n.a.  - PackageManager - fix bug where messages show up multiple times in install dialog (drw)
                * n.a.- make qpeglobal.h include qglobal.h (zecke)
        2005-03-20Opie 1.2.0-rc1
        New Features
        ------------
        * Launcher: Support a static background pixmap (mickeyl)
        * LauncherSettings: Choose whether to have a static background pixmap (mickeyl)
        * PackageManager supports the 'lists_dir' ipkg configuration option (drw)
        * Added hi-res inline images for large resolution devices (drw)
        * Improved launcher icons for consistency (ar)
        * Datebook: Added plugin system to datebook so holidays and birthdays from contacts may displayed in datebook (alwin)
        Fixed Bugs
        ----------
        * #1236 - VCards contained empty home and work address entries causing Palms to crash (eilers)
        * #1412 - Launcher Settings - fixed default settings for background in Edit tab dialog (drw)
        * #1472 - Opie textedit now check for unsaved changes on ESC key (ljp)
        * #1474 - Implement GUI for Scrollbars on the Left in Appearance (zecke)
        * #1482 - Fix double '/' in paths (zecke)
        * #1536 - Autosave of custom locations in opie backup (ar)
        * #1539 - Fixed displaying too long path in the delete dialog in opie-eye (zecke)
        * #1540 - Implemented deletion of DocLnks in opie-eye (zecke)
        * #1542 - Fixed Todo crash when priority < 1 or > 5 (drw)
        * #1550 - Browse for alarm sound start in QPEDIR/sounds/ (zecke)
        * #1554 - Fixed Opie-Console name in .desktop file (mickeyl)
        * #1556 - Start to look for sound files in /opt/QtPalmtop/sounds (zecke)
        * #1558 - Fixed opie-login breaking opie startup (mickeyl)
        * #1560 - Fixed Opie-Console picking up the wrong shell (bluelightning)
        * #1570 - Confirmation needed befor Restore a backup and overwrite local data (ar)
        * #1591 - Addressbook sortorder changed by clicking on column 0 (eilers)
        * #1599 - Security - change recommendation for opie-multiauth to opie-securityplugin (gints)
        * #1604 - Checkbook crashed on startup (drw)
        * #1608 - Addressbook crashed after search, which may caused by not initialzed member variable (eilers)
        * #1608 - QueryByExampe-Datediff on SQL database did not worked properly (eilers)
        * n.a.  - Netsystemtime - fixed UI to prevent error dialog from displaying when it shouldn't, get rid of some compiler warnings (drw)
        * n.a.  - PackageManager - fixed where last package in status file was not shown as installed when it should be (drw)
        * n.a.  - PackageManager - fixed bug where lists_dir was not being honored at startup (drw)
        * n.a.  - PackageManager - provided default value for lists_dir when none is entered in configuration dialog (drw)
        * n.a.  - OTabWidget - fixed scroll buttons, fix display position of tabs (drw)
        * n.a.  - AddressBook - fixed sorting by 'File As' name (drw)
        * n.a.  - AddressBook - fixed category handling for 'All' and 'Unfiled' (eilers)
        * n.a.  - AddressBook - fixed letter picker record selection and sort records afterwards (drw)
        Internal
        --------
        * Worked around bug in Qt/Embedded 2.3.10: qt_version() returns 231 (mickeyl)
        * Killed the need for weak symbols in QtE (zecke)
        * Added optional building libqpe without inline images (mickeyl)
        * OColorButton - fixed so does not emit a colorSelected signal inside of resizeEvent (drw)
        2005-02-03Opie 1.1.9
        New Features
        ------------
        * Number of icon columns in Launcher is customizable through Launcher.conf (hrw,zecke,mickeyl)
        * Number of icon columns in Launcher is customizable through LauncherSettings (mickeyl)
        * Usability enhancements in OpieIRC (skyhusker)
        Fixed Bugs
        ----------
        * #1501 - Fixed bug in todo sql backend (eilers)
        * #1505 - Added more Swap sizes in memoryapplet (mickeyl)
        * #1525 - Hopefully fixed double alarms and not removing alarms set with the Clock application (zecke)
        * #1533 - Security Owner Dialog (shown in case of unsuccessfull authentiacation) wasn't able to display information in non latin1 encoding (zecke)
        * n.a. - Removed hard coded font sizes in a couple of inputmethods (mickeyl)
        * n.a. - Removed MediumDlg appearing prior to FirstUsage wizard (i.e. calibration) (mickeyl)
        * n.a. - Fixed numerous buglets in OpieIRC (skyhusker)
        Internal
        --------
        * Added the Qtopia 1.7 SDK macros for quick-apps to easa compilation of 3rd party apps against our headers (mickeyl)
        * You can now use the Opie build system in combination with a OpenEmbedded staging area which makes a nice cross development environment (mickeyl)
        * Made Opie compilable with Qt/Embedded 2.3.10 (ar)
        * Changed Launcher to get default orientation from ODevice w/ QWS_DISPLAY overriding (mickeyl)
        * Build tree cleanups (mickeyl)
        2004-11-26Opie 1.1.8
        New Features
        ------------
        * PackageManager supports installation of local ipkg files (drw)
        * PackageManager supports linking of applications to root (drw)
        * PackageManager supports src/gz feeds (drw,wimpie)
        * Added a syslog information tab to sysinfo (mickeyl)
        * Added new, more consistent, PIM icons + a GIMP teplate (ar)
        Fixed Bugs
        ----------
        * #1017 - Tetrix doesn't display correctly for high resolution screens (drw)
        * #1269 - VCards were imported into personal area if it was activated (eilers)
        * #1464 - Packagemanager dont set active filter after install a package (drw)
        * #1479 - Improved VCard-Parser to import VCards created by Evolution 2 and Apple Addressbook (eilers)
        * #1493 - Fixed one column layout bug of the launcher (hrw)
        * n.a. - PackageManager - (Minor UI tweak) in filter dialog, when option is enabled, set focus to widget that corresponds to that option (drw)
        * n.a. - PackageManager - (Minor UI tweak) fix double entry in source feed configuration when adding a new feed (drw)
        * n.a. - Battery Applet - fix sizing of battery info popup (drw,mickeyl)
        Internal
        --------
        * Moved libopie1 to unsupported (mickeyl)
        * Implemented generic queryByExample() with incremental searching. A lot of internal changes of the Pim2-library (eilers)
        * Added fast and full featured and incremental sorted() for SQL addressbook backend (eilers)
        2004-11-14Opie 1.1.7
        New Features
        ------------
        * libOpieDB now uses SQLite V3 instead V2. Remember to upgrade your database files! (eilers)
        * Backup now uses the busy indicator when backing up and restore (ar)
        * OpiePlayer2 gained adding of Directories to the playlist (zecke)
        * OpiePlayer2 better error handling (zecke)
        * OpiePlayer2 progress indication while streaming (zecke)
        * OpiePlayer2 ported to use libxine 1.0.0-rc6a (brad,zecke)
        * Ported brightnessapplet from Qtopia 1.7 (mickeyl)
        * Opie-Eye got a Digital Camera File Backend (alwin,zecke)
        * Support for Tuxpad1 of Tradesquare.NL (mickeyl,zecke)
        * Opie-Console use Custom Font and Size in a Profile (harlekin)
        * Opie-Console transparently log the Output and Input to a file (harlekin)
        * Added new O-menu icon to lock the PDA immediately: opie-lockapplet (clem)
        * Opie-Security now hides the plugin-based authentication tabs if no auth. plugin package is installed (clem)
        * Opie-Security gained a 'test authentication' button (clem)
        * Opie-Eye  got a more unique layout (menubar), a slideshow, user can setup some defaults
        * Opie-Mail improve the handling of POP mail boxes (alwin)
        * Both Opie-Eye and Opie-Mail were greatly improved due the hard work of Rajko Albrecht(alwin)
        * Opie IRC - backports of the 'NeIRC fork' (zecke)
        Fixed Bugs
        ----------
        * #501  - Pickboard is able to show 'Umlaute' (TT,zecke)
        * #608  - Make Opie usable for left handed users (zecke)
        * #957  - Import of VCards/VTodos/VEvents with BASE64 encoding (ljp,zecke)
        * #1245 - Opie-Go 'paused' (zecke)
        * #1358 - DocTab didn't show any MimeTypes (was fixed earlier) (zecke)
        * #1380 - QDateBookAccess::remove() doesn't remove entries (eilers, zecke)
        * #1395 - Build VNC Backend with gcc3.4
        * #1440 - The icon of opie-mobilemsg is missing (CoreDump)
        * #1426 - Add missing opie-bartender Icon (CoreDump)
        * #1445 - Opie-Sheet Has No Icon (CoreDump)
        * #1448 - Brightness Applet added (mickeyl)
        * #1450 - ZSame didn't clear the bonus item after winning a game (zecke)
        * #1482 - Fix OFileSelector to be able to sort by size (zecke)
        * n.a.  - Opie-mail: fixed some crasher, some layout-problems
        * n.a.  - Converted applications to not hardcode /opt/QtPalmtop but to use QPEApplication::qpeDir (zecke)
        * n.a.  - Converted usage of qpeDir() not to include a '/' as first charachter of the string (zecke)
        * n.a.  - Build system: Enable distcc and ccache when crosscompiling too, and use them everywhere we can (clem)
        * 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)
        * n.a.  - Removed hardcoded icon size in a couple of applets (mickeyl)
        Internal
        --------
        * Opie-Qashmoney has been moved to unsupported (mickeyl)
        * Opie-Ubrowser has been moved to unsupported (mickeyl)
        2004-09-17Opie 1.1.6
        New Features
        ------------
        * Fifteen gained configurable number of items (zecke)
        * Fifteen can have custom background images (zecke)
        * Added daemonizing capabilities to QWS Server [via Qt/Embedded] (mickeyl)
        * Integrated the new security framework into libopie2 (zecke,clem)
        * Converted the launcher to use the new security framework (zecke)
        * Backup can now handle custom locations for backup and restore (ar)
        * Implemented right-on-hold feedback (wimpie,zecke)
        * Lots of new features in opie-reader (tim,pohly)
        * Build system cleanups (schurig)
        Fixed Bugs
        --------
        * #1005 - Fixed backup to CompactFlash (ar)
        * #1167 - Fixed Opie write crashing on more text than one page (ar)
        * #1225 - Fixed repeated light flashing on Zaurus with keyz (mickeyl)
        * #1359 - Fixed bookmarks in Gutenbrowser (ljp)
        * #1361 - Fixed auto upercase in Opie-Addressbook (eilers)
        * #1370 - Pimconverter now reacts on cancel key (eilers)
        * #1376 - Bring back the capslock/numlock display (zecke)
        * #1383 - Language settings now warns about losing open apps (Markus Litz)
        * #1393 - Fixed line wrap issues in opie-console for the default profile (mickeyl)
        * #1394 - Fixed oversized headline in opie-login (coredump)
        * #1396 - Opie-console captures the escape key and vim is working (zecke)
        * #1401 - Scrollbar is now only visible if necessary in DocTab (mickeyl)
        2004-07-06Opie 1.1.4
        New Features
        ------------
        * Added four themes courtesy Robert Griebl (http://www.softforge.de/zstyle)
        * Added Conversion tool for pim-data (eilers)
        * Introduced new OPimAccessFactory and OBackendFactory which simplyfies database access (eilers)
        * Modified the PIM API for providing generic use of OPimRecords (eilers)
        * Clicking on the application symbol now iterates over the application's top level widgets if already raised (zecke)
        Fixed Bugs
        --------
        * #1068 - Country Drop Down Box Off Screen
        * #1291 - Opie tinykate does not open .desktop files (ar)
        * #1291 - Opie sheet not saving correctly (ar)
        * #1294 - Opie does not know about British Summer Time
        * #1314 - Drawpad initialization (mickeyl)
        * #1317 - Packagemanager crashes on hold-down or install (chicken)
        * #1321 - Batteryapplet graphic glitch (harlekin)
        * #1324 - ZSafe not starting up (mickeyl)
        * #1328 - Personal Home Address fields is trimmed to 1char (eilers)
        * #1327 - Opie-mail ipk does not depend on libopiedb2 (chicken)
        * #1345 - Networksettingsplugin wlan plugin dependency on libpcap0 (mickeyl)
        * #1348 - Datebook dependency on libopiedb2 (chicken)
        * #1328 - Switched SQLDatabase and VCards char encoding from latin1 to unicode (eilers)
        2004-04-25Opie 1.1.3
        * Introduced first implementation of SQL-Support using SQLite (eilers)
        * Added a new Gutenberg Project reader app - opie-gutenbrowser (ljp)
        * Added a real system graffiti character set (brad)
        * Added Generic Keyconfig Widget (zecke)
        * Improved Screenshotapplet and Drawpad integration. You can now open a screenshot in drawpad and take notes (zecke)
        * Added new Bible reader app - opie-dagger (drw)
        * Added a new Image Viewer. Work is ongoing (zecke,alwin)
        * Added namespace usage in libopie2 and everywhere (zecke,alwin)
        * Enabled the possibility to pass command line arguments to applications (mickeyl)
        * Added an about applet showing some credits and information about Opie (mickeyl)
        * Added benchmarking functionality to sysinfo (mickeyl)
        * Added applet and configuration application for switching hardware keyboard layouts (alwin)
        * Ported applications from libopie1 to libopie2* (drw,ar,alwin)
        * Imported fullscreen and font improvements from the Qkonsole fork to embeddedkonsole (waspe)
        * Clean-up of package information in control files (drw)
        * Repaired mediummount which was broken since integrating the quicklauncher (alwin)
        * Improved big-screen support (zecke,ar)
        * Improved multikeyboard support, added keyboard layout switching applet (mouse)
        * Added a new mail client based on libetpan (harlekin,alwin,jgf)
        * Added new package manager - opie-packagemanager (drw)
        * Improved light-n-power for C7x0 (mickeyl)
        * Added automatic rotation support for C7x0 (treke)
        * Split libopie1 up into a set of smaller - functionally grouped - libraries (mickeyl)
        * Added scanning the wireless network neighbourhood to networksettings (mickeyl)
        2003-11-29Opie 1.0.3
        * Released as Version 1.0.3
        * Improved i18n (various contributors)
        * Reduced application startup time by integrating the TT quicklauncher (zecke,harlekin)
        * Made the Documents Tab optional (mickeyl)
        * Integrated basic support for HP iPAQ 54xx and the Jornada 5xx (chicken)
        2003-08-04Opie 1.0.0
        * Released as Version 1.0.0
        * Including a PPP module for easy dial up (tille,harlekin,zecke)
diff --git a/Vars.make b/Vars.make
index b99da70..457f867 100644
--- a/Vars.make
+++ b/Vars.make
@@ -1,138 +1,141 @@
 prefix=/opt/QtPalmtop
 ifeq ($(OPIEDIR),)
    export OPIEDIR:=$(TOPDIR)
 endif
 ifeq ($(IPK_DIR),)
    export IPK_DIR:=$(OPIEDIR)
 endif
 ifneq ($(wildcard $(TOPDIR)/.config),)
    include $(TOPDIR)/.config
 endif
 ifndef CONFIG_TARGET_OE
    ifndef QTDIR
    $(error QTDIR not set)
    endif
 else
    OEDIR:=$(shell echo $(CONFIG_OE_BUILD_DIR) | sed -e's/"//g')
    OEHOSTSYS:=$(shell echo $(CONFIG_OE_HOST_SYS) | sed -e's/"//g')
    OETARGETSYS:=$(shell echo $(CONFIG_OE_TARGET_SYS) | sed -e's/"//g')
    QTDIR:=$(shell echo $(OEDIR) | sed -e's/"//g')/tmp/staging/$(OETARGETSYS)/qt2
    $(shell mkdir -p $(QTDIR)/src/moc)
    $(shell echo -e "all: \n\t" >>$(QTDIR)/src/moc/Makefile)
    PLATFORM=sharp-linux
 endif
 ifdef CONFIG_TARGET_X86
    PLATFORM=x86-linux
 endif
 ifdef CONFIG_TARGET_64BIT
    PLATFORM=64bit-linux
 endif
 ifdef CONFIG_TARGET_SHARP
  PLATFORM=sharp-linux
 endif
 ifdef CONFIG_TARGET_IPAQ
  PLATFORM=ipaq-linux
 endif
 ifdef CONFIG_TARGET_RAMSES
  PLATFORM=ramses-linux
 endif
 ifdef CONFIG_TARGET_SIMPAD
  PLATFORM=simpad-linux
 endif
 ifdef CONFIG_TARGET_YOPY
  PLATFORM=yopy-linux
 endif
 ifdef CONFIG_TARGET_MACOSX
  PLATFORM=macx-darwin
 endif
+ifdef CONFIG_TARGET_HTC
+  PLATFORM=htc-linux
+endif
 export QMAKE:=$(OPIEDIR)/qmake/qmake
 export QMAKESPECSDIR=$(OPIEDIR)/mkspecs
 ifeq ($(QPE_VERSION),)
    VERSION_MAJ:=$(shell echo $$(sed -n -e 's/.*QPE_VERSION "\([0-9]*\)\..*\..*".*/\1/p' <$(OPIEDIR)/library/version.h))
    VERSION_MIN:=$(shell echo $$(sed -n -e 's/.*QPE_VERSION ".*\.\([0-9]*\)\..*".*/\1/p' <$(OPIEDIR)/library/version.h))
    VERSION_PAT:=$(shell echo $$(sed -n -e 's/.*QPE_VERSION ".*\..*\.\([0-9]*\).*/\1/p' <$(OPIEDIR)/library/version.h))
    QPE_VERSION:=$(VERSION_MAJ).$(VERSION_MIN).$(VERSION_PAT)
    ifeq ($(QPE_VERSION),..)
        QPE_VERSION=1.1.2
    endif
 endif
 export QPE_VERSION
 SUB_VERSION=$(shell echo $$(sed -n -e 's,.*SUB_VERSION \"\(.*\)\".*,\1,p' <$(OPIEDIR)/library/version.h))
 ifeq ($(VERSION_CVS),)
    VERSION_CVS:=$(shell date +%s)
 endif
 ifneq ($(filter %snapshot",$(shell cat $(OPIEDIR)/library/version.h|grep QPE_VERSION)),)
    SUB_VERSION:=$(VERSION_CVS)
 endif
 export SUB_VERSION
 ifneq ($(strip $(SUB_VERSION)),)
 EXTRAVERSION=-$(SUB_VERSION)
 endif
 ifeq ($(QTE_REVISION),)
    QTE_REVISION=6
 endif
 export QTE_REVISION
 export DEB_VERSION=2.0
 ifeq ($(QTE_BASEVERSION),)
    ifneq ($(shell ls $(QTDIR)/include/qglobal.h 2>/dev/null),)
        QTE_BASEVERSION:=$(shell cat $(QTDIR)/include/qglobal.h|grep '^\#define QT_VERSION'|grep -v STR|sed -e 's/\#define QT_VERSION\t*//; s/.*\([0-9]\)\([0-9]\)\([0-9]\).*/\1.\2.\3/;')
    else
        QTE_BASEVERSION=2.3.7
    endif
 endif
 export QTE_BASEVERSION
 ifeq ($(QTE_VERSION),)
    ifneq ($(shell ls $(QTDIR)/include/qglobal.h 2>/dev/null),)
        QTE_VERSION:=$(shell cat $(QTDIR)/include/qglobal.h|grep '^\#define QT_VERSION_STR'|sed -e 's/\#define QT_VERSION_STR\t*//;' -e 's/.*"\([^"]*\)".*/\1/;')
    else
        QTE_VERSION=2.3.7
    endif
 endif
 export QTE_VERSION
 export PATH:=$(OPIEDIR)/scripts:$(PATH)
 export QMAKESPEC=$(QMAKESPECSDIR)/$(patsubst "%",%,$(CONFIG_SPECFILE))
 ifdef CONFIG_OPTIMIZATIONS
 export CFLAGS_RELEASE=$(patsubst "%,%,$(CONFIG_OPTIMIZATIONS))
 export CFLAGS_RELEASE:=$(patsubst %",%,$(CFLAGS_RELEASE))
 endif
 ifeq ($(STRIP),)
    ifneq ($(CONFIG_TARGET_X86),)
        STRIP=strip
    endif
    ifneq ($(CONFIG_TARGET_64BIT),)
        STRIP=strip
    endif
    ifneq ($(CONFIG_TARGET_IPAQ),)
        STRIP=arm-linux-strip
    endif
    ifneq ($(CONFIG_TARGET_SHARP),)
        STRIP=arm-linux-strip
    endif
    ifneq ($(CONFIG_TARGET_RAMSES),)
        STRIP=arm-linux-strip
    endif
    ifneq ($(CONFIG_TARGET_SIMPAD),)
        STRIP=arm-linux-strip
    endif
    ifneq ($(CONFIG_TARGET_YOPY),)
        STRIP=arm-linux-strip
    endif
 endif
diff --git a/config.in b/config.in
index e979966..93bdcb2 100644
--- a/config.in
+++ b/config.in
@@ -1,291 +1,297 @@
 mainmenu "Opie Configuration"
 menu "Build Parameters"
 choice
  prompt "Target Machine"
  default TARGET_X86
  help
    Please select the architecture of the machine you will be
    building the OpenZaurus buildroot for.
  config TARGET_X86
    boolean "Intel X86"
  config TARGET_MACOSX
    boolean "Mac OS X (DARWIN)"
  config TARGET_SHARP
    boolean "Sharp Zaurus w/ SA1100 (5000 and 5500)"
  config TARGET_C700
    boolean "Sharp Zaurus w/ PXA25x (5600, C7x0, C8x0)"
  config TARGET_OE
    boolean "OpenEmbedded w/ OE build dir set below"
  config TARGET_IPAQ
    boolean "iPAQ"
  config TARGET_RAMSES
    boolean "Ramses"
  config TARGET_SIMPAD
    boolean "SIMpad"
  config TARGET_YOPY
    boolean "Yopy 3500/3700"  
+  config TARGET_HTC
+    boolean "HTC"
  config TARGET_64BIT
    boolean "64 BIT"
 endchoice
 config OE_BUILD_DIR
  depends TARGET_OE
  string "OE build directory"
  default ">>>set OpenEmbedded build directory here<<<"
 config OE_HOST_SYS
  depends TARGET_OE
  string "OE host system"
  default "i686-linux"
 config OE_TARGET_SYS
  depends TARGET_OE
  string "OE target system"
  default "arm-linux"
      
 config OPTIMIZE
  boolean "Use optimizations"
  default "y" if ! TARGET_X86
 config THREADED
  boolean "Enable threaded build"
  default "n"
 config STATIC
  boolean "Build static libraries"
  default "n"
 config DEBUG
  boolean "Enable debug builds"
  default n
 config RELEASE
  bool
  default y
  depends !DEBUG
  
 config QUICK_LAUNCH
  boolean "Enable Quick Launch"
  default n if TARGET_X86
  default y if ! TARGET_X86
  
 config QUICKLAUNCH_PATH
  string "Path to quicklauncher"
  default "./quicklauncher" if TARGET_X86
  default "/opt/QtPalmtop/bin/quicklauncher" if ! TARGET_X86
 config SPECFILE
  string
  default "qws/linux-generic-g++" if TARGET_X86 && (! X11)
  default "linux-g++" if TARGET_X86 && X11
  default "qws/linux-sharp-g++" if TARGET_SHARP && (! X11)
  default "linux-g++" if TARGET_SHARP && X11
  default "qws/linux-ipaq-g++" if TARGET_IPAQ && (! X11)
  default "linux-g++" if TARGET_IPAQ && X11
  default "qws/linux-ramses-g++" if TARGET_RAMSES && (! X11)
  default "linux-g++" if TARGET_RAMSES && X11
  default "qws/linux-simpad-g++" if TARGET_SIMPAD && (! X11)
  default "linux-g++" if TARGET_SIMPAD && X11
  default "qws/linux-yopy-g++" if TARGET_YOPY && (! X11)
  default "qws/macx-generic-g++" if TARGET_MACOSX && (! X11)
  default "qws/linux-oe-g++" if TARGET_OE && (!X11)
+  default "qws/linux-htc-g++" if TARGET_HTC && (! X11)
+  default "linux-g++" if TARGET_HTC  && X11
 config CUSTOMFILE
  string
  default "custom-ipaq.h" if TARGET_IPAQ
  default "custom-sharp.h" if TARGET_SHARP
  default "custom-ramses.h" if TARGET_RAMSES
  default "custom-ipaq.h" if TARGET_SIMPAD
  default "custom-yopy.h" if TARGET_YOPY
 config OPTIMIZATIONS
  string "Optimization flags"
  depends OPTIMIZE
  default "-march=armv4 -mtune=strongarm1100 -mapcs-32 -fexpensive-optimizations -fomit-frame-pointer -O2" if TARGET_IPAQ
  default "-march=armv4 -mtune=strongarm1100 -mapcs-32 -fexpensive-optimizations -fomit-frame-pointer -O2" if TARGET_YOPY
  default "-march=armv4 -mtune=strongarm1100 -mapcs-32 -fexpensive-optimizations -fomit-frame-pointer -O2" if TARGET_SHARP
  default "-march=armv4 -mtune=strongarm1100 -mapcs-32 -fexpensive-optimizations -fomit-frame-pointer -O2" if TARGET_RAMSES
  default "-march=armv4 -mtune=strongarm1100 -mapcs-32 -fexpensive-optimizations -fomit-frame-pointer -O2" if TARGET_SIMPAD
  default "-march=armv5te -mtune=xscale -mapcs-32 -fexpensive-optimizations -fomit-frame-pointer -O2" if TARGET_C700
+  default "-march=armv4 -mtune=strongarm1100 -mapcs-32 -fexpensive-optimizations -fomit-frame-pointer -O2" if TARGET_HTC
 config EXPERIMENTAL
  bool "Prompt for development and/or incomplete items"
  default y
 config USE_CCACHE
  bool "Use ccache, if available?"
  default y
 endmenu
 menu "Configuration"
 config OPIE_NO_BUILTIN_SHUTDOWN
  boolean "Disable the built in shutdown application"
  default y
 config OPIE_NO_BUILTIN_CALIBRATE
  boolean "Disable the built in calibrate application"
  default y if TARGET_YOPY
  default n if ! TARGET_YOPY
 config OPIE_SOUND_FRAGMENT_SHIFT
  string  "The sound fragment used in Opie Player I"
  default "14" if TARGET_IPAQ
  default "16" if ! TARGET_IPAQ
 config USE_REALTIME_AUDIO_THREAD
  boolean "Use a realtime thread in Opie Player I"
  default y if TARGET_IPAQ || TARGET_SIMPAD || TARGET_RAMSES || TARGET_SHARP
  default n if ! (TARGET_IPAQ || TARGET_SIMPAD || TARGET_RAMSES || TARGET_SHARP)
 config QT_QWS_ALLOW_OVERCLOCK
  boolean "Allow the user to overclock the device"
  depends TARGET_RAMSES
  default n
 config USE_FILE_NOTIFICATION
  boolean "Substitute (some) polling interfaces with OFileNotifier"
  default y
 config OPIE_NEW_ALLOC
  boolean "Use malloc and free for the implementation"
  default y if TARGET_RAMSES || TARGET_IPAQ || TARGET_SIMPAD || TARGET_SHARP
  default n if ! (TARGET_IPAQ || TARGET_SIMPAD || TARGET_RAMSES || TARGET_SHARP)
 config OPIE_TASKBAR_LOCK_KEY_STATE
  boolean "Have a KeyLock state indicator on the taskbar"
  default y if TARGET_SHARP
  default n if !TARGET_SHARP
 config LIBQPE_WITHROHFEEDBACK
  boolean "Build libqpe with Right-On-Hold feedback"
  default y
 config LIBQPE_NO_INLINE_IMAGES
  boolean "Build libqpe without inline images"
  default n
 config OPIE_NO_SOUND_PCM_READ_BITS
  boolean "There is not a pcm_read_bits io control"
  default y if TARGET_SHARP
  default n if ! TARGET_SHARP
 endmenu
 menu "Dependencies"
    source dependencies.in
 endmenu
 menu "Base"
  choice
    prompt "Qpe Library Selection"
    default LIBQPE
    source library/config.in
    source x11/config.in
  endchoice
  source libopie2/config.in
  source libqtaux/config.in
  source rsync/config.in
  source core/opie-login/config.in
  source core/opiealarm/config.in
  source core/tools/quicklauncher/config.in
  source core/tools/hotplug-qcop/config.in
  source core/launcher/config.in
  source core/symlinker/config.in
 endmenu
 comment ""
 menu "Applets"
  source core/applets/config.in
  source noncore/applets/config.in
 endmenu
 menu "Apps"
  source core/apps/config.in
  source noncore/apps/config.in
 endmenu
 menu "Communications and Networking"
  source noncore/comm/config.in
  source noncore/net/config.in
 endmenu
 menu "Games"
  source noncore/games/config.in
 endmenu
 menu "Graphics and Multimedia"
  source freetype/config.in
  source noncore/graphics/config.in
  source core/multimedia/config.in
  source noncore/multimedia/config.in
 endmenu
 menu "Input methods"
  source inputmethods/config.in
 endmenu
 menu "Pim"
  source core/obex/config.in
  source core/pim/config.in
  comment "Today Plugins ---"
    source noncore/todayplugins/config.in
    source core/pim/today/plugins/config.in
  comment "Holiday Plugins ---"
    source core/pim/datebook/holiday/config.in
 endmenu
 menu "Settings"
  source core/settings/config.in
  source noncore/settings/config.in
  source noncore/securityplugins/config.in
 endmenu
 menu "Theming"
  comment "Decorations ---"
  source noncore/decorations/config.in
  comment "Styles ---"
  source noncore/styles/config.in
 endmenu
 menu "Tools"
  source noncore/tools/config.in
 endmenu
 menu "Development"
  source development/keyview/config.in
  #source development/debugviewer/config.in
 endmenu
 menu "Examples"
    config EXAMPLES
        boolean "Compile Example Application"
    source examples/config.in
 endmenu
 comment ""
 menu "Unsupported / Unmaintained"
  source noncore/unsupported/config.in
 endmenu
 comment ""
  depends on EXPERIMENTAL
 menu "Experimental"
  depends on EXPERIMENTAL
  source libslcompat/config.in
  source core/qws/config.in
 endmenu
diff --git a/libopie2/opiecore/device/device.pro b/libopie2/opiecore/device/device.pro
index 8469398..0954733 100644
--- a/libopie2/opiecore/device/device.pro
+++ b/libopie2/opiecore/device/device.pro
@@ -1,26 +1,28 @@
 HEADERS    += device/odevice.h          \
              device/odevicebutton.h    \
              device/odevice_abstractmobiledevice.h \
              device/odevice_beagle.h   \
              device/odevice_ipaq.h     \
              device/odevice_jornada.h  \
              device/odevice_ramses.h   \
              device/odevice_simpad.h   \
              device/odevice_zaurus.h   \
              device/odevice_genuineintel.h   \
              device/odevice_yopy.h  \
-              device/odevice_mypal.h 
+              device/odevice_mypal.h \
+              device/odevice_htc.h
 SOURCES    += device/odevice.cpp        \
              device/odevicebutton.cpp  \
              device/odevice_abstractmobiledevice.cpp \
              device/odevice_beagle.cpp \
              device/odevice_ipaq.cpp   \
              device/odevice_jornada.cpp\
              device/odevice_ramses.cpp \
              device/odevice_simpad.cpp \
              device/odevice_zaurus.cpp \
              device/odevice_genuineintel.cpp   \
              device/odevice_yopy.cpp \
-              device/odevice_mypal.cpp
+              device/odevice_mypal.cpp \
+              device/odevice_htc.cpp
diff --git a/libopie2/opiecore/device/odevice.cpp b/libopie2/opiecore/device/odevice.cpp
index 7b99eb4..c6e031f 100644
--- a/libopie2/opiecore/device/odevice.cpp
+++ b/libopie2/opiecore/device/odevice.cpp
@@ -1,817 +1,820 @@
 /*
 � � � � � � � �             This file is part of the Opie Project
             =.              (C) 2002-2005 The Opie Team <opie-devel@handhelds.org>
            .=l.
 � � � � � �.>+-=
 �_;:, � � .> � �:=|.         This program is free software; you can
 .> <`_, � > �. � <=          redistribute it and/or  modify it under
 :`=1 )Y*s>-.-- � :           the terms of the GNU Library General Public
 .="- .-=="i, � � .._         License as published by the Free Software
 �- . � .-<_> � � .<>         Foundation; version 2 of the License.
 � � �._= =} � � � :
 � � .%`+i> � � � _;_.
 � � .i_,=:_. � � �-<s.       This program is distributed in the hope that
 � � �+ �. �-:. � � � =       it will be useful,  but WITHOUT ANY WARRANTY;
 � � : .. � �.:, � � . . .    without even the implied warranty of
 � � =_ � � � �+ � � =;=|`    MERCHANTABILITY or FITNESS FOR A
 � _.=:. � � � : � �:=>`:     PARTICULAR PURPOSE. See the GNU
 ..}^=.= � � � = � � � ;      Library General Public License for more
 ++= � -. � � .` � � .:       details.
 �: � � = �...= . :.=-
 �-. � .:....=;==+<;          You should have received a copy of the GNU
 � -_. . . � )=. �=           Library General Public License along with
 � � -- � � � �:-=`           this library; see the file COPYING.LIB.
                             If not, write to the Free Software Foundation,
                             Inc., 59 Temple Place - Suite 330,
                             Boston, MA 02111-1307, USA.
 */
 #include "odevice_beagle.h"
 #include "odevice_ipaq.h"
 #include "odevice_mypal.h"
 #include "odevice_jornada.h"
 #include "odevice_ramses.h"
 #include "odevice_simpad.h"
 #include "odevice_yopy.h"
 #include "odevice_zaurus.h"
 #include "odevice_genuineintel.h"
+#include "odevice_htc.h"
 /* QT */
 #include <qapplication.h>
 #include <qfile.h>
 #include <qtextstream.h>
 #include <qwindowsystem_qws.h>
 /* OPIE */
 #include <qpe/config.h>
 #include <qpe/sound.h>
 #include <qpe/qcopenvelope_qws.h>
 #include <qpe/sound.h>
 #include <opie2/okeyfilter.h>
 #include <opie2/oresource.h>
 /* STD */
 #include <fcntl.h>
 #include <math.h>
 #include <stdlib.h>
 #include <signal.h>
 #include <sys/ioctl.h>
 #include <sys/time.h>
 #include <unistd.h>
 #ifndef QT_NO_SOUND
 #include <linux/soundcard.h>
 #endif
 namespace Opie {
 namespace Core {
 static const char* PATH_PROC_CPUINFO = "/proc/cpuinfo";
 /* STATIC and common implementation */
 /* EXPORT */ ODistribution distributions[] = {
    { System_Familiar,        "FamiliarLinux",   "/etc/familiar-version" },
    { System_OpenZaurus,      "OpenZaurus",      "/etc/openzaurus-version" },
    { System_OpenEmbedded,    "OpenEmbedded",    "/etc/oe-version" },
    { System_Unknown,         "Linux",           "/etc/issue" },
 };
 /* EXPORT */ bool isQWS(){
    return qApp ? ( qApp->type() == QApplication::GuiServer ) : false;
 }
 /* EXPORT */ QCString makeChannel ( const char *str ){
    if ( str && !::strchr ( str, '/' ))
        return QCString ( "QPE/Application/" ) + str;
    else
        return str;
 }
 /* Now the default implementation of ODevice */
 struct default_button default_buttons [] =  {
    { Qt::Key_F9, QT_TRANSLATE_NOOP("Button", "Calendar Button"),
    "devicebuttons/z_calendar",
    "datebook", "nextView()",
    "today", "raise()" },
    { Qt::Key_F10, QT_TRANSLATE_NOOP("Button", "Contacts Button"),
    "devicebuttons/z_contact",
    "addressbook", "raise()",
    "addressbook", "beamBusinessCard()" },
    { Qt::Key_F12, QT_TRANSLATE_NOOP("Button", "Home Button"),
    "devicebuttons/z_home",
    "QPE/Launcher", "home()",
    "buttonsettings", "raise()" },
    { Qt::Key_F11, QT_TRANSLATE_NOOP("Button", "Menu Button"),
    "devicebuttons/z_menu",
    "QPE/TaskBar", "toggleMenu()",
    "QPE/TaskBar", "toggleStartMenu()" },
    { Qt::Key_F13, QT_TRANSLATE_NOOP("Button", "Mail Button"),
    "devicebuttons/z_mail",
    "opiemail", "raise()",
    "opiemail", "newMail()" },
 };
 ODevice *ODevice::inst()
 {
    static ODevice *dev = 0;
    QString cpu_info;
    if ( !dev )
    {
        QFile f( PATH_PROC_CPUINFO );
        if ( f.open( IO_ReadOnly ) )
        {
            QTextStream s( &f );
            while ( !s.atEnd() )
            {
                QString line;
                line = s.readLine();
                if ( line.startsWith( "Hardware" ) )
                {
                    qDebug( "ODevice() - found '%s'", (const char*) line );
                    cpu_info = line;
                    if ( line.contains( "sharp", false ) ) dev = new Internal::Zaurus();
                    else if ( line.contains( "ipaq", false ) ) dev = new Internal::iPAQ();
                    else if ( line.contains( "mypal", false ) ) dev = new Internal::MyPal();
                    else if ( line.contains( "simpad", false ) ) dev = new Internal::SIMpad();
                    else if ( line.contains( "jornada", false ) ) dev = new Internal::Jornada();
                    else if ( line.contains( "ramses", false ) ) dev = new Internal::Ramses();
                    else if ( line.contains( "Tradesquare.NL", false ) ) dev = new Internal::Beagle();
+                    else if ( line.contains( "HTC", false ) ) dev = new Internal::HTC();
                    else qWarning( "ODevice() - unknown hardware - using default." );
                    break;
                } else if ( line.startsWith( "vendor_id" ) ) {
                    qDebug( "ODevice() - found '%s'", (const char*) line );
                    cpu_info = line;
                    if( line.contains( "genuineintel", false ) ) {
                      dev = new Internal::GenuineIntel();
                      break;
                    }
                }
            }
        }
        else
        {
            qWarning( "ODevice() - can't open '%s' - unknown hardware - using default.", PATH_PROC_CPUINFO );
        }
        if ( !dev ) dev = new ODevice();
        dev->init(cpu_info);
    }
    return dev;
 }
 ODevice::ODevice()
 {
    d = new ODeviceData;
    d->m_modelstr = "Unknown";
    d->m_model = Model_Unknown;
    d->m_vendorstr = "Unknown";
    d->m_vendor = Vendor_Unknown;
    d->m_systemstr = "Unknown";
    d->m_system = System_Unknown;
    d->m_sysverstr = "0.0";
    d->m_rotation = Rot0;
    d->m_direction = CW;
    d->m_qteDriver = "Transformed";
    d->m_holdtime = 1000; // 1000ms
    d->m_buttons = 0;
    d->m_cpu_frequencies = new QStrList;
    /* mixer */
    d->m_sound = d->m_vol   = d->m_mixer = -1;
    /* System QCopChannel created */
    d->m_initializedButtonQcop = false;
    // New distribution detection code first checks for legacy distributions,
    // identified by /etc/familiar-version or /etc/oz_version.
    // Then check for OpenEmbedded and lastly, read /etc/issue
    for ( unsigned int i = 0; i < sizeof(distributions)/sizeof(ODistribution); ++i )
    {
        if ( QFile::exists( distributions[i].sysvfile ) )
        {
            d->m_systemstr = distributions[i].sysstr;
            d->m_system = distributions[i].system;
            d->m_sysverstr = "<Unknown>";
            QFile f( distributions[i].sysvfile );
            if ( f.open( IO_ReadOnly ) )
            {
                QTextStream ts( &f );
                d->m_sysverstr = ts.readLine().replace( QRegExp( "\\\\." ), "" );
            }
            break;
        }
    }
 }
 void ODevice::systemMessage( const QCString &msg, const QByteArray & )
 {
    if ( msg == "deviceButtonMappingChanged()" ) {
        reloadButtonMapping();
    }
 }
 void ODevice::init(const QString&)
 {
 }
 /**
 * This method initialises the button mapping
 */
 void ODevice::initButtons()
 {
    if ( d->m_buttons )
        return;
    qDebug ( "init Buttons" );
    d->m_buttons = new QValueList <ODeviceButton>;
    for ( uint i = 0; i < ( sizeof( default_buttons ) / sizeof( default_button )); i++ ) {
        default_button *db = default_buttons + i;
        ODeviceButton b;
        b. setKeycode ( db->code );
        b. setUserText ( QObject::tr ( "Button", db->utext ));
        b. setPixmap ( OResource::loadPixmap ( db->pix ));
        b. setFactoryPresetPressedAction ( OQCopMessage ( makeChannel ( db->fpressedservice ), db->fpressedaction ));
        b. setFactoryPresetHeldAction ( OQCopMessage ( makeChannel ( db->fheldservice ), db->fheldaction ));
        d->m_buttons->append ( b );
    }
    reloadButtonMapping();
 }
 ODevice::~ODevice()
 {
 // we leak m_devicebuttons and m_cpu_frequency
 // but it's a singleton and it is not so importantant
 // -zecke
    delete d;
 }
 /**
 * This method will try to suspend the device
 * It only works if the user is the QWS Server and the apm application
 * is installed.
 * It tries to suspend and then waits some time cause some distributions
 * do have asynchronus apm implementations.
 * This method will either fail and return false or it'll suspend the
 * device and return once the device got woken up
 *
 * @return if the device got suspended
 */
 bool ODevice::suspend()
 {
    return false; // default implementation == unknown device or qvfb
 }
 /**
 * This sets the display on or off
 */
 bool ODevice::setDisplayStatus( bool on )
 {
    qDebug( "ODevice::setDisplayStatus( %d ) - please override me.", on );
    return false; // don't do anything for unknown models
 }
 /**
 * This sets the display brightness
 *
 * @param b The brightness to be set on a scale from 0 to 255
 * @return success or failure
 */
 bool ODevice::setDisplayBrightness( int b )
 {
    qDebug( "ODevice::setDisplayBrightness( %d ) - please override me.", b );
    return false;
 }
 /**
 *
 * @returns the number of steppings on the brightness slider
 * in the Light-'n-Power settings. Values smaller than zero and bigger
 * than 255 do not make sense.
 *
 * \sa QSlider::setLineStep
 * \sa QSlider::setPageStep
 */
 int ODevice::displayBrightnessResolution() const
 {
    qDebug( "ODevice::displayBrightnessResolution() - please override me." );
    return 16;
 }
 /**
 * This sets the display contrast
 * @param p The contrast to be set on a scale from 0 to 255
 * @returns success or failure
 */
 bool ODevice::setDisplayContrast( int p )
 {
    qDebug( "ODevice::setDisplayContrast( %d ) - please override me.", p );
    return false;
 }
 /**
 * @returns the maximum value for the contrast settings slider
 *         or 0 if the device doesn't support setting of a contrast
 */
 int ODevice::displayContrastResolution() const
 {
    qDebug( "ODevice::displayBrightnessResolution() - please override me." );
    return 0;
 }
 /**
 * This returns the vendor as string
 * @return Vendor as QString
 */
 QString ODevice::vendorString() const
 {
    return d->m_vendorstr;
 }
 /**
 * This returns the vendor as one of the values of OVendor
 * @return OVendor
 */
 OVendor ODevice::vendor() const
 {
    return d->m_vendor;
 }
 /**
 * This returns the model as a string
 * @return A string representing the model
 */
 QString ODevice::modelString() const
 {
    return d->m_modelstr;
 }
 /**
 * This does return the OModel used
 */
 OModel ODevice::model() const
 {
    return d->m_model;
 }
 /**
 * This does return the systen name
 */
 QString ODevice::systemString() const
 {
    return d->m_systemstr;
 }
 /**
 * Return System as OSystem value
 */
 OSystem ODevice::system() const
 {
    return d->m_system;
 }
 /**
 * @return the version string of the base system
 */
 QString ODevice::systemVersionString() const
 {
    return d->m_sysverstr;
 }
 /**
 *  @return the current Transformation
 */
 Transformation ODevice::rotation() const
 {
    return d->m_rotation;
 }
 /**
 *  @return the current rotation direction
 */
 ODirection ODevice::direction() const
 {
    return d->m_direction;
 }
 QString ODevice::qteDriver() const
 {
    return d->m_qteDriver;
 }
 /**
 * This plays an alarm sound
 */
 void ODevice::playAlarmSound()
 {
 #ifndef QT_NO_SOUND
    static Sound snd ( "alarm" );
    if ( snd. isFinished())
        snd. play();
 #endif
 }
 /**
 * This plays a key sound
 */
 void ODevice::playKeySound()
 {
 #ifndef QT_NO_SOUND
    static Sound snd ( "keysound" );
    if ( snd. isFinished())
        snd. play();
 #endif
 }
 /**
 * This plays a touch sound
 */
 void ODevice::playTouchSound()
 {
 #ifndef QT_NO_SOUND
    static Sound snd ( "touchsound" );
    if ( snd. isFinished())
        snd. play();
 #endif
 }
 /**
 * This method will return a list of leds
 * available on this device
 * @return a list of LEDs.
 */
 QValueList <OLed> ODevice::ledList() const
 {
    return QValueList <OLed>();
 }
 /**
 * This does return the state of the LEDs
 */
 QValueList <OLedState> ODevice::ledStateList ( OLed /*which*/ ) const
 {
    return QValueList <OLedState>();
 }
 /**
 * @return the state for a given OLed
 */
 OLedState ODevice::ledState ( OLed /*which*/ ) const
 {
    return Led_Off;
 }
 /**
 * Set the state for a LED
 * @param which Which OLed to use
 * @param st The state to set
 * @return success or failure
 */
 bool ODevice::setLedState ( OLed which, OLedState st )
 {
        Q_UNUSED( which )
        Q_UNUSED( st    )
    return false;
 }
 /**
 * @return if the device has a light sensor
 */
 bool ODevice::hasLightSensor() const
 {
    return false;
 }
 /**
 * @return a value from the light sensor
 */
 int ODevice::readLightSensor()
 {
    return -1;
 }
 /**
 * @return the light sensor resolution
 */
 int ODevice::lightSensorResolution() const
 {
    return 0;
 }
 /**
 * @return if the device has a hinge sensor
 */
 bool ODevice::hasHingeSensor() const
 {
    return false;
 }
 /**
 * @return a value from the hinge sensor
 */
 OHingeStatus ODevice::readHingeSensor()const
 {
    return CASE_UNKNOWN;
 }
 /**
 * @return a list with CPU frequencies supported by the hardware
 */
 const QStrList &ODevice::allowedCpuFrequencies() const
 {
    return *d->m_cpu_frequencies;
 }
 /**
 * Set desired CPU frequency
 *
 * @param index index into d->m_cpu_frequencies of the frequency to be set
 */
 bool ODevice::setCurrentCpuFrequency(uint index)
 {
    if (index >= d->m_cpu_frequencies->count())
        return false;
    char *freq = d->m_cpu_frequencies->at(index);
    qWarning("set freq to %s", freq);
    int fd;
    if ((fd = ::open("/proc/sys/cpu/0/speed", O_WRONLY)) >= 0) {
        char writeCommand[50];
        const int count = sprintf(writeCommand, "%s\n", freq);
        int res = (::write(fd, writeCommand, count) != -1);
        ::close(fd);
        return res;
    }
    return false;
 }
 /**
 * @return a list of hardware buttons
 */
 const QValueList <ODeviceButton> &ODevice::buttons()
 {
    initButtons();
    return *d->m_buttons;
 }
 /**
 * @return The amount of time that would count as a hold
 */
 uint ODevice::buttonHoldTime() const
 {
    return d->m_holdtime;
 }
 /**
 * This method return a ODeviceButton for a key code
 * or 0 if no special hardware button is available for the device
 *
 * @return The devicebutton or 0l
 * @see ODeviceButton
 */
 const ODeviceButton *ODevice::buttonForKeycode ( ushort code )
 {
    initButtons();
    for ( QValueListConstIterator<ODeviceButton> it = d->m_buttons->begin(); it != d->m_buttons->end(); ++it ) {
        if ( (*it).keycode() == code )
            return &(*it);
    }
    return 0;
 }
 void ODevice::reloadButtonMapping()
 {
    if(!d->m_buttons)
        initButtons();
    if(!d->m_initializedButtonQcop) {
        QCopChannel *chan = new QCopChannel("QPE/System", this, "ODevice button channel");
        connect(chan,SIGNAL(received(const QCString&,const QByteArray&)),
                this,SLOT(systemMessage(const QCString&,const QByteArray&)));
        d->m_initializedButtonQcop = true;
    }
    Config cfg ( "ButtonSettings" );
    for ( uint i = 0; i < d->m_buttons->count(); i++ ) {
        ODeviceButton &b = ( *d->m_buttons ) [i];
        QString group = "Button" + QString::number ( i );
        QCString pch, hch;
        QCString pm, hm;
        QByteArray pdata, hdata;
        if ( cfg. hasGroup ( group )) {
            cfg. setGroup ( group );
            pch = cfg. readEntry ( "PressedActionChannel" ). latin1();
            pm  = cfg. readEntry ( "PressedActionMessage" ). latin1();
            // pdata = decodeBase64 ( buttonFile. readEntry ( "PressedActionArgs" ));
            hch = cfg. readEntry ( "HeldActionChannel" ). latin1();
            hm  = cfg. readEntry ( "HeldActionMessage" ). latin1();
            // hdata = decodeBase64 ( buttonFile. readEntry ( "HeldActionArgs" ));
        }
        b. setPressedAction ( OQCopMessage ( pch, pm, pdata ));
        b. setHeldAction ( OQCopMessage ( hch, hm, hdata ));
    }
 }
 void ODevice::remapPressedAction ( int button, const OQCopMessage &action )
 {
    initButtons();
    QString mb_chan;
    if ( button >= (int) d->m_buttons->count())
        return;
    ODeviceButton &b = ( *d->m_buttons ) [button];
        b. setPressedAction ( action );
    mb_chan=b. pressedAction(). channel();
    Config buttonFile ( "ButtonSettings" );
    buttonFile. setGroup ( "Button" + QString::number ( button ));
    buttonFile. writeEntry ( "PressedActionChannel", (const char*) mb_chan);
    buttonFile. writeEntry ( "PressedActionMessage", (const char*) b. pressedAction(). message());
 //  buttonFile. writeEntry ( "PressedActionArgs", encodeBase64 ( b. pressedAction(). data()));
    QCopEnvelope ( "QPE/System", "deviceButtonMappingChanged()" );
 }
 void ODevice::remapHeldAction ( int button, const OQCopMessage &action )
 {
    initButtons();
    if ( button >= (int) d->m_buttons->count())
        return;
    ODeviceButton &b = ( *d->m_buttons ) [button];
        b. setHeldAction ( action );
    Config buttonFile ( "ButtonSettings" );
    buttonFile. setGroup ( "Button" + QString::number ( button ));
    buttonFile. writeEntry ( "HeldActionChannel", (const char *) b. heldAction(). channel());
    buttonFile. writeEntry ( "HeldActionMessage", (const char *) b. heldAction(). message());
 //  buttonFile. writeEntry ( "HeldActionArgs", decodeBase64 ( b. heldAction(). data()));
    QCopEnvelope ( "QPE/System", "deviceButtonMappingChanged()" );
 }
 /**
 * @internal
 */
 void ODevice::virtual_hook(int, void* ){
 }
 /**
 * \brief Send a QCOP Message before suspending
 *
 * Sends a QCOP message to channel QPE/System
 * with the message "aboutToSuspend()" if this
 * is the windowing server.
 *
 * Call this in your custom \sa suspend() Method
 * before going to suspend.
 *
 */
 void ODevice::sendSuspendmsg()
 {
    if ( !isQWS() )
        return;
    QCopEnvelope ( "QPE/System", "aboutToSuspend()" );
 }
 /**
 * \brief Prepend the QWSServer::KeyboardFilter to the list of installed KeyFilters
 *
 * Prepend a QWSServer::KeyboardFilter to the List of Keyboard
 * Filters. This function is the only way to prepend a KeyFilter.
 *
 * @param aFilter The KeyFilter to be prepended to the list of filters
 *
 * @see Opie::Core::OKeyFilter
 * @see Opie::Core::OKeyFilter::inst()
 */
 void ODevice::addPreHandler(QWSServer::KeyboardFilter*aFilter)
 {
    Opie::Core::OKeyFilter::inst()->addPreHandler(aFilter);
 }
 /**
 * \brief Remove the QWSServer::KeyboardFilter in the param from the list
 *
 * Remove the QWSServer::KeyboardFilter \par aFilter from the List
 * of Keyfilters. Call this when you delete the KeyFilter!
 *
 * @param aFilter The filter to be removed from the Opie::Core::OKeyFilter
 * @see Opie::Core::ODevice::addPreHandler
 */
 void ODevice::remPreHandler(QWSServer::KeyboardFilter*aFilter)
 {
    Opie::Core::OKeyFilter::inst()->remPreHandler(aFilter);
 }
 /**
 * @internal
 *
 * @see changeMixerForAlarm
 */
 void ODevice::playingStopped() {
    if ( sender() )
        const_cast<QObject*>(sender())->disconnect( this );
 #ifndef QT_NO_SOUND
    if ( d->m_sound >= 0 ) {
        ::ioctl ( d->m_sound, MIXER_WRITE( d->m_mixer ), &d->m_vol );
        ::close ( d->m_sound );
    }
 #endif
 }
 /**
 * \brief Change the Volume for the Alarm and set it back after playing is finished
 *
 * If you play an Alarm Sound you might want to change the Mixer to
 * full volume and ignore the user setting. After it \sa Sound::isFinished
 * you would turn the volume back to the user preference.
 * The problem is that we used to enter the event loop while waiting
 * for the sound to be finished triggering all kind of reentrance
 * problems what a library shouldn't introduce.
 * Instead of manually waiting for the sound to be finished use
 * this Method and it will automatically restore the Mixer to
 * the user configuration after the sound finished playing.
 *
 * Note: The onwership of \param snd is not transfered and playing
 * is not started in this method. If 'snd' gets deleted before
 * playing is finished the volume doesn't get set back to
 * the user preference!
 *
 * \code
 * static Sound snd("alarm");
 * if(!snd.isFinished())
 *    return;
 *
 * changeMixerForAlarm( my_channel, "/dev/mixer", &snd );
 * snd.play()
 * \endcode
 *
 *
 *
 * @param mixer The mixer number/channel to use
 * @param file  The file name. If you convert from QString use QFile::encodeName
 * @param snd   The sound to wait for finishing
 *
 */
 void ODevice::changeMixerForAlarm( int mixer, const char* file, Sound *snd ) {
 #ifndef QT_NO_SOUND
    if (( d->m_sound = ::open ( file, O_RDWR )) >= 0 ) {
        if ( ::ioctl ( d->m_sound, MIXER_READ( mixer ), &d->m_vol ) >= 0 ) {
            Config cfg ( "qpe" );
            cfg. setGroup ( "Volume" );
            int volalarm = cfg. readNumEntry ( "AlarmPercent", 50 );
            if ( volalarm < 0 )
                volalarm = 0;
            else if ( volalarm > 100 )
                volalarm = 100;
            volalarm |= ( volalarm << 8 );
            if ( ::ioctl ( d->m_sound, MIXER_WRITE( mixer ), &volalarm ) >= 0 )
                register_qpe_sound_finished(snd, this, SLOT(playingStopped()));
        }
        d->m_mixer = mixer;
    }
 #endif
 }
 }
 }
diff --git a/libopie2/opiecore/device/odevice.h b/libopie2/opiecore/device/odevice.h
index c70d2af..0c78277 100644
--- a/libopie2/opiecore/device/odevice.h
+++ b/libopie2/opiecore/device/odevice.h
@@ -1,392 +1,397 @@
 /*
 � � � � � � � �             This file is part of the Opie Project
 � � � � � � �                Copyright (C) The Opie Team <opie-devel@handhelds.org>
              =.
            .=l.
 � � � � � �.>+-=
 �_;:, � � .> � �:=|.         This program is free software; you can
 .> <`_, � > �. � <=          redistribute it and/or  modify it under
 :`=1 )Y*s>-.-- � :           the terms of the GNU Library General Public
 .="- .-=="i, � � .._         License as published by the Free Software
 �- . � .-<_> � � .<>         Foundation; either version 2 of the License,
 � � �._= =} � � � :          or (at your option) any later version.
 � � .%`+i> � � � _;_.
 � � .i_,=:_. � � �-<s.       This program is distributed in the hope that
 � � �+ �. �-:. � � � =       it will be useful,  but WITHOUT ANY WARRANTY;
 � � : .. � �.:, � � . . .    without even the implied warranty of
 � � =_ � � � �+ � � =;=|`    MERCHANTABILITY or FITNESS FOR A
 � _.=:. � � � : � �:=>`:     PARTICULAR PURPOSE. See the GNU
 ..}^=.= � � � = � � � ;      Library General Public License for more
 ++= � -. � � .` � � .:       details.
 �: � � = �...= . :.=-
 �-. � .:....=;==+<;          You should have received a copy of the GNU
 � -_. . . � )=. �=           Library General Public License along with
 � � -- � � � �:-=`           this library; see the file COPYING.LIB.
                             If not, write to the Free Software Foundation,
                             Inc., 59 Temple Place - Suite 330,
                             Boston, MA 02111-1307, USA.
 */
 #ifndef ODEVICE_H_
 #define ODEVICE_H_
 /* OPIE */
 #include <opie2/odevicebutton.h>
 #include <qpe/qpeapplication.h> /* for Transformation enum.. */
 /* QT */
 #include <qnamespace.h>
 #include <qobject.h>
 #include <qstring.h>
 #include <qstrlist.h>
 #include <qwindowsystem_qws.h>
 class Sound;
 namespace Opie{
 namespace Core{
 class ODeviceData;
 /**
 * The available devices
 */
 enum OModel {
    Model_Unknown, // = 0
    Model_Series_Mask   = 0xffff0000,
    Model_iPAQ          = ( 1 << 16 ),
    Model_iPAQ_All      = ( Model_iPAQ | 0xffff ),
    Model_iPAQ_H31xx    = ( Model_iPAQ | 0x0001 ),
    Model_iPAQ_H36xx    = ( Model_iPAQ | 0x0002 ),
    Model_iPAQ_H37xx    = ( Model_iPAQ | 0x0003 ),
    Model_iPAQ_H38xx    = ( Model_iPAQ | 0x0004 ),
    Model_iPAQ_H39xx    = ( Model_iPAQ | 0x0005 ),
    Model_iPAQ_H5xxx    = ( Model_iPAQ | 0x0006 ),
    Model_iPAQ_H22xx    = ( Model_iPAQ | 0x0007 ),
    Model_iPAQ_H191x    = ( Model_iPAQ | 0x0008 ),
    Model_iPAQ_H1940    = ( Model_iPAQ | 0x0009 ),
    Model_Jornada       = ( 6 << 16 ),
    Model_Jornada_56x   = ( Model_Jornada | 0x0001 ),
    Model_Jornada_720   = ( Model_Jornada | 0x0002 ),
    Model_Zaurus        = ( 2 << 16 ),
    Model_Zaurus_SL5000 = ( Model_Zaurus | 0x0001 ),
    Model_Zaurus_SL5500 = ( Model_Zaurus | 0x0002 ),
    Model_Zaurus_SLA300 = ( Model_Zaurus | 0x0003 ),
    Model_Zaurus_SLB600 = ( Model_Zaurus | 0x0004 ),
    Model_Zaurus_SLC7x0 = ( Model_Zaurus | 0x0005 ),
    Model_Zaurus_SL6000 = ( Model_Zaurus | 0x0006 ),
    Model_Zaurus_SLC3000 = ( Model_Zaurus | 0x0007 ),
    Model_Zaurus_SLC1000 = ( Model_Zaurus | 0x0008 ),
    Model_Zaurus_SLC3100 = ( Model_Zaurus | 0x0009 ),
    Model_SIMpad        = ( 3 << 16 ),
    Model_SIMpad_All    = ( Model_SIMpad | 0xffff ),
    Model_SIMpad_CL4    = ( Model_SIMpad | 0x0001 ),
    Model_SIMpad_SL4    = ( Model_SIMpad | 0x0002 ),
    Model_SIMpad_SLC    = ( Model_SIMpad | 0x0003 ),
    Model_SIMpad_TSinus = ( Model_SIMpad | 0x0004 ),
    Model_Ramses        = ( 4 << 16 ),
    Model_Ramses_All    = ( Model_Ramses | 0xffff ),
    Model_Ramses_MNCI   = ( Model_Ramses | 0x0001 ),
    Model_Ramses_MNCIRX = ( Model_Ramses | 0x0002 ),
    Model_Yopy          = ( 5 << 16 ),
    Model_Yopy_All      = ( Model_Yopy | 0xffff ),
    Model_Yopy_3000     = ( Model_Yopy | 0x0001 ),
    Model_Yopy_3500     = ( Model_Yopy | 0x0002 ),
    Model_Yopy_3700     = ( Model_Yopy | 0x0003 ),
    Model_Beagle        = ( 6 << 16 ),
    Model_Beagle_All    = ( Model_Beagle | 0xffff ),
    Model_Beagle_PA100  = ( Model_Beagle | 0x0001 ),
    Model_GenuineIntel  = ( 7 << 16 ),
    Model_MyPal         = ( 8 << 16 ),
    Model_MyPal_All     = ( Model_MyPal | 0xffff ),
    Model_MyPal_620     = ( Model_MyPal | 0x0001 ),
    Model_MyPal_716     = ( Model_MyPal | 0x0002 ),
-    Model_MyPal_730     = ( Model_MyPal | 0x0003 )
+    Model_MyPal_730     = ( Model_MyPal | 0x0003 ),
+    Model_HTC           = ( 9 << 16 ),
+    Model_HTC_All       = ( Model_HTC | 0xffff ),
+    Model_HTC_Universal = ( Model_HTC | 0x0001 )
 };
 /**
 * The vendor of the device
 */
 enum OVendor {
    Vendor_Unknown,
    Vendor_HP,
    Vendor_Sharp,
    Vendor_SIEMENS,
    Vendor_MundN,
    Vendor_GMate,
    Vendor_MasterIA,
    Vendor_GenuineIntel,
-    Vendor_Asus
+    Vendor_Asus,
+    Vendor_HTC
 };
 /**
 * The System used
 */
 enum OSystem {
    System_Unknown,
    System_Familiar,
    System_Zaurus,
    System_OpenZaurus,
    System_Linupy,
    System_OpenEmbedded,
    System_PC
 };
 typedef struct {
    OSystem system;
    char* sysstr;
    char* sysvfile;
 } ODistribution;
 extern ODistribution distributions[];
 enum OLedState {
    Led_Off,
    Led_On,
    Led_BlinkSlow,
    Led_BlinkFast
 };
 enum OLed {
    Led_Mail,
    Led_Power,
    Led_BlueTooth
 };
 enum OHardKey {
    HardKey_Datebook  = Qt::Key_F9,
    HardKey_Contacts  = Qt::Key_F10,
    HardKey_Menu      = Qt::Key_F11,
    HardKey_Home      = Qt::Key_F12,
    HardKey_Mail      = Qt::Key_F13,
    HardKey_Record    = Qt::Key_F24,
    HardKey_Suspend   = Qt::Key_F34,
    HardKey_Backlight = Qt::Key_F35,
    HardKey_Action    = Qt::Key_F10,
    HardKey_OK        = Qt::Key_F11,
    HardKey_End       = Qt::Key_F12,
 };
 enum ODirection {
    CW   = 0,
    CCW  = 1,
    Flip = 2,
 };
 enum OHingeStatus {
    CASE_CLOSED = 3,
    CASE_PORTRAIT = 2,
    CASE_LANDSCAPE = 0,
    CASE_UNKNOWN = 1,
 };
 /* default button for qvfb or such
 * see odevice.cpp for details.
 * hint: manage a user defined button for qvfb?
 * alwin
 */
 struct default_button {
    Qt::Key code;
    char *utext;
    char *pix;
    char *fpressedservice;
    char *fpressedaction;
    char *fheldservice;
    char *fheldaction;
 };
 /**
 * A singleton which gives informations about device specefic option
 * like the Hardware used, LEDs, the Base Distribution and
 * hardware key mappings.
 *
 * @short A small class for device specific options
 * @see QObject
 * @author Robert Griebl
 * @version 1.0
 */
 class ODevice : public QObject
 {
    Q_OBJECT
 private:
    /* disable copy */
    ODevice ( const ODevice & );
 protected:
    ODevice();
    virtual void init(const QString&);
    virtual void initButtons();
    static void sendSuspendmsg();
    ODeviceData *d;
 public:
    // sandman do we want to allow destructions? -zecke?
    virtual ~ODevice();
    static ODevice *inst();
    // information
    QString modelString() const;
    OModel model() const;
    inline OModel series() const { return (OModel) ( model() & Model_Series_Mask ); }
    QString vendorString() const;
    OVendor vendor() const;
    QString systemString() const;
    OSystem system() const;
    QString systemVersionString() const;
    virtual Transformation rotation() const;
    virtual ODirection direction() const;
    QString qteDriver() const;
    // system
    virtual bool suspend();
    virtual bool setDisplayStatus ( bool on );
    virtual bool setDisplayBrightness ( int brightness );
    virtual int displayBrightnessResolution() const;
    virtual bool setDisplayContrast ( int contrast );
    virtual int displayContrastResolution() const;
    // don't add new virtual methods, use this:
    //  /*virtual */ void boo(int i ) { return virtual_hook(1,&i); };
    // and in your subclass do overwrite
    //  protected virtual int virtual_hook(int, void *)
    // which is defined below
    // input / output
    virtual void playAlarmSound();
    virtual void playKeySound();
    virtual void playTouchSound();
    virtual QValueList <OLed> ledList() const;
    virtual QValueList <OLedState> ledStateList ( OLed led ) const;
    virtual OLedState ledState ( OLed led ) const;
    virtual bool setLedState ( OLed led, OLedState st );
    virtual bool hasLightSensor() const;
    virtual int readLightSensor();
    virtual int lightSensorResolution() const;
    virtual bool hasHingeSensor() const;
    virtual OHingeStatus readHingeSensor()const;
    const QStrList &allowedCpuFrequencies() const;
    bool setCurrentCpuFrequency(uint index);
    /**
     * Returns the available buttons on this device.  The number and location
     * of buttons will vary depending on the device.  Button numbers will be assigned
     * by the device manufacturer and will be from most preferred button to least preffered
     * button.  Note that this list only contains "user mappable" buttons.
     *
     * @todo Make method const and take care of calling initButtons or make that const too
     *
     */
    const QValueList<ODeviceButton> &buttons();
    /**
     * Returns the DeviceButton for the \a keyCode.  If \a keyCode is not found, it
     * returns 0L
     */
    const ODeviceButton *buttonForKeycode ( ushort keyCode );
    /**
     * Reassigns the pressed action for \a button.  To return to the factory
     * default pass an empty string as \a qcopMessage.
     */
    void remapPressedAction ( int button, const OQCopMessage &qcopMessage );
    /**
     * Reassigns the held action for \a button.  To return to the factory
     * default pass an empty string as \a qcopMessage.
     */
    void remapHeldAction ( int button, const OQCopMessage &qcopMessage );
    /**
     * How long (in ms) you have to press a button for a "hold" action
     */
    uint buttonHoldTime() const;
 signals:
    void buttonMappingChanged();
 private slots:
    void systemMessage ( const QCString &, const QByteArray & );
    void playingStopped();
 protected:
    void addPreHandler(QWSServer::KeyboardFilter*aFilter);
    void remPreHandler(QWSServer::KeyboardFilter*aFilter);
    void reloadButtonMapping();
    void changeMixerForAlarm( int mixer, const char* file, Sound *snd);
    /*  ugly virtual hook */
    virtual void virtual_hook( int id, void* data );
 };
 class ODeviceData {
  public:
    QString m_vendorstr;
    OVendor m_vendor;
    QString m_modelstr;
    OModel m_model;
    QString m_systemstr;
    OSystem m_system;
    QString m_sysverstr;
    Transformation m_rotation;
    ODirection m_direction;
    QString m_qteDriver;
    QValueList <ODeviceButton> *m_buttons;
    uint                        m_holdtime;
    QStrList                   *m_cpu_frequencies;
    bool    m_initializedButtonQcop : 1;
    /* values for changeMixerForAlarm */
    int m_sound, m_vol, m_mixer;
 };
 extern bool isQWS();
 extern QCString makeChannel ( const char *str );
 }
 }
 #endif
diff --git a/libopie2/opiecore/device/odevice_htc.h b/libopie2/opiecore/device/odevice_htc.h
new file mode 100644
index 0000000..5b707c8
--- a/dev/null
+++ b/libopie2/opiecore/device/odevice_htc.h
@@ -0,0 +1,154 @@
+/*
+ � � � � � � � �             This file is part of the Opie Project
+� � � � � � �                Copyright (C) 2002-2005 The Opie Team <opie-devel@handhelds.org>
+              =.             Copyright (C) 2002-2005 Michael 'Mickey' Lauer <mickey@Vanille.de>
+            .=l.
+� � � � � �.>+-=
+�_;:, � � .> � �:=|.         This program is free software; you can
+.> <`_, � > �. � <=          redistribute it and/or  modify it under
+:`=1 )Y*s>-.-- � :           the terms of the GNU Library General Public
+.="- .-=="i, � � .._         License as published by the Free Software
+�- . � .-<_> � � .<>         Foundation; version 2 of the License.
+� � �._= =} � � � :
+� � .%`+i> � � � _;_.
+� � .i_,=:_. � � �-<s.       This program is distributed in the hope that
+� � �+ �. �-:. � � � =       it will be useful,  but WITHOUT ANY WARRANTY;
+� � : .. � �.:, � � . . .    without even the implied warranty of
+� � =_ � � � �+ � � =;=|`    MERCHANTABILITY or FITNESS FOR A
+� _.=:. � � � : � �:=>`:     PARTICULAR PURPOSE. See the GNU
+..}^=.= � � � = � � � ;      Library General Public License for more
++= � -. � � .` � � .:       details.
+�: � � = �...= . :.=-
+�-. � .:....=;==+<;          You should have received a copy of the GNU
+� -_. . . � )=. �=           Library General Public License along with
+� � -- � � � �:-=`           this library; see the file COPYING.LIB.
+                             If not, write to the Free Software Foundation,
+                             Inc., 59 Temple Place - Suite 330,
+                             Boston, MA 02111-1307, USA.
+*/
+#ifndef ODEVICE_HTC
+#define ODEVICE_HTC
+#include "odevice_abstractmobiledevice.h"
+/* QT */
+#include <qfile.h>
+#include <qwindowsystem_qws.h>
+#ifndef ARRAY_SIZE
+#define ARRAY_SIZE(x) (sizeof(x) / sizeof((x)[0]))
+#endif
+// _IO and friends are only defined in kernel headers ...
+#define OD_IOC(dir,type,number,size)    (( dir << 30 ) | ( type << 8 ) | ( number ) | ( size << 16 ))
+#define OD_IO(type,number)              OD_IOC(0,type,number,0)
+#define OD_IOW(type,number,size)        OD_IOC(1,type,number,sizeof(size))
+#define OD_IOR(type,number,size)        OD_IOC(2,type,number,sizeof(size))
+#define OD_IORW(type,number,size)       OD_IOC(3,type,number,sizeof(size))
+// Audio
+#define SHARP_DEV_IOCTL_COMMAND_START 0x5680
+#define SHARP_BUZZER_IOCTL_START (SHARP_DEV_IOCTL_COMMAND_START)
+#define SHARP_BUZZER_MAKESOUND   (SHARP_BUZZER_IOCTL_START)
+#define SHARP_BUZ_TOUCHSOUND       1  /* touch panel sound */
+#define SHARP_BUZ_KEYSOUND         2  /* key sound */
+#define SHARP_BUZ_SCHEDULE_ALARM  11  /* schedule alarm */
+#define SHARP_BUZZER_SETVOLUME   (SHARP_BUZZER_IOCTL_START+1)
+#define SHARP_BUZZER_GETVOLUME   (SHARP_BUZZER_IOCTL_START+2)
+#define SHARP_BUZZER_ISSUPPORTED (SHARP_BUZZER_IOCTL_START+3)
+#define SHARP_BUZZER_SETMUTE     (SHARP_BUZZER_IOCTL_START+4)
+#define SHARP_BUZZER_STOPSOUND   (SHARP_BUZZER_IOCTL_START+5)
+// LED
+#define SHARP_LED_IOCTL_START (SHARP_DEV_IOCTL_COMMAND_START)
+#define SHARP_LED_SETSTATUS   (SHARP_LED_IOCTL_START+1)
+#define SHARP_LED_MAIL_EXISTS  9     /* mail status (exists or not) */
+#define LED_MAIL_NO_UNREAD_MAIL  0   /* for SHARP_LED_MAIL_EXISTS */
+#define LED_MAIL_NEWMAIL_EXISTS  1   /* for SHARP_LED_MAIL_EXISTS */
+#define LED_MAIL_UNREAD_MAIL_EX  2   /* for SHARP_LED_MAIL_EXISTS */
+// Rotation and Power Management
+#define SHARP_IOCTL_GET_ROTATION 0x413c
+#define APM_IOCGEVTSRC          OD_IOR( 'A', 203, int )
+#define APM_IOCSEVTSRC          OD_IORW( 'A', 204, int )
+#define APM_EVT_POWER_BUTTON    (1 << 0)
+// Brightness Embedix
+#define SHARP_FL_IOCTL_DEVICE   "/dev/sharp_fl"
+#define SHARP_FL_IOCTL_ON                  1
+#define SHARP_FL_IOCTL_OFF                 2
+#define SHARP_FL_IOCTL_STEP_CONTRAST     100
+#define SHARP_FL_IOCTL_GET_STEP_CONTRAST 101
+#define SHARP_FL_IOCTL_GET_STEP          102
+// Vesa Standard
+#define FB_BLANK_UNBLANK            0
+#define FB_BLANK_POWERDOWN          4
+namespace Opie {
+namespace Core {
+namespace Internal {
+class HTC : public OAbstractMobileDevice, public QWSServer::KeyboardFilter
+{
+  Q_OBJECT
+  protected:
+    virtual void init(const QString&);
+    virtual void initButtons();
+    void initHingeSensor();
+  protected slots:
+    void hingeSensorTriggered();
+    void systemMessage( const QCString &msg, const QByteArray & );
+  public:
+    virtual bool setDisplayBrightness( int b );
+    virtual bool setDisplayStatus( bool on );
+    virtual int displayBrightnessResolution() const;
+    virtual void playAlarmSound();
+    virtual void playKeySound();
+    virtual void playTouchSound();
+    virtual QValueList <OLed> ledList() const;
+    virtual QValueList <OLedState> ledStateList ( OLed led ) const;
+    virtual OLedState ledState( OLed led ) const;
+    virtual bool setLedState( OLed led, OLedState st );
+    virtual bool hasHingeSensor() const;
+    virtual OHingeStatus readHingeSensor() const;
+    virtual Transformation rotation() const;
+    virtual ODirection direction() const;
+    virtual bool suspend();
+  protected:
+    virtual void buzzer( int snd );
+    virtual bool filter( int unicode, int keycode, int modifiers, bool isPress, bool autoRepeat );
+    QString m_backlightdev;
+    OLedState m_leds[1];
+    bool m_embedix;
+    QFile m_hinge;
+};
+struct htc_button {
+    Qt::Key code;
+    char *utext;
+    char *pix;
+    char *fpressedservice;
+    char *fpressedaction;
+    char *fheldservice;
+    char *fheldaction;
+};
+}
+}
+}
+#endif
diff --git a/mkspecs/qws/linux-htc-g++/qmake.conf b/mkspecs/qws/linux-htc-g++/qmake.conf
new file mode 100644
index 0000000..76a0ad5
--- a/dev/null
+++ b/mkspecs/qws/linux-htc-g++/qmake.conf
@@ -0,0 +1,81 @@
+#
+# $Id$
+#
+# qmake configuration for linux-g++ using the arm-linux-g++ crosscompiler
+#
+        MAKEFILE_GENERATOR= UNIX
+        TEMPLATE        = app
+        CONFIG          += qt link_prl
+        QMAKE_CC        = $(CCACHE) $(DISTCC) $(shell which arm-linux-gcc)
+        QMAKE_LEX       = flex
+        QMAKE_LEXFLAGS  =
+        QMAKE_YACC      = yacc
+        QMAKE_YACCFLAGS         = -d
+        QMAKE_CFLAGS    = -pipe $(CFLAGS_EXTRA)
+        QMAKE_CFLAGS_WARN_ON= -Wall -W
+        QMAKE_CFLAGS_WARN_OFF=
+        QMAKE_CFLAGS_RELEASE= $(if $(CFLAGS_RELEASE),$(CFLAGS_RELEASE), -O2)
+        QMAKE_CFLAGS_DEBUG= -g
+        QMAKE_CFLAGS_SHLIB= -fPIC
+        QMAKE_CFLAGS_YACC= -Wno-unused -Wno-parentheses
+        QMAKE_CFLAGS_THREAD= -D_REENTRANT
+        QMAKE_CXX       = $(CCACHE) $(DISTCC) $(shell which arm-linux-g++) -DQT_QWS_IPAQ
+        QMAKE_CXXFLAGS  = $$QMAKE_CFLAGS  -DQWS -fno-exceptions -fno-rtti $(CXXFLAGS_EXTRA)
+        QMAKE_CXXFLAGS_WARN_ON= $$QMAKE_CFLAGS_WARN_ON
+        QMAKE_CXXFLAGS_WARN_OFF= $$QMAKE_CFLAGS_WARN_OFF
+        QMAKE_CXXFLAGS_RELEASE= $$QMAKE_CFLAGS_RELEASE
+        QMAKE_CXXFLAGS_DEBUG= $$QMAKE_CFLAGS_DEBUG
+        QMAKE_CXXFLAGS_SHLIB= $$QMAKE_CFLAGS_SHLIB
+        QMAKE_CXXFLAGS_YACC= $$QMAKE_CFLAGS_YACC
+        QMAKE_CXXFLAGS_THREAD= $$QMAKE_CFLAGS_THREAD
+        QMAKE_INCDIR    =
+        QMAKE_LIBDIR    =
+        QMAKE_INCDIR_X11= 
+        QMAKE_LIBDIR_X11= 
+        QMAKE_INCDIR_QT         = $(QTDIR)/include
+        QMAKE_LIBDIR_QT         = $(QTDIR)/lib
+        QMAKE_INCDIR_OPENGL= /usr/X11R6/include
+        QMAKE_LIBDIR_OPENGL= /usr/X11R6/lib
+        QMAKE_INCDIR_QTOPIA= $(QPEDIR)/include
+        QMAKE_LIBDIR_QTOPIA= $(QPEDIR)/lib
+        QMAKE_LINK      = arm-linux-g++
+        QMAKE_LINK_SHLIB= arm-linux-g++
+        QMAKE_LFLAGS    = $(LFLAGS_EXTRA)
+        QMAKE_LFLAGS_RELEASE=
+        QMAKE_LFLAGS_DEBUG=
+QMAKE_LFLAGS_SHLIB      = -shared
+QMAKE_LFLAGS_PLUGIN     = $$QMAKE_LFLAGS_SHLIB
+QMAKE_LFLAGS_SONAME     = -Wl,-soname,
+QMAKE_LFLAGS_THREAD     =
+QMAKE_RPATH             = -Wl,-rpath-link,
+        QMAKE_LIBS      = $(LIBS_EXTRA)
+QMAKE_LIBS_DYNLOAD      = -ldl
+        QMAKE_LIBS_X11  = 
+        QMAKE_LIBS_X11SM= 
+        QMAKE_LIBS_QT   = -lqte
+QMAKE_LIBS_QT_THREAD    = -lqte-mt
+        QMAKE_LIBS_QT_OPENGL= -lqgl
+        QMAKE_LIBS_QTOPIA= -lqtopia -lqpe
+QMAKE_LIBS_THREAD       = -lpthread
+        QMAKE_MOC       = $(QTDIR)/bin/moc
+        QMAKE_UIC       = $(QTDIR)/bin/uic
+        QMAKE_AR        = ar cqs
+        QMAKE_RANLIB    =
+        QMAKE_TAR       = tar -cf
+        QMAKE_GZIP      = gzip -9f
+        QMAKE_COPY      = cp -f
+        QMAKE_MOVE      = mv -f
+        QMAKE_DEL_FILE  = rm -f
+        QMAKE_DEL_DIR   = rmdir
+        QMAKE_CHK_DIR_EXISTS= test -d
+        QMAKE_MKDIR     = mkdir -p