diff options
| author | Knut Petter Svendsen <knutpett@pvv.org> | 2012-09-24 11:39:34 +0200 |
|---|---|---|
| committer | Orgad Shaneh <orgads@gmail.com> | 2012-09-24 16:51:56 +0200 |
| commit | d1ef970a19dbfc60fe0f99557bade02020c7a1a8 (patch) | |
| tree | 6676f8199c0a9221eff9e1be965448cd12246842 /src/plugins/clearcase/checkoutdialog.cpp | |
| parent | 8676b58fb46d378954841bbe702ed7fdf0524c9d (diff) | |
| download | qt-creator-d1ef970a19dbfc60fe0f99557bade02020c7a1a8.tar.gz | |
Add support for base ClearCase.
Current implementation only works for UCM views, which is a bug.
UCM is layered on top of base ClearCase. UCM has concepts such as
projects, streams and activities. When a view is base ClearCase
disable all prompting for activity, UCM menu entries and dialogs.
Change-Id: I81fb1a014373ece97d3f681623d314344a59b75a
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Diffstat (limited to 'src/plugins/clearcase/checkoutdialog.cpp')
| -rw-r--r-- | src/plugins/clearcase/checkoutdialog.cpp | 20 |
1 files changed, 16 insertions, 4 deletions
diff --git a/src/plugins/clearcase/checkoutdialog.cpp b/src/plugins/clearcase/checkoutdialog.cpp index 3e7aba22f8..455aba30dc 100644 --- a/src/plugins/clearcase/checkoutdialog.cpp +++ b/src/plugins/clearcase/checkoutdialog.cpp @@ -31,8 +31,8 @@ **************************************************************************/ #include "checkoutdialog.h" -#include "clearcaseplugin.h" #include "ui_checkoutdialog.h" +#include "activityselector.h" #include <QList> #include <QPair> @@ -41,11 +41,23 @@ namespace ClearCase { namespace Internal { -CheckOutDialog::CheckOutDialog(const QString &fileName, QWidget *parent) : - QDialog(parent), ui(new Ui::CheckOutDialog) +CheckOutDialog::CheckOutDialog(const QString &fileName, bool isUcm, QWidget *parent) : + QDialog(parent), ui(new Ui::CheckOutDialog), m_actSelector(0) { ui->setupUi(this); ui->lblFileName->setText(fileName); + + if (isUcm) { + m_actSelector = new ActivitySelector(this); + + ui->verticalLayout->insertWidget(0, m_actSelector); + + QFrame *line = new QFrame(this); + line->setFrameShape(QFrame::HLine); + line->setFrameShadow(QFrame::Sunken); + + ui->verticalLayout->insertWidget(1, line); + } } CheckOutDialog::~CheckOutDialog() @@ -55,7 +67,7 @@ CheckOutDialog::~CheckOutDialog() QString CheckOutDialog::activity() const { - return ui->actSelector->activity(); + return m_actSelector ? m_actSelector->activity() : QString(); } QString CheckOutDialog::comment() const |