diff --git a/fuel.pro b/fuel.pro index 94dd085..f1ca1db 100644 --- a/fuel.pro +++ b/fuel.pro @@ -47,7 +47,7 @@ SOURCES += src/main.cpp\ src/FileActionDialog.cpp \ src/SettingsDialog.cpp \ src/CloneDialog.cpp \ - src/UpdateDialog.cpp \ + src/RevisionDialog.cpp \ src/Utils.cpp \ src/FileTableView.cpp \ src/LoggedProcess.cpp \ @@ -61,7 +61,7 @@ HEADERS += src/MainWindow.h \ src/FileActionDialog.h \ src/SettingsDialog.h \ src/CloneDialog.h \ - src/UpdateDialog.h \ + src/RevisionDialog.h \ src/Utils.h \ src/FileTableView.h \ src/LoggedProcess.h \ @@ -76,7 +76,7 @@ FORMS += ui/MainWindow.ui \ ui/SettingsDialog.ui \ ui/CloneDialog.ui \ ui/BrowserWidget.ui \ - ui/UpdateDialog.ui + ui/RevisionDialog.ui RESOURCES += \ rsrc/resources.qrc diff --git a/manifest b/manifest index e8bd21b..a38c1e0 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Made\stag\sreferences\sexplicit\swith\s"tag:"\sto\sprevent\sclashes\swith\sfilesystem\sobjects\swith\sthe\ssame\sname -D 2015-05-03T14:41:54.154 +C Renamed\sUpdateDialog\sto\sRevisionDialog +D 2015-05-03T14:47:53.844 F .travis.yml 77966888a81c4ceee1fcc79bce842c9667ad8a35 F debian/changelog eb4304dfcb6bb66850ec740838090eb50ce1249b F debian/compat b6abd567fa79cbe0196d093a067271361dc6ca8b @@ -15,7 +15,7 @@ F dist/win/fuel.iss ef3558dbba409eb194938b930377fc9ee27d319e F doc/Building.txt 17b43fa23da764b5d1b828cc48c5a95e612bbd8f F doc/Changes.txt b03302545e4a6c0b16a30d623a7627f8aef65ef6 F doc/License.txt 4cc77b90af91e615a64ae04893fdffa7939db84c -F fuel.pro ffc65a5de975124eeb22032c6d9595f77ef284d8 +F fuel.pro 6199ecb89dd8cc9a1d5357ebcac774edc302ef0d F intl/convert.bat 4222ae403418381452b843929d15259ea9850ab1 x F intl/convert.sh 2ca2179ff53e727f241925b75e19182607883c45 x F intl/de_DE.ts e2faceab920ac60c97bbc6fba038e261d51fc741 @@ -200,12 +200,12 @@ F src/Fossil.cpp f27b97eaf068275a0e8558dd2b739f9c7b61774a F src/Fossil.h f9b49ed930af2159f97a86ce0f6da821a0b0819e F src/LoggedProcess.cpp 2a1e5c94bc1e57c8984563e66c210e43a14dc60c F src/LoggedProcess.h 85df7c635c807a5a0e8c4763f17a0752aaff7261 -F src/MainWindow.cpp 552a6bab2ae5a643e9b27105001ef469753ad5e1 +F src/MainWindow.cpp d430100fd7dce89899830505869d30d7fe78c80d F src/MainWindow.h e6797adc543fd07a117a4eacc202fb166ec6665a +F src/RevisionDialog.cpp 51065c65a07c118dd1a7363da4a55a135d1c6c9c w src/UpdateDialog.cpp +F src/RevisionDialog.h b718c3009342eaabad39c8a11a253a4e4fef7a73 w src/UpdateDialog.h F src/SettingsDialog.cpp a46cff5e5dd425e3dbdd15632abfd5829f5562b4 F src/SettingsDialog.h 4e2790f581e991c744ae9f86580f1972b8c7ff43 -F src/UpdateDialog.cpp 4dd021bc57dde4f6e3f444f5f8a02f5a4a736478 -F src/UpdateDialog.h b3ecf0401659a9e48a4f832bd996fe27c6d15f40 F src/Utils.cpp 748a58f19187aff7f3b867894129291cbe091678 F src/Utils.h 9cc125f59b8d46ff47bbde4c2cf9bc77f8e2553b F src/Workspace.cpp f68a4ca05d1b7c5c345fbd89527691813593c663 @@ -218,9 +218,9 @@ F ui/CloneDialog.ui 4886e7d4f258ea8b852b5eefc860396e35145712 F ui/CommitDialog.ui 6200f6cabdcf40a20812e811be28e0793f82516f F ui/FileActionDialog.ui 89bb4dc2d0b8adcd41adcb11ec65f2028a09a12d F ui/MainWindow.ui d4fc7971a0717677adb1be0bb88502dfcb92f5c4 +F ui/RevisionDialog.ui 27c3b98c665fec014a50cbf3352c0627f75e68cd w ui/UpdateDialog.ui F ui/SettingsDialog.ui 2b7c2870e0054b0f4106f495d85d02c0b814df8b -F ui/UpdateDialog.ui 392cdba296dd4b79145992a85e79748e7c34580d -P b64d5954b1e1baf7e69d56b2ec8c31584141cebb -R c4ee61e1b2e9e65e210979f3618ea057 +P 71aeb47a33d20919a71efc23d973c5f6a3c3bb90 +R f78244cea8d27d8c7919d636f9f5d003 U kostas -Z 4e196455c7fb9e67c5070f7ff39d102c +Z 077b53fc9177948b0f7f836370f27e76 diff --git a/manifest.uuid b/manifest.uuid index c897223..ff4b9ae 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -71aeb47a33d20919a71efc23d973c5f6a3c3bb90 \ No newline at end of file +9704609d5e9ccbadfce2ed96e74893f97e453e0f \ No newline at end of file diff --git a/src/MainWindow.cpp b/src/MainWindow.cpp index 6c50c12..c5fd490 100644 --- a/src/MainWindow.cpp +++ b/src/MainWindow.cpp @@ -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; diff --git a/src/UpdateDialog.cpp b/src/RevisionDialog.cpp similarity index 73% rename from src/UpdateDialog.cpp rename to src/RevisionDialog.cpp index aacdc1d..0f2ca8b 100644 --- a/src/UpdateDialog.cpp +++ b/src/RevisionDialog.cpp @@ -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); diff --git a/src/UpdateDialog.h b/src/RevisionDialog.h similarity index 66% rename from src/UpdateDialog.h rename to src/RevisionDialog.h index 5714f00..42f678a 100644 --- a/src/UpdateDialog.h +++ b/src/RevisionDialog.h @@ -1,28 +1,28 @@ -#ifndef UPDATEDIALOG_H -#define UPDATEDIALOG_H +#ifndef REVISIONDIALOG_H +#define REVISIONDIALOG_H #include #include 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 diff --git a/ui/UpdateDialog.ui b/ui/RevisionDialog.ui similarity index 94% rename from ui/UpdateDialog.ui rename to ui/RevisionDialog.ui index b588ddf..f2bb9a1 100644 --- a/ui/UpdateDialog.ui +++ b/ui/RevisionDialog.ui @@ -1,7 +1,7 @@ - UpdateDialog - + RevisionDialog + Qt::WindowModal @@ -96,7 +96,7 @@ buttonBox accepted() - UpdateDialog + RevisionDialog accept() @@ -112,7 +112,7 @@ buttonBox rejected() - UpdateDialog + RevisionDialog reject()