← Back to branch summary

~michael-sheldon/ubuntu-keyboard/fix-1385518-rtm

« back to all changes in this revision

Viewing changes to src/plugin/inputmethod.h

  • Committer: CI bot
  • Author(s): Michael Sheldon
  • Date: 2014-09-10 14:57:01 UTC
  • mfrom: (215.3.9 fix-1359404)
  • Revision ID: ps-jenkins@lists.canonical.com-20140910145701-j2o8iqkw4qtf4viw
Only switch back automatically from the symbol page if the user presses space or apostrophe and make pre-edit behaviour when entering symbols more consistent. Fixes: 1359404

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/plugin/inputmethod.h
55
55
    Q_PROPERTY(QString audioFeedbackSound READ audioFeedbackSound NOTIFY audioFeedbackSoundChanged)
56
56
    Q_PROPERTY(QObject* actionKeyOverride READ actionKeyOverride NOTIFY actionKeyOverrideChanged)
57
57
    Q_PROPERTY(bool useHapticFeedback READ useHapticFeedback NOTIFY useHapticFeedbackChanged)
 
58
    Q_PROPERTY(QString keyboardState READ keyboardState WRITE setKeyboardState NOTIFY keyboardStateChanged)
58
59
 
59
60
    Q_ENUMS(TextContentType)
60
61
 
112
113
    const QString audioFeedbackSound() const;
113
114
    bool useHapticFeedback() const;
114
115
 
 
116
    const QString keyboardState() const;
 
117
    Q_SLOT void setKeyboardState(const QString& state);
 
118
 
115
119
    QObject* actionKeyOverride() const;
116
120
 
117
121
    Q_SLOT void close();
128
132
    void wordRibbonEnabledChanged(bool wordRibbonEnabled);
129
133
    void windowGeometryRectChanged(QRect rect);
130
134
    void actionKeyOverrideChanged();
 
135
    void keyboardStateChanged(QString state);
 
136
    void keyboardReset();
131
137
 
132
138
private:
133
139
    Q_SLOT void onAutoCorrectSettingChanged();