From 130df73f35a7c1ed45a8ce3c37817038b8ff14a1 Mon Sep 17 00:00:00 2001 From: kostas Date: Sun, 24 May 2015 18:19:19 +0000 Subject: [PATCH] Separated Application and Fossil settings into separate dialogs. FossilOrigin-Name: 97d0d1e2408832e1fc8b532e059b2141afd9ac55 --- fuel.pro | 3 + manifest | 33 +-- manifest.uuid | 2 +- src/FslSettingsDialog.cpp | 72 ++++++ src/FslSettingsDialog.h | 33 +++ src/MainWindow.cpp | 15 +- src/MainWindow.h | 3 +- src/Settings.cpp | 3 +- src/Settings.h | 2 +- src/SettingsDialog.cpp | 36 --- src/SettingsDialog.h | 2 - ui/CommitDialog.ui | 2 +- ui/FslSettingsDialog.ui | 300 +++++++++++++++++++++ ui/MainWindow.ui | 14 + ui/SettingsDialog.ui | 529 +++++++++++--------------------------- 15 files changed, 616 insertions(+), 433 deletions(-) create mode 100644 src/FslSettingsDialog.cpp create mode 100644 src/FslSettingsDialog.h create mode 100644 ui/FslSettingsDialog.ui diff --git a/fuel.pro b/fuel.pro index 9b84a57..f606f86 100644 --- a/fuel.pro +++ b/fuel.pro @@ -47,6 +47,7 @@ SOURCES += src/main.cpp\ src/CommitDialog.cpp \ src/FileActionDialog.cpp \ src/SettingsDialog.cpp \ + src/FslSettingsDialog.cpp \ src/CloneDialog.cpp \ src/RevisionDialog.cpp \ src/Utils.cpp \ @@ -63,6 +64,7 @@ HEADERS += src/MainWindow.h \ src/CommitDialog.h \ src/FileActionDialog.h \ src/SettingsDialog.h \ + src/FslSettingsDialog.h \ src/CloneDialog.h \ src/RevisionDialog.h \ src/Utils.h \ @@ -79,6 +81,7 @@ FORMS += ui/MainWindow.ui \ ui/CommitDialog.ui \ ui/FileActionDialog.ui \ ui/SettingsDialog.ui \ + ui/FslSettingsDialog.ui \ ui/CloneDialog.ui \ ui/BrowserWidget.ui \ ui/RevisionDialog.ui diff --git a/manifest b/manifest index 5c12c3b..4ab163c 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Fuel\snow\suses\sthe\shttp\sport\sthat\sFossil\sreports\swhen\sstarting\sthe\sweb\sui.\n -D 2015-05-24T17:44:01.161 +C Separated\sApplication\sand\sFossil\ssettings\sinto\sseparate\sdialogs. +D 2015-05-24T18:19:19.178 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 81afa5c27542c0ac63faa6a310a0e6bb98244609 +F fuel.pro b010c4ee3093112003a9d27045927efce5985dab F intl/convert.bat 4222ae403418381452b843929d15259ea9850ab1 x F intl/convert.sh 2ca2179ff53e727f241925b75e19182607883c45 x F intl/de_DE.ts e2faceab920ac60c97bbc6fba038e261d51fc741 @@ -198,18 +198,20 @@ F src/FileTableView.cpp 5ddf8c391c9a3ac449ec61fb1db837b577afeec2 F src/FileTableView.h 03e56d87c2d46411b9762b87f4d301619aaf18df F src/Fossil.cpp 0d4c50327a61c48506d2d45e28cd6f71f1697ea2 F src/Fossil.h 31765ef57e20a860914372d56c024033b30aa765 +F src/FslSettingsDialog.cpp f5a34a70ecb0560d2b6eea6bf27e42048548aedd +F src/FslSettingsDialog.h dfe2a61884a55a74cbb9206b6f6b482b979725e7 F src/LoggedProcess.cpp 2a1e5c94bc1e57c8984563e66c210e43a14dc60c F src/LoggedProcess.h 85df7c635c807a5a0e8c4763f17a0752aaff7261 -F src/MainWindow.cpp c25a7a4898b9fe80154d2cb7abb81bcafcd50dd6 -F src/MainWindow.h d398df5f8b27d7f1ccae6a7f1fd5ef2c2236002b +F src/MainWindow.cpp 4cbfa1fdf3092b97649711388576230e4808d50e +F src/MainWindow.h a848462f21423b5c1e0c218cab1805c308299607 F src/RevisionDialog.cpp 51065c65a07c118dd1a7363da4a55a135d1c6c9c F src/RevisionDialog.h b718c3009342eaabad39c8a11a253a4e4fef7a73 F src/SearchBox.cpp d4209c575baa9933e1ce5ed376e785b289a145ba F src/SearchBox.h 0c78d3a68136dab3e0e71b83ae36f22bd2688ab2 -F src/Settings.cpp 90eb11d68d0b55a144aab0d78946de98399ceef6 -F src/Settings.h 43fe09ee02ca5b7adb3cc5ab467b078ce3a9a980 -F src/SettingsDialog.cpp efc9de9eac816074036b8f4215f1a0cbcbb9e46d -F src/SettingsDialog.h 02223bf6d3bf51a21ca9d7206e0ecc6f7d6206b7 +F src/Settings.cpp 6ab826273b9693bfcd65f0f59b550ae2aa3577f1 +F src/Settings.h 1ff8bb71e19949150e8caa4f5e5f13f8810e496b +F src/SettingsDialog.cpp 25be4c351dd21ea9132321944f42dc0bc22fb128 +F src/SettingsDialog.h b324dfd77ca3ad24fd83588aaf79a7e4c291e716 F src/Utils.cpp c48e3316f3a0a5d735e8d4953710500358985e32 F src/Utils.h c2a28611bd77fb35ea3dcf65fb60ed585f68aa3c F src/Workspace.cpp f68a4ca05d1b7c5c345fbd89527691813593c663 @@ -219,12 +221,13 @@ F tools/git-push.sh 62cc58434cae5b7bcd6bd9d4cce8b08739f31cd7 x F tools/pack.sh d7f38a498c4e9327fecd6a6e5ac27be270d43008 x F ui/BrowserWidget.ui 994ad9ea0e9f5815d6b1a27acc2f6f39164c507f F ui/CloneDialog.ui 4886e7d4f258ea8b852b5eefc860396e35145712 -F ui/CommitDialog.ui 5270bbf9c0b0c64d695420388160e2bb0e217d9f +F ui/CommitDialog.ui aea77347eef82b6b591f31fb058a1bb96193c728 F ui/FileActionDialog.ui 89bb4dc2d0b8adcd41adcb11ec65f2028a09a12d -F ui/MainWindow.ui 22dc5cebf86223754dc8e0b14707b4cb81c95cc6 +F ui/FslSettingsDialog.ui 042717833d8efea905b4fc380bad580be809717d w ui/FossilSettingsDialog.ui +F ui/MainWindow.ui adf8714bec560da44cd84d74f2ce60f7cea09a70 F ui/RevisionDialog.ui 27c3b98c665fec014a50cbf3352c0627f75e68cd -F ui/SettingsDialog.ui 5aafd8784268ea7cd828330d4673500b8f38d6db -P 7ffecfc49aeb4ccb8b2972ac5c6eddd265d3b578 -R c614f64a06cb8d44d405228318daf9d9 +F ui/SettingsDialog.ui 4c480cd595a32664d01c85bf74845c4282fc0068 +P 5c9a7defad9f6c77db2447df1d904e24001ec40e +R 2a40906bd18bac1ee536fd4bf0202e77 U kostas -Z d1c35d582fe773add2faa8e714e12402 +Z 4c1489c21209abe55181b48a52b2520c diff --git a/manifest.uuid b/manifest.uuid index 40633ee..19b44c2 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -5c9a7defad9f6c77db2447df1d904e24001ec40e \ No newline at end of file +97d0d1e2408832e1fc8b532e059b2141afd9ac55 \ No newline at end of file diff --git a/src/FslSettingsDialog.cpp b/src/FslSettingsDialog.cpp new file mode 100644 index 0000000..62de753 --- /dev/null +++ b/src/FslSettingsDialog.cpp @@ -0,0 +1,72 @@ +#include "FslSettingsDialog.h" +#include "ui_FslSettingsDialog.h" +#include "Utils.h" + +#include + +/////////////////////////////////////////////////////////////////////////////// +FslSettingsDialog::FslSettingsDialog(QWidget *parent, Settings &_settings) : + QDialog(parent, Qt::Sheet), + ui(new Ui::FslSettingsDialog), + settings(&_settings) +{ + ui->setupUi(this); + + ui->lineUIPort->setText(settings->GetValue(FOSSIL_SETTING_HTTP_PORT).toString()); + + // Global Settings + ui->lineGDiffCommand->setText(settings->GetFossilValue(FOSSIL_SETTING_GDIFF_CMD).toString()); + ui->lineGMergeCommand->setText(settings->GetFossilValue(FOSSIL_SETTING_GMERGE_CMD).toString()); + ui->lineProxy->setText(settings->GetFossilValue(FOSSIL_SETTING_PROXY_URL).toString()); + + // Repository Settings + ui->lineRemoteURL->setText(settings->GetFossilValue(FOSSIL_SETTING_REMOTE_URL).toString()); + ui->lineIgnore->setText(settings->GetFossilValue(FOSSIL_SETTING_IGNORE_GLOB).toString()); + ui->lineIgnoreCRNL->setText(settings->GetFossilValue(FOSSIL_SETTING_CRNL_GLOB).toString()); +} + +//----------------------------------------------------------------------------- +FslSettingsDialog::~FslSettingsDialog() +{ + delete ui; +} + +//----------------------------------------------------------------------------- +bool FslSettingsDialog::run(QWidget *parent, Settings &settings) +{ + FslSettingsDialog dlg(parent, settings); + return dlg.exec() == QDialog::Accepted; +} + +//----------------------------------------------------------------------------- +void FslSettingsDialog::on_buttonBox_accepted() +{ + settings->SetValue(FOSSIL_SETTING_HTTP_PORT, ui->lineUIPort->text()); + + settings->SetFossilValue(FOSSIL_SETTING_GDIFF_CMD, ui->lineGDiffCommand->text()); + settings->SetFossilValue(FOSSIL_SETTING_GMERGE_CMD, ui->lineGMergeCommand->text()); + settings->SetFossilValue(FOSSIL_SETTING_PROXY_URL, ui->lineProxy->text()); + + settings->SetFossilValue(FOSSIL_SETTING_REMOTE_URL, ui->lineRemoteURL->text()); + settings->SetFossilValue(FOSSIL_SETTING_IGNORE_GLOB, ui->lineIgnore->text()); + settings->SetFossilValue(FOSSIL_SETTING_CRNL_GLOB, ui->lineIgnoreCRNL->text()); + + settings->ApplyEnvironment(); +} + +//----------------------------------------------------------------------------- +void FslSettingsDialog::on_btnSelectFossilGDiff_clicked() +{ + QString path = SelectExe(this, tr("Select Graphical Diff application")); + if(!path.isEmpty()) + ui->lineGDiffCommand->setText(QDir::toNativeSeparators(path)); +} + +//----------------------------------------------------------------------------- +void FslSettingsDialog::on_btnSelectGMerge_clicked() +{ + QString path = SelectExe(this, tr("Select Graphical Merge application")); + if(!path.isEmpty()) + ui->lineGMergeCommand->setText(path); +} + diff --git a/src/FslSettingsDialog.h b/src/FslSettingsDialog.h new file mode 100644 index 0000000..ed71046 --- /dev/null +++ b/src/FslSettingsDialog.h @@ -0,0 +1,33 @@ +#ifndef FSLSETTINGSDIALOG_H +#define FSLSETTINGSDIALOG_H + +#include +#include "Settings.h" + +namespace Ui { + class FslSettingsDialog; +} + +class FslSettingsDialog : public QDialog +{ + Q_OBJECT + +public: + explicit FslSettingsDialog(QWidget *parent, Settings &_settings); + ~FslSettingsDialog(); + + static bool run(QWidget *parent, Settings &_settings); + + +private slots: + void on_buttonBox_accepted(); + void on_btnSelectFossilGDiff_clicked(); + void on_btnSelectGMerge_clicked(); + +private: + + Ui::FslSettingsDialog *ui; + Settings *settings; +}; + +#endif // FSLSETTINGSDIALOG_H diff --git a/src/MainWindow.cpp b/src/MainWindow.cpp index 02b50b0..09896a2 100644 --- a/src/MainWindow.cpp +++ b/src/MainWindow.cpp @@ -12,6 +12,8 @@ #include #include #include +#include "SettingsDialog.h" +#include "FslSettingsDialog.h" #include "SearchBox.h" #include "CommitDialog.h" #include "FileActionDialog.h" @@ -19,7 +21,7 @@ #include "RevisionDialog.h" #include "Utils.h" -#define REVISION_LATEST "Latest" +#define REVISION_LATEST "Latest revision" //----------------------------------------------------------------------------- enum @@ -1641,11 +1643,19 @@ void MainWindow::loadFossilSettings() //------------------------------------------------------------------------------ void MainWindow::on_actionSettings_triggered() +{ + // Run the dialog + if(!SettingsDialog::run(this, settings)) + return; +} + +//------------------------------------------------------------------------------ +void MainWindow::on_actionFossilSettings_triggered() { loadFossilSettings(); // Run the dialog - if(!SettingsDialog::run(this, settings)) + if(!FslSettingsDialog::run(this, settings)) return; // Apply settings @@ -1668,6 +1678,7 @@ void MainWindow::on_actionSettings_triggered() QString value = it.value().Value.toString(); fossil().setFossilSetting(name, value, type == Settings::Setting::TYPE_FOSSIL_GLOBAL); } + } //------------------------------------------------------------------------------ diff --git a/src/MainWindow.h b/src/MainWindow.h index 0517589..dc7eb64 100644 --- a/src/MainWindow.h +++ b/src/MainWindow.h @@ -4,7 +4,7 @@ #include #include #include -#include "SettingsDialog.h" +#include "Settings.h" #include "Workspace.h" namespace Ui { @@ -99,6 +99,7 @@ private slots: void on_actionAbout_triggered(); void on_actionUpdate_triggered(); void on_actionSettings_triggered(); + void on_actionFossilSettings_triggered(); void on_actionViewUnchanged_triggered(); void on_actionViewModified_triggered(); void on_actionViewUnknown_triggered(); diff --git a/src/Settings.cpp b/src/Settings.cpp index 00941cf..95ce3cf 100644 --- a/src/Settings.cpp +++ b/src/Settings.cpp @@ -13,6 +13,7 @@ Settings::Settings(bool portableMode) : store(0) Mappings.insert(FOSSIL_SETTING_GDIFF_CMD, Setting("", Setting::TYPE_FOSSIL_GLOBAL)); Mappings.insert(FOSSIL_SETTING_GMERGE_CMD, Setting("", Setting::TYPE_FOSSIL_GLOBAL)); Mappings.insert(FOSSIL_SETTING_PROXY_URL, Setting("", Setting::TYPE_FOSSIL_GLOBAL)); + Mappings.insert(FOSSIL_SETTING_HTTP_PORT, Setting("", Setting::TYPE_FOSSIL_GLOBAL)); Mappings.insert(FOSSIL_SETTING_IGNORE_GLOB, Setting("", Setting::TYPE_FOSSIL_LOCAL)); Mappings.insert(FOSSIL_SETTING_CRNL_GLOB, Setting("", Setting::TYPE_FOSSIL_LOCAL)); @@ -36,8 +37,6 @@ Settings::Settings(bool portableMode) : store(0) SetValue(FUEL_SETTING_LANGUAGE, QLocale::system().name()); if(!HasValue(FUEL_SETTING_WEB_BROWSER)) SetValue(FUEL_SETTING_WEB_BROWSER, 0); - if(!HasValue(FUEL_SETTING_HTTP_PORT)) - SetValue(FUEL_SETTING_HTTP_PORT, "8090"); ApplyEnvironment(); } diff --git a/src/Settings.h b/src/Settings.h index bcb40fa..f0535ee 100644 --- a/src/Settings.h +++ b/src/Settings.h @@ -10,7 +10,6 @@ #define FUEL_SETTING_FILE_DBLCLICK "FileDblClickAction" #define FUEL_SETTING_LANGUAGE "Language" #define FUEL_SETTING_WEB_BROWSER "WebBrowser" -#define FUEL_SETTING_HTTP_PORT "HTTPPort" #define FOSSIL_SETTING_GDIFF_CMD "gdiff-command" #define FOSSIL_SETTING_GMERGE_CMD "gmerge-command" @@ -18,6 +17,7 @@ #define FOSSIL_SETTING_IGNORE_GLOB "ignore-glob" #define FOSSIL_SETTING_CRNL_GLOB "crnl-glob" #define FOSSIL_SETTING_REMOTE_URL "remote-url" +#define FOSSIL_SETTING_HTTP_PORT "http-port" enum FileDblClickAction diff --git a/src/SettingsDialog.cpp b/src/SettingsDialog.cpp index 8ee5bd9..59b86d7 100644 --- a/src/SettingsDialog.cpp +++ b/src/SettingsDialog.cpp @@ -25,7 +25,6 @@ SettingsDialog::SettingsDialog(QWidget *parent, Settings &_settings) : ui->lineFossilPath->setText(QDir::toNativeSeparators(settings->GetValue(FUEL_SETTING_FOSSIL_PATH).toString())); ui->cmbDoubleClickAction->setCurrentIndex(settings->GetValue(FUEL_SETTING_FILE_DBLCLICK).toInt()); ui->cmbFossilBrowser->setCurrentIndex(settings->GetValue(FUEL_SETTING_WEB_BROWSER).toInt()); - ui->lineUIPort->setText(settings->GetValue(FUEL_SETTING_HTTP_PORT).toString()); // Initialize language combo foreach(const LangMap &m, langMap) @@ -37,15 +36,6 @@ SettingsDialog::SettingsDialog(QWidget *parent, Settings &_settings) : ui->cmbActiveLanguage->findText( LangIdToName(lang))); - // Global Settings - ui->lineGDiffCommand->setText(settings->GetFossilValue(FOSSIL_SETTING_GDIFF_CMD).toString()); - ui->lineGMergeCommand->setText(settings->GetFossilValue(FOSSIL_SETTING_GMERGE_CMD).toString()); - ui->lineProxy->setText(settings->GetFossilValue(FOSSIL_SETTING_PROXY_URL).toString()); - - // Repository Settings - ui->lineRemoteURL->setText(settings->GetFossilValue(FOSSIL_SETTING_REMOTE_URL).toString()); - ui->lineIgnore->setText(settings->GetFossilValue(FOSSIL_SETTING_IGNORE_GLOB).toString()); - ui->lineIgnoreCRNL->setText(settings->GetFossilValue(FOSSIL_SETTING_CRNL_GLOB).toString()); } //----------------------------------------------------------------------------- @@ -68,7 +58,6 @@ void SettingsDialog::on_buttonBox_accepted() Q_ASSERT(ui->cmbDoubleClickAction->currentIndex()>=FILE_DLBCLICK_ACTION_DIFF && ui->cmbDoubleClickAction->currentIndex()SetValue(FUEL_SETTING_FILE_DBLCLICK, ui->cmbDoubleClickAction->currentIndex()); settings->SetValue(FUEL_SETTING_WEB_BROWSER, ui->cmbFossilBrowser->currentIndex()); - settings->SetValue(FUEL_SETTING_HTTP_PORT, ui->lineUIPort->text()); Q_ASSERT(settings->HasValue(FUEL_SETTING_LANGUAGE)); QString curr_langid = settings->GetValue(FUEL_SETTING_LANGUAGE).toString(); @@ -79,15 +68,6 @@ void SettingsDialog::on_buttonBox_accepted() if(curr_langid != new_langid) QMessageBox::information(this, tr("Restart required"), tr("The language change will take effect after restarting the application"), QMessageBox::Ok); - settings->SetFossilValue(FOSSIL_SETTING_GDIFF_CMD, ui->lineGDiffCommand->text()); - settings->SetFossilValue(FOSSIL_SETTING_GMERGE_CMD, ui->lineGMergeCommand->text()); - settings->SetFossilValue(FOSSIL_SETTING_PROXY_URL, ui->lineProxy->text()); - - settings->SetFossilValue(FOSSIL_SETTING_REMOTE_URL, ui->lineRemoteURL->text()); - settings->SetFossilValue(FOSSIL_SETTING_IGNORE_GLOB, ui->lineIgnore->text()); - settings->SetFossilValue(FOSSIL_SETTING_CRNL_GLOB, ui->lineIgnoreCRNL->text()); - - settings->ApplyEnvironment(); } @@ -99,22 +79,6 @@ void SettingsDialog::on_btnSelectFossil_clicked() ui->lineFossilPath->setText(QDir::toNativeSeparators(path)); } -//----------------------------------------------------------------------------- -void SettingsDialog::on_btnSelectFossilGDiff_clicked() -{ - QString path = SelectExe(this, tr("Select Graphical Diff application")); - if(!path.isEmpty()) - ui->lineGDiffCommand->setText(QDir::toNativeSeparators(path)); -} - -//----------------------------------------------------------------------------- -void SettingsDialog::on_btnSelectGMerge_clicked() -{ - QString path = SelectExe(this, tr("Select Graphical Merge application")); - if(!path.isEmpty()) - ui->lineGMergeCommand->setText(path); -} - //----------------------------------------------------------------------------- void SettingsDialog::on_btnClearMessageHistory_clicked() { diff --git a/src/SettingsDialog.h b/src/SettingsDialog.h index 3969f88..418f2ea 100644 --- a/src/SettingsDialog.h +++ b/src/SettingsDialog.h @@ -22,8 +22,6 @@ public: private slots: void on_btnSelectFossil_clicked(); void on_buttonBox_accepted(); - void on_btnSelectFossilGDiff_clicked(); - void on_btnSelectGMerge_clicked(); void on_btnClearMessageHistory_clicked(); private: diff --git a/ui/CommitDialog.ui b/ui/CommitDialog.ui index 5407673..0907856 100644 --- a/ui/CommitDialog.ui +++ b/ui/CommitDialog.ui @@ -10,7 +10,7 @@ 0 0 400 - 397 + 394 diff --git a/ui/FslSettingsDialog.ui b/ui/FslSettingsDialog.ui new file mode 100644 index 0000000..db9ea78 --- /dev/null +++ b/ui/FslSettingsDialog.ui @@ -0,0 +1,300 @@ + + + FslSettingsDialog + + + Qt::WindowModal + + + + 0 + 0 + 457 + 266 + + + + Fossil Settings + + + + :/icons/icon-application:/icons/icon-application + + + true + + + + + + + 0 + + + 0 + + + 0 + + + 0 + + + + + + 100 + 0 + + + + Graphical Diff + + + + + + + + + Path to graphical diff tool + + + + + + + + 0 + 0 + + + + + 24 + 24 + + + + ... + + + + + + + + + + 100 + 0 + + + + Graphical Merge + + + + + + + + + Path to the graphical merge tool + + + + + + + + 0 + 0 + + + + + 24 + 24 + + + + ... + + + + + + + + + + 100 + 0 + + + + HTTP Proxy + + + + + + + + 0 + 0 + + + + The URL of the HTTP proxy + + + + + + + HTTP Port + + + + + + + HTTP port to use for the Fossil web interface + + + + + + + + 0 + 0 + + + + A comma separated list of glob-style file patterns to exclude from Fossil's CR/NL consistency checking + + + + + + + + 100 + 0 + + + + Ignore CR/NL + + + + + + + + 0 + 0 + + + + A comma separated list of glob-style file/path patterns ignored in Fossil file operations + + + + + + + + 100 + 0 + + + + Ignore List + + + + + + + + 0 + 0 + + + + The remote url used to push/pull changes. +URL style user names and passwords are also supported. +For example http://username:password@server.com/fossil + + + + + + + + 100 + 0 + + + + Remote Url + + + + + + + + + + Qt::Horizontal + + + QDialogButtonBox::Cancel|QDialogButtonBox::Ok + + + + + + + + + + + buttonBox + accepted() + FslSettingsDialog + accept() + + + 248 + 254 + + + 157 + 274 + + + + + buttonBox + rejected() + FslSettingsDialog + reject() + + + 316 + 260 + + + 286 + 274 + + + + + diff --git a/ui/MainWindow.ui b/ui/MainWindow.ui index 82aa591..48409e5 100644 --- a/ui/MainWindow.ui +++ b/ui/MainWindow.ui @@ -276,6 +276,8 @@ + + @@ -925,6 +927,9 @@ Create a branch from the current revision + + Create a branch from the current revision + @@ -957,6 +962,15 @@ Show all files + + + + :/icons/icon-action-settings:/icons/icon-action-settings + + + F&ossil Settings + + diff --git a/ui/SettingsDialog.ui b/ui/SettingsDialog.ui index 1696517..0685355 100644 --- a/ui/SettingsDialog.ui +++ b/ui/SettingsDialog.ui @@ -10,7 +10,7 @@ 0 0 457 - 352 + 204 @@ -25,377 +25,162 @@ - - - 0 - - - - Application - - - - - - - 100 - 0 - - - - Fossil Path - - - - - - - - - Path to the Fossil executable. Leave blank to use the default Fossil - - - - - - - - 0 - 0 - - - - - 24 - 24 - - - - ... - - - - - - - - - - 100 - 0 - - - - Graphical Diff - - - - - - - - - Path to graphical diff tool - - - - - - - - 0 - 0 - - - - - 24 - 24 - - - - ... - - - - - - - - - - 100 - 0 - - - - Graphical Merge - - - - - - - - - Path to the graphical merge tool - - - - - - - - 0 - 0 - - - - - 24 - 24 - - - - ... - - - - - - - - - - 100 - 0 - - - - HTTP Proxy - - - - - - - - 0 - 0 - - - - The URL of the HTTP proxy - - - - - - - HTTP Port - - - - - - - HTTP port to use for the Fossil web interface - - - - - - - - 100 - 0 - - - - Commit Messages - - - - - - - - 0 - 0 - - - - Clear the commit message history - - - Clear - - - - - - - Web Browser - - - - - - - - 0 - 0 - - - - Web browser to use for the Fossil web interface - - - - - - - - 100 - 0 - - - - Double-click Action - - - - - - - - 0 - 0 - - - - Action to perfom when double-clicking a file - - - -1 - - - - - - - Language - - - - - - - - 0 - 0 - - - - Language for the user interface - - - - - - - - Repository - - - - QFormLayout::ExpandingFieldsGrow - - - Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter - - - - - - 100 - 0 - - - - Remote Url - - - - - - - - 0 - 0 - - - - The remote url used to push/pull changes. -URL style user names and passwords are also supported. -For example http://username:password@server.com/fossil - - - - - - - - 100 - 0 - - - - Ignore List - - - - - - - - 0 - 0 - - - - A comma separated list of glob-style file/path patterns ignored in Fossil file operations - - - - - - - - 100 - 0 - - - - Ignore CR/NL - - - - - - - - 0 - 0 - - - - A comma separated list of glob-style file patterns to exclude from Fossil's CR/NL consistency checking - - - - - + + + + 0 + + + 0 + + + 0 + + + 0 + + + + + + 100 + 0 + + + + Fossil Path + + + + + + + + + Path to the Fossil executable. Leave blank to use the default Fossil + + + + + + + + 0 + 0 + + + + + 24 + 24 + + + + ... + + + + + + + + + + 100 + 0 + + + + Commit Messages + + + + + + + + 0 + 0 + + + + Clear the commit message history + + + Clear + + + + + + + Web Browser + + + + + + + + 0 + 0 + + + + Web browser to use for the Fossil web interface + + + + + + + + 100 + 0 + + + + Double-click Action + + + + + + + + 0 + 0 + + + + Action to perfom when double-clicking a file + + + -1 + + + + + + + Language + + + + + + + + 0 + 0 + + + + Language for the user interface + + + +