Bump actions/cache from 2.1.7 to 3 (#19)

Co-authored-by: Edgar <Edgar@AnotherFoxGuy.com>
Co-authored-by: Weblate <noreply@weblate.org>
Translate-URL: https://weblate.anotherfoxguy.com/projects/fuel-scm/fuel-scm/nl/
Translation: fuel-scm/fuel-scm

.clang-format

@@ -0,0 +1,25 @@
+Language: Cpp
+
+AccessModifierOffset: -4
+AllowShortFunctionsOnASingleLine: Inline
+AllowShortIfStatementsOnASingleLine: false
+AllowShortLambdasOnASingleLine: Empty
+AllowShortLoopsOnASingleLine: false
+AlwaysBreakAfterDefinitionReturnType: None
+AlwaysBreakBeforeMultilineStrings: false
+BasedOnStyle: Microsoft
+BreakBeforeBraces: Allman
+BreakConstructorInitializers: AfterColon
+BreakInheritanceList: AfterColon
+ColumnLimit: 200
+ConstructorInitializerAllOnOneLineOrOnePerLine: false
+FixNamespaceComments: true
+IndentCaseLabels: true
+IndentWidth: 4
+IndentWrappedFunctionNames: true
+IndentPPDirectives: AfterHash
+IncludeBlocks: Preserve
+NamespaceIndentation: Inner
+SpacesBeforeTrailingComments: 2
+Standard: Auto
+ReflowComments: false

.fossil-settings/manifest

@@ -0,0 +1 @@
+on

.github/dependabot.yml

@@ -0,0 +1,8 @@
+# Set update schedule for GitHub Actions
+version: 2
+updates:
+  - package-ecosystem: "github-actions"
+    directory: "/"
+    schedule:
+      # Check for updates to GitHub Actions every weekday
+      interval: "weekly"

.github/workflows/build.yml

@@ -0,0 +1,92 @@
+---
+name: Build
+
+on: [push, pull_request]
+
+jobs:
+  build-msvc:
+    name: Build Windows
+    runs-on: windows-latest
+    env:
+      BUILD_TOOLS_PATH: C:\apps\build-tools\
+    steps:
+      - run: echo $env:BUILD_TOOLS_PATH | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append
+
+      - uses: actions/checkout@v3
+        with:
+          submodules: true
+
+      - name: Install Build tools
+        shell: cmake -P {0}
+        run: |
+          file(MAKE_DIRECTORY $ENV{BUILD_TOOLS_PATH})
+          file(DOWNLOAD https://cdn.anotherfoxguy.com/build-tools.zip "$ENV{TMP}/build-tools.zip" SHOW_PROGRESS)
+          execute_process(COMMAND ${CMAKE_COMMAND} -E tar xzf "$ENV{TMP}/build-tools.zip" WORKING_DIRECTORY "$ENV{BUILD_TOOLS_PATH}")
+
+      - name: Enable Developer Command Prompt
+        uses: ilammy/msvc-dev-cmd@v1.10.0
+
+      - name: Cache conan packages
+        uses: actions/cache@v3
+        with:
+          key: win-conan-${{ hashFiles('**/conanfile.txt') }}
+          path: ~/.conan/
+
+      - name: Cache Qt
+        id: cache-qt
+        uses: actions/cache@v3
+        with:
+          path: "${{ github.workspace }}/qt/"
+          key: ${{ runner.os }}-QtCache
+
+      - name: Install Qt
+        uses: jurplel/install-qt-action@v2
+        with:
+          cached: ${{ steps.cache-qt.outputs.cache-hit }}
+          modules: qtwebengine
+          dir: "${{ github.workspace }}/qt/"
+
+      - name: Add conan remote
+        run: conan remote add fuel-scm https://artifactory.anotherfoxguy.com/artifactory/api/conan/fuel-scm -f
+
+      - name: Build
+        run: |
+          mkdir build
+          cd build
+          conan install .. --build=missing
+          cmake -GNinja -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=redist ..
+          ninja
+        shell: cmd
+
+      - name: Install
+        run: |
+          cd build
+          ninja install
+        shell: cmd
+
+      - name: Upload redist folder
+        uses: actions/upload-artifact@v2
+        with:
+          name: fuel-win
+          path: build/redist
+
+  build-gcc:
+    name: Build Linux
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+        with:
+          submodules: true
+
+      - name: Install qt
+        run: |
+          sudo apt-get update
+          sudo apt-get install qt5keychain-dev qtwebengine5-dev qttools5-dev -y
+
+      - name: Build
+        run: |
+          mkdir build
+          cd build
+          cmake -DCMAKE_BUILD_TYPE=Release ..
+          make -j4
+        shell: bash

.gitignore

@@ -0,0 +1,48 @@
+# C++ objects and libs
+*.slo
+*.lo
+*.o
+*.a
+*.la
+*.lai
+*.so
+*.dll
+*.dylib
+
+# Qt-es
+object_script.*.Release
+object_script.*.Debug
+*_plugin_import.cpp
+/.qmake.cache
+/.qmake.stash
+*.pro.user
+*.pro.user.*
+*.qbs.user
+*.qbs.user.*
+*.moc
+moc_*.cpp
+moc_*.h
+qrc_*.cpp
+ui_*.h
+*.qmlc
+*.jsc
+Makefile*
+*build-*
+
+# Qt unit tests
+target_wrapper.*
+
+# QtCreator
+*.autosave
+
+# QtCreator Qml
+*.qmlproject.user
+*.qmlproject.user.*
+
+# QtCreator CMake
+CMakeLists.txt.user*
+
+*.qm
+/build*
+.idea/
+test-pr

CMakeLists.txt

@@ -0,0 +1,244 @@
+cmake_minimum_required(VERSION 3.10)
+if (${CMAKE_VERSION} VERSION_GREATER "3.14")
+    cmake_policy(SET CMP0087 NEW)
+endif ()
+set(CMAKE_MODULE_PATH "${CMAKE_BINARY_DIR}" ${CMAKE_MODULE_PATH})
+include(FeatureSummary)
+
+# Setup paths
+SET(RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin/")
+SET(LIBRARY_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/lib/")
+SET(ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/lib/")
+SET(EXECUTABLE_OUTPUT_PATH ${RUNTIME_OUTPUT_DIRECTORY})
+SET(LIBRARY_OUTPUT_PATH ${RUNTIME_OUTPUT_DIRECTORY})
+# Fix executable paths for windows
+SET(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${RUNTIME_OUTPUT_DIRECTORY})
+SET(CMAKE_RUNTIME_OUTPUT_DIRECTORY_RELEASE ${RUNTIME_OUTPUT_DIRECTORY})
+SET(CMAKE_RUNTIME_OUTPUT_DIRECTORY_RELWITHDEBINFO ${RUNTIME_OUTPUT_DIRECTORY})
+SET(CMAKE_RUNTIME_OUTPUT_DIRECTORY_DEBUG ${RUNTIME_OUTPUT_DIRECTORY})
+
+project(Fuel VERSION "2.0.0")
+
+set(CMAKE_AUTOMOC ON)
+set(CMAKE_AUTORCC ON)
+set(CMAKE_AUTOUIC ON)
+set(CMAKE_AUTOUIC_SEARCH_PATHS "${CMAKE_SOURCE_DIR}/ui")
+
+find_package(Qt5 COMPONENTS Core Gui WebEngineWidgets REQUIRED)
+find_package(Qt5Keychain REQUIRED)
+
+set(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
+        ui/RemoteDialog.ui
+        ui/AboutDialog.ui)
+
+set(SOURCES
+        src/main.cpp
+        src/MainWindow.cpp
+        src/CommitDialog.cpp
+        src/FileActionDialog.cpp
+        src/SettingsDialog.cpp
+        src/FslSettingsDialog.cpp
+        src/CloneDialog.cpp
+        src/RevisionDialog.cpp
+        src/Utils.cpp
+        src/FileTableView.cpp
+        src/LoggedProcess.cpp
+        src/BrowserWidget.cpp
+        src/CustomWebView.cpp
+        src/Fossil.cpp
+        src/Workspace.cpp
+        src/SearchBox.cpp
+        src/AppSettings.cpp
+        src/RemoteDialog.cpp
+        src/AboutDialog.cpp)
+
+set(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
+        src/FileTableView.h
+        src/LoggedProcess.h
+        src/BrowserWidget.h
+        src/CustomWebView.h
+        src/Fossil.h
+        src/Workspace.h
+        src/SearchBox.h
+        src/AppSettings.h
+        src/RemoteDialog.h
+        src/AboutDialog.h
+        src/WorkspaceCommon.h)
+
+set(RESOURCES
+        rsrc/resources.qrc)
+
+set(TRANSLATIONS
+        intl/en_US.ts
+        intl/el_GR.ts
+        intl/de_DE.ts
+        intl/es_ES.ts
+        intl/fr_FR.ts
+        intl/ru_RU.ts
+        intl/pt_PT.ts
+        intl/it_IT.ts
+        intl/nl_NL.ts
+        intl/ko_KR.ts)
+
+
+find_package(Qt5LinguistTools)
+if (Qt5LinguistTools_FOUND)
+    set_source_files_properties(${TRANSLATIONS} PROPERTIES OUTPUT_LOCATION "intl")
+
+    qt5_create_translation(QM_MESSAGES ${CMAKE_SOURCE_DIR}/ui ${CMAKE_SOURCE_DIR}/src ${TRANSLATIONS})
+    qt5_add_translation(QM_FILES ${TRANSLATIONS})
+    add_custom_target(messages DEPENDS ${QM_MESSAGES})
+    add_custom_target(translations DEPENDS ${QM_FILES} messages)
+
+    file(COPY rsrc/languages.qrc DESTINATION ${CMAKE_BINARY_DIR}/intl)
+    list(APPEND RESOURCES "${CMAKE_BINARY_DIR}/intl/languages.qrc")
+else ()
+    message("Qt5LinguistTools not found")
+endif ()
+
+if (WIN32)
+    # clang-cl doesn't support resource files
+    if (NOT CMAKE_CXX_COMPILER_ID MATCHES "Clang")
+        list(APPEND SOURCES "${CMAKE_SOURCE_DIR}/rsrc/fuel.rc")
+    endif ()
+elseif (APPLE)
+    list(APPEND SOURCES "${CMAKE_SOURCE_DIR}/rsrc/icons/fuel.icns")
+endif ()
+
+add_executable(
+        ${PROJECT_NAME}
+        ${FORMS}
+        ${HEADERS}
+        ${SOURCES}
+        ${QM_FILES}
+        ${RESOURCES}
+)
+
+target_include_directories(
+        ${PROJECT_NAME} PUBLIC ${CMAKE_SOURCE_DIR}
+        ${CMAKE_SOURCE_DIR}/ui/
+        ${CMAKE_SOURCE_DIR}/src/
+
+)
+target_link_libraries(${PROJECT_NAME} PRIVATE Qt5::Widgets Qt5::WebEngineCore Qt5::WebEngineWidgets)
+if (TARGET Qt5Keychain::Qt5Keychain)
+    target_link_libraries(${PROJECT_NAME} PRIVATE Qt5Keychain::Qt5Keychain)
+else ()
+    target_link_libraries(${PROJECT_NAME} PRIVATE qt5keychain)
+endif ()
+
+target_compile_definitions(${PROJECT_NAME} PRIVATE FUEL_VERSION="${PROJECT_VERSION}")
+
+if (Qt5LinguistTools_FOUND)
+    add_dependencies(${PROJECT_NAME} translations)
+endif ()
+
+
+# ------------------------------------------------------------------------------------------------#
+# Cpack
+# ------------------------------------------------------------------------------------------------#
+
+include(GNUInstallDirs)
+include(FetchContent)
+
+set(CMAKE_INSTALL_DEFAULT_COMPONENT_NAME "${PROJECT_NAME}")
+set(CPACK_PACKAGE_NAME "${PROJECT_NAME}")
+set(CPACK_PACKAGE_VENDOR "${PROJECT_NAME}")
+set(CPACK_PACKAGE_DESCRIPTION "A GUI front-end for the Fossil SCM")
+set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "A GUI front-end for the Fossil SCM")
+set(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_SOURCE_DIR}/rsrc/license.rtf")
+set(CPACK_PACKAGE_VERSION ${PROJECT_VERSION})
+set(CPACK_PACKAGE_EXECUTABLES "${PROJECT_NAME}" "${PROJECT_NAME}")
+
+set(CPACK_GENERATOR ZIP)
+
+if (WIN32)
+    set_target_properties(${PROJECT_NAME} PROPERTIES WIN32_EXECUTABLE TRUE)
+
+    get_target_property(Qt5_Core_Location Qt5::Core LOCATION)
+    get_filename_component(QT_BIN_DIR ${Qt5_Core_Location} DIRECTORY)
+
+    # Fix for windeployqt not being able to find qt5keychain
+    if (EXISTS ${RUNTIME_OUTPUT_DIRECTORY}/qt5keychain.dll AND NOT EXISTS ${QT_BIN_DIR}/qt5keychain.dll)
+        message("Copying ${RUNTIME_OUTPUT_DIRECTORY}/qt5keychain.dll to ${QT_BIN_DIR}")
+        file(COPY ${RUNTIME_OUTPUT_DIRECTORY}/qt5keychain.dll DESTINATION ${QT_BIN_DIR})
+    endif ()
+
+    add_custom_target(
+            copy_dll
+            COMMAND ${QT_BIN_DIR}/windeployqt.exe $<TARGET_FILE:${PROJECT_NAME}> --release --no-compiler-runtime --no-opengl-sw
+            WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
+    )
+
+    install(
+            TARGETS ${PROJECT_NAME}
+            RUNTIME DESTINATION .
+    )
+
+    install(CODE "execute_process(COMMAND ${QT_BIN_DIR}/windeployqt.exe $<TARGET_FILE:${PROJECT_NAME}> --release --no-opengl-sw --dir \${CMAKE_INSTALL_PREFIX})")
+
+
+    FetchContent_Declare(
+            fossil
+            URL https://fossil-scm.org/home/uv/fossil-w64-2.17.zip
+            URL_MD5 f62b6e28846871741e057cfd09acdfc8
+    )
+    FetchContent_MakeAvailable(fossil)
+
+    install(
+            PROGRAMS ${fossil_SOURCE_DIR}/fossil.exe
+            DESTINATION .
+            COMPONENT Fossil
+            EXCLUDE_FROM_ALL
+    )
+
+    # For Windows Desktop shortcuts
+    set(CPACK_CREATE_DESKTOP_LINKS "${PROJECT_NAME}" "${PROJECT_NAME}")
+
+    set(CPACK_NSIS_EXECUTABLES_DIRECTORY ".")
+    set(CPACK_NSIS_MODIFY_PATH "ON")
+    set(CPACK_NSIS_HELP_LINK "https://fuel-scm.org")
+    set(CPACK_NSIS_URL_INFO_ABOUT "https://fuel-scm.org")
+    SET(CPACK_NSIS_INSTALLED_ICON_NAME "Fuel.exe")
+    SET(CPACK_NSIS_MUI_ICON "${CMAKE_SOURCE_DIR}/rsrc/icons/fuel.ico")
+    SET(CPACK_NSIS_MUI_UNIICON "${CMAKE_SOURCE_DIR}/rsrc/icons/fuel.ico")
+
+    set(CPACK_PACKAGE_INSTALL_DIRECTORY "${PROJECT_NAME}")
+    set(CPACK_GENERATOR ${CPACK_GENERATOR} NSIS)
+    set(CPACK_MODULE_PATH "")
+endif ()
+
+if (UNIX)
+    install(
+            TARGETS ${PROJECT_NAME}
+            RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
+    )
+    install(
+            FILES ${CMAKE_SOURCE_DIR}/rsrc/fuel.desktop
+            DESTINATION ${CMAKE_INSTALL_DATADIR}/applications/
+    )
+    install(
+            FILES ${CMAKE_SOURCE_DIR}/rsrc/icons/fuel.png
+            DESTINATION ${CMAKE_INSTALL_DATADIR}/pixmaps/
+    )
+endif ()
+
+include(CPack)
+
+feature_summary(WHAT ALL)

README.md

@@ -0,0 +1,42 @@
+Fuel
+---------
+Fuel is cross-platform GUI front-end for the excellent <a href="http://fossil-scm.org">Fossil</a> SCM tool written in Qt. Fuel runs on Windows, OSX as well as various flavors of Unix including Linux and FreeBSD.
+
+### What does it look like? (V2.0.0 Beta)
+![Fuel-2.0.0-Beta-Win](/doc/Fuel-2.0.0-Beta-Win.jpg)
+
+## Status
+Currently the following Fossil operations are supported
+
+#### Repositories
+  *  Create
+  *  Clone
+  *  Push/Pull
+  *  Timeline View (via fossil ui)
+  *  Multiple Remotes (Version 2)
+  *  Branches (Version 2)
+  *  Tags (Version 2)
+  *  Stashes
+
+#### Files
+  *  Commit
+  *  Add
+  *  Remove
+  *  Rename, including folders
+  *  Revert
+  *  Diff
+  *  Stash
+  *  History (via fossil ui)
+
+
+## Translation Project
+Do you use Fuel a lot but would prefer if it spoke your language? Help by submitting a translation for your language. 
+
+Click <a href="https://weblate.anotherfoxguy.com/engage/fuel-scm/">here</a>
+and help make Fuel better.
+
+### Realtime Translation Stats
+
+<a href="https://weblate.anotherfoxguy.com/engage/fuel-scm/">
+<img src="https://weblate.anotherfoxguy.com/widgets/fuel-scm/-/fuel-scm/multi-auto.svg" alt="Translation status" />
+</a>

conanfile.txt

@@ -0,0 +1,11 @@
+[requires]
+qtkeychain/0.13.2
+
+[generators]
+qmake
+cmake_find_package
+
+[imports]
+bin, *.dll -> ./bin @ keep_path=False
+share, *.qm -> ./bin/translations @ keep_path=False
+lib, *.so* -> ./bin @ keep_path=False

debian/changelog

@@ -1,5 +0,0 @@
-fuel (0.9.6-1) unstable; urgency=low
-
-  * Initial release (Closes: #nnnn)  <nnnn is the bug number of your ITP>
-
- -- Kostas <kostas@unknown>  Wed, 08 Oct 2014 12:10:32 +0300

debian/compat

@@ -1 +0,0 @@
-9

debian/control

@@ -1,17 +0,0 @@
-Source: fuel
-Section: x11
-Priority: optional
-Maintainer: Kostas Karanikolas <karanikolas@gmail.com>
-Build-Depends: cdbs, debhelper (>= 8.0.0), qtbase5-dev, qttools5-dev-tools, 
- libqt5webkit5-dev
-Standards-Version: 3.9.4
-Homepage: http://fuelscm.org
-#Vcs-Git: git://git.debian.org/collab-maint/fuel.git
-#Vcs-Browser: http://git.debian.org/?p=collab-maint/fuel.git;a=summary
-
-Package: fuel
-Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
-Recommends: fossil
-Description: Fossil SCM GUI
- Fuel is cross-platform GUI front-end for the Fossil SCM tool written in Qt. 

debian/copyright

@@ -1,38 +0,0 @@
-Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
-Upstream-Name: fuel
-Source: <url://example.com>
-
-Files: *
-Copyright: <years> <put author's name and email here>
-           <years> <likewise for another author>
-License: <special license>
- <Put the license of the package here indented by 1 space>
- <This follows the format of Description: lines in control file>
- .
- <Including paragraphs>
-
-# If you want to use GPL v2 or later for the /debian/* files use 
-# the following clauses, or change it to suit. Delete these two lines
-Files: debian/*
-Copyright: 2014 Kostas <kostas@unknown>
-License: GPL-2+
- This package is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2 of the License, or
- (at your option) any later version.
- .
- This package is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- GNU General Public License for more details.
- .
- You should have received a copy of the GNU General Public License
- along with this program. If not, see <http://www.gnu.org/licenses/>
- .
- On Debian systems, the complete text of the GNU General
- Public License version 2 can be found in "/usr/share/common-licenses/GPL-2".
-
-# Please also look if there are files or directories which have a
-# different copyright/license attached and list them here.
-# Please avoid to pick license terms that are more restrictive than the
-# packaged work, as it may make Debian's contributions unacceptable upstream.

debian/fuel.install

@@ -1 +0,0 @@
-rsrc/icons/fuel.png usr/share/pixmaps

debian/menu

@@ -1,6 +0,0 @@
-?package(fuel):\
-  needs="X11"\
-  section="Applications/File Management"\
-  title="Fuel"\
-  icon32x32="/usr/share/pixmaps/fuel.png"\
-  command="/usr/bin/fuel"

debian/rules

@@ -1,6 +0,0 @@
-#!/usr/bin/make -f
-# -*- makefile -*-
-
-include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/class/qmake.mk
-

debian/source/format

@@ -1 +0,0 @@
-3.0 (quilt)

debian/watch

@@ -1,24 +0,0 @@
-# Example watch control file for uscan
-# Rename this file to "watch" and then you can run the "uscan" command
-# to check for upstream updates and more.
-# See uscan(1) for format
-
-# Compulsory line, this is a version 3 file
-version=3
-
-# Uncomment to examine a Webpage
-# <Webpage URL> <string match>
-#http://www.example.com/downloads.php fuel-(.*)\.tar\.gz
-http://fuelscm.org/files/releases fuel-(.*)\.tar\.gz
-
-# Uncomment to examine a Webserver directory
-#http://www.example.com/pub/fuel-(.*)\.tar\.gz
-
-# Uncommment to examine a FTP server
-#ftp://ftp.example.com/pub/fuel-(.*)\.tar\.gz debian uupdate
-
-# Uncomment to find new files on sourceforge, for devscripts >= 2.9
-# http://sf.net/fuel/fuel-(.*)\.tar\.gz
-
-# Uncomment to find new files on GooglePages
-# http://example.googlepages.com/foo.html fuel-(.*)\.tar\.gz

dist/arch-git/PKGBUILD

@@ -0,0 +1,27 @@
+# Maintainer: Edgar <Edgar{at}AnotherFoxGuy.com>
+pkgname=fuel-git
+pkgver=2.0.0
+pkgrel=1
+pkgdesc="A GUI front-end to Fossil SCM"
+arch=(i686 x86_64)
+url="https://fuel-scm.org/"
+license=('GPL2')
+depends=('qt5-base>=5.4.0' 'qt5-webengine>=5.4.0' 'fossil' 'qtkeychain-qt5')
+makedepends=('git' 'cmake')
+source=("git://github.com/AnotherFoxGuy/fuel-scm")
+md5sums=('SKIP')
+
+build() {
+  cd "$srcdir/fuel-scm"
+  [ -d build ] && rm -r build
+  mkdir build
+  cd build
+  cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=/usr ..
+  make
+}
+
+package() {
+  cd "$srcdir/fuel-scm/build"
+  make DESTDIR="${pkgdir}" install
+}
+

dist/arch/PKGBUILD

@@ -1,27 +1,26 @@
-# Maintainer: Kostas Karanikolas <lastname[at]gmail[dot]com>
+# Maintainer: Edgar <Edgar{at}AnotherFoxGuy.com>
 pkgname=fuel
-pkgver=1.0.0
+pkgver=2.0.0
 pkgrel=1
 pkgdesc="A GUI front-end to Fossil SCM"
 arch=(i686 x86_64)
-url="http://code.google.com/p/fuel-scm/"
+url="https://fuel-scm.org/"
 license=('GPL2')
-depends=('qt5-base>=5.4.0', 'qt5-webkit>=5.2.0' 'fossil')
-source=("http://fuelscm.org/files/releases/${pkgname}-${pkgver}.tar.gz")
+depends=('qt5-base>=5.4.0', 'qt5-webkit>=5.4.0', 'fossil', 'qtkeychain-qt5')
+source=("https://fuel-scm.org/files/releases/${pkgname}-${pkgver}.tar.gz")
 
-sha256sums=('905faee12029eafaec9715e6bd5706c57514efa016389e78b78254a7cca0abaa') # Generate with 'makepkg -g'
+sha256sums=('034593d16eba9e30a73d1b40bfd4f1a7f9ba438a04dc07cc7bb2cd2202da40fc') # Generate with 'makepkg -g'
 
 build() {
-  cd "${srcdir}"
+  cd "$srcdir"
   [ -d build ] && rm -r build
   mkdir build
   cd build
-  qmake-qt5 "${srcdir}/${pkgname}-${pkgver}/fuel.pro"
+  cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=/usr ..
   make
 }
 
 package() {
-  cd "${srcdir}/build"
-  make INSTALL_ROOT="${pkgdir}" install
+  cd "$srcdir/build"
+  make DESTDIR="${pkgdir}" install
 }
-

dist/makedeb/PKGBUILD

@@ -0,0 +1,27 @@
+# Maintainer: Edgar <Edgar{at}AnotherFoxGuy.com>
+pkgname=fuel-git
+pkgver=2.0.0
+pkgrel=1
+pkgdesc="A GUI front-end to Fossil SCM"
+arch=(i686 x86_64)
+url="https://fuel-scm.org/"
+license=('GPL2')
+depends=('qtbase5-dev' 'qtwebengine5-dev' 'qttools5-dev' 'fossil' 'qt5keychain-dev')
+makedepends=('git' 'cmake')
+source=("git://github.com/AnotherFoxGuy/fuel-scm")
+md5sums=('SKIP')
+
+build() {
+  cd "$srcdir/fuel-scm"
+  [ -d build ] && rm -r build
+  mkdir build
+  cd build
+  cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=/usr ..
+  make -j$(nproc)
+}
+
+package() {
+  cd "$srcdir/fuel-scm/build"
+  make DESTDIR="${pkgdir}" install
+}
+

dist/win/fuel.iss

@@ -1,53 +0,0 @@
-; Script generated by the Inno Setup Script Wizard.
-; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES!
-
-#define MyAppName "Fuel"
-#define MyAppVersion "0.9.6"
-#define MyAppPublisher "Kostas Karanikolas"
-#define MyAppURL "http://fuel-scm.org/"
-#define MyAppExeName "Fuel.exe"
-
-[Setup]
-; NOTE: The value of AppId uniquely identifies this application.
-; Do not use the same AppId value in installers for other applications.
-; (To generate a new GUID, click Tools | Generate GUID inside the IDE.)
-AppId={{2B36FB79-7AD8-4864-AE6B-61D1E7A0D2FD}
-AppName={#MyAppName}
-AppVersion={#MyAppVersion}
-;AppVerName={#MyAppName} {#MyAppVersion}
-AppPublisher={#MyAppPublisher}
-AppPublisherURL={#MyAppURL}
-AppSupportURL={#MyAppURL}
-AppUpdatesURL={#MyAppURL}
-DefaultDirName={pf}\{#MyAppName}
-DefaultGroupName={#MyAppName}
-DisableProgramGroupPage=yes
-LicenseFile=..\..\doc\License.txt
-OutputDir=build
-OutputBaseFilename={#MyAppName}-{#MyAppVersion}
-Compression=lzma
-SolidCompression=yes
-
-[Languages]
-Name: "english"; MessagesFile: "compiler:Default.isl"
-
-[Tasks]
-Name: "desktopicon"; Description: "{cm:CreateDesktopIcon}"; GroupDescription: "{cm:AdditionalIcons}"; Flags: unchecked
-
-[Files]
-Source: "..\..\..\fuel-build-desktop\release\Fuel.exe"; DestDir: "{app}"; Flags: ignoreversion
-Source: "..\..\..\fuel-build-desktop\release\fossil.exe"; DestDir: "{app}"; Flags: ignoreversion
-Source: "..\..\..\fuel-build-desktop\release\libgcc_s_dw2-1.dll"; DestDir: "{app}"; Flags: ignoreversion
-Source: "..\..\..\fuel-build-desktop\release\mingwm10.dll"; DestDir: "{app}"; Flags: ignoreversion
-Source: "..\..\..\fuel-build-desktop\release\QtCore4.dll"; DestDir: "{app}"; Flags: ignoreversion
-Source: "..\..\..\fuel-build-desktop\release\QtGui4.dll"; DestDir: "{app}"; Flags: ignoreversion
-; NOTE: Don't use "Flags: ignoreversion" on any shared system files
-
-[Icons]
-Name: "{group}\{#MyAppName}"; Filename: "{app}\{#MyAppExeName}"
-Name: "{group}\{cm:UninstallProgram,{#MyAppName}}"; Filename: "{uninstallexe}"
-Name: "{commondesktop}\{#MyAppName}"; Filename: "{app}\{#MyAppExeName}"; Tasks: desktopicon
-
-[Run]
-Filename: "{app}\{#MyAppExeName}"; Description: "{cm:LaunchProgram,{#StringChange(MyAppName, "&", "&&")}}"; Flags: nowait postinstall skipifsilent
-

doc/Building.md

@@ -0,0 +1,143 @@
+Building from Source
+===============================================================================
+
+Prerequisites
+-------------------------------------------------------------------------------
+Building Fuel from source requires Qt version 5. Qt is available at:
+	http://www.qt.io/download-open-source/
+
+To run Fuel a compiled binary of Fossil must be available either in the system
+path or in the same folder as the Fuel executable. You can find the latest
+Fossil binaries from the Fossil homepage at:
+	https://www.fossil-scm.org/download.html
+
+Retrieving the source
+-------------------------------------------------------------------------------
+The source is available as a tar.gz archive at the following location
+
+	https://fuel-scm.org/fossil/wiki?name=Downloads
+
+Additionally you can clone the source code directly from our site using fossil
+
+	mkdir fuel
+	cd fuel
+	fossil clone https://fuel-scm.org/fossil fuel.fossil
+	fossil open fuel.fossil
+
+
+Windows (Qt5 / MinGW)
+-------------------------------------------------------------------------------
+1. Open a Command Prompt and cd into the folder containing the Fuel source code
+
+		cd fuel
+
+2. Make a build folder and cd into it
+
+		md build
+		cd build
+
+3. Generate the makefile with cmake
+
+		cmake -DCMAKE_BUILD_TYPE=Release ..
+
+4. Build the project
+
+		make -j6
+
+5. Copy the Qt DLLs
+
+		make copy_dll
+
+
+Windows (Qt5 / MSVC)
+-------------------------------------------------------------------------------
+1. Open a Command Prompt and cd into the folder containing the Fuel source code
+
+		cd fuel
+
+2. Make a build folder and cd into it
+
+		md build
+		cd build
+
+3. Generate the Visual Studio project makefile with cmake
+
+		cmake ..
+
+4. Open the generated project
+
+		start fuel.vcxproj
+
+5. Build the project
+	Use the IDE to build the project or alternatively you can use via MSBuild
+
+		call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\VC\Auxiliary\Build\vcvars64.bat"
+		msbuild /p:Configuration=Release /m Fuel.vcxproj
+
+6. Copy the Qt DLLs
+
+		msbuild /p:Configuration=Release copy_dll.vcxproj
+
+4. Enjoy
+
+		bin\Fuel.exe
+
+
+Mac OS X
+-------------------------------------------------------------------------------
+Build Steps:
+
+1. Open a Terminal and add your Qt bin folder to the path
+
+		export PATH=$PATH:/path/to/qt/version/clang_64/bin
+
+2. Go into the folder containing the Fuel source code
+
+		cd fuel
+
+3. Generate the makefile with cmake
+
+		cmake -DCMAKE_BUILD_TYPE=Release ..
+
+5. Build the project
+
+		make -j6
+
+6. (Optional) Include the Fossil executable within the Fuel application bundle
+
+		cp /location/to/fossil Fuel.app/Contents/MacOS
+
+7. Package Qt dependencies into Fuel to make a standalone application bundle
+
+		macdeployqt Fuel.app
+
+8. Enjoy
+
+		open Fuel.app
+
+
+Unix-based OS
+-------------------------------------------------------------------------------
+Build Steps:
+
+1. cd into the folder containing the Fuel source code
+
+		cd fuel
+
+2. Make a build folder and cd into it
+
+		md build
+		cd build
+
+3. Generate the makefile with cmake
+
+		cmake -DCMAKE_BUILD_TYPE=Release ..
+
+4. Build the project
+
+		make -j6
+
+5. Enjoy
+
+		bin/Fuel
+

doc/Building.txt

@@ -1,110 +0,0 @@
-Building from Source
-===============================================================================
-
-Prerequisites
--------------------------------------------------------------------------------
-Building Fuel from source requires Qt version 4. Qt is available at:
-	http://qt.nokia.com/downloads
-
-To run Fuel a compiled binary of Fossil must be available either in the system 
-path or in the same folder as the Fuel executable. You can find the latest
-Fossil binaries from the Fossil homepage at:
-	http://www.fossil-scm.org/download.html
-
-
-Retrieving the source
--------------------------------------------------------------------------------
-The source is available as a tar.gz archive at the following location
-	https://fuel-scm.googlecode.com/files/fuel-{VERSION}.tar.gz
-So for version 0.9.6 the package name would be fuel-0.9.6.tar.gz
-
-Additionally you can clone the source code directly from Chisel using fossil
-	mkdir fuel
-	cd fuel
-	fossil clone https://chiselapp.com/user/karanik/repository/fuel fuel.fossil
-	fossil open fuel.fossil
-
-
-Windows
--------------------------------------------------------------------------------
-1. Open a Command Prompt and cd into the folder containing the Fuel source code
-	cd fuel
-
-2. Make a build folder and cd into it
-	md build
-	cd build
-
-3.1 Build with MinGW
-	3.1.1 Generate the makefile with qmake
-		C:\QtSDK\Desktop\Qt\4.8.1\mingw\bin\qmake ..\fuel.pro -r -spec win32-g++ CONFIG+=release
-
-	3.1.2 Build the project
-		c:\QtSDK\mingw\bin\mingw32-make
-
-	3.1.3 Copy the Qt DLLs
-		copy C:\QtSDK\Desktop\Qt\4.8.1\mingw\bin\QtCore4.dll release
-		copy C:\QtSDK\Desktop\Qt\4.8.1\mingw\bin\QtGui4.dll release
-
-	3.1.4 Copy the MinGW DLLs
-		copy C:\QtSDK\mingw\bin\libgcc_s_dw2-1.dll release
-		copy C:\QtSDK\mingw\bin\mingwm10.dll release
-	
-3.2 Build with Visual Studio 2010
-	3.2.1 Generate the Visual Studio project makefile with qmake
-		C:\QtSDK\Desktop\Qt\4.8.1\msvc2010\bin\qmake ..\fuel.pro -tp vc -spec win32-msvc2010
-
-	3.2.2 Open the generated project
-		start fuel.vcxproj
-		
-	3.2.3 Build the project
-		
-	Alternatively you can build via MSBuild
-		c:\Windows\Microsoft.NET\Framework\v4.0.30319\msbuild Fuel.vcxproj /t:build /p:Configuration=Release
-		
-	3.2.4 Copy the Qt DLLs
-		copy C:\QtSDK\Desktop\Qt\4.8.1\msvc2010\bin\QtCore4.dll release
-		copy C:\QtSDK\Desktop\Qt\4.8.1\msvc2010\bin\QtGui4.dll release
-		
-4. Enjoy
-	release\Fuel.exe
-
-
-Mac OS X
--------------------------------------------------------------------------------
-Build Steps:
-
-1. Open a Terminal and cd into the folder containing the Fuel source code
-	cd fuel
-
-2. Generate the makefile with qmake
-	/path/to/qt/bin/qmake fuel.pro -spec macx-g++ CONFIG+=release
-
-3. Build the project
-	make
-
-4. (Optional) Include the Fossil executable within the Fuel application bundle
-	cp /location/to/fossil Fuel.app/Contents/MacOS
-
-5. Package Qt dependencies into Fuel to make a standalone application bundle
-	/path/to/qt/bin/macdeployqt Fuel.app
-
-6. Enjoy
-	open Fuel.app
-
-
-Unix-based OSs
--------------------------------------------------------------------------------
-Build Steps:
-
-1. cd into the folder containing the Fuel source code
-	cd fuel
-
-2. Generate the makefile with qmake
-	qmake fuel.pro
-
-3. Build the project
-	make
-
-4. Enjoy
-	./Fuel
-

doc/Changes.md

@@ -0,0 +1,89 @@
+Changes
+================================================================================
+
+Fuel V2.0.0 (2015-XX-XX)
+--------------------------------------------------------------------------------
+- Feature: New workspace view to visualise branches, tags, stashes and remotes
+- Feature: Support for creating, merging and integrating branches
+- Feature: Support for creating and deleting tags
+- Feature: Support for updating the workspace to a particular revisions including
+  specific branches or tags
+- Feature: Support for creating a branch during commit, including private branches
+- Feature: Added Search Box for filtering and searching within the list of files
+- Feature: Display the active tags and branches in the status bar
+- Feature: Fuel now automatically detects the http port of "fossil ui"
+- Feature: Added menu shortcut to display only the modified files of the workspace
+- Feature: Support for arbitrary number of remote urls, including pushing and
+  pulling to specific remotes.
+- Feature: Remote URL credentials are stored in the user keychain for systems that
+  support one. Thanks to the QtKeychain project (https://github.com/frankosterfeld/qtkeychain)
+- Feature: Folders now have different appereance depending on the modification
+  status of their contents, including missing folders
+- Feature: Support for multiple file user-actions
+- Feature: Double-Click action also allows user actions
+- Feature: Support for the versionable .fossil-settings/ignore-glob
+- Feature: OSX: UI improvements
+- Feature: OSX: Improved external application selection for application bundles
+- Feature: Long operations can now be aborted via a button on the status bar
+- Feature: Windows: Shift-Right-Click invokes the Explorer folder context menu on
+  Workspace folders
+- Feature: Support for force closing a workspace
+- Misc: Reorganised menu structure.
+- Misc: Separated Fuel and Fossil settings
+- Bug Fix: Retain the folder tree state when refreshing the workspace
+- Bug Fix: Fixed issue with the expanding width of the commit dialog
+- Major internal refactoring
+
+Fuel V1.0.1 (2015-08-23)
+--------------------------------------------------------------------------------
+- Added Localisations:
+	- Italian (Thanks maxxlupi and Zangune)
+	- Dutch (Thanks Rick Van Lieshout and Fly Man)
+	- Korean (Thanks ardiefox)
+- Reformated Docs into Markdown
+
+Fuel V1.0.0 (2015-03-28)
+--------------------------------------------------------------------------------
+- Feature: Long Operations can now be aborted by pressing the Escape key
+- Improvement: Better support for commit messages with international characters
+- Improvement: Fossil queries about CR/NL inconsistencies are now handled better
+- Improvement: Files in Conflicted state are now shown
+- Localisations:
+	- Russian (Thanks Mouse166)
+	- Portuguese (Thanks emansije)
+
+Fuel V0.9.7 (Unreleased)
+--------------------------------------------------------------------------------
+- Feature: Optionally use the internal browser for the Fossil UI
+- Feature: Support for persisting the state (Column order and sizes) of the File View
+- Feature: Dropping a Fossil checkout file or workspace folder on Fuel now opens that workspace
+- Feature: Dropping a file on Fuel now adds that file to Fossil
+- Feature: Commit Dialog: Pressing Ctrl-Enter within the comment box commences the commit,
+  and Escape aborts it
+- Feature: Support for localization
+- Localisations:
+	- French (Thanks Fringale)
+	- German (Thanks stayawake)
+	- Greek
+	- Spanish (Thanks djnavas)
+- Feature: Support for QT5
+- Distribution: Fuel is now available in the Arch User Repository
+
+Fuel V0.9.6 (2012-05-13)
+--------------------------------------------------------------------------------
+- Feature: Support for fossil stashes
+- Feature: Support for dragging and dropping files out of Fuel
+- Feature: Allow for opening workspaces via the checkout file or a workspace folder
+- Feature: Display the actual file icons
+- Feature: Windows: Shift-Right-Click invokes the Explorer file context menu
+- Feature: Allow starting Fuel into an existing fossil workspace via the command line (Thanks Chris)
+- Feature: Portable mode. When starting Fuel with the "--portable" option all settings
+  will be stored in a Fuel.ini file. If a settings file already exists, Fuel will start
+  into portable mode automatically. (Thanks Chris)
+- Improvement: Always show unknown files when starting a new repository
+- Bug Fix: Avoid specifying filenames explicitly when all modified files are selected.
+  This addresses an issue preventing commits after a merge
+- Bug Fix: Fixed issue where a complete repository would be committed even when
+  the user has a specific set of files marked for commit
+- Misc: Minor GUI bug fixes and usability enhancements
+

doc/Changes.txt

@@ -1,44 +0,0 @@
-Fuel V1.0.0 (2015-03-28)
-============
-- Feature: Long Operations can now be aborted by pressing the Escape key
-- Improvement: Better support for commit messages with international characters
-- Improvement: Fossil queries about CR/NL inconsistencies are now handled better
-- Improvement: Files in Conflicted state are now shown
-- Localisations:
-	Russian (Thanks Mouse166)
-	Portuguese (Thanks emansije)
-
-Fuel V0.9.7 (Unreleased)
-============
-- Feature: Optionally use the internal browser for the Fossil UI
-- Feature: Support for persisting the state (Column order and sizes) of the File View
-- Feature: Dropping a Fossil checkout file or workspace folder on Fuel now opens that workspace
-- Feature: Dropping a file on Fuel now adds that file to Fossil
-- Feature: Commit Dialog: Pressing Ctrl-Enter within the comment box commences the commit,
-  and Escape aborts it
-- Feature: Support for localization
-- Localisations:
-	French (Thanks Fringale)
-	German (Thanks stayawake)
-	Greek
-	Spanish (Thanks djnavas)
-- Feature: Support for QT5
-- Distribution: Fuel is now available in the Arch User Repository
-
-Fuel V0.9.6 (2012-05-13)
-============
-- Feature: Support for fossil stashes
-- Feature: Support for dragging and dropping files out of Fuel
-- Feature: Allow for opening workspaces via the checkout file or a workspace folder
-- Feature: Display the actual file icons
-- Feature: Windows: Shift-Right-Click invokes the Explorer file context menu
-- Feature: Allow starting Fuel into an existing fossil workspace via the command line (Thanks Chris)
-- Feature: Portable mode. When starting Fuel with the "--portable" option all settings
-  will be stored in a Fuel.ini file. If a settings file already exists, Fuel will start
-  into portable mode automatically. (Thanks Chris)
-- Improvement: Always show unknown files when starting a new repository
-- Bug Fix: Avoid specifying filenames explicitly when all modified files are selected.
-  This addresses an issue preventing commits after a merge
-- Bug Fix: Fixed issue where a complete repository would be committed even when
-  the user has a specific set of files marked for commit
-- Misc: Minor GUI bug fixes and usability enhancements

fuel.pro

@@ -2,14 +2,24 @@
 # Fuel
 #-------------------------------------------------
 
-QT    += core gui webkit
-
-contains(QT_VERSION, ^5\\..*) {
-	QT += widgets webkitwidgets
+lessThan(QT_MAJOR_VERSION, 5) {
+	message("Unsupported Qt version $${QT_VERSION}.")
+	error("Fuel requires Qt 5.4.0 or greater")
 }
 
+# Fuel requires at least Qt 5.4 due to QtWebEngine
+equals(QT_MAJOR_VERSION, 5):lessThan(QT_MINOR_VERSION, 4) {
+	message("Unsupported Qt version $${QT_VERSION}.")
+	error("Fuel requires Qt 5.4.0 or greater")
+}
+
+QT = core gui widgets webengine webenginewidgets
+QT-= quick multimediawidgets opengl printsupport qml multimedia positioning sensors
+
+
 TARGET = Fuel
 TEMPLATE = app
+DEFINES += FUEL_VERSION=\\\"2.0.1\\\"
 
 win32 {
 	RC_FILE = rsrc/fuel.rc
@@ -20,6 +30,12 @@ macx {
 	ICON = rsrc/icons/fuel.icns
 }
 
+# FreeBSD needs explicit paths to Qt install
+unix:freebsd {
+	INCLUDEPATH += /usr/local/include
+	LIBS += -L/usr/local/lib
+}
+
 unix:!macx {
 	TARGET = fuel
 	ICON = rsrc/icons/fuel.png
@@ -35,9 +51,15 @@ unix:!macx {
 	icon.files += rsrc/icons/fuel.png
 
 	INSTALLS += target desktop icon
-	system(intl/convert.sh)
 }
 
+exists( $$OUT_PWD/conanbuildinfo.pri ) {
+    message("Using conan packages")
+    CONFIG += conan_basic_setup
+    include($$OUT_PWD/conanbuildinfo.pri)
+} else {
+	QT += Qt5Keychain
+}
 
 INCLUDEPATH += src
 
@@ -46,30 +68,51 @@ 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 \
 	src/FileTableView.cpp \
-	src/CloneDialog.cpp \
 	src/LoggedProcess.cpp \
 	src/BrowserWidget.cpp \
-	src/CustomWebView.cpp
+	src/CustomWebView.cpp \
+	src/Fossil.cpp \
+	src/Workspace.cpp \
+	src/SearchBox.cpp \
+	src/AppSettings.cpp \
+	src/RemoteDialog.cpp \
+    src/AboutDialog.cpp
 
 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 \
 	src/FileTableView.h \
-	src/CloneDialog.h \
 	src/LoggedProcess.h \
 	src/BrowserWidget.h \
-	src/CustomWebView.h
+	src/CustomWebView.h \
+	src/Fossil.h \
+	src/Workspace.h \
+	src/SearchBox.h \
+	src/AppSettings.h \
+	src/RemoteDialog.h \
+	src/AboutDialog.h \
+	src/WorkspaceCommon.h
 
 FORMS    += ui/MainWindow.ui \
 	ui/CommitDialog.ui \
 	ui/FileActionDialog.ui \
 	ui/SettingsDialog.ui \
+	ui/FslSettingsDialog.ui \
 	ui/CloneDialog.ui \
-	ui/BrowserWidget.ui
+	ui/BrowserWidget.ui \
+	ui/RevisionDialog.ui \
+	ui/RemoteDialog.ui \
+	ui/AboutDialog.ui
 
 RESOURCES += \
 	rsrc/resources.qrc
@@ -83,5 +126,7 @@ TRANSLATIONS += \
 	intl/es_ES.ts \
 	intl/fr_FR.ts \
 	intl/ru_RU.ts \
-	intl/pt_PT.ts
-
+	intl/pt_PT.ts \
+	intl/it_IT.ts \
+	intl/nl_NL.ts \
+	intl/ko_KR.ts \

intl/convert.bat

@@ -1,20 +0,0 @@
-@echo off
-setlocal EnableDelayedExpansion
-set SCRIPTDIR=%CD%
-set PRJDIR=%SCRIPTDIR%\..
-set QTPATH=C:\Qt\Qt5.3.1\5.3\mingw482_32
-
-echo Converting localizations
-del /q %PRJDIR%\rsrc\intl\*
-if not exist %PRJDIR%\rsrc\intl\ mkdir %PRJDIR%\rsrc\intl\
-
-REM Convert all except the en_US which is the original text in the code
-
-%QTPATH%\bin\lrelease de_DE.ts -qm ..\rsrc\intl\de_DE.qm
-%QTPATH%\bin\lrelease el_GR.ts -qm ..\rsrc\intl\el_GR.qm
-%QTPATH%\bin\lrelease es_ES.ts -qm ..\rsrc\intl\es_ES.qm
-%QTPATH%\bin\lrelease fr_FR.ts -qm ..\rsrc\intl\fr_FR.qm
-%QTPATH%\bin\lrelease ru_RU.ts -qm ..\rsrc\intl\ru_RU.qm
-%QTPATH%\bin\lrelease ru_RU.ts -qm ..\rsrc\intl\pt_PT.qm
-
-endlocal

intl/convert.sh

@@ -1,22 +0,0 @@
-#!/bin/bash
-SCRIPTDIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
-PRJDIR=$SCRIPTDIR/..
-INTLDIR=$SCRIPTDIR
-
-echo "Converting localizations"
-
-rm -rf $PRJDIR/rsrc/intl
-mkdir $PRJDIR/rsrc/intl
-
-for i in $INTLDIR/*.ts
-do
-	BASE=`basename $i .ts`
-
-	# Convert all except the en_US which is
-	# the original text in the code
-	if [ "$BASE" != "en_US" ]; then
-		echo "$TARGET"
-		lrelease-qt5 $i -qm $PRJDIR/rsrc/intl/$BASE.qm
-	fi
-done
-

intl/update.sh

@@ -1,5 +0,0 @@
-#!/bin/sh
-
-# Update existing translations
-lupdate-qt5 ../fuel.pro
-

manifest

@@ -1,217 +0,0 @@
-C Updated\sapplication\sversion
-D 2015-03-27T18:25:42.323
-F debian/changelog 19b96029fa5c46944f5c9ffb9a75ce47a19e1dda
-F debian/compat b6abd567fa79cbe0196d093a067271361dc6ca8b
-F debian/control f4f9bbf38a523520eadbb6f66325d2784297e2a0
-F debian/copyright 6bcc83e13533b6cc208f3cd423f1f483163b62ad
-F debian/fuel.install 761f61f2c45aa522df4ffb345121c10da958cb63
-F debian/menu aa1321fe6597a631df5cc978a3cf7b21ac1a3657
-F debian/rules 468914cbcf1bcc252ab3f616e1fdc2b37bc10b5d x
-F debian/source/format 1064dc0ce263680c076a1005f35ec906a5cf5a32
-F debian/watch 34f0921ff100a3e16a7ad84dcc303731de830a60
-F dist/arch/PKGBUILD e08bdd82de34beeba1ef22ce6b6aa1900637581c
-F dist/win/fuel.iss ef3558dbba409eb194938b930377fc9ee27d319e
-F doc/Building.txt 7c0f1060d4a08ed330058d4a3a68905c05228381
-F doc/Changes.txt b03302545e4a6c0b16a30d623a7627f8aef65ef6
-F doc/License.txt 4cc77b90af91e615a64ae04893fdffa7939db84c
-F fuel.pro 844a18c3faf5239e0d0025d8b7feac3900c28e71
-F intl/convert.bat a4c0198e6df9e39469e81d1d702fccffe74ed691 x
-F intl/convert.sh 40ca4d0474063faefb6bd51dd37e0e732a7e82aa x
-F intl/de_DE.ts e2faceab920ac60c97bbc6fba038e261d51fc741
-F intl/el_GR.ts 1b805ee57309d02059d9e3e4cb49d945f9d9ac82
-F intl/en_US.ts 7917816efedf35d5f4f798d18896d7aa0cb3c71b
-F intl/es_ES.ts fbddd3374f7999e602536de9870ae1fef0c28ea8
-F intl/fr_FR.ts 8d2c00ab00927ee5239c1d273f380bbe4cfb2464
-F intl/pt_PT.ts f93bcc3df5447ab1d85407e1dec4cd68c03d2245
-F intl/ru_RU.ts 74189b3ee2b30b0b47b2db5bd7c9935db84947fc
-F intl/update.sh 39d4561630ba6681bb27e7beadc225a31469728f x
-F rsrc/fuel.desktop 43145556bc61f5a91b497c38a16aec44af271d29
-F rsrc/fuel.rc 8e9ac966f283102c11a77cd7f936cdc09e09bd79
-F rsrc/icons/Address\sBook-01.png ef2cec80ea5a559b72e8be4a344a1869fe69cbd8
-F rsrc/icons/Adobe\sIllustrator\sCS3\sDocument-01.png 2e44e933d58eefee7ccfa1650fed4ceadcf3c2be
-F rsrc/icons/Adobe\sPDF\sDocument-01.png 8a0bc3ba633d08debde748d64b5a9675e30447a3
-F rsrc/icons/Adobe\sPhotoshop\sCS3\sDocument-01.png 2adf660fad1e339e4a5dc0fded32902ba7e98379
-F rsrc/icons/Battery-01.png 40daf53b7f6bdcdd0d6aa5ef433d078ec5ea4342
-F rsrc/icons/Binoculars-01.png 386d0f3f9fa5b80a0abb650b3704bb450434d44f
-F rsrc/icons/Book-01.png 07fc552ba34b69f4d038dfe57f23be211405ed27
-F rsrc/icons/Briefcase-01.png 43cc1bb663f3470303cd94b473128f44754fcffa
-F rsrc/icons/Button\sAdd-01.png e256fcdf5f374e58f0731ef500e7cd3117a7b6ec
-F rsrc/icons/Button\sBlank\sBlue-01.png 1935637b553ca06c5187ef7fc52f90536c989f07
-F rsrc/icons/Button\sBlank\sGray-01.png 2758d7f21d1fe39f5fb942fcb1c4b8aafe5eb61e
-F rsrc/icons/Button\sBlank\sGreen-01.png 75ba0e98d49367f364cf4138825fb94a1acbe947
-F rsrc/icons/Button\sBlank\sRed-01.png 9126ac9058892f2ea02589a458ebb1910a88d6a4
-F rsrc/icons/Button\sBlank\sYellow-01.png c99b31de0194cc4a569d6286ffdc6c63237b7e80
-F rsrc/icons/Button\sCancel-01.png 18ca405914aa4af713432bc2e440e34f8159b8e7
-F rsrc/icons/Button\sClose-01.png 61e86985ea0820b2b1c77687085a334f80e8683f
-F rsrc/icons/Button\sDelete-01.png bd92e3cac0a2de2c9d7423f6f7148484c4082c37
-F rsrc/icons/Button\sDownload-01.png d4225280a2dc32202eed8effd5054974f2b88157
-F rsrc/icons/Button\sFavorite-01.png 8d2cf9abaf1949070b1a619ccd16ed1edc4ae9d0
-F rsrc/icons/Button\sForward-01.png 6e331bfd3a233a40d6fa6fef3a521701ef348efe
-F rsrc/icons/Button\sHelp-01.png d039a2098fca2627ad8788c6b32af93ab42844f0
-F rsrc/icons/Button\sInfo-01.png be1b3aa44d390070fd2bf4e01283c3eb3965764a
-F rsrc/icons/Button\sLog\sOff-01.png 40c91569a169521608f0bb768a553d0376120573
-F rsrc/icons/Button\sNext-01.png 964bed76e228f8c9efa11300b691b839478e11a0
-F rsrc/icons/Button\sPause-01.png 9c1d5a8fd2a0b609909a3756c173b147c2cc49e5
-F rsrc/icons/Button\sPlay-01.png 89bdf23e613c74e57979cb197bfd00e09c1c8a79
-F rsrc/icons/Button\sPrevious-01.png 92f7a31def5383ec7a86f0414aa70f54c7f4bce8
-F rsrc/icons/Button\sRefresh-01.png 594c33a7ecc20dd13dd0e8717f873357da50cb6c
-F rsrc/icons/Button\sReload-01.png 7566acfe8bfa1b022e27010b943e3852d7f33808
-F rsrc/icons/Button\sReminder-01.png b6603db497ab7c8c8aef63d999ff5ac5c614610d
-F rsrc/icons/Button\sRewind-01.png 6356da09a8b401cc5f7c430b0c529f8702feac52
-F rsrc/icons/Button\sTalk\sBalloon-01.png a6f9ffb5f2dd0bd3a41048651a6aacdf53ee1c37
-F rsrc/icons/Button\sTurn\sOff-01.png eb741164d55a0d7b5d073a0113abc45ebe0c4b5b
-F rsrc/icons/Button\sTurn\sOn-01.png 2856f779e240a99bc5d181b52f358ce92c65700e
-F rsrc/icons/Button\sUpload-01.png 942019d20bc3bd7227bd1624d2ffc3d5531963b0
-F rsrc/icons/Button\sWarning-01.png bd41b99c1584a86181f5fb8ff213f86334e3d94b
-F rsrc/icons/Calculator-01.png a52cc6339c98f3a8f467ce8eb8e60f34eb778f61
-F rsrc/icons/Calendar\sBlue-01.png 80f5da756794307a8d354a8bf715d6e687ee920e
-F rsrc/icons/Calendar\sGreen-01.png bb242aa1b9e6c997fcc91968143b492516d9d27f
-F rsrc/icons/Calendar\sRed-01.png 179b04cc2700660823720d1a7679b33de7b958b8
-F rsrc/icons/Clipboard\sPaste-01.png 9d93fc2ce21e7aa4211a0dde9023589b374262e8
-F rsrc/icons/Clipboard-01.png bb9c311135d48bd6a3d435f0c5d51ff4c35b6b3c
-F rsrc/icons/Clock-01.png 6607d4181689c30e91bfdd16159ecbd742dbdce4
-F rsrc/icons/Coin-01.png 36bfdcba641f0ecdb902771b71a18e154777102f
-F rsrc/icons/Compressed\sFile\sRAR-01.png c2de3e5ac4547639f9d311b61fca84478531e67c
-F rsrc/icons/Compressed\sFile\sSIT-01.png 4adbd6c08e7f4f292abd7298fad6da6d0ff5d3b9
-F rsrc/icons/Compressed\sFile\sZip-01.png 3ac05b15cb16df4a2ee6c2320ebd4312ceeb63aa
-F rsrc/icons/Computer\sMonitor-01.png f17362f4ec7afd4531eaef6a905a2e25c5b64b63
-F rsrc/icons/Computer\sNetwork-01.png fa296534cbc19c9fd5a683a02bb5aa5f85022d08
-F rsrc/icons/Document\sAttach-01.png 50bbd2ff79326893f93224c46d0d41f21c675f59
-F rsrc/icons/Document\sBlank-01.png c4e260ee3d1461eae0f9b12fe4bf84e6ef710a40
-F rsrc/icons/Document\sChart-01.png 3764305ca853077a2fa0dc1e264c2aeebf44d192
-F rsrc/icons/Document\sCopy-01.png 2d56e677afb57ab2423bdaaaabc5353369346b61
-F rsrc/icons/Document\sFlow\sChart-01.png 4f954822a1a0b5ca0f66c0c48bf18f1fd4fa6b21
-F rsrc/icons/Document\sGant\sChart-01.png c94eb569a056bdcc61e1daed4ef8d763b3db1e70
-F rsrc/icons/Document\sHelp-01.png 27ac48d35020476070382d68bd1d652ee5996589
-F rsrc/icons/Document\sLine\sChart-01.png 47427bbde9d578dbf7a3ce317b5fcad35a5b53b9
-F rsrc/icons/Document\sMicrosoft\sExcel-01.png 1961228e739fe2451aa0a3375c8328e5a1038a8a
-F rsrc/icons/Document\sMicrosoft\sPowerPoint-01.png f83b4dc5665201b9038690efb4403bcb4281b7bf
-F rsrc/icons/Document\sMicrosoft\sWord-01.png 1e994fe798bd71bde553f119ca4d95eb2534992a
-F rsrc/icons/Document\sOrganization\sChart-01.png 08e2d90232609a6537ff27c2fcbaf8669d27eef4
-F rsrc/icons/Document\sPreview-01.png 6dad0c2b3796f79b9ca2afeda35a4a25b2bf1a93
-F rsrc/icons/Document\sText-01.png d2032f213666611e1f2ac3c6d3bbd5ac3cb70c4e
-F rsrc/icons/Document-01.png 5caa3fb0c2803a5824967b772e221b8a6bf81888
-F rsrc/icons/Document-Revert-icon.png e0b9cdfe17a0f5f56fea52f129adb99e99d3013a
-F rsrc/icons/Edit\sDocument-01.png f83318cc0406ec8404162c6fd90bdb87ffd953d2
-F rsrc/icons/Email\sAttachment-01.png 9140f252ce29af0f3ca8f8b9438bc5fd73084627
-F rsrc/icons/Email\sDelete-01.png 6f7f1f536dcedf8e560a688e10be05c8f292f481
-F rsrc/icons/Email\sDownload-01.png b258db6c84afd8d25ad083388715040549fc4f5d
-F rsrc/icons/Email\sForward-01.png 2103ff91b3892d31f972ee05c0ae0975bd15630f
-F rsrc/icons/Email\sInbox-01.png da93bcba8b4b4e8c809f03c0b0bf836debc26034
-F rsrc/icons/Email\sReply-01.png 0d8c08f82ab27fdec23ee9876df08de17c2ceea8
-F rsrc/icons/Email-01.png 92d6b1952b23844c162f9641988e1d1d367c6827
-F rsrc/icons/File\sAudio\sAIFF-01.png f96b29301442962bf8d0cd9474526213ca91cb0f
-F rsrc/icons/File\sAudio\sMP3-01.png ed08e831ac7fa06d307562e0831b1d5279dd0df7
-F rsrc/icons/File\sAudio\sWAV-01.png 3c67326fd5ded4dc81792b2439dfc9f9c8c202c9
-F rsrc/icons/File\sAudio\sWMA-01.png 90ed8def8fb40f1072087b008a7247dd4c477f5a
-F rsrc/icons/File\sAudio-01.png 6b05fba6d25c44345fe7feebc874e3dc0579a980
-F rsrc/icons/File\sDelete-01.png e41d9c1bfda748df54f4a60c4bf09e33f01be36e
-F rsrc/icons/File\sHistory-01.png e009e86ecf1ab1f79aacd74d69f7c99f7f6a3134
-F rsrc/icons/File\sNew-01.png 48347428962e33d2b4b25f4dce85dc892d673aea
-F rsrc/icons/File\sOpen-01.png 406b558c24285b5da50604d89c171a8684b9d689
-F rsrc/icons/File\sVideo\s3GP-01.png 855490ff7380da71789408e848697e3d0584737a
-F rsrc/icons/File\sVideo\sAVI-01.png e307ad10e6761eb2cc47083070bac14288d36381
-F rsrc/icons/File\sVideo\sMOV-01.png 8eaa2eabfeaa194aa42d1a3bd6bd0f55b14275ed
-F rsrc/icons/File\sVideo\sMPEG-01.png 77bfaf4f0fef4d19a572a34449be609eee146c89
-F rsrc/icons/File\sVideo\sWMV-01.png 396d52a2cfbe8ac3c91e67576b7b1d6d25941919
-F rsrc/icons/File\sVideo-01.png 8ebed5e9ff46d1532a5df8cd0427918eae2d3565
-F rsrc/icons/Folder\sAdd-01.png d069b3c05a9bc41fc58fe5fee85a75dbed2a2f7e
-F rsrc/icons/Folder\sCompressed-01.png 8c25f6bc354ac7d48989319627531d94a0e1fd7d
-F rsrc/icons/Folder\sDelete-01.png fde9f4c91eade5281999165af04c1b53827fd63c
-F rsrc/icons/Folder\sExplorer-01.png 4bca07d4e2a90580ab43fc864826fe9ada299464
-F rsrc/icons/Folder\sGeneric\sBlue-01.png 65a1ec6e34725b1ed65e98be169558e3ffbaf95f
-F rsrc/icons/Folder\sGeneric\sGreen-01.png 56a1d1084a8de4ebd29be2398b737fdbf956107d
-F rsrc/icons/Folder\sGeneric\sRed-01.png 58e9ea810ab2c4b22ac4589ade357beaddd42612
-F rsrc/icons/Folder\sGeneric\sSilver-01.png d7c336da6d33cb1b78d4439ca932e5ab0287c976
-F rsrc/icons/Folder\sOpen-01.png 8f65da9130e1c4a553d23accc0222a307f209b71
-F rsrc/icons/Folder\sRAR-01.png 984bc1348f47d73b59cc66829f14906a4e22d811
-F rsrc/icons/Folder-01.png 797254b9c180b17c336eb24510732306454b631b
-F rsrc/icons/Games-01.png 36d2c9b086320a67a7bce7ae80bd80b06f660f8b
-F rsrc/icons/Gear-01.png dd9d2f1b3eaefd2b376547e8d7dc0224b142fb79
-F rsrc/icons/Highlighter\sBlue-01.png f13cd5ab2131e0405e6cca65c9bf859ddeac7dca
-F rsrc/icons/Highlighter\sGreen-01.png c27855873f1603692ddec1fe5eb387d82dec4511
-F rsrc/icons/Highlighter\sYellow-01.png 50c25fe8857e04ccbe7d518abc8e50cad64e82da
-F rsrc/icons/IconCredits.txt e38bd317b7d007b1bffb910f543dbbd376b2b16a
-F rsrc/icons/Image\sBMP-01.png 79a0ca5cd1a794b711c37a3ab9a9d45d458c6cd1
-F rsrc/icons/Image\sGIF-01.png d409ac6dfeceac46d711cc7bef274d94bbd4e9b0
-F rsrc/icons/Image\sJPEG-01.png 63bc765c3c2c389c580faa66c7802f8d18e2ddd7
-F rsrc/icons/Image\sPNG-01.png 858fc6a016aa903777fe9e7994b1ebd94d16bd35
-F rsrc/icons/Image\sTIFF-01.png c21d860de99f929afe4541f4ac1d8a71c80bff68
-F rsrc/icons/Lock\sLock-01.png b1502b0b7ef07d643ae2d169d831a7a6272a02d1
-F rsrc/icons/Lock\sUnlock-01.png e47398b3f0ab0f78e04afebb697bd3ab9eff6aa7
-F rsrc/icons/My\sDocuments-01.png 4553fc16e9a4b08127f09016469ab5eb00300c8c
-F rsrc/icons/My\sEbooks-01.png 0ed4118b3b7fff5d56c8612fb6e0a8e3fd083169
-F rsrc/icons/My\sMusic-01.png f7b0dfce2ea321a3b72795fc5501dedf9f5f683c
-F rsrc/icons/My\sPictures.png 93728e10f32a81cc965c3390b40abff8cbffbfdc
-F rsrc/icons/My\sVideos-01.png 2e8cee013490100dfe4c42c5b2fb10ee3cdee7b0
-F rsrc/icons/My\sWebsites-01.png 1af5ae10a10bcc628c60b65bcc82f65537e4b93e
-F rsrc/icons/Network\sFirewall-01.png 4bbfe1f6d4b08c900fb5a15ab3ae212ca06ffe88
-F rsrc/icons/Network\sMAC-01.png 9001794331edc31f166d9c90be59e49604cc7ee7
-F rsrc/icons/Network\sPC-01.png 1d862ce6c21d89cec29e518a290dad785aa17324
-F rsrc/icons/Network\sRefresh-01.png 2fd0f18658addfc9f728cb1462fb007e514db9ec
-F rsrc/icons/Pen\sBlue-01.png 162d6d34b71697c202e16309962ad8e48fb77ad9
-F rsrc/icons/Pen\sGreen-01.png b0ec213414205cc2a443f3113d3c22396fe0556b
-F rsrc/icons/Pen\sRed-01.png 6af49c0ee04376c446cdcf0baa404bb724cf2d01
-F rsrc/icons/Save-01.png d0b40c336956c9b8dd1ddafe72801c2ff1718ca1
-F rsrc/icons/Text\sEdit.png 010ae940be096d9d65d6e53c52fc31d8c238cacc
-F rsrc/icons/USB-01.png 2c7e2200c2ddb6e6465dbb167c2b5ee34aaaf5cb
-F rsrc/icons/User\sAdministrator\sBlue-01.png e7c742a268bea5242caa41b80a23756b198338a6
-F rsrc/icons/User\sAdministrator\sGreen-01.png 86aed5f9bbf259a9aa9d725f033ecd0351c0131e
-F rsrc/icons/User\sAdministrator\sRed-01.png d315742668de4b255de1a5ea141bb5e605e9389c
-F rsrc/icons/User\sChat-01.png e755eb8d6d476fa92d0155db761819272a0dbf3f
-F rsrc/icons/User\sClients-01.png 769b86d73904c0256c7835b0f3dd9e922be4abc4
-F rsrc/icons/User\sCoat\sBlue-01.png 2a2a6b9bec6506c55de188a81136c770a0cade72
-F rsrc/icons/User\sCoat\sGreen-01.png 61756d020524c1b33c29121188a2b6fe29ab9884
-F rsrc/icons/User\sCoat\sRed-01.png 2c63e8b957f56caffa297314e8eae9b646a70440
-F rsrc/icons/User\sExecutive\sBlue-01.png f6e5d1c4a4f534f106d1c517cddada9d080a8317
-F rsrc/icons/User\sExecutive\sGreen-01.png bd120c95a3b5f03ded7eda8cbd36b0890d830ced
-F rsrc/icons/User\sExecutive\sRed-01.png 2a0300a88c070ee20eebd1fef1995ea5bab3297e
-F rsrc/icons/User\sGroup-01.png 95efb545e7d01f97ab5c1e1eace5afa0d7d4b31b
-F rsrc/icons/User\sPreppy\sBlue-01.png a44530fa2d2a51172f00d78242e2dd922408bdf5
-F rsrc/icons/User\sPreppy\sGreen-01.png b814dcaf10f54adb0557d1dd8dc8c09abf1ed0e5
-F rsrc/icons/User\sPreppy\sRed-01.png b28eaef39fdff249fb4bf5e49ad4c584a3845ed5
-F rsrc/icons/Web\sHTML-01.png 6232d980a5ad2b3a313475abda43659ab400bb69
-F rsrc/icons/Web\sXML-01.png 0f5cd39709e7b99a1e6833b6718c631756ce8f7c
-F rsrc/icons/Window\sRefresh-01.png 14740f1fbc0bf6fe43e571bf344f1354c3b55f82
-F rsrc/icons/Window-01.png c283536f3825409ce01c0446a528b9a0c3cee203
-F rsrc/icons/Windows\sCascade-01.png 4d61073295f73437d2c01c4829da94b29823fa7e
-F rsrc/icons/Windows-01.png c5da37a9fb6e9c777107668b39fec98169a1db77
-F rsrc/icons/Zoom\sIn-01.png bdd24558fd23a1003f1a569f092f22022736f236
-F rsrc/icons/Zoom\sOut-01.png 8eda092100d9e00c9097f43a80d1e26695947448
-F rsrc/icons/Zoom-01.png 67ca532922e9166325c5c75fce1ca3fbb0d2b6a6
-F rsrc/icons/fuel.icns 81e535004b62db801a02f3e15d0a33afc9d4070b
-F rsrc/icons/fuel.ico eb529ab3332a17b9302ef3e851db5b9ebce2a038
-F rsrc/icons/fuel.png 40daf53b7f6bdcdd0d6aa5ef433d078ec5ea4342
-F rsrc/resources.qrc 4098be128fd6c045db933d041fe8844b14643a6f
-F src/BrowserWidget.cpp 8b8f545cdff4a4188edc698a1b4777f5df46f056
-F src/BrowserWidget.h 764d66aa9a93b890298bd0301097739cb4e16597
-F src/CloneDialog.cpp 812ef7d361c16da21540b7047c9d4d5e74f18539
-F src/CloneDialog.h e9f0fc8e5cc5ea2e7c43d6e77b5c4a9cc850b59e
-F src/CommitDialog.cpp 5300522ac11bc1096a11a6ce22f8c1665d4afc05
-F src/CommitDialog.h f1ee8db92103164e7db55a8407ccdcff24571b72
-F src/CustomWebView.cpp b7dd0c41977c2cba005df07ed8967ba6f58d07d9
-F src/CustomWebView.h fbc8ee55812d1acb3c3b2bc31be7533e8a112822
-F src/FileActionDialog.cpp fcaebf9986f789b3440d5390b3458ad5f86fe0c8
-F src/FileActionDialog.h 15db1650b3a13d70bc338371e4c033c66e3b79ce
-F src/FileTableView.cpp 5ddf8c391c9a3ac449ec61fb1db837b577afeec2
-F src/FileTableView.h 03e56d87c2d46411b9762b87f4d301619aaf18df
-F src/LoggedProcess.cpp 2a1e5c94bc1e57c8984563e66c210e43a14dc60c
-F src/LoggedProcess.h 85df7c635c807a5a0e8c4763f17a0752aaff7261
-F src/MainWindow.cpp a228d45fde194eace0cb7833d3da8757b49142ab
-F src/MainWindow.h dc0a9ed7de8a338e56c38c00ec303796f31bd24d
-F src/SettingsDialog.cpp a46cff5e5dd425e3dbdd15632abfd5829f5562b4
-F src/SettingsDialog.h 4e2790f581e991c744ae9f86580f1972b8c7ff43
-F src/Utils.cpp 9aff456712e4276b49083426301b3b96d3819c77
-F src/Utils.h c546e478a1225a28c99cd4c30f70cf9be9804a2a
-F src/main.cpp 0bba433f16072096cba1d48733b4e801df144800
-F tools/pack.sh d7f38a498c4e9327fecd6a6e5ac27be270d43008 x
-F ui/BrowserWidget.ui 5ad98b13773afadb20a1a2c22148aaebe5dbd95d
-F ui/CloneDialog.ui 4886e7d4f258ea8b852b5eefc860396e35145712
-F ui/CommitDialog.ui 6200f6cabdcf40a20812e811be28e0793f82516f
-F ui/FileActionDialog.ui 89bb4dc2d0b8adcd41adcb11ec65f2028a09a12d
-F ui/MainWindow.ui 7ede8bbb54513e0771fdf5d5a2566d88c81b73ad
-F ui/SettingsDialog.ui 2b7c2870e0054b0f4106f495d85d02c0b814df8b
-P ca68fe622ce88483d769d78281f7e98ed0f70e9e
-R 0d1dd353890d2cf810a406f276a6938b
-U kostas
-Z a91ed61381f99fa788c67281b0b4d5ce

manifest.uuid

@@ -1 +1 @@
-f1c343a9ee2e43baf5ba2bc5c2e34a8dd7215ac9
+6b21c5057dad0036c043e4d57effd5cceb6d2a10

recipes/qtkeychain/conanfile.py

@@ -0,0 +1,34 @@
+from conans import ConanFile, CMake, tools
+
+
+class QtkeychainConan(ConanFile):
+    name = "qtkeychain"
+    version = "0.13.2"
+    license = "BSD-3"
+    author = "Edgar"
+    url = "https://github.com/AnotherFoxGuy/fuel-scm"
+    description = "Platform-independent Qt API for storing passwords securely"
+    settings = "os", "compiler", "build_type", "arch"
+    options = {"static": [True, False]}
+    default_options = {"static": False}
+    scm = {
+        "type": "git",
+        "url": "https://github.com/frankosterfeld/qtkeychain.git",
+        "revision": "v0.13.2"
+    }
+
+    def build(self):
+        cmake = CMake(self)
+        cmake.definitions["QTKEYCHAIN_STATIC"] = self.options.static
+        cmake.definitions["BUILD_TEST_APPLICATION"] = "OFF"
+        cmake.configure()
+        cmake.build()
+
+    def package(self):
+        cmake = CMake(self)
+        cmake.install()
+
+    def package_info(self):
+        self.cpp_info.names["cmake_find_package"] = "Qt5Keychain"
+        self.cpp_info.names["cmake_find_package_multi"] = "Qt5Keychain"
+        self.cpp_info.libs = tools.collect_libs(self)

rsrc/docs/Licenses.txt

@@ -0,0 +1,28 @@
+Icon Theme by Deleket - Jojo Mendoza
+Available under the CC Attribution Noncommercial No Derivative 3.0 License
+---------------------------------------
+
+QtKeychain 
+https://github.com/frankosterfeld/qtkeychain
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+
+1. Redistributions of source code must retain the above copyright
+   notice, this list of conditions and the following disclaimer.
+2. Redistributions in binary form must reproduce the above copyright
+   notice, this list of conditions and the following disclaimer in the
+   documentation and/or other materials provided with the distribution.
+
+THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+---------------------------------------

rsrc/docs/Translators.txt

@@ -0,0 +1,10 @@
+stayawake: de_DE
+djnavas: es_ES
+Fringale: fr_FR
+mouse166: ru_RU
+emansije: pt_PT
+maxxlupi: it_IT
+Zangune: it_IT
+Fly Man: nl_NL
+Rick Van Lieshout: nl_NL
+ardiefox: ko_KR

rsrc/fuel.desktop

@@ -1,10 +1,9 @@
 [Desktop Entry]
-Encoding=UTF-8
 Type=Application
-Exec=/usr/bin/fuel
-Icon=/usr/share/icons/hicolor/256x256/apps/fuel.png
+Exec=Fuel
+Icon=fuel
 Terminal=false
 Name=Fuel
 GenericName=Software Configuration Management tool
 Comment=GUI Front-End to the Fossil SCM tool
-Categories=Qt;Development;RevisionControl
+Categories=Development;RevisionControl;

rsrc/languages.qrc

@@ -0,0 +1,13 @@
+<RCC>
+ <qresource prefix="/intl">
+   <file>el_GR.qm</file>
+   <file>de_DE.qm</file>
+   <file>es_ES.qm</file>
+   <file>fr_FR.qm</file>
+   <file>ru_RU.qm</file>
+   <file>pt_PT.qm</file>
+   <file>it_IT.qm</file>
+   <file>nl_NL.qm</file>
+   <file>ko_KR.qm</file>
+ </qresource>
+</RCC>

rsrc/license.rtf

@@ -0,0 +1,152 @@
+{\rtf1\ansi\deff0{\fonttbl{\f0 \fswiss Helvetica;}{\f1 Courier;}}
+{\colortbl;\red255\green0\blue0;\red0\green0\blue255;}
+\widowctrl\hyphauto
+
+{\pard \ql \f0 \sa180 \li0 \fi0 \b \fs28 GNU GENERAL PUBLIC LICENSE\par}
+{\pard \ql \f0 \sa180 \li0 \fi0 Version 3, 29 June 2007\par}
+{\pard \ql \f0 \sa180 \li0 \fi0 Copyright \u169? 2007 Free Software Foundation, Inc. <{\field{\*\fldinst{HYPERLINK "https://fsf.org/"}}{\fldrslt{\ul
+https://fsf.org/
+}}}
+>\par}
+{\pard \ql \f0 \sa180 \li0 \fi0 Everyone is permitted to copy and distribute verbatim copies of this license document, but changing it is not allowed.\par}
+{\pard \ql \f0 \sa180 \li0 \fi0 \b \fs28 Preamble\par}
+{\pard \ql \f0 \sa180 \li0 \fi0 The GNU General Public License is a free, copyleft license for software and other kinds of works.\par}
+{\pard \ql \f0 \sa180 \li0 \fi0 The licenses for most software and other practical works are designed to take away your freedom to share and change the works. By contrast, the GNU General Public License is intended to guarantee your freedom to share and change all versions of a program--to make sure it remains free software for all its users. We, the Free Software Foundation, use the GNU General Public License for most of our software; it applies also to any other work released this way by its authors. You can apply it to your programs, too.\par}
+{\pard \ql \f0 \sa180 \li0 \fi0 When we speak of free software, we are referring to freedom, not price. Our General Public Licenses are designed to make sure that you have the freedom to distribute copies of free software (and charge for them if you wish), that you receive source code or can get it if you want it, that you can change the software or use pieces of it in new free programs, and that you know you can do these things.\par}
+{\pard \ql \f0 \sa180 \li0 \fi0 To protect your rights, we need to prevent others from denying you these rights or asking you to surrender the rights. Therefore, you have certain responsibilities if you distribute copies of the software, or if you modify it: responsibilities to respect the freedom of others.\par}
+{\pard \ql \f0 \sa180 \li0 \fi0 For example, if you distribute copies of such a program, whether gratis or for a fee, you must pass on to the recipients the same freedoms that you received. You must make sure that they, too, receive or can get the source code. And you must show them these terms so they know their rights.\par}
+{\pard \ql \f0 \sa180 \li0 \fi0 Developers that use the GNU GPL protect your rights with two steps: (1) assert copyright on the software, and (2) offer you this License giving you legal permission to copy, distribute and/or modify it.\par}
+{\pard \ql \f0 \sa180 \li0 \fi0 For the developers' and authors' protection, the GPL clearly explains that there is no warranty for this free software. For both users' and authors' sake, the GPL requires that modified versions be marked as changed, so that their problems will not be attributed erroneously to authors of previous versions.\par}
+{\pard \ql \f0 \sa180 \li0 \fi0 Some devices are designed to deny users access to install or run modified versions of the software inside them, although the manufacturer can do so. This is fundamentally incompatible with the aim of protecting users' freedom to change the software. The systematic pattern of such abuse occurs in the area of products for individuals to use, which is precisely where it is most unacceptable. Therefore, we have designed this version of the GPL to prohibit the practice for those products. If such problems arise substantially in other domains, we stand ready to extend this provision to those domains in future versions of the GPL, as needed to protect the freedom of users.\par}
+{\pard \ql \f0 \sa180 \li0 \fi0 Finally, every program is threatened constantly by software patents. States should not allow patents to restrict development and use of software on general-purpose computers, but in those that do, we wish to avoid the special danger that patents applied to a free program could make it effectively proprietary. To prevent this, the GPL assures that patents cannot be used to render the program non-free.\par}
+{\pard \ql \f0 \sa180 \li0 \fi0 The precise terms and conditions for copying, distribution and modification follow.\par}
+{\pard \ql \f0 \sa180 \li0 \fi0 \b \fs28 TERMS AND CONDITIONS\par}
+{\pard \ql \f0 \sa180 \li0 \fi0 \b \fs24 0. Definitions.\par}
+{\pard \ql \f0 \sa180 \li0 \fi0 \u8220"This License\u8221" refers to version 3 of the GNU General Public License.\par}
+{\pard \ql \f0 \sa180 \li0 \fi0 \u8220"Copyright\u8221" also means copyright-like laws that apply to other kinds of works, such as semiconductor masks.\par}
+{\pard \ql \f0 \sa180 \li0 \fi0 \u8220"The Program\u8221" refers to any copyrightable work licensed under this License. Each licensee is addressed as \u8220"you\u8221". \u8220"Licensees\u8221" and \u8220"recipients\u8221" may be individuals or organizations.\par}
+{\pard \ql \f0 \sa180 \li0 \fi0 To \u8220"modify\u8221" a work means to copy from or adapt all or part of the work in a fashion requiring copyright permission, other than the making of an exact copy. The resulting work is called a \u8220"modified version\u8221" of the earlier work or a work \u8220"based on\u8221" the earlier work.\par}
+{\pard \ql \f0 \sa180 \li0 \fi0 A \u8220"covered work\u8221" means either the unmodified Program or a work based on the Program.\par}
+{\pard \ql \f0 \sa180 \li0 \fi0 To \u8220"propagate\u8221" a work means to do anything with it that, without permission, would make you directly or secondarily liable for infringement under applicable copyright law, except executing it on a computer or modifying a private copy. Propagation includes copying, distribution (with or without modification), making available to the public, and in some countries other activities as well.\par}
+{\pard \ql \f0 \sa180 \li0 \fi0 To \u8220"convey\u8221" a work means any kind of propagation that enables other parties to make or receive copies. Mere interaction with a user through a computer network, with no transfer of a copy, is not conveying.\par}
+{\pard \ql \f0 \sa180 \li0 \fi0 An interactive user interface displays \u8220"Appropriate Legal Notices\u8221" to the extent that it includes a convenient and prominently visible feature that (1) displays an appropriate copyright notice, and (2) tells the user that there is no warranty for the work (except to the extent that warranties are provided), that licensees may convey the work under this License, and how to view a copy of this License. If the interface presents a list of user commands or options, such as a menu, a prominent item in the list meets this criterion.\par}
+{\pard \ql \f0 \sa180 \li0 \fi0 \b \fs24 1. Source Code.\par}
+{\pard \ql \f0 \sa180 \li0 \fi0 The \u8220"source code\u8221" for a work means the preferred form of the work for making modifications to it. \u8220"Object code\u8221" means any non-source form of a work.\par}
+{\pard \ql \f0 \sa180 \li0 \fi0 A \u8220"Standard Interface\u8221" means an interface that either is an official standard defined by a recognized standards body, or, in the case of interfaces specified for a particular programming language, one that is widely used among developers working in that language.\par}
+{\pard \ql \f0 \sa180 \li0 \fi0 The \u8220"System Libraries\u8221" of an executable work include anything, other than the work as a whole, that (a) is included in the normal form of packaging a Major Component, but which is not part of that Major Component, and (b) serves only to enable use of the work with that Major Component, or to implement a Standard Interface for which an implementation is available to the public in source code form. A \u8220"Major Component\u8221", in this context, means a major essential component (kernel, window system, and so on) of the specific operating system (if any) on which the executable work runs, or a compiler used to produce the work, or an object code interpreter used to run it.\par}
+{\pard \ql \f0 \sa180 \li0 \fi0 The \u8220"Corresponding Source\u8221" for a work in object code form means all the source code needed to generate, install, and (for an executable work) run the object code and to modify the work, including scripts to control those activities. However, it does not include the work's System Libraries, or general-purpose tools or generally available free programs which are used unmodified in performing those activities but which are not part of the work. For example, Corresponding Source includes interface definition files associated with source files for the work, and the source code for shared libraries and dynamically linked subprograms that the work is specifically designed to require, such as by intimate data communication or control flow between those subprograms and other parts of the work.\par}
+{\pard \ql \f0 \sa180 \li0 \fi0 The Corresponding Source need not include anything that users can regenerate automatically from other parts of the Corresponding Source.\par}
+{\pard \ql \f0 \sa180 \li0 \fi0 The Corresponding Source for a work in source code form is that same work.\par}
+{\pard \ql \f0 \sa180 \li0 \fi0 \b \fs24 2. Basic Permissions.\par}
+{\pard \ql \f0 \sa180 \li0 \fi0 All rights granted under this License are granted for the term of copyright on the Program, and are irrevocable provided the stated conditions are met. This License explicitly affirms your unlimited permission to run the unmodified Program. The output from running a covered work is covered by this License only if the output, given its content, constitutes a covered work. This License acknowledges your rights of fair use or other equivalent, as provided by copyright law.\par}
+{\pard \ql \f0 \sa180 \li0 \fi0 You may make, run and propagate covered works that you do not convey, without conditions so long as your license otherwise remains in force. You may convey covered works to others for the sole purpose of having them make modifications exclusively for you, or provide you with facilities for running those works, provided that you comply with the terms of this License in conveying all material for which you do not control copyright. Those thus making or running the covered works for you must do so exclusively on your behalf, under your direction and control, on terms that prohibit them from making any copies of your copyrighted material outside their relationship with you.\par}
+{\pard \ql \f0 \sa180 \li0 \fi0 Conveying under any other circumstances is permitted solely under the conditions stated below. Sublicensing is not allowed; section 10 makes it unnecessary.\par}
+{\pard \ql \f0 \sa180 \li0 \fi0 \b \fs24 3. Protecting Users' Legal Rights From Anti-Circumvention Law.\par}
+{\pard \ql \f0 \sa180 \li0 \fi0 No covered work shall be deemed part of an effective technological measure under any applicable law fulfilling obligations under article 11 of the WIPO copyright treaty adopted on 20 December 1996, or similar laws prohibiting or restricting circumvention of such measures.\par}
+{\pard \ql \f0 \sa180 \li0 \fi0 When you convey a covered work, you waive any legal power to forbid circumvention of technological measures to the extent such circumvention is effected by exercising rights under this License with respect to the covered work, and you disclaim any intention to limit operation or modification of the work as a means of enforcing, against the work's users, your or third parties' legal rights to forbid circumvention of technological measures.\par}
+{\pard \ql \f0 \sa180 \li0 \fi0 \b \fs24 4. Conveying Verbatim Copies.\par}
+{\pard \ql \f0 \sa180 \li0 \fi0 You may convey verbatim copies of the Program's source code as you receive it, in any medium, provided that you conspicuously and appropriately publish on each copy an appropriate copyright notice; keep intact all notices stating that this License and any non-permissive terms added in accord with section 7 apply to the code; keep intact all notices of the absence of any warranty; and give all recipients a copy of this License along with the Program.\par}
+{\pard \ql \f0 \sa180 \li0 \fi0 You may charge any price or no price for each copy that you convey, and you may offer support or warranty protection for a fee.\par}
+{\pard \ql \f0 \sa180 \li0 \fi0 \b \fs24 5. Conveying Modified Source Versions.\par}
+{\pard \ql \f0 \sa180 \li0 \fi0 You may convey a work based on the Program, or the modifications to produce it from the Program, in the form of source code under the terms of section 4, provided that you also meet all of these conditions:\par}
+{\pard \ql \f0 \sa0 \li360 \fi-360 \bullet \tx360\tab a) The work must carry prominent notices stating that you modified it, and giving a relevant date.\par}
+{\pard \ql \f0 \sa0 \li360 \fi-360 \bullet \tx360\tab b) The work must carry prominent notices stating that it is released under this License and any conditions added under section 7. This requirement modifies the requirement in section 4 to \u8220"keep intact all notices\u8221".\par}
+{\pard \ql \f0 \sa0 \li360 \fi-360 \bullet \tx360\tab c) You must license the entire work, as a whole, under this License to anyone who comes into possession of a copy. This License will therefore apply, along with any applicable section 7 additional terms, to the whole of the work, and all its parts, regardless of how they are packaged. This License gives no permission to license the work in any other way, but it does not invalidate such permission if you have separately received it.\par}
+{\pard \ql \f0 \sa0 \li360 \fi-360 \bullet \tx360\tab d) If the work has interactive user interfaces, each must display Appropriate Legal Notices; however, if the Program has interactive interfaces that do not display Appropriate Legal Notices, your work need not make them do so.\sa180\par}
+{\pard \ql \f0 \sa180 \li0 \fi0 A compilation of a covered work with other separate and independent works, which are not by their nature extensions of the covered work, and which are not combined with it such as to form a larger program, in or on a volume of a storage or distribution medium, is called an \u8220"aggregate\u8221" if the compilation and its resulting copyright are not used to limit the access or legal rights of the compilation's users beyond what the individual works permit. Inclusion of a covered work in an aggregate does not cause this License to apply to the other parts of the aggregate.\par}
+{\pard \ql \f0 \sa180 \li0 \fi0 \b \fs24 6. Conveying Non-Source Forms.\par}
+{\pard \ql \f0 \sa180 \li0 \fi0 You may convey a covered work in object code form under the terms of sections 4 and 5, provided that you also convey the machine-readable Corresponding Source under the terms of this License, in one of these ways:\par}
+{\pard \ql \f0 \sa0 \li360 \fi-360 \bullet \tx360\tab a) Convey the object code in, or embodied in, a physical product (including a physical distribution medium), accompanied by the Corresponding Source fixed on a durable physical medium customarily used for software interchange.\par}
+{\pard \ql \f0 \sa0 \li360 \fi-360 \bullet \tx360\tab b) Convey the object code in, or embodied in, a physical product (including a physical distribution medium), accompanied by a written offer, valid for at least three years and valid for as long as you offer spare parts or customer support for that product model, to give anyone who possesses the object code either (1) a copy of the Corresponding Source for all the software in the product that is covered by this License, on a durable physical medium customarily used for software interchange, for a price no more than your reasonable cost of physically performing this conveying of source, or (2) access to copy the Corresponding Source from a network server at no charge.\par}
+{\pard \ql \f0 \sa0 \li360 \fi-360 \bullet \tx360\tab c) Convey individual copies of the object code with a copy of the written offer to provide the Corresponding Source. This alternative is allowed only occasionally and noncommercially, and only if you received the object code with such an offer, in accord with subsection 6b.\par}
+{\pard \ql \f0 \sa0 \li360 \fi-360 \bullet \tx360\tab d) Convey the object code by offering access from a designated place (gratis or for a charge), and offer equivalent access to the Corresponding Source in the same way through the same place at no further charge. You need not require recipients to copy the Corresponding Source along with the object code. If the place to copy the object code is a network server, the Corresponding Source may be on a different server (operated by you or a third party) that supports equivalent copying facilities, provided you maintain clear directions next to the object code saying where to find the Corresponding Source. Regardless of what server hosts the Corresponding Source, you remain obligated to ensure that it is available for as long as needed to satisfy these requirements.\par}
+{\pard \ql \f0 \sa0 \li360 \fi-360 \bullet \tx360\tab e) Convey the object code using peer-to-peer transmission, provided you inform other peers where the object code and Corresponding Source of the work are being offered to the general public at no charge under subsection 6d.\sa180\par}
+{\pard \ql \f0 \sa180 \li0 \fi0 A separable portion of the object code, whose source code is excluded from the Corresponding Source as a System Library, need not be included in conveying the object code work.\par}
+{\pard \ql \f0 \sa180 \li0 \fi0 A \u8220"User Product\u8221" is either (1) a \u8220"consumer product\u8221", which means any tangible personal property which is normally used for personal, family, or household purposes, or (2) anything designed or sold for incorporation into a dwelling. In determining whether a product is a consumer product, doubtful cases shall be resolved in favor of coverage. For a particular product received by a particular user, \u8220"normally used\u8221" refers to a typical or common use of that class of product, regardless of the status of the particular user or of the way in which the particular user actually uses, or expects or is expected to use, the product. A product is a consumer product regardless of whether the product has substantial commercial, industrial or non-consumer uses, unless such uses represent the only significant mode of use of the product.\par}
+{\pard \ql \f0 \sa180 \li0 \fi0 \u8220"Installation Information\u8221" for a User Product means any methods, procedures, authorization keys, or other information required to install and execute modified versions of a covered work in that User Product from a modified version of its Corresponding Source. The information must suffice to ensure that the continued functioning of the modified object code is in no case prevented or interfered with solely because modification has been made.\par}
+{\pard \ql \f0 \sa180 \li0 \fi0 If you convey an object code work under this section in, or with, or specifically for use in, a User Product, and the conveying occurs as part of a transaction in which the right of possession and use of the User Product is transferred to the recipient in perpetuity or for a fixed term (regardless of how the transaction is characterized), the Corresponding Source conveyed under this section must be accompanied by the Installation Information. But this requirement does not apply if neither you nor any third party retains the ability to install modified object code on the User Product (for example, the work has been installed in ROM).\par}
+{\pard \ql \f0 \sa180 \li0 \fi0 The requirement to provide Installation Information does not include a requirement to continue to provide support service, warranty, or updates for a work that has been modified or installed by the recipient, or for the User Product in which it has been modified or installed. Access to a network may be denied when the modification itself materially and adversely affects the operation of the network or violates the rules and protocols for communication across the network.\par}
+{\pard \ql \f0 \sa180 \li0 \fi0 Corresponding Source conveyed, and Installation Information provided, in accord with this section must be in a format that is publicly documented (and with an implementation available to the public in source code form), and must require no special password or key for unpacking, reading or copying.\par}
+{\pard \ql \f0 \sa180 \li0 \fi0 \b \fs24 7. Additional Terms.\par}
+{\pard \ql \f0 \sa180 \li0 \fi0 \u8220"Additional permissions\u8221" are terms that supplement the terms of this License by making exceptions from one or more of its conditions. Additional permissions that are applicable to the entire Program shall be treated as though they were included in this License, to the extent that they are valid under applicable law. If additional permissions apply only to part of the Program, that part may be used separately under those permissions, but the entire Program remains governed by this License without regard to the additional permissions.\par}
+{\pard \ql \f0 \sa180 \li0 \fi0 When you convey a copy of a covered work, you may at your option remove any additional permissions from that copy, or from any part of it. (Additional permissions may be written to require their own removal in certain cases when you modify the work.) You may place additional permissions on material, added by you to a covered work, for which you have or can give appropriate copyright permission.\par}
+{\pard \ql \f0 \sa180 \li0 \fi0 Notwithstanding any other provision of this License, for material you add to a covered work, you may (if authorized by the copyright holders of that material) supplement the terms of this License with terms:\par}
+{\pard \ql \f0 \sa0 \li360 \fi-360 \bullet \tx360\tab a) Disclaiming warranty or limiting liability differently from the terms of sections 15 and 16 of this License; or\par}
+{\pard \ql \f0 \sa0 \li360 \fi-360 \bullet \tx360\tab b) Requiring preservation of specified reasonable legal notices or author attributions in that material or in the Appropriate Legal Notices displayed by works containing it; or\par}
+{\pard \ql \f0 \sa0 \li360 \fi-360 \bullet \tx360\tab c) Prohibiting misrepresentation of the origin of that material, or requiring that modified versions of such material be marked in reasonable ways as different from the original version; or\par}
+{\pard \ql \f0 \sa0 \li360 \fi-360 \bullet \tx360\tab d) Limiting the use for publicity purposes of names of licensors or authors of the material; or\par}
+{\pard \ql \f0 \sa0 \li360 \fi-360 \bullet \tx360\tab e) Declining to grant rights under trademark law for use of some trade names, trademarks, or service marks; or\par}
+{\pard \ql \f0 \sa0 \li360 \fi-360 \bullet \tx360\tab f) Requiring indemnification of licensors and authors of that material by anyone who conveys the material (or modified versions of it) with contractual assumptions of liability to the recipient, for any liability that these contractual assumptions directly impose on those licensors and authors.\sa180\par}
+{\pard \ql \f0 \sa180 \li0 \fi0 All other non-permissive additional terms are considered \u8220"further restrictions\u8221" within the meaning of section 10. If the Program as you received it, or any part of it, contains a notice stating that it is governed by this License along with a term that is a further restriction, you may remove that term. If a license document contains a further restriction but permits relicensing or conveying under this License, you may add to a covered work material governed by the terms of that license document, provided that the further restriction does not survive such relicensing or conveying.\par}
+{\pard \ql \f0 \sa180 \li0 \fi0 If you add terms to a covered work in accord with this section, you must place, in the relevant source files, a statement of the additional terms that apply to those files, or a notice indicating where to find the applicable terms.\par}
+{\pard \ql \f0 \sa180 \li0 \fi0 Additional terms, permissive or non-permissive, may be stated in the form of a separately written license, or stated as exceptions; the above requirements apply either way.\par}
+{\pard \ql \f0 \sa180 \li0 \fi0 \b \fs24 8. Termination.\par}
+{\pard \ql \f0 \sa180 \li0 \fi0 You may not propagate or modify a covered work except as expressly provided under this License. Any attempt otherwise to propagate or modify it is void, and will automatically terminate your rights under this License (including any patent licenses granted under the third paragraph of section 11).\par}
+{\pard \ql \f0 \sa180 \li0 \fi0 However, if you cease all violation of this License, then your license from a particular copyright holder is reinstated (a) provisionally, unless and until the copyright holder explicitly and finally terminates your license, and (b) permanently, if the copyright holder fails to notify you of the violation by some reasonable means prior to 60 days after the cessation.\par}
+{\pard \ql \f0 \sa180 \li0 \fi0 Moreover, your license from a particular copyright holder is reinstated permanently if the copyright holder notifies you of the violation by some reasonable means, this is the first time you have received notice of violation of this License (for any work) from that copyright holder, and you cure the violation prior to 30 days after your receipt of the notice.\par}
+{\pard \ql \f0 \sa180 \li0 \fi0 Termination of your rights under this section does not terminate the licenses of parties who have received copies or rights from you under this License. If your rights have been terminated and not permanently reinstated, you do not qualify to receive new licenses for the same material under section 10.\par}
+{\pard \ql \f0 \sa180 \li0 \fi0 \b \fs24 9. Acceptance Not Required for Having Copies.\par}
+{\pard \ql \f0 \sa180 \li0 \fi0 You are not required to accept this License in order to receive or run a copy of the Program. Ancillary propagation of a covered work occurring solely as a consequence of using peer-to-peer transmission to receive a copy likewise does not require acceptance. However, nothing other than this License grants you permission to propagate or modify any covered work. These actions infringe copyright if you do not accept this License. Therefore, by modifying or propagating a covered work, you indicate your acceptance of this License to do so.\par}
+{\pard \ql \f0 \sa180 \li0 \fi0 \b \fs24 10. Automatic Licensing of Downstream Recipients.\par}
+{\pard \ql \f0 \sa180 \li0 \fi0 Each time you convey a covered work, the recipient automatically receives a license from the original licensors, to run, modify and propagate that work, subject to this License. You are not responsible for enforcing compliance by third parties with this License.\par}
+{\pard \ql \f0 \sa180 \li0 \fi0 An \u8220"entity transaction\u8221" is a transaction transferring control of an organization, or substantially all assets of one, or subdividing an organization, or merging organizations. If propagation of a covered work results from an entity transaction, each party to that transaction who receives a copy of the work also receives whatever licenses to the work the party's predecessor in interest had or could give under the previous paragraph, plus a right to possession of the Corresponding Source of the work from the predecessor in interest, if the predecessor has it or can get it with reasonable efforts.\par}
+{\pard \ql \f0 \sa180 \li0 \fi0 You may not impose any further restrictions on the exercise of the rights granted or affirmed under this License. For example, you may not impose a license fee, royalty, or other charge for exercise of rights granted under this License, and you may not initiate litigation (including a cross-claim or counterclaim in a lawsuit) alleging that any patent claim is infringed by making, using, selling, offering for sale, or importing the Program or any portion of it.\par}
+{\pard \ql \f0 \sa180 \li0 \fi0 \b \fs24 11. Patents.\par}
+{\pard \ql \f0 \sa180 \li0 \fi0 A \u8220"contributor\u8221" is a copyright holder who authorizes use under this License of the Program or a work on which the Program is based. The work thus licensed is called the contributor's \u8220"contributor version\u8221".\par}
+{\pard \ql \f0 \sa180 \li0 \fi0 A contributor's \u8220"essential patent claims\u8221" are all patent claims owned or controlled by the contributor, whether already acquired or hereafter acquired, that would be infringed by some manner, permitted by this License, of making, using, or selling its contributor version, but do not include claims that would be infringed only as a consequence of further modification of the contributor version. For purposes of this definition, \u8220"control\u8221" includes the right to grant patent sublicenses in a manner consistent with the requirements of this License.\par}
+{\pard \ql \f0 \sa180 \li0 \fi0 Each contributor grants you a non-exclusive, worldwide, royalty-free patent license under the contributor's essential patent claims, to make, use, sell, offer for sale, import and otherwise run, modify and propagate the contents of its contributor version.\par}
+{\pard \ql \f0 \sa180 \li0 \fi0 In the following three paragraphs, a \u8220"patent license\u8221" is any express agreement or commitment, however denominated, not to enforce a patent (such as an express permission to practice a patent or covenant not to sue for patent infringement). To \u8220"grant\u8221" such a patent license to a party means to make such an agreement or commitment not to enforce a patent against the party.\par}
+{\pard \ql \f0 \sa180 \li0 \fi0 If you convey a covered work, knowingly relying on a patent license, and the Corresponding Source of the work is not available for anyone to copy, free of charge and under the terms of this License, through a publicly available network server or other readily accessible means, then you must either (1) cause the Corresponding Source to be so available, or (2) arrange to deprive yourself of the benefit of the patent license for this particular work, or (3) arrange, in a manner consistent with the requirements of this License, to extend the patent license to downstream recipients. \u8220"Knowingly relying\u8221" means you have actual knowledge that, but for the patent license, your conveying the covered work in a country, or your recipient's use of the covered work in a country, would infringe one or more identifiable patents in that country that you have reason to believe are valid.\par}
+{\pard \ql \f0 \sa180 \li0 \fi0 If, pursuant to or in connection with a single transaction or arrangement, you convey, or propagate by procuring conveyance of, a covered work, and grant a patent license to some of the parties receiving the covered work authorizing them to use, propagate, modify or convey a specific copy of the covered work, then the patent license you grant is automatically extended to all recipients of the covered work and works based on it.\par}
+{\pard \ql \f0 \sa180 \li0 \fi0 A patent license is \u8220"discriminatory\u8221" if it does not include within the scope of its coverage, prohibits the exercise of, or is conditioned on the non-exercise of one or more of the rights that are specifically granted under this License. You may not convey a covered work if you are a party to an arrangement with a third party that is in the business of distributing software, under which you make payment to the third party based on the extent of your activity of conveying the work, and under which the third party grants, to any of the parties who would receive the covered work from you, a discriminatory patent license (a) in connection with copies of the covered work conveyed by you (or copies made from those copies), or (b) primarily for and in connection with specific products or compilations that contain the covered work, unless you entered into that arrangement, or that patent license was granted, prior to 28 March 2007.\par}
+{\pard \ql \f0 \sa180 \li0 \fi0 Nothing in this License shall be construed as excluding or limiting any implied license or other defenses to infringement that may otherwise be available to you under applicable patent law.\par}
+{\pard \ql \f0 \sa180 \li0 \fi0 \b \fs24 12. No Surrender of Others' Freedom.\par}
+{\pard \ql \f0 \sa180 \li0 \fi0 If conditions are imposed on you (whether by court order, agreement or otherwise) that contradict the conditions of this License, they do not excuse you from the conditions of this License. If you cannot convey a covered work so as to satisfy simultaneously your obligations under this License and any other pertinent obligations, then as a consequence you may not convey it at all. For example, if you agree to terms that obligate you to collect a royalty for further conveying from those to whom you convey the Program, the only way you could satisfy both those terms and this License would be to refrain entirely from conveying the Program.\par}
+{\pard \ql \f0 \sa180 \li0 \fi0 \b \fs24 13. Use with the GNU Affero General Public License.\par}
+{\pard \ql \f0 \sa180 \li0 \fi0 Notwithstanding any other provision of this License, you have permission to link or combine any covered work with a work licensed under version 3 of the GNU Affero General Public License into a single combined work, and to convey the resulting work. The terms of this License will continue to apply to the part which is the covered work, but the special requirements of the GNU Affero General Public License, section 13, concerning interaction through a network will apply to the combination as such.\par}
+{\pard \ql \f0 \sa180 \li0 \fi0 \b \fs24 14. Revised Versions of this License.\par}
+{\pard \ql \f0 \sa180 \li0 \fi0 The Free Software Foundation may publish revised and/or new versions of the GNU General Public License from time to time. Such new versions will be similar in spirit to the present version, but may differ in detail to address new problems or concerns.\par}
+{\pard \ql \f0 \sa180 \li0 \fi0 Each version is given a distinguishing version number. If the Program specifies that a certain numbered version of the GNU General Public License \u8220"or any later version\u8221" applies to it, you have the option of following the terms and conditions either of that numbered version or of any later version published by the Free Software Foundation. If the Program does not specify a version number of the GNU General Public License, you may choose any version ever published by the Free Software Foundation.\par}
+{\pard \ql \f0 \sa180 \li0 \fi0 If the Program specifies that a proxy can decide which future versions of the GNU General Public License can be used, that proxy's public statement of acceptance of a version permanently authorizes you to choose that version for the Program.\par}
+{\pard \ql \f0 \sa180 \li0 \fi0 Later license versions may give you additional or different permissions. However, no additional obligations are imposed on any author or copyright holder as a result of your choosing to follow a later version.\par}
+{\pard \ql \f0 \sa180 \li0 \fi0 \b \fs24 15. Disclaimer of Warranty.\par}
+{\pard \ql \f0 \sa180 \li0 \fi0 THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM \u8220"AS IS\u8221" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.\par}
+{\pard \ql \f0 \sa180 \li0 \fi0 \b \fs24 16. Limitation of Liability.\par}
+{\pard \ql \f0 \sa180 \li0 \fi0 IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.\par}
+{\pard \ql \f0 \sa180 \li0 \fi0 \b \fs24 17. Interpretation of Sections 15 and 16.\par}
+{\pard \ql \f0 \sa180 \li0 \fi0 If the disclaimer of warranty and limitation of liability provided above cannot be given local legal effect according to their terms, reviewing courts shall apply local law that most closely approximates an absolute waiver of all civil liability in connection with the Program, unless a warranty or assumption of liability accompanies a copy of the Program in return for a fee.\par}
+{\pard \ql \f0 \sa180 \li0 \fi0 END OF TERMS AND CONDITIONS\par}
+{\pard \ql \f0 \sa180 \li0 \fi0 \b \fs28 How to Apply These Terms to Your New Programs\par}
+{\pard \ql \f0 \sa180 \li0 \fi0 If you develop a new program, and you want it to be of the greatest possible use to the public, the best way to achieve this is to make it free software which everyone can redistribute and change under these terms.\par}
+{\pard \ql \f0 \sa180 \li0 \fi0 To do so, attach the following notices to the program. It is safest to attach them to the start of each source file to most effectively state the exclusion of warranty; and each file should have at least the \u8220"copyright\u8221" line and a pointer to where the full notice is found.\par}
+{\pard \ql \f0 \sa180 \li0 \fi0 \f1     <one line to give the program's name and a brief idea of what it does.>\line
+    Copyright (C) <year>  <name of author>\line
+\line
+    This program is free software: you can redistribute it and/or modify\line
+    it under the terms of the GNU General Public License as published by\line
+    the Free Software Foundation, either version 3 of the License, or\line
+    (at your option) any later version.\line
+\line
+    This program is distributed in the hope that it will be useful,\line
+    but WITHOUT ANY WARRANTY; without even the implied warranty of\line
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\line
+    GNU General Public License for more details.\line
+\line
+    You should have received a copy of the GNU General Public License\line
+    along with this program.  If not, see <https://www.gnu.org/licenses/>.\par}
+{\pard \ql \f0 \sa180 \li0 \fi0 Also add information on how to contact you by electronic and paper mail.\par}
+{\pard \ql \f0 \sa180 \li0 \fi0 If the program does terminal interaction, make it output a short notice like this when it starts in an interactive mode:\par}
+{\pard \ql \f0 \sa180 \li0 \fi0 \f1     <program>  Copyright (C) <year>  <name of author>\line
+    This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.\line
+    This is free software, and you are welcome to redistribute it\line
+    under certain conditions; type `show c' for details.\par}
+{\pard \ql \f0 \sa180 \li0 \fi0 The hypothetical commands `show w' and `show c' should show the appropriate parts of the General Public License. Of course, your program's commands might be different; for a GUI interface, you would use an \u8220"about box\u8221".\par}
+{\pard \ql \f0 \sa180 \li0 \fi0 You should also get your employer (if you work as a programmer) or school, if any, to sign a \u8220"copyright disclaimer\u8221" for the program, if necessary. For more information on this, and how to apply and follow the GNU GPL, see <{\field{\*\fldinst{HYPERLINK "https://www.gnu.org/licenses/"}}{\fldrslt{\ul
+https://www.gnu.org/licenses/
+}}}
+>.\par}
+{\pard \ql \f0 \sa180 \li0 \fi0 The GNU General Public License does not permit incorporating your program into proprietary programs. If your program is a subroutine library, you may consider it more useful to permit linking proprietary applications with the library. If this is what you want to do, use the GNU Lesser General Public License instead of this License. But first, please read <{\field{\*\fldinst{HYPERLINK "https://www.gnu.org/licenses/why-not-lgpl.html"}}{\fldrslt{\ul
+https://www.gnu.org/licenses/why-not-lgpl.html
+}}}
+>.\par}
+}

rsrc/resources.qrc

@@ -1,163 +1,167 @@
 <RCC>
-	<qresource prefix="/icons">
-		<file>icons/Address Book-01.png</file>
-		<file>icons/Adobe Illustrator CS3 Document-01.png</file>
-		<file>icons/Adobe PDF Document-01.png</file>
-		<file>icons/Adobe Photoshop CS3 Document-01.png</file>
-		<file>icons/Battery-01.png</file>
-		<file>icons/Binoculars-01.png</file>
-		<file>icons/Book-01.png</file>
-		<file>icons/Briefcase-01.png</file>
-		<file>icons/Button Add-01.png</file>
-		<file>icons/Button Blank Blue-01.png</file>
-		<file>icons/Button Blank Gray-01.png</file>
-		<file>icons/Button Blank Green-01.png</file>
-		<file>icons/Button Blank Red-01.png</file>
-		<file>icons/Button Blank Yellow-01.png</file>
-		<file>icons/Button Cancel-01.png</file>
-		<file>icons/Button Close-01.png</file>
-		<file>icons/Button Delete-01.png</file>
-		<file>icons/Button Download-01.png</file>
-		<file>icons/Button Favorite-01.png</file>
-		<file>icons/Button Forward-01.png</file>
-		<file>icons/Button Help-01.png</file>
-		<file>icons/Button Info-01.png</file>
-		<file>icons/Button Log Off-01.png</file>
-		<file>icons/Button Next-01.png</file>
-		<file>icons/Button Pause-01.png</file>
-		<file>icons/Button Play-01.png</file>
-		<file>icons/Button Previous-01.png</file>
-		<file>icons/Button Refresh-01.png</file>
-		<file>icons/Button Reload-01.png</file>
-		<file>icons/Button Reminder-01.png</file>
-		<file>icons/Button Rewind-01.png</file>
-		<file>icons/Button Talk Balloon-01.png</file>
-		<file>icons/Button Turn Off-01.png</file>
-		<file>icons/Button Turn On-01.png</file>
-		<file>icons/Button Upload-01.png</file>
-		<file>icons/Button Warning-01.png</file>
-		<file>icons/Calculator-01.png</file>
-		<file>icons/Calendar Blue-01.png</file>
-		<file>icons/Calendar Green-01.png</file>
-		<file>icons/Calendar Red-01.png</file>
-		<file>icons/Clipboard-01.png</file>
-		<file>icons/Clipboard Paste-01.png</file>
-		<file>icons/Clock-01.png</file>
-		<file>icons/Coin-01.png</file>
-		<file>icons/Compressed File RAR-01.png</file>
-		<file>icons/Compressed File SIT-01.png</file>
-		<file>icons/Compressed File Zip-01.png</file>
-		<file>icons/Computer Monitor-01.png</file>
-		<file>icons/Computer Network-01.png</file>
-		<file>icons/Document-01.png</file>
-		<file>icons/Document Attach-01.png</file>
-		<file>icons/Document Blank-01.png</file>
-		<file>icons/Document Chart-01.png</file>
-		<file>icons/Document Copy-01.png</file>
-		<file>icons/Document Flow Chart-01.png</file>
-		<file>icons/Document Gant Chart-01.png</file>
-		<file>icons/Document Help-01.png</file>
-		<file>icons/Document Line Chart-01.png</file>
-		<file>icons/Document Microsoft Excel-01.png</file>
-		<file>icons/Document Microsoft PowerPoint-01.png</file>
-		<file>icons/Document Microsoft Word-01.png</file>
-		<file>icons/Document Organization Chart-01.png</file>
-		<file>icons/Document Preview-01.png</file>
-		<file>icons/Document-Revert-icon.png</file>
-		<file>icons/Document Text-01.png</file>
-		<file>icons/Edit Document-01.png</file>
-		<file>icons/Email-01.png</file>
-		<file>icons/Email Attachment-01.png</file>
-		<file>icons/Email Delete-01.png</file>
-		<file>icons/Email Download-01.png</file>
-		<file>icons/Email Forward-01.png</file>
-		<file>icons/Email Inbox-01.png</file>
-		<file>icons/Email Reply-01.png</file>
-		<file>icons/File Audio-01.png</file>
-		<file>icons/File Audio AIFF-01.png</file>
-		<file>icons/File Audio MP3-01.png</file>
-		<file>icons/File Audio WAV-01.png</file>
-		<file>icons/File Audio WMA-01.png</file>
-		<file>icons/File Delete-01.png</file>
-		<file>icons/File History-01.png</file>
-		<file>icons/File New-01.png</file>
-		<file>icons/File Open-01.png</file>
-		<file>icons/File Video 3GP-01.png</file>
-		<file>icons/File Video-01.png</file>
-		<file>icons/File Video AVI-01.png</file>
-		<file>icons/File Video MOV-01.png</file>
-		<file>icons/File Video MPEG-01.png</file>
-		<file>icons/File Video WMV-01.png</file>
-		<file>icons/Folder-01.png</file>
-		<file>icons/Folder Add-01.png</file>
-		<file>icons/Folder Compressed-01.png</file>
-		<file>icons/Folder Delete-01.png</file>
-		<file>icons/Folder Explorer-01.png</file>
-		<file>icons/Folder Generic Blue-01.png</file>
-		<file>icons/Folder Generic Green-01.png</file>
-		<file>icons/Folder Generic Red-01.png</file>
-		<file>icons/Folder Generic Silver-01.png</file>
-		<file>icons/Folder Open-01.png</file>
-		<file>icons/Folder RAR-01.png</file>
-		<file>icons/Games-01.png</file>
-		<file>icons/Gear-01.png</file>
-		<file>icons/Highlighter Blue-01.png</file>
-		<file>icons/Highlighter Green-01.png</file>
-		<file>icons/Highlighter Yellow-01.png</file>
-		<file>icons/Image BMP-01.png</file>
-		<file>icons/Image GIF-01.png</file>
-		<file>icons/Image JPEG-01.png</file>
-		<file>icons/Image PNG-01.png</file>
-		<file>icons/Image TIFF-01.png</file>
-		<file>icons/Lock Lock-01.png</file>
-		<file>icons/Lock Unlock-01.png</file>
-		<file>icons/My Documents-01.png</file>
-		<file>icons/My Ebooks-01.png</file>
-		<file>icons/My Music-01.png</file>
-		<file>icons/My Pictures.png</file>
-		<file>icons/My Videos-01.png</file>
-		<file>icons/My Websites-01.png</file>
-		<file>icons/Network Firewall-01.png</file>
-		<file>icons/Network MAC-01.png</file>
-		<file>icons/Network PC-01.png</file>
-		<file>icons/Network Refresh-01.png</file>
-		<file>icons/Pen Blue-01.png</file>
-		<file>icons/Pen Green-01.png</file>
-		<file>icons/Pen Red-01.png</file>
-		<file>icons/Save-01.png</file>
-		<file>icons/Text Edit.png</file>
-		<file>icons/USB-01.png</file>
-		<file>icons/User Administrator Blue-01.png</file>
-		<file>icons/User Administrator Green-01.png</file>
-		<file>icons/User Administrator Red-01.png</file>
-		<file>icons/User Chat-01.png</file>
-		<file>icons/User Clients-01.png</file>
-		<file>icons/User Coat Blue-01.png</file>
-		<file>icons/User Coat Green-01.png</file>
-		<file>icons/User Coat Red-01.png</file>
-		<file>icons/User Executive Blue-01.png</file>
-		<file>icons/User Executive Green-01.png</file>
-		<file>icons/User Executive Red-01.png</file>
-		<file>icons/User Group-01.png</file>
-		<file>icons/User Preppy Blue-01.png</file>
-		<file>icons/User Preppy Green-01.png</file>
-		<file>icons/User Preppy Red-01.png</file>
-		<file>icons/Web HTML-01.png</file>
-		<file>icons/Web XML-01.png</file>
-		<file>icons/Window-01.png</file>
-		<file>icons/Window Refresh-01.png</file>
-		<file>icons/Windows-01.png</file>
-		<file>icons/Windows Cascade-01.png</file>
-		<file>icons/Zoom-01.png</file>
-		<file>icons/Zoom In-01.png</file>
-		<file>icons/Zoom Out-01.png</file>
-	</qresource>
-	<qresource prefix="/intl">
-		<file>intl/el_GR.qm</file>
-		<file>intl/de_DE.qm</file>
-		<file>intl/es_ES.qm</file>
-		<file>intl/fr_FR.qm</file>
-		<file>intl/ru_RU.qm</file>
-		<file>intl/pt_PT.qm</file>
-	</qresource>
+    <qresource prefix="/icons">
+        <file>icons/Address Book-01.png</file>
+        <file>icons/Adobe Illustrator CS3 Document-01.png</file>
+        <file>icons/Adobe PDF Document-01.png</file>
+        <file>icons/Adobe Photoshop CS3 Document-01.png</file>
+        <file alias="icon-application">icons/Battery-01.png</file>
+        <file>icons/Binoculars-01.png</file>
+        <file alias="icon-item-tag">icons/Book-01.png</file>
+        <file>icons/Briefcase-01.png</file>
+        <file alias="icon-item-added">icons/Button Add-01.png</file>
+        <file>icons/Button Blank Blue-01.png</file>
+        <file alias="icon-item-unknown">icons/Button Blank Gray-01.png</file>
+        <file alias="icon-item-unchanged">icons/Button Blank Green-01.png</file>
+        <file alias="icon-item-conflicted">icons/Button Blank Red-01.png</file>
+        <file alias="icon-item-edited">icons/Button Blank Yellow-01.png</file>
+        <file>icons/Button Cancel-01.png</file>
+        <file alias="icon-item-deleted">icons/Button Close-01.png</file>
+        <file alias="icon-action-tag-delete">icons/Button Close-01.png</file>
+        <file alias="icon-action-stop">icons/Button Close-01.png</file>
+        <file>icons/Button Delete-01.png</file>
+        <file alias="icon-action-pull">icons/Button Download-01.png</file>
+        <file>icons/Button Favorite-01.png</file>
+        <file>icons/Button Forward-01.png</file>
+        <file alias="icon-item-missing">icons/Button Help-01.png</file>
+        <file>icons/Button Info-01.png</file>
+        <file>icons/Button Log Off-01.png</file>
+        <file alias="icon-action-next">icons/Button Next-01.png</file>
+        <file>icons/Button Pause-01.png</file>
+        <file alias="icon-action-update">icons/Button Play-01.png</file>
+        <file alias="icon-action-previous">icons/Button Previous-01.png</file>
+        <file alias="icon-action-refresh">icons/Button Refresh-01.png</file>
+        <file alias="icon-action-undo">icons/Button Reload-01.png</file>
+        <file alias="icon-item-renamed">icons/Button Reload-01.png</file>
+        <file>icons/Button Reminder-01.png</file>
+        <file alias="icon-action-revert">icons/Button Rewind-01.png</file>
+        <file>icons/Button Talk Balloon-01.png</file>
+        <file alias="icon-action-quit">icons/Button Turn Off-01.png</file>
+        <file>icons/Button Turn On-01.png</file>
+        <file alias="icon-action-push">icons/Button Upload-01.png</file>
+        <file>icons/Button Warning-01.png</file>
+        <file>icons/Calculator-01.png</file>
+        <file>icons/Calendar Blue-01.png</file>
+        <file>icons/Calendar Green-01.png</file>
+        <file>icons/Calendar Red-01.png</file>
+        <file>icons/Clipboard-01.png</file>
+        <file>icons/Clipboard Paste-01.png</file>
+        <file alias="icon-action-timeline">icons/Clock-01.png</file>
+        <file>icons/Coin-01.png</file>
+        <file>icons/Compressed File RAR-01.png</file>
+        <file>icons/Compressed File SIT-01.png</file>
+        <file>icons/Compressed File Zip-01.png</file>
+        <file>icons/Computer Monitor-01.png</file>
+        <file>icons/Computer Network-01.png</file>
+        <file alias="icon-item-file">icons/Document-01.png</file>
+        <file>icons/Document Attach-01.png</file>
+        <file alias="icon-action-repo-new">icons/Document Blank-01.png</file>
+        <file>icons/Document Chart-01.png</file>
+        <file alias="icon-item-diff">icons/Document Copy-01.png</file>
+        <file alias="icon-action-merge">icons/Document Flow Chart-01.png</file>
+        <file>icons/Document Gant Chart-01.png</file>
+        <file>icons/Document Help-01.png</file>
+        <file>icons/Document Line Chart-01.png</file>
+        <file>icons/Document Microsoft Excel-01.png</file>
+        <file>icons/Document Microsoft PowerPoint-01.png</file>
+        <file>icons/Document Microsoft Word-01.png</file>
+        <file alias="icon-item-branch">icons/Document Organization Chart-01.png</file>
+        <file>icons/Document Preview-01.png</file>
+        <file alias="icon-item-revert">icons/Document-Revert-icon.png</file>
+        <file>icons/Document Text-01.png</file>
+        <file>icons/Edit Document-01.png</file>
+        <file>icons/Email-01.png</file>
+        <file>icons/Email Attachment-01.png</file>
+        <file>icons/Email Delete-01.png</file>
+        <file>icons/Email Download-01.png</file>
+        <file>icons/Email Forward-01.png</file>
+        <file>icons/Email Inbox-01.png</file>
+        <file>icons/Email Reply-01.png</file>
+        <file>icons/File Audio-01.png</file>
+        <file>icons/File Audio AIFF-01.png</file>
+        <file>icons/File Audio MP3-01.png</file>
+        <file>icons/File Audio WAV-01.png</file>
+        <file>icons/File Audio WMA-01.png</file>
+        <file alias="icon-item-delete">icons/File Delete-01.png</file>
+        <file alias="icon-item-history">icons/File History-01.png</file>
+        <file alias="icon-item-add">icons/File New-01.png</file>
+        <file alias="icon-item-rename">icons/File Open-01.png</file>
+        <file>icons/File Video 3GP-01.png</file>
+        <file>icons/File Video-01.png</file>
+        <file>icons/File Video AVI-01.png</file>
+        <file>icons/File Video MOV-01.png</file>
+        <file>icons/File Video MPEG-01.png</file>
+        <file>icons/File Video WMV-01.png</file>
+        <file alias="icon-item-folder">icons/Folder-01.png</file>
+        <file alias="icon-action-stash-new">icons/Folder Add-01.png</file>
+        <file alias="icon-action-stash-apply">icons/Folder Compressed-01.png</file>
+        <file alias="icon-action-stash-delete">icons/Folder Delete-01.png</file>
+        <file alias="icon-action-stash-diff">icons/Folder Explorer-01.png</file>
+        <file alias="icon-action-folder-explore">icons/Folder Explorer-01.png</file>
+        <file>icons/Folder Generic Blue-01.png</file>
+        <file alias="icon-item-folder-unchanged">icons/Folder Generic Green-01.png</file>
+        <file alias="icon-item-folder-modified">icons/Folder Generic Red-01.png</file>
+        <file alias="icon-item-folder-unknown">icons/Folder Generic Silver-01.png</file>
+        <file alias="icon-action-folder-rename">icons/Folder Open-01.png</file>
+        <file>icons/Folder RAR-01.png</file>
+        <file>icons/Games-01.png</file>
+        <file alias="icon-action-settings">icons/Gear-01.png</file>
+        <file>icons/Highlighter Blue-01.png</file>
+        <file>icons/Highlighter Green-01.png</file>
+        <file alias="icon-action-tag-new">icons/Highlighter Yellow-01.png</file>
+        <file>icons/Image BMP-01.png</file>
+        <file>icons/Image GIF-01.png</file>
+        <file>icons/Image JPEG-01.png</file>
+        <file>icons/Image PNG-01.png</file>
+        <file>icons/Image TIFF-01.png</file>
+        <file>icons/Lock Lock-01.png</file>
+        <file>icons/Lock Unlock-01.png</file>
+        <file alias="icon-action-repo-open">icons/My Documents-01.png</file>
+        <file>icons/My Ebooks-01.png</file>
+        <file>icons/My Music-01.png</file>
+        <file>icons/My Pictures.png</file>
+        <file>icons/My Videos-01.png</file>
+        <file alias="icon-action-repo-clone">icons/My Websites-01.png</file>
+        <file>icons/Network Firewall-01.png</file>
+        <file alias="icon-webview">icons/Network MAC-01.png</file>
+        <file alias="icon-item-remote">icons/Network PC-01.png</file>
+        <file>icons/Network Refresh-01.png</file>
+        <file>icons/Pen Blue-01.png</file>
+        <file>icons/Pen Green-01.png</file>
+        <file>icons/Pen Red-01.png</file>
+        <file alias="icon-action-commit">icons/Save-01.png</file>
+        <file alias="icon-clear-log">icons/Text Edit.png</file>
+        <file>icons/USB-01.png</file>
+        <file>icons/User Administrator Blue-01.png</file>
+        <file>icons/User Administrator Green-01.png</file>
+        <file>icons/User Administrator Red-01.png</file>
+        <file>icons/User Chat-01.png</file>
+        <file>icons/User Clients-01.png</file>
+        <file>icons/User Coat Blue-01.png</file>
+        <file>icons/User Coat Green-01.png</file>
+        <file>icons/User Coat Red-01.png</file>
+        <file>icons/User Executive Blue-01.png</file>
+        <file>icons/User Executive Green-01.png</file>
+        <file>icons/User Executive Red-01.png</file>
+        <file>icons/User Group-01.png</file>
+        <file>icons/User Preppy Blue-01.png</file>
+        <file>icons/User Preppy Green-01.png</file>
+        <file>icons/User Preppy Red-01.png</file>
+        <file>icons/Web HTML-01.png</file>
+        <file>icons/Web XML-01.png</file>
+        <file>icons/Window-01.png</file>
+        <file>icons/Window Refresh-01.png</file>
+        <file>icons/Windows-01.png</file>
+        <file>icons/Windows Cascade-01.png</file>
+        <file>icons/Zoom-01.png</file>
+        <file>icons/Zoom In-01.png</file>
+        <file>icons/Zoom Out-01.png</file>
+        <file alias="icon-item-addremove">icons/File Refresh-01.png</file>
+    </qresource>
+    <qresource prefix="/docs">
+        <file>docs/Translators.txt</file>
+        <file>docs/Licenses.txt</file>
+    </qresource>
+    <qresource prefix="/version">
+        <file alias="manifest">../manifest.uuid</file>
+    </qresource>
 </RCC>

src/AboutDialog.cpp

@@ -0,0 +1,56 @@
+#include "AboutDialog.h"
+#include "ui_AboutDialog.h"
+#include <QFile>
+
+AboutDialog::AboutDialog(QWidget *parent, const QString &fossilVersion) : QDialog(parent), ui(new Ui::AboutDialog)
+{
+    ui->setupUi(this);
+    QString banner(QCoreApplication::applicationName() + " " + QCoreApplication::applicationVersion());
+    banner += "\n" + ui->lblBanner->text();
+    banner += "\n<a href=\"https://fuel-scm.org/\">https://fuel-scm.org/</a>";
+    banner = banner.replace("\n", "<br/>");
+    ui->lblBanner->setText(banner);
+    ui->lblBanner->setOpenExternalLinks(true);
+    ui->lblBanner->setTextFormat(Qt::RichText);
+
+    ui->lblQtVersion->setText(tr("QT version %0").arg(QT_VERSION_STR));
+
+    if (!fossilVersion.isEmpty())
+        ui->lblFossilVersion->setText(tr("Fossil version %0").arg(fossilVersion));
+
+    QString revisiontxt;
+    QFile fmanifest(":/version/manifest");
+    if (fmanifest.open(QFile::ReadOnly))
+    {
+        QString revision = QString(fmanifest.readAll()).trimmed();
+        revisiontxt = QString(tr("Fuel revision %0").arg("<a href=\"https://fuel-scm.org/fossil/timeline?c=%0\">%0</a>").arg(revision));
+        ui->lblFuelRevision->setOpenExternalLinks(true);
+        ui->lblFuelRevision->setTextFormat(Qt::RichText);
+        fmanifest.close();
+    }
+    ui->lblFuelRevision->setText(revisiontxt);
+
+    QString additional;
+    QFile ftrans(":/docs/docs/Translators.txt");
+    if (ftrans.open(QFile::ReadOnly))
+    {
+        additional.append(tr("Translations with the help of:") + "\n");
+        additional.append(ftrans.readAll());
+        additional.append("\n\n");
+        ftrans.close();
+    }
+
+    QFile flicenses(":/docs/docs/Licenses.txt");
+    if (flicenses.open(QFile::ReadOnly))
+    {
+        additional.append(tr("This sofware uses the following open-source libraries and assets:") + "\n");
+        additional.append(flicenses.readAll());
+        flicenses.close();
+    }
+    ui->txtAdditional->setText(additional);
+}
+
+AboutDialog::~AboutDialog()
+{
+    delete ui;
+}

src/AboutDialog.h

@@ -0,0 +1,23 @@
+#ifndef ABOUTDIALOG_H
+#define ABOUTDIALOG_H
+
+#include <QDialog>
+
+namespace Ui
+{
+class AboutDialog;
+}
+
+class AboutDialog : public QDialog
+{
+    Q_OBJECT
+
+public:
+    explicit AboutDialog(QWidget *parent, const QString &fossilVersion);
+    ~AboutDialog();
+
+private:
+    Ui::AboutDialog *ui;
+};
+
+#endif  // ABOUTDIALOG_H

src/AppSettings.cpp

@@ -0,0 +1,129 @@
+#include "AppSettings.h"
+
+#include <QCoreApplication>
+#include <QDir>
+#include <QResource>
+#include <QSettings>
+#include <QTextCodec>
+#include <QTranslator>
+
+///////////////////////////////////////////////////////////////////////////////
+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));
+
+    // Go into portable mode when explicitly requested or if a config file exists next to the executable
+    QString ini_path = QDir::toNativeSeparators(QCoreApplication::applicationDirPath() + QDir::separator() + QCoreApplication::applicationName() + ".ini");
+    if (portableMode || QFile::exists(ini_path))
+        store = new QSettings(ini_path, QSettings::IniFormat);
+    else
+    {
+        // Linux: ~/.config/organizationName/applicationName.conf
+        // Windows: HKEY_CURRENT_USER\Software\organizationName\Fuel
+        store = new QSettings(QSettings::UserScope, QCoreApplication::organizationName(), QCoreApplication::applicationName());
+    }
+    Q_ASSERT(store);
+
+    if (!HasValue(FUEL_SETTING_FILE_DBLCLICK))
+        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);
+
+    for (int i = 0; i < MAX_CUSTOM_ACTIONS; ++i)
+    {
+        CustomAction action;
+        action.Id = QObject::tr("Custom Action %0").arg(i + 1);
+        customActions.append(action);
+    }
+
+    ApplyEnvironment();
+}
+
+//-----------------------------------------------------------------------------
+Settings::~Settings()
+{
+    Q_ASSERT(store);
+    delete store;
+}
+
+//-----------------------------------------------------------------------------
+void Settings::ApplyEnvironment()
+{
+    QString lang_id = GetValue(FUEL_SETTING_LANGUAGE).toString();
+#if (QT_VERSION < QT_VERSION_CHECK(5, 0, 0))
+    QTextCodec::setCodecForTr(QTextCodec::codecForName("utf8"));
+#endif
+    if (!InstallLang(lang_id))
+        SetValue(FUEL_SETTING_LANGUAGE, "en_US");
+}
+
+//-----------------------------------------------------------------------------
+bool Settings::InstallLang(const QString &langId)
+{
+    if (langId == "en_US")
+    {
+        QCoreApplication::instance()->removeTranslator(&translator);
+        return true;
+    }
+
+    QString locale_path = QString(":intl/%0.qm").arg(langId);
+    if (!translator.load(locale_path))
+        return false;
+
+    Q_ASSERT(!translator.isEmpty());
+    QCoreApplication::instance()->installTranslator(&translator);
+
+    return true;
+}
+
+//-----------------------------------------------------------------------------
+bool Settings::HasValue(const QString &name) const
+{
+    return store->contains(name);
+}
+
+//-----------------------------------------------------------------------------
+const QVariant Settings::GetValue(const QString &name)
+{
+    if (!HasValue(name))
+        return QVariant();
+    return store->value(name);
+}
+
+//-----------------------------------------------------------------------------
+void Settings::SetValue(const QString &name, const QVariant &value)
+{
+    store->setValue(name, value);
+}
+
+//-----------------------------------------------------------------------------
+QVariant &Settings::GetFossilValue(const QString &name)
+{
+    mappings_t::iterator it = Mappings.find(name);
+    Q_ASSERT(it != Mappings.end());
+    return it.value().Value;
+}
+
+//-----------------------------------------------------------------------------
+void Settings::SetFossilValue(const QString &name, const QVariant &value)
+{
+    mappings_t::iterator it = Mappings.find(name);
+    Q_ASSERT(it != Mappings.end());
+    it->Value = value;
+}
+
+//-----------------------------------------------------------------------------
+bool Settings::SupportsLang(const QString &langId) const
+{
+    QString locale_path = QString(":intl/%0.qm").arg(langId);
+    QResource res(locale_path);
+    return res.isValid();
+}

src/AppSettings.h

@@ -0,0 +1,112 @@
+#ifndef APPSETTINGS_H
+#define APPSETTINGS_H
+
+#include <QMap>
+#include <QTranslator>
+#include <QVariant>
+#include <QVector>
+
+#define FUEL_SETTING_FOSSIL_PATH "FossilPath"
+#define FUEL_SETTING_COMMIT_MSG "CommitMsgHistory"
+#define FUEL_SETTING_FILE_DBLCLICK "FileDblClickAction"
+#define FUEL_SETTING_LANGUAGE "Language"
+#define FUEL_SETTING_WEB_BROWSER "WebBrowser"
+
+#define FOSSIL_SETTING_GDIFF_CMD "gdiff-command"
+#define FOSSIL_SETTING_GMERGE_CMD "gmerge-command"
+#define FOSSIL_SETTING_PROXY_URL "proxy"
+#define FOSSIL_SETTING_IGNORE_GLOB "ignore-glob"
+#define FOSSIL_SETTING_CRNL_GLOB "crnl-glob"
+#define FOSSIL_SETTING_HTTP_PORT "http-port"
+
+enum FileDblClickAction
+{
+    FILE_DLBCLICK_ACTION_DIFF,
+    FILE_DLBCLICK_ACTION_OPEN,
+    FILE_DLBCLICK_ACTION_OPENCONTAINING,
+    FILE_DLBCLICK_ACTION_CUSTOM,  // Custom Action 1
+    FILE_DLBCLICK_ACTION_MAX
+};
+
+enum CustomActionContext
+{
+    ACTION_CONTEXT_FILES = 1 << 0,
+    ACTION_CONTEXT_FOLDERS = 1 << 1,
+    ACTION_CONTEXT_FILES_AND_FOLDERS = ACTION_CONTEXT_FILES | ACTION_CONTEXT_FOLDERS
+};
+
+enum
+{
+    MAX_CUSTOM_ACTIONS = 9
+};
+
+struct CustomAction
+{
+    QString Id;
+    QString Description;
+    QString Command;
+    CustomActionContext Context;
+    bool MultipleSelection;
+
+    CustomAction() { Clear(); }
+
+    bool IsValid() const { return !(Description.isEmpty() || Command.isEmpty()); }
+
+    bool IsActive(CustomActionContext context) const { return (Context & context) != 0; }
+
+    void Clear()
+    {
+        Description.clear();
+        Command.clear();
+        Context = ACTION_CONTEXT_FILES;
+        MultipleSelection = true;
+    }
+};
+
+struct Settings
+{
+    struct Setting
+    {
+        enum SettingType
+        {
+            TYPE_FOSSIL_GLOBAL,
+            TYPE_FOSSIL_LOCAL
+        };
+
+        Setting(QVariant value, SettingType type) : Value(value), Type(type) {}
+        QVariant Value;
+        SettingType Type;
+    };
+    typedef QMap<QString, Setting> mappings_t;
+    typedef QVector<CustomAction> custom_actions_t;
+
+    Settings(bool portableMode = false);
+    ~Settings();
+
+    void ApplyEnvironment();
+
+    // App configuration access
+    class QSettings *GetStore() { return store; }
+    bool HasValue(const QString &name) const;                   // store->contains(FUEL_SETTING_FOSSIL_PATH)
+    const QVariant GetValue(const QString &name);               // settings.store->value
+    void SetValue(const QString &name, const QVariant &value);  // settings.store->value
+
+    // Fossil configuration access
+    QVariant &GetFossilValue(const QString &name);
+    void SetFossilValue(const QString &name, const QVariant &value);
+    mappings_t &GetMappings() { return Mappings; }
+
+    bool SupportsLang(const QString &langId) const;
+    bool InstallLang(const QString &langId);
+
+    custom_actions_t &GetCustomActions() { return customActions; }
+
+private:
+    mappings_t Mappings;
+    class QSettings *store;
+    QTranslator translator;
+
+    custom_actions_t customActions;
+};
+
+#endif  // APPSETTINGS_H

src/BrowserWidget.cpp

@@ -1,73 +1,69 @@
-#include <QLineEdit>
 #include "BrowserWidget.h"
 #include "ui_BrowserWidget.h"
+#include <QLineEdit>
 
-BrowserWidget::BrowserWidget(QWidget *parent) :
-	QWidget(parent),
-	loading(false)
+BrowserWidget::BrowserWidget(QWidget *parent) : QWidget(parent), loading(false)
 {
-	ui = new Ui::BrowserWidget;
-	ui->setupUi(this);
-	ui->toolBar->addWidget(ui->txtUrl);
-	connect(ui->txtUrl, SIGNAL(returnPressed()), this, SLOT(on_txtUrl_returnPressed()) );
-	ui->actionBrowserStop->setVisible(false);
+    ui = new Ui::BrowserWidget;
+    ui->setupUi(this);
+    ui->toolBar->addWidget(ui->txtUrl);
+    connect(ui->txtUrl, SIGNAL(returnPressed()), this, SLOT(on_txtUrl_returnPressed()));
+    ui->actionBrowserStop->setVisible(false);
 }
 
 BrowserWidget::~BrowserWidget()
 {
-	delete ui;
+    delete ui;
 }
 
 void BrowserWidget::load(const QUrl &url)
 {
-	ui->webView->load(url);
+    ui->webView->load(url);
 }
 
 void BrowserWidget::on_webView_urlChanged(const QUrl &url)
 {
-	ui->txtUrl->setText(url.toString());
+    ui->txtUrl->setText(url.toString());
 }
 
 void BrowserWidget::on_webView_loadStarted()
 {
-	loading=true;
-	ui->actionBrowserRefresh->setVisible(false);
-	ui->actionBrowserStop->setVisible(true);
+    loading = true;
+    ui->actionBrowserRefresh->setVisible(false);
+    ui->actionBrowserStop->setVisible(true);
 }
 
 void BrowserWidget::on_webView_loadFinished(bool /*errorOccured*/)
 {
-	loading=false;
-	ui->actionBrowserRefresh->setVisible(true);
-	ui->actionBrowserStop->setVisible(false);
+    loading = false;
+    ui->actionBrowserRefresh->setVisible(true);
+    ui->actionBrowserStop->setVisible(false);
 }
 
-
 void BrowserWidget::on_txtUrl_returnPressed()
 {
-	QUrl url(ui->txtUrl->text());
-	if(url.scheme().isEmpty())
-		url.setScheme("http");
-	ui->webView->load(url);
+    QUrl url(ui->txtUrl->text());
+    if (url.scheme().isEmpty())
+        url.setScheme("http");
+    ui->webView->load(url);
 }
 
-
 void BrowserWidget::on_actionBrowserBack_triggered()
 {
-	ui->webView->back();
+    ui->webView->back();
 }
 
 void BrowserWidget::on_actionBrowserForward_triggered()
 {
-	ui->webView->forward();
+    ui->webView->forward();
 }
 
 void BrowserWidget::on_actionBrowserRefresh_triggered()
 {
-	ui->webView->reload();
+    ui->webView->reload();
 }
 
 void BrowserWidget::on_actionBrowserStop_triggered()
 {
-	ui->webView->stop();
+    ui->webView->stop();
 }

src/BrowserWidget.h

@@ -1,37 +1,38 @@
 #ifndef BROWSERWIDGET_H
 #define BROWSERWIDGET_H
 
-#include <QWidget>
 #include <QUrl>
+#include <QWidget>
 
-namespace Ui {
+namespace Ui
+{
 class BrowserWidget;
 }
 
 class BrowserWidget : public QWidget
 {
-	Q_OBJECT
+    Q_OBJECT
 
 public:
-	explicit BrowserWidget(QWidget *parent = 0);
-	~BrowserWidget();
+    explicit BrowserWidget(QWidget *parent = 0);
+    ~BrowserWidget();
 
-	void load(const QUrl &url);
+    void load(const QUrl &url);
 
 private slots:
-	void on_webView_urlChanged(const QUrl &url);
-	void on_webView_loadStarted();
-	void on_webView_loadFinished(bool);
-	void on_actionBrowserBack_triggered();
-	void on_actionBrowserForward_triggered();
-	void on_actionBrowserRefresh_triggered();
-	void on_txtUrl_returnPressed();
+    void on_webView_urlChanged(const QUrl &url);
+    void on_webView_loadStarted();
+    void on_webView_loadFinished(bool);
+    void on_actionBrowserBack_triggered();
+    void on_actionBrowserForward_triggered();
+    void on_actionBrowserRefresh_triggered();
+    void on_txtUrl_returnPressed();
 
-	void on_actionBrowserStop_triggered();
+    void on_actionBrowserStop_triggered();
 
 private:
-	Ui::BrowserWidget *ui;
-	bool loading;
+    Ui::BrowserWidget *ui;
+    bool loading;
 };
 
-#endif // BROWSERWIDGET_H
+#endif  // BROWSERWIDGET_H

src/CloneDialog.cpp

@@ -1,129 +1,134 @@
 #include "CloneDialog.h"
+#include "Utils.h"
 #include "ui_CloneDialog.h"
-#include <QFileDialog>
-#include <QDir>
-#include <QMessageBox>
 #include <QClipboard>
+#include <QDir>
+#include <QFileDialog>
+#include <QMessageBox>
 #include <QUrl>
 
 //-----------------------------------------------------------------------------
-CloneDialog::CloneDialog(QWidget *parent) :
-	QDialog(parent),
-	ui(new Ui::CloneDialog)
+CloneDialog::CloneDialog(QWidget *parent) : QDialog(parent), ui(new Ui::CloneDialog)
 {
-	ui->setupUi(this);
+    ui->setupUi(this);
 }
 
 //-----------------------------------------------------------------------------
 CloneDialog::~CloneDialog()
 {
-	delete ui;
+    delete ui;
 }
 
 //-----------------------------------------------------------------------------
 bool CloneDialog::run(QWidget *parent, QUrl &url, QString &repository, QUrl &urlProxy)
 {
-	CloneDialog dlg(parent);
+    CloneDialog dlg(parent);
 
-	// Try to parse a url from the clipboard
-	QClipboard *clipboard = QApplication::clipboard();
-	if(clipboard)
-	{
-		QUrl nurl = QUrl::fromUserInput(clipboard->text());
+    // Try to parse a url from the clipboard
+    QClipboard *clipboard = QApplication::clipboard();
+    if (clipboard)
+    {
+        QUrl nurl = QUrl::fromUserInput(clipboard->text());
 
-		// If we have a valid url
-		if(nurl.isValid() && !nurl.isEmpty())
-		{
-			// Fill in dialog
-			dlg.ui->lineUserName->setText(nurl.userName());
-			dlg.ui->linePassword->setText(nurl.password());
-			nurl.setUserName("");
-			nurl.setPassword("");
-			dlg.ui->lineURL->setText(nurl.toString());
-		}
-	}
+        // If we have a valid url
+        if (nurl.isValid() && !nurl.isEmpty())
+        {
+            // Fill in dialog
+            dlg.ui->lineUserName->setText(nurl.userName());
+            dlg.ui->linePassword->setText(nurl.password());
+            nurl.setUserName("");
+            nurl.setPassword("");
+            dlg.ui->lineURL->setText(UrlToStringNoCredentials(nurl));
+        }
+    }
 
-	if(dlg.exec() != QDialog::Accepted)
-		return false;
+    if (dlg.exec() != QDialog::Accepted)
+        return false;
 
-	QString urltext = dlg.ui->lineURL->text();
+    QString urltext = dlg.ui->lineURL->text();
 
-	url = QUrl::fromUserInput(urltext);
-	if(url.isEmpty() || !url.isValid())
-	{
-		QMessageBox::critical(parent, tr("Error"), tr("Invalid URL."), QMessageBox::Ok );
-		return false;
-	}
+    // Check if the url is a local file
+    if (QFileInfo::exists(urltext))
+        url = QUrl::fromLocalFile(urltext);
+    else
+    {
+        url = QUrl::fromUserInput(urltext);
+        if (url.isEmpty() || !url.isValid())
+        {
+            QMessageBox::critical(parent, tr("Error"), tr("Invalid URL."), QMessageBox::Ok);
+            return false;
+        }
+    }
 
-	if(!dlg.ui->lineUserName->text().trimmed().isEmpty())
-		url.setUserName(dlg.ui->lineUserName->text());
+    if (!dlg.ui->lineUserName->text().trimmed().isEmpty())
+        url.setUserName(dlg.ui->lineUserName->text());
 
-	if(!dlg.ui->linePassword->text().trimmed().isEmpty())
-		url.setPassword(dlg.ui->linePassword->text());
+    if (!dlg.ui->linePassword->text().trimmed().isEmpty())
+        url.setPassword(dlg.ui->linePassword->text());
 
-	if(dlg.ui->lineTargetRepository->text().isEmpty())
-	{
-		QMessageBox::critical(parent, tr("Error"), tr("Invalid Repository File."), QMessageBox::Ok );
-		return false;
-	}
+    if (dlg.ui->lineTargetRepository->text().isEmpty())
+    {
+        QMessageBox::critical(parent, tr("Error"), tr("Invalid Repository File."), QMessageBox::Ok);
+        return false;
+    }
 
-	urlProxy = QUrl::fromUserInput(dlg.ui->lineHttpProxyUrl->text());
-	if(!urlProxy.isEmpty() && !urlProxy.isValid())
-	{
-		QMessageBox::critical(parent, tr("Error"), tr("Invalid Proxy URL."), QMessageBox::Ok );
-		return false;
-	}
+    urlProxy = QUrl::fromUserInput(dlg.ui->lineHttpProxyUrl->text());
+    if (!urlProxy.isEmpty() && !urlProxy.isValid())
+    {
+        QMessageBox::critical(parent, tr("Error"), tr("Invalid Proxy URL."), QMessageBox::Ok);
+        return false;
+    }
 
-	repository = dlg.ui->lineTargetRepository->text();
-	return true;
+    repository = dlg.ui->lineTargetRepository->text();
+    return true;
 }
 
 //-----------------------------------------------------------------------------
 void CloneDialog::GetRepositoryPath(QString &pathResult)
 {
-	QString filter(tr("Fossil Repository") + QString(" (*." FOSSIL_EXT ")"));
+    QString filter(tr("Fossil Repository") + QString(" (*." FOSSIL_EXT ")"));
 
-	pathResult = QFileDialog::getSaveFileName(
-				this,
-				tr("Select Fossil Repository"),
-				QDir::toNativeSeparators(pathResult),
-				filter,
-				&filter,
-				QFileDialog::DontConfirmOverwrite);
+    pathResult = QFileDialog::getSaveFileName(this, tr("Select Fossil Repository"), QDir::toNativeSeparators(pathResult), filter, &filter, QFileDialog::DontConfirmOverwrite);
+
+    // Ensure that it ends in the required extension (On GTK, Qt doesn't seem to add it automatically)
+    QFileInfo fi(pathResult);
+    QString ext = fi.suffix().toLower();
+    if (ext != FOSSIL_EXT)
+        pathResult += "." FOSSIL_EXT;
 }
 
 //-----------------------------------------------------------------------------
 void CloneDialog::on_btnSelectSourceRepo_clicked()
 {
-	QString path = ui->lineURL->text();
-	GetRepositoryPath(path);
+    QString path = ui->lineURL->text();
+    GetRepositoryPath(path);
 
-	if(path.trimmed().isEmpty())
-		return;
+    if (path.trimmed().isEmpty())
+        return;
 
-	if(!QFile::exists(path))
-	{
-		QMessageBox::critical(this, tr("Error"), tr("Invalid Repository File."), QMessageBox::Ok);
-		return;
-	}
+    if (!QFile::exists(path))
+    {
+        QMessageBox::critical(this, tr("Error"), tr("Invalid Repository File."), QMessageBox::Ok);
+        return;
+    }
 
-	ui->lineURL->setText(QDir::toNativeSeparators(path));
+    ui->lineURL->setText(QDir::toNativeSeparators(path));
 }
 
 //-----------------------------------------------------------------------------
 void CloneDialog::on_btnSelectTargetRepo_clicked()
 {
-	QString path = ui->lineTargetRepository->text();
-	GetRepositoryPath(path);
+    QString path = ui->lineTargetRepository->text();
+    GetRepositoryPath(path);
 
-	if(path.trimmed().isEmpty())
-		return;
+    if (path.trimmed().isEmpty())
+        return;
 
-	if(QFile::exists(path))
-	{
-		QMessageBox::critical(this, tr("Error"), tr("This repository file already exists."), QMessageBox::Ok);
-		return;
-	}
+    if (QFile::exists(path))
+    {
+        QMessageBox::critical(this, tr("Error"), tr("This repository file already exists."), QMessageBox::Ok);
+        return;
+    }
 
-	ui->lineTargetRepository->setText(QDir::toNativeSeparators(path));
+    ui->lineTargetRepository->setText(QDir::toNativeSeparators(path));
 }

src/CloneDialog.h

@@ -3,32 +3,29 @@
 
 #include <QDialog>
 
-#define FOSSIL_CHECKOUT1	"_FOSSIL_"
-#define FOSSIL_CHECKOUT2	".fslckout"
-#define FOSSIL_EXT			"fossil"
-
-namespace Ui {
+namespace Ui
+{
 class CloneDialog;
 }
 
 class CloneDialog : public QDialog
 {
-	Q_OBJECT
+    Q_OBJECT
 
 public:
-	explicit CloneDialog(QWidget *parent = 0);
-	~CloneDialog();
+    explicit CloneDialog(QWidget *parent = 0);
+    ~CloneDialog();
 
-	static bool run(QWidget *parent, class QUrl &url, QString &repository, QUrl& urlProxy);
+    static bool run(QWidget *parent, class QUrl &url, QString &repository, QUrl &urlProxy);
 
 private slots:
-	void on_btnSelectSourceRepo_clicked();
-	void on_btnSelectTargetRepo_clicked();
+    void on_btnSelectSourceRepo_clicked();
+    void on_btnSelectTargetRepo_clicked();
 
 private:
-	void GetRepositoryPath(QString &pathResult);
+    void GetRepositoryPath(QString &pathResult);
 
-	Ui::CloneDialog *ui;
+    Ui::CloneDialog *ui;
 };
 
-#endif // CLONEDIALOG_H
+#endif  // CLONEDIALOG_H

src/CommitDialog.cpp

@@ -1,144 +1,168 @@
 #include "CommitDialog.h"
+#include "MainWindow.h"  // Ugly. I know.
+#include "ui_CommitDialog.h"
+#include <QAction>
 #include <QPushButton>
 #include <QShortcut>
-#include "ui_CommitDialog.h"
-#include "MainWindow.h" // Ugly. I know.
 
-CommitDialog::CommitDialog(QWidget *parent, QString title, QStringList &files, const QStringList *history, bool singleLineEntry, const QString *checkBoxText, bool *checkBoxValue) :
-	QDialog(parent, Qt::Sheet),
-	ui(new Ui::CommitDialog)
+CommitDialog::CommitDialog(QWidget *parent, const QString &title, QStringList &files, const QStringList *history, bool stashMode) : QDialog(parent, Qt::Sheet), ui(new Ui::CommitDialog)
 {
-	ui->setupUi(this);
-	ui->plainTextEdit->clear();
-	ui->listView->setModel(&itemModel);
+    ui->setupUi(this);
+    ui->plainTextEdit->clear();
+    ui->listView->setModel(&itemModel);
 
-	setWindowTitle(title);
+    setWindowTitle(title);
 
-	// Activate the appropriate control based on mode
-	ui->plainTextEdit->setVisible(!singleLineEntry);
-	ui->lineEdit->setVisible(singleLineEntry);
+    // Activate the appropriate control based on mode
+    ui->plainTextEdit->setVisible(!stashMode);
+    ui->lineEdit->setVisible(stashMode);
 
-	// Activate the checkbox if we have some text
-	ui->checkBox->setVisible(checkBoxText!=0);
-	if(checkBoxText && checkBoxValue)
-	{
-		ui->checkBox->setText(*checkBoxText);
-		ui->checkBox->setCheckState(*checkBoxValue ? Qt::Checked : Qt::Unchecked);
-	}
+    // Activate the checkbox if we have some text
+    ui->chkRevertFiles->setVisible(stashMode);
 
-	// Activate the combo if we have history
-	ui->comboBox->setVisible(history!=0);
-	if(history)
-	{
-		// Generate the history combo
-		foreach(const QString msg, *history)
-		{
-			QString trimmed = msg.trimmed();
-			if(trimmed.isEmpty())
-				continue;
+    ui->widgetBranchOptions->setVisible(!stashMode);
 
-			commitMessages.append(trimmed);
-			QStringList lines = trimmed.split('\n');
-			QString first_line;
-			if(!lines.empty())
-				first_line = lines[0] + "...";
+    // Activate the combo if we have history
+    ui->comboBox->setVisible(history != 0);
+    if (history)
+    {
+        // Generate the history combo
+        foreach (const QString msg, *history)
+        {
+            QString trimmed = msg.trimmed();
+            if (trimmed.isEmpty())
+                continue;
 
-			ui->comboBox->addItem(first_line);
-		}
-	}
+            commitMessages.append(trimmed);
+            QStringList lines = trimmed.split('\n');
+            QString first_line;
+            if (!lines.empty())
+                first_line = lines[0] + "...";
 
-	// Populate file list
-	for(QStringList::const_iterator it=files.begin(); it!=files.end(); ++it)
-	{
-		QStandardItem *si = new QStandardItem(*it);
-		si->setCheckable(true);
-		si->setCheckState(Qt::Checked);
-		itemModel.appendRow(si);
-	}
+            ui->comboBox->addItem(first_line);
+        }
+    }
 
+    // Populate file list
+    for (QStringList::const_iterator it = files.begin(); it != files.end(); ++it)
+    {
+        QStandardItem *si = new QStandardItem(*it);
+        si->setCheckable(true);
+        si->setCheckState(Qt::Checked);
+        itemModel.appendRow(si);
+    }
 
-	// Trigger commit with a Ctrl-Return from the comment box
-	QAction* action = new QAction(ui->plainTextEdit);
-	QShortcut* shortcut = new QShortcut(QKeySequence("Ctrl+Return"), ui->plainTextEdit);
-	action->setAutoRepeat(false);
-	connect(shortcut, SIGNAL(activated()), ui->buttonBox->button(QDialogButtonBox::Ok), SLOT(click()));
+    // Trigger commit with a Ctrl-Return from the comment box
+    QAction *action = new QAction(ui->plainTextEdit);
+    QShortcut *shortcut = new QShortcut(QKeySequence("Ctrl+Return"), ui->plainTextEdit);
+    action->setAutoRepeat(false);
+    connect(shortcut, SIGNAL(activated()), ui->buttonBox->button(QDialogButtonBox::Ok), SLOT(click()));
 
-	// Abort commit with an Escape key from the comment box
-	action = new QAction(ui->plainTextEdit);
-	shortcut = new QShortcut(QKeySequence("Escape"), ui->plainTextEdit);
-	action->setAutoRepeat(false);
-	connect(shortcut, SIGNAL(activated()), ui->buttonBox->button(QDialogButtonBox::Cancel), SLOT(click()));
+    // Abort commit with an Escape key from the comment box
+    action = new QAction(ui->plainTextEdit);
+    shortcut = new QShortcut(QKeySequence("Escape"), ui->plainTextEdit);
+    action->setAutoRepeat(false);
+    connect(shortcut, SIGNAL(activated()), ui->buttonBox->button(QDialogButtonBox::Cancel), SLOT(click()));
 }
 
 //------------------------------------------------------------------------------
 CommitDialog::~CommitDialog()
 {
-	delete ui;
+    delete ui;
 }
 
 //------------------------------------------------------------------------------
-bool CommitDialog::run(QWidget *parent, QString title, QStringList &files, QString &commitMsg, const QStringList *history, bool singleLineEntry, const QString *checkBoxText, bool *checkBoxValue)
+bool CommitDialog::runCommit(QWidget *parent, QStringList &files, QString &commitMsg, const QStringList &commitMsgHistory, QString &branchName, bool &privateBranch)
 {
-	CommitDialog dlg(parent, title, files, history, singleLineEntry, checkBoxText, checkBoxValue);
-	int res = dlg.exec();
+    CommitDialog dlg(parent, tr("Commit Changes"), files, &commitMsgHistory, false);
+    int res = dlg.exec();
 
-	if(singleLineEntry)
-		commitMsg = dlg.ui->lineEdit->text();
-	else
-		commitMsg = dlg.ui->plainTextEdit->toPlainText();
+    commitMsg = dlg.ui->plainTextEdit->toPlainText();
 
+    if (res != QDialog::Accepted)
+        return false;
 
-	if(res!=QDialog::Accepted)
-		return false;
+    files.clear();
+    for (int i = 0; i < dlg.itemModel.rowCount(); ++i)
+    {
+        QStandardItem *si = dlg.itemModel.item(i);
+        if (si->checkState() != Qt::Checked)
+            continue;
+        files.append(si->text());
+    }
 
-	files.clear();
-	for(int i=0; i<dlg.itemModel.rowCount(); ++i)
-	{
-		QStandardItem *si = dlg.itemModel.item(i);
-		if(si->checkState()!=Qt::Checked)
-			continue;
-		files.append(si->text());
-	}
+    branchName.clear();
+    if (dlg.ui->chkNewBranch->isChecked())
+    {
+        branchName = dlg.ui->lineBranchName->text().trimmed();
+        privateBranch = dlg.ui->chkPrivateBranch->isChecked();
+    }
 
-	if(checkBoxText)
-	{
-		Q_ASSERT(checkBoxValue);
-		*checkBoxValue = dlg.ui->checkBox->checkState() == Qt::Checked;
-	}
+    return true;
+}
 
-	return true;
+//------------------------------------------------------------------------------
+bool CommitDialog::runStashNew(QWidget *parent, QStringList &stashedFiles, QString &stashName, bool &revertFiles)
+{
+    CommitDialog dlg(parent, tr("Stash Changes"), stashedFiles, NULL, true);
+    int res = dlg.exec();
+
+    stashName = dlg.ui->lineEdit->text();
+
+    if (res != QDialog::Accepted)
+        return false;
+
+    stashedFiles.clear();
+    for (int i = 0; i < dlg.itemModel.rowCount(); ++i)
+    {
+        QStandardItem *si = dlg.itemModel.item(i);
+        if (si->checkState() != Qt::Checked)
+            continue;
+        stashedFiles.append(si->text());
+    }
+
+    revertFiles = dlg.ui->chkRevertFiles->checkState() == Qt::Checked;
+    return true;
 }
 
 //------------------------------------------------------------------------------
 void CommitDialog::on_comboBox_activated(int index)
 {
-	Q_ASSERT(index < commitMessages.length());
+    Q_ASSERT(index < commitMessages.length());
 
-	if(ui->plainTextEdit->isVisible())
-		ui->plainTextEdit->setPlainText(commitMessages[index]);
+    if (ui->plainTextEdit->isVisible())
+        ui->plainTextEdit->setPlainText(commitMessages[index]);
 
-	if(ui->lineEdit->isVisible())
-		ui->lineEdit->setText(commitMessages[index]);
+    if (ui->lineEdit->isVisible())
+        ui->lineEdit->setText(commitMessages[index]);
 }
 
 //------------------------------------------------------------------------------
 void CommitDialog::on_listView_doubleClicked(const QModelIndex &index)
 {
-	QVariant data = itemModel.data(index);
-	QString filename = data.toString();
-	reinterpret_cast<MainWindow*>(parent())->diffFile(filename);
+    QVariant data = itemModel.data(index);
+    QString filename = data.toString();
+    reinterpret_cast<MainWindow *>(parent())->diffFile(filename);
 }
 
 //------------------------------------------------------------------------------
 void CommitDialog::on_listView_clicked(const QModelIndex &)
 {
-	int num_selected = 0;
-	for(int i=0; i<itemModel.rowCount(); ++i)
-	{
-		QStandardItem *si = itemModel.item(i);
-		if(si->checkState()==Qt::Checked)
-			++num_selected;
-	}
+    int num_selected = 0;
+    for (int i = 0; i < itemModel.rowCount(); ++i)
+    {
+        QStandardItem *si = itemModel.item(i);
+        if (si->checkState() == Qt::Checked)
+            ++num_selected;
+    }
 
-	ui->buttonBox->button(QDialogButtonBox::Ok)->setEnabled(num_selected>0);
+    ui->buttonBox->button(QDialogButtonBox::Ok)->setEnabled(num_selected > 0);
+}
+
+//------------------------------------------------------------------------------
+void CommitDialog::on_chkNewBranch_toggled(bool checked)
+{
+    ui->lblPrivateBranch->setEnabled(checked);
+    ui->chkPrivateBranch->setEnabled(checked);
+    ui->lineBranchName->setEnabled(checked);
 }

src/CommitDialog.h

@@ -4,8 +4,9 @@
 #include <QDialog>
 #include <QStandardItemModel>
 
-namespace Ui {
-    class CommitDialog;
+namespace Ui
+{
+class CommitDialog;
 }
 
 class CommitDialog : public QDialog
@@ -13,20 +14,22 @@ class CommitDialog : public QDialog
     Q_OBJECT
 
 public:
-	explicit CommitDialog(QWidget *parent, QString title, QStringList &files, const QStringList *history=0, bool singleLineEntry=false, const QString *checkBoxText=0, bool *checkBoxValue=0);
+    explicit CommitDialog(QWidget *parent, const QString &title, QStringList &files, const QStringList *history, bool stashMode);
     ~CommitDialog();
 
-	static bool run(QWidget *parent, QString title, QStringList &files, QString &commitMsg, const QStringList *history=0, bool singleLineEntry=false, const QString *checkBoxText=0, bool *checkBoxValue=0);
+    static bool runStashNew(QWidget *parent, QStringList &stashedFiles, QString &stashName, bool &revertFiles);
+    static bool runCommit(QWidget *parent, QStringList &files, QString &commitMsg, const QStringList &commitMsgHistory, QString &branchName, bool &privateBranch);
 
 private slots:
-	void on_comboBox_activated(int index);
-	void on_listView_doubleClicked(const QModelIndex &index);
-	void on_listView_clicked(const QModelIndex &index);
+    void on_comboBox_activated(int index);
+    void on_listView_doubleClicked(const QModelIndex &index);
+    void on_listView_clicked(const QModelIndex &index);
+    void on_chkNewBranch_toggled(bool checked);
 
 private:
     Ui::CommitDialog *ui;
-	QStandardItemModel	itemModel;
-	QStringList commitMessages;
+    QStandardItemModel itemModel;
+    QStringList commitMessages;
 };
 
-#endif // COMMITDIALOG_H
+#endif  // COMMITDIALOG_H

src/CustomWebView.cpp

@@ -1,19 +1,18 @@
 #include "CustomWebView.h"
 #include <QMouseEvent>
 
-CustomWebView::CustomWebView(QWidget *parent) :
-	QWebView(parent)
+CustomWebView::CustomWebView(QWidget *parent) : QWebEngineView(parent)
 {
-	setUrl(QUrl("about:blank"));
+    setUrl(QUrl("about:blank"));
 }
 
 void CustomWebView::mousePressEvent(QMouseEvent *event)
 {
-	Qt::MouseButton but = event->button();
-	if(but == Qt::XButton1)
-		back();
-	else if(but == Qt::XButton2)
-		forward();
-	else
-		QWebView::mousePressEvent(event);
+    Qt::MouseButton but = event->button();
+    if (but == Qt::XButton1)
+        back();
+    else if (but == Qt::XButton2)
+        forward();
+    else
+        QWebEngineView::mousePressEvent(event);
 }

src/CustomWebView.h

@@ -1,21 +1,20 @@
 #ifndef CUSTOMWEBVIEW_H
 #define CUSTOMWEBVIEW_H
 
-#include <QWebView>
+#include <QWebEngineView>
 
-class CustomWebView : public QWebView
+class CustomWebView : public QWebEngineView
 {
-	Q_OBJECT
+    Q_OBJECT
 public:
-	explicit CustomWebView(QWidget *parent = 0);
+    explicit CustomWebView(QWidget *parent = 0);
 
 signals:
 
 public slots:
 
 protected:
-	virtual void mousePressEvent(QMouseEvent *event);
-
+    virtual void mousePressEvent(QMouseEvent *event);
 };
 
-#endif // CUSTOMWEBVIEW_H
+#endif  // CUSTOMWEBVIEW_H

src/FileActionDialog.cpp

@@ -1,64 +1,61 @@
-#include <QCheckBox>
 #include "FileActionDialog.h"
 #include "ui_FileActionDialog.h"
+#include <QCheckBox>
 
 FileActionDialog::FileActionDialog(QWidget *parent, const QString &title, const QString &message, const QStringList &listData, const QString &checkBoxText, bool *checkBoxResult) :
-	QDialog(parent, Qt::Sheet),
-	ui(new Ui::FileActionDialog),
-	clickedButton(QDialogButtonBox::NoButton)
+    QDialog(parent, Qt::Sheet), ui(new Ui::FileActionDialog), clickedButton(QDialogButtonBox::NoButton)
 {
     ui->setupUi(this);
-	setWindowTitle(title);
-	ui->label->setText(message);
-	ui->listView->setModel(&itemModel);
+    setWindowTitle(title);
+    ui->label->setText(message);
+    ui->listView->setModel(&itemModel);
 
-	if(!checkBoxText.isEmpty() && checkBoxResult)
-	{
-		checkBox = new QCheckBox(this);
-		checkBox->setText(checkBoxText);
-		checkBox->setEnabled(true);
-		checkBox->setChecked(*checkBoxResult);
-		this->checkBoxResult = checkBoxResult;
-		ui->verticalLayout->insertWidget(2, checkBox);
-	}
+    if (!checkBoxText.isEmpty() && checkBoxResult)
+    {
+        checkBox = new QCheckBox(this);
+        checkBox->setText(checkBoxText);
+        checkBox->setEnabled(true);
+        checkBox->setChecked(*checkBoxResult);
+        this->checkBoxResult = checkBoxResult;
+        ui->verticalLayout->insertWidget(2, checkBox);
+    }
 
-	if(listData.empty())
-		ui->listView->setVisible(false);
-	else
-	{
-		foreach(const QString &s, listData)
-			itemModel.appendRow(new QStandardItem(s));
-	}
+    if (listData.empty())
+        ui->listView->setVisible(false);
+    else
+    {
+        foreach (const QString &s, listData)
+            itemModel.appendRow(new QStandardItem(s));
+    }
 }
 
 FileActionDialog::~FileActionDialog()
 {
-	delete ui;
+    delete ui;
 }
 
 bool FileActionDialog::run(QWidget *parent, const QString &title, const QString &message, const QStringList &listData, const QString &checkBoxText, bool *checkBoxResult)
 {
-	FileActionDialog dlg(parent, title, message, listData, checkBoxText, checkBoxResult);
-	int res = dlg.exec();
+    FileActionDialog dlg(parent, title, message, listData, checkBoxText, checkBoxResult);
+    int res = dlg.exec();
 
-	if(!checkBoxText.isEmpty() && checkBoxResult && dlg.checkBox)
-		*checkBoxResult = dlg.checkBox->isChecked();
+    if (!checkBoxText.isEmpty() && checkBoxResult && dlg.checkBox)
+        *checkBoxResult = dlg.checkBox->isChecked();
 
-	return res == QDialog::Accepted;
+    return res == QDialog::Accepted;
 }
 
 QDialogButtonBox::StandardButton FileActionDialog::runStandardButtons(QWidget *parent, StandardButtons buttons, const QString &title, const QString &message, const QStringList &listData)
 {
-	FileActionDialog dlg(parent, title, message, listData);
-	dlg.ui->buttonBox->setStandardButtons(buttons);
+    FileActionDialog dlg(parent, title, message, listData);
+    dlg.ui->buttonBox->setStandardButtons(buttons);
 
-	dlg.exec();
-	return dlg.clickedButton;
+    dlg.exec();
+    return dlg.clickedButton;
 }
 
 void FileActionDialog::on_buttonBox_clicked(QAbstractButton *button)
 {
-	// Retrieve the flag corresponding to the standard clicked
-	clickedButton = ui->buttonBox->standardButton(button);
+    // Retrieve the flag corresponding to the standard clicked
+    clickedButton = ui->buttonBox->standardButton(button);
 }
-

src/FileActionDialog.h

@@ -2,37 +2,37 @@
 #define FILEACTIONDIALOG_H
 
 #include <QDialog>
-#include <QStandardItemModel>
 #include <QDialogButtonBox>
+#include <QStandardItemModel>
 
-namespace Ui {
-    class FileActionDialog;
+namespace Ui
+{
+class FileActionDialog;
 }
 
 class FileActionDialog : public QDialog
 {
     Q_OBJECT
 public:
-	explicit FileActionDialog(QWidget *parent, const QString &title, const QString &message, const QStringList &listData, const QString &checkBoxText=QString(), bool *checkBoxResult=0);
+    explicit FileActionDialog(QWidget *parent, const QString &title, const QString &message, const QStringList &listData, const QString &checkBoxText = QString(), bool *checkBoxResult = 0);
     ~FileActionDialog();
 
-	static bool run(QWidget *parent, const QString &title, const QString &message, const QStringList &listData, const QString &checkBoxText=QString(), bool *checkBoxResult=0);
+    static bool run(QWidget *parent, const QString &title, const QString &message, const QStringList &listData, const QString &checkBoxText = QString(), bool *checkBoxResult = 0);
 
-	typedef QDialogButtonBox::StandardButton StandardButton;
-	typedef QDialogButtonBox::StandardButtons StandardButtons;
-
-	static StandardButton runStandardButtons(QWidget *parent, StandardButtons, const QString &title, const QString &message, const QStringList &listData);
+    typedef QDialogButtonBox::StandardButton StandardButton;
+    typedef QDialogButtonBox::StandardButtons StandardButtons;
 
+    static StandardButton runStandardButtons(QWidget *parent, StandardButtons, const QString &title, const QString &message, const QStringList &listData);
 
 private slots:
-	void on_buttonBox_clicked(QAbstractButton *button);
+    void on_buttonBox_clicked(QAbstractButton *button);
 
 private:
     Ui::FileActionDialog *ui;
-	QStandardItemModel	itemModel;
-	class QCheckBox *checkBox;
-	bool *checkBoxResult;
-	StandardButton clickedButton;
+    QStandardItemModel itemModel;
+    class QCheckBox *checkBox;
+    bool *checkBoxResult;
+    StandardButton clickedButton;
 };
 
-#endif // FILEACTIONDIALOG_H
+#endif  // FILEACTIONDIALOG_H

src/FileTableView.cpp

@@ -1,31 +1,27 @@
 #include "FileTableView.h"
-#include <QMouseEvent>
 #include <QApplication>
+#include <QMouseEvent>
 
-FileTableView::FileTableView(QWidget *parent) :
-	QTableView(parent)
-{
-}
+FileTableView::FileTableView(QWidget *parent) : QTableView(parent) {}
 
 //------------------------------------------------------------------------------
 void FileTableView::mousePressEvent(QMouseEvent *event)
 {
-	if (event->button() == Qt::LeftButton)
-		dragStartPos = event->pos();
+    if (event->button() == Qt::LeftButton)
+        dragStartPos = event->pos();
 
-	QTableView::mousePressEvent(event);
+    QTableView::mousePressEvent(event);
 }
 
 //------------------------------------------------------------------------------
 void FileTableView::mouseMoveEvent(QMouseEvent *event)
 {
-	int distance = (event->pos() - dragStartPos).manhattanLength();
-	if (event->buttons() & Qt::LeftButton && distance >= QApplication::startDragDistance())
-	{
-		dragOutEvent();
-		QTableView::mouseReleaseEvent(event);
-	}
-	else
-		QTableView::mouseMoveEvent(event);
-
+    int distance = (event->pos() - dragStartPos).manhattanLength();
+    if (event->buttons() & Qt::LeftButton && distance >= QApplication::startDragDistance())
+    {
+        dragOutEvent();
+        QTableView::mouseReleaseEvent(event);
+    }
+    else
+        QTableView::mouseMoveEvent(event);
 }

src/FileTableView.h

@@ -1,24 +1,24 @@
 #ifndef FILETABLEVIEW_H
 #define FILETABLEVIEW_H
 
-#include <QTableView>
 #include <QPoint>
+#include <QTableView>
 
 class FileTableView : public QTableView
 {
-	Q_OBJECT
+    Q_OBJECT
 public:
-	explicit FileTableView(QWidget *parent = 0);
-	
+    explicit FileTableView(QWidget *parent = 0);
+
 signals:
-	void dragOutEvent();
+    void dragOutEvent();
 
 private:
-	void mousePressEvent(QMouseEvent *event);
-	void mouseMoveEvent(QMouseEvent *event);
+    void mousePressEvent(QMouseEvent *event);
+    void mouseMoveEvent(QMouseEvent *event);
 
 private:
-	QPoint				dragStartPos;
+    QPoint dragStartPos;
 };
 
-#endif // FILETABLEVIEW_H
+#endif  // FILETABLEVIEW_H

src/Fossil.h

@@ -0,0 +1,121 @@
+#ifndef FOSSIL_H
+#define FOSSIL_H
+
+class QStringList;
+#include "LoggedProcess.h"
+#include "Utils.h"
+#include "WorkspaceCommon.h"
+#include <QString>
+#include <QStringList>
+#include <QUrl>
+
+class Fossil
+{
+public:
+    Fossil();
+    void Init(UICallback *callback, const QString &exePath);
+
+    // Repositories
+    bool createRepository(const QString &repositoryPath);
+    bool cloneRepository(const QString &repository, const QUrl &url, const QUrl &proxyUrl);
+
+    // Workspace
+    bool createWorkspace(const QString &repositoryPath, const QString &workspacePath);
+    bool closeWorkspace(bool force = false);
+    void setWorkspace(const QString &_workspacePath);
+    bool pushWorkspace(const QUrl &url);
+    bool pullWorkspace(const QUrl &url);
+    bool undoWorkspace(QStringList &result, bool explainOnly);
+    bool updateWorkspace(QStringList &result, const QString &revision, bool explainOnly);
+    bool statusWorkspace(QStringList &result);
+    WorkspaceState getWorkspaceState();
+    static bool isWorkspace(const QString &path);
+
+    // Workspace Information
+    const QString &getProjectName() const { return projectName; }
+    const QString &getRepositoryFile() const { return repositoryFile; }
+    const QString &getWorkspacePath() const { return workspacePath; }
+
+    // Files
+    bool listFiles(QStringList &files);
+    bool diffFile(const QString &repoFile, bool graphical);
+    bool commitFiles(const QStringList &fileList, const QString &comment, const QString &newBranchName, bool isPrivateBranch);
+    bool addFiles(const QStringList &fileList);
+    bool removeFiles(const QStringList &fileList, bool deleteLocal);
+    bool addRemoveFiles();
+    bool revertFiles(const QStringList &fileList);
+    bool renameFile(const QString &beforePath, const QString &afterPath, bool renameLocal);
+
+    // Settings
+    bool getSettings(QStringList &result);
+    bool setSetting(const QString &name, const QString &value, bool global);
+
+    // Remotes
+    bool setRemoteUrl(const QUrl &url);
+    bool getRemoteUrl(QUrl &url);
+
+    // Stashes
+    bool stashNew(const QStringList &fileList, const QString &name, bool revert);
+    bool stashList(stashmap_t &stashes);
+    bool stashApply(const QString &name);
+    bool stashDrop(const QString &name);
+    bool stashDiff(const QString &name);
+
+    // Tags
+    bool tagList(QStringMap &tags);
+    bool tagNew(const QString &name, const QString &revision);
+    bool tagDelete(const QString &name, const QString &revision);
+
+    // Branches
+    bool branchList(QStringList &branches, QStringList &activeBranches);
+    bool branchNew(const QString &name, const QString &revisionBasis, bool isPrivate = false);
+    bool branchMerge(QStringList &res, const QString &revision, bool integrate, bool force, bool testOnly);
+
+    const QString &getCurrentRevision() const { return currentRevision; }
+    const QStringList &getActiveTags() const { return activeTags; }
+
+    // UI
+    bool uiRunning() const;
+    bool startUI(const QString &httpPort);
+    void stopUI();
+    const QString &getUIHttpPort() const { return fossilUIPort; }
+    QString getUIHttpAddress() const;
+
+    // Fossil executable
+    void setExePath(const QString &path) { fossilPath = path; }
+    bool getExeVersion(QString &version);
+
+private:
+    enum RunFlags
+    {
+        RUNFLAGS_NONE = 0 << 0,
+        RUNFLAGS_SILENT_INPUT = 1 << 0,
+        RUNFLAGS_SILENT_OUTPUT = 1 << 1,
+        RUNFLAGS_SILENT_ALL = RUNFLAGS_SILENT_INPUT | RUNFLAGS_SILENT_OUTPUT,
+        RUNFLAGS_DETACHED = 1 << 2,
+        RUNFLAGS_DEBUG = 1 << 3,
+    };
+
+    void setRepositoryFile(const QString &filename) { repositoryFile = filename; }
+    bool runFossil(const QStringList &args, QStringList *output = 0, int runFlags = RUNFLAGS_NONE);
+    bool runFossilRaw(const QStringList &args, QStringList *output, int *exitCode, int runFlags);
+    QString getFossilPath();
+
+    void log(const QString &text, bool isHTML = false)
+    {
+        if (uiCallback)
+            uiCallback->logText(text, isHTML);
+    }
+
+    UICallback *uiCallback;
+    QString workspacePath;
+    QString fossilPath;  // The value from the settings
+    QString repositoryFile;
+    QString projectName;
+    QString currentRevision;
+    QStringList activeTags;
+    LoggedProcess fossilUI;
+    QString fossilUIPort;
+};
+
+#endif  // FOSSIL_H

src/FslSettingsDialog.cpp

@@ -0,0 +1,66 @@
+#include "FslSettingsDialog.h"
+#include "Utils.h"
+#include "ui_FslSettingsDialog.h"
+
+#include <QDir>
+
+///////////////////////////////////////////////////////////////////////////////
+FslSettingsDialog::FslSettingsDialog(QWidget *parent, Settings &_settings) : QDialog(parent, Qt::Sheet), ui(new Ui::FslSettingsDialog), settings(&_settings)
+{
+    ui->setupUi(this);
+
+    ui->lineUIPort->setText(settings->GetFossilValue(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->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->SetFossilValue(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_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);
+}

src/FslSettingsDialog.h

@@ -0,0 +1,32 @@
+#ifndef FSLSETTINGSDIALOG_H
+#define FSLSETTINGSDIALOG_H
+
+#include "AppSettings.h"
+#include <QDialog>
+
+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

src/LoggedProcess.cpp

@@ -3,20 +3,19 @@
 ///////////////////////////////////////////////////////////////////////////////
 LoggedProcess::LoggedProcess(QObject *parent) : QProcess(parent)
 {
-	setProcessChannelMode(QProcess::MergedChannels);
-	connect(this, SIGNAL(readyReadStandardOutput()), this, SLOT(onReadyReadStandardOutput()));
+    setProcessChannelMode(QProcess::MergedChannels);
+    connect(this, SIGNAL(readyReadStandardOutput()), this, SLOT(onReadyReadStandardOutput()));
 }
 
 void LoggedProcess::getLogAndClear(QByteArray &buffer)
 {
-	QMutexLocker lck(&mutex);
-	buffer = log;
-	log.clear();
+    QMutexLocker lck(&mutex);
+    buffer = log;
+    log.clear();
 }
 
 void LoggedProcess::onReadyReadStandardOutput()
 {
-	QMutexLocker lck(&mutex);
-	log.append(readAllStandardOutput());
+    QMutexLocker lck(&mutex);
+    log.append(readAllStandardOutput());
 }
-

src/LoggedProcess.h

@@ -1,24 +1,24 @@
 #ifndef LOGGEDPROCESS_H
 #define LOGGEDPROCESS_H
 
-#include <QProcess>
 #include <QMutex>
+#include <QProcess>
 
 class LoggedProcess : public QProcess
 {
-	Q_OBJECT
+    Q_OBJECT
 public:
-	explicit LoggedProcess(QObject *parent = 0);
-	void getLogAndClear(QByteArray &buffer);
-	bool isLogEmpty() const { return log.isEmpty(); }
-	qint64 logBytesAvailable() const { return log.size(); }
+    explicit LoggedProcess(QObject *parent = 0);
+    void getLogAndClear(QByteArray &buffer);
+    bool isLogEmpty() const { return log.isEmpty(); }
+    qint64 logBytesAvailable() const { return log.size(); }
 
 private slots:
-	void onReadyReadStandardOutput();
+    void onReadyReadStandardOutput();
 
 private:
-	QMutex mutex;
-	QByteArray log;
+    QMutex mutex;
+    QByteArray log;
 };
 
-#endif // LOGGEDPROCESS_H
+#endif  // LOGGEDPROCESS_H

src/MainWindow.h

@@ -1,274 +1,207 @@
 #ifndef MAINWINDOW_H
 #define MAINWINDOW_H
 
+#include "AppSettings.h"
+#include "Workspace.h"
+#include <QFileIconProvider>
 #include <QMainWindow>
-#include <QStandardItemModel>
 #include <QStringList>
-#include <QMap>
-#include <QFileInfo>
-#include <QDir>
-#include <QProcess>
-#include <QSet>
-#include "SettingsDialog.h"
 
-namespace Ui {
-	class MainWindow;
-}
-
-
-class QStringList;
-
-//////////////////////////////////////////////////////////////////////////
-// RepoFile
-//////////////////////////////////////////////////////////////////////////
-struct RepoFile
+namespace Ui
 {
-	enum EntryType
-	{
-		TYPE_UNKNOWN		= 1<<0,
-		TYPE_UNCHANGED		= 1<<1,
-		TYPE_EDITTED		= 1<<2,
-		TYPE_ADDED			= 1<<3,
-		TYPE_DELETED		= 1<<4,
-		TYPE_MISSING		= 1<<5,
-		TYPE_RENAMED		= 1<<6,
-		TYPE_CONFLICTED		= 1<<7,
-		TYPE_MODIFIED		= TYPE_EDITTED|TYPE_ADDED|TYPE_DELETED|TYPE_MISSING|TYPE_RENAMED|TYPE_CONFLICTED,
-		TYPE_REPO			= TYPE_UNCHANGED|TYPE_MODIFIED,
-		TYPE_ALL			= TYPE_UNKNOWN|TYPE_REPO
-	};
-
-	RepoFile(QFileInfo &info, EntryType type, const QString &repoPath)
-	{
-		FileInfo = info;
-		Type = type;
-		FilePath = getRelativeFilename(repoPath);
-		Path = FileInfo.absolutePath();
-
-		// Strip the workspace path from the path
-		Q_ASSERT(Path.indexOf(repoPath)==0);
-		Path = Path.mid(repoPath.length()+1);
-	}
-
-	bool isType(EntryType t) const
-	{
-		return Type == t;
-	}
-
-	void setType(EntryType t)
-	{
-		Type = t;
-	}
-
-	EntryType getType() const
-	{
-		return Type;
-	}
-
-	QFileInfo getFileInfo() const
-	{
-		return FileInfo;
-	}
-
-	bool isRepo() const
-	{
-		return Type == TYPE_UNCHANGED || Type == TYPE_EDITTED;
-	}
-
-	const QString &getFilePath() const
-	{
-		return FilePath;
-	}
-
-	QString getFilename() const
-	{
-		return FileInfo.fileName();
-	}
-
-	const QString &getPath() const
-	{
-		return Path;
-	}
-
-	QString getRelativeFilename(const QString &path)
-	{
-		QString abs_base_dir = QDir(path).absolutePath();
-
-		QString relative = FileInfo.absoluteFilePath();
-		int index = relative.indexOf(abs_base_dir);
-		if(index<0)
-			return QString("");
-
-		return relative.right(relative.length() - abs_base_dir.length()-1);
-	}
-
-private:
-	QFileInfo	FileInfo;
-	EntryType	Type;
-	QString		FilePath;
-	QString		Path;
-};
+class MainWindow;
+}
 
 //////////////////////////////////////////////////////////////////////////
 // MainWindow
 //////////////////////////////////////////////////////////////////////////
 class MainWindow : public QMainWindow
 {
-	Q_OBJECT
+    Q_OBJECT
 
 public:
-	explicit MainWindow(Settings &_settings, QWidget *parent = 0, QString *workspacePath = 0);
-	~MainWindow();
-	bool diffFile(QString repoFile);
-	void fullRefresh();
+    explicit MainWindow(Settings &_settings, QWidget *parent = 0, QString *workspacePath = 0);
+    ~MainWindow();
+    bool diffFile(const QString &repoFile);
+    void fullRefresh();
 
 private:
-	typedef QSet<QString> stringset_t;
-	enum RunFlags
-	{
-		RUNFLAGS_NONE			= 0<<0,
-		RUNFLAGS_SILENT_INPUT	= 1<<0,
-		RUNFLAGS_SILENT_OUTPUT	= 1<<1,
-		RUNFLAGS_SILENT_ALL		= RUNFLAGS_SILENT_INPUT | RUNFLAGS_SILENT_OUTPUT,
-		RUNFLAGS_DETACHED		= 1<<2
-	};
+    bool refresh();
+    bool scanWorkspace();
+    void applySettings();
+    void updateSettings();
+    void updateRevision(const QString &revision);
+    void setCurrentWorkspace(const QString &workspace);
+    void log(const QString &text, bool isHTML = false);
+    void setStatus(const QString &text);
+    bool uiRunning() const;
+    void getSelectionFilenames(QStringList &filenames, int includeMask = WorkspaceFile::TYPE_ALL, bool allIfEmpty = false);
+    void getFileViewSelection(QStringList &filenames, int includeMask = WorkspaceFile::TYPE_ALL, bool allIfEmpty = false);
+    void getDirViewSelection(QStringList &filenames, int includeMask = WorkspaceFile::TYPE_ALL, bool allIfEmpty = false);
+    void getSelectionStashes(QStringList &stashNames);
+    void getSelectionPaths(stringset_t &paths);
+    void getSelectionRemotes(QStringList &remoteUrls);
+    void getAllFilenames(QStringList &filenames, int includeMask = WorkspaceFile::TYPE_ALL);
+    bool startUI();
+    void stopUI();
+    void enableActions(bool on);
+    void addWorkspaceHistory(const QString &dir);
+    void rebuildRecent();
+    bool openWorkspace(const QString &path);
+    void loadFossilSettings();
+    void updateWorkspaceView();
+    void updateFileView();
+    void selectRootDir();
+    void mergeRevision(const QString &defaultRevision);
+    void updateCustomActions();
+    void invokeCustomAction(int actionId);
 
-private:
-	bool refresh();
-	void scanWorkspace();
-	bool runFossil(const QStringList &args, QStringList *output=0, int runFlags=RUNFLAGS_NONE);
-	bool runFossilRaw(const QStringList &args, QStringList *output=0, int *exitCode=0, int runFlags=RUNFLAGS_NONE);
-	void applySettings();
-	void updateSettings();
-	const QString &getCurrentWorkspace();
-	void setCurrentWorkspace(const QString &workspace);
-	void log(const QString &text, bool isHTML=false);
-	void setStatus(const QString &text);
-	bool uiRunning() const { return fossilUI.state() == QProcess::Running; }
-	void getSelectionFilenames(QStringList &filenames, int includeMask=RepoFile::TYPE_ALL, bool allIfEmpty=false);
-	void getFileViewSelection(QStringList &filenames, int includeMask=RepoFile::TYPE_ALL, bool allIfEmpty=false);
-	void getDirViewSelection(QStringList &filenames, int includeMask=RepoFile::TYPE_ALL, bool allIfEmpty=false);
-	void getStashViewSelection(QStringList &stashNames, bool allIfEmpty=false);
-	void getSelectionPaths(stringset_t &paths);
-	void getAllFilenames(QStringList &filenames, int includeMask=RepoFile::TYPE_ALL);
-	bool startUI();
-	void stopUI();
-	void enableActions(bool on);
-	void addWorkspace(const QString &dir);
-	void rebuildRecent();
-	bool openWorkspace(const QString &path);
-	void loadFossilSettings();
-	QString getFossilPath();
-	QString getFossilHttpAddress();
-	bool scanDirectory(QFileInfoList &entries, const QString& dirPath, const QString &baseDir, const QString ignoreSpec, const bool& abort);
-	void updateDirView();
-	void updateFileView();
-	void updateStashView();
-	void selectRootDir();
-	void fossilBrowse(const QString &fossilUrl);
-	void dragEnterEvent(class QDragEnterEvent *event);
-	void dropEvent(class QDropEvent *event);
-	void setBusy(bool busy);
-	virtual QMenu *createPopupMenu();
+    void fossilBrowse(const QString &fossilUrl);
+    void dragEnterEvent(class QDragEnterEvent *event);
+    void dropEvent(class QDropEvent *event);
+    void setBusy(bool busy);
+    virtual QMenu *createPopupMenu();
+    const QIcon &getCachedIcon(const char *name);
+    const QIcon &getCachedFileIcon(const QFileInfo &finfo);
 
-	enum RepoStatus
-	{
-		REPO_OK,
-		REPO_NOT_FOUND,
-		REPO_OLD_SCHEMA
-	};
-
-	RepoStatus getRepoStatus();
-
-	enum ViewMode
-	{
-		VIEWMODE_LIST,
-		VIEWMODE_TREE
-	};
+    enum ViewMode
+    {
+        VIEWMODE_LIST,
+        VIEWMODE_TREE
+    };
 
 private slots:
-	// Manual slots.
-	// Use a different naming scheme to prevent warnings from Qt's automatic signaling
-	void onOpenRecent();
-	void onTreeViewSelectionChanged(const class QItemSelection &selected, const class QItemSelection &deselected);
-	void onFileViewDragOut();
-	void onAbort();
+    // Manual slots.
+    // Use a different naming scheme to prevent warnings from Qt's automatic signaling
+    void onOpenRecent();
+    void onWorkspaceTreeViewSelectionChanged(const class QItemSelection &selected, const class QItemSelection &deselected);
+    void onFileViewDragOut();
+    void onSearchBoxTextChanged(const QString &text);
+    void onSearch();
+    void onCustomActionTriggered();
 
-	// Designer slots
-	void on_actionRefresh_triggered();
-	void on_actionDiff_triggered();
-	void on_actionFossilUI_triggered();
-	void on_actionQuit_triggered();
-	void on_actionTimeline_triggered();
-	void on_actionHistory_triggered();
-	void on_actionClearLog_triggered();
-	void on_tableView_doubleClicked(const QModelIndex &index);
-	void on_treeView_doubleClicked(const QModelIndex &index);
-	void on_actionOpenFile_triggered();
-	void on_actionPush_triggered();
-	void on_actionPull_triggered();
-	void on_actionCommit_triggered();
-	void on_actionAdd_triggered();
-	void on_actionDelete_triggered();
-	void on_actionRevert_triggered();
-	void on_actionOpenContaining_triggered();
-	void on_actionRename_triggered();
-	void on_actionUndo_triggered();
-	void on_actionAbout_triggered();
-	void on_actionUpdate_triggered();
-	void on_actionSettings_triggered();
-	void on_actionViewUnchanged_triggered();
-	void on_actionViewModified_triggered();
-	void on_actionViewUnknown_triggered();
-	void on_actionViewIgnored_triggered();
-	void on_actionViewAsList_triggered();
-	void on_actionOpenFolder_triggered();
-	void on_actionRenameFolder_triggered();
-	void on_actionNewRepository_triggered();
-	void on_actionOpenRepository_triggered();
-	void on_actionCloseRepository_triggered();
-	void on_actionCloneRepository_triggered();
-	void on_actionViewStash_triggered();
-	void on_actionNewStash_triggered();
-	void on_actionApplyStash_triggered();
-	void on_actionDeleteStash_triggered();
-	void on_actionDiffStash_triggered();
-	void on_textBrowser_customContextMenuRequested(const QPoint &pos);
-	void on_tableView_customContextMenuRequested(const QPoint &pos);
+    // Designer slots
+    void on_actionRefresh_triggered();
+    void on_actionDiff_triggered();
+    void on_actionFossilUI_triggered();
+    void on_actionQuit_triggered();
+    void on_actionTimeline_triggered();
+    void on_actionHistory_triggered();
+    void on_actionClearLog_triggered();
+    void on_fileTableView_doubleClicked(const QModelIndex &index);
+    void on_workspaceTreeView_doubleClicked(const QModelIndex &index);
+    void on_actionOpenFile_triggered();
+    void on_actionPush_triggered();
+    void on_actionPull_triggered();
+    void on_actionPushRemote_triggered();
+    void on_actionPullRemote_triggered();
+    void on_actionCommit_triggered();
+    void on_actionAdd_triggered();
+    void on_actionAddRemove_triggered();
+    void on_actionDelete_triggered();
+    void on_actionRevert_triggered();
+    void on_actionOpenContaining_triggered();
+    void on_actionRename_triggered();
+    void on_actionUndo_triggered();
+    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();
+    void on_actionViewIgnored_triggered();
+    void on_actionViewAll_triggered();
+    void on_actionViewModifedOnly_triggered();
+    void on_actionViewAsList_triggered();
+    void on_actionViewAsFolders_triggered();
+    void on_actionOpenFolder_triggered();
+    void on_actionRenameFolder_triggered();
+    void on_actionNewRepository_triggered();
+    void on_actionOpenRepository_triggered();
+    void on_actionCloseRepository_triggered();
+    void on_actionCloneRepository_triggered();
+    void on_actionCreateStash_triggered();
+    void on_actionApplyStash_triggered();
+    void on_actionDeleteStash_triggered();
+    void on_actionDiffStash_triggered();
+    void on_textBrowser_customContextMenuRequested(const QPoint &pos);
+    void on_fileTableView_customContextMenuRequested(const QPoint &pos);
+    void on_workspaceTreeView_customContextMenuRequested(const QPoint &pos);
+    void on_actionCreateTag_triggered();
+    void on_actionDeleteTag_triggered();
+    void on_actionCreateBranch_triggered();
+    void on_actionMergeBranch_triggered();
+    void on_actionEditRemote_triggered();
+    void on_actionSetDefaultRemote_triggered();
+    void on_actionAddRemote_triggered();
+    void on_actionDeleteRemote_triggered();
+    void on_actionAbortOperation_triggered();
 
 private:
-	enum
-	{
-		MAX_RECENT=5
-	};
+    class MainWinUICallback : public UICallback
+    {
+    public:
+        MainWinUICallback() : mainWindow(0), aborted(false) {}
 
+        void init(class MainWindow *mainWindow) { this->mainWindow = mainWindow; }
 
-	Ui::MainWindow		*ui;
-	QStandardItemModel	repoFileModel;
-	QStandardItemModel	repoDirModel;
-	QStandardItemModel	repoStashModel;
-	QProcess			fossilUI;
-	class QAction		*recentWorkspaceActs[MAX_RECENT];
-	class QProgressBar	*progressBar;
-	class QShortcut		*abortShortcut;
-	bool				abortOperation;
+        virtual void logText(const QString &text, bool isHTML);
+        virtual void beginProcess(const QString &text);
+        virtual void updateProcess(const QString &text);
+        virtual bool processAborted() const { return aborted; }
+        virtual void endProcess();
+        virtual QMessageBox::StandardButton Query(const QString &title, const QString &query, QMessageBox::StandardButtons buttons);
+        void abortProcess() { aborted = true; }
 
-	Settings			&settings;
-	QString				projectName;
-	QString				repositoryFile;
-	QStringList			workspaceHistory;
-	QString				currentWorkspace;
-	ViewMode			viewMode;
-	stringset_t			selectedDirs;	// The directory selected in the tree
+    private:
+        class MainWindow *mainWindow;
+        bool aborted;
+    };
 
-	// Repository State
-	typedef QList<RepoFile*> filelist_t;
-	typedef QMap<QString, RepoFile*> filemap_t;
-	typedef QMap<QString, QString> stashmap_t;
-	filemap_t			workspaceFiles;
-	stringset_t			pathSet;
-	stashmap_t			stashMap;
+    friend class MainWinUICallback;
+
+    enum
+    {
+        MAX_RECENT = 5
+    };
+
+    typedef QMap<QString, QIcon> icon_map_t;
+
+    Ui::MainWindow *ui;
+    QFileIconProvider iconProvider;
+    icon_map_t iconCache;
+    class QAction *recentWorkspaceActs[MAX_RECENT];
+    class QAction *customActions[MAX_CUSTOM_ACTIONS];
+    class QAction *fileActionSeparator;
+    class QAction *workspaceActionSeparator;
+    class QProgressBar *progressBar;
+    class QToolButton *abortButton;
+    class QLabel *lblTags;
+    class SearchBox *searchBox;
+    class QShortcut *searchShortcut;
+    QMenu *menuWorkspace;
+    QMenu *menuStashes;
+    QMenu *menuTags;
+    QMenu *menuBranches;
+    QMenu *menuRemotes;
+
+    bool operationAborted;
+    stringset_t selectedDirs;  // The directory selected in the tree
+    QStringList selectedTags;
+    QStringList selectedBranches;
+    QStringList versionList;
+
+    Workspace workspace;
+    Workspace &getWorkspace() { return workspace; }
+    const Workspace &getWorkspace() const { return workspace; }
+
+    Settings &settings;
+    QStringList workspaceHistory;
+
+    MainWinUICallback uiCallback;
+
+    ViewMode viewMode;
 };
 
-#endif // MAINWINDOW_H
-
+#endif  // MAINWINDOW_H

src/RemoteDialog.cpp

@@ -0,0 +1,98 @@
+#include "RemoteDialog.h"
+#include "Utils.h"
+#include "ui_RemoteDialog.h"
+#include <QClipboard>
+#include <QDir>
+#include <QFileDialog>
+#include <QMessageBox>
+#include <QUrl>
+
+//-----------------------------------------------------------------------------
+RemoteDialog::RemoteDialog(QWidget *parent) : QDialog(parent), ui(new Ui::RemoteDialog)
+{
+    ui->setupUi(this);
+}
+
+//-----------------------------------------------------------------------------
+RemoteDialog::~RemoteDialog()
+{
+    delete ui;
+}
+
+//-----------------------------------------------------------------------------
+bool RemoteDialog::run(QWidget *parent, QUrl &url, QString &name)
+{
+    RemoteDialog dlg(parent);
+
+    // Set URL components
+    if (!url.isEmpty())
+    {
+        dlg.ui->lineName->setText(name);
+
+        if (url.isLocalFile())
+            dlg.ui->lineURL->setText(QDir::toNativeSeparators(url.toLocalFile()));
+        else
+        {
+            QString url_no_credentials = UrlToStringNoCredentials(url);
+            dlg.ui->lineURL->setText(url_no_credentials);
+            dlg.ui->lineUserName->setText(url.userName());
+            dlg.ui->linePassword->setText(url.password());
+        }
+    }
+
+    if (dlg.exec() != QDialog::Accepted)
+        return false;
+
+    QString urltext = dlg.ui->lineURL->text();
+
+    // Check if the url is a local file
+    if (QFileInfo(urltext).exists())
+        url = QUrl::fromLocalFile(urltext);
+    else
+    {
+        url = QUrl::fromUserInput(urltext);
+        if (url.isEmpty() || !url.isValid())
+        {
+            QMessageBox::critical(parent, tr("Error"), tr("Invalid URL."), QMessageBox::Ok);
+            return false;
+        }
+    }
+
+    if (!dlg.ui->lineUserName->text().trimmed().isEmpty())
+        url.setUserName(dlg.ui->lineUserName->text());
+
+    if (!dlg.ui->linePassword->text().trimmed().isEmpty())
+        url.setPassword(dlg.ui->linePassword->text());
+
+    name = dlg.ui->lineName->text().trimmed();
+    if (name.isEmpty())
+        name = UrlToStringNoCredentials(url);
+
+    return true;
+}
+
+//-----------------------------------------------------------------------------
+void RemoteDialog::GetRepositoryPath(QString &pathResult)
+{
+    QString filter(tr("Fossil Repository") + QString(" (*." FOSSIL_EXT ")"));
+
+    pathResult = QFileDialog::getSaveFileName(this, tr("Select Fossil Repository"), QDir::toNativeSeparators(pathResult), filter, &filter, QFileDialog::DontConfirmOverwrite);
+}
+
+//-----------------------------------------------------------------------------
+void RemoteDialog::on_btnSelectSourceRepo_clicked()
+{
+    QString path = ui->lineURL->text();
+    GetRepositoryPath(path);
+
+    if (path.trimmed().isEmpty())
+        return;
+
+    if (!QFile::exists(path))
+    {
+        QMessageBox::critical(this, tr("Error"), tr("Invalid Repository File."), QMessageBox::Ok);
+        return;
+    }
+
+    ui->lineURL->setText(QDir::toNativeSeparators(path));
+}

src/RemoteDialog.h

@@ -0,0 +1,30 @@
+#ifndef REMOTEDIALOG_H
+#define REMOTEDIALOG_H
+
+#include <QDialog>
+
+namespace Ui
+{
+class RemoteDialog;
+}
+
+class RemoteDialog : public QDialog
+{
+    Q_OBJECT
+
+public:
+    explicit RemoteDialog(QWidget *parent = 0);
+    ~RemoteDialog();
+
+    static bool run(QWidget *parent, class QUrl &url, QString &name);
+
+private slots:
+    void on_btnSelectSourceRepo_clicked();
+
+private:
+    void GetRepositoryPath(QString &pathResult);
+
+    Ui::RemoteDialog *ui;
+};
+
+#endif  // REMOTEDIALOG_H

src/RevisionDialog.cpp

@@ -0,0 +1,96 @@
+#include "RevisionDialog.h"
+#include "Utils.h"
+#include "ui_RevisionDialog.h"
+
+//-----------------------------------------------------------------------------
+RevisionDialog::RevisionDialog(QWidget *parent, const QStringList &completions, const QString &defaultValue) : QDialog(parent), ui(new Ui::RevisionDialog), completer(completions, parent)
+{
+    ui->setupUi(this);
+    ui->cmbRevision->setCompleter(&completer);
+
+    ui->cmbRevision->addItems(completions);
+
+    if (!defaultValue.isEmpty())
+    {
+#if (QT_VERSION < QT_VERSION_CHECK(5, 0, 0))
+        int index = ui->cmbRevision->findText(defaultValue);
+        if (index >= 0)
+            ui->cmbRevision->setCurrentIndex(index);
+#else
+        ui->cmbRevision->setCurrentText(defaultValue);
+#endif
+    }
+}
+
+//-----------------------------------------------------------------------------
+RevisionDialog::~RevisionDialog()
+{
+    delete ui;
+}
+
+//-----------------------------------------------------------------------------
+QString RevisionDialog::runUpdate(QWidget *parent, const QString &title, const QStringList &completions, const QString &defaultValue)
+{
+    RevisionDialog 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 RevisionDialog::runMerge(QWidget *parent, const QString &title, const QStringList &completions, const QString &defaultValue, bool &integrate, bool &force)
+{
+    RevisionDialog 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 RevisionDialog::runNewTag(QWidget *parent, const QString &title, const QStringList &completions, const QString &defaultValue, QString &revision, QString &name)
+{
+    RevisionDialog 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;
+}

src/RevisionDialog.h

@@ -0,0 +1,29 @@
+#ifndef REVISIONDIALOG_H
+#define REVISIONDIALOG_H
+
+#include <QCompleter>
+#include <QDialog>
+
+namespace Ui
+{
+class RevisionDialog;
+}
+
+class RevisionDialog : public QDialog
+{
+    Q_OBJECT
+
+public:
+    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::RevisionDialog *ui;
+    QCompleter completer;
+};
+
+#endif  // REVISIONDIALOG_H

src/SearchBox.cpp

@@ -0,0 +1,18 @@
+#include "SearchBox.h"
+#include <QKeyEvent>
+
+SearchBox::SearchBox(QWidget *parent) : QLineEdit(parent) {}
+
+SearchBox::~SearchBox() {}
+
+void SearchBox::keyPressEvent(QKeyEvent *event)
+{
+    // Clear text on escape
+    if (event->key() == Qt::Key_Escape)
+    {
+        setText("");
+        clearFocus();
+    }
+    else
+        QLineEdit::keyPressEvent(event);
+}

src/SearchBox.h

@@ -0,0 +1,21 @@
+#ifndef SEARCHBOX_H
+#define SEARCHBOX_H
+
+#include <QLineEdit>
+
+class SearchBox : public QLineEdit
+{
+    Q_OBJECT
+public:
+    explicit SearchBox(QWidget *parent = 0);
+    ~SearchBox();
+
+signals:
+
+public slots:
+
+protected:
+    void keyPressEvent(QKeyEvent *event);
+};
+
+#endif  // SEARCHBOX_H

src/SettingsDialog.cpp

@@ -1,305 +1,202 @@
 #include "SettingsDialog.h"
-#include "ui_SettingsDialog.h"
-#include <QFileDialog>
 #include "Utils.h"
+#include "ui_SettingsDialog.h"
 
-#include <QSettings>
-#include <QCoreApplication>
 #include <QDir>
-#include <QTranslator>
-#include <QResource>
-#include <QTextCodec>
-
 
 ///////////////////////////////////////////////////////////////////////////////
-QString SettingsDialog::SelectExe(QWidget *parent, const QString &description)
+SettingsDialog::SettingsDialog(QWidget *parent, Settings &_settings) : QDialog(parent, Qt::Sheet), ui(new Ui::SettingsDialog), settings(&_settings)
 {
-	QString filter(tr("Applications"));
-#ifdef Q_OS_WIN
-	filter += " (*.exe)";
-#else
-	filter += " (*)";
-#endif
-	QString path = QFileDialog::getOpenFileName(
-				parent,
-				description,
-				QString(),
-				filter,
-				&filter);
+    ui->setupUi(this);
 
-	if(!QFile::exists(path))
-		return QString();
+    CreateLangMap();
 
-	return path;
-}
+    ui->cmbDoubleClickAction->addItem(tr("Diff File"));
+    ui->cmbDoubleClickAction->addItem(tr("Open File"));
+    ui->cmbDoubleClickAction->addItem(tr("Open Containing Folder"));
+    ui->cmbDoubleClickAction->addItem(tr("Custom Action %0").arg(1));
 
-///////////////////////////////////////////////////////////////////////////////
-SettingsDialog::SettingsDialog(QWidget *parent, Settings &_settings) :
-	QDialog(parent, Qt::Sheet),
-	ui(new Ui::SettingsDialog),
-	settings(&_settings)
-{
-	ui->setupUi(this);
+    ui->cmbFossilBrowser->addItem(tr("System"));
+    ui->cmbFossilBrowser->addItem(tr("Internal"));
 
-	CreateLangMap();
+    // 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->cmbDoubleClickAction->addItem(tr("Diff File"));
-	ui->cmbDoubleClickAction->addItem(tr("Open File"));
-	ui->cmbDoubleClickAction->addItem(tr("Open Containing Folder"));
+    // Initialize language combo
+    foreach (const LangMap &m, langMap)
+        ui->cmbActiveLanguage->addItem(m.name);
 
-	ui->cmbFossilBrowser->addItem(tr("System"));
-	ui->cmbFossilBrowser->addItem(tr("Internal"));
+    QString lang = settings->GetValue(FUEL_SETTING_LANGUAGE).toString();
+    // Select current language
+    ui->cmbActiveLanguage->setCurrentIndex(ui->cmbActiveLanguage->findText(LangIdToName(lang)));
 
-	// 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());
+    lastActionIndex = 0;
+    currentCustomActions = settings->GetCustomActions();
 
-	// Initialize language combo
-	foreach(const LangMap &m, langMap)
-		ui->cmbActiveLanguage->addItem(m.name);
+    ui->cmbCustomActionContext->addItem(tr("Files"));
+    ui->cmbCustomActionContext->addItem(tr("Folders"));
+    ui->cmbCustomActionContext->setCurrentIndex(0);
 
-	QString lang = settings->GetValue(FUEL_SETTING_LANGUAGE).toString();
-	// Select current language
-	ui->cmbActiveLanguage->setCurrentIndex(
-				ui->cmbActiveLanguage->findText(
-					LangIdToName(lang)));
+    GetCustomAction(0);
 
-	// 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());
+    for (auto &a : currentCustomActions)
+    {
+        ui->cmbCustomAction->addItem(a.Id);
+    }
+    ui->cmbCustomAction->setCurrentIndex(0);
 }
 
 //-----------------------------------------------------------------------------
 SettingsDialog::~SettingsDialog()
 {
-	delete ui;
+    delete ui;
 }
 
 //-----------------------------------------------------------------------------
 bool SettingsDialog::run(QWidget *parent, Settings &settings)
 {
-	SettingsDialog dlg(parent, settings);
-	return dlg.exec() == QDialog::Accepted;
+    SettingsDialog dlg(parent, settings);
+    return dlg.exec() == QDialog::Accepted;
 }
 
 //-----------------------------------------------------------------------------
 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()<FILE_DLBCLICK_ACTION_MAX);
-	settings->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());
+    settings->SetValue(FUEL_SETTING_FOSSIL_PATH, QDir::fromNativeSeparators(ui->lineFossilPath->text()));
+    Q_ASSERT(ui->cmbDoubleClickAction->currentIndex() >= FILE_DLBCLICK_ACTION_DIFF && ui->cmbDoubleClickAction->currentIndex() < FILE_DLBCLICK_ACTION_MAX);
+    settings->SetValue(FUEL_SETTING_FILE_DBLCLICK, ui->cmbDoubleClickAction->currentIndex());
+    settings->SetValue(FUEL_SETTING_WEB_BROWSER, ui->cmbFossilBrowser->currentIndex());
 
-	Q_ASSERT(settings->HasValue(FUEL_SETTING_LANGUAGE));
-	QString curr_langid = settings->GetValue(FUEL_SETTING_LANGUAGE).toString();
-	QString new_langid = LangNameToId(ui->cmbActiveLanguage->currentText());
-	Q_ASSERT(!new_langid.isEmpty());
-	settings->SetValue(FUEL_SETTING_LANGUAGE, new_langid);
+    Q_ASSERT(settings->HasValue(FUEL_SETTING_LANGUAGE));
+    QString curr_langid = settings->GetValue(FUEL_SETTING_LANGUAGE).toString();
+    QString new_langid = LangNameToId(ui->cmbActiveLanguage->currentText());
+    Q_ASSERT(!new_langid.isEmpty());
+    settings->SetValue(FUEL_SETTING_LANGUAGE, new_langid);
 
-	if(curr_langid != new_langid)
-		QMessageBox::information(this, tr("Restart required"), tr("The language change will take effect after restarting the application"), QMessageBox::Ok);
+    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());
+    for (auto &a : currentCustomActions)
+    {
+        a.Description = a.Description.trimmed();
+        a.Command = a.Command.trimmed();
+    }
 
-	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());
+    PutCustomAction(ui->cmbCustomAction->currentIndex());
 
+    settings->GetCustomActions() = currentCustomActions;
 
-	settings->ApplyEnvironment();
+    settings->ApplyEnvironment();
 }
 
 //-----------------------------------------------------------------------------
 void SettingsDialog::on_btnSelectFossil_clicked()
 {
-	QString path = SelectExe(this, tr("Select Fossil executable"));
-	if(!path.isEmpty())
-		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);
+    QString path = SelectExe(this, tr("Select Fossil executable"));
+    if (!path.isEmpty())
+        ui->lineFossilPath->setText(QDir::toNativeSeparators(path));
 }
 
 //-----------------------------------------------------------------------------
 void SettingsDialog::on_btnClearMessageHistory_clicked()
 {
-	if(DialogQuery(this, tr("Clear Commit Message History"), tr("Are you sure you want to clear the commit message history?"))==QMessageBox::Yes)
-		settings->SetValue(FUEL_SETTING_COMMIT_MSG, QStringList());
+    if (DialogQuery(this, tr("Clear Commit Message History"), tr("Are you sure you want to clear the commit message history?")) == QMessageBox::Yes)
+        settings->SetValue(FUEL_SETTING_COMMIT_MSG, QStringList());
 }
 
 //-----------------------------------------------------------------------------
 void SettingsDialog::CreateLangMap()
 {
-	langMap.append(LangMap("de_DE", "German (DE)"));
-	langMap.append(LangMap("el_GR", "Greek"));
-	langMap.append(LangMap("en_US", "English (US)"));
-	langMap.append(LangMap("es_ES", "Spanish (ES)"));
-	langMap.append(LangMap("fr_FR", "French (FR)"));
-	langMap.append(LangMap("ru_RU", "Russian (RU)"));
-	langMap.append(LangMap("pt_PT", "Portuguese (PT)"));
+    langMap.append(LangMap("nl_NL", "Dutch (NL)"));
+    langMap.append(LangMap("en_US", "English (US)"));
+    langMap.append(LangMap("fr_FR", "French (FR)"));
+    langMap.append(LangMap("de_DE", "German (DE)"));
+    langMap.append(LangMap("el_GR", "Greek (GR)"));
+    langMap.append(LangMap("it_IT", "Italian (IT)"));
+    langMap.append(LangMap("ko_KR", "Korean (KO)"));
+    langMap.append(LangMap("pt_PT", "Portuguese (PT)"));
+    langMap.append(LangMap("ru_RU", "Russian (RU)"));
+    langMap.append(LangMap("es_ES", "Spanish (ES)"));
 }
 
 //-----------------------------------------------------------------------------
 QString SettingsDialog::LangIdToName(const QString &id)
 {
-	foreach(const LangMap &m, langMap)
-	{
-		if(m.id == id)
-			return m.name;
-	}
+    foreach (const LangMap &m, langMap)
+    {
+        if (m.id == id)
+            return m.name;
+    }
 
-	return "";
+    return "";
 }
 
 //-----------------------------------------------------------------------------
 QString SettingsDialog::LangNameToId(const QString &name)
 {
-	foreach(const LangMap &m, langMap)
-	{
-		if(m.name == name)
-			return m.id;
-	}
+    foreach (const LangMap &m, langMap)
+    {
+        if (m.name == name)
+            return m.id;
+    }
 
-	return "";
-}
-
-///////////////////////////////////////////////////////////////////////////////
-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_IGNORE_GLOB, Setting("", Setting::TYPE_FOSSIL_LOCAL));
-	Mappings.insert(FOSSIL_SETTING_CRNL_GLOB, Setting("", Setting::TYPE_FOSSIL_LOCAL));
-	Mappings.insert(FOSSIL_SETTING_REMOTE_URL, Setting("off", Setting::TYPE_FOSSIL_COMMAND));
-
-	// Go into portable mode when explicitly requested or if a config file exists next to the executable
-	QString ini_path = QDir::toNativeSeparators(QCoreApplication::applicationDirPath() + QDir::separator() + QCoreApplication::applicationName() + ".ini");
-	if( portableMode || QFile::exists(ini_path))
-		store = new QSettings(ini_path, QSettings::IniFormat);
-	else
-	{
-		// Linux: ~/.config/organizationName/applicationName.conf
-		// Windows: HKEY_CURRENT_USER\Software\organizationName\Fuel
-		store = new QSettings(QSettings::UserScope, QCoreApplication::organizationName(), QCoreApplication::applicationName());
-	}
-	Q_ASSERT(store);
-
-	if(!HasValue(FUEL_SETTING_FILE_DBLCLICK))
-		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();
+    return "";
 }
 
 //-----------------------------------------------------------------------------
-Settings::~Settings()
+void SettingsDialog::on_btnSelectCustomFileActionCommand_clicked()
 {
-	Q_ASSERT(store);
-	delete store;
+    QString path = SelectExe(this, tr("Select command"));
+    if (path.isEmpty())
+        return;
+
+    // Quote path if it contains spaces
+    if (path.indexOf(' ') != -1)
+        path = '"' + path + '"';
+
+    ui->lineCustomActionCommand->setText(QDir::toNativeSeparators(path));
 }
 
 //-----------------------------------------------------------------------------
-void Settings::ApplyEnvironment()
+void SettingsDialog::GetCustomAction(int index)
 {
-	QString lang_id = GetValue(FUEL_SETTING_LANGUAGE).toString();
-#if (QT_VERSION < QT_VERSION_CHECK(5, 0, 0))
-	QTextCodec::setCodecForTr(QTextCodec::codecForName("utf8"));
-#endif
-	if(!InstallLang(lang_id))
-		SetValue(FUEL_SETTING_LANGUAGE, "en_US");
+    Q_ASSERT(index >= 0 && index < currentCustomActions.size());
+    CustomAction &action = currentCustomActions[index];
+    ui->lineCustomActionDescription->setText(action.Description);
+    ui->lineCustomActionCommand->setText(action.Command);
+    ui->cmbCustomActionContext->setCurrentIndex(action.Context - 1);
+    ui->chkCustomActionMultipleSelection->setChecked(action.MultipleSelection);
 }
 
 //-----------------------------------------------------------------------------
-bool Settings::InstallLang(const QString &langId)
+void SettingsDialog::PutCustomAction(int index)
 {
-	if(langId == "en_US")
-	{
-		QCoreApplication::instance()->removeTranslator(&translator);
-		return true;
-	}
-
-	QString locale_path = QString(":intl/intl/%0.qm").arg(langId);
-	if(!translator.load(locale_path))
-		return false;
-
-	Q_ASSERT(!translator.isEmpty());
-	QCoreApplication::instance()->installTranslator(&translator);
-
-
-	return true;
+    Q_ASSERT(index >= 0 && index < currentCustomActions.size());
+    CustomAction &action = currentCustomActions[index];
+    action.Description = ui->lineCustomActionDescription->text().trimmed();
+    action.Command = ui->lineCustomActionCommand->text().trimmed();
+    action.Context = static_cast<CustomActionContext>(ui->cmbCustomActionContext->currentIndex() + 1);
+    action.MultipleSelection = ui->chkCustomActionMultipleSelection->isChecked();
 }
 
 //-----------------------------------------------------------------------------
-bool Settings::HasValue(const QString &name) const
+void SettingsDialog::on_cmbCustomAction_currentIndexChanged(int index)
 {
-	return store->contains(name);
+    if (index != lastActionIndex)
+        PutCustomAction(lastActionIndex);
+
+    GetCustomAction(index);
+    lastActionIndex = index;
 }
 
 //-----------------------------------------------------------------------------
-const QVariant Settings::GetValue(const QString &name)
+void SettingsDialog::on_cmbCustomActionContext_currentIndexChanged(int index)
 {
-	if(!HasValue(name))
-		return QVariant();
-	return store->value(name);
-}
-
-//-----------------------------------------------------------------------------
-void Settings::SetValue(const QString &name, const QVariant &value)
-{
-	store->setValue(name, value);
-}
-
-//-----------------------------------------------------------------------------
-QVariant &Settings::GetFossilValue(const QString &name)
-{
-	mappings_t::iterator it=Mappings.find(name);
-	Q_ASSERT(it!=Mappings.end());
-	return it.value().Value;
-}
-
-//-----------------------------------------------------------------------------
-void Settings::SetFossilValue(const QString &name, const QVariant &value)
-{
-	mappings_t::iterator it=Mappings.find(name);
-	Q_ASSERT(it!=Mappings.end());
-	it->Value = value;
-}
-
-//-----------------------------------------------------------------------------
-bool Settings::SupportsLang(const QString &langId) const
-{
-	QString locale_path = QString(":intl/intl/%0.qm").arg(langId);
-	QResource res(locale_path);
-	return res.isValid();
+    int action_index = ui->cmbCustomAction->currentIndex();
+    if (action_index < 0)
+        return;
+    Q_ASSERT(action_index >= 0 && action_index < currentCustomActions.size());
+    currentCustomActions[action_index].Context = static_cast<CustomActionContext>(index + 1);
 }

src/SettingsDialog.h

@@ -1,121 +1,52 @@
 #ifndef SETTINGSDIALOG_H
 #define SETTINGSDIALOG_H
 
+#include "AppSettings.h"
 #include <QDialog>
-#include <QMap>
-#include <QVariant>
-#include <QTranslator>
 
-
-namespace Ui {
-	class SettingsDialog;
+namespace Ui
+{
+class SettingsDialog;
 }
 
-#define FUEL_SETTING_FOSSIL_PATH			"FossilPath"
-#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"
-#define FOSSIL_SETTING_PROXY_URL			"proxy"
-#define FOSSIL_SETTING_IGNORE_GLOB			"ignore-glob"
-#define FOSSIL_SETTING_CRNL_GLOB			"crnl-glob"
-#define FOSSIL_SETTING_REMOTE_URL			"remote-url"
-
-
-enum FileDblClickAction
-{
-	FILE_DLBCLICK_ACTION_DIFF,
-	FILE_DLBCLICK_ACTION_OPEN,
-	FILE_DLBCLICK_ACTION_OPENCONTAINING,
-	FILE_DLBCLICK_ACTION_MAX
-};
-
-struct Settings
-{
-	struct Setting
-	{
-		enum SettingType
-		{
-			TYPE_FOSSIL_GLOBAL,
-			TYPE_FOSSIL_LOCAL,
-			TYPE_FOSSIL_COMMAND
-		};
-
-		Setting(QVariant value, SettingType type) : Value(value), Type(type)
-		{}
-		QVariant Value;
-		SettingType Type;
-	};
-	typedef QMap<QString, Setting> mappings_t;
-
-
-	Settings(bool portableMode = false);
-	~Settings();
-
-	void				ApplyEnvironment();
-
-	// App configuration access
-	class QSettings *	GetStore() { return store; }
-	bool				HasValue(const QString &name) const; // store->contains(FUEL_SETTING_FOSSIL_PATH)
-	const QVariant		GetValue(const QString &name); // settings.store->value
-	void				SetValue(const QString &name, const QVariant &value); // settings.store->value
-
-	// Fossil configuration access
-	QVariant &		GetFossilValue(const QString &name);
-	void			SetFossilValue(const QString &name, const QVariant &value);
-	mappings_t &	GetMappings() { return Mappings; }
-
-	bool			SupportsLang(const QString &langId) const;
-	bool			InstallLang(const QString &langId);
-private:
-	mappings_t		Mappings;
-	class QSettings	*store;
-	QTranslator		translator;
-};
-
-
 class SettingsDialog : public QDialog
 {
-	Q_OBJECT
+    Q_OBJECT
 
 public:
-	explicit SettingsDialog(QWidget *parent, Settings &_settings);
-	~SettingsDialog();
-
-	static bool run(QWidget *parent, Settings &_settings);
+    explicit SettingsDialog(QWidget *parent, Settings &_settings);
+    ~SettingsDialog();
 
+    static bool run(QWidget *parent, Settings &_settings);
 
 private slots:
-	void on_btnSelectFossil_clicked();
-	void on_buttonBox_accepted();
-	void on_btnSelectFossilGDiff_clicked();
-	void on_btnSelectGMerge_clicked();
-	void on_btnClearMessageHistory_clicked();
+    void on_btnSelectFossil_clicked();
+    void on_buttonBox_accepted();
+    void on_btnClearMessageHistory_clicked();
+    void on_btnSelectCustomFileActionCommand_clicked();
+    void on_cmbCustomAction_currentIndexChanged(int index);
+    void on_cmbCustomActionContext_currentIndexChanged(int index);
 
 private:
-	static QString SelectExe(QWidget *parent, const QString &description);
-	QString LangIdToName(const QString &id);
-	QString LangNameToId(const QString &name);
-	void CreateLangMap();
+    QString LangIdToName(const QString &id);
+    QString LangNameToId(const QString &name);
+    void CreateLangMap();
+    void GetCustomAction(int index);
+    void PutCustomAction(int index);
 
-	struct LangMap
-	{
-		LangMap(const QString &_id, const QString &_name)
-			: id(_id), name(_name)
-		{
-		}
+    struct LangMap
+    {
+        LangMap(const QString &_id, const QString &_name) : id(_id), name(_name) {}
 
-		QString id;
-		QString name;
-	};
+        QString id;
+        QString name;
+    };
 
-	QList<LangMap>	langMap;
-	Ui::SettingsDialog *ui;
-	Settings *settings;
+    QList<LangMap> langMap;
+    Ui::SettingsDialog *ui;
+    Settings *settings;
+    Settings::custom_actions_t currentCustomActions;
+    int lastActionIndex;
 };
 
-#endif // SETTINGSDIALOG_H
+#endif  // SETTINGSDIALOG_H

src/Utils.cpp

@@ -1,22 +1,71 @@
 #include "Utils.h"
-#include <QMessageBox>
+#include <QCryptographicHash>
 #include <QDialogButtonBox>
+#include <QEventLoop>
+#include <QFileDialog>
+#include <QMessageBox>
+#include <QProcess>
+#include <QUrl>
+#include <qt5keychain/keychain.h>
 
 ///////////////////////////////////////////////////////////////////////////////
 QMessageBox::StandardButton DialogQuery(QWidget *parent, const QString &title, const QString &query, QMessageBox::StandardButtons buttons)
 {
-	QMessageBox mb(QMessageBox::Question, title, query, buttons, parent, Qt::Dialog | Qt::MSWindowsFixedSizeDialogHint | Qt::Sheet );
-	mb.setDefaultButton(QMessageBox::No);
-	mb.setWindowModality(Qt::WindowModal);
-	mb.setModal(true);
-	mb.exec();
-	QMessageBox::StandardButton res = mb.standardButton(mb.clickedButton());
-	return res;
+    QMessageBox mb(QMessageBox::Question, title, query, buttons, parent, Qt::Dialog | Qt::MSWindowsFixedSizeDialogHint | Qt::Sheet);
+    mb.setDefaultButton(QMessageBox::No);
+    mb.setWindowModality(Qt::WindowModal);
+    mb.setModal(true);
+    mb.exec();
+    QMessageBox::StandardButton res = mb.standardButton(mb.clickedButton());
+    return res;
 }
 
 //-----------------------------------------------------------------------------
-#if 0 // Unused
-#include <QInputDialog>
+QString QuotePath(const QString &path)
+{
+    return path;
+}
+
+//-----------------------------------------------------------------------------
+QStringList QuotePaths(const QStringList &paths)
+{
+    QStringList res;
+    for (int i = 0; i < paths.size(); ++i)
+        res.append(QuotePath(paths[i]));
+    return res;
+}
+
+//-----------------------------------------------------------------------------
+QString SelectExe(QWidget *parent, const QString &description)
+{
+    QString filter(QObject::tr("Applications"));
+#ifdef Q_OS_WIN
+    filter += " (*.exe)";
+#else
+    filter += " (*)";
+#endif
+    QString path = QFileDialog::getOpenFileName(parent, description, QString(), filter, &filter);
+
+    if (!QFile::exists(path))
+        return QString();
+
+#ifdef Q_OS_MACX
+    // Guess actual executable from bundle dir
+    QFileInfo fi(path);
+    if (fi.isDir() && path.indexOf(".app") != -1)
+    {
+        path += "/Contents/MacOS/" + fi.baseName();
+
+        if (!QFile::exists(path))
+            return QString();
+    }
+#endif
+
+    return path;
+}
+//-----------------------------------------------------------------------------
+#if 0  // Unused
+#    include <QInputDialog>
 
 static bool DialogQueryText(QWidget *parent, const QString &title, const QString &query, QString &text, bool isPassword=false)
 {
@@ -38,10 +87,9 @@ static bool DialogQueryText(QWidget *parent, const QString &title, const QString
 }
 #endif
 
-
 #ifdef Q_OS_WIN
 // Explorer File Context Menu support. Based on http://www.microsoft.com/msj/0497/wicked/wicked0497.aspx
-#include <shlobj.h>
+#    include <shlobj.h>
 
 //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 //
@@ -66,228 +114,538 @@ static bool DialogQueryText(QWidget *parent, const QString &title, const QString
 //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 bool ShowExplorerMenu(HWND hwnd, const QString &path, const QPoint &qpoint)
 {
-	struct Util
-	{
-		//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-		//  FUNCTION:       GetNextItem
-		//  DESCRIPTION:    Finds the next item in an item ID list.
-		//  INPUT:          pidl = Pointer to an item ID list.
-		//  RETURNS:        Pointer to the next item.
-		//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-		static LPITEMIDLIST GetNextItem (LPITEMIDLIST pidl)
-		{
-			USHORT nLen;
+    struct Util
+    {
+        //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+        //  FUNCTION:       GetNextItem
+        //  DESCRIPTION:    Finds the next item in an item ID list.
+        //  INPUT:          pidl = Pointer to an item ID list.
+        //  RETURNS:        Pointer to the next item.
+        //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+        static LPITEMIDLIST GetNextItem(LPITEMIDLIST pidl)
+        {
+            USHORT nLen;
 
-			if ((nLen = pidl->mkid.cb) == 0)
-				return NULL;
+            if ((nLen = pidl->mkid.cb) == 0)
+                return NULL;
 
-			return (LPITEMIDLIST) (((LPBYTE) pidl) + nLen);
-		}
+            return (LPITEMIDLIST)(((LPBYTE)pidl) + nLen);
+        }
 
-		//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-		//  FUNCTION:       GetItemCount
-		//  DESCRIPTION:    Computes the number of item IDs in an item ID list.
-		//  INPUT:          pidl = Pointer to an item ID list.
-		//  RETURNS:        Number of item IDs in the list.
-		//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-		static UINT GetItemCount (LPITEMIDLIST pidl)
-		{
-			USHORT nLen;
-			UINT nCount;
+        //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+        //  FUNCTION:       GetItemCount
+        //  DESCRIPTION:    Computes the number of item IDs in an item ID list.
+        //  INPUT:          pidl = Pointer to an item ID list.
+        //  RETURNS:        Number of item IDs in the list.
+        //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+        static UINT GetItemCount(LPITEMIDLIST pidl)
+        {
+            USHORT nLen;
+            UINT nCount;
 
-			nCount = 0;
-			while ((nLen = pidl->mkid.cb) != 0) {
-				pidl = GetNextItem (pidl);
-				nCount++;
-			}
-			return nCount;
-		}
+            nCount = 0;
+            while ((nLen = pidl->mkid.cb) != 0)
+            {
+                pidl = GetNextItem(pidl);
+                nCount++;
+            }
+            return nCount;
+        }
 
-		//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-		//  FUNCTION:       DuplicateItem
-		//  DESCRIPTION:    Makes a copy of the next item in an item ID list.
-		//  INPUT:          pMalloc = Pointer to an IMalloc interface.
-		//                  pidl    = Pointer to an item ID list.
-		//  RETURNS:        Pointer to an ITEMIDLIST containing the copied item ID.
-		//  NOTES:          It is the caller's responsibility to free the memory
-		//                  allocated by this function when the item ID is no longer
-		//                  needed. Example:
-		//                    pidlItem = DuplicateItem (pMalloc, pidl);
-		//                      .
-		//                      .
-		//                      .
-		//                    pMalloc->lpVtbl->Free (pMalloc, pidlItem);
-		//                  Failure to free the ITEMIDLIST will result in memory
-		//                  leaks.
-		//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-		static LPITEMIDLIST DuplicateItem (LPMALLOC pMalloc, LPITEMIDLIST pidl)
-		{
-			USHORT nLen;
-			LPITEMIDLIST pidlNew;
+        //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+        //  FUNCTION:       DuplicateItem
+        //  DESCRIPTION:    Makes a copy of the next item in an item ID list.
+        //  INPUT:          pMalloc = Pointer to an IMalloc interface.
+        //                  pidl    = Pointer to an item ID list.
+        //  RETURNS:        Pointer to an ITEMIDLIST containing the copied item ID.
+        //  NOTES:          It is the caller's responsibility to free the memory
+        //                  allocated by this function when the item ID is no longer
+        //                  needed. Example:
+        //                    pidlItem = DuplicateItem (pMalloc, pidl);
+        //                      .
+        //                      .
+        //                      .
+        //                    pMalloc->lpVtbl->Free (pMalloc, pidlItem);
+        //                  Failure to free the ITEMIDLIST will result in memory
+        //                  leaks.
+        //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+        static LPITEMIDLIST DuplicateItem(LPMALLOC pMalloc, LPITEMIDLIST pidl)
+        {
+            USHORT nLen;
+            LPITEMIDLIST pidlNew;
 
-			nLen = pidl->mkid.cb;
-			if (nLen == 0)
-				return NULL;
+            nLen = pidl->mkid.cb;
+            if (nLen == 0)
+                return NULL;
 
-			pidlNew = (LPITEMIDLIST) pMalloc->Alloc (
-				nLen + sizeof (USHORT));
-			if (pidlNew == NULL)
-				return NULL;
+            pidlNew = (LPITEMIDLIST)pMalloc->Alloc(nLen + sizeof(USHORT));
+            if (pidlNew == NULL)
+                return NULL;
 
-			CopyMemory (pidlNew, pidl, nLen);
-			*((USHORT*) (((LPBYTE) pidlNew) + nLen)) = 0;
+            CopyMemory(pidlNew, pidl, nLen);
+            *((USHORT *)(((LPBYTE)pidlNew) + nLen)) = 0;
 
-			return pidlNew;
-		}
-	};
+            return pidlNew;
+        }
+    };
 
+    LPITEMIDLIST pidlMain, pidlItem, pidlNextItem, *ppidl;
+    UINT nCount;
+    POINT point;
+    point.x = qpoint.x();
+    point.y = qpoint.y();
 
-	LPITEMIDLIST pidlMain, pidlItem, pidlNextItem, *ppidl;
-	UINT nCount;
-	POINT point;
-	point.x = qpoint.x();
-	point.y = qpoint.y();
+    WCHAR wchPath[MAX_PATH];
+    memset(wchPath, 0, sizeof(wchPath));
+    Q_ASSERT(path.length() < MAX_PATH);
+    path.toWCharArray(wchPath);
 
-	WCHAR wchPath[MAX_PATH];
-	memset(wchPath, 0, sizeof(wchPath));
-	Q_ASSERT(path.length()<MAX_PATH);
-	path.toWCharArray(wchPath);
+    //
+    // Get pointers to the shell's IMalloc interface and the desktop's
+    // IShellFolder interface.
+    //
+    bool bResult = false;
 
-	//
-	// Get pointers to the shell's IMalloc interface and the desktop's
-	// IShellFolder interface.
-	//
-	bool bResult = false;
-	
-	LPMALLOC pMalloc;
-	if (!SUCCEEDED (SHGetMalloc (&pMalloc)))
-		return bResult;
+    LPMALLOC pMalloc;
+    if (!SUCCEEDED(SHGetMalloc(&pMalloc)))
+        return bResult;
 
-	LPSHELLFOLDER psfFolder;
-	if (!SUCCEEDED (SHGetDesktopFolder (&psfFolder))) {
-		pMalloc->Release();
-		return bResult;
-	}
+    LPSHELLFOLDER psfFolder;
+    if (!SUCCEEDED(SHGetDesktopFolder(&psfFolder)))
+    {
+        pMalloc->Release();
+        return bResult;
+    }
 
-	//
-	// Convert the path name into a pointer to an item ID list (pidl).
-	//
-	ULONG ulCount, ulAttr;
-	if (SUCCEEDED (psfFolder->ParseDisplayName (hwnd,
-		NULL, wchPath, &ulCount, &pidlMain, &ulAttr)) && (pidlMain != NULL)) {
+    //
+    // Convert the path name into a pointer to an item ID list (pidl).
+    //
+    ULONG ulCount, ulAttr;
+    if (SUCCEEDED(psfFolder->ParseDisplayName(hwnd, NULL, wchPath, &ulCount, &pidlMain, &ulAttr)) && (pidlMain != NULL))
+    {
 
-		if ( (nCount = Util::GetItemCount (pidlMain))>0) { // nCount must be > 0
-			//
-			// Initialize psfFolder with a pointer to the IShellFolder
-			// interface of the folder that contains the item whose context
-			// menu we're after, and initialize pidlItem with a pointer to
-			// the item's item ID. If nCount > 1, this requires us to walk
-			// the list of item IDs stored in pidlMain and bind to each
-			// subfolder referenced in the list.
-			//
-			pidlItem = pidlMain;
+        if ((nCount = Util::GetItemCount(pidlMain)) > 0)
+        {  // nCount must be > 0
+            //
+            // Initialize psfFolder with a pointer to the IShellFolder
+            // interface of the folder that contains the item whose context
+            // menu we're after, and initialize pidlItem with a pointer to
+            // the item's item ID. If nCount > 1, this requires us to walk
+            // the list of item IDs stored in pidlMain and bind to each
+            // subfolder referenced in the list.
+            //
+            pidlItem = pidlMain;
 
-			while (--nCount) {
-				//
-				// Create a 1-item item ID list for the next item in pidlMain.
-				//
-				pidlNextItem = Util::DuplicateItem (pMalloc, pidlItem);
-				if (pidlNextItem == NULL) {
-					pMalloc->Free(pidlMain);
-					psfFolder->Release ();
-					pMalloc->Release ();
-					return bResult;
-				}
+            while (--nCount)
+            {
+                //
+                // Create a 1-item item ID list for the next item in pidlMain.
+                //
+                pidlNextItem = Util::DuplicateItem(pMalloc, pidlItem);
+                if (pidlNextItem == NULL)
+                {
+                    pMalloc->Free(pidlMain);
+                    psfFolder->Release();
+                    pMalloc->Release();
+                    return bResult;
+                }
 
-				//
-				// Bind to the folder specified in the new item ID list.
-				//
-				LPSHELLFOLDER psfNextFolder;
-				if (!SUCCEEDED (psfFolder->BindToObject (
-					pidlNextItem, NULL, IID_IShellFolder, (void**)&psfNextFolder))) {
-					pMalloc->Free (pidlNextItem);
-					pMalloc->Free (pidlMain);
-					psfFolder->Release ();
-					pMalloc->Release ();
-					return bResult;
-				}
+                //
+                // Bind to the folder specified in the new item ID list.
+                //
+                LPSHELLFOLDER psfNextFolder;
+                if (!SUCCEEDED(psfFolder->BindToObject(pidlNextItem, NULL, IID_IShellFolder, (void **)&psfNextFolder)))
+                {
+                    pMalloc->Free(pidlNextItem);
+                    pMalloc->Free(pidlMain);
+                    psfFolder->Release();
+                    pMalloc->Release();
+                    return bResult;
+                }
 
-				//
-				// Release the IShellFolder pointer to the parent folder
-				// and set psfFolder equal to the IShellFolder pointer for
-				// the current folder.
-				//
-				psfFolder->Release ();
-				psfFolder = psfNextFolder;
+                //
+                // Release the IShellFolder pointer to the parent folder
+                // and set psfFolder equal to the IShellFolder pointer for
+                // the current folder.
+                //
+                psfFolder->Release();
+                psfFolder = psfNextFolder;
 
-				//
-				// Release the storage for the 1-item item ID list we created
-				// just a moment ago and initialize pidlItem so that it points
-				// to the next item in pidlMain.
-				//
-				pMalloc->Free(pidlNextItem);
-				pidlItem = Util::GetNextItem (pidlItem);
-			}
+                //
+                // Release the storage for the 1-item item ID list we created
+                // just a moment ago and initialize pidlItem so that it points
+                // to the next item in pidlMain.
+                //
+                pMalloc->Free(pidlNextItem);
+                pidlItem = Util::GetNextItem(pidlItem);
+            }
 
-			//
-			// Get a pointer to the item's IContextMenu interface and call
-			// IContextMenu::QueryContextMenu to initialize a context menu.
-			//
-			ppidl = &pidlItem;
-			LPCONTEXTMENU pContextMenu;
-			if (SUCCEEDED (psfFolder->GetUIObjectOf (
-				hwnd, 1, (const ITEMIDLIST **)ppidl, IID_IContextMenu, NULL, (void**)&pContextMenu))) {
+            //
+            // Get a pointer to the item's IContextMenu interface and call
+            // IContextMenu::QueryContextMenu to initialize a context menu.
+            //
+            ppidl = &pidlItem;
+            LPCONTEXTMENU pContextMenu;
+            if (SUCCEEDED(psfFolder->GetUIObjectOf(hwnd, 1, (const ITEMIDLIST **)ppidl, IID_IContextMenu, NULL, (void **)&pContextMenu)))
+            {
 
-				HMENU hMenu = CreatePopupMenu ();
-				if (SUCCEEDED (pContextMenu->QueryContextMenu (
-					hMenu, 0, 1, 0x7FFF, CMF_EXPLORE))) {
+                HMENU hMenu = CreatePopupMenu();
+                if (SUCCEEDED(pContextMenu->QueryContextMenu(hMenu, 0, 1, 0x7FFF, CMF_EXPLORE)))
+                {
 
+                    //
+                    // Display the context menu.
+                    //
+                    UINT nCmd = TrackPopupMenu(hMenu, TPM_LEFTALIGN | TPM_LEFTBUTTON | TPM_RIGHTBUTTON | TPM_RETURNCMD, point.x, point.y, 0, hwnd, NULL);
 
-					//
-					// Display the context menu.
-					//
-					UINT nCmd = TrackPopupMenu (hMenu, TPM_LEFTALIGN |
-						TPM_LEFTBUTTON | TPM_RIGHTBUTTON | TPM_RETURNCMD,
-						point.x, point.y, 0, hwnd, NULL);
+                    //
+                    // If a command was selected from the menu, execute it.
+                    //
+                    if (nCmd)
+                    {
+                        CMINVOKECOMMANDINFO ici;
+                        memset(&ici, 0, sizeof(ici));
+                        ici.cbSize = sizeof(CMINVOKECOMMANDINFO);
+                        ici.fMask = 0;
+                        ici.hwnd = hwnd;
+                        ici.lpVerb = MAKEINTRESOURCEA(nCmd - 1);
+                        ici.lpParameters = NULL;
+                        ici.lpDirectory = NULL;
+                        ici.nShow = SW_SHOWNORMAL;
+                        ici.dwHotKey = 0;
+                        ici.hIcon = NULL;
 
+                        if (SUCCEEDED(pContextMenu->InvokeCommand((CMINVOKECOMMANDINFO *)&ici)))
+                            bResult = true;
+                    }
+                }
+                DestroyMenu(hMenu);
+                pContextMenu->Release();
+            }
+        }
+        pMalloc->Free(pidlMain);
+    }
 
-					//
-					// If a command was selected from the menu, execute it.
-					//
-					if (nCmd) {
-						CMINVOKECOMMANDINFO ici;
-						memset(&ici, 0, sizeof(ici) );
-						ici.cbSize          = sizeof (CMINVOKECOMMANDINFO);
-						ici.fMask           = 0;
-						ici.hwnd            = hwnd;
-						ici.lpVerb          = MAKEINTRESOURCEA (nCmd - 1);
-						ici.lpParameters    = NULL;
-						ici.lpDirectory     = NULL;
-						ici.nShow           = SW_SHOWNORMAL;
-						ici.dwHotKey        = 0;
-						ici.hIcon           = NULL;
+    //
+    // Clean up and return.
+    //
+    psfFolder->Release();
+    pMalloc->Release();
 
-						if (SUCCEEDED (
-							pContextMenu->InvokeCommand (
-							(CMINVOKECOMMANDINFO*)&ici)))
-							bResult = true;
-					}
-				}
-				DestroyMenu (hMenu);
-				pContextMenu->Release ();
-			}
-		}
-		pMalloc->Free (pidlMain);
-	}
-
-	//
-	// Clean up and return.
-	//
-	psfFolder->Release ();
-	pMalloc->Release ();
-
-	return bResult;
+    return bResult;
 }
 
 #endif
 
+//-----------------------------------------------------------------------------
+void ParseProperties(QStringMap &properties, const QStringList &lines, QChar separator)
+{
+    properties.clear();
+    foreach (QString l, lines)
+    {
+        l = l.trimmed();
+        int index = l.indexOf(separator);
+
+        QString key;
+        QString value;
+        if (index != -1)
+        {
+            key = l.left(index).trimmed();
+            value = l.mid(index + 1).trimmed();
+        }
+        else
+            key = l;
+
+        properties.insert(key, value);
+    }
+}
+
+//------------------------------------------------------------------------------
+void GetStandardItemTextRecursive(QString &name, const QStandardItem &item, const QChar &separator)
+{
+    if (item.parent())
+    {
+        GetStandardItemTextRecursive(name, *item.parent());
+        name.append(separator);
+    }
+
+    name.append(item.data(Qt::DisplayRole).toString());
+}
+
+//------------------------------------------------------------------------------
+void BuildNameToModelIndex(name_modelindex_map_t &map, const QStandardItem &item)
+{
+    QString name;
+    GetStandardItemTextRecursive(name, item);
+    map.insert(name, item.index());
+
+    for (int i = 0; i < item.rowCount(); ++i)
+    {
+        const QStandardItem *child = item.child(i);
+        Q_ASSERT(child);
+        BuildNameToModelIndex(map, *child);
+    }
+}
+
+//------------------------------------------------------------------------------
+void BuildNameToModelIndex(name_modelindex_map_t &map, const QStandardItemModel &model)
+{
+    for (int i = 0; i < model.rowCount(); ++i)
+    {
+        const QStandardItem *item = model.item(i);
+        Q_ASSERT(item);
+        BuildNameToModelIndex(map, *item);
+    }
+}
+
+//------------------------------------------------------------------------------
+bool KeychainSet(QObject *parent, const QUrl &url, QSettings &settings)
+{
+    QEventLoop loop(parent);
+    QKeychain::WritePasswordJob job(UrlToStringNoCredentials(url));
+
+#ifdef Q_OS_WIN
+    settings.beginGroup("Keychain");
+    job.setSettings(&settings);
+#else
+    Q_UNUSED(settings)
+#endif
+
+    job.connect(&job, SIGNAL(finished(QKeychain::Job *)), &loop, SLOT(quit()));
+    job.setAutoDelete(false);
+    job.setInsecureFallback(false);
+    job.setKey(url.userName());
+    job.setTextData(url.password());
+    job.start();
+    loop.exec();
+
+#ifdef Q_OS_WIN
+    settings.endGroup();
+#endif
+
+    return job.error() == QKeychain::NoError;
+}
+
+//------------------------------------------------------------------------------
+bool KeychainGet(QObject *parent, QUrl &url, QSettings &settings)
+{
+    QEventLoop loop(parent);
+    QKeychain::ReadPasswordJob job(UrlToStringNoCredentials(url));
+
+#ifdef Q_OS_WIN
+    settings.beginGroup("Keychain");
+    job.setSettings(&settings);
+#else
+    Q_UNUSED(settings)
+#endif
+
+    job.connect(&job, SIGNAL(finished(QKeychain::Job *)), &loop, SLOT(quit()));
+    job.setAutoDelete(false);
+    job.setInsecureFallback(false);
+    job.setAutoDelete(false);
+    job.setKey(url.userName());
+    job.start();
+    loop.exec();
+
+#ifdef Q_OS_WIN
+    settings.endGroup();
+#endif
+
+    if (job.error() != QKeychain::NoError)
+        return false;
+
+    url.setUserName(job.key());
+    url.setPassword(job.textData());
+    return true;
+}
+
+//------------------------------------------------------------------------------
+bool KeychainDelete(QObject *parent, const QUrl &url, QSettings &settings)
+{
+    QEventLoop loop(parent);
+    QKeychain::DeletePasswordJob job(UrlToStringNoCredentials(url));
+
+#ifdef Q_OS_WIN
+    settings.beginGroup("Keychain");
+    job.setSettings(&settings);
+#else
+    Q_UNUSED(settings)
+#endif
+
+    job.connect(&job, SIGNAL(finished(QKeychain::Job *)), &loop, SLOT(quit()));
+    job.setAutoDelete(false);
+    job.setInsecureFallback(false);
+    job.setAutoDelete(false);
+    job.setKey(url.userName());
+    job.start();
+    loop.exec();
+
+#ifdef Q_OS_WIN
+    settings.endGroup();
+#endif
+
+    return job.error() == QKeychain::NoError;
+}
+
+//------------------------------------------------------------------------------
+QString HashString(const QString &str)
+{
+    QCryptographicHash hash(QCryptographicHash::Sha1);
+    const QByteArray ba(str.toUtf8());
+    hash.addData(ba.data(), ba.size());
+    QString str_out(hash.result().toHex());
+    return str_out;
+}
+
+//------------------------------------------------------------------------------
+QString UrlToStringDisplay(const QUrl &url)
+{
+#if (QT_VERSION < QT_VERSION_CHECK(5, 0, 0))
+    return url.toString(QUrl::RemovePassword);
+#else
+    return url.toDisplayString();
+#endif
+}
+
+//------------------------------------------------------------------------------
+QString UrlToStringNoCredentials(const QUrl &url)
+{
+#if (QT_VERSION < QT_VERSION_CHECK(5, 0, 0))
+    return url.toString(QUrl::RemoveUserInfo);
+#else
+    return url.toString(QUrl::PrettyDecoded | QUrl::RemoveUserInfo);
+#endif
+}
+
+//------------------------------------------------------------------------------
+// Attempt to address weird behaviour of QUrl to string conversions
+QString UrlToString(const QUrl &url)
+{
+    QString username = url.userName();
+    // QUrl generates bad local file url for Windows local paths with drive letters
+    if (url.isLocalFile())
+        return url.toLocalFile();
+    else if (username.isEmpty())  // QUrl generates an invalid url like http://@host.domain/path
+        return UrlToStringNoCredentials(url);
+    else
+        return url.toEncoded();
+}
+
+//------------------------------------------------------------------------------
+void SplitCommandLine(const QString &commandLine, QString &command, QString &extraParams)
+{
+    // Process command string
+    command = commandLine.trimmed();
+
+    Q_ASSERT(!command.isEmpty());
+
+    // Split command from embedded params
+    extraParams.clear();
+
+    // Command ends after first space
+    QChar cmd_char_end = ' ';
+    int cmd_start = 0;
+    int backtrack = 0;
+
+    // ...unless it is a quoted command
+    if (command[0] == '"')
+    {
+        cmd_char_end = '"';
+        cmd_start = 1;
+        backtrack = 1;
+    }
+
+    int cmd_end = command.indexOf(cmd_char_end, cmd_start);
+    if (cmd_end > 0)
+    {
+        extraParams = command.mid(cmd_end + 1);
+        command = command.mid(cmd_start, cmd_end - backtrack);
+    }
+
+    command = command.trimmed();
+    extraParams = extraParams.trimmed();
+}
+
+//------------------------------------------------------------------------------
+bool SpawnExternalProcess(QObject *processParent, const QString &command, const QStringList &fileList, const stringset_t &pathSet, const QString &workspaceDir, UICallback &uiCallback)
+{
+    static const char *MACRO_FILE = "%FILE";
+    static const char *MACRO_FOLDER = "%FOLDER";
+    static const char *MACRO_WORKSPACE = "%WORKSPACE";
+
+    QStringList params;
+
+    QString cmd, extra_params;
+    SplitCommandLine(command, cmd, extra_params);
+
+    // Push all additional params, except those containing macros
+    QString macro_file;
+    QString macro_folder;
+
+    if (!extra_params.isEmpty())
+    {
+        QStringList extra_param_list = extra_params.split(' ');
+
+        foreach (const QString &p, extra_param_list)
+        {
+            if (p.indexOf(MACRO_FILE) != -1)
+            {
+                macro_file = p;
+                continue;
+            }
+            else if (p.indexOf(MACRO_FOLDER) != -1)
+            {
+                macro_folder = p;
+                continue;
+            }
+            else if (p.indexOf(MACRO_WORKSPACE) != -1)
+            {
+                // Add in-place
+                QString n = p;
+                n.replace(MACRO_WORKSPACE, QDir::toNativeSeparators(workspaceDir), Qt::CaseInsensitive);
+                params.push_back(n);
+                continue;
+            }
+
+            params.push_back(p);
+        }
+    }
+
+    // Build file params
+    if (!macro_file.isEmpty())
+    {
+        foreach (const QString &f, fileList)
+        {
+            QString path = QDir::toNativeSeparators(QFileInfo(workspaceDir + PATH_SEPARATOR + f).absoluteFilePath());
+
+            QString macro = macro_file;
+            path = macro.replace(MACRO_FILE, path, Qt::CaseInsensitive);
+            params.append(path);
+        }
+    }
+
+    // Build folder params
+    if (!macro_folder.isEmpty())
+    {
+        foreach (const QString &f, pathSet)
+        {
+            QString path = QDir::toNativeSeparators(QFileInfo(workspaceDir + PATH_SEPARATOR + f).absoluteFilePath());
+
+            QString macro = macro_folder;
+            path = macro.replace(MACRO_FOLDER, path, Qt::CaseInsensitive);
+            params.append(path);
+        }
+    }
+
+    uiCallback.logText("<b>" + cmd + " " + params.join(" ") + "</b><br>", true);
+
+    QProcess proc(processParent);
+    return proc.startDetached(cmd, params);
+}
+
+//------------------------------------------------------------------------------
+void TrimStringList(QStringList &list)
+{
+    for (int i = 0; i < list.length(); ++i)
+        list[i] = list[i].trimmed();
+}

src/Utils.h

@@ -1,14 +1,68 @@
 #ifndef UTILS_H
 #define UTILS_H
 
-#include <QString>
+#include <QMap>
 #include <QMessageBox>
+#include <QSet>
+#include <QSettings>
+#include <QStandardItem>
+#include <QString>
 
-QMessageBox::StandardButton DialogQuery(QWidget *parent, const QString &title, const QString &query, QMessageBox::StandardButtons buttons = QMessageBox::Yes|QMessageBox::No);
+#define COUNTOF(array) (sizeof(array) / sizeof(array[0]))
+#define FOSSIL_CHECKOUT1 "_FOSSIL_"
+#define FOSSIL_CHECKOUT2 ".fslckout"
+#define FOSSIL_EXT "fossil"
+#define PATH_SEPARATOR "/"
+
+typedef QSet<QString> stringset_t;
+
+class UICallback
+{
+public:
+    virtual void logText(const QString &text, bool isHTML) = 0;
+    virtual void beginProcess(const QString &text) = 0;
+    virtual void updateProcess(const QString &text) = 0;
+    virtual bool processAborted() const = 0;
+    virtual void endProcess() = 0;
+    virtual QMessageBox::StandardButton Query(const QString &title, const QString &query, QMessageBox::StandardButtons buttons) = 0;
+};
+
+class ScopedStatus
+{
+public:
+    ScopedStatus(UICallback *callback, const QString &text) : uiCallback(callback) { uiCallback->beginProcess(text); }
+
+    ~ScopedStatus() { uiCallback->endProcess(); }
+
+private:
+    UICallback *uiCallback;
+};
+
+QMessageBox::StandardButton DialogQuery(QWidget *parent, const QString &title, const QString &query, QMessageBox::StandardButtons buttons = QMessageBox::Yes | QMessageBox::No);
+QString QuotePath(const QString &path);
+QStringList QuotePaths(const QStringList &paths);
+QString SelectExe(QWidget *parent, const QString &description);
+
+typedef QMap<QString, QModelIndex> name_modelindex_map_t;
+void GetStandardItemTextRecursive(QString &name, const QStandardItem &item, const QChar &separator = '/');
+void BuildNameToModelIndex(name_modelindex_map_t &map, const QStandardItem &item);
+void BuildNameToModelIndex(name_modelindex_map_t &map, const QStandardItemModel &model);
+bool KeychainSet(QObject *parent, const QUrl &url, QSettings &settings);
+bool KeychainGet(QObject *parent, QUrl &url, QSettings &settings);
+bool KeychainDelete(QObject *parent, const QUrl &url, QSettings &settings);
+QString HashString(const QString &str);
+QString UrlToStringDisplay(const QUrl &url);
+QString UrlToStringNoCredentials(const QUrl &url);
+QString UrlToString(const QUrl &url);
+void SplitCommandLine(const QString &commandLine, QString &command, QString &extraParams);
+bool SpawnExternalProcess(QObject *processParent, const QString &command, const QStringList &fileList, const stringset_t &pathSet, const QString &workspaceDir, UICallback &uiCallback);
+void TrimStringList(QStringList &list);
+
+typedef QMap<QString, QString> QStringMap;
+void ParseProperties(QStringMap &properties, const QStringList &lines, QChar separator = ' ');
 
 #ifdef Q_OS_WIN
-	bool ShowExplorerMenu(HWND hwnd, const QString &path, const QPoint &qpoint);
+bool ShowExplorerMenu(HWND hwnd, const QString &path, const QPoint &qpoint);
 #endif
 
-
-#endif // UTILS_H
+#endif  // UTILS_H

src/Workspace.cpp

@@ -0,0 +1,417 @@
+#include "Workspace.h"
+#include "Utils.h"
+#include <QCoreApplication>
+
+//-----------------------------------------------------------------------------
+Workspace::Workspace() {}
+//-----------------------------------------------------------------------------
+Workspace::~Workspace()
+{
+    clearState();
+    remotes.clear();
+}
+
+//------------------------------------------------------------------------------
+void Workspace::clearState()
+{
+    // Dispose RepoFiles
+    foreach (WorkspaceFile *r, getFiles())
+        delete r;
+
+    getFiles().clear();
+    getPaths().clear();
+    pathState.clear();
+    stashMap.clear();
+    branchNames.clear();
+    tags.clear();
+    isIntegrated = false;
+}
+
+//------------------------------------------------------------------------------
+void Workspace::storeWorkspace(QSettings &store)
+{
+    QString workspace = fossil().getWorkspacePath();
+    if (workspace.isEmpty())
+        return;
+
+    store.beginGroup("Remotes");
+    QString workspace_hash = HashString(QDir::toNativeSeparators(workspace));
+
+    store.beginWriteArray(workspace_hash);
+    int index = 0;
+    for (auto &re : remotes)
+    {
+        store.setArrayIndex(index);
+        store.setValue("Name", re.name);
+        QUrl url = re.url;
+        url.setPassword("");
+        store.setValue("Url", url);
+        if (re.isDefault)
+            store.setValue("Default", re.isDefault);
+        else
+            store.remove("Default");
+    }
+    store.endArray();
+    store.endGroup();
+}
+
+//------------------------------------------------------------------------------
+bool Workspace::switchWorkspace(const QString &workspace, QSettings &store)
+{
+    // Save Remotes
+    storeWorkspace(store);
+    clearState();
+    remotes.clear();
+
+    fossil().setWorkspace("");
+    if (workspace.isEmpty())
+        return true;
+
+    QString new_workspace = QFileInfo(workspace).absoluteFilePath();
+
+    if (!QDir::setCurrent(new_workspace))
+        return false;
+
+    fossil().setWorkspace(new_workspace);
+
+    // Load Remotes
+    QString workspace_hash = HashString(QDir::toNativeSeparators(new_workspace));
+
+    store.beginGroup("Remotes");
+    int num_remotes = store.beginReadArray(workspace_hash);
+    for (int i = 0; i < num_remotes; ++i)
+    {
+        store.setArrayIndex(i);
+
+        QString name = store.value("Name").toString();
+        QUrl url = store.value("Url").toUrl();
+        bool def = store.value("Default", false).toBool();
+        addRemote(url, name);
+        if (def)
+            setRemoteDefault(url);
+    }
+    store.endArray();
+    store.endGroup();
+
+#if 0  // FIXME: Disabled this because if fossil's remote does not match exactly what we have stored (url and username), it will be automatically added every-time
+	// Add the default url from fossil
+	QUrl default_remote;
+	if(fossil().getRemoteUrl(default_remote) && default_remote.isValid() && !default_remote.isEmpty())
+	{
+		default_remote.setPassword("");
+
+		// Add Default remote if not available already
+		if(findRemote(default_remote)==NULL)
+		{
+			addRemote(default_remote, UrlToStringDisplay(default_remote));
+			if(getRemoteDefault().isEmpty())
+				setRemoteDefault(default_remote);
+		}
+	}
+#endif
+
+    return true;
+}
+
+//------------------------------------------------------------------------------
+bool Workspace::scanDirectory(QFileInfoList &entries, const QString &dirPath, const QString &baseDir, const QStringList &ignorePatterns, UICallback &uiCallback)
+{
+    QDir dir(dirPath);
+
+    uiCallback.updateProcess(dirPath);
+
+    QFileInfoList list = dir.entryInfoList(QDir::Dirs | QDir::Files | QDir::Hidden | QDir::NoDotAndDotDot);
+    for (auto &info : list)
+    {
+        if (uiCallback.processAborted())
+            return false;
+
+        QString filepath = info.filePath();
+        QString rel_path = filepath;
+        rel_path.remove(baseDir + PATH_SEPARATOR);
+
+        // Skip ignored files
+        if (!ignorePatterns.isEmpty() && QDir::match(ignorePatterns, rel_path))
+            continue;
+
+        if (info.isDir())
+        {
+            if (!scanDirectory(entries, filepath, baseDir, ignorePatterns, uiCallback))
+                return false;
+        }
+        else
+            entries.push_back(info);
+    }
+    return true;
+}
+
+//------------------------------------------------------------------------------
+static bool StringLengthDescending(const QString &l, const QString &r)
+{
+    return l.length() > r.length();
+}
+
+//------------------------------------------------------------------------------
+void Workspace::scanWorkspace(bool scanLocal, bool scanIgnored, bool scanModified, bool scanUnchanged, const QStringList &ignorePatterns, UICallback &uiCallback)
+{
+    // Scan all workspace files
+    QFileInfoList all_files;
+    QString wkdir = fossil().getWorkspacePath();
+
+    if (wkdir.isEmpty())
+        return;
+
+    // Retrieve the status of files tracked by fossil
+    QStringList res;
+    if (!fossil().listFiles(res))
+        return;
+
+    bool scan_files = scanLocal;
+
+    clearState();
+
+    QStringList paths;
+
+    uiCallback.beginProcess("");
+    if (scan_files)
+    {
+        QCoreApplication::processEvents();
+
+        QStringList ignore;
+        if (!scanIgnored)
+            ignore = ignorePatterns;
+
+        if (!scanDirectory(all_files, wkdir, wkdir, ignore, uiCallback))
+            goto _done;
+
+        for (auto &all_file : all_files)
+        {
+            QString filename = all_file.fileName();
+            QString fullpath = all_file.absoluteFilePath();
+
+            // Skip fossil files
+            if (filename == FOSSIL_CHECKOUT1 || filename == FOSSIL_CHECKOUT2 || (!fossil().getRepositoryFile().isEmpty() && QFileInfo(fullpath) == QFileInfo(fossil().getRepositoryFile())))
+                continue;
+
+            WorkspaceFile::Type type = WorkspaceFile::TYPE_UNKNOWN;
+
+            WorkspaceFile *rf = new WorkspaceFile(all_file, type, wkdir);
+            const QString &path = rf->getPath();
+            getFiles().insert(rf->getFilePath(), rf);
+            getPaths().insert(path);
+
+            // Add or merge file state into directory state
+            pathstate_map_t::iterator state_it = pathState.find(path);
+            if (state_it != pathState.end())
+                state_it.value() = static_cast<WorkspaceFile::Type>(state_it.value() | type);
+            else
+            {
+                pathState.insert(path, type);
+                paths.append(path);  // keep path in list for depth sort
+            }
+        }
+    }
+    uiCallback.endProcess();
+
+    uiCallback.beginProcess(QObject::tr("Updating..."));
+
+    // Update Files and Directories
+    for (auto &re : res)
+    {
+        QString line = re.trimmed();
+        if (line.length() == 0)
+            continue;
+
+        int space_index = line.indexOf(' ');
+        if (space_index == -1)
+            continue;
+
+        QString status_text = line.left(space_index);
+        QString fname = line.right(line.length() - space_index).trimmed();
+        WorkspaceFile::Type type = WorkspaceFile::TYPE_UNKNOWN;
+
+        // Generate a RepoFile for all non-existant fossil files
+        // or for all files if we skipped scanning the workspace
+        bool add_missing = !scan_files;
+
+        if (status_text == "EDITED")
+            type = WorkspaceFile::TYPE_EDITTED;
+        else if (status_text == "ADDED")
+            type = WorkspaceFile::TYPE_ADDED;
+        else if (status_text == "DELETED")
+        {
+            type = WorkspaceFile::TYPE_DELETED;
+            add_missing = true;
+        }
+        else if (status_text == "MISSING")
+        {
+            type = WorkspaceFile::TYPE_MISSING;
+            add_missing = true;
+        }
+        else if (status_text == "RENAMED")
+            type = WorkspaceFile::TYPE_RENAMED;
+        else if (status_text == "UNCHANGED")
+            type = WorkspaceFile::TYPE_UNCHANGED;
+        else if (status_text == "CONFLICT")
+            type = WorkspaceFile::TYPE_CONFLICTED;
+        else if (status_text == "UPDATED_BY_MERGE" || status_text == "ADDED_BY_MERGE" || status_text == "ADDED_BY_INTEGRATE" || status_text == "UPDATED_BY_INTEGRATE")
+            type = WorkspaceFile::TYPE_MERGED;
+
+        // Filter unwanted file types
+        if (((type & WorkspaceFile::TYPE_MODIFIED) && !scanModified) || ((type & WorkspaceFile::TYPE_UNCHANGED) && !scanUnchanged))
+        {
+            getFiles().remove(fname);
+            continue;
+        }
+        else
+            add_missing = true;
+
+        filemap_t::iterator it = getFiles().find(fname);
+
+        WorkspaceFile *rf = 0;
+        if (add_missing && it == getFiles().end())
+        {
+            QFileInfo info(wkdir + QDir::separator() + fname);
+            rf = new WorkspaceFile(info, type, wkdir);
+            getFiles().insert(rf->getFilePath(), rf);
+        }
+
+        if (!rf)
+        {
+            it = getFiles().find(fname);
+            Q_ASSERT(it != getFiles().end());
+            rf = *it;
+        }
+
+        rf->setType(type);
+
+        QString path = rf->getPath();
+        getPaths().insert(path);
+
+        // Add or merge file state into directory state
+        pathstate_map_t::iterator state_it = pathState.find(path);
+        if (state_it != pathState.end())
+            state_it.value() = static_cast<WorkspaceFile::Type>(state_it.value() | type);
+        else
+        {
+            pathState.insert(path, type);
+            paths.append(path);  // keep path in list for depth sort
+        }
+    }
+
+    // Sort paths, so that children (longer path) are before parents (shorter path)
+    std::sort(paths.begin(), paths.end(), StringLengthDescending);
+    foreach (const QString &p, paths)
+    {
+        pathstate_map_t::iterator state_it = pathState.find(p);
+        Q_ASSERT(state_it != pathState.end());
+        WorkspaceFile::Type state = state_it.value();
+
+        // Propagate child dir state to parents
+        QString parent_path = p;
+        while (!parent_path.isEmpty())
+        {
+            // Extract parent path
+            int sep_index = parent_path.lastIndexOf(PATH_SEPARATOR);
+            if (sep_index >= 0)
+                parent_path = parent_path.left(sep_index);
+            else
+                parent_path = "";
+
+            // Merge path of child to parent
+            pathstate_map_t::iterator state_it2 = pathState.find(parent_path);
+            if (state_it2 != pathState.end())
+                state_it2.value() = static_cast<WorkspaceFile::Type>(state_it2.value() | state);
+            else
+                pathState.insert(parent_path, state);
+        }
+    }
+
+    // Check if the repository needs integration
+    res.clear();
+    fossil().statusWorkspace(res);
+    isIntegrated = false;
+    foreach (const QString &l, res)
+    {
+        if (l.trimmed().indexOf("INTEGRATE") == 0)
+        {
+            isIntegrated = true;
+            break;
+        }
+    }
+
+    // Load the stashes, branches and tags
+    fossil().stashList(getStashes());
+
+    fossil().branchList(branchNames, branchNames);
+
+    fossil().tagList(tags);
+    // Fossil includes the branches in the tag list
+    // So remove them
+    foreach (const QString &name, branchNames)
+        tags.remove(name);
+
+_done:
+    uiCallback.endProcess();
+}
+
+//------------------------------------------------------------------------------
+bool Workspace::addRemote(const QUrl &url, const QString &name)
+{
+    if (remotes.contains(url))
+        return false;
+
+    Q_ASSERT(url.password().isEmpty());
+
+    Remote r(name, url);
+    remotes.insert(url, r);
+    return true;
+}
+
+//------------------------------------------------------------------------------
+bool Workspace::removeRemote(const QUrl &url)
+{
+    return remotes.remove(url) > 0;
+}
+
+//------------------------------------------------------------------------------
+bool Workspace::setRemoteDefault(const QUrl &url)
+{
+    Q_ASSERT(url.password().isEmpty());
+
+    const QString &url_str = url.toString();
+
+    bool found = false;
+    for (auto &remote : remotes)
+    {
+        if (remote.url.toString() == url_str)  // FIXME: Use strings as QUrl to QUrl comparisons sometime fail!?
+        {
+            remote.isDefault = true;
+            found = true;
+        }
+        else
+            remote.isDefault = false;
+    }
+    return found;
+}
+
+//------------------------------------------------------------------------------
+QUrl Workspace::getRemoteDefault() const
+{
+    for (const auto &remote : remotes)
+    {
+        if (remote.isDefault)
+            return remote.url;
+    }
+
+    return QUrl();
+}
+
+//------------------------------------------------------------------------------
+Remote *Workspace::findRemote(const QUrl &url)
+{
+    remote_map_t::iterator it = remotes.find(url);
+    if (it != remotes.end())
+        return &(*it);
+    return NULL;
+}

src/Workspace.h

@@ -0,0 +1,139 @@
+#ifndef WORKSPACE_H
+#define WORKSPACE_H
+
+#include "Fossil.h"
+#include "Utils.h"
+#include "WorkspaceCommon.h"
+#include <QDir>
+#include <QFileInfo>
+#include <QMap>
+#include <QSet>
+#include <QSettings>
+#include <QStandardItemModel>
+
+//////////////////////////////////////////////////////////////////////////
+// Workspace
+//////////////////////////////////////////////////////////////////////////
+class Workspace
+{
+public:
+    Workspace();
+    ~Workspace();
+
+    void clearState();
+
+    Fossil &fossil() { return bridge; }
+    const Fossil &fossil() const { return bridge; }
+
+    const QString &getPath() const { return fossil().getWorkspacePath(); }
+    bool switchWorkspace(const QString &workspace, QSettings &store);
+    void scanWorkspace(bool scanLocal, bool scanIgnored, bool scanModified, bool scanUnchanged, const QStringList &ignorePatterns, UICallback &uiCallback);
+
+    QStandardItemModel &getFileModel() { return repoFileModel; }
+    QStandardItemModel &getTreeModel() { return repoTreeModel; }
+
+    filemap_t &getFiles() { return workspaceFiles; }
+    stringset_t &getPaths() { return pathSet; }
+    pathstate_map_t &getPathState() { return pathState; }
+    stashmap_t &getStashes() { return stashMap; }
+    QStringMap &getTags() { return tags; }
+    QStringList &getBranches() { return branchNames; }
+    bool otherChanges() const { return isIntegrated; }
+    const QString &getCurrentRevision() const { return fossil().getCurrentRevision(); }
+    const QStringList &getActiveTags() const { return fossil().getActiveTags(); }
+    const QString &getProjectName() const { return fossil().getProjectName(); }
+
+    // Remotes
+    const remote_map_t &getRemotes() const { return remotes; }
+    bool addRemote(const QUrl &url, const QString &name);
+    bool removeRemote(const QUrl &url);
+    bool setRemoteDefault(const QUrl &url);
+    QUrl getRemoteDefault() const;
+    Remote *findRemote(const QUrl &url);
+
+    void storeWorkspace(QSettings &store);
+
+    // Fossil Wrappers
+    void Init(UICallback *callback, const QString &exePath) { fossil().Init(callback, exePath); }
+
+    bool create(const QString &repositoryPath, const QString &workspacePath) { return fossil().createWorkspace(repositoryPath, workspacePath); }
+
+    bool createRepository(const QString &repositoryPath) { return fossil().createRepository(repositoryPath); }
+
+    WorkspaceState getState() { return fossil().getWorkspaceState(); }
+
+    bool close(bool force = false) { return fossil().closeWorkspace(force); }
+
+    bool cloneRepository(const QString &repository, const QUrl &url, const QUrl &proxyUrl) { return fossil().cloneRepository(repository, url, proxyUrl); }
+
+    bool push(const QUrl &url) { return fossil().pushWorkspace(url); }
+
+    bool pull(const QUrl &url) { return fossil().pullWorkspace(url); }
+
+    bool update(QStringList &result, const QString &revision, bool explainOnly) { return fossil().updateWorkspace(result, revision, explainOnly); }
+
+    bool undo(QStringList &result, bool explainOnly) { return fossil().undoWorkspace(result, explainOnly); }
+
+    bool diffFile(const QString &repoFile, bool graphical) { return fossil().diffFile(repoFile, graphical); }
+
+    bool commitFiles(const QStringList &fileList, const QString &comment, const QString &newBranchName, bool isPrivateBranch)
+    {
+        return fossil().commitFiles(fileList, comment, newBranchName, isPrivateBranch);
+    }
+
+    bool addFiles(const QStringList &fileList) { return fossil().addFiles(fileList); }
+
+    bool removeFiles(const QStringList &fileList, bool deleteLocal) { return fossil().removeFiles(fileList, deleteLocal); }
+
+    bool addRemoveFiles() { return fossil().addRemoveFiles(); }
+
+    bool revertFiles(const QStringList &fileList) { return fossil().revertFiles(fileList); }
+
+    bool renameFile(const QString &beforePath, const QString &afterPath, bool renameLocal) { return fossil().renameFile(beforePath, afterPath, renameLocal); }
+
+    // Stashes
+    bool stashNew(const QStringList &fileList, const QString &name, bool revert) { return fossil().stashNew(fileList, name, revert); }
+
+    bool stashList(stashmap_t &stashes) { return fossil().stashList(stashes); }
+
+    bool stashApply(const QString &name) { return fossil().stashApply(name); }
+
+    bool stashDrop(const QString &name) { return fossil().stashDrop(name); }
+
+    bool stashDiff(const QString &name) { return fossil().stashDiff(name); }
+
+    // Tags
+    bool tagList(QStringMap &tags) { return fossil().tagList(tags); }
+
+    bool tagNew(const QString &name, const QString &revision) { return fossil().tagNew(name, revision); }
+
+    bool tagDelete(const QString &name, const QString &revision) { return fossil().tagDelete(name, revision); }
+
+    // Branches
+    bool branchList(QStringList &branches, QStringList &activeBranches) { return fossil().branchList(branches, activeBranches); }
+
+    bool branchNew(const QString &name, const QString &revisionBasis, bool isPrivate = false) { return fossil().branchNew(name, revisionBasis, isPrivate); }
+
+    bool branchMerge(QStringList &res, const QString &revision, bool integrate, bool force, bool testOnly) { return fossil().branchMerge(res, revision, integrate, force, testOnly); }
+
+    bool getInterfaceVersion(QString &version) { return fossil().getExeVersion(version); }
+
+private:
+    static bool scanDirectory(QFileInfoList &entries, const QString &dirPath, const QString &baseDir, const QStringList &ignorePatterns, UICallback &uiCallback);
+
+private:
+    Fossil bridge;
+    filemap_t workspaceFiles;
+    stringset_t pathSet;
+    pathstate_map_t pathState;
+    stashmap_t stashMap;
+    QStringList branchNames;
+    QStringMap tags;
+    remote_map_t remotes;
+    bool isIntegrated;
+
+    QStandardItemModel repoFileModel;
+    QStandardItemModel repoTreeModel;
+};
+
+#endif  // WORKSPACE_H

src/WorkspaceCommon.h

@@ -0,0 +1,103 @@
+#ifndef WORKSPACECOMMON_H
+#define WORKSPACECOMMON_H
+
+#include "Utils.h"
+#include <QDir>
+#include <QFileInfo>
+#include <QMap>
+#include <QSet>
+#include <QUrl>
+
+//////////////////////////////////////////////////////////////////////////
+// WorkspaceState
+//////////////////////////////////////////////////////////////////////////
+enum WorkspaceState
+{
+    WORKSPACE_STATE_OK,
+    WORKSPACE_STATE_NOTFOUND,
+    WORKSPACE_STATE_OLDSCHEMA
+};
+
+//////////////////////////////////////////////////////////////////////////
+// WorkspaceFile
+//////////////////////////////////////////////////////////////////////////
+struct WorkspaceFile
+{
+    enum Type
+    {
+        TYPE_UNKNOWN = 1 << 0,
+        TYPE_UNCHANGED = 1 << 1,
+        TYPE_EDITTED = 1 << 2,
+        TYPE_ADDED = 1 << 3,
+        TYPE_DELETED = 1 << 4,
+        TYPE_MISSING = 1 << 5,
+        TYPE_RENAMED = 1 << 6,
+        TYPE_CONFLICTED = 1 << 7,
+        TYPE_MERGED = 1 << 8,
+        TYPE_MODIFIED = TYPE_EDITTED | TYPE_ADDED | TYPE_DELETED | TYPE_MISSING | TYPE_RENAMED | TYPE_CONFLICTED | TYPE_MERGED,
+        TYPE_REPO = TYPE_UNCHANGED | TYPE_MODIFIED,
+        TYPE_ALL = TYPE_UNKNOWN | TYPE_REPO
+    };
+
+    WorkspaceFile(const QFileInfo &info, Type type, const QString &repoPath)
+    {
+        FileInfo = info;
+        FileType = type;
+        FilePath = getRelativeFilename(repoPath);
+        Path = FileInfo.absolutePath();
+
+        // Strip the workspace path from the path
+        Q_ASSERT(Path.indexOf(repoPath) == 0);
+        Path = Path.mid(repoPath.length() + 1);
+    }
+
+    bool isType(Type t) const { return FileType == t; }
+
+    void setType(Type t) { FileType = t; }
+
+    Type getType() const { return FileType; }
+
+    QFileInfo getFileInfo() const { return FileInfo; }
+
+    const QString &getFilePath() const { return FilePath; }
+
+    QString getFilename() const { return FileInfo.fileName(); }
+
+    const QString &getPath() const { return Path; }
+
+    QString getRelativeFilename(const QString &path)
+    {
+        QString abs_base_dir = QDir(path).absolutePath();
+
+        QString relative = FileInfo.absoluteFilePath();
+        int index = relative.indexOf(abs_base_dir);
+        if (index < 0)
+            return QString("");
+
+        return relative.right(relative.length() - abs_base_dir.length() - 1);
+    }
+
+private:
+    QFileInfo FileInfo;
+    Type FileType;
+    QString FilePath;
+    QString Path;
+};
+
+class Remote
+{
+public:
+    Remote(const QString &_name, const QUrl &_url, bool _isDefault = false) : name(_name), url(_url), isDefault(_isDefault) {}
+
+    QString name;
+    QUrl url;
+    bool isDefault;
+};
+
+typedef QMap<QUrl, Remote> remote_map_t;
+typedef QMap<QString, WorkspaceFile::Type> pathstate_map_t;
+typedef QList<WorkspaceFile *> filelist_t;
+typedef QMap<QString, WorkspaceFile *> filemap_t;
+typedef QMap<QString, QString> stashmap_t;
+
+#endif  // WORKSPACECOMMON_H

src/main.cpp

@@ -1,46 +1,42 @@
-#include <QApplication>
 #include "MainWindow.h"
+#include <QApplication>
 
 int main(int argc, char *argv[])
 {
-	QApplication app(argc, argv);
-	app.setApplicationName("Fuel");
-	app.setApplicationVersion("1.0.0");
-	app.setOrganizationDomain("fuel-scm.org");
-	app.setOrganizationName("Fuel-SCM");
+    QApplication app(argc, argv);
+    app.setApplicationName("Fuel");
+    app.setApplicationVersion(FUEL_VERSION);
+    app.setOrganizationDomain("fuel-scm.org");
+    app.setOrganizationName("Fuel-SCM");
 
+#ifdef Q_OS_MACX
+    // Native OSX applications don't have menu icons
+    app.setAttribute(Qt::AA_DontShowIconsInMenus);
+#endif
+    {
+        bool portable = false;
+        QString workspace;
 
-	#ifdef Q_OS_MACX
-		// Native OSX applications don't have menu icons
-		app.setAttribute(Qt::AA_DontShowIconsInMenus);
-	#endif
-	{
-		bool portable = false;
-		QString workspace;
+        Q_ASSERT(app.arguments().size() > 0);
+        for (int i = 1; i < app.arguments().size(); ++i)
+        {
+            QString arg = app.arguments()[i];
+            // Parse options
+            if (arg.indexOf("--") != -1)
+            {
+                if (arg.indexOf("portable") != -1)
+                    portable = true;
+                continue;
+            }
+            else
+                workspace = arg;
+        }
 
-		Q_ASSERT(app.arguments().size()>0);
-		for(int i=1; i<app.arguments().size(); ++i)
-		{
-			QString arg = app.arguments()[i];
-			// Parse options
-			if(arg.indexOf("--")!=-1)
-			{
-				if(arg.indexOf("portable")!=-1)
-					portable = true;
-				continue;
-			}
-			else
-				workspace = arg;
-		}
+        Settings settings(portable);
 
-		Settings settings(portable);
-
-		MainWindow mainwin(settings,
-						   0,
-						   workspace.isEmpty() ? 0 : &workspace);
-		mainwin.show();
-		mainwin.fullRefresh();
-		return app.exec();
-
-	}
+        MainWindow mainwin(settings, 0, workspace.isEmpty() ? 0 : &workspace);
+        mainwin.show();
+        mainwin.fullRefresh();
+        return app.exec();
+    }
 }

tools/git-push.sh

@@ -0,0 +1,17 @@
+#!/bin/bash
+export MARKS=marks
+export DUMP=changes.fastexport
+export REPO=fuel.fossil
+
+
+if [ ! -f $MARKS-fossil ]; then
+	touch $MARKS-fossil
+fi
+
+fossil export --git --import-marks $MARKS-fossil --export-marks $MARKS-fossil $REPO >$DUMP
+
+if [ ! -f $MARKS-git ]; then
+	touch $MARKS-git
+fi
+
+git fast-import --export-marks=$MARKS-git --import-marks=$MARKS-git <$DUMP

ui/AboutDialog.ui

@@ -0,0 +1,139 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>AboutDialog</class>
+ <widget class="QDialog" name="AboutDialog">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>577</width>
+    <height>349</height>
+   </rect>
+  </property>
+  <property name="windowTitle">
+   <string>About Fuel...</string>
+  </property>
+  <property name="modal">
+   <bool>true</bool>
+  </property>
+  <layout class="QGridLayout" name="gridLayout">
+   <item row="0" column="1">
+    <widget class="QLabel" name="lblBanner">
+     <property name="text">
+      <string>A GUI front-end for the Fossil SCM by Kostas Karanikolas
+Released under the GNU GPL</string>
+     </property>
+     <property name="alignment">
+      <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
+     </property>
+    </widget>
+   </item>
+   <item row="2" column="1">
+    <widget class="QLabel" name="lblFossilVersion">
+     <property name="text">
+      <string notr="true">FOSSIL VERSION</string>
+     </property>
+     <property name="alignment">
+      <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
+     </property>
+    </widget>
+   </item>
+   <item row="0" column="0">
+    <widget class="QLabel" name="lblIcon">
+     <property name="maximumSize">
+      <size>
+       <width>64</width>
+       <height>64</height>
+      </size>
+     </property>
+     <property name="text">
+      <string notr="true"/>
+     </property>
+     <property name="pixmap">
+      <pixmap resource="../rsrc/resources.qrc">:/icons/icon-application</pixmap>
+     </property>
+     <property name="scaledContents">
+      <bool>true</bool>
+     </property>
+     <property name="alignment">
+      <set>Qt::AlignHCenter|Qt::AlignTop</set>
+     </property>
+    </widget>
+   </item>
+   <item row="4" column="1">
+    <widget class="QTextEdit" name="txtAdditional">
+     <property name="readOnly">
+      <bool>true</bool>
+     </property>
+     <property name="textInteractionFlags">
+      <set>Qt::TextSelectableByKeyboard|Qt::TextSelectableByMouse</set>
+     </property>
+    </widget>
+   </item>
+   <item row="5" column="1">
+    <widget class="QDialogButtonBox" name="buttonBox">
+     <property name="orientation">
+      <enum>Qt::Horizontal</enum>
+     </property>
+     <property name="standardButtons">
+      <set>QDialogButtonBox::Ok</set>
+     </property>
+    </widget>
+   </item>
+   <item row="3" column="1">
+    <widget class="QLabel" name="lblQtVersion">
+     <property name="text">
+      <string notr="true">QT VERSION</string>
+     </property>
+     <property name="alignment">
+      <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
+     </property>
+    </widget>
+   </item>
+   <item row="1" column="1">
+    <widget class="QLabel" name="lblFuelRevision">
+     <property name="text">
+      <string notr="true">FUEL REVISION</string>
+     </property>
+    </widget>
+   </item>
+  </layout>
+ </widget>
+ <resources>
+  <include location="../rsrc/resources.qrc"/>
+ </resources>
+ <connections>
+  <connection>
+   <sender>buttonBox</sender>
+   <signal>accepted()</signal>
+   <receiver>AboutDialog</receiver>
+   <slot>accept()</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>248</x>
+     <y>254</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>157</x>
+     <y>274</y>
+    </hint>
+   </hints>
+  </connection>
+  <connection>
+   <sender>buttonBox</sender>
+   <signal>rejected()</signal>
+   <receiver>AboutDialog</receiver>
+   <slot>reject()</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>316</x>
+     <y>260</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>286</x>
+     <y>274</y>
+    </hint>
+   </hints>
+  </connection>
+ </connections>
+</ui>

ui/BrowserWidget.ui

@@ -14,7 +14,16 @@
    <property name="spacing">
     <number>0</number>
    </property>
-   <property name="margin">
+   <property name="leftMargin">
+    <number>0</number>
+   </property>
+   <property name="topMargin">
+    <number>0</number>
+   </property>
+   <property name="rightMargin">
+    <number>0</number>
+   </property>
+   <property name="bottomMargin">
     <number>0</number>
    </property>
    <item>
@@ -44,7 +53,7 @@
   <action name="actionBrowserBack">
    <property name="icon">
     <iconset resource="../rsrc/resources.qrc">
-     <normaloff>:/icons/icons/Button Previous-01.png</normaloff>:/icons/icons/Button Previous-01.png</iconset>
+     <normaloff>:/icons/icon-action-previous</normaloff>:/icons/icon-action-previous</iconset>
    </property>
    <property name="text">
     <string>Back</string>
@@ -56,7 +65,7 @@
   <action name="actionBrowserForward">
    <property name="icon">
     <iconset resource="../rsrc/resources.qrc">
-     <normaloff>:/icons/icons/Button Next-01.png</normaloff>:/icons/icons/Button Next-01.png</iconset>
+     <normaloff>:/icons/icon-action-next</normaloff>:/icons/icon-action-next</iconset>
    </property>
    <property name="text">
     <string>Forward</string>
@@ -68,7 +77,7 @@
   <action name="actionBrowserRefresh">
    <property name="icon">
     <iconset resource="../rsrc/resources.qrc">
-     <normaloff>:/icons/icons/Button Refresh-01.png</normaloff>:/icons/icons/Button Refresh-01.png</iconset>
+     <normaloff>:/icons/icon-action-refresh</normaloff>:/icons/icon-action-refresh</iconset>
    </property>
    <property name="text">
     <string>Refresh</string>
@@ -80,7 +89,7 @@
   <action name="actionBrowserStop">
    <property name="icon">
     <iconset resource="../rsrc/resources.qrc">
-     <normaloff>:/icons/icons/Button Close-01.png</normaloff>:/icons/icons/Button Close-01.png</iconset>
+     <normaloff>:/icons/icon-action-stop</normaloff>:/icons/icon-action-stop</iconset>
    </property>
    <property name="text">
     <string>Stop</string>

ui/CloneDialog.ui

@@ -28,7 +28,7 @@
      <item row="0" column="0">
       <widget class="QLabel" name="label_1">
        <property name="text">
-        <string>URL</string>
+        <string>Remote Repository</string>
        </property>
       </widget>
      </item>
@@ -96,7 +96,7 @@
      <item row="4" column="0">
       <widget class="QLabel" name="label_4">
        <property name="text">
-        <string>Repository</string>
+        <string>Local Repository</string>
        </property>
       </widget>
      </item>

ui/CommitDialog.ui

@@ -10,7 +10,7 @@
     <x>0</x>
     <y>0</y>
     <width>400</width>
-    <height>300</height>
+    <height>394</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -21,7 +21,11 @@
   </property>
   <layout class="QVBoxLayout" name="verticalLayout">
    <item>
-    <widget class="QComboBox" name="comboBox"/>
+    <widget class="QComboBox" name="comboBox">
+     <property name="sizeAdjustPolicy">
+      <enum>QComboBox::AdjustToMinimumContentsLength</enum>
+     </property>
+    </widget>
    </item>
    <item>
     <widget class="QLineEdit" name="lineEdit"/>
@@ -62,9 +66,96 @@
     </widget>
    </item>
    <item>
-    <widget class="QCheckBox" name="checkBox">
+    <widget class="QWidget" name="widgetBranchOptions" native="true">
+     <layout class="QFormLayout" name="formLayout_2">
+      <property name="leftMargin">
+       <number>0</number>
+      </property>
+      <property name="topMargin">
+       <number>0</number>
+      </property>
+      <property name="rightMargin">
+       <number>0</number>
+      </property>
+      <property name="bottomMargin">
+       <number>0</number>
+      </property>
+      <item row="0" column="0">
+       <widget class="QLabel" name="label_2">
+        <property name="text">
+         <string>Commit to new branch</string>
+        </property>
+       </widget>
+      </item>
+      <item row="0" column="1">
+       <layout class="QHBoxLayout" name="horizontalLayout">
+        <item>
+         <widget class="QCheckBox" name="chkNewBranch">
+          <property name="text">
+           <string/>
+          </property>
+         </widget>
+        </item>
+        <item>
+         <spacer name="horizontalSpacer">
+          <property name="orientation">
+           <enum>Qt::Horizontal</enum>
+          </property>
+          <property name="sizeHint" stdset="0">
+           <size>
+            <width>40</width>
+            <height>20</height>
+           </size>
+          </property>
+         </spacer>
+        </item>
+        <item>
+         <layout class="QFormLayout" name="formLayout">
+          <item row="0" column="0">
+           <widget class="QLabel" name="lblPrivateBranch">
+            <property name="enabled">
+             <bool>false</bool>
+            </property>
+            <property name="text">
+             <string>Private branch</string>
+            </property>
+           </widget>
+          </item>
+          <item row="0" column="1">
+           <widget class="QCheckBox" name="chkPrivateBranch">
+            <property name="enabled">
+             <bool>false</bool>
+            </property>
+            <property name="text">
+             <string/>
+            </property>
+           </widget>
+          </item>
+         </layout>
+        </item>
+       </layout>
+      </item>
+      <item row="1" column="0">
+       <widget class="QLabel" name="label">
+        <property name="text">
+         <string>Branch name</string>
+        </property>
+       </widget>
+      </item>
+      <item row="1" column="1">
+       <widget class="QLineEdit" name="lineBranchName">
+        <property name="enabled">
+         <bool>false</bool>
+        </property>
+       </widget>
+      </item>
+     </layout>
+    </widget>
+   </item>
+   <item>
+    <widget class="QCheckBox" name="chkRevertFiles">
      <property name="text">
-      <string/>
+      <string>Revert stashed files</string>
      </property>
     </widget>
    </item>

ui/FslSettingsDialog.ui

@@ -0,0 +1,272 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>FslSettingsDialog</class>
+ <widget class="QDialog" name="FslSettingsDialog">
+  <property name="windowModality">
+   <enum>Qt::WindowModal</enum>
+  </property>
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>457</width>
+    <height>235</height>
+   </rect>
+  </property>
+  <property name="windowTitle">
+   <string>Fossil Settings</string>
+  </property>
+  <property name="windowIcon">
+   <iconset resource="../rsrc/resources.qrc">
+    <normaloff>:/icons/icon-application</normaloff>:/icons/icon-application</iconset>
+  </property>
+  <property name="modal">
+   <bool>true</bool>
+  </property>
+  <layout class="QVBoxLayout" name="verticalLayout">
+   <item>
+    <widget class="QWidget" name="widget" native="true">
+     <layout class="QFormLayout" name="formLayout">
+      <property name="leftMargin">
+       <number>0</number>
+      </property>
+      <property name="topMargin">
+       <number>0</number>
+      </property>
+      <property name="rightMargin">
+       <number>0</number>
+      </property>
+      <property name="bottomMargin">
+       <number>0</number>
+      </property>
+      <item row="0" column="0">
+       <widget class="QLabel" name="label_2">
+        <property name="minimumSize">
+         <size>
+          <width>100</width>
+          <height>0</height>
+         </size>
+        </property>
+        <property name="text">
+         <string>Graphical Diff </string>
+        </property>
+       </widget>
+      </item>
+      <item row="0" column="1">
+       <layout class="QHBoxLayout" name="horizontalLayout_9">
+        <item>
+         <widget class="QLineEdit" name="lineGDiffCommand">
+          <property name="toolTip">
+           <string>Path to graphical diff tool</string>
+          </property>
+         </widget>
+        </item>
+        <item>
+         <widget class="QPushButton" name="btnSelectFossilGDiff">
+          <property name="sizePolicy">
+           <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+            <horstretch>0</horstretch>
+            <verstretch>0</verstretch>
+           </sizepolicy>
+          </property>
+          <property name="maximumSize">
+           <size>
+            <width>24</width>
+            <height>24</height>
+           </size>
+          </property>
+          <property name="text">
+           <string>...</string>
+          </property>
+         </widget>
+        </item>
+       </layout>
+      </item>
+      <item row="1" column="0">
+       <widget class="QLabel" name="label_3">
+        <property name="minimumSize">
+         <size>
+          <width>100</width>
+          <height>0</height>
+         </size>
+        </property>
+        <property name="text">
+         <string>Graphical Merge</string>
+        </property>
+       </widget>
+      </item>
+      <item row="1" column="1">
+       <layout class="QHBoxLayout" name="horizontalLayout_10">
+        <item>
+         <widget class="QLineEdit" name="lineGMergeCommand">
+          <property name="toolTip">
+           <string>Path to the graphical merge tool</string>
+          </property>
+         </widget>
+        </item>
+        <item>
+         <widget class="QPushButton" name="btnSelectGMerge">
+          <property name="sizePolicy">
+           <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+            <horstretch>0</horstretch>
+            <verstretch>0</verstretch>
+           </sizepolicy>
+          </property>
+          <property name="maximumSize">
+           <size>
+            <width>24</width>
+            <height>24</height>
+           </size>
+          </property>
+          <property name="text">
+           <string>...</string>
+          </property>
+         </widget>
+        </item>
+       </layout>
+      </item>
+      <item row="2" column="0">
+       <widget class="QLabel" name="label_44">
+        <property name="minimumSize">
+         <size>
+          <width>100</width>
+          <height>0</height>
+         </size>
+        </property>
+        <property name="text">
+         <string>HTTP Proxy</string>
+        </property>
+       </widget>
+      </item>
+      <item row="2" column="1">
+       <widget class="QLineEdit" name="lineProxy">
+        <property name="minimumSize">
+         <size>
+          <width>0</width>
+          <height>0</height>
+         </size>
+        </property>
+        <property name="toolTip">
+         <string>The URL of the HTTP proxy</string>
+        </property>
+       </widget>
+      </item>
+      <item row="3" column="0">
+       <widget class="QLabel" name="uILanguageLabel_3">
+        <property name="text">
+         <string>HTTP Port</string>
+        </property>
+       </widget>
+      </item>
+      <item row="3" column="1">
+       <widget class="QLineEdit" name="lineUIPort">
+        <property name="toolTip">
+         <string>HTTP port to use for the Fossil web interface</string>
+        </property>
+       </widget>
+      </item>
+      <item row="4" column="0">
+       <widget class="QLabel" name="label_7">
+        <property name="minimumSize">
+         <size>
+          <width>100</width>
+          <height>0</height>
+         </size>
+        </property>
+        <property name="text">
+         <string>Ignore CR/NL</string>
+        </property>
+       </widget>
+      </item>
+      <item row="4" column="1">
+       <widget class="QLineEdit" name="lineIgnoreCRNL">
+        <property name="minimumSize">
+         <size>
+          <width>0</width>
+          <height>0</height>
+         </size>
+        </property>
+        <property name="toolTip">
+         <string>A comma separated list of glob-style file patterns to exclude from Fossil's CR/NL consistency checking</string>
+        </property>
+       </widget>
+      </item>
+      <item row="5" column="0">
+       <widget class="QLabel" name="label_4">
+        <property name="minimumSize">
+         <size>
+          <width>100</width>
+          <height>0</height>
+         </size>
+        </property>
+        <property name="text">
+         <string>Ignore List</string>
+        </property>
+       </widget>
+      </item>
+      <item row="5" column="1">
+       <widget class="QLineEdit" name="lineIgnore">
+        <property name="minimumSize">
+         <size>
+          <width>0</width>
+          <height>0</height>
+         </size>
+        </property>
+        <property name="toolTip">
+         <string>A comma separated list of glob-style file/path patterns ignored in Fossil file operations</string>
+        </property>
+       </widget>
+      </item>
+     </layout>
+    </widget>
+   </item>
+   <item>
+    <widget class="QDialogButtonBox" name="buttonBox">
+     <property name="orientation">
+      <enum>Qt::Horizontal</enum>
+     </property>
+     <property name="standardButtons">
+      <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
+     </property>
+    </widget>
+   </item>
+  </layout>
+ </widget>
+ <resources>
+  <include location="../rsrc/resources.qrc"/>
+ </resources>
+ <connections>
+  <connection>
+   <sender>buttonBox</sender>
+   <signal>accepted()</signal>
+   <receiver>FslSettingsDialog</receiver>
+   <slot>accept()</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>248</x>
+     <y>254</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>157</x>
+     <y>274</y>
+    </hint>
+   </hints>
+  </connection>
+  <connection>
+   <sender>buttonBox</sender>
+   <signal>rejected()</signal>
+   <receiver>FslSettingsDialog</receiver>
+   <slot>reject()</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>316</x>
+     <y>260</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>286</x>
+     <y>274</y>
+    </hint>
+   </hints>
+  </connection>
+ </connections>
+</ui>

ui/RemoteDialog.ui

@@ -0,0 +1,165 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>RemoteDialog</class>
+ <widget class="QDialog" name="RemoteDialog">
+  <property name="windowModality">
+   <enum>Qt::WindowModal</enum>
+  </property>
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>478</width>
+    <height>164</height>
+   </rect>
+  </property>
+  <property name="windowTitle">
+   <string>Remote Repository</string>
+  </property>
+  <property name="modal">
+   <bool>true</bool>
+  </property>
+  <layout class="QVBoxLayout" name="verticalLayout">
+   <item>
+    <layout class="QFormLayout" name="formLayout">
+     <property name="fieldGrowthPolicy">
+      <enum>QFormLayout::AllNonFixedFieldsGrow</enum>
+     </property>
+     <item row="1" column="0">
+      <widget class="QLabel" name="label_1">
+       <property name="text">
+        <string>Remote Repository</string>
+       </property>
+      </widget>
+     </item>
+     <item row="1" column="1">
+      <layout class="QHBoxLayout" name="horizontalLayout_11">
+       <item>
+        <widget class="QLineEdit" name="lineURL">
+         <property name="toolTip">
+          <string>The URL of the source repository</string>
+         </property>
+        </widget>
+       </item>
+       <item>
+        <widget class="QPushButton" name="btnSelectSourceRepo">
+         <property name="sizePolicy">
+          <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+           <horstretch>0</horstretch>
+           <verstretch>0</verstretch>
+          </sizepolicy>
+         </property>
+         <property name="maximumSize">
+          <size>
+           <width>24</width>
+           <height>24</height>
+          </size>
+         </property>
+         <property name="text">
+          <string>...</string>
+         </property>
+        </widget>
+       </item>
+      </layout>
+     </item>
+     <item row="2" column="0">
+      <widget class="QLabel" name="label_2">
+       <property name="text">
+        <string>User Name</string>
+       </property>
+      </widget>
+     </item>
+     <item row="2" column="1">
+      <widget class="QLineEdit" name="lineUserName">
+       <property name="toolTip">
+        <string>The user name used to access the remote repository. Leave blank if not required</string>
+       </property>
+      </widget>
+     </item>
+     <item row="3" column="0">
+      <widget class="QLabel" name="label_3">
+       <property name="text">
+        <string>Password</string>
+       </property>
+      </widget>
+     </item>
+     <item row="3" column="1">
+      <widget class="QLineEdit" name="linePassword">
+       <property name="toolTip">
+        <string>The password used to access the remote repository. Leave blank if not required</string>
+       </property>
+       <property name="echoMode">
+        <enum>QLineEdit::Password</enum>
+       </property>
+      </widget>
+     </item>
+     <item row="4" column="1">
+      <widget class="QLineEdit" name="lineName">
+       <property name="toolTip">
+        <string>The password used to access the remote repository. Leave blank if not required</string>
+       </property>
+      </widget>
+     </item>
+     <item row="4" column="0">
+      <widget class="QLabel" name="Name">
+       <property name="text">
+        <string>Name</string>
+       </property>
+      </widget>
+     </item>
+    </layout>
+   </item>
+   <item>
+    <widget class="QDialogButtonBox" name="buttonBox">
+     <property name="orientation">
+      <enum>Qt::Horizontal</enum>
+     </property>
+     <property name="standardButtons">
+      <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
+     </property>
+    </widget>
+   </item>
+  </layout>
+ </widget>
+ <tabstops>
+  <tabstop>lineURL</tabstop>
+  <tabstop>btnSelectSourceRepo</tabstop>
+  <tabstop>lineUserName</tabstop>
+  <tabstop>linePassword</tabstop>
+ </tabstops>
+ <resources/>
+ <connections>
+  <connection>
+   <sender>buttonBox</sender>
+   <signal>accepted()</signal>
+   <receiver>RemoteDialog</receiver>
+   <slot>accept()</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>248</x>
+     <y>254</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>157</x>
+     <y>274</y>
+    </hint>
+   </hints>
+  </connection>
+  <connection>
+   <sender>buttonBox</sender>
+   <signal>rejected()</signal>
+   <receiver>RemoteDialog</receiver>
+   <slot>reject()</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>316</x>
+     <y>260</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>286</x>
+     <y>274</y>
+    </hint>
+   </hints>
+  </connection>
+ </connections>
+</ui>

ui/RevisionDialog.ui

@@ -0,0 +1,129 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>RevisionDialog</class>
+ <widget class="QDialog" name="RevisionDialog">
+  <property name="windowModality">
+   <enum>Qt::WindowModal</enum>
+  </property>
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>478</width>
+    <height>177</height>
+   </rect>
+  </property>
+  <property name="minimumSize">
+   <size>
+    <width>400</width>
+    <height>0</height>
+   </size>
+  </property>
+  <property name="modal">
+   <bool>true</bool>
+  </property>
+  <layout class="QVBoxLayout" name="verticalLayout">
+   <item>
+    <layout class="QFormLayout" name="formLayout">
+     <item row="0" column="0">
+      <widget class="QLabel" name="lblRevision">
+       <property name="text">
+        <string>Revision</string>
+       </property>
+      </widget>
+     </item>
+     <item row="0" column="1">
+      <widget class="QComboBox" name="cmbRevision">
+       <property name="editable">
+        <bool>true</bool>
+       </property>
+      </widget>
+     </item>
+     <item row="1" column="0">
+      <widget class="QLabel" name="lblName">
+       <property name="text">
+        <string>Name</string>
+       </property>
+      </widget>
+     </item>
+     <item row="1" column="1">
+      <widget class="QLineEdit" name="lineName"/>
+     </item>
+     <item row="2" column="0">
+      <widget class="QLabel" name="lblIntegrate">
+       <property name="text">
+        <string>Integrate</string>
+       </property>
+      </widget>
+     </item>
+     <item row="3" column="0">
+      <widget class="QLabel" name="lblForce">
+       <property name="text">
+        <string>Force</string>
+       </property>
+      </widget>
+     </item>
+     <item row="2" column="1">
+      <widget class="QCheckBox" name="chkIntegrate">
+       <property name="text">
+        <string/>
+       </property>
+      </widget>
+     </item>
+     <item row="3" column="1">
+      <widget class="QCheckBox" name="chkForce">
+       <property name="text">
+        <string/>
+       </property>
+      </widget>
+     </item>
+    </layout>
+   </item>
+   <item>
+    <widget class="QDialogButtonBox" name="buttonBox">
+     <property name="orientation">
+      <enum>Qt::Horizontal</enum>
+     </property>
+     <property name="standardButtons">
+      <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
+     </property>
+    </widget>
+   </item>
+  </layout>
+ </widget>
+ <resources/>
+ <connections>
+  <connection>
+   <sender>buttonBox</sender>
+   <signal>accepted()</signal>
+   <receiver>RevisionDialog</receiver>
+   <slot>accept()</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>248</x>
+     <y>254</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>157</x>
+     <y>274</y>
+    </hint>
+   </hints>
+  </connection>
+  <connection>
+   <sender>buttonBox</sender>
+   <signal>rejected()</signal>
+   <receiver>RevisionDialog</receiver>
+   <slot>reject()</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>316</x>
+     <y>260</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>286</x>
+     <y>274</y>
+    </hint>
+   </hints>
+  </connection>
+ </connections>
+</ui>

ui/SettingsDialog.ui

@@ -9,397 +9,289 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>457</width>
-    <height>352</height>
+    <width>449</width>
+    <height>428</height>
    </rect>
   </property>
   <property name="windowTitle">
    <string>Settings</string>
   </property>
+  <property name="windowIcon">
+   <iconset resource="../rsrc/resources.qrc">
+    <normaloff>:/icons/icon-application</normaloff>:/icons/icon-application</iconset>
+  </property>
   <property name="modal">
    <bool>true</bool>
   </property>
   <layout class="QVBoxLayout" name="verticalLayout">
    <item>
-    <widget class="QTabWidget" name="tabWidget">
-     <property name="currentIndex">
-      <number>0</number>
-     </property>
-     <widget class="QWidget" name="tabApp">
-      <attribute name="icon">
-       <iconset resource="../rsrc/resources.qrc">
-        <normaloff>:/icons/icons/Battery-01.png</normaloff>:/icons/icons/Battery-01.png</iconset>
-      </attribute>
-      <attribute name="title">
-       <string>Application</string>
-      </attribute>
-      <layout class="QFormLayout" name="formLayout">
-       <item row="0" column="0">
-        <widget class="QLabel" name="label">
-         <property name="minimumSize">
-          <size>
-           <width>100</width>
-           <height>0</height>
-          </size>
+    <widget class="QWidget" name="widget" native="true">
+     <layout class="QFormLayout" name="formLayout">
+      <item row="0" column="0">
+       <widget class="QLabel" name="label">
+        <property name="minimumSize">
+         <size>
+          <width>100</width>
+          <height>0</height>
+         </size>
+        </property>
+        <property name="text">
+         <string>Fossil Path</string>
+        </property>
+       </widget>
+      </item>
+      <item row="0" column="1">
+       <layout class="QHBoxLayout" name="horizontalLayout_8">
+        <item>
+         <widget class="QLineEdit" name="lineFossilPath">
+          <property name="toolTip">
+           <string>Path to the Fossil executable. Leave blank to use the default Fossil</string>
+          </property>
+         </widget>
+        </item>
+        <item>
+         <widget class="QPushButton" name="btnSelectFossil">
+          <property name="sizePolicy">
+           <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+            <horstretch>0</horstretch>
+            <verstretch>0</verstretch>
+           </sizepolicy>
+          </property>
+          <property name="maximumSize">
+           <size>
+            <width>24</width>
+            <height>24</height>
+           </size>
+          </property>
+          <property name="text">
+           <string>...</string>
+          </property>
+         </widget>
+        </item>
+       </layout>
+      </item>
+      <item row="1" column="0">
+       <widget class="QLabel" name="label_6">
+        <property name="minimumSize">
+         <size>
+          <width>100</width>
+          <height>0</height>
+         </size>
+        </property>
+        <property name="text">
+         <string>Commit Messages</string>
+        </property>
+       </widget>
+      </item>
+      <item row="1" column="1">
+       <widget class="QPushButton" name="btnClearMessageHistory">
+        <property name="sizePolicy">
+         <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="toolTip">
+         <string>Clear the commit message history</string>
+        </property>
+        <property name="text">
+         <string>Clear</string>
+        </property>
+       </widget>
+      </item>
+      <item row="2" column="0">
+       <widget class="QLabel" name="uILanguageLabel_2">
+        <property name="text">
+         <string>Web Browser</string>
+        </property>
+       </widget>
+      </item>
+      <item row="2" column="1">
+       <widget class="QComboBox" name="cmbFossilBrowser">
+        <property name="sizePolicy">
+         <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="toolTip">
+         <string>Web browser to use for the Fossil web interface</string>
+        </property>
+       </widget>
+      </item>
+      <item row="3" column="0">
+       <widget class="QLabel" name="label_8">
+        <property name="minimumSize">
+         <size>
+          <width>100</width>
+          <height>0</height>
+         </size>
+        </property>
+        <property name="text">
+         <string>Double-click Action</string>
+        </property>
+       </widget>
+      </item>
+      <item row="3" column="1">
+       <widget class="QComboBox" name="cmbDoubleClickAction">
+        <property name="sizePolicy">
+         <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="toolTip">
+         <string>Action to perfom when double-clicking a file</string>
+        </property>
+        <property name="currentIndex">
+         <number>-1</number>
+        </property>
+       </widget>
+      </item>
+      <item row="4" column="0">
+       <widget class="QLabel" name="uILanguageLabel">
+        <property name="text">
+         <string>Language</string>
+        </property>
+       </widget>
+      </item>
+      <item row="4" column="1">
+       <widget class="QComboBox" name="cmbActiveLanguage">
+        <property name="sizePolicy">
+         <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="toolTip">
+         <string>Language for the user interface</string>
+        </property>
+       </widget>
+      </item>
+      <item row="5" column="0" colspan="2">
+       <widget class="QGroupBox" name="groupBox">
+        <property name="title">
+         <string>Custom Actions</string>
+        </property>
+        <layout class="QFormLayout" name="formLayout_2">
+         <property name="leftMargin">
+          <number>0</number>
          </property>
-         <property name="text">
-          <string>Fossil Path</string>
+         <property name="rightMargin">
+          <number>0</number>
          </property>
-        </widget>
-       </item>
-       <item row="0" column="1">
-        <layout class="QHBoxLayout" name="horizontalLayout_8">
-         <item>
-          <widget class="QLineEdit" name="lineFossilPath">
-           <property name="toolTip">
-            <string>Path to the Fossil executable. Leave blank to use the default Fossil</string>
+         <item row="1" column="0">
+          <widget class="QLabel" name="label_4">
+           <property name="text">
+            <string>Action</string>
            </property>
           </widget>
          </item>
-         <item>
-          <widget class="QPushButton" name="btnSelectFossil">
-           <property name="sizePolicy">
-            <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
-             <horstretch>0</horstretch>
-             <verstretch>0</verstretch>
-            </sizepolicy>
+         <item row="1" column="1">
+          <widget class="QComboBox" name="cmbCustomAction">
+           <property name="toolTip">
+            <string>Custom action</string>
            </property>
-           <property name="maximumSize">
+          </widget>
+         </item>
+         <item row="2" column="1">
+          <widget class="QLineEdit" name="lineCustomActionDescription">
+           <property name="toolTip">
+            <string>Name of custom action</string>
+           </property>
+          </widget>
+         </item>
+         <item row="2" column="0">
+          <widget class="QLabel" name="label_2">
+           <property name="minimumSize">
             <size>
-             <width>24</width>
-             <height>24</height>
+             <width>100</width>
+             <height>0</height>
             </size>
            </property>
            <property name="text">
-            <string>...</string>
+            <string>Description</string>
+           </property>
+          </widget>
+         </item>
+         <item row="3" column="0">
+          <widget class="QLabel" name="label_3">
+           <property name="minimumSize">
+            <size>
+             <width>100</width>
+             <height>0</height>
+            </size>
+           </property>
+           <property name="text">
+            <string>Command</string>
+           </property>
+          </widget>
+         </item>
+         <item row="3" column="1">
+          <layout class="QHBoxLayout" name="horizontalLayout_10">
+           <item>
+            <widget class="QLineEdit" name="lineCustomActionCommand">
+             <property name="toolTip">
+              <string>Custom action command-line. Information about the selected items is available via the macros %FILE %FOLDER %WORKSPACE</string>
+             </property>
+            </widget>
+           </item>
+           <item>
+            <widget class="QPushButton" name="btnSelectCustomFileActionCommand">
+             <property name="sizePolicy">
+              <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+               <horstretch>0</horstretch>
+               <verstretch>0</verstretch>
+              </sizepolicy>
+             </property>
+             <property name="maximumSize">
+              <size>
+               <width>24</width>
+               <height>24</height>
+              </size>
+             </property>
+             <property name="text">
+              <string>...</string>
+             </property>
+            </widget>
+           </item>
+          </layout>
+         </item>
+         <item row="4" column="0">
+          <widget class="QLabel" name="label_5">
+           <property name="text">
+            <string>Context</string>
+           </property>
+          </widget>
+         </item>
+         <item row="4" column="1">
+          <widget class="QComboBox" name="cmbCustomActionContext">
+           <property name="toolTip">
+            <string>The context where this action will be available</string>
+           </property>
+          </widget>
+         </item>
+         <item row="5" column="1">
+          <widget class="QCheckBox" name="chkCustomActionMultipleSelection">
+           <property name="toolTip">
+            <string>When checked this action supports multiple selected items</string>
+           </property>
+           <property name="text">
+            <string/>
+           </property>
+          </widget>
+         </item>
+         <item row="5" column="0">
+          <widget class="QLabel" name="label_7">
+           <property name="text">
+            <string>Multiple Selection</string>
            </property>
           </widget>
          </item>
         </layout>
-       </item>
-       <item row="1" column="0">
-        <widget class="QLabel" name="label_2">
-         <property name="minimumSize">
-          <size>
-           <width>100</width>
-           <height>0</height>
-          </size>
-         </property>
-         <property name="text">
-          <string>Graphical Diff </string>
-         </property>
-        </widget>
-       </item>
-       <item row="1" column="1">
-        <layout class="QHBoxLayout" name="horizontalLayout_9">
-         <item>
-          <widget class="QLineEdit" name="lineGDiffCommand">
-           <property name="toolTip">
-            <string>Path to graphical diff tool</string>
-           </property>
-          </widget>
-         </item>
-         <item>
-          <widget class="QPushButton" name="btnSelectFossilGDiff">
-           <property name="sizePolicy">
-            <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
-             <horstretch>0</horstretch>
-             <verstretch>0</verstretch>
-            </sizepolicy>
-           </property>
-           <property name="maximumSize">
-            <size>
-             <width>24</width>
-             <height>24</height>
-            </size>
-           </property>
-           <property name="text">
-            <string>...</string>
-           </property>
-          </widget>
-         </item>
-        </layout>
-       </item>
-       <item row="2" column="0">
-        <widget class="QLabel" name="label_3">
-         <property name="minimumSize">
-          <size>
-           <width>100</width>
-           <height>0</height>
-          </size>
-         </property>
-         <property name="text">
-          <string>Graphical Merge</string>
-         </property>
-        </widget>
-       </item>
-       <item row="2" column="1">
-        <layout class="QHBoxLayout" name="horizontalLayout_10">
-         <item>
-          <widget class="QLineEdit" name="lineGMergeCommand">
-           <property name="toolTip">
-            <string>Path to the graphical merge tool</string>
-           </property>
-          </widget>
-         </item>
-         <item>
-          <widget class="QPushButton" name="btnSelectGMerge">
-           <property name="sizePolicy">
-            <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
-             <horstretch>0</horstretch>
-             <verstretch>0</verstretch>
-            </sizepolicy>
-           </property>
-           <property name="maximumSize">
-            <size>
-             <width>24</width>
-             <height>24</height>
-            </size>
-           </property>
-           <property name="text">
-            <string>...</string>
-           </property>
-          </widget>
-         </item>
-        </layout>
-       </item>
-       <item row="3" column="0">
-        <widget class="QLabel" name="label_44">
-         <property name="minimumSize">
-          <size>
-           <width>100</width>
-           <height>0</height>
-          </size>
-         </property>
-         <property name="text">
-          <string>HTTP Proxy</string>
-         </property>
-        </widget>
-       </item>
-       <item row="3" column="1">
-        <widget class="QLineEdit" name="lineProxy">
-         <property name="minimumSize">
-          <size>
-           <width>0</width>
-           <height>0</height>
-          </size>
-         </property>
-         <property name="toolTip">
-          <string>The URL of the HTTP proxy</string>
-         </property>
-        </widget>
-       </item>
-       <item row="4" column="0">
-        <widget class="QLabel" name="uILanguageLabel_3">
-         <property name="text">
-          <string>HTTP Port</string>
-         </property>
-        </widget>
-       </item>
-       <item row="4" column="1">
-        <widget class="QLineEdit" name="lineUIPort">
-         <property name="toolTip">
-          <string>HTTP port to use for the Fossil web interface</string>
-         </property>
-        </widget>
-       </item>
-       <item row="5" column="0">
-        <widget class="QLabel" name="label_6">
-         <property name="minimumSize">
-          <size>
-           <width>100</width>
-           <height>0</height>
-          </size>
-         </property>
-         <property name="text">
-          <string>Commit Messages</string>
-         </property>
-        </widget>
-       </item>
-       <item row="5" column="1">
-        <widget class="QPushButton" name="btnClearMessageHistory">
-         <property name="sizePolicy">
-          <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
-           <horstretch>0</horstretch>
-           <verstretch>0</verstretch>
-          </sizepolicy>
-         </property>
-         <property name="toolTip">
-          <string>Clear the commit message history</string>
-         </property>
-         <property name="text">
-          <string>Clear</string>
-         </property>
-        </widget>
-       </item>
-       <item row="6" column="0">
-        <widget class="QLabel" name="uILanguageLabel_2">
-         <property name="text">
-          <string>Web Browser</string>
-         </property>
-        </widget>
-       </item>
-       <item row="6" column="1">
-        <widget class="QComboBox" name="cmbFossilBrowser">
-         <property name="sizePolicy">
-          <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
-           <horstretch>0</horstretch>
-           <verstretch>0</verstretch>
-          </sizepolicy>
-         </property>
-         <property name="toolTip">
-          <string>Web browser to use for the Fossil web interface</string>
-         </property>
-        </widget>
-       </item>
-       <item row="7" column="0">
-        <widget class="QLabel" name="label_8">
-         <property name="minimumSize">
-          <size>
-           <width>100</width>
-           <height>0</height>
-          </size>
-         </property>
-         <property name="text">
-          <string>Double-click Action</string>
-         </property>
-        </widget>
-       </item>
-       <item row="7" column="1">
-        <widget class="QComboBox" name="cmbDoubleClickAction">
-         <property name="sizePolicy">
-          <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
-           <horstretch>0</horstretch>
-           <verstretch>0</verstretch>
-          </sizepolicy>
-         </property>
-         <property name="toolTip">
-          <string>Action to perfom when double-clicking a file</string>
-         </property>
-         <property name="currentIndex">
-          <number>-1</number>
-         </property>
-        </widget>
-       </item>
-       <item row="8" column="0">
-        <widget class="QLabel" name="uILanguageLabel">
-         <property name="text">
-          <string>Language</string>
-         </property>
-        </widget>
-       </item>
-       <item row="8" column="1">
-        <widget class="QComboBox" name="cmbActiveLanguage">
-         <property name="sizePolicy">
-          <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
-           <horstretch>0</horstretch>
-           <verstretch>0</verstretch>
-          </sizepolicy>
-         </property>
-         <property name="toolTip">
-          <string>Language for the user interface</string>
-         </property>
-        </widget>
-       </item>
-      </layout>
-     </widget>
-     <widget class="QWidget" name="tabRepo">
-      <attribute name="icon">
-       <iconset resource="../rsrc/resources.qrc">
-        <normaloff>:/icons/icons/Book-01.png</normaloff>:/icons/icons/Book-01.png</iconset>
-      </attribute>
-      <attribute name="title">
-       <string>Repository</string>
-      </attribute>
-      <layout class="QFormLayout" name="formLayout_2">
-       <property name="fieldGrowthPolicy">
-        <enum>QFormLayout::ExpandingFieldsGrow</enum>
-       </property>
-       <property name="labelAlignment">
-        <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
-       </property>
-       <item row="0" column="0">
-        <widget class="QLabel" name="label_5">
-         <property name="minimumSize">
-          <size>
-           <width>100</width>
-           <height>0</height>
-          </size>
-         </property>
-         <property name="text">
-          <string>Remote Url</string>
-         </property>
-        </widget>
-       </item>
-       <item row="0" column="1">
-        <widget class="QLineEdit" name="lineRemoteURL">
-         <property name="minimumSize">
-          <size>
-           <width>0</width>
-           <height>0</height>
-          </size>
-         </property>
-         <property name="toolTip">
-          <string>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</string>
-         </property>
-        </widget>
-       </item>
-       <item row="1" column="0">
-        <widget class="QLabel" name="label_4">
-         <property name="minimumSize">
-          <size>
-           <width>100</width>
-           <height>0</height>
-          </size>
-         </property>
-         <property name="text">
-          <string>Ignore List</string>
-         </property>
-        </widget>
-       </item>
-       <item row="1" column="1">
-        <widget class="QLineEdit" name="lineIgnore">
-         <property name="minimumSize">
-          <size>
-           <width>0</width>
-           <height>0</height>
-          </size>
-         </property>
-         <property name="toolTip">
-          <string>A comma separated list of glob-style file/path patterns ignored in Fossil file operations</string>
-         </property>
-        </widget>
-       </item>
-       <item row="2" column="0">
-        <widget class="QLabel" name="label_7">
-         <property name="minimumSize">
-          <size>
-           <width>100</width>
-           <height>0</height>
-          </size>
-         </property>
-         <property name="text">
-          <string>Ignore CR/NL</string>
-         </property>
-        </widget>
-       </item>
-       <item row="2" column="1">
-        <widget class="QLineEdit" name="lineIgnoreCRNL">
-         <property name="minimumSize">
-          <size>
-           <width>0</width>
-           <height>0</height>
-          </size>
-         </property>
-         <property name="toolTip">
-          <string>A comma separated list of glob-style file patterns to exclude from Fossil's CR/NL consistency checking</string>
-         </property>
-        </widget>
-       </item>
-      </layout>
-     </widget>
+       </widget>
+      </item>
+     </layout>
     </widget>
    </item>
    <item>