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

* Patch by Christian Loose <christian.loose@hamburg.de>:

  - Allow to specify a comment when importing a module
  - Enable checkout/import when no item is selected
* Always enable folding and unfolding the tree

svn path=/trunk/kdesdk/cervisia/; revision=151119
parent b37fc349
2002-04-22 Bernd Gehrmann <bernd@mail.berlios.de>
* Patch by Christian Loose <christian.loose@hamburg.de>:
- Allow to specify a comment when importing a module
- Enable checkout/import when no item is selected
* Always enable folding and unfolding the tree
2002-04-17 Bernd Gehrmann <bernd@mail.berlios.de>
* Patch by Gregory Green <gregory.p.green@boeing.com>:
......
......@@ -561,11 +561,9 @@ void CervisiaPart::updateActions()
actionCollection()->action( "lock_files" )->setEnabled( nojob );
actionCollection()->action( "unlock_files" )->setEnabled( nojob );
actionCollection()->action( "repository_checkout" )->setEnabled( nojob );
actionCollection()->action( "repository_import" )->setEnabled( nojob );
actionCollection()->action( "repository_checkout" )->setEnabled( !hasRunningJob );
actionCollection()->action( "repository_import" )->setEnabled( !hasRunningJob );
actionCollection()->action( "view_unfold_tree" )->setEnabled( selected );
actionCollection()->action( "view_fold_tree" )->setEnabled( selected );
actionCollection()->action( "view_history" )->setEnabled(selected);
actionCollection()->action( "make_patch" )->setEnabled(selected);
}
......@@ -576,7 +574,7 @@ void CervisiaPart::aboutCervisia()
QString aboutstr(i18n("Cervisia %1\n"
"(Using KDE %2)\n"
"\n"
"Copyright (C) 1999-2001\n"
"Copyright (C) 1999-2002\n"
"Bernd Gehrmann <bernd@physik.hu-berlin.de>\n"
"\n"
"This program may be distributed under the terms of the Q Public\n"
......@@ -584,7 +582,8 @@ void CervisiaPart::aboutCervisia()
"file LICENSE.QPL included in the packaging of this file.\n\n"
"This program is distributed in the hope that it will be useful,\n"
"but WITHOUT ANY WARRANTY; without even the implied warranty of\n"
"MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."));
"MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n\n"
"See the ChangeLog file for a list of contributors."));
QMessageBox::about(0, i18n("About Cervisia"),
aboutstr.arg(CERVISIA_VERSION).arg(KDE_VERSION_STRING));
}
......@@ -1221,8 +1220,9 @@ void CervisiaPart::importOrCheckout(CheckoutDialog::ActionType action)
cmdline += " -I ";
cmdline += KShellProcess::quote(ignore);
}
QString comment = l->comment().stripWhiteSpace();
cmdline += " -m ";
cmdline += (QString("\"") + "" + "\" "); // log message?
cmdline += (QString("\"") + comment + "\" ");
cmdline += l->module();
cmdline += " ";
cmdline += l->vendorTag();
......
......@@ -45,11 +45,11 @@ CheckoutDialog::CheckoutDialog(ActionType action, QWidget *parent, const char *n
QBoxLayout *layout = new QVBoxLayout(this, 10);
QGridLayout *grid = new QGridLayout((action==Checkout)? 4 : 8, 2, 10);
QGridLayout *grid = new QGridLayout((action==Checkout)? 4 : 9, 2, 10);
layout->addLayout(grid);
grid->setColStretch(0, 1);
grid->setColStretch(1, 20);
for (int i = 0; i < ((action==Checkout)? 4 : 8); ++i)
for (int i = 0; i < ((action==Checkout)? 4 : 9); ++i)
grid->setRowStretch(i, 0);
repo_combo = new QComboBox(true, this);
......@@ -154,10 +154,19 @@ CheckoutDialog::CheckoutDialog(ActionType action, QWidget *parent, const char *n
(ignore_edit, i18n("&Ignore files:"), this);
ignore_label->setFixedSize(ignore_label->sizeHint());
grid->addWidget(ignore_label, resume_row + 3, 0, AlignLeft | AlignVCenter);
comment_edit = new QLineEdit(this);
comment_edit->setMinimumSize(comment_edit->sizeHint());
grid->addWidget(comment_edit, resume_row + 4, 1);
QLabel *comment_label = new QLabel
(comment_edit, i18n("&Comment:"), this);
comment_label->setFixedSize(comment_label->sizeHint());
grid->addWidget(comment_label, resume_row + 4, 0, AlignLeft | AlignVCenter);
binary_box = new QCheckBox(i18n("Import as &binaries"), this);
binary_box->setMinimumSize(binary_box->sizeHint());
grid->addMultiCellWidget(binary_box, resume_row + 4, 6, 0, 1);
grid->addMultiCellWidget(binary_box, resume_row + 5, 7, 0, 1);
}
......
......@@ -36,14 +36,16 @@ public:
{ return repo_combo->currentText(); }
QString module() const
{ return act==Import? module_edit->text() : module_combo->currentText(); }
QString branch() const
{ return branch_edit->text(); }
QString branch() const
{ return branch_edit->text(); }
QString vendorTag() const
{ return vendortag_edit->text(); }
QString releaseTag() const
{ return releasetag_edit->text(); }
QString ignoreFiles() const
{ return ignore_edit->text(); }
QString comment() const
{ return comment_edit->text(); }
bool importBinary() const
{ return binary_box->isChecked(); }
......@@ -61,7 +63,7 @@ private:
struct Options {
QString repo;
QString module;
QString branch;
QString branch;
QString workdir;
QString vendortag;
QString releasetag;
......@@ -73,6 +75,7 @@ private:
QComboBox *repo_combo, *module_combo;
QLineEdit *module_edit, *workdir_edit;
QLineEdit *branch_edit;
QLineEdit *comment_edit;
QLineEdit *vendortag_edit, *releasetag_edit, *ignore_edit;
QCheckBox *binary_box;
QPushButton *ok_button, *cancel_button;
......
......@@ -29,7 +29,7 @@ int main(int argc, char **argv)
};
KAboutData about("cervisia", I18N_NOOP("Cervisia"),
CERVISIA_VERSION, I18N_NOOP("A CVS frontend"),
KAboutData::License_QPL, I18N_NOOP("(c) 1999-2001 Bernd Gehrmann"));
KAboutData::License_QPL, I18N_NOOP("(c) 1999-2002 Bernd Gehrmann"));
KCmdLineArgs::init(argc, argv, &about);
KCmdLineArgs::addCmdLineOptions(options);
......
#define CERVISIA_VERSION "1.5rich1"
#define CERVISIA_VERSION "1.6"
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