diff --git a/doc/Changes.txt b/doc/Changes.txt index 111fb48..2d50fdb 100644 --- a/doc/Changes.txt +++ b/doc/Changes.txt @@ -1,10 +1,13 @@ Fuel V0.9.7 (2012-XX-XX) ============ - Distribution: Fuel is now available in the Arch User Repository +- Feature: Optionally use the internal browser for the Fossil UI +- UI: Support for persisting the state (Column order and sizes) of the File View - Feature: Support for localization - Localisations: Greek German (thanks stayawake) + Spanish (thanks djnavas) Fuel V0.9.6 (2012-05-13) ============ diff --git a/fuel.pro b/fuel.pro index 05b1c75..33d984a 100644 --- a/fuel.pro +++ b/fuel.pro @@ -2,7 +2,7 @@ # Fuel #------------------------------------------------- -QT += core gui +QT += core gui webkit TARGET = Fuel TEMPLATE = app diff --git a/manifest b/manifest index cf461e9..1f74da8 100644 --- a/manifest +++ b/manifest @@ -1,11 +1,11 @@ -C Added\sSpanish\stranslation\nChanged\sthe\shandling\sof\sFileView\scolumns\nFileView\scolumn\sorder\sand\ssizes\sis\snow\spersisted\sin\sthe\ssettings\n\n\n\n\n -D 2012-12-15T10:50:34.083 +C Optionally\suse\sthe\sinternal\sbrowser\sfor\sthe\sFossil\sUI\nSupport\sfor\spersisting\sthe\sstate\s(Column\sorder\sand\ssizes)\sof\sthe\sFile\sView\n\n +D 2012-12-15T14:12:28.439 F dist/arch/PKGBUILD dd21073c035af4e6a4ecb3842c1fd7ae45c5e93d F dist/win/fuel.iss ef3558dbba409eb194938b930377fc9ee27d319e F doc/Building.txt 7c0f1060d4a08ed330058d4a3a68905c05228381 -F doc/Changes.txt f2999c99053d2bf2aeaaba5504eb96e228dbac58 +F doc/Changes.txt 50bdd6db6883452cfc7fe5b35512bf0e840772b9 F doc/License.txt 4cc77b90af91e615a64ae04893fdffa7939db84c -F fuel.pro 3374e40d77a366de63f35f0c3bf48eb61ecbc979 +F fuel.pro f2bda42ff7c3258dce38e679107687b16007f5a0 F intl/convert.sh 5694496585ff5f4363c90ff8b6f48e19e0b6b4aa x F intl/de_DE.ts 82873d85b3df5b204d6c41aa666ef88dd60583aa F intl/el_GR.ts e7ba75d373804b715d23b86d289fb7b556079889 @@ -180,10 +180,10 @@ F src/FileTableView.cpp 5ddf8c391c9a3ac449ec61fb1db837b577afeec2 F src/FileTableView.h 03e56d87c2d46411b9762b87f4d301619aaf18df F src/LoggedProcess.cpp 2a1e5c94bc1e57c8984563e66c210e43a14dc60c F src/LoggedProcess.h 85df7c635c807a5a0e8c4763f17a0752aaff7261 -F src/MainWindow.cpp e46c31b692b3d072a5f80aab9b910ab4524257f8 -F src/MainWindow.h 3f3825cab25058666b6706b36f51269ad5f65f3e -F src/SettingsDialog.cpp 66e8ad0a01c58cd29f397d74f46274021abe34b8 -F src/SettingsDialog.h d37dde23f698fbe6182b2e14234104a15468be3d +F src/MainWindow.cpp bb82954d26ba915a4632e83af1d45d2498a1aac9 +F src/MainWindow.h c7c72113541604b1c605345da5e680ed3865f39b +F src/SettingsDialog.cpp 2031ed9d431bce2c8a967030bc4043570134b22e +F src/SettingsDialog.h 01c1f876c64f750ba8820a0d745e377acabe4921 F src/Utils.cpp caca5268e3194abe77211040bf9511a82909d2e6 F src/Utils.h 5af911147390879176e587fc60fb662490bb9e97 F src/main.cpp 8f8790822f82870a12169bcf204e571138adb065 @@ -191,9 +191,9 @@ F tools/pack.sh d7f38a498c4e9327fecd6a6e5ac27be270d43008 x F ui/CloneDialog.ui 0fc820804df91f16506ee466a44519fdd44e468f F ui/CommitDialog.ui 6200f6cabdcf40a20812e811be28e0793f82516f F ui/FileActionDialog.ui 89bb4dc2d0b8adcd41adcb11ec65f2028a09a12d -F ui/MainWindow.ui 998f26c6fe75bd655cf3d4f0073e67dc0bf3b3d7 -F ui/SettingsDialog.ui 7f578450cf01d6786ff2d91a2142505192446e3f -P 33305fed1383ad01dd5d66ef4cf379956508b0c8 -R a1ac056afe9f31b4aa8bb64f43ff42ac +F ui/MainWindow.ui 26585cc74af41321337e239e2cb283f25cddac5c +F ui/SettingsDialog.ui 55aefad7145c40d936c43759789d1b50e361b020 +P 87b7bd70eec27bd136f17432d98dd313282fc3d1 +R 2fcea15e839ecc5fd6f667fce4bef347 U kostas -Z 520d9618aa62a70c2f7ef5b438253c9f +Z d8452a239012f381e4acfb4d4b9022db diff --git a/manifest.uuid b/manifest.uuid index 4a4c710..4570f81 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -87b7bd70eec27bd136f17432d98dd313282fc3d1 \ No newline at end of file +7439077817df40f70c96d6f5f3e6f47314ba1b59 \ No newline at end of file diff --git a/src/MainWindow.cpp b/src/MainWindow.cpp index 719272c..669c821 100644 --- a/src/MainWindow.cpp +++ b/src/MainWindow.cpp @@ -38,6 +38,12 @@ enum COLUMN_PATH }; +enum +{ + TAB_LOG, + TAB_BROWSER +}; + enum { REPODIRMODEL_ROLE_PATH = Qt::UserRole+1 @@ -134,7 +140,7 @@ MainWindow::MainWindow(Settings &_settings, QWidget *parent, QString *workspaceP Qt::DirectConnection ); QStringList header; - header << tr("Status") << tr("File") << tr("Ext") << tr("Modified") << tr("Path"); + header << tr("Status") << tr("File") << tr("Extension") << tr("Modified") << tr("Path"); repoFileModel.setHorizontalHeaderLabels(header); repoFileModel.horizontalHeaderItem(COLUMN_STATUS)->setTextAlignment(Qt::AlignCenter); @@ -1394,6 +1400,27 @@ void MainWindow::selectRootDir() ui->treeView->selectionModel()->select(root_index, QItemSelectionModel::Select); } } + +//------------------------------------------------------------------------------ +void MainWindow::fossilBrowse(const QString &fossilUrl) +{ + if(!uiRunning()) + ui->actionFossilUI->activate(QAction::Trigger); + + Q_ASSERT(uiRunning()); + + bool use_internal = settings.GetValue(FUEL_SETTING_WEB_BROWSER).toInt() == 1; + + QUrl url = QUrl(getFossilHttpAddress()+fossilUrl); + + if(use_internal) + { + ui->webView->load(url); + ui->tabWidget->setCurrentIndex(TAB_BROWSER); + } + else + QDesktopServices::openUrl(url); +} //------------------------------------------------------------------------------ void MainWindow::getSelectionFilenames(QStringList &filenames, int includeMask, bool allIfEmpty) { @@ -1567,7 +1594,10 @@ bool MainWindow::startUI() log(tr("Starting Fossil browser UI. Please wait.")+"\n"); QString fossil = getFossilPath(); - fossilUI.start(fossil, QStringList() << "ui"); + QString port = settings.GetValue(FUEL_SETTING_HTTP_PORT).toString(); + + fossilUI.start(fossil, QStringList() << "server" << "--localauth" << "-P" << port ); + if(!fossilUI.waitForStarted() || fossilUI.state()!=QProcess::Running) { log(tr("Could not start Fossil executable '%s'").arg(fossil)+"\n"); @@ -1575,31 +1605,7 @@ bool MainWindow::startUI() return false; } -#if 0 - QString buffer; - while(buffer.indexOf(EOL_MARK)==-1) - { - fossilUI.waitForReadyRead(500); - buffer += fossilUI.readAll(); - QCoreApplication::processEvents(); - } - - fossilUIPort.clear(); - - // Parse output to determine the running port - // "Listening for HTTP requests on TCP port 8080" - int idx = buffer.indexOf("TCP Port "); - if(idx!=-1) - fossilUIPort = buffer.mid(idx, 4); - else - fossilUIPort = "8080"; // Have a sensible default if we failed to parse the message -#else - fossilUIPort = "8080"; -#endif - - ui->actionFossilUI->setChecked(true); - return true; } @@ -1614,14 +1620,19 @@ void MainWindow::stopUI() fossilUI.terminate(); #endif } + fossilUI.close(); + ui->actionFossilUI->setChecked(false); } //------------------------------------------------------------------------------ void MainWindow::on_actionFossilUI_triggered() { - if(!uiRunning()) + if(!uiRunning() && ui->actionFossilUI->isChecked()) + { startUI(); + fossilBrowse(""); + } else stopUI(); } @@ -1635,29 +1646,17 @@ void MainWindow::on_actionQuit_triggered() //------------------------------------------------------------------------------ void MainWindow::on_actionTimeline_triggered() { - if(!uiRunning()) - ui->actionFossilUI->activate(QAction::Trigger); - - Q_ASSERT(uiRunning()); - - QDesktopServices::openUrl(QUrl(getFossilHttpAddress()+"/timeline")); + fossilBrowse("/timeline"); } //------------------------------------------------------------------------------ void MainWindow::on_actionHistory_triggered() { - if(!uiRunning()) - ui->actionFossilUI->activate(QAction::Trigger); - - Q_ASSERT(uiRunning()); - QStringList selection; getSelectionFilenames(selection); for(QStringList::iterator it = selection.begin(); it!=selection.end(); ++it) - { - QDesktopServices::openUrl(QUrl(getFossilHttpAddress()+"/finfo?name="+*it)); - } + fossilBrowse("/finfo?name="+*it); } //------------------------------------------------------------------------------ @@ -2103,7 +2102,8 @@ void MainWindow::on_actionViewAsList_triggered() //------------------------------------------------------------------------------ QString MainWindow::getFossilHttpAddress() { - return "http://127.0.0.1:"+fossilUIPort; + QString port = settings.GetValue(FUEL_SETTING_HTTP_PORT).toString(); + return "http://127.0.0.1:"+port; } //------------------------------------------------------------------------------ diff --git a/src/MainWindow.h b/src/MainWindow.h index b250c33..8fa18e9 100644 --- a/src/MainWindow.h +++ b/src/MainWindow.h @@ -163,6 +163,7 @@ private: void updateFileView(); void updateStashView(); void selectRootDir(); + void fossilBrowse(const QString &fossilUrl); virtual QMenu *createPopupMenu(); @@ -242,7 +243,6 @@ private: QStandardItemModel repoDirModel; QStandardItemModel repoStashModel; QProcess fossilUI; - QString fossilUIPort; class QAction *recentWorkspaceActs[MAX_RECENT]; class QProgressBar *progressBar; bool fossilAbort; // FIXME: No GUI for it yet diff --git a/src/SettingsDialog.cpp b/src/SettingsDialog.cpp index 73fa309..a682471 100644 --- a/src/SettingsDialog.cpp +++ b/src/SettingsDialog.cpp @@ -47,9 +47,14 @@ SettingsDialog::SettingsDialog(QWidget *parent, Settings &_settings) : ui->cmbDoubleClickAction->addItem(tr("Open File")); ui->cmbDoubleClickAction->addItem(tr("Open Containing Folder")); + ui->cmbFossilBrowser->addItem(tr("System")); + ui->cmbFossilBrowser->addItem(tr("Internal")); + // App 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) @@ -88,6 +93,8 @@ void SettingsDialog::on_buttonBox_accepted() settings->SetValue(FUEL_SETTING_FOSSIL_PATH, QDir::fromNativeSeparators(ui->lineFossilPath->text())); 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(); @@ -196,6 +203,10 @@ Settings::Settings(bool portableMode) : store(0) SetValue(FUEL_SETTING_FILE_DBLCLICK, 0); if(!HasValue(FUEL_SETTING_LANGUAGE) && SupportsLang(QLocale::system().name())) 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/SettingsDialog.h b/src/SettingsDialog.h index c59587a..a3b564e 100644 --- a/src/SettingsDialog.h +++ b/src/SettingsDialog.h @@ -15,6 +15,8 @@ namespace Ui { #define FUEL_SETTING_COMMIT_MSG "CommitMsgHistory" #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" diff --git a/ui/MainWindow.ui b/ui/MainWindow.ui index e5b54a6..79196f0 100644 --- a/ui/MainWindow.ui +++ b/ui/MainWindow.ui @@ -4,10 +4,10 @@ - 0 - 0 - 865 - 640 + 0 + 0 + 865 + 640 @@ -15,203 +15,257 @@ - :/icons/icons/Battery-01.png:/icons/icons/Battery-01.png + :/icons/icons/Battery-01.png:/icons/icons/Battery-01.png true - - 4 - - - - - Qt::Vertical - - - - - 0 - 80 - - - - Qt::Horizontal - - - - - 20 - 0 - - - - Qt::ActionsContextMenu - - - QAbstractItemView::NoEditTriggers - - - QAbstractItemView::ExtendedSelection - - - QAbstractItemView::SelectItems - - - true - - - true - - - false - - - - - - 80 - 0 - - - - Qt::CustomContextMenu - - - QAbstractItemView::NoEditTriggers - - - true - - - QAbstractItemView::SelectRows - - - false - - - true - - - false - - - false - - - 20 - - - true - - - true - - - false - - - 30 - - - - - - 20 - 0 - - - - Qt::ActionsContextMenu - - - QAbstractItemView::NoEditTriggers - - - true - - - QAbstractItemView::SelectRows - - - false - - - true - - - false - - - false - - - true - - - false - - - - - - - 0 - 20 - - - - Qt::CustomContextMenu - - - - + + 4 + + + + + + 0 + 0 + + + + Qt::Vertical + + + + + 0 + 75 + + + + Qt::Horizontal + + + + + 20 + 0 + + + + Qt::ActionsContextMenu + + + QAbstractItemView::NoEditTriggers + + + QAbstractItemView::ExtendedSelection + + + QAbstractItemView::SelectItems + + + true + + + true + + + false + + + + + + 80 + 0 + + + + Qt::CustomContextMenu + + + QAbstractItemView::NoEditTriggers + + + true + + + QAbstractItemView::SelectRows + + + QAbstractItemView::ScrollPerPixel + + + QAbstractItemView::ScrollPerPixel + + + false + + + true + + + false + + + false + + + 20 + + + true + + + true + + + false + + + 30 + + + + + + 20 + 0 + + + + Qt::ActionsContextMenu + + + QAbstractItemView::NoEditTriggers + + + true + + + QAbstractItemView::SelectRows + + + false + + + true + + + false + + + false + + + true + + + false + + + + + + + 0 + 8 + + + + QTabWidget::South + + + 1 + + + + Log + + + + 0 + + + + + + 0 + 0 + + + + Qt::CustomContextMenu + + + QFrame::NoFrame + + + + + + + + Browser + + + + 0 + + + + + + + + + - - 0 - 0 - 865 - 23 - + + 0 + 0 + 865 + 23 + - - &File - - - - - - - - - - - + + &File + + + + + + + + + + + - - &Help - - + + &Help + + - - &View - - - - - - - - - + + &View + + + + + + + + + @@ -219,28 +273,28 @@ - Main Toolbar + Main Toolbar - false + false - - 32 - 32 - + + 32 + 32 + - Qt::ToolButtonIconOnly + Qt::ToolButtonIconOnly - false + false - TopToolBarArea + TopToolBarArea - false + false @@ -269,567 +323,572 @@ - - :/icons/icons/Button Refresh-01.png:/icons/icons/Button Refresh-01.png + + :/icons/icons/Button Refresh-01.png:/icons/icons/Button Refresh-01.png - Refresh + Refresh - Refresh the views + Refresh the views - Refresh the views + Refresh the views - F5 + F5 - - :/icons/icons/Save-01.png:/icons/icons/Save-01.png + + :/icons/icons/Save-01.png:/icons/icons/Save-01.png - Commit + Commit - Commit modifications + Commit modifications - Commit modifications + Commit modifications - Ctrl+M + Ctrl+M - - :/icons/icons/Document Copy-01.png:/icons/icons/Document Copy-01.png + + :/icons/icons/Document Copy-01.png:/icons/icons/Document Copy-01.png - Diff + Diff - Display the differences between the current and last committed version + Display the differences between the current and last committed version - Display the differences between the current and last committed version + Display the differences between the current and last committed version - Ctrl+D + Ctrl+D - - :/icons/icons/File New-01.png:/icons/icons/File New-01.png + + :/icons/icons/File New-01.png:/icons/icons/File New-01.png - Add + Add - Add files to the repository + Add files to the repository - Add files to the repository + Add files to the repository - Ctrl++ + Ctrl++ - - :/icons/icons/File Delete-01.png:/icons/icons/File Delete-01.png + + :/icons/icons/File Delete-01.png:/icons/icons/File Delete-01.png - Delete + Delete - Delete files from the repository + Delete files from the repository - Delete files from the repository + Delete files from the repository - Ctrl+- + Ctrl+- - - :/icons/icons/Document Blank-01.png:/icons/icons/Document Blank-01.png + + :/icons/icons/Document Blank-01.png:/icons/icons/Document Blank-01.png - &New... + &New... - Make a new Fossil repository + Make a new Fossil repository - Make a new Fossil repository + Make a new Fossil repository - Ctrl+N + Ctrl+N - - :/icons/icons/My Documents-01.png:/icons/icons/My Documents-01.png + + :/icons/icons/My Documents-01.png:/icons/icons/My Documents-01.png - &Open... + &Open... - Open a Fossil repository or workspace folder + Open a Fossil repository or workspace folder - Open a Fossil repository or workspace folder + Open a Fossil repository or workspace folder - Ctrl+O + Ctrl+O - true + true - &Close + &Close - Close the current workspace + Close the current workspace - Close the current workspace + Close the current workspace - - :/icons/icons/My Websites-01.png:/icons/icons/My Websites-01.png + + :/icons/icons/My Websites-01.png:/icons/icons/My Websites-01.png - Clone... + Clone... - - :/icons/icons/Button Upload-01.png:/icons/icons/Button Upload-01.png + + :/icons/icons/Button Upload-01.png:/icons/icons/Button Upload-01.png - Push + Push - Push changes to the remote repository + Push changes to the remote repository - Push changes to the remote repository + Push changes to the remote repository - Ctrl+P + Ctrl+P - - :/icons/icons/Button Download-01.png:/icons/icons/Button Download-01.png + + :/icons/icons/Button Download-01.png:/icons/icons/Button Download-01.png - Pull + Pull - Pull changes from the remote repository + Pull changes from the remote repository - Pull changes from the remote repository + Pull changes from the remote repository - Ctrl+L + Ctrl+L - - :/icons/icons/File Open-01.png:/icons/icons/File Open-01.png + + :/icons/icons/File Open-01.png:/icons/icons/File Open-01.png - Rename + Rename - Rename the selected file + Rename the selected file - Rename the selected file + Rename the selected file - Ctrl+R + Ctrl+R - - :/icons/icons/Button Turn Off-01.png:/icons/icons/Button Turn Off-01.png + + :/icons/icons/Button Turn Off-01.png:/icons/icons/Button Turn Off-01.png - &Quit + &Quit - Quit + Quit - Ctrl+Q + Ctrl+Q - true + true - - :/icons/icons/File History-01.png:/icons/icons/File History-01.png + + :/icons/icons/File History-01.png:/icons/icons/File History-01.png - History + History - Display the version history of a file via the Fossil UI + Display the version history of a file via the Fossil UI - Display the version history of a file via the Fossil UI + Display the version history of a file via the Fossil UI - Ctrl+H + Ctrl+H - true + true - - :/icons/icons/Network MAC-01.png:/icons/icons/Network MAC-01.png + + :/icons/icons/Network MAC-01.png:/icons/icons/Network MAC-01.png - Fossil UI + Fossil UI - Starts the Fosill UI in the Web Browser + Starts the Fosill UI in the Web Browser - Starts the Fosill UI in the Web Browser + Starts the Fosill UI in the Web Browser - - :/icons/icons/Document-Revert-icon.png:/icons/icons/Document-Revert-icon.png + + :/icons/icons/Document-Revert-icon.png:/icons/icons/Document-Revert-icon.png - Revert + Revert - Revert files to the last commited version + Revert files to the last commited version - Revert files to the last commited version + Revert files to the last commited version - - :/icons/icons/Text Edit.png:/icons/icons/Text Edit.png + + :/icons/icons/Text Edit.png:/icons/icons/Text Edit.png - Clear Log + Clear Log - Clears the log + Clears the log - Ctrl+K + Ctrl+K - - :/icons/icons/Clock-01.png:/icons/icons/Clock-01.png + + :/icons/icons/Clock-01.png:/icons/icons/Clock-01.png - Timeline + Timeline - Display the change history of the Fossil repository + Display the change history of the Fossil repository - Display the change history of the Fossil repository + Display the change history of the Fossil repository - - :/icons/icons/Document-01.png:/icons/icons/Document-01.png + + :/icons/icons/Document-01.png:/icons/icons/Document-01.png - Open file + Open file - Open the selected file + Open the selected file - Open the selected file + Open the selected file - Ctrl+Return + Ctrl+Return - - :/icons/icons/Folder-01.png:/icons/icons/Folder-01.png + + :/icons/icons/Folder-01.png:/icons/icons/Folder-01.png - Open Containing + Open Containing - Open the folder containing the selected file + Open the folder containing the selected file - Open the folder containing the selected file + Open the folder containing the selected file - Alt+Return + Alt+Return - - :/icons/icons/Button Reload-01.png:/icons/icons/Button Reload-01.png + + :/icons/icons/Button Reload-01.png:/icons/icons/Button Reload-01.png - Undo + Undo - Undo the last Fossil action + Undo the last Fossil action - Undo the last Fossil action + Undo the last Fossil action - Ctrl+Z + Ctrl+Z - - :/icons/icons/Battery-01.png:/icons/icons/Battery-01.png + + :/icons/icons/Battery-01.png:/icons/icons/Battery-01.png - &About... + &About... - About Fuel + About Fuel - - :/icons/icons/Button Play-01.png:/icons/icons/Button Play-01.png + + :/icons/icons/Button Play-01.png:/icons/icons/Button Play-01.png - Update + Update - Update the workspace to the latest version + Update the workspace to the latest version - Update the workspace to the latest version + Update the workspace to the latest version - Ctrl+U + Ctrl+U - - :/icons/icons/Gear-01.png:/icons/icons/Gear-01.png + + :/icons/icons/Gear-01.png:/icons/icons/Gear-01.png - &Preferences... + &Preferences... - Fuel Preferences + Fuel Preferences - Fuel Preferences + Fuel Preferences - true + true - true + true - &Modified + &Modified - Show modifed files + Show modifed files - true + true - true + true - &Unchanged + &Unchanged - Show unchanged files + Show unchanged files - true + true - true + true - Un&known + Un&known - Show unknown files + Show unknown files - true + true - &Ignored + &Ignored - Show ignored files + Show ignored files - true + true - File &List + File &List - View as files as a list + View as files as a list - View as files as a list + View as files as a list - View the workspace as a list of files + View the workspace as a list of files - - :/icons/icons/Folder-01.png:/icons/icons/Folder-01.png + + :/icons/icons/Folder-01.png:/icons/icons/Folder-01.png - Open Folder + Open Folder - Open the selected folder + Open the selected folder - Open the selected folder + Open the selected folder - - :/icons/icons/Folder Open-01.png:/icons/icons/Folder Open-01.png + + :/icons/icons/Folder Open-01.png:/icons/icons/Folder Open-01.png - Rename Folder + Rename Folder - Rename the selected folder + Rename the selected folder - Rename the selected folder + Rename the selected folder - - :/icons/icons/Folder Add-01.png:/icons/icons/Folder Add-01.png + + :/icons/icons/Folder Add-01.png:/icons/icons/Folder Add-01.png - Stash changes + Stash changes - Show the stash + Show the stash - - :/icons/icons/Folder Open-01.png:/icons/icons/Folder Open-01.png + + :/icons/icons/Folder Open-01.png:/icons/icons/Folder Open-01.png - Apply Stash + Apply Stash - Apply stashed changes + Apply stashed changes - Apply stashed changes + Apply stashed changes - true + true - &Stashed Changes + &Stashed Changes - View the Stash + View the Stash - Show the list of stashed changes + Show the list of stashed changes - - :/icons/icons/Folder Delete-01.png:/icons/icons/Folder Delete-01.png + + :/icons/icons/Folder Delete-01.png:/icons/icons/Folder Delete-01.png - Delete Stash + Delete Stash - - :/icons/icons/Folder Explorer-01.png:/icons/icons/Folder Explorer-01.png + + :/icons/icons/Folder Explorer-01.png:/icons/icons/Folder Explorer-01.png - Diff Stash + Diff Stash + + QWebView + QWidget +
QtWebKit/QWebView
+ FileTableView QTableView diff --git a/ui/SettingsDialog.ui b/ui/SettingsDialog.ui index 7da9a34..a277125 100644 --- a/ui/SettingsDialog.ui +++ b/ui/SettingsDialog.ui @@ -7,10 +7,10 @@ - 0 - 0 - 560 - 300 + 0 + 0 + 457 + 352 @@ -21,342 +21,370 @@ - - - 0 - - - - - :/icons/icons/Battery-01.png:/icons/icons/Battery-01.png - - - Application - - - - QFormLayout::ExpandingFieldsGrow - - - Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter - - - - - - 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 - - - - Commit Messages - - - - - - - - 0 - 0 - - - - Clear the commit message history - - - Clear - - - - - - - - 100 - 0 - - - - Double-click Action - - - - - - - - 0 - 0 - - - - Action to perfom when double-clicking a file - - - -1 - - - - - - - Language - - - - - - - - 0 - 0 - - - - Language for the user interface - - - - - - - - - :/icons/icons/Book-01.png:/icons/icons/Book-01.png - - - Repository - - - - QFormLayout::ExpandingFieldsGrow - - - Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter - - - - - - 100 - 0 - - - - Remote Url - - - - - - - - 0 - 0 - - - - The remote url used to push/pull changes. + + + 0 + + + + + :/icons/icons/Battery-01.png:/icons/icons/Battery-01.png + + + 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 + + + + ... + + + + + + + + + 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 + + + + + + + + + :/icons/icons/Book-01.png:/icons/icons/Book-01.png + + + 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 - - - - - - + + + + + + + + 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 + + + + + + - - - Qt::Horizontal - - - QDialogButtonBox::Cancel|QDialogButtonBox::Ok - - + + + Qt::Horizontal + + + QDialogButtonBox::Cancel|QDialogButtonBox::Ok + + @@ -370,14 +398,14 @@ For example http://username:password@server.com/fossil SettingsDialog accept() - - 248 - 254 - - - 157 - 274 - + + 248 + 254 + + + 157 + 274 + @@ -386,14 +414,14 @@ For example http://username:password@server.com/fossil SettingsDialog reject() - - 316 - 260 - - - 286 - 274 - + + 316 + 260 + + + 286 + 274 +