Swiftdiff options
| author | Richard Maudsley <richard.maudsley@isode.com> | 2014-07-23 08:00:01 (GMT) |
|---|---|---|
| committer | Swift Review <review@swift.im> | 2014-10-03 07:21:38 (GMT) |
| commit | 3742d8fe17f558f9f6a5e26ac10e5ec3f0c3ae6c (patch) | |
| tree | 0135a5e6aef5e1e9b5f389cdb8f14406765df029 /Swift/QtUI/QtHighlightEditor.h | |
| parent | 4a4e72be24c9b7789426adf5cae078bfc4ca424e (diff) | |
| download | swift-contrib-3742d8fe17f558f9f6a5e26ac10e5ec3f0c3ae6c.zip swift-contrib-3742d8fe17f558f9f6a5e26ac10e5ec3f0c3ae6c.tar.bz2 | |
Suggest MUC occupants when typing in highlight editor JID box
Test-Information:
Join several MUCs and confirm that MUC occupants are suggested along with recent contacts. Confirm that clicking or pressing return adds the selected contact to the edit field. Check that QtSuggestingJIDInput in Start Chat dialog still functions as before, and that MUC users are not suggested here.
Change-Id: Ieadc95d55c764e1fa48c949cca4d5e0aa5f19615
Diffstat (limited to 'Swift/QtUI/QtHighlightEditor.h')
| -rw-r--r-- | Swift/QtUI/QtHighlightEditor.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Swift/QtUI/QtHighlightEditor.h b/Swift/QtUI/QtHighlightEditor.h index e0595ad..93a19b6 100644 --- a/Swift/QtUI/QtHighlightEditor.h +++ b/Swift/QtUI/QtHighlightEditor.h @@ -21,50 +21,50 @@ namespace Swift { class QtSettingsProvider; class QtSuggestingJIDInput; class QtWebKitChatView; class QtHighlightEditor : public QWidget, public HighlightEditorWindow { Q_OBJECT public: QtHighlightEditor(QtSettingsProvider* settings, QWidget* parent = NULL); virtual ~QtHighlightEditor(); virtual void show(); virtual void setHighlightManager(HighlightManager* highlightManager); virtual void setContactSuggestions(const std::vector<Contact::ref>& suggestions); private slots: void colorOtherSelect(); void colorCustomSelect(); void soundOtherSelect(); void soundCustomSelect(); void onNewButtonClicked(); void onDeleteButtonClicked(); void onUpButtonClicked(); void onDownButtonClicked(); void onCurrentRowChanged(int currentRow); void onApplyButtonClick(); void onCancelButtonClick(); void onOkButtonClick(); void setChildWidgetStates(); void widgetClick(); void disableDialog(); void handleContactSuggestionRequested(const QString& text); void selectSoundFile(); private: - void handleOnUserSelected(const JID& jid); + void handleOnUserSelected(const Contact::ref& contact); void populateList(); void selectRow(int row); int getSelectedRow() const; HighlightRule ruleFromDialog(); void ruleToDialog(const HighlightRule& rule); Ui::QtHighlightEditor ui_; QtSettingsProvider* settings_; HighlightManager* highlightManager_; QtSuggestingJIDInput* jid_; int previousRow_; }; } |