Start with some customization bits for inputmethods as part of the

BigScreen initiative. You can now choose to have free floating and
resizable inputmethods.
Two outstanding things: 1.) Hiding the inputmethod via the [x] button
confuses the show/hide toggle button. 2.) The new size and position of
a moved/resized inputmethod should be remembered.

4 files changed, 35 insertions, 26 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
@@ -59,30 +59,24 @@ static const char * tri_xpm[]={
 "a c #000000",
 ". c None",
 ".........",
 ".........",
 ".........",
 "....a....",
 "...aaa...",
 "..aaaaa..",
 ".aaaaaaa.",
 ".........",
 "........."};
 
-static const int inputWidgetStyle = QWidget::WStyle_Customize |
-				    QWidget::WStyle_Tool |
-				    QWidget::WStyle_StaysOnTop |
-				    QWidget::WGroupLeader;
-
-
 int InputMethod::operator <(const InputMethod& o) const
 {
     return name() < o.name();
 }
 int InputMethod::operator >(const InputMethod& o) const
 {
     return name() > o.name();
 }
 int InputMethod::operator <=(const InputMethod& o) const
 {
     return name() <= o.name();
 }
@@ -95,24 +89,30 @@ int InputMethod::operator <=(const InputMethod& o) const
 class IMToolButton : public QToolButton
 {
 public:
     IMToolButton::IMToolButton( QWidget *parent ) : QToolButton( parent )
     { setWFlags( WStyle_Tool ); }
 };
 
 
 InputMethods::InputMethods( QWidget *parent ) :
     QWidget( parent, "InputMethods", WStyle_Tool | WStyle_Customize ),
     mkeyboard(0), imethod(0)
 {
+    Config cfg( "Launcher" );
+    cfg.setGroup( "InputMethods" );
+    inputWidgetStyle = QWidget::WStyle_Customize | QWidget::WStyle_StaysOnTop | QWidget::WGroupLeader;
+    inputWidgetStyle |= cfg.readBoolEntry( "Float", false ) ? QWidget::WStyle_DialogBorder : QWidget::WStyle_Tool;
+    inputWidgetWidth = cfg.readNumEntry( "Width", 100 );
+
     setBackgroundMode( PaletteBackground );
     QHBoxLayout *hbox = new QHBoxLayout( this );
 
     kbdButton = new IMToolButton( this);
     kbdButton->setFocusPolicy(NoFocus);
     kbdButton->setToggleButton( TRUE );
     if (parent->sizeHint().height() > 0)
 	kbdButton->setFixedHeight( parent->sizeHint().height() );
     kbdButton->setFixedWidth( 32 );
     kbdButton->setAutoRaise( TRUE );
     kbdButton->setUsesBigPixmap( TRUE );
     hbox->addWidget( kbdButton );
@@ -528,25 +528,25 @@ void InputMethods::qcopReceive( const QCString &msg, const QByteArray &data )
 
 
 void InputMethods::showKbd( bool on )
 {
     if ( !mkeyboard )
 	return;
 
     if ( on ) {
 	mkeyboard->resetState();
 	// HACK... Make the texteditor fit with all input methods
 	// Input methods should also never use more than about 40% of the screen
 	int height = QMIN( mkeyboard->widget->sizeHint().height(), 134 );
-	mkeyboard->widget->resize( qApp->desktop()->width(), height );
+	mkeyboard->widget->resize( qApp->desktop()->width() * (inputWidgetWidth*0.01), height );
 	mkeyboard->widget->move( 0, mapToGlobal( QPoint() ).y() - height );
 	mkeyboard->widget->show();
     } else {
 	mkeyboard->widget->hide();
     }
 
     emit inputToggled( on );
 }
 
 bool InputMethods::shown() const
 {
     return mkeyboard && mkeyboard->widget->isVisible();
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
@@ -94,17 +94,19 @@ private:
     void chooseKeyboard(InputMethod* im);
     void updateKeyboards(InputMethod *im);
 
 private:
     QToolButton *kbdButton;
     QToolButton *kbdChoice;
     QWidgetStack *imButton; // later will be widget stack
     QToolButton *imChoice;
     InputMethod *mkeyboard;
     InputMethod *imethod;
     QValueList<InputMethod> inputMethodList;
     QValueList<InputMethod> inputModifierList;
+    int inputWidgetStyle;
+    int inputWidgetWidth;
 };
 
 
 #endif // __INPUT_METHODS_H__
 
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
@@ -19,24 +19,25 @@
 **********************************************************************/
 
 #include "startmenu.h"
 #include "inputmethods.h"
 #include "runningappbar.h"
 #include "systray.h"
 #include "wait.h"
 #include "appicons.h"
 
 #include "taskbar.h"
 #include "server.h"
 
+#include <qtopia/config.h>
 #include <qtopia/qpeapplication.h>
 #ifdef QWS
 #include <qtopia/qcopenvelope_qws.h>
 #endif
 #include <qtopia/global.h>
 #include <qtopia/custom.h>
 
 #include <qlabel.h>
 #include <qlayout.h>
 #include <qtimer.h>
 #ifdef QWS
 #include <qwindowsystem_qws.h>
@@ -163,24 +164,28 @@ private:
     bool nl, cl;
 };
 
 //---------------------------------------------------------------------------
 
 TaskBar::~TaskBar()
 {
 }
 
 
 TaskBar::TaskBar() : QHBox(0, 0, WStyle_Customize | WStyle_Tool | WStyle_StaysOnTop | WGroupLeader)
 {
+    Config cfg( "Launcher" );
+    cfg.setGroup( "InputMethods" );
+    resizeRunningApp = cfg.readBoolEntry( "Resize", true );
+
     sm = new StartMenu( this );
     connect( sm, SIGNAL(tabSelected(const QString&)), this,
 	    SIGNAL(tabSelected(const QString&)) );
 
     inputMethods = new InputMethods( this );
     connect( inputMethods, SIGNAL(inputToggled(bool)),
 	     this, SLOT(calcMaxWindowRect()) );
 
     stack = new QWidgetStack( this );
     stack->setSizePolicy( QSizePolicy( QSizePolicy::Expanding, QSizePolicy::Minimum ) );
     label = new QLabel(stack);
 
@@ -282,44 +287,42 @@ void TaskBar::resizeEvent( QResizeEvent *e )
 
     qWarning("TaskBar::resize event");
 }
 
 void TaskBar::styleChange( QStyle &s )
 {
     QHBox::styleChange( s );
     calcMaxWindowRect();
 }
 
 void TaskBar::calcMaxWindowRect()
 {
-    /*
-#ifdef Q_WS_QWS
+    if ( resizeRunningApp )
+    {
+    #if defined(Q_WS_QWS)
     QRect wr;
     int displayWidth  = qApp->desktop()->width();
     QRect ir = inputMethods->inputRect();
     if ( ir.isValid() ) {
 	wr.setCoords( 0, 0, displayWidth-1, ir.top()-1 );
     } else {
 	wr.setCoords( 0, 0, displayWidth-1, y()-1 );
     }
-
 #if QT_VERSION < 0x030000
-    QWSServer::setMaxWindowRect( qt_screen->mapToDevice(wr,
-	QSize(qt_screen->width(),qt_screen->height()))
-	);
+        QWSServer::setMaxWindowRect( qt_screen->mapToDevice(wr,QSize(qt_screen->width(),qt_screen->height())) );
 #else
     QWSServer::setMaxWindowRect( wr );
 #endif
 #endif
-    */
+    }
 }
 
 void TaskBar::receive( const QCString &msg, const QByteArray &data )
 {
     QDataStream stream( data, IO_ReadOnly );
     if ( msg == "message(QString)" ) {
         QString text;
         stream >> text;
         setStatusMessage( text );
     } else if ( msg == "hideInputMethod()" ) {
 	inputMethods->hideInputMethod();
     } else if ( msg == "showInputMethod()" ) {
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,83 +1,87 @@
 /**********************************************************************
-** Copyright (C) 2000 Trolltech AS.  All rights reserved.
+** Copyright (C) 2000-2002 Trolltech AS.  All rights reserved.
 **
-** This file is part of Qtopia Environment.
+** This file is part of the Qtopia Environment.
 **
 ** This file may be distributed and/or modified under the terms of the
 ** GNU General Public License version 2 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.GPL included in the
 ** packaging of this file.
 **
 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
 ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
 **
 ** See http://www.trolltech.com/gpl/ for GPL licensing information.
 **
 ** Contact info@trolltech.com if any conditions of this licensing are
 ** not clear to you.
 **
 **********************************************************************/
 
-#ifndef __TASKBAR_H__
-#define __TASKBAR_H__
+#ifndef TASKBAR_H
+#define TASKBAR_H
 
 #include <qhbox.h>
+#include "serverinterface.h"
+#include "startmenu.h"
 
 class QLabel;
 class QTimer;
 class InputMethods;
 class Wait;
 class SysTray;
 class RunningAppBar;
 class QWidgetStack;
 class QTimer;
 class QLabel;
-class StartMenu;
 class LockKeyState;
+class AppLnkSet;
 
 class TaskBar : public QHBox {
     Q_OBJECT
 public:
     TaskBar();
     ~TaskBar();
 
-    static QWidget *calibrate( bool );
+    void launchStartMenu() { if (sm) sm->launch(); }
+    void refreshStartMenu() { if (sm) sm->refreshMenu(); }
+    void setApplicationState( const QString &name, ServerInterface::ApplicationState state );
 
-    bool recoverMemory();
+signals:
+    void tabSelected(const QString&);
 
-    StartMenu *startMenu() const { return sm; }
 public slots:
     void startWait();
     void stopWait(const QString&);
     void stopWait();
+
     void clearStatusBar();
     void toggleNumLockState();
     void toggleCapsLockState();
     void toggleSymbolInput();
+    void calcMaxWindowRect();
 
 protected:
     void resizeEvent( QResizeEvent * );
     void styleChange( QStyle & );
     void setStatusMessage( const QString &text );
 
-public slots:
-    void calcMaxWindowRect();
 private slots:
     void receive( const QCString &msg, const QByteArray &data );
 
 private:
-
     QTimer *waitTimer;
     Wait *waitIcon;
     InputMethods *inputMethods;
     SysTray *sysTray;
     RunningAppBar* runningAppBar;
     QWidgetStack *stack;
     QTimer *clearer;
     QLabel *label;
     LockKeyState* lockState;
     StartMenu *sm;
+    bool resizeRunningApp;
 };
 
 
-#endif // __TASKBAR_H__
+#endif // TASKBAR_H