-rw-r--r-- | libopie/odevice.cpp | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/libopie/odevice.cpp b/libopie/odevice.cpp index 0e1c0dd..29c8ad2 100644 --- a/libopie/odevice.cpp +++ b/libopie/odevice.cpp | |||
@@ -54,32 +54,33 @@ using namespace Opie; | |||
54 | class ODeviceData { | 54 | class ODeviceData { |
55 | public: | 55 | public: |
56 | bool m_qwsserver : 1; | 56 | bool m_qwsserver : 1; |
57 | 57 | ||
58 | QString m_vendorstr; | 58 | QString m_vendorstr; |
59 | OVendor m_vendor; | 59 | OVendor m_vendor; |
60 | 60 | ||
61 | QString m_modelstr; | 61 | QString m_modelstr; |
62 | OModel m_model; | 62 | OModel m_model; |
63 | 63 | ||
64 | QString m_systemstr; | 64 | QString m_systemstr; |
65 | OSystem m_system; | 65 | OSystem m_system; |
66 | 66 | ||
67 | QString m_sysverstr; | 67 | QString m_sysverstr; |
68 | 68 | ||
69 | Transformation m_rotation; | 69 | Transformation m_rotation; |
70 | ODirection m_direction; | ||
70 | 71 | ||
71 | QValueList <ODeviceButton> *m_buttons; | 72 | QValueList <ODeviceButton> *m_buttons; |
72 | uint m_holdtime; | 73 | uint m_holdtime; |
73 | }; | 74 | }; |
74 | 75 | ||
75 | 76 | ||
76 | class iPAQ : public ODevice, public QWSServer::KeyboardFilter { | 77 | class iPAQ : public ODevice, public QWSServer::KeyboardFilter { |
77 | protected: | 78 | protected: |
78 | virtual void init ( ); | 79 | virtual void init ( ); |
79 | virtual void initButtons ( ); | 80 | virtual void initButtons ( ); |
80 | 81 | ||
81 | public: | 82 | public: |
82 | virtual bool setSoftSuspend ( bool soft ); | 83 | virtual bool setSoftSuspend ( bool soft ); |
83 | 84 | ||
84 | virtual bool setDisplayBrightness ( int b ); | 85 | virtual bool setDisplayBrightness ( int b ); |
85 | virtual int displayBrightnessResolution ( ) const; | 86 | virtual int displayBrightnessResolution ( ) const; |
@@ -241,32 +242,33 @@ ODevice *ODevice::inst ( ) | |||
241 | 242 | ||
242 | 243 | ||
243 | ODevice::ODevice ( ) | 244 | ODevice::ODevice ( ) |
244 | { | 245 | { |
245 | d = new ODeviceData; | 246 | d = new ODeviceData; |
246 | 247 | ||
247 | d-> m_qwsserver = qApp ? ( qApp-> type ( ) == QApplication::GuiServer ) : false; | 248 | d-> m_qwsserver = qApp ? ( qApp-> type ( ) == QApplication::GuiServer ) : false; |
248 | 249 | ||
249 | d-> m_modelstr = "Unknown"; | 250 | d-> m_modelstr = "Unknown"; |
250 | d-> m_model = Model_Unknown; | 251 | d-> m_model = Model_Unknown; |
251 | d-> m_vendorstr = "Unknown"; | 252 | d-> m_vendorstr = "Unknown"; |
252 | d-> m_vendor = Vendor_Unknown; | 253 | d-> m_vendor = Vendor_Unknown; |
253 | d-> m_systemstr = "Unknown"; | 254 | d-> m_systemstr = "Unknown"; |
254 | d-> m_system = System_Unknown; | 255 | d-> m_system = System_Unknown; |
255 | d-> m_sysverstr = "0.0"; | 256 | d-> m_sysverstr = "0.0"; |
256 | d-> m_rotation = Rot0; | 257 | d-> m_rotation = Rot0; |
258 | d-> m_direction = CW; | ||
257 | 259 | ||
258 | d-> m_holdtime = 1000; // 1000ms | 260 | d-> m_holdtime = 1000; // 1000ms |
259 | d-> m_buttons = 0; | 261 | d-> m_buttons = 0; |
260 | } | 262 | } |
261 | 263 | ||
262 | void ODevice::systemMessage ( const QCString &msg, const QByteArray & ) | 264 | void ODevice::systemMessage ( const QCString &msg, const QByteArray & ) |
263 | { | 265 | { |
264 | if ( msg == "deviceButtonMappingChanged()" ) { | 266 | if ( msg == "deviceButtonMappingChanged()" ) { |
265 | reloadButtonMapping ( ); | 267 | reloadButtonMapping ( ); |
266 | } | 268 | } |
267 | } | 269 | } |
268 | 270 | ||
269 | void ODevice::init ( ) | 271 | void ODevice::init ( ) |
270 | { | 272 | { |
271 | } | 273 | } |
272 | 274 | ||
@@ -457,32 +459,40 @@ OSystem ODevice::system ( ) const | |||
457 | * @return the version string of the base system | 459 | * @return the version string of the base system |
458 | */ | 460 | */ |
459 | QString ODevice::systemVersionString ( ) const | 461 | QString ODevice::systemVersionString ( ) const |
460 | { | 462 | { |
461 | return d-> m_sysverstr; | 463 | return d-> m_sysverstr; |
462 | } | 464 | } |
463 | 465 | ||
464 | /** | 466 | /** |
465 | * @return the current Transformation | 467 | * @return the current Transformation |
466 | */ | 468 | */ |
467 | Transformation ODevice::rotation ( ) const | 469 | Transformation ODevice::rotation ( ) const |
468 | { | 470 | { |
469 | return d-> m_rotation; | 471 | return d-> m_rotation; |
470 | } | 472 | } |
471 | 473 | ||
472 | /** | 474 | /** |
475 | * @return the current rotation direction | ||
476 | */ | ||
477 | ODirection ODevice::direction ( ) const | ||
478 | { | ||
479 | return d-> m_direction; | ||
480 | } | ||
481 | |||
482 | /** | ||
473 | * This plays an alarmSound | 483 | * This plays an alarmSound |
474 | */ | 484 | */ |
475 | void ODevice::alarmSound ( ) | 485 | void ODevice::alarmSound ( ) |
476 | { | 486 | { |
477 | #ifndef QT_NO_SOUND | 487 | #ifndef QT_NO_SOUND |
478 | static Sound snd ( "alarm" ); | 488 | static Sound snd ( "alarm" ); |
479 | 489 | ||
480 | if ( snd. isFinished ( )) | 490 | if ( snd. isFinished ( )) |
481 | snd. play ( ); | 491 | snd. play ( ); |
482 | #endif | 492 | #endif |
483 | } | 493 | } |
484 | 494 | ||
485 | /** | 495 | /** |
486 | * This plays a key sound | 496 | * This plays a key sound |
487 | */ | 497 | */ |
488 | void ODevice::keySound ( ) | 498 | void ODevice::keySound ( ) |