1
=== modified file 'plugins/pinyin/src/chineselanguagefeatures.cpp'
2
--- plugins/pinyin/src/chineselanguagefeatures.cpp	2014-04-15 12:18:47 +0000
3
+++ plugins/pinyin/src/chineselanguagefeatures.cpp	2014-06-11 13:16:05 +0000
4
@@ -47,6 +47,24 @@
5
47
47
6
48
QString ChineseLanguageFeatures::appendixForReplacedPreedit(const QString &preedit) const
48
QString ChineseLanguageFeatures::appendixForReplacedPreedit(const QString &preedit) const
7
49
{
49
{
9
50
    Q_UNUSED(preedit)
50
    if (isSeparator(preedit.right(1))) {
10
51
        return QString(" ");
11
52
    }
12
53
13
51
    return QString("");
54
    return QString("");
14
52
}
55
}
15
56
16
57
bool ChineseLanguageFeatures::isSeparator(const QString &text) const
17
58
{
18
59
    static const QString separators = QString::fromUtf8("。、,!?:;\r\n");
19
60
20
61
    if (text.isEmpty()) {
21
62
        return false;
22
63
    }
23
64
24
65
    if (separators.contains(text.right(1))) {
25
66
        return true;
26
67
    }
27
68
28
69
    return false;
29
70
}
30
53
\ No newline at end of file
71
\ No newline at end of file
31
54
72
32
=== modified file 'plugins/pinyin/src/chineselanguagefeatures.h'
33
--- plugins/pinyin/src/chineselanguagefeatures.h	2014-04-15 12:18:47 +0000
34
+++ plugins/pinyin/src/chineselanguagefeatures.h	2014-06-11 13:16:05 +0000
35
@@ -31,6 +31,7 @@
36
31
    virtual bool autoCapsAvailable() const;
31
    virtual bool autoCapsAvailable() const;
37
32
    virtual bool activateAutoCaps(const QString &preedit) const;
32
    virtual bool activateAutoCaps(const QString &preedit) const;
38
33
    virtual QString appendixForReplacedPreedit(const QString &preedit) const;
33
    virtual QString appendixForReplacedPreedit(const QString &preedit) const;
39
34
    virtual bool isSeparator(const QString &text) const;
40
34
};
35
};
41
35
36
42
36
#endif // CHINESELANGUAGEFEATURES_H
37
#endif // CHINESELANGUAGEFEATURES_H
43
37
38
44
=== modified file 'plugins/westernsupport/westernlanguagefeatures.cpp'
45
--- plugins/westernsupport/westernlanguagefeatures.cpp	2014-04-15 12:18:47 +0000
46
+++ plugins/westernsupport/westernlanguagefeatures.cpp	2014-06-11 13:16:05 +0000
47
@@ -74,3 +74,18 @@
48
74
74
49
75
    return QString(" ");
75
    return QString(" ");
50
76
}
76
}
51
77
52
78
bool WesternLanguageFeatures::isSeparator(const QString &text) const
53
79
{
54
80
    static const QString separators = QString::fromUtf8(",.!?\r\n");
55
81
56
82
    if (text.isEmpty()) {
57
83
        return false;
58
84
    }
59
85
60
86
    if (separators.contains(text.right(1))) {
61
87
        return true;
62
88
    }
63
89
64
90
    return false;
65
91
}
66
77
92
67
=== modified file 'plugins/westernsupport/westernlanguagefeatures.h'
68
--- plugins/westernsupport/westernlanguagefeatures.h	2014-04-15 12:18:47 +0000
69
+++ plugins/westernsupport/westernlanguagefeatures.h	2014-06-11 13:16:05 +0000
70
@@ -46,6 +46,8 @@
71
46
    virtual bool autoCapsAvailable() const;
46
    virtual bool autoCapsAvailable() const;
72
47
    virtual bool activateAutoCaps(const QString &preedit) const;
47
    virtual bool activateAutoCaps(const QString &preedit) const;
73
48
    virtual QString appendixForReplacedPreedit(const QString &preedit) const;
48
    virtual QString appendixForReplacedPreedit(const QString &preedit) const;
74
49
    virtual bool isSeparator(const QString &text) const;
75
50
    virtual QString fullStopSequence() const { return QString("."); }
76
49
};
51
};
77
50
52
78
51
#endif // MALIITKEYBOARD_LANGUAGEFEATURES_H
53
#endif // MALIITKEYBOARD_LANGUAGEFEATURES_H
79
52
54
80
=== modified file 'qml/Keyboard.qml'
81
--- qml/Keyboard.qml	2014-02-28 18:25:13 +0000
82
+++ qml/Keyboard.qml	2014-06-11 13:16:05 +0000
83
@@ -244,6 +244,7 @@
84
244
                onActivateAutocaps: {
244
                onActivateAutocaps: {
85
245
                    keypad.state = "CHARACTERS";
245
                    keypad.state = "CHARACTERS";
86
246
                    keypad.activeKeypadState = "SHIFTED";
246
                    keypad.activeKeypadState = "SHIFTED";
87
247
                    keypad.autoCapsTriggered = true;
88
247
                }
248
                }
89
248
            }
249
            }
90
249
250
91
250
251
92
=== modified file 'qml/KeyboardContainer.qml'
93
--- qml/KeyboardContainer.qml	2014-05-12 20:24:36 +0000
94
+++ qml/KeyboardContainer.qml	2014-06-11 13:16:05 +0000
95
@@ -28,6 +28,8 @@
96
28
    property int keyWidth: 0
28
    property int keyWidth: 0
97
29
    property int keyHeight: 0
29
    property int keyHeight: 0
98
30
30
99
31
    property bool autoCapsTriggered: false
100
32
101
31
    property string activeKeypadState: "NORMAL"
33
    property string activeKeypadState: "NORMAL"
102
32
    property alias popoverEnabled: extendedKeysSelector.enabled
34
    property alias popoverEnabled: extendedKeysSelector.enabled
103
33
35
104
34
36
105
=== modified file 'qml/keys/CharKey.qml'
106
--- qml/keys/CharKey.qml	2014-05-01 16:39:00 +0000
107
+++ qml/keys/CharKey.qml	2014-06-11 13:16:05 +0000
108
@@ -142,9 +142,14 @@
109
142
        onReleased: {
142
        onReleased: {
110
143
            if (!extendedKeysShown) {
143
            if (!extendedKeysShown) {
111
144
                event_handler.onKeyReleased(valueToSubmit, action);
144
                event_handler.onKeyReleased(valueToSubmit, action);
113
145
                if (!skipAutoCaps)
145
114
146
                if (panel.autoCapsTriggered) {
115
147
                    panel.autoCapsTriggered = false;
116
148
                }
117
149
                else if (!skipAutoCaps) {
118
146
                    if (panel.activeKeypadState === "SHIFTED" && panel.state === "CHARACTERS")
150
                    if (panel.activeKeypadState === "SHIFTED" && panel.state === "CHARACTERS")
119
147
                        panel.activeKeypadState = "NORMAL"
151
                        panel.activeKeypadState = "NORMAL"
120
152
                }
121
148
            }
153
            }
122
149
        }
154
        }
123
150
        onPressed: {
155
        onPressed: {
124
@@ -154,6 +159,8 @@
125
154
            if (maliit_input_method.useHapticFeedback)
159
            if (maliit_input_method.useHapticFeedback)
126
155
                 pressEffect.start();
160
                 pressEffect.start();
127
156
161
128
162
            // Quick workaround to fix initial autocaps - not beautiful, but works
129
163
            panel.autoCapsTriggered = false;
130
157
            event_handler.onKeyPressed(valueToSubmit, action);
164
            event_handler.onKeyPressed(valueToSubmit, action);
131
158
        }
165
        }
132
159
    }
166
    }
133
160
167
134
=== modified file 'src/lib/logic/abstractlanguagefeatures.h'
135
--- src/lib/logic/abstractlanguagefeatures.h	2014-04-15 12:19:05 +0000
136
+++ src/lib/logic/abstractlanguagefeatures.h	2014-06-11 13:16:05 +0000
137
@@ -45,6 +45,8 @@
138
45
    virtual bool autoCapsAvailable() const = 0;
45
    virtual bool autoCapsAvailable() const = 0;
139
46
    virtual bool activateAutoCaps(const QString &preedit) const = 0;
46
    virtual bool activateAutoCaps(const QString &preedit) const = 0;
140
47
    virtual QString appendixForReplacedPreedit(const QString &preedit) const = 0;
47
    virtual QString appendixForReplacedPreedit(const QString &preedit) const = 0;
141
48
    virtual bool isSeparator(const QString &text) const { Q_UNUSED(text); return false; }
142
49
    virtual QString fullStopSequence() const { return QString(); }
143
48
};
50
};
144
49
51
145
50
#endif // MALIIT_KEYBOARD_ABSTRACTLANGUAGEFEATURES_H
52
#endif // MALIIT_KEYBOARD_ABSTRACTLANGUAGEFEATURES_H
146
51
53
147
=== modified file 'src/view/abstracttexteditor.cpp'
148
--- src/view/abstracttexteditor.cpp	2014-05-27 15:37:37 +0000
149
+++ src/view/abstracttexteditor.cpp	2014-06-11 13:16:05 +0000
150
@@ -285,6 +285,8 @@
151
285
    bool auto_caps_enabled;
285
    bool auto_caps_enabled;
152
286
    int ignore_next_cursor_position;
286
    int ignore_next_cursor_position;
153
287
    QString ignore_next_surrounding_text;
287
    QString ignore_next_surrounding_text;
154
288
    bool look_for_a_double_space;
155
289
    QString appendix_for_previous_preedit;
156
288
    int backspace_word_acceleration;
290
    int backspace_word_acceleration;
157
289
291
158
290
    explicit AbstractTextEditorPrivate(const EditorOptions &new_options,
292
    explicit AbstractTextEditorPrivate(const EditorOptions &new_options,
159
@@ -307,6 +309,8 @@
160
307
    , auto_caps_enabled(false)
309
    , auto_caps_enabled(false)
161
308
    , ignore_next_cursor_position(-1)
310
    , ignore_next_cursor_position(-1)
162
309
    , ignore_next_surrounding_text()
311
    , ignore_next_surrounding_text()
163
312
    , look_for_a_double_space(false)
164
313
    , appendix_for_previous_preedit()
165
310
    , backspace_word_acceleration(0)
314
    , backspace_word_acceleration(0)
166
311
{
315
{
167
312
    auto_repeat_backspace_timer.setSingleShot(true);
316
    auto_repeat_backspace_timer.setSingleShot(true);
168
@@ -415,23 +419,66 @@
169
415
    const QString text = key.label();
419
    const QString text = key.label();
170
416
    QString keyText = QString("");
420
    QString keyText = QString("");
171
417
    Qt::Key event_key = Qt::Key_unknown;
421
    Qt::Key event_key = Qt::Key_unknown;
172
422
    bool look_for_a_double_space = d->look_for_a_double_space;
173
423
174
424
    if (look_for_a_double_space) {
175
425
        // we reset the flag here so that we won't have to add boilerplate code later
176
426
        d->look_for_a_double_space = false;
177
427
    }
178
418
428
179
419
    switch(key.action()) {
429
    switch(key.action()) {
180
420
    case Key::ActionInsert: {
430
    case Key::ActionInsert: {
182
421
        d->text->appendToPreedit(text);
431
        bool alreadyAppended = false;
183
432
        bool auto_caps_activated = false;
184
433
        const bool isSeparator = d->word_engine->languageFeature()->isSeparator(text);
185
434
        const bool replace_preedit = d->auto_correct_enabled && not d->text->primaryCandidate().isEmpty() && 
186
435
                    not d->text->preedit().isEmpty() && isSeparator;
187
422
436
188
423
        // computeCandidates can change preedit face, so needs to happen
189
424
        // before sending preedit:
190
425
        if (d->preedit_enabled) {
437
        if (d->preedit_enabled) {
196
426
            d->word_engine->computeCandidates(d->text.data());
438
            if (replace_preedit) {
197
427
        }
439
                // this means we should commit the candidate, add the separator and whitespace
198
428
440
                d->text->setPreedit(d->text->primaryCandidate());
199
429
        sendPreeditString(d->text->preedit(), d->text->preeditFace(),
441
                d->text->appendToPreedit(text);
200
430
                          Replacement(d->text->cursorPosition()));
442
                d->appendix_for_previous_preedit = d->word_engine->languageFeature()->appendixForReplacedPreedit(d->text->preedit());
201
443
                d->text->appendToPreedit(d->appendix_for_previous_preedit);
202
444
                commitPreedit();
203
445
                auto_caps_activated = d->word_engine->languageFeature()->activateAutoCaps(d->text->surroundingLeft() + d->text->preedit() + text);
204
446
                alreadyAppended = true;
205
447
            }
206
448
            else if (d->auto_correct_enabled && isSeparator) {
207
449
                // remove all whitespaces before the separator, then add a whitespace after it
208
450
                removeTrailingWhitespaces();
209
451
210
452
                d->text->appendToPreedit(text);
211
453
                auto_caps_activated = d->word_engine->languageFeature()->activateAutoCaps(d->text->surroundingLeft() + d->text->preedit());
212
454
                d->text->appendToPreedit(d->word_engine->languageFeature()->appendixForReplacedPreedit(d->text->preedit()));
213
455
                commitPreedit();
214
456
                alreadyAppended = true;
215
457
            }
216
458
        }
217
459
218
460
        // if we had modified the preedit already because of a separator entry, there is no need to perform all the
219
461
        // steps like appending the input or computing candidates - as all we needed was already done in the previous part
220
462
        if (not alreadyAppended) {
221
463
            d->text->appendToPreedit(text);     
222
464
223
465
            // computeCandidates can change preedit face, so needs to happen
224
466
            // before sending preedit:
225
467
            if (d->preedit_enabled) {
226
468
                d->word_engine->computeCandidates(d->text.data());
227
469
            }
228
470
229
471
            sendPreeditString(d->text->preedit(), d->text->preeditFace(),
230
472
                              Replacement(d->text->cursorPosition()));
231
473
        }
232
431
474
233
432
        if (not d->preedit_enabled) {
475
        if (not d->preedit_enabled) {
234
433
            commitPreedit();
476
            commitPreedit();
235
434
        }
477
        }
236
478
        else if (auto_caps_activated && d->auto_caps_enabled) {
237
479
            // standard input (like certain separators, e.g. '.' in western languages) can also trigger autoCaps
238
480
            Q_EMIT autoCapsActivated();
239
481
        }
240
435
    } break;
482
    } break;
241
436
483
242
437
    case Key::ActionBackspace: {
484
    case Key::ActionBackspace: {
243
@@ -445,17 +492,31 @@
244
445
    } break;
492
    } break;
245
446
493
246
447
    case Key::ActionSpace: {
494
    case Key::ActionSpace: {
247
495
        QString space = " ";
248
448
        QString textOnLeft = d->text->surroundingLeft() + d->text->preedit();
496
        QString textOnLeft = d->text->surroundingLeft() + d->text->preedit();
250
449
        const bool auto_caps_activated = d->word_engine->languageFeature()->activateAutoCaps(textOnLeft);
497
        bool auto_caps_activated = d->word_engine->languageFeature()->activateAutoCaps(textOnLeft);
251
450
        const bool replace_preedit = d->auto_correct_enabled && not d->text->primaryCandidate().isEmpty() && not d->text->preedit().isEmpty();
498
        const bool replace_preedit = d->auto_correct_enabled && not d->text->primaryCandidate().isEmpty() && not d->text->preedit().isEmpty();
252
499
        const QString stopSequence = d->word_engine->languageFeature()->fullStopSequence();
253
500
254
501
        // every double-space character inputs one-after-another force a full-stop, so trigger it if needed
255
502
        if (d->preedit_enabled && d->auto_correct_enabled && not look_for_a_double_space) {
256
503
            d->look_for_a_double_space = true;
257
504
        }
258
451
505
259
452
        if (replace_preedit) {
506
        if (replace_preedit) {
261
453
            const QString &appendix = d->word_engine->languageFeature()->appendixForReplacedPreedit(d->text->preedit());
507
            space = d->appendix_for_previous_preedit = d->word_engine->languageFeature()->appendixForReplacedPreedit(d->text->preedit());
262
454
            d->text->setPreedit(d->text->primaryCandidate());
508
            d->text->setPreedit(d->text->primaryCandidate());
267
455
            d->text->appendToPreedit(appendix);
509
        }
268
456
        } else {
510
        else if (look_for_a_double_space && not stopSequence.isEmpty()) {
269
457
            d->text->appendToPreedit(" ");
511
            removeTrailingWhitespaces();
270
458
        }
512
            d->text->appendToPreedit(d->word_engine->languageFeature()->fullStopSequence());
271
513
272
514
            // we need to re-evaluate autocaps after our changes to the preedit
273
515
            textOnLeft = d->text->surroundingLeft() + d->text->preedit();
274
516
            auto_caps_activated = d->word_engine->languageFeature()->activateAutoCaps(textOnLeft);
275
517
        }
276
518
277
519
        d->text->appendToPreedit(space);
278
459
        commitPreedit();
520
        commitPreedit();
279
460
521
280
461
        if (auto_caps_activated && d->auto_caps_enabled) {
522
        if (auto_caps_activated && d->auto_caps_enabled) {
281
@@ -578,8 +639,10 @@
282
578
639
283
579
    d->text->setPreedit(replacement);
640
    d->text->setPreedit(replacement);
284
580
    const bool auto_caps_activated = d->word_engine->languageFeature()->activateAutoCaps(d->text->preedit());
641
    const bool auto_caps_activated = d->word_engine->languageFeature()->activateAutoCaps(d->text->preedit());
287
581
    const QString appendix = d->word_engine->languageFeature()->appendixForReplacedPreedit(d->text->preedit());
642
    d->appendix_for_previous_preedit = d->word_engine->languageFeature()->appendixForReplacedPreedit(d->text->preedit());
288
582
    d->text->appendToPreedit(appendix);
643
    if (d->auto_correct_enabled) {
289
644
        d->text->appendToPreedit(d->appendix_for_previous_preedit);
290
645
    }
291
583
    commitPreedit();
646
    commitPreedit();
292
584
647
293
585
    if (auto_caps_activated && d->auto_caps_enabled) {
648
    if (auto_caps_activated && d->auto_caps_enabled) {
294
@@ -674,6 +737,21 @@
295
674
    d->word_engine->clearCandidates();
737
    d->word_engine->clearCandidates();
296
675
}
738
}
297
676
739
298
740
void AbstractTextEditor::removeTrailingWhitespaces()
299
741
{
300
742
    Q_D(AbstractTextEditor);
301
743
302
744
    const QString textOnLeft = d->text->surroundingLeft() + d->text->preedit();
303
745
304
746
    QString::const_iterator begin = textOnLeft.cbegin();
305
747
    QString::const_iterator i = textOnLeft.cend();
306
748
    while (i != begin) {
307
749
        --i;
308
750
        if (*i != ' ') break;
309
751
        singleBackspace();
310
752
    }
311
753
}
312
754
313
677
// TODO: this implementation does not take into account following features:
755
// TODO: this implementation does not take into account following features:
314
678
// 1) preedit string
756
// 1) preedit string
315
679
//      if there is preedit then first call to autoRepeatBackspace should clean it completely
757
//      if there is preedit then first call to autoRepeatBackspace should clean it completely
316
680
758
317
=== modified file 'src/view/abstracttexteditor.h'
318
--- src/view/abstracttexteditor.h	2014-05-14 13:14:34 +0000
319
+++ src/view/abstracttexteditor.h	2014-06-11 13:16:05 +0000
320
@@ -158,6 +158,7 @@
321
158
    virtual void singleBackspace();
158
    virtual void singleBackspace();
322
159
159
323
160
    void commitPreedit();
160
    void commitPreedit();
324
161
    void removeTrailingWhitespaces();
325
161
    Q_SLOT void autoRepeatBackspace();
162
    Q_SLOT void autoRepeatBackspace();
326
162
    void autoRepeatWordBackspace();
163
    void autoRepeatWordBackspace();
327
163
    QString wordLeftOfCursor() const;
164
    QString wordLeftOfCursor() const;
328
164
165
329
=== modified file 'tests/unittests/ut_editor/ut_editor.cpp'
330
--- tests/unittests/ut_editor/ut_editor.cpp	2013-12-19 15:55:17 +0000
331
+++ tests/unittests/ut_editor/ut_editor.cpp	2014-06-11 13:16:05 +0000
332
@@ -69,6 +69,8 @@
333
69
            Key key;
69
            Key key;
334
70
            if (c.isSpace()) {
70
            if (c.isSpace()) {
335
71
                key.setAction(Key::ActionSpace);
71
                key.setAction(Key::ActionSpace);
336
72
            } else if (c == '\r') {
337
73
                key.setAction(Key::ActionReturn);
338
72
            } else {
74
            } else {
339
73
                key.setAction(Key::ActionInsert);
75
                key.setAction(Key::ActionInsert);
340
74
                key.rLabel() = QString(c);
76
                key.rLabel() = QString(c);
341
@@ -101,12 +103,24 @@
342
101
                << false << "Helol Wordl! " << "Helol Wordl! ";
103
                << false << "Helol Wordl! " << "Helol Wordl! ";
343
102
        QTest::newRow("auto-correct disabled, multiple punctation")
104
        QTest::newRow("auto-correct disabled, multiple punctation")
344
103
                << false << "Helol Wordl!! " << "Helol Wordl!! ";
105
                << false << "Helol Wordl!! " << "Helol Wordl!! ";
346
104
        QTest::newRow("auto-correct enabled, digits")
106
        QTest::newRow("auto-correct disabled, digits")
347
105
                << false << "Helol Wordl12 " << "Helol Wordl12 ";
107
                << false << "Helol Wordl12 " << "Helol Wordl12 ";
348
106
//        QTest::newRow("auto-correct enabled")
108
//        QTest::newRow("auto-correct enabled")
349
107
//                << true << "Helol Wordl! " << "Hello World! ";
109
//                << true << "Helol Wordl! " << "Hello World! ";
350
108
//        QTest::newRow("auto-correct enabled, multiple punctation")
110
//        QTest::newRow("auto-correct enabled, multiple punctation")
351
109
//                << true << "Helol Wordl!! " << "Hello World!! ";
111
//                << true << "Helol Wordl!! " << "Hello World!! ";
352
112
353
113
        // Tests for the auto-correct and separator-at-end behavior
354
114
        // FIXME: In the current testing infra, we cannot really test this properly, as we are using the 'backspace' character
355
115
        //  a lot during auto-correction, which is currently not handled too well here.
356
116
        QTest::newRow("auto-correct enabled, commit with space, check separators")
357
117
                << true << "Hel ,Wor ." << "Hello , World . ";
358
118
        QTest::newRow("auto-correct enabled, commit with separators, check separators")
359
119
                << true << "Hel.Wor." << "Hello. World. ";
360
120
        QTest::newRow("auto-correct enabled, check if two spaces are full-stop")
361
121
                << true << "Hel  " << "Hello . ";      
362
122
        //QTest::newRow("auto-correct enabled, check removal of unnecessary whitespaces")
363
123
        //        << true << "Hello.       . " << "Hello.. ";
364
110
    }
124
    }
365
111
125
366
112
    Q_SLOT void testAutoCorrect()
126
    Q_SLOT void testAutoCorrect()
367
@@ -169,14 +183,24 @@
368
169
                << false << "This is a \"first sentence\". And a second, one! "
183
                << false << "This is a \"first sentence\". And a second, one! "
369
170
                << "This is a \"first sentence\". And a second, one! " << 2;
184
                << "This is a \"first sentence\". And a second, one! " << 2;
370
171
        QTest::newRow("auto-correct enabled, multiple sentences with mixed punctation")
185
        QTest::newRow("auto-correct enabled, multiple sentences with mixed punctation")
372
172
                << true << "This is a \"first sentence\". And a second, one! "
186
                << true << "This is a \"first sentence\".And a second,one!"
373
173
                << "This is a \"first sentence\". And a second, one! " << 2;
187
                << "This is a \"first sentence\". And a second, one! " << 2;
374
174
        QTest::newRow("auto-correct disabled, multiple sentences with dots")
188
        QTest::newRow("auto-correct disabled, multiple sentences with dots")
375
175
                << false << "First sentence. Second one. And Third. "
189
                << false << "First sentence. Second one. And Third. "
376
176
                << "First sentence. Second one. And Third. " << 3;
190
                << "First sentence. Second one. And Third. " << 3;
377
177
        QTest::newRow("auto-correct enabled, multiple sentences with dots")
191
        QTest::newRow("auto-correct enabled, multiple sentences with dots")
379
178
                << true << "First sentence. Second one. And Third. "
192
                << true << "First sentence.Second one.And Third."
380
179
                << "First sentence. Second one. And Third. " << 3;
193
                << "First sentence. Second one. And Third. " << 3;
381
194
382
195
        // Tests for the auto-correct and autocaps separator functionality
383
196
        // FIXME: In the current testing infra, we cannot really test this properly, as we are using the 'backspace' character
384
197
        //  a lot during auto-correction, which is currently not handled too well here.
385
198
        QTest::newRow("auto-correct enabled, autocaps after separator auto-correction")
386
199
                << true << "Hello Wor .This should be autocapsed "
387
200
                << "Hello World . This should be autocapsed " << 1;
388
201
        QTest::newRow("auto-correct enabled, autocaps after separator auto-correction #2")
389
202
                << true << "Hello Wor .This should be autocapsed "
390
203
                << "Hello World . This should be autocapsed " << 1;
391
180
    }
204
    }
392
181
205
393
182
    Q_SLOT void testAutoCaps()
206
    Q_SLOT void testAutoCaps()
394
@@ -196,6 +220,7 @@
395
196
        initializeWordEngine(word_engine);
220
        initializeWordEngine(word_engine);
396
197
221
397
198
        editor.wordEngine()->setWordPredictionEnabled(true);
222
        editor.wordEngine()->setWordPredictionEnabled(true);
398
223
        editor.wordEngine()->setEnabled(true);
399
199
        editor.setAutoCorrectEnabled(enable_auto_correct);
224
        editor.setAutoCorrectEnabled(enable_auto_correct);
400
200
        editor.setPreeditEnabled(true);
225
        editor.setPreeditEnabled(true);
401
201
        editor.setAutoCapsEnabled(true);
226
        editor.setAutoCapsEnabled(true);
402
@@ -204,7 +229,7 @@
403
204
229
404
205
        QCOMPARE(host.commitStringHistory(), expected_commit_history);
230
        QCOMPARE(host.commitStringHistory(), expected_commit_history);
405
206
        Q_UNUSED(expected_auto_caps_activated_count)
231
        Q_UNUSED(expected_auto_caps_activated_count)
407
207
//        QCOMPARE(auto_caps_activated_spy.count(), expected_auto_caps_activated_count);
232
        QCOMPARE(auto_caps_activated_spy.count(), expected_auto_caps_activated_count);
408
208
    }
233
    }
409
209
};
234
};
410
210
235
411
211
236
412
=== modified file 'tests/unittests/ut_editor/wordengineprobe.cpp'
413
--- tests/unittests/ut_editor/wordengineprobe.cpp	2014-04-24 13:18:54 +0000
414
+++ tests/unittests/ut_editor/wordengineprobe.cpp	2014-06-11 13:16:05 +0000
415
@@ -31,6 +31,38 @@
416
31
31
417
32
#include "wordengineprobe.h"
32
#include "wordengineprobe.h"
418
33
33
419
34
// To properly mock language features, we need to realistically determine separators and autoCaps
420
35
// Since unittests use latin letters, we simply use the same methods as in WesternLanguageFeatures
421
36
bool MockLanguageFeatures::activateAutoCaps(const QString &preedit) const
422
37
{
423
38
    static const QString sentenceBreak = QString::fromUtf8("!.?:\r\n");
424
39
425
40
    if (preedit.isEmpty()) {
426
41
        return false;
427
42
    }
428
43
429
44
    if (sentenceBreak.contains(preedit.right(1))) {
430
45
        return true;
431
46
    }
432
47
433
48
    return false;
434
49
}
435
50
436
51
bool MockLanguageFeatures::isSeparator(const QString &text) const
437
52
{
438
53
    static const QString separators = QString::fromUtf8(",.!?:;\r\n");
439
54
440
55
    if (text.isEmpty()) {
441
56
        return false;
442
57
    }
443
58
444
59
    if (separators.contains(text.right(1))) {
445
60
        return true;
446
61
    }
447
62
448
63
    return false;
449
64
}
450
65
451
34
namespace MaliitKeyboard {
66
namespace MaliitKeyboard {
452
35
namespace Logic {
67
namespace Logic {
453
36
68
454
37
69
455
=== modified file 'tests/unittests/ut_editor/wordengineprobe.h'
456
--- tests/unittests/ut_editor/wordengineprobe.h	2014-04-24 13:18:54 +0000
457
+++ tests/unittests/ut_editor/wordengineprobe.h	2014-06-11 13:16:05 +0000
458
@@ -43,10 +43,12 @@
459
43
    explicit MockLanguageFeatures() {}
43
    explicit MockLanguageFeatures() {}
460
44
    virtual ~MockLanguageFeatures() {}
44
    virtual ~MockLanguageFeatures() {}
461
45
45
462
46
    virtual bool isSeparator(const QString &text) const;
463
46
    virtual bool alwaysShowSuggestions() const { return false; }
47
    virtual bool alwaysShowSuggestions() const { return false; }
467
47
    virtual bool autoCapsAvailable() const { return false; }
48
    virtual bool autoCapsAvailable() const { return true; }
468
48
    virtual bool activateAutoCaps(const QString &preedit) const { Q_UNUSED(preedit); return false; }
49
    virtual bool activateAutoCaps(const QString &preedit) const;
469
49
    virtual QString appendixForReplacedPreedit(const QString &preedit) const { Q_UNUSED(preedit); return ""; }
50
    virtual QString appendixForReplacedPreedit(const QString &preedit) const { Q_UNUSED(preedit); return " "; }
470
51
    virtual QString fullStopSequence() const { return QString("."); }
471
50
};
52
};
472
51
53
473
52
namespace MaliitKeyboard {
54
namespace MaliitKeyboard {
Reviewer	Review Type	Date Requested	Status
Bill Filler (community)			Approve on 2014-06-11
PS Jenkins bot	continuous-integration		Needs Fixing on 2014-06-11
Michael Sheldon (community)		2014-04-09	Needs Fixing on 2014-05-23
Review via email: mp+214996@code.launchpad.net