Swiftdiff options
| author | Kevin Smith <git@kismith.co.uk> | 2011-09-27 16:13:56 (GMT) |
|---|---|---|
| committer | Kevin Smith <git@kismith.co.uk> | 2011-09-27 16:38:45 (GMT) |
| commit | 41854ebf8c3376d6ee430efe3a9fdd25610bb2f5 (patch) | |
| tree | 81e918793afb16accb29af46ccd99eefa204930c /Swift/QtUI/QtChatWindow.h | |
| parent | 24e53876500f0f5497a84b239d9350676e95751a (diff) | |
| download | swift-contrib-41854ebf8c3376d6ee430efe3a9fdd25610bb2f5.zip swift-contrib-41854ebf8c3376d6ee430efe3a9fdd25610bb2f5.tar.bz2 | |
Allow room configuration.
Resolves: #989
Diffstat (limited to 'Swift/QtUI/QtChatWindow.h')
| -rw-r--r-- | Swift/QtUI/QtChatWindow.h | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/Swift/QtUI/QtChatWindow.h b/Swift/QtUI/QtChatWindow.h index b8fa478..b011427 100644 --- a/Swift/QtUI/QtChatWindow.h +++ b/Swift/QtUI/QtChatWindow.h @@ -6,15 +6,17 @@ #pragma once -#include "Swift/Controllers/UIInterfaces/ChatWindow.h" +#include <Swift/Controllers/UIInterfaces/ChatWindow.h> +#include <Swift/QtUI/QtMUCConfigurationWindow.h> -#include "QtTabbable.h" +#include <QtTabbable.h> -#include "SwifTools/LastLineTracker.h" +#include <SwifTools/LastLineTracker.h> -#include "Swiften/Base/IDGenerator.h" +#include <Swiften/Base/IDGenerator.h> #include <map> +#include <QPointer> class QTextEdit; class QLineEdit; @@ -69,6 +71,7 @@ namespace Swift { QByteArray getSplitterState(); virtual void setAvailableOccupantActions(const std::vector<OccupantAction>& actions); void setSubject(const std::string& subject); + void showRoomConfigurationForm(Form::ref); public slots: void handleChangeSplitterState(QByteArray state); @@ -147,8 +150,8 @@ namespace Swift { QSplitter *logRosterSplitter_; Tristate correctionEnabled_; QString alertStyleSheet_; - std::map<QString, QString> descriptions; QtFileTransferJSBridge* fileTransferJS; + QPointer<QtMUCConfigurationWindow> mucConfigurationWindow; }; } |