-rw-r--r-- | library/qpeapplication.cpp | 36 |
1 files changed, 19 insertions, 17 deletions
diff --git a/library/qpeapplication.cpp b/library/qpeapplication.cpp index 35f433c..c6d9cfd 100644 --- a/library/qpeapplication.cpp +++ b/library/qpeapplication.cpp | |||
@@ -98,10 +98,9 @@ | |||
98 | #include "qt_override_p.h" | 98 | #include "qt_override_p.h" |
99 | 99 | ||
100 | #include <qpe/rohfeedback.h> | 100 | #include <backend/rohfeedback.h> |
101 | 101 | ||
102 | 102 | ||
103 | static bool useBigPixmaps = 0; | 103 | static bool useBigPixmaps = 0; |
104 | 104 | ||
105 | |||
106 | class HackWidget : public QWidget | 105 | class HackWidget : public QWidget |
107 | { | 106 | { |
@@ -117,6 +116,6 @@ class QPEApplicationData | |||
117 | { | 116 | { |
118 | public: | 117 | public: |
119 | QPEApplicationData ( ) | 118 | QPEApplicationData ( ) : |
120 | : presstimer( 0 ), presswidget( 0 ), rightpressed( false ), kbgrabbed( false ), | 119 | presstimer( 0 ), presswidget( 0 ), rightpressed( false ), kbgrabbed( false ), |
121 | notbusysent( false ), preloaded( false ), forceshow( false ), nomaximize( false ), | 120 | notbusysent( false ), preloaded( false ), forceshow( false ), nomaximize( false ), |
122 | keep_running( true ), qcopQok( false ), | 121 | keep_running( true ), qcopQok( false ), |
@@ -131,5 +130,5 @@ public: | |||
131 | smallIconSize = cfg.readNumEntry( "SmallIconSize", 14 ); | 130 | smallIconSize = cfg.readNumEntry( "SmallIconSize", 14 ); |
132 | bigIconSize = cfg.readNumEntry( "BigIconSize", 32 ); | 131 | bigIconSize = cfg.readNumEntry( "BigIconSize", 32 ); |
133 | #ifdef OPIE_ROHFEEDBACK | 132 | #ifdef OPIE_WITHROHFEEDBACK |
134 | RoH = 0; | 133 | RoH = 0; |
135 | #endif | 134 | #endif |
@@ -139,5 +138,5 @@ public: | |||
139 | QWidget* presswidget; | 138 | QWidget* presswidget; |
140 | QPoint presspos; | 139 | QPoint presspos; |
141 | #ifdef OPIE_ROHFEEDBACK | 140 | #ifdef OPIE_WITHROHFEEDBACK |
142 | Opie::Internal::RoHFeedback *RoH; | 141 | Opie::Internal::RoHFeedback *RoH; |
143 | #endif | 142 | #endif |
@@ -503,4 +502,5 @@ static void qpe_show_dialog( QDialog* d, bool nomax ) | |||
503 | } | 502 | } |
504 | } | 503 | } |
504 | |||
505 | }; | 505 | }; |
506 | 506 | ||
@@ -1216,5 +1216,7 @@ QPEApplication::~QPEApplication() | |||
1216 | delete pidChannel; | 1216 | delete pidChannel; |
1217 | #endif | 1217 | #endif |
1218 | #ifdef OPIE_ROHFEEDBACK | 1218 | |
1219 | #ifdef OPIE_WITHROHFEEDBACK | ||
1220 | if( d->RoH ) | ||
1219 | delete d->RoH; | 1221 | delete d->RoH; |
1220 | #endif | 1222 | #endif |
@@ -2036,18 +2038,18 @@ bool QPEApplication::eventFilter( QObject *o, QEvent *e ) | |||
2036 | case QEvent::MouseButtonPress: | 2038 | case QEvent::MouseButtonPress: |
2037 | if ( me->button() == LeftButton ) { | 2039 | if ( me->button() == LeftButton ) { |
2040 | static long Pref = 500; // #### pref. | ||
2038 | d->presswidget = (QWidget*)o; | 2041 | d->presswidget = (QWidget*)o; |
2039 | d->presspos = me->pos(); | 2042 | d->presspos = me->pos(); |
2040 | d->rightpressed = FALSE; | 2043 | d->rightpressed = FALSE; |
2041 | // just for the time being | 2044 | #ifdef OPIE_WITHROHFEEDBACK |
2042 | static int pref = 500; | ||
2043 | #ifdef OPIE_ROHFEEDBACK | ||
2044 | if( ! d->RoH ) | 2045 | if( ! d->RoH ) |
2045 | d->RoH = new Opie::Internal::RoHFeedback; | 2046 | d->RoH = new Opie::Internal::RoHFeedback; |
2046 | 2047 | ||
2047 | d->RoH->init( me->globalPos(), d->presswidget ); | 2048 | d->RoH->init( me->globalPos(), d->presswidget ); |
2048 | pref = d->RoH->delay(); | 2049 | Pref = d->RoH->delay(); |
2050 | |||
2049 | #endif | 2051 | #endif |
2050 | if (!d->presstimer ) | 2052 | if (!d->presstimer ) |
2051 | d->presstimer = startTimer( pref ); // #### pref. | 2053 | d->presstimer = startTimer( Pref ); // #### pref. |
2052 | 2054 | ||
2053 | } | 2055 | } |
@@ -2056,6 +2058,5 @@ bool QPEApplication::eventFilter( QObject *o, QEvent *e ) | |||
2056 | if (d->presstimer && (me->pos() - d->presspos).manhattanLength() > 8) { | 2058 | if (d->presstimer && (me->pos() - d->presspos).manhattanLength() > 8) { |
2057 | killTimer(d->presstimer); | 2059 | killTimer(d->presstimer); |
2058 | #ifdef OPIE_ROHFEEDBACK | 2060 | #ifdef OPIE_WITHROHFEEDBACK |
2059 | if( d->RoH ) | ||
2060 | d->RoH->stop( ); | 2061 | d->RoH->stop( ); |
2061 | #endif | 2062 | #endif |
@@ -2067,6 +2068,5 @@ bool QPEApplication::eventFilter( QObject *o, QEvent *e ) | |||
2067 | if ( d->presstimer ) { | 2068 | if ( d->presstimer ) { |
2068 | killTimer(d->presstimer); | 2069 | killTimer(d->presstimer); |
2069 | #ifdef OPIE_ROHFEEDBACK | 2070 | #ifdef OPIE_WITHROHFEEDBACK |
2070 | if( d->RoH ) | ||
2071 | d->RoH->stop( ); | 2071 | d->RoH->stop( ); |
2072 | #endif | 2072 | #endif |
@@ -2074,4 +2074,5 @@ bool QPEApplication::eventFilter( QObject *o, QEvent *e ) | |||
2074 | } | 2074 | } |
2075 | if ( d->rightpressed && d->presswidget ) { | 2075 | if ( d->rightpressed && d->presswidget ) { |
2076 | printf( "Send ButtonRelease\n" ); | ||
2076 | // Right released | 2077 | // Right released |
2077 | postEvent( d->presswidget, | 2078 | postEvent( d->presswidget, |
@@ -2117,4 +2118,5 @@ void QPEApplication::timerEvent( QTimerEvent *e ) | |||
2117 | { | 2118 | { |
2118 | if ( e->timerId() == d->presstimer && d->presswidget ) { | 2119 | if ( e->timerId() == d->presstimer && d->presswidget ) { |
2120 | |||
2119 | // Right pressed | 2121 | // Right pressed |
2120 | postEvent( d->presswidget, | 2122 | postEvent( d->presswidget, |
@@ -2124,5 +2126,5 @@ void QPEApplication::timerEvent( QTimerEvent *e ) | |||
2124 | d->presstimer = 0; | 2126 | d->presstimer = 0; |
2125 | d->rightpressed = TRUE; | 2127 | d->rightpressed = TRUE; |
2126 | #ifdef OPIE_ROHFEEDBACK | 2128 | #ifdef OPIE_WITHROHFEEDBACK |
2127 | d->RoH->stop(); | 2129 | d->RoH->stop(); |
2128 | #endif | 2130 | #endif |