-rw-r--r-- | core/launcher/inputmethods.cpp | 14 | ||||
-rw-r--r-- | core/launcher/inputmethods.h | 2 | ||||
-rw-r--r-- | core/launcher/taskbar.cpp | 41 | ||||
-rw-r--r-- | core/launcher/taskbar.h | 30 |
4 files changed, 48 insertions, 39 deletions
diff --git a/core/launcher/inputmethods.cpp b/core/launcher/inputmethods.cpp index f0d8294..d89a366 100644 --- a/core/launcher/inputmethods.cpp +++ b/core/launcher/inputmethods.cpp | |||
@@ -70,8 +70,2 @@ static const char * tri_xpm[]={ | |||
70 | 70 | ||
71 | static const int inputWidgetStyle = QWidget::WStyle_Customize | | ||
72 | QWidget::WStyle_Tool | | ||
73 | QWidget::WStyle_StaysOnTop | | ||
74 | QWidget::WGroupLeader; | ||
75 | |||
76 | |||
77 | int InputMethod::operator <(const InputMethod& o) const | 71 | int InputMethod::operator <(const InputMethod& o) const |
@@ -106,2 +100,8 @@ InputMethods::InputMethods( QWidget *parent ) : | |||
106 | { | 100 | { |
101 | Config cfg( "Launcher" ); | ||
102 | cfg.setGroup( "InputMethods" ); | ||
103 | inputWidgetStyle = QWidget::WStyle_Customize | QWidget::WStyle_StaysOnTop | QWidget::WGroupLeader; | ||
104 | inputWidgetStyle |= cfg.readBoolEntry( "Float", false ) ? QWidget::WStyle_DialogBorder : QWidget::WStyle_Tool; | ||
105 | inputWidgetWidth = cfg.readNumEntry( "Width", 100 ); | ||
106 | |||
107 | setBackgroundMode( PaletteBackground ); | 107 | setBackgroundMode( PaletteBackground ); |
@@ -539,3 +539,3 @@ void InputMethods::showKbd( bool on ) | |||
539 | int height = QMIN( mkeyboard->widget->sizeHint().height(), 134 ); | 539 | int height = QMIN( mkeyboard->widget->sizeHint().height(), 134 ); |
540 | mkeyboard->widget->resize( qApp->desktop()->width(), height ); | 540 | mkeyboard->widget->resize( qApp->desktop()->width() * (inputWidgetWidth*0.01), height ); |
541 | mkeyboard->widget->move( 0, mapToGlobal( QPoint() ).y() - height ); | 541 | mkeyboard->widget->move( 0, mapToGlobal( QPoint() ).y() - height ); |
diff --git a/core/launcher/inputmethods.h b/core/launcher/inputmethods.h index 93b69de..246661a 100644 --- a/core/launcher/inputmethods.h +++ b/core/launcher/inputmethods.h | |||
@@ -105,2 +105,4 @@ private: | |||
105 | QValueList<InputMethod> inputModifierList; | 105 | QValueList<InputMethod> inputModifierList; |
106 | int inputWidgetStyle; | ||
107 | int inputWidgetWidth; | ||
106 | }; | 108 | }; |
diff --git a/core/launcher/taskbar.cpp b/core/launcher/taskbar.cpp index 37fdb30..2966168 100644 --- a/core/launcher/taskbar.cpp +++ b/core/launcher/taskbar.cpp | |||
@@ -30,2 +30,3 @@ | |||
30 | 30 | ||
31 | #include <qtopia/config.h> | ||
31 | #include <qtopia/qpeapplication.h> | 32 | #include <qtopia/qpeapplication.h> |
@@ -174,2 +175,6 @@ TaskBar::TaskBar() : QHBox(0, 0, WStyle_Customize | WStyle_Tool | WStyle_StaysOn | |||
174 | { | 175 | { |
176 | Config cfg( "Launcher" ); | ||
177 | cfg.setGroup( "InputMethods" ); | ||
178 | resizeRunningApp = cfg.readBoolEntry( "Resize", true ); | ||
179 | |||
175 | sm = new StartMenu( this ); | 180 | sm = new StartMenu( this ); |
@@ -293,22 +298,20 @@ void TaskBar::calcMaxWindowRect() | |||
293 | { | 298 | { |
294 | /* | 299 | if ( resizeRunningApp ) |
295 | #ifdef Q_WS_QWS | 300 | { |
296 | QRect wr; | 301 | #if defined(Q_WS_QWS) |
297 | int displayWidth = qApp->desktop()->width(); | 302 | QRect wr; |
298 | QRect ir = inputMethods->inputRect(); | 303 | int displayWidth = qApp->desktop()->width(); |
299 | if ( ir.isValid() ) { | 304 | QRect ir = inputMethods->inputRect(); |
300 | wr.setCoords( 0, 0, displayWidth-1, ir.top()-1 ); | 305 | if ( ir.isValid() ) { |
301 | } else { | 306 | wr.setCoords( 0, 0, displayWidth-1, ir.top()-1 ); |
302 | wr.setCoords( 0, 0, displayWidth-1, y()-1 ); | 307 | } else { |
308 | wr.setCoords( 0, 0, displayWidth-1, y()-1 ); | ||
309 | } | ||
310 | #if QT_VERSION < 0x030000 | ||
311 | QWSServer::setMaxWindowRect( qt_screen->mapToDevice(wr,QSize(qt_screen->width(),qt_screen->height())) ); | ||
312 | #else | ||
313 | QWSServer::setMaxWindowRect( wr ); | ||
314 | #endif | ||
315 | #endif | ||
303 | } | 316 | } |
304 | |||
305 | #if QT_VERSION < 0x030000 | ||
306 | QWSServer::setMaxWindowRect( qt_screen->mapToDevice(wr, | ||
307 | QSize(qt_screen->width(),qt_screen->height())) | ||
308 | ); | ||
309 | #else | ||
310 | QWSServer::setMaxWindowRect( wr ); | ||
311 | #endif | ||
312 | #endif | ||
313 | */ | ||
314 | } | 317 | } |
diff --git a/core/launcher/taskbar.h b/core/launcher/taskbar.h index 0cfc123..ed558b1 100644 --- a/core/launcher/taskbar.h +++ b/core/launcher/taskbar.h | |||
@@ -1,5 +1,5 @@ | |||
1 | /********************************************************************** | 1 | /********************************************************************** |
2 | ** Copyright (C) 2000 Trolltech AS. All rights reserved. | 2 | ** Copyright (C) 2000-2002 Trolltech AS. All rights reserved. |
3 | ** | 3 | ** |
4 | ** This file is part of Qtopia Environment. | 4 | ** This file is part of the Qtopia Environment. |
5 | ** | 5 | ** |
@@ -20,6 +20,8 @@ | |||
20 | 20 | ||
21 | #ifndef __TASKBAR_H__ | 21 | #ifndef TASKBAR_H |
22 | #define __TASKBAR_H__ | 22 | #define TASKBAR_H |
23 | 23 | ||
24 | #include <qhbox.h> | 24 | #include <qhbox.h> |
25 | #include "serverinterface.h" | ||
26 | #include "startmenu.h" | ||
25 | 27 | ||
@@ -34,4 +36,4 @@ class QTimer; | |||
34 | class QLabel; | 36 | class QLabel; |
35 | class StartMenu; | ||
36 | class LockKeyState; | 37 | class LockKeyState; |
38 | class AppLnkSet; | ||
37 | 39 | ||
@@ -43,7 +45,9 @@ public: | |||
43 | 45 | ||
44 | static QWidget *calibrate( bool ); | 46 | void launchStartMenu() { if (sm) sm->launch(); } |
47 | void refreshStartMenu() { if (sm) sm->refreshMenu(); } | ||
48 | void setApplicationState( const QString &name, ServerInterface::ApplicationState state ); | ||
45 | 49 | ||
46 | bool recoverMemory(); | 50 | signals: |
51 | void tabSelected(const QString&); | ||
47 | 52 | ||
48 | StartMenu *startMenu() const { return sm; } | ||
49 | public slots: | 53 | public slots: |
@@ -52,2 +56,3 @@ public slots: | |||
52 | void stopWait(); | 56 | void stopWait(); |
57 | |||
53 | void clearStatusBar(); | 58 | void clearStatusBar(); |
@@ -56,2 +61,3 @@ public slots: | |||
56 | void toggleSymbolInput(); | 61 | void toggleSymbolInput(); |
62 | void calcMaxWindowRect(); | ||
57 | 63 | ||
@@ -61,5 +67,3 @@ protected: | |||
61 | void setStatusMessage( const QString &text ); | 67 | void setStatusMessage( const QString &text ); |
62 | 68 | ||
63 | public slots: | ||
64 | void calcMaxWindowRect(); | ||
65 | private slots: | 69 | private slots: |
@@ -68,3 +72,2 @@ private slots: | |||
68 | private: | 72 | private: |
69 | |||
70 | QTimer *waitTimer; | 73 | QTimer *waitTimer; |
@@ -79,2 +82,3 @@ private: | |||
79 | StartMenu *sm; | 82 | StartMenu *sm; |
83 | bool resizeRunningApp; | ||
80 | }; | 84 | }; |
@@ -82,2 +86,2 @@ private: | |||
82 | 86 | ||
83 | #endif // __TASKBAR_H__ | 87 | #endif // TASKBAR_H |