Commit 0c4702fa authored by Bernd Gehrmann's avatar Bernd Gehrmann
Browse files

sync with sf.net repo

svn path=/trunk/kdesdk/cervisia/; revision=113323
parent a80b75e5
2001-09-04 Bernd Gehrmann <bernd@physik.hu-berlin.de>
* Added 'Force tag creation' option to tag dialog
Patch by Alessandro Praduroux <pradu@thekompany.com>
======> TODO Before Importing ======> TODO Before Importing
======================================== ========================================
* Remove stale CVS directories and add to main repository * Remove stale CVS directories and add to main repository
......
...@@ -1240,8 +1240,10 @@ void CervisiaPart::createOrDeleteTag(TagDialog::ActionType action) ...@@ -1240,8 +1240,10 @@ void CervisiaPart::createOrDeleteTag(TagDialog::ActionType action)
cmdline += " tag "; cmdline += " tag ";
if (action == TagDialog::Delete) if (action == TagDialog::Delete)
cmdline += "-d "; cmdline += "-d ";
else if (l->branchTag()) if (l->branchTag())
cmdline += "-b "; cmdline += "-b ";
if (l->forceTag())
cmdline += "-F ";
cmdline += l->tag(); cmdline += l->tag();
cmdline += " "; cmdline += " ";
cmdline += joinLine(list); cmdline += joinLine(list);
......
...@@ -31,7 +31,7 @@ ...@@ -31,7 +31,7 @@
TagDialog::TagDialog(ActionType action, const QString &sbox, const QString &repo, TagDialog::TagDialog(ActionType action, const QString &sbox, const QString &repo,
QWidget *parent, const char *name) QWidget *parent, const char *name)
: QDialog(parent, name, true) : QDialog(parent, name, true), branchtag_button(0), forcetag_button(0)
{ {
setCaption( (action==Delete)? i18n("CVS Delete Tag") : i18n("CVS Tag") ); setCaption( (action==Delete)? i18n("CVS Delete Tag") : i18n("CVS Tag") );
...@@ -73,6 +73,9 @@ TagDialog::TagDialog(ActionType action, const QString &sbox, const QString &repo ...@@ -73,6 +73,9 @@ TagDialog::TagDialog(ActionType action, const QString &sbox, const QString &repo
branchtag_button = new QCheckBox(i18n("Create &branch with this tag"), this); branchtag_button = new QCheckBox(i18n("Create &branch with this tag"), this);
layout->addWidget(branchtag_button); layout->addWidget(branchtag_button);
forcetag_button = new QCheckBox(i18n("&Force tag creation even if tag already exists"), this);
layout->addWidget(forcetag_button);
} }
QFrame *frame = new QFrame(this); QFrame *frame = new QFrame(this);
......
...@@ -33,7 +33,9 @@ public: ...@@ -33,7 +33,9 @@ public:
QWidget *parent=0, const char *name=0 ); QWidget *parent=0, const char *name=0 );
bool branchTag() const bool branchTag() const
{ return branchtag_button->isChecked(); } { return branchtag_button && branchtag_button->isChecked(); }
bool forceTag() const
{ return forcetag_button && forcetag_button->isChecked(); }
QString tag() const QString tag() const
{ return act==Delete? tag_combo->currentText() : tag_edit->text(); } { return act==Delete? tag_combo->currentText() : tag_edit->text(); }
...@@ -48,6 +50,7 @@ private: ...@@ -48,6 +50,7 @@ private:
QString sandbox, repository; QString sandbox, repository;
QCheckBox *branchtag_button; QCheckBox *branchtag_button;
QCheckBox *forcetag_button;
QLineEdit *tag_edit; QLineEdit *tag_edit;
QComboBox *tag_combo; QComboBox *tag_combo;
}; };
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment