Swiftdiff options
| author | Richard Maudsley <richard.maudsley@isode.com> | 2014-05-19 11:18:52 (GMT) |
|---|---|---|
| committer | Swift Review <review@swift.im> | 2014-07-09 10:19:41 (GMT) |
| commit | 05d9e618e4c756e50b633448f0546614a645a13d (patch) | |
| tree | 5a05e5c2c939c240a58c4aa468af0806a7ed8822 /Swift/QtUI/QtSwift.cpp | |
| parent | acac7962ba04c083377f62f4265ecc754176f74e (diff) | |
| download | swift-contrib-05d9e618e4c756e50b633448f0546614a645a13d.zip swift-contrib-05d9e618e4c756e50b633448f0546614a645a13d.tar.bz2 | |
Add dialog to send AdHoc's to target specific JID's. Fix multi-item Form rendering.
Test-Information:
Use AdHoc bot that presents a multi-item form and check that it is rendered correctly. Check that entering invalid JID and node parameters in the dialog do not cause malfunction. Check that canceling the JID prompt closes the dialog without sending any server commands.
Change-Id: I10e6f4c7eccd1a35c8c885d548994b5f57fdbf66
Diffstat (limited to 'Swift/QtUI/QtSwift.cpp')
| -rw-r--r-- | Swift/QtUI/QtSwift.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/Swift/QtUI/QtSwift.cpp b/Swift/QtUI/QtSwift.cpp index 183f64d..d2224ba 100644 --- a/Swift/QtUI/QtSwift.cpp +++ b/Swift/QtUI/QtSwift.cpp @@ -90,4 +90,5 @@ po::options_description QtSwift::getOptionsDescription() { ("multi-account", po::value<int>()->default_value(1), "Number of accounts to open windows for (unsupported)") ("start-minimized", "Don't show the login/roster window at startup") + ("enable-jid-adhocs", "Enable AdHoc commands to custom JID's.") #if QT_VERSION >= 0x040800 ("language", po::value<std::string>(), "Use a specific language, instead of the system-wide one") @@ -163,4 +164,5 @@ QtSwift::QtSwift(const po::variables_map& options) : networkFactories_(&clientMa } + bool enableAdHocCommandOnJID = options.count("enable-jid-adhocs") > 0; tabs_ = options.count("no-tabs") && !splitter_ ? NULL : new QtChatTabs(splitter_ != NULL); bool startMinimized = options.count("start-minimized") > 0; @@ -211,5 +213,5 @@ QtSwift::QtSwift(const po::variables_map& options) : networkFactories_(&clientMa systemTrays_.push_back(new QtSystemTray()); } - QtUIFactory* uiFactory = new QtUIFactory(settingsHierachy_, qtSettings_, tabs_, splitter_, systemTrays_[i], chatWindowFactory_, networkFactories_.getTimerFactory(), statusCache_, startMinimized, !emoticons.empty()); + QtUIFactory* uiFactory = new QtUIFactory(settingsHierachy_, qtSettings_, tabs_, splitter_, systemTrays_[i], chatWindowFactory_, networkFactories_.getTimerFactory(), statusCache_, startMinimized, !emoticons.empty(), enableAdHocCommandOnJID); uiFactories_.push_back(uiFactory); MainController* mainController = new MainController( |