Merge branch 'develop' into lerignoux_best_match_clip

.github/CONTRIBUTING.md

@@ -132,7 +132,7 @@ For **Qt-UI files** (*.ui*): 2 spaces
 
 // Application includes
 #include "core/Config.h"
-#include "core/FilePath.h"
+#include "core/Resources.h"
 
 // Global includes
 #include <QWidget>

CHANGELOG.md

@@ -1,12 +1,14 @@
 # Changelog
 
-## 2.6 (unreleased)
+## 2.6.0 (unreleased)
 
 ### Added
 - Added CLI db-info command [#4231]
 
 ### Changed
 - Renamed CLI create command to db-create [#4231]
+- Added --set-password option for CLI db-create command
+- Added --set-key-file option for CLI db-create command (replacing --key-file option)
 
 ## 2.5.3 (2020-01-19)
 

CMakeLists.txt

@@ -62,9 +62,9 @@ endif()
 if(WITH_CCACHE)
     # Use the Compiler Cache (ccache) program
     # (install with: sudo apt get ccache)
-    find_program (CCACHE_FOUND ccache)
+    find_program(CCACHE_FOUND ccache)
     if(CCACHE_FOUND)
-        set_property(GLOBAL PROPERTY RULE_LAUNCH_COMPILE ccache)
+        set_property(GLOBAL PROPERTY RULE_LAUNCH_COMPILE ${CCACHE_FOUND})
     else()
         message(FATAL_ERROR "ccache requested but cannot be found.")
     endif()
@@ -99,8 +99,8 @@ if(NOT WITH_XC_NETWORKING AND WITH_XC_UPDATECHECK)
 endif()
 
 set(KEEPASSXC_VERSION_MAJOR "2")
-set(KEEPASSXC_VERSION_MINOR "5")
-set(KEEPASSXC_VERSION_PATCH "3")
+set(KEEPASSXC_VERSION_MINOR "6")
+set(KEEPASSXC_VERSION_PATCH "0")
 set(KEEPASSXC_VERSION "${KEEPASSXC_VERSION_MAJOR}.${KEEPASSXC_VERSION_MINOR}.${KEEPASSXC_VERSION_PATCH}")
 set(OVERRIDE_VERSION "" CACHE STRING "Override the KeePassXC Version for Snapshot builds")
 

COPYING

@@ -180,6 +180,8 @@ Files: share/icons/application/scalable/categories/preferences-other.svg
        share/icons/application/scalable/actions/favicon-download.svg
        share/icons/application/scalable/actions/document-open.svg
        share/icons/application/scalable/actions/document-save-as.svg
+       share/icons/application/scalable/actions/refresh.svg
+       share/icons/application/scalable/actions/clipboard-text.svg
 Copyright: 2019 Austin Andrews <http://templarian.com/>
 License: SIL OPEN FONT LICENSE Version 1.1
 Comment: Taken from Material Design icon set (https://github.com/templarian/MaterialDesign/)

INSTALL.md

@@ -68,7 +68,6 @@ git checkout master
 Navigate to the directory where you have downloaded KeePassXC and type these commands:
 
 ```
-cd directory-where-sources-live
 mkdir build
 cd build
 cmake -DWITH_XC_ALL=ON ..

cmake/CLangFormat.cmake

@@ -19,7 +19,7 @@ set(EXCLUDED_DIRS
         # objective-c directories
         src/touchid/
         src/autotype/mac/
-        src/gui/macutils/)
+        src/gui/osutils/macutils/)
 
 set(EXCLUDED_FILES
         # third-party files

share/CMakeLists.txt

@@ -19,10 +19,6 @@ add_subdirectory(translations)
 file(GLOB wordlists_files "wordlists/*.wordlist")
 install(FILES ${wordlists_files} DESTINATION ${DATA_INSTALL_DIR}/wordlists)
 
-file(GLOB DATABASE_ICONS icons/database/*.png)
-
-install(FILES ${DATABASE_ICONS} DESTINATION ${DATA_INSTALL_DIR}/icons/database)
-
 if(UNIX AND NOT APPLE AND NOT HAIKU)
     install(DIRECTORY icons/application/ DESTINATION ${CMAKE_INSTALL_DATADIR}/icons/hicolor
             FILES_MATCHING PATTERN "keepassx*.png" PATTERN "keepassx*.svg"
@@ -39,12 +35,9 @@ if(APPLE)
   install(FILES macosx/keepassxc.icns DESTINATION ${DATA_INSTALL_DIR})
 endif()
 
-install(DIRECTORY docs/ DESTINATION ${DATA_INSTALL_DIR}/docs FILES_MATCHING PATTERN "*.pdf")
+install(FILES icons/application/256x256/apps/keepassxc.png DESTINATION ${DATA_INSTALL_DIR}/icons/application/256x256/apps)
 
-install(DIRECTORY wizard/ DESTINATION ${DATA_INSTALL_DIR}/wizard FILES_MATCHING PATTERN "*.png")
-
-install(DIRECTORY icons/application/ DESTINATION ${DATA_INSTALL_DIR}/icons/application
-        FILES_MATCHING PATTERN "*.png" PATTERN "*.svg")
+install(DIRECTORY docs/ DESTINATION ${DATA_INSTALL_DIR}/docs FILES_MATCHING PATTERN "*.pdf")
 
 add_custom_target(icons
     # SVG to PNGs for KeePassXC

share/docs/man/keepassxc-cli.1

@@ -29,7 +29,7 @@ Copies an attribute or the current TOTP (if the \fI-t\fP option is specified) of
 In interactive mode, closes the currently opened database (see \fIopen\fP).
 
 .IP "\fBdb-create\fP [options] <database>"
-Creates a new database with a key file and/or password. The key file will be created if the file that is referred to does not exist. If both the key file and password are empty, no database will be created.
+Creates a new database with a password and/or a key file. The key file will be created if the file that is referred to does not exist. If both the key file and password are empty, no database will be created.
 
 .IP "\fBdb-info\fP [options] <database>"
 Show a database's information.
@@ -185,6 +185,12 @@ Will report an error if no TOTP is configured for the entry.
 
 .SS "Create options"
 
+.IP "\fB-k\fP, \fB--set-key-file\fP <path>"
+Set the key file for the database.
+
+.IP "\fB-p\fP, \fB--set-password\fP"
+Set a password for the database.
+
 .IP "\fB-t\fP, \fB--decryption-time\fP <time>"
 Target decryption time in MS for the database.
 

share/icons/application/index.theme

@@ -0,0 +1,45 @@
+[Icon Theme]
+Name=application
+Comment=KeePassXC Application Icon Theme
+
+Directories=256x256/apps,scalable/actions,scalable/apps,scalable/categories,scalable/mimetypes,scalable/status
+
+[scalable/actions]
+Size=48
+Type=Scalable
+MinSize=1
+MaxSize=256
+Context=Actions
+
+[scalable/apps]
+Size=48
+Type=Scalable
+MinSize=1
+MaxSize=256
+Context=Applications
+
+[scalable/categories]
+Size=48
+Type=Scalable
+MinSize=1
+MaxSize=256
+Context=Categories
+
+[scalable/mimetypes]
+Size=48
+Type=Scalable
+MinSize=1
+MaxSize=256
+Context=MimeTypes
+
+[scalable/status]
+Size=48
+Type=Scalable
+MinSize=1
+MaxSize=256
+Context=Status
+
+[256x256/apps]
+Size=256
+Type=Fixed
+Context=Applications