Commit Dialog:
- Commit messages must not be empty - Double-clicking a file invokes diff FileAction Dialog: - Optional checkbox MainWindow: - Added Rename/Undo/About Actions - Added Renamed/Missing file states - Added tooltips to status column - Support for running fossil in detached mode (to prevent killing fossil due to timeout on diff sessions) FossilOrigin-Name: ea42e7cd8b7041d82e35720b14e30437b6db6e0d
This commit is contained in:
@ -1,7 +1,7 @@
|
||||
#include "FileActionDialog.h"
|
||||
#include "ui_FileActionDialog.h"
|
||||
|
||||
FileActionDialog::FileActionDialog(const QString &title, const QString &message, const QStringList &files, QWidget *parent) :
|
||||
FileActionDialog::FileActionDialog(QWidget *parent, const QString &title, const QString &message, const QStringList &files, const QString &checkBoxText, bool *checkBoxResult) :
|
||||
QDialog(parent),
|
||||
ui(new Ui::FileActionDialog)
|
||||
{
|
||||
@ -10,6 +10,17 @@ FileActionDialog::FileActionDialog(const QString &title, const QString &message,
|
||||
ui->label->setText(message);
|
||||
ui->listView->setModel(&itemModel);
|
||||
|
||||
if(!checkBoxText.isEmpty() && checkBoxResult)
|
||||
{
|
||||
checkBox = new QCheckBox(this);
|
||||
checkBox->setText(checkBoxText);
|
||||
checkBox->setEnabled(true);
|
||||
checkBox->setChecked(*checkBoxResult);
|
||||
this->checkBoxResult = checkBoxResult;
|
||||
ui->verticalLayout->insertWidget(2, checkBox);
|
||||
}
|
||||
|
||||
|
||||
for(QStringList::const_iterator it=files.begin(); it!=files.end(); ++it)
|
||||
itemModel.appendRow(new QStandardItem(*it));
|
||||
}
|
||||
@ -19,10 +30,13 @@ FileActionDialog::~FileActionDialog()
|
||||
delete ui;
|
||||
}
|
||||
|
||||
bool FileActionDialog::run(const QString &title, const QString &message, const QStringList &files, QWidget *parent)
|
||||
bool FileActionDialog::run(QWidget *parent, const QString &title, const QString &message, const QStringList &files, const QString &checkBoxText, bool *checkBoxResult)
|
||||
{
|
||||
FileActionDialog dlg(title, message, files, parent);
|
||||
FileActionDialog dlg(parent, title, message, files, checkBoxText, checkBoxResult);
|
||||
int res = dlg.exec();
|
||||
|
||||
if(!checkBoxText.isEmpty() && checkBoxResult && dlg.checkBox)
|
||||
*checkBoxResult = dlg.checkBox->isChecked();
|
||||
|
||||
return res == QDialog::Accepted;
|
||||
}
|
||||
|
Reference in New Issue
Block a user