AnotherFoxGuy/fuel-scm
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Renamed UpdateDialog to RevisionDialog

Browse Source 
FossilOrigin-Name: 9704609d5e9ccbadfce2ed96e74893f97e453e0f
This commit is contained in:
kostas
2015-05-03 14:47:53 +00:00
parent 9786af1d2b
commit 234f27302c
7 changed files with 42 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/MainWindow.cpp
View File

@ -16,7 +16,7 @@
#include "CommitDialog.h"
#include "FileActionDialog.h"
#include "CloneDialog.h"
#include "UpdateDialog.h"
#include "RevisionDialog.h"
#include "Utils.h"
#define LATEST_VERSION "Latest Revision"
@ -2220,7 +2220,7 @@ void MainWindow::updateRevision(const QString &revision)
if(!revision.isEmpty())
defaultval = revision;
QString selected_revision = UpdateDialog::runUpdate(this, tr("Update workspace"), versionList, defaultval).trimmed();
QString selected_revision = RevisionDialog::runUpdate(this, tr("Update workspace"), versionList, defaultval).trimmed();
if(selected_revision.isEmpty())
return;
@ -2258,7 +2258,7 @@ void MainWindow::on_actionNewTag_triggered()
QString revision = fossil().getCurrentRevision();
QString name;
if(!UpdateDialog::runNewTag(this, tr("New Tag"), versionList, revision, revision, name))
if(!RevisionDialog::runNewTag(this, tr("New Tag"), versionList, revision, revision, name))
return;
if(name.isEmpty() || getWorkspace().getTags().contains(name) || getWorkspace().getBranches().contains(name))
@ -2297,7 +2297,7 @@ void MainWindow::on_actionNewBranch_triggered()
QString revision = fossil().getCurrentRevision();
QString branch_name;
if(!UpdateDialog::runNewTag(this, tr("New Branch"), versionList, revision, revision, branch_name))
if(!RevisionDialog::runNewTag(this, tr("New Branch"), versionList, revision, revision, branch_name))
return;
if(branch_name.isEmpty() || getWorkspace().getTags().contains(branch_name) || getWorkspace().getBranches().contains(branch_name))
@ -2322,7 +2322,7 @@ void MainWindow::MergeRevision(const QString &defaultRevision)
bool integrate = false;
bool force = false;
revision = UpdateDialog::runMerge(this, tr("Merge"), versionList, revision, integrate, force);
revision = RevisionDialog::runMerge(this, tr("Merge"), versionList, revision, integrate, force);
if(revision.isEmpty())
return;

22
src/UpdateDialog.cpp → src/RevisionDialog.cpp
View File

@ -1,11 +1,11 @@
#include "UpdateDialog.h"
#include "ui_UpdateDialog.h"
#include "RevisionDialog.h"
#include "ui_RevisionDialog.h"
#include "Utils.h"
//-----------------------------------------------------------------------------
UpdateDialog::UpdateDialog(QWidget *parent, const QStringList &completions, const QString &defaultValue) :
RevisionDialog::RevisionDialog(QWidget *parent, const QStringList &completions, const QString &defaultValue) :
QDialog(parent),
ui(new Ui::UpdateDialog),
ui(new Ui::RevisionDialog),
completer(completions, parent)
{
ui->setupUi(this);
@ -18,15 +18,15 @@ UpdateDialog::UpdateDialog(QWidget *parent, const QStringList &completions, cons
}
//-----------------------------------------------------------------------------
UpdateDialog::~UpdateDialog()
RevisionDialog::~RevisionDialog()
{
delete ui;
}
//-----------------------------------------------------------------------------
QString UpdateDialog::runUpdate(QWidget *parent, const QString &title, const QStringList &completions, const QString &defaultValue)
QString RevisionDialog::runUpdate(QWidget *parent, const QString &title, const QStringList &completions, const QString &defaultValue)
{
UpdateDialog dlg(parent, completions, defaultValue);
RevisionDialog dlg(parent, completions, defaultValue);
dlg.setWindowTitle(title);
dlg.ui->lblName->setVisible(false);
dlg.ui->lineName->setVisible(false);
@ -43,9 +43,9 @@ QString UpdateDialog::runUpdate(QWidget *parent, const QString &title, const QSt
}
//-----------------------------------------------------------------------------
QString UpdateDialog::runMerge(QWidget *parent, const QString &title, const QStringList &completions, const QString &defaultValue, bool &integrate, bool &force)
QString RevisionDialog::runMerge(QWidget *parent, const QString &title, const QStringList &completions, const QString &defaultValue, bool &integrate, bool &force)
{
UpdateDialog dlg(parent, completions, defaultValue);
RevisionDialog dlg(parent, completions, defaultValue);
dlg.setWindowTitle(title);
dlg.ui->lblName->setVisible(false);
dlg.ui->lineName->setVisible(false);
@ -69,9 +69,9 @@ QString UpdateDialog::runMerge(QWidget *parent, const QString &title, const QStr
//-----------------------------------------------------------------------------
bool UpdateDialog::runNewTag(QWidget *parent, const QString &title, const QStringList &completions, const QString &defaultValue, QString &revision, QString &name)
bool RevisionDialog::runNewTag(QWidget *parent, const QString &title, const QStringList &completions, const QString &defaultValue, QString &revision, QString &name)
{
UpdateDialog dlg(parent, completions, defaultValue);
RevisionDialog dlg(parent, completions, defaultValue);
dlg.setWindowTitle(title);
dlg.ui->lblName->setVisible(true);

16
src/UpdateDialog.h → src/RevisionDialog.h
View File

@ -1,28 +1,28 @@
#ifndef UPDATEDIALOG_H
#define UPDATEDIALOG_H
#ifndef REVISIONDIALOG_H
#define REVISIONDIALOG_H
#include <QDialog>
#include <QCompleter>
namespace Ui {
class UpdateDialog;
class RevisionDialog;
}
class UpdateDialog : public QDialog
class RevisionDialog : public QDialog
{
Q_OBJECT
public:
explicit UpdateDialog(QWidget *parent, const QStringList &completions, const QString &defaultValue);
~UpdateDialog();
explicit RevisionDialog(QWidget *parent, const QStringList &completions, const QString &defaultValue);
~RevisionDialog();
static QString runUpdate(QWidget *parent, const QString &title, const QStringList &completions, const QString &defaultValue);
static QString runMerge(QWidget* parent, const QString& title, const QStringList& completions, const QString& defaultValue, bool& integrate, bool& force);
static bool runNewTag(QWidget *parent, const QString &title, const QStringList &completions, const QString &defaultValue, QString &revision, QString &name);
private:
Ui::UpdateDialog *ui;
Ui::RevisionDialog *ui;
QCompleter completer;
};
#endif // UPDATEDIALOG_H
#endif // REVISIONDIALOG_H