Diffstat (limited to 'inputmethods/pickboard/pickboardcfg.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r-- | inputmethods/pickboard/pickboardcfg.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/inputmethods/pickboard/pickboardcfg.cpp b/inputmethods/pickboard/pickboardcfg.cpp index e8b47cb..d500266 100644 --- a/inputmethods/pickboard/pickboardcfg.cpp +++ b/inputmethods/pickboard/pickboardcfg.cpp | |||
@@ -137,52 +137,52 @@ void PickboardConfig::doMenu(int i) | |||
137 | 137 | ||
138 | void StringConfig::draw(QPainter* p) | 138 | void StringConfig::draw(QPainter* p) |
139 | { | 139 | { |
140 | QFontMetrics fm = p->fontMetrics(); | 140 | QFontMetrics fm = p->fontMetrics(); |
141 | 141 | ||
142 | for (int r=0; r<nrows; r++) { | 142 | for (int r=0; r<nrows; r++) { |
143 | p->translate(0,fm.lineSpacing()); | 143 | p->translate(0,fm.lineSpacing()); |
144 | p->setPen(rowColor(r)); | 144 | p->setPen(rowColor(r)); |
145 | 145 | ||
146 | int tw=0; | 146 | int tw=0; |
147 | QString s; | 147 | QString s; |
148 | int i=0; | 148 | int i=0; |
149 | for (; !(s=text(r,i)).isNull(); ++i) { | 149 | for (; !(s=text(r,i)).isNull(); ++i) { |
150 | int w = fm.width(s); | 150 | int w = fm.width(s); |
151 | tw += w; | 151 | tw += w; |
152 | } | 152 | } |
153 | bool spread = spreadRow(r);// && parent->width() > tw; | 153 | bool spread = spreadRow(r);// && parent->width() > tw; |
154 | int xw = spread ? (parent->width()-tw)/(i-1) : 3; | 154 | int xw = spread ? (parent->width()-tw)/(i-1) : 3; |
155 | int x = spread ? (parent->width()-tw-xw*(i-1))/2 : 2; | 155 | int x = spread ? (parent->width()-tw-xw*(i-1))/2 : 2; |
156 | 156 | ||
157 | i=0; | 157 | i=0; |
158 | for (; !(s=text(r,i)).isNull(); ++i) { | 158 | for (; !(s=text(r,i)).isNull(); ++i) { |
159 | int w = fm.width(s)+xw; | 159 | int w = fm.width(s)+xw; |
160 | if ( highlight(r,i) ) { | 160 | if ( highlight(r,i) ) { |
161 | p->fillRect(x-xw/2,1+fm.descent()-fm.lineSpacing(),w,fm.lineSpacing(),Qt::black); | 161 | p->fillRect(x-xw/2,1+fm.descent()-fm.lineSpacing(),w,fm.lineSpacing(),::Qt::black); |
162 | p->setPen(Qt::white); | 162 | p->setPen(::Qt::white); |
163 | }else{ | 163 | }else{ |
164 | p->setPen(Qt::black); | 164 | p->setPen(::Qt::black); |
165 | } | 165 | } |
166 | p->drawText(x,-fm.descent()-1,s); | 166 | p->drawText(x,-fm.descent()-1,s); |
167 | x += w; | 167 | x += w; |
168 | } | 168 | } |
169 | } | 169 | } |
170 | } | 170 | } |
171 | 171 | ||
172 | void StringConfig::pickInRow(int r, int xpos, bool press) | 172 | void StringConfig::pickInRow(int r, int xpos, bool press) |
173 | { | 173 | { |
174 | QFontMetrics fm = parent->fontMetrics(); | 174 | QFontMetrics fm = parent->fontMetrics(); |
175 | 175 | ||
176 | int tw=0; | 176 | int tw=0; |
177 | QString s; | 177 | QString s; |
178 | int i=0; | 178 | int i=0; |
179 | for (; !(s=text(r,i)).isNull(); ++i) { | 179 | for (; !(s=text(r,i)).isNull(); ++i) { |
180 | int w = fm.width(s); | 180 | int w = fm.width(s); |
181 | tw += w; | 181 | tw += w; |
182 | } | 182 | } |
183 | bool spread = spreadRow(r) && parent->width() > tw; | 183 | bool spread = spreadRow(r) && parent->width() > tw; |
184 | int xw = spread ? (parent->width()-tw)/(i-1) : 3; | 184 | int xw = spread ? (parent->width()-tw)/(i-1) : 3; |
185 | int x = spread ? (parent->width()-tw-xw*(i-1))/2 : 2; | 185 | int x = spread ? (parent->width()-tw-xw*(i-1))/2 : 2; |
186 | 186 | ||
187 | i=0; | 187 | i=0; |
188 | for (; !(s=text(r,i)).isNull(); ++i) { | 188 | for (; !(s=text(r,i)).isNull(); ++i) { |
@@ -410,52 +410,52 @@ QString DictFilterConfig::capitalize(const QString& s) | |||
410 | switch ( shift ) { | 410 | switch ( shift ) { |
411 | case 1: { | 411 | case 1: { |
412 | QString u = s; | 412 | QString u = s; |
413 | u[0] = u[0].upper(); | 413 | u[0] = u[0].upper(); |
414 | return u; | 414 | return u; |
415 | break; | 415 | break; |
416 | } case 2: | 416 | } case 2: |
417 | return s.upper(); | 417 | return s.upper(); |
418 | break; | 418 | break; |
419 | } | 419 | } |
420 | return s; | 420 | return s; |
421 | } | 421 | } |
422 | 422 | ||
423 | void DictFilterConfig::pick(bool press, int row, int item) | 423 | void DictFilterConfig::pick(bool press, int row, int item) |
424 | { | 424 | { |
425 | if ( row == 0 ) { | 425 | if ( row == 0 ) { |
426 | if ( press ) { | 426 | if ( press ) { |
427 | if ( input.isEmpty() ) { | 427 | if ( input.isEmpty() ) { |
428 | lit0 = item; | 428 | lit0 = item; |
429 | if ( othermodes[item] == "Space" ) { | 429 | if ( othermodes[item] == "Space" ) { |
430 | updateItem(row,item); | 430 | updateItem(row,item); |
431 | generateText(" "); | 431 | generateText(" "); |
432 | } else if ( othermodes[item] == "Back" ) { | 432 | } else if ( othermodes[item] == "Back" ) { |
433 | updateItem(row,item); | 433 | updateItem(row,item); |
434 | generateKey(Qt::Key_Backspace); | 434 | generateKey(::Qt::Key_Backspace); |
435 | } else if ( othermodes[item] == "Enter" ) { | 435 | } else if ( othermodes[item] == "Enter" ) { |
436 | updateItem(row,item); | 436 | updateItem(row,item); |
437 | generateKey(Qt::Key_Return); | 437 | generateKey(::Qt::Key_Return); |
438 | } else if ( othermodes[item] == "Shift" ) { | 438 | } else if ( othermodes[item] == "Shift" ) { |
439 | updateItem(row,item); | 439 | updateItem(row,item); |
440 | shift = (shift+1)%3; | 440 | shift = (shift+1)%3; |
441 | } | 441 | } |
442 | } | 442 | } |
443 | } else { | 443 | } else { |
444 | if ( !input.isEmpty() ) { | 444 | if ( !input.isEmpty() ) { |
445 | input.clear(); | 445 | input.clear(); |
446 | if ( item>=0 ) { | 446 | if ( item>=0 ) { |
447 | generateText(capitalize(matches[item])); | 447 | generateText(capitalize(matches[item])); |
448 | } | 448 | } |
449 | shift = 0; | 449 | shift = 0; |
450 | matches.clear(); | 450 | matches.clear(); |
451 | updateRows(0,0); | 451 | updateRows(0,0); |
452 | } else if ( item < 3 ) { | 452 | } else if ( item < 3 ) { |
453 | lit0 = -1; | 453 | lit0 = -1; |
454 | changeMode(item+1); // I'm mode 0! #### | 454 | changeMode(item+1); // I'm mode 0! #### |
455 | updateRows(0,1); | 455 | updateRows(0,1); |
456 | } | 456 | } |
457 | if ( lit0 >= 0 ) { | 457 | if ( lit0 >= 0 ) { |
458 | if ( !shift || othermodes[lit0] != "Shift" ) { | 458 | if ( !shift || othermodes[lit0] != "Shift" ) { |
459 | updateItem(0,lit0); | 459 | updateItem(0,lit0); |
460 | lit0 = -1; | 460 | lit0 = -1; |
461 | } | 461 | } |