diff --git a/.travis.yml b/.travis.yml
index 5f49424bf..ed8e2f47c 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -5,6 +5,7 @@ dist: xenial
branches:
only:
- master
+ - v3.12.x
# env:
# - ARCH=x86_64 DOCKER_IMAGE=amd64/ubuntu:trusty
@@ -57,17 +58,17 @@ script:
- cmake -DCMAKE_INSTALL_PREFIX:PATH=../appdir/usr -Wno-dev -Dsqlcipher=1 -DSQLITE_ENABLE_JSON1=1 ..
- make install
- cd ..
-- git rev-list master --count
- wget -c -nv "https://github.com/probonopd/linuxdeployqt/releases/download/6/linuxdeployqt-6-x86_64.AppImage"
- chmod a+x linuxdeployqt-6-x86_64.AppImage
-- export VERSION=$(printf "`master`-`git rev-list HEAD --count`-` git -C . rev-parse --short HEAD`") #$(git rev-parse --short HEAD) # linuxdeployqt uses this for naming the file
+- export VERSION=${TRAVIS_BRANCH}-`git -C . rev-parse --short HEAD` # linuxdeployqt uses this for naming the file
- ./linuxdeployqt-6-x86_64.AppImage appdir/usr/share/applications/*.desktop -appimage
after_success:
- find appdir -executable -type f -exec ldd {} \; | grep " => /usr" | cut -d " " -f 2-3 | sort | uniq
- wget -c https://github.com/probonopd/uploadtool/raw/master/upload.sh
- - bash upload.sh DB_Browser_for_SQLite*.AppImage*
+ - chmod a+x upload.sh
+ - UPLOADTOOL_ISPRERELEASE=true UPLOADTOOL_SUFFIX=$TRAVIS_BRANCH ./upload.sh DB_Browser_for_SQLite*.AppImage*
notifications:
email:
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 2ae689731..d0209c56c 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -75,12 +75,12 @@ if(NOT FORCE_INTERNAL_QSCINTILLA)
find_package(QScintilla 2.8.10 QUIET)
endif()
if(FORCE_INTERNAL_QCUSTOMPLOT)
- set(QCUSTOMPLOT_FOUND FALSE)
+ set(QCustomPlot_FOUND FALSE)
else()
find_package(QCustomPlot)
endif()
if(FORCE_INTERNAL_QHEXEDIT)
- set(QHEXEDIT_FOUND FALSE)
+ set(QHexEdit_FOUND FALSE)
else()
find_package(QHexEdit)
endif()
@@ -90,15 +90,15 @@ if(NOT QSCINTILLA_FOUND)
set(QSCINTILLA_DIR libs/qscintilla/Qt4Qt5)
add_subdirectory(${QSCINTILLA_DIR})
endif()
-if(NOT QHEXEDIT_FOUND)
- set(QHEXEDIT_DIR libs/qhexedit)
- set(QHEXEDIT_INCL_DIR ${QHEXEDIT_DIR}/src)
- add_subdirectory(${QHEXEDIT_DIR})
+if(NOT QHexEdit_FOUND)
+ set(QHexEdit_DIR libs/qhexedit)
+ set(QHexEdit_INCL_DIR ${QHexEdit_DIR}/src)
+ add_subdirectory(${QHexEdit_DIR})
endif()
add_subdirectory(${JSON_DIR})
-if(NOT QCUSTOMPLOT_FOUND)
- set(QCUSTOMPLOT_DIR libs/qcustomplot-source)
- add_subdirectory(${QCUSTOMPLOT_DIR})
+if(NOT QCustomPlot_FOUND)
+ set(QCustomPlot_DIR libs/qcustomplot-source)
+ add_subdirectory(${QCustomPlot_DIR})
endif()
set(CMAKE_AUTOMOC ON)
@@ -170,6 +170,9 @@ set(SQLB_MOC_HDR
src/ProxyDialog.h
src/SelectItemsPopup.h
src/TableBrowser.h
+ src/RemoteLocalFilesModel.h
+ src/RemoteCommitsModel.h
+ src/RemoteNetwork.h
)
set(SQLB_SRC
@@ -228,6 +231,9 @@ set(SQLB_SRC
src/sql/parser/ParserDriver.cpp
src/sql/parser/sqlite3_lexer.cpp
src/sql/parser/sqlite3_parser.cpp
+ src/RemoteLocalFilesModel.cpp
+ src/RemoteCommitsModel.cpp
+ src/RemoteNetwork.cpp
)
set(SQLB_FORMS
@@ -287,6 +293,7 @@ set(SQLB_TSS
"${CMAKE_SOURCE_DIR}/src/translations/sqlb_uk_UA.ts"
"${CMAKE_SOURCE_DIR}/src/translations/sqlb_it.ts"
"${CMAKE_SOURCE_DIR}/src/translations/sqlb_ja.ts"
+ "${CMAKE_SOURCE_DIR}/src/translations/sqlb_nl.ts"
)
# Windows image format plugin files
@@ -386,15 +393,15 @@ include_directories(
${JSON_DIR}
${ADDITIONAL_INCLUDE_PATHS}
src)
-if(QHEXEDIT_FOUND)
- include_directories(${QHEXEDIT_INCLUDE_DIR})
+if(QHexEdit_FOUND)
+ include_directories(${QHexEdit_INCLUDE_DIR})
else()
- include_directories(${QHEXEDIT_INCL_DIR})
+ include_directories(${QHexEdit_INCL_DIR})
endif()
-if(QCUSTOMPLOT_FOUND)
- include_directories(${QCUSTOMPLOT_INCLUDE_DIR})
+if(QCustomPlot_FOUND)
+ include_directories(${QCustomPlot_INCLUDE_DIR})
else()
- include_directories(${QCUSTOMPLOT_DIR})
+ include_directories(${QCustomPlot_DIR})
endif()
if(QSCINTILLA_FOUND)
include_directories(${QSCINTILLA_INCLUDE_DIR})
@@ -420,21 +427,21 @@ if (ALL_WARNINGS AND CMAKE_COMPILER_IS_GNUCC)
endif()
endif()
-if(NOT QHEXEDIT_FOUND)
+if(NOT QHexEdit_FOUND)
add_dependencies(${PROJECT_NAME} qhexedit)
endif()
-if(NOT QCUSTOMPLOT_FOUND)
+if(NOT QCustomPlot_FOUND)
add_dependencies(${PROJECT_NAME} qcustomplot)
endif()
if(NOT QSCINTILLA_FOUND)
add_dependencies(${PROJECT_NAME} qscintilla2)
endif()
-if(NOT QHEXEDIT_FOUND)
- link_directories("${CMAKE_CURRENT_BINARY_DIR}/${QHEXEDIT_DIR}")
+if(NOT QHexEdit_FOUND)
+ link_directories("${CMAKE_CURRENT_BINARY_DIR}/${QHexEdit_DIR}")
endif()
-if(NOT QCUSTOMPLOT_FOUND)
- link_directories("${CMAKE_CURRENT_BINARY_DIR}/${QCUSTOMPLOT_DIR}")
+if(NOT QCustomPlot_FOUND)
+ link_directories("${CMAKE_CURRENT_BINARY_DIR}/${QCustomPlot_DIR}")
endif()
if(NOT QSCINTILLA_FOUND)
link_directories("${CMAKE_CURRENT_BINARY_DIR}/${QSCINTILLA_DIR}")
@@ -448,13 +455,13 @@ target_link_libraries(${PROJECT_NAME}
${WIN32_STATIC_LINK}
${LIBSQLITE}
${ADDITIONAL_LIBS})
-if(QHEXEDIT_FOUND)
- target_link_libraries(${PROJECT_NAME} ${QHEXEDIT_LIBRARIES})
+if(QHexEdit_FOUND)
+ target_link_libraries(${PROJECT_NAME} ${QHexEdit_LIBRARIES})
else()
target_link_libraries(${PROJECT_NAME} qhexedit)
endif()
-if(QCUSTOMPLOT_FOUND)
- target_link_libraries(${PROJECT_NAME} ${QCUSTOMPLOT_LIBRARIES})
+if(QCustomPlot_FOUND)
+ target_link_libraries(${PROJECT_NAME} ${QCustomPlot_LIBRARIES})
else()
target_link_libraries(${PROJECT_NAME} qcustomplot)
endif()
diff --git a/cmake/FindQCustomPlot.cmake b/cmake/FindQCustomPlot.cmake
index b3dba344a..da936c5ef 100644
--- a/cmake/FindQCustomPlot.cmake
+++ b/cmake/FindQCustomPlot.cmake
@@ -31,21 +31,21 @@
# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-find_library(QCUSTOMPLOT_LIBRARY qcustomplot)
-set(QCUSTOMPLOT_LIBRARIES "${QCUSTOMPLOT_LIBRARY}")
+find_library(QCustomPlot_LIBRARY qcustomplot)
+set(QCustomPlot_LIBRARIES "${QCustomPlot_LIBRARY}")
-find_path(QCUSTOMPLOT_INCLUDE_DIR qcustomplot.h)
-set(QCUSTOMPLOT_INCLUDE_DIRS "${QCUSTOMPLOT_INCLUDE_DIR}")
+find_path(QCustomPlot_INCLUDE_DIR qcustomplot.h)
+set(QCustomPlot_INCLUDE_DIRS "${QCustomPlot_INCLUDE_DIR}")
include(FindPackageHandleStandardArgs)
find_package_handle_standard_args(
- QCUSTOMPLOT
+ QCustomPlot
DEFAULT_MSG
- QCUSTOMPLOT_LIBRARIES
- QCUSTOMPLOT_INCLUDE_DIRS
+ QCustomPlot_LIBRARIES
+ QCustomPlot_INCLUDE_DIRS
)
mark_as_advanced(
- QCUSTOMPLOT_INCLUDE_DIRS
- QCUSTOMPLOT_LIBRARIES
+ QCustomPlot_INCLUDE_DIRS
+ QCustomPlot_LIBRARIES
)
diff --git a/cmake/FindQHexEdit.cmake b/cmake/FindQHexEdit.cmake
index 248abfe2f..383623662 100644
--- a/cmake/FindQHexEdit.cmake
+++ b/cmake/FindQHexEdit.cmake
@@ -31,21 +31,21 @@
# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-find_library(QHEXEDIT_LIBRARY qhexedit)
-set(QHEXEDIT_LIBRARIES "${QHEXEDIT_LIBRARY}")
+find_library(QHexEdit_LIBRARY qhexedit)
+set(QHexEdit_LIBRARIES "${QHexEdit_LIBRARY}")
-find_path(QHEXEDIT_INCLUDE_DIR qhexedit.h)
-set(QHEXEDIT_INCLUDE_DIRS "${QHEXEDIT_INCLUDE_DIR}")
+find_path(QHexEdit_INCLUDE_DIR qhexedit.h)
+set(QHexEdit_INCLUDE_DIRS "${QHexEdit_INCLUDE_DIR}")
include(FindPackageHandleStandardArgs)
find_package_handle_standard_args(
- QHEXEDIT
+ QHexEdit
DEFAULT_MSG
- QHEXEDIT_LIBRARIES
- QHEXEDIT_INCLUDE_DIRS
+ QHexEdit_LIBRARIES
+ QHexEdit_INCLUDE_DIRS
)
mark_as_advanced(
- QHEXEDIT_INCLUDE_DIRS
- QHEXEDIT_LIBRARIES
+ QHexEdit_INCLUDE_DIRS
+ QHexEdit_LIBRARIES
)
diff --git a/installer/windows/product.wxs b/installer/windows/product.wxs
index 05eab25b5..f912c958c 100644
--- a/installer/windows/product.wxs
+++ b/installer/windows/product.wxs
@@ -49,6 +49,11 @@
+
+
+
+
+
@@ -148,6 +153,9 @@
+
+
+
diff --git a/installer/windows/variables.wxi b/installer/windows/variables.wxi
index df2979a68..7bb5f5e8a 100644
--- a/installer/windows/variables.wxi
+++ b/installer/windows/variables.wxi
@@ -3,7 +3,7 @@
-
+