894f980a7c
Support for forced merges Context menus are offset by a pixel to prevent unintended clicks FossilOrigin-Name: b0f81bc9c4d226d8406f65d9ad02099205d7e067
93 lines
2.9 KiB
C++
93 lines
2.9 KiB
C++
#include "UpdateDialog.h"
|
|
#include "ui_UpdateDialog.h"
|
|
#include "Utils.h"
|
|
|
|
//-----------------------------------------------------------------------------
|
|
UpdateDialog::UpdateDialog(QWidget *parent, const QStringList &completions, const QString &defaultValue) :
|
|
QDialog(parent),
|
|
ui(new Ui::UpdateDialog),
|
|
completer(completions, parent)
|
|
{
|
|
ui->setupUi(this);
|
|
ui->cmbRevision->setCompleter(&completer);
|
|
|
|
ui->cmbRevision->addItems(completions);
|
|
|
|
if(!defaultValue.isEmpty())
|
|
ui->cmbRevision->setCurrentText(defaultValue);
|
|
}
|
|
|
|
//-----------------------------------------------------------------------------
|
|
UpdateDialog::~UpdateDialog()
|
|
{
|
|
delete ui;
|
|
}
|
|
|
|
//-----------------------------------------------------------------------------
|
|
QString UpdateDialog::runUpdate(QWidget *parent, const QString &title, const QStringList &completions, const QString &defaultValue)
|
|
{
|
|
UpdateDialog dlg(parent, completions, defaultValue);
|
|
dlg.setWindowTitle(title);
|
|
dlg.ui->lblName->setVisible(false);
|
|
dlg.ui->lineName->setVisible(false);
|
|
dlg.ui->lblIntegrate->setVisible(false);
|
|
dlg.ui->chkIntegrate->setVisible(false);
|
|
dlg.ui->lblForce->setVisible(false);
|
|
dlg.ui->chkForce->setVisible(false);
|
|
|
|
dlg.adjustSize();
|
|
|
|
if(dlg.exec() != QDialog::Accepted)
|
|
return QString("");
|
|
return dlg.ui->cmbRevision->currentText().trimmed();
|
|
}
|
|
|
|
//-----------------------------------------------------------------------------
|
|
QString UpdateDialog::runMerge(QWidget *parent, const QString &title, const QStringList &completions, const QString &defaultValue, bool &integrate, bool &force)
|
|
{
|
|
UpdateDialog dlg(parent, completions, defaultValue);
|
|
dlg.setWindowTitle(title);
|
|
dlg.ui->lblName->setVisible(false);
|
|
dlg.ui->lineName->setVisible(false);
|
|
dlg.ui->lblIntegrate->setVisible(true);
|
|
dlg.ui->chkIntegrate->setVisible(true);
|
|
dlg.ui->chkIntegrate->setChecked(integrate);
|
|
dlg.ui->lblForce->setVisible(true);
|
|
dlg.ui->chkForce->setVisible(true);
|
|
dlg.ui->chkForce->setChecked(force);
|
|
|
|
dlg.adjustSize();
|
|
|
|
if(dlg.exec() != QDialog::Accepted)
|
|
return QString("");
|
|
|
|
integrate = dlg.ui->chkIntegrate->checkState() == Qt::Checked;
|
|
force = dlg.ui->chkForce->checkState() == Qt::Checked;
|
|
|
|
return dlg.ui->cmbRevision->currentText().trimmed();
|
|
}
|
|
|
|
|
|
//-----------------------------------------------------------------------------
|
|
bool UpdateDialog::runNewTag(QWidget *parent, const QString &title, const QStringList &completions, const QString &defaultValue, QString &revision, QString &name)
|
|
{
|
|
UpdateDialog dlg(parent, completions, defaultValue);
|
|
dlg.setWindowTitle(title);
|
|
|
|
dlg.ui->lblName->setVisible(true);
|
|
dlg.ui->lineName->setVisible(true);
|
|
dlg.ui->lblIntegrate->setVisible(false);
|
|
dlg.ui->chkIntegrate->setVisible(false);
|
|
dlg.ui->lblForce->setVisible(false);
|
|
dlg.ui->chkForce->setVisible(false);
|
|
|
|
dlg.adjustSize();
|
|
|
|
if(dlg.exec() != QDialog::Accepted)
|
|
return false;
|
|
|
|
revision = dlg.ui->cmbRevision->currentText().trimmed();
|
|
name = dlg.ui->lineName->text().trimmed();
|
|
return true;
|
|
}
|