summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--core/launcher/inputmethods.cpp12
1 files changed, 6 insertions, 6 deletions
diff --git a/core/launcher/inputmethods.cpp b/core/launcher/inputmethods.cpp
index acd0d59..765dfe9 100644
--- a/core/launcher/inputmethods.cpp
+++ b/core/launcher/inputmethods.cpp
@@ -61,102 +61,102 @@ static const char * tri_xpm[]={
61"...aaa...", 61"...aaa...",
62"..aaaaa..", 62"..aaaaa..",
63".aaaaaaa.", 63".aaaaaaa.",
64".........", 64".........",
65"........."}; 65"........."};
66 66
67static const int inputWidgetStyle = QWidget::WStyle_Customize | 67static const int inputWidgetStyle = QWidget::WStyle_Customize |
68 QWidget::WStyle_Tool | 68 QWidget::WStyle_Tool |
69 QWidget::WStyle_StaysOnTop | 69 QWidget::WStyle_StaysOnTop |
70 QWidget::WGroupLeader; 70 QWidget::WGroupLeader;
71 71
72InputMethods::InputMethods( QWidget *parent ) : 72InputMethods::InputMethods( QWidget *parent ) :
73 QWidget( parent, "InputMethods", WStyle_Tool | WStyle_Customize ) 73 QWidget( parent, "InputMethods", WStyle_Tool | WStyle_Customize )
74{ 74{
75 method = NULL; 75 method = NULL;
76 76
77 setBackgroundMode ( PaletteBackground ); 77 setBackgroundMode ( PaletteBackground );
78 78
79 QHBoxLayout *hbox = new QHBoxLayout( this ); 79 QHBoxLayout *hbox = new QHBoxLayout( this );
80 80
81 kbdButton = new QToolButton( this ); 81 kbdButton = new QToolButton( this );
82 kbdButton->setFocusPolicy(NoFocus); 82 kbdButton->setFocusPolicy(NoFocus);
83 kbdButton->setToggleButton( TRUE ); 83 kbdButton->setToggleButton( TRUE );
84 kbdButton->setFixedHeight( 17 ); 84 kbdButton->setFixedHeight( 17 );
85 kbdButton->setFixedWidth( 32 ); 85 kbdButton->setFixedWidth( 32 );
86 kbdButton->setAutoRaise( TRUE ); 86 kbdButton->setAutoRaise( TRUE );
87 kbdButton->setUsesBigPixmap( TRUE ); 87 kbdButton->setUsesBigPixmap( TRUE );
88 hbox->addWidget( kbdButton ); 88 hbox->addWidget( kbdButton );
89 connect( kbdButton, SIGNAL(toggled(bool)), this, SLOT(showKbd(bool)) ); 89 connect( kbdButton, SIGNAL(toggled(bool)), this, SLOT(showKbd(bool)) );
90 90
91 kbdChoice = new QToolButton( this ); 91 kbdChoice = new QToolButton( this );
92 kbdChoice->setFocusPolicy(NoFocus); 92 kbdChoice->setFocusPolicy(NoFocus);
93 kbdChoice->setPixmap( QPixmap( (const char **)tri_xpm ) ); 93 kbdChoice->setPixmap( QPixmap( (const char **)tri_xpm ) );
94 kbdChoice->setFixedHeight( 17 ); 94 kbdChoice->setFixedHeight( 17 );
95 kbdChoice->setFixedWidth( 12 ); 95 kbdChoice->setFixedWidth( 12 );
96 kbdChoice->setAutoRaise( TRUE ); 96 kbdChoice->setAutoRaise( TRUE );
97 hbox->addWidget( kbdChoice ); 97 hbox->addWidget( kbdChoice );
98 connect( kbdChoice, SIGNAL(clicked()), this, SLOT(chooseKbd()) ); 98 connect( kbdChoice, SIGNAL(clicked()), this, SLOT(chooseKbd()) );
99 99
100 connect( (QPEApplication*)qApp, SIGNAL(clientMoused()), 100 connect( (QPEApplication*)qApp, SIGNAL(clientMoused()),
101 this, SLOT(resetStates()) ); 101 this, SLOT(resetStates()) );
102 102
103 loadInputMethods(); 103 loadInputMethods();
104} 104}
105 105
106InputMethods::~InputMethods() 106InputMethods::~InputMethods()
107{ 107{
108#ifndef SINGLE_APP 108#ifndef SINGLE_APP
109 QValueList<InputMethod>::Iterator mit; 109 QValueList<InputMethod>::Iterator mit;
110 for ( mit = inputMethodList.begin(); mit != inputMethodList.end(); ++mit ) { 110 for ( mit = inputMethodList.begin(); mit != inputMethodList.end(); ++mit ) {
111 int i = (*mit).interface->release(); 111 (void) (*mit).interface->release();
112 (*mit).library->unload(); 112 (*mit).library->unload();
113 delete (*mit).library; 113 delete (*mit).library;
114 } 114 }
115#endif 115#endif
116} 116}
117 117
118void InputMethods::hideInputMethod() 118void InputMethods::hideInputMethod()
119{ 119{
120 kbdButton->setOn( FALSE ); 120 kbdButton->setOn( FALSE );
121} 121}
122 122
123void InputMethods::showInputMethod() 123void InputMethods::showInputMethod()
124{ 124{
125 kbdButton->setOn( TRUE ); 125 kbdButton->setOn( TRUE );
126} 126}
127 127
128void InputMethods::showInputMethod(const QString& name) 128void InputMethods::showInputMethod(const QString& name)
129{ 129{
130 int i = 0; 130 int i = 0;
131 QValueList<InputMethod>::Iterator it; 131 QValueList<InputMethod>::Iterator it;
132 InputMethod *im = 0; 132 InputMethod *im = 0;
133 for ( it = inputMethodList.begin(); it != inputMethodList.end(); ++it, i++ ) { 133 for ( it = inputMethodList.begin(); it != inputMethodList.end(); ++it, i++ ) {
134 if ( (*it).interface->name() == name ) { 134 if ( (*it).interface->name() == name ) {
135 im = &(*it); 135 im = &(*it);
136 break; 136 break;
137 } 137 }
138 } 138 }
139 if ( im ) 139 if ( im )
140 chooseMethod(im); 140 chooseMethod(im);
141} 141}
142 142
143void InputMethods::resetStates() 143void InputMethods::resetStates()
144{ 144{
145 if ( method ) 145 if ( method )
146 method->interface->resetState(); 146 method->interface->resetState();
147} 147}
148 148
149QRect InputMethods::inputRect() const 149QRect InputMethods::inputRect() const
150{ 150{
151 if ( !method || !method->widget->isVisible() ) 151 if ( !method || !method->widget->isVisible() )
152 return QRect(); 152 return QRect();
153 else 153 else
154 return method->widget->geometry(); 154 return method->widget->geometry();
155} 155}
156 156
157void InputMethods::loadInputMethods() 157void InputMethods::loadInputMethods()
158{ 158{
159#ifndef SINGLE_APP 159#ifndef SINGLE_APP
160 hideInputMethod(); 160 hideInputMethod();
161 method = 0; 161 method = 0;
162 162