author | erik <erik> | 2007-01-19 01:15:31 (UTC) |
---|---|---|
committer | erik <erik> | 2007-01-19 01:15:31 (UTC) |
commit | ac0ce844e90a64247c0adb210e0a23021b011d57 (patch) (unidiff) | |
tree | 1fd3b8d0c24d8f2054ed45e7e2e102f940343462 | |
parent | 1ab92f1d2b346de7da8ca5c3aaa6bc75b43981e7 (diff) | |
download | opie-ac0ce844e90a64247c0adb210e0a23021b011d57.zip opie-ac0ce844e90a64247c0adb210e0a23021b011d57.tar.gz opie-ac0ce844e90a64247c0adb210e0a23021b011d57.tar.bz2 |
Commit of Paul's patch to remove a macro and substitute it with a
class variable.
-rw-r--r-- | library/qpeapplication.cpp | 16 | ||||
-rw-r--r-- | library/qpeapplication.h | 2 | ||||
-rw-r--r-- | library/widget_showing.cpp | 9 |
3 files changed, 15 insertions, 12 deletions
diff --git a/library/qpeapplication.cpp b/library/qpeapplication.cpp index dcc1001..34f5e6a 100644 --- a/library/qpeapplication.cpp +++ b/library/qpeapplication.cpp | |||
@@ -103,2 +103,3 @@ | |||
103 | static bool useBigPixmaps = 0; | 103 | static bool useBigPixmaps = 0; |
104 | static bool saveWindowsPos = 0; | ||
104 | 105 | ||
@@ -131,2 +132,3 @@ public: | |||
131 | bigIconSize = cfg.readNumEntry( "BigIconSize", 32 ); | 132 | bigIconSize = cfg.readNumEntry( "BigIconSize", 32 ); |
133 | saveWindowsPos = cfg.readBoolEntry( "AllowWindowed", false ); | ||
132 | #ifdef OPIE_WITHROHFEEDBACK | 134 | #ifdef OPIE_WITHROHFEEDBACK |
@@ -252,3 +254,4 @@ public: | |||
252 | { | 254 | { |
253 | #ifndef OPIE_NO_WINDOWED | 255 | if (!saveWindowsPos) |
256 | return FALSE; | ||
254 | maximized = TRUE; | 257 | maximized = TRUE; |
@@ -274,4 +277,2 @@ public: | |||
274 | } | 277 | } |
275 | #endif | ||
276 | return FALSE; | ||
277 | } | 278 | } |
@@ -324,3 +325,4 @@ public: | |||
324 | return; | 325 | return; |
325 | #ifndef OPIE_NO_WINDOWED | 326 | if (!saveWindowsPos) |
327 | return; | ||
326 | // 350 is the trigger in qwsdefaultdecoration for providing a resize button | 328 | // 350 is the trigger in qwsdefaultdecoration for providing a resize button |
@@ -345,3 +347,2 @@ public: | |||
345 | cfg.writeEntry( app, s ); | 347 | cfg.writeEntry( app, s ); |
346 | #endif | ||
347 | } | 348 | } |
@@ -2209,2 +2210,7 @@ void QPEApplication::hideOrQuit() | |||
2209 | 2210 | ||
2211 | bool QPEApplication::isSaveWindowsPos() | ||
2212 | { | ||
2213 | return saveWindowsPos; | ||
2214 | } | ||
2215 | |||
2210 | #if (__GNUC__ > 2 ) && !defined(_OS_MACX_) | 2216 | #if (__GNUC__ > 2 ) && !defined(_OS_MACX_) |
diff --git a/library/qpeapplication.h b/library/qpeapplication.h index 6486cad..7c99a9a 100644 --- a/library/qpeapplication.h +++ b/library/qpeapplication.h | |||
@@ -139,2 +139,4 @@ public: | |||
139 | 139 | ||
140 | static bool isSaveWindowsPos(); | ||
141 | |||
140 | signals: | 142 | signals: |
diff --git a/library/widget_showing.cpp b/library/widget_showing.cpp index e43a16a..cc1bfb2 100644 --- a/library/widget_showing.cpp +++ b/library/widget_showing.cpp | |||
@@ -54,9 +54,4 @@ void QPEApplication::showWidget( QWidget* wg, bool nomax ) { | |||
54 | 54 | ||
55 | #ifdef OPIE_NO_WINDOWED | 55 | if ( !isSaveWindowsPos() || (!nomax |
56 | Q_UNUSED( nomax ) | 56 | && ( qApp->desktop()->width() <= 30 )) ){ |
57 | if ( TRUE ) { | ||
58 | #else | ||
59 | if ( !nomax | ||
60 | && ( qApp->desktop()->width() <= 320 ) ){ | ||
61 | #endif | ||
62 | wg->showMaximized(); | 57 | wg->showMaximized(); |