Swiftdiff options
| author | Tobias Markmann <tm@ayena.de> | 2015-06-03 06:19:49 (GMT) |
|---|---|---|
| committer | Kevin Smith <kevin.smith@isode.com> | 2015-06-05 19:52:20 (GMT) |
| commit | 3741c9ad5c0cc6f92e4ed913d67b3b530882334e (patch) | |
| tree | baa449dcf475ceb291444bb80e78196d94ccc1e4 /Swift/QtUI/QtAdHocCommandWindow.h | |
| parent | dba9757d5805ab308b56c9e623a076426b2dd4c2 (diff) | |
| download | swift-3741c9ad5c0cc6f92e4ed913d67b3b530882334e.zip swift-3741c9ad5c0cc6f92e4ed913d67b3b530882334e.tar.bz2 | |
UI improvements to the ad-hoc command window
Use QDialogButtonBox instead of custom button layout code. This way
the button are correctly layouted depending on platform guidelines.
Show a 'Ok' button if no other button is shown which closes the window.
Test-Information:
Tested on OS X 10.9.5 with Qt 5.4.2.
Change-Id: I37581982766d013f4d3d636880fd5ada59ee0c40
Diffstat (limited to 'Swift/QtUI/QtAdHocCommandWindow.h')
| -rw-r--r-- | Swift/QtUI/QtAdHocCommandWindow.h | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/Swift/QtUI/QtAdHocCommandWindow.h b/Swift/QtUI/QtAdHocCommandWindow.h index 231a51c..c8d493c 100644 --- a/Swift/QtUI/QtAdHocCommandWindow.h +++ b/Swift/QtUI/QtAdHocCommandWindow.h @@ -1,18 +1,20 @@ /* - * Copyright (c) 2010-2012 Isode Limited. + * Copyright (c) 2010-2015 Isode Limited. * All rights reserved. * See the COPYING file for more information. */ #pragma once -#include <QWidget> -#include <QPushButton> +#include <QDialogButtonBox> #include <QLabel> +#include <QPushButton> +#include <QWidget> -#include <Swift/Controllers/UIInterfaces/AdHocCommandWindow.h> #include <Swiften/AdHoc/OutgoingAdHocCommandSession.h> +#include <Swift/Controllers/UIInterfaces/AdHocCommandWindow.h> + class QBoxLayout; namespace Swift { @@ -23,6 +25,7 @@ namespace Swift { QtAdHocCommandWindow(boost::shared_ptr<OutgoingAdHocCommandSession> command); virtual ~QtAdHocCommandWindow(); virtual void setOnline(bool online); + private: void closeEvent(QCloseEvent* event); void handleNextStageReceived(Command::ref command); @@ -30,11 +33,13 @@ namespace Swift { void setForm(Form::ref); void setNoForm(bool andHide); void setAvailableActions(Command::ref commandResult); + private slots: void handleCancelClicked(); void handlePrevClicked(); void handleNextClicked(); void handleCompleteClicked(); + private: boost::shared_ptr<OutgoingAdHocCommandSession> command_; QtFormWidget* formWidget_; @@ -45,7 +50,9 @@ namespace Swift { QPushButton* nextButton_; QPushButton* completeButton_; QPushButton* cancelButton_; + QPushButton* okButton_; std::map<Command::Action, QPushButton*> actions_; + QDialogButtonBox* dialogButtons_; QBoxLayout* layout_; }; } |