diff --git a/CMakeLists.txt b/CMakeLists.txt index 96a9c425de..f06a98e206 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -19,7 +19,7 @@ if(NOT CMAKE_BUILD_TYPE) FORCE) endif() -project(KeePassX) +project(KeePassXC) cmake_minimum_required(VERSION 2.8.12) @@ -33,8 +33,8 @@ option(WITH_TESTS "Enable building of unit tests" ON) option(WITH_GUI_TESTS "Enable building of GUI tests" OFF) option(WITH_DEV_BUILD "Use only for development. Disables/warns about deprecated methods." OFF) -set(KEEPASSX_VERSION "2.0.3") -set(KEEPASSX_VERSION_NUM "2.0.3") +set(KEEPASSXC_VERSION "2.1.0") +set(KEEPASSXC_VERSION_NUM "2.1.0") if("${CMAKE_C_COMPILER}" MATCHES "clang$" OR "${CMAKE_C_COMPILER_ID}" STREQUAL "Clang") set(CMAKE_COMPILER_IS_CLANG 1) @@ -120,9 +120,9 @@ if(MINGW) endif() if(APPLE OR MINGW) - set(PROGNAME KeePassX) + set(PROGNAME KeePassXC) else() - set(PROGNAME keepassx) + set(PROGNAME keepassxc) endif() if(APPLE AND "${CMAKE_INSTALL_PREFIX}" STREQUAL "/usr/local") @@ -141,8 +141,8 @@ else() include(GNUInstallDirs) set(BIN_INSTALL_DIR "${CMAKE_INSTALL_BINDIR}") - set(PLUGIN_INSTALL_DIR "${CMAKE_INSTALL_LIBDIR}/keepassx") - set(DATA_INSTALL_DIR "${CMAKE_INSTALL_DATADIR}/keepassx") + set(PLUGIN_INSTALL_DIR "${CMAKE_INSTALL_LIBDIR}/keepassxc") + set(DATA_INSTALL_DIR "${CMAKE_INSTALL_DATADIR}/keepassxc") endif() if(WITH_TESTS) diff --git a/share/CMakeLists.txt b/share/CMakeLists.txt index ede76cb683..a77f80a8e5 100644 --- a/share/CMakeLists.txt +++ b/share/CMakeLists.txt @@ -23,32 +23,95 @@ if(UNIX AND NOT APPLE) install(DIRECTORY icons/application/ DESTINATION ${CMAKE_INSTALL_DATADIR}/icons/hicolor FILES_MATCHING PATTERN "keepassx*.png" PATTERN "keepassx*.svgz") install(DIRECTORY icons/application/ DESTINATION ${CMAKE_INSTALL_DATADIR}/icons/hicolor - FILES_MATCHING PATTERN "application-x-keepassx.png" PATTERN "application-x-keepassx.svgz") - install(FILES linux/keepassx.desktop DESTINATION ${CMAKE_INSTALL_DATADIR}/applications) - install(FILES linux/keepassx.xml DESTINATION ${CMAKE_INSTALL_DATADIR}/mime/packages) + FILES_MATCHING PATTERN "application-x-keepassxc.png" PATTERN "application-x-keepassxc.svgz") + install(FILES linux/keepassxc.desktop DESTINATION ${CMAKE_INSTALL_DATADIR}/applications) + install(FILES linux/keepassxc.xml DESTINATION ${CMAKE_INSTALL_DATADIR}/mime/packages) endif(UNIX AND NOT APPLE) if(APPLE) - install(FILES macosx/keepassx.icns DESTINATION ${DATA_INSTALL_DIR}) + install(FILES macosx/keepassxc.icns DESTINATION ${DATA_INSTALL_DIR}) endif() install(DIRECTORY icons/application/ DESTINATION ${DATA_INSTALL_DIR}/icons/application FILES_MATCHING PATTERN "*.png" PATTERN "*.svgz") add_custom_target(icons - COMMAND png2icns macosx/keepassx.icns - icons/application/16x16/apps/keepassx.png - icons/application/32x32/apps/keepassx.png - icons/application/48x48/apps/keepassx.png - icons/application/128x128/apps/keepassx.png - icons/application/256x256/apps/keepassx.png - COMMAND icotool -c -o windows/keepassx.ico - icons/application/16x16/apps/keepassx.png - icons/application/24x24/apps/keepassx.png - icons/application/32x32/apps/keepassx.png - icons/application/48x48/apps/keepassx.png - icons/application/64x64/apps/keepassx.png - icons/application/128x128/apps/keepassx.png - icons/application/256x256/apps/keepassx.png + # SVGZ to PNGs for KeePassXC + COMMAND inkscape -z -w 16 -h 16 + icons/application/scalable/apps/keepassxc.svgz -e icons/application/16x16/apps/keepassxc.png + COMMAND inkscape -z -w 24 -h 24 + icons/application/scalable/apps/keepassxc.svgz -e icons/application/24x24/apps/keepassxc.png + COMMAND inkscape -z -w 32 -h 32 + icons/application/scalable/apps/keepassxc.svgz -e icons/application/32x32/apps/keepassxc.png + COMMAND inkscape -z -w 48 -h 48 + icons/application/scalable/apps/keepassxc.svgz -e icons/application/48x48/apps/keepassxc.png + COMMAND inkscape -z -w 64 -h 64 + icons/application/scalable/apps/keepassxc.svgz -e icons/application/64x64/apps/keepassxc.png + COMMAND inkscape -z -w 128 -h 128 + icons/application/scalable/apps/keepassxc.svgz -e icons/application/128x128/apps/keepassxc.png + COMMAND inkscape -z -w 256 -h 256 + icons/application/scalable/apps/keepassxc.svgz -e icons/application/256x256/apps/keepassxc.png + + # SVGZ to PNGs for KeePassXC + COMMAND inkscape -z -w 16 -h 16 + icons/application/scalable/apps/keepassxc-dark.svgz -e icons/application/16x16/apps/keepassxc-dark.png + COMMAND inkscape -z -w 24 -h 24 + icons/application/scalable/apps/keepassxc-dark.svgz -e icons/application/24x24/apps/keepassxc-dark.png + COMMAND inkscape -z -w 32 -h 32 + icons/application/scalable/apps/keepassxc-dark.svgz -e icons/application/32x32/apps/keepassxc-dark.png + COMMAND inkscape -z -w 48 -h 48 + icons/application/scalable/apps/keepassxc-dark.svgz -e icons/application/48x48/apps/keepassxc-dark.png + COMMAND inkscape -z -w 64 -h 64 + icons/application/scalable/apps/keepassxc-dark.svgz -e icons/application/64x64/apps/keepassxc-dark.png + COMMAND inkscape -z -w 128 -h 128 + icons/application/scalable/apps/keepassxc-dark.svgz -e icons/application/128x128/apps/keepassxc-dark.png + COMMAND inkscape -z -w 256 -h 256 + icons/application/scalable/apps/keepassxc-dark.svgz -e icons/application/256x256/apps/keepassxc-dark.png + + # SVGZ to PNGs for KeePassXC + COMMAND inkscape -z -w 16 -h 16 + icons/application/scalable/apps/keepassxc-locked.svgz -e icons/application/16x16/apps/keepassxc-locked.png + COMMAND inkscape -z -w 24 -h 24 + icons/application/scalable/apps/keepassxc-locked.svgz -e icons/application/24x24/apps/keepassxc-locked.png + COMMAND inkscape -z -w 32 -h 32 + icons/application/scalable/apps/keepassxc-locked.svgz -e icons/application/32x32/apps/keepassxc-locked.png + COMMAND inkscape -z -w 48 -h 48 + icons/application/scalable/apps/keepassxc-locked.svgz -e icons/application/48x48/apps/keepassxc-locked.png + COMMAND inkscape -z -w 64 -h 64 + icons/application/scalable/apps/keepassxc-locked.svgz -e icons/application/64x64/apps/keepassxc-locked.png + COMMAND inkscape -z -w 128 -h 128 + icons/application/scalable/apps/keepassxc-locked.svgz -e icons/application/128x128/apps/keepassxc-locked.png + COMMAND inkscape -z -w 256 -h 256 + icons/application/scalable/apps/keepassxc-locked.svgz -e icons/application/256x256/apps/keepassxc-locked.png + + # SVGZ to PNGs for KeePassXC MIME-Type + COMMAND inkscape -z -w 16 -h 16 + icons/application/scalable/mimetypes/application-x-keepassxc.svgz -e icons/application/16x16/mimetypes/application-x-keepassxc.png + COMMAND inkscape -z -w 22 -h 22 + icons/application/scalable/mimetypes/application-x-keepassxc.svgz -e icons/application/22x22/mimetypes/application-x-keepassxc.png + COMMAND inkscape -z -w 32 -h 32 + icons/application/scalable/mimetypes/application-x-keepassxc.svgz -e icons/application/32x32/mimetypes/application-x-keepassxc.png + COMMAND inkscape -z -w 64 -h 64 + icons/application/scalable/mimetypes/application-x-keepassxc.svgz -e icons/application/64x64/mimetypes/application-x-keepassxc.png + COMMAND inkscape -z -w 128 -h 128 + icons/application/scalable/mimetypes/application-x-keepassxc.svgz -e icons/application/128x128/mimetypes/application-x-keepassxc.png + + # ICNS for MacOS + COMMAND png2icns macosx/keepassxc.icns + icons/application/16x16/apps/keepassxc.png + icons/application/32x32/apps/keepassxc.png + icons/application/48x48/apps/keepassxc.png + icons/application/128x128/apps/keepassxc.png + icons/application/256x256/apps/keepassxc.png + + # ICO for Windows + COMMAND icotool -c -o windows/keepassxc.ico + icons/application/16x16/apps/keepassxc.png + icons/application/24x24/apps/keepassxc.png + icons/application/32x32/apps/keepassxc.png + icons/application/48x48/apps/keepassxc.png + icons/application/64x64/apps/keepassxc.png + icons/application/128x128/apps/keepassxc.png + icons/application/256x256/apps/keepassxc.png VERBATIM WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}) diff --git a/share/icons/application/128x128/apps/keepassx-locked.png b/share/icons/application/128x128/apps/keepassx-locked.png deleted file mode 100644 index f5096a41f6..0000000000 Binary files a/share/icons/application/128x128/apps/keepassx-locked.png and /dev/null differ diff --git a/share/icons/application/128x128/apps/keepassx.png b/share/icons/application/128x128/apps/keepassx.png deleted file mode 100644 index 567a0d4328..0000000000 Binary files a/share/icons/application/128x128/apps/keepassx.png and /dev/null differ diff --git a/share/icons/application/128x128/apps/keepassxc-dark.png b/share/icons/application/128x128/apps/keepassxc-dark.png new file mode 100644 index 0000000000..57ad32062a Binary files /dev/null and b/share/icons/application/128x128/apps/keepassxc-dark.png differ diff --git a/share/icons/application/128x128/apps/keepassxc-locked.png b/share/icons/application/128x128/apps/keepassxc-locked.png new file mode 100644 index 0000000000..0465596ec3 Binary files /dev/null and b/share/icons/application/128x128/apps/keepassxc-locked.png differ diff --git a/share/icons/application/128x128/apps/keepassxc.png b/share/icons/application/128x128/apps/keepassxc.png new file mode 100644 index 0000000000..69b0fe24ee Binary files /dev/null and b/share/icons/application/128x128/apps/keepassxc.png differ diff --git a/share/icons/application/128x128/mimetypes/application-x-keepassx.png b/share/icons/application/128x128/mimetypes/application-x-keepassx.png deleted file mode 100644 index b7b7ae4483..0000000000 Binary files a/share/icons/application/128x128/mimetypes/application-x-keepassx.png and /dev/null differ diff --git a/share/icons/application/128x128/mimetypes/application-x-keepassxc.png b/share/icons/application/128x128/mimetypes/application-x-keepassxc.png new file mode 100644 index 0000000000..539823d923 Binary files /dev/null and b/share/icons/application/128x128/mimetypes/application-x-keepassxc.png differ diff --git a/share/icons/application/16x16/apps/keepassx-locked.png b/share/icons/application/16x16/apps/keepassx-locked.png deleted file mode 100644 index ed8408b3bc..0000000000 Binary files a/share/icons/application/16x16/apps/keepassx-locked.png and /dev/null differ diff --git a/share/icons/application/16x16/apps/keepassx.png b/share/icons/application/16x16/apps/keepassx.png deleted file mode 100644 index ac68342216..0000000000 Binary files a/share/icons/application/16x16/apps/keepassx.png and /dev/null differ diff --git a/share/icons/application/16x16/apps/keepassxc-dark.png b/share/icons/application/16x16/apps/keepassxc-dark.png new file mode 100644 index 0000000000..3c10ad4b76 Binary files /dev/null and b/share/icons/application/16x16/apps/keepassxc-dark.png differ diff --git a/share/icons/application/16x16/apps/keepassxc-locked.png b/share/icons/application/16x16/apps/keepassxc-locked.png new file mode 100644 index 0000000000..711b3ba107 Binary files /dev/null and b/share/icons/application/16x16/apps/keepassxc-locked.png differ diff --git a/share/icons/application/16x16/apps/keepassxc.png b/share/icons/application/16x16/apps/keepassxc.png new file mode 100644 index 0000000000..2164f0335e Binary files /dev/null and b/share/icons/application/16x16/apps/keepassxc.png differ diff --git a/share/icons/application/16x16/mimetypes/application-x-keepassx.png b/share/icons/application/16x16/mimetypes/application-x-keepassx.png deleted file mode 100644 index c389c10aa7..0000000000 Binary files a/share/icons/application/16x16/mimetypes/application-x-keepassx.png and /dev/null differ diff --git a/share/icons/application/16x16/mimetypes/application-x-keepassxc.png b/share/icons/application/16x16/mimetypes/application-x-keepassxc.png new file mode 100644 index 0000000000..7bfdf6d592 Binary files /dev/null and b/share/icons/application/16x16/mimetypes/application-x-keepassxc.png differ diff --git a/share/icons/application/22x22/mimetypes/application-x-keepassx.png b/share/icons/application/22x22/mimetypes/application-x-keepassx.png deleted file mode 100644 index a61ec5d8dc..0000000000 Binary files a/share/icons/application/22x22/mimetypes/application-x-keepassx.png and /dev/null differ diff --git a/share/icons/application/22x22/mimetypes/application-x-keepassxc.png b/share/icons/application/22x22/mimetypes/application-x-keepassxc.png new file mode 100644 index 0000000000..2fc813f6f9 Binary files /dev/null and b/share/icons/application/22x22/mimetypes/application-x-keepassxc.png differ diff --git a/share/icons/application/24x24/apps/keepassx-locked.png b/share/icons/application/24x24/apps/keepassx-locked.png deleted file mode 100644 index 09aedf6431..0000000000 Binary files a/share/icons/application/24x24/apps/keepassx-locked.png and /dev/null differ diff --git a/share/icons/application/24x24/apps/keepassx.png b/share/icons/application/24x24/apps/keepassx.png deleted file mode 100644 index c8ecaa9c23..0000000000 Binary files a/share/icons/application/24x24/apps/keepassx.png and /dev/null differ diff --git a/share/icons/application/24x24/apps/keepassxc-dark.png b/share/icons/application/24x24/apps/keepassxc-dark.png new file mode 100644 index 0000000000..f02157ecd8 Binary files /dev/null and b/share/icons/application/24x24/apps/keepassxc-dark.png differ diff --git a/share/icons/application/24x24/apps/keepassxc-locked.png b/share/icons/application/24x24/apps/keepassxc-locked.png new file mode 100644 index 0000000000..cb8485708d Binary files /dev/null and b/share/icons/application/24x24/apps/keepassxc-locked.png differ diff --git a/share/icons/application/24x24/apps/keepassxc.png b/share/icons/application/24x24/apps/keepassxc.png new file mode 100644 index 0000000000..68c6cabc18 Binary files /dev/null and b/share/icons/application/24x24/apps/keepassxc.png differ diff --git a/share/icons/application/256x256/apps/keepassx-locked.png b/share/icons/application/256x256/apps/keepassx-locked.png deleted file mode 100644 index e68cc881af..0000000000 Binary files a/share/icons/application/256x256/apps/keepassx-locked.png and /dev/null differ diff --git a/share/icons/application/256x256/apps/keepassx.png b/share/icons/application/256x256/apps/keepassx.png deleted file mode 100644 index bf85b6b641..0000000000 Binary files a/share/icons/application/256x256/apps/keepassx.png and /dev/null differ diff --git a/share/icons/application/256x256/apps/keepassxc-dark.png b/share/icons/application/256x256/apps/keepassxc-dark.png new file mode 100644 index 0000000000..c14badcd6e Binary files /dev/null and b/share/icons/application/256x256/apps/keepassxc-dark.png differ diff --git a/share/icons/application/256x256/apps/keepassxc-locked.png b/share/icons/application/256x256/apps/keepassxc-locked.png new file mode 100644 index 0000000000..d3b7c05438 Binary files /dev/null and b/share/icons/application/256x256/apps/keepassxc-locked.png differ diff --git a/share/icons/application/256x256/apps/keepassxc.png b/share/icons/application/256x256/apps/keepassxc.png new file mode 100644 index 0000000000..d1c1178133 Binary files /dev/null and b/share/icons/application/256x256/apps/keepassxc.png differ diff --git a/share/icons/application/32x32/apps/keepassx-locked.png b/share/icons/application/32x32/apps/keepassx-locked.png deleted file mode 100644 index 01eabf8b16..0000000000 Binary files a/share/icons/application/32x32/apps/keepassx-locked.png and /dev/null differ diff --git a/share/icons/application/32x32/apps/keepassx.png b/share/icons/application/32x32/apps/keepassx.png deleted file mode 100644 index f8358d68d6..0000000000 Binary files a/share/icons/application/32x32/apps/keepassx.png and /dev/null differ diff --git a/share/icons/application/32x32/apps/keepassxc-dark.png b/share/icons/application/32x32/apps/keepassxc-dark.png new file mode 100644 index 0000000000..b2092359e6 Binary files /dev/null and b/share/icons/application/32x32/apps/keepassxc-dark.png differ diff --git a/share/icons/application/32x32/apps/keepassxc-locked.png b/share/icons/application/32x32/apps/keepassxc-locked.png new file mode 100644 index 0000000000..dbe8f45dd3 Binary files /dev/null and b/share/icons/application/32x32/apps/keepassxc-locked.png differ diff --git a/share/icons/application/32x32/apps/keepassxc.png b/share/icons/application/32x32/apps/keepassxc.png new file mode 100644 index 0000000000..de06bf03ae Binary files /dev/null and b/share/icons/application/32x32/apps/keepassxc.png differ diff --git a/share/icons/application/32x32/mimetypes/application-x-keepassx.png b/share/icons/application/32x32/mimetypes/application-x-keepassx.png deleted file mode 100644 index 5df0f449a7..0000000000 Binary files a/share/icons/application/32x32/mimetypes/application-x-keepassx.png and /dev/null differ diff --git a/share/icons/application/32x32/mimetypes/application-x-keepassxc.png b/share/icons/application/32x32/mimetypes/application-x-keepassxc.png new file mode 100644 index 0000000000..195f792d87 Binary files /dev/null and b/share/icons/application/32x32/mimetypes/application-x-keepassxc.png differ diff --git a/share/icons/application/48x48/apps/keepassx-locked.png b/share/icons/application/48x48/apps/keepassx-locked.png deleted file mode 100644 index 8a5c9d6cf3..0000000000 Binary files a/share/icons/application/48x48/apps/keepassx-locked.png and /dev/null differ diff --git a/share/icons/application/48x48/apps/keepassx.png b/share/icons/application/48x48/apps/keepassx.png deleted file mode 100644 index dbe1baa428..0000000000 Binary files a/share/icons/application/48x48/apps/keepassx.png and /dev/null differ diff --git a/share/icons/application/48x48/apps/keepassxc-dark.png b/share/icons/application/48x48/apps/keepassxc-dark.png new file mode 100644 index 0000000000..08e396cd32 Binary files /dev/null and b/share/icons/application/48x48/apps/keepassxc-dark.png differ diff --git a/share/icons/application/48x48/apps/keepassxc-locked.png b/share/icons/application/48x48/apps/keepassxc-locked.png new file mode 100644 index 0000000000..5668dd7b51 Binary files /dev/null and b/share/icons/application/48x48/apps/keepassxc-locked.png differ diff --git a/share/icons/application/48x48/apps/keepassxc.png b/share/icons/application/48x48/apps/keepassxc.png new file mode 100644 index 0000000000..06a563d1a7 Binary files /dev/null and b/share/icons/application/48x48/apps/keepassxc.png differ diff --git a/share/icons/application/64x64/apps/keepassx-locked.png b/share/icons/application/64x64/apps/keepassx-locked.png deleted file mode 100644 index 38ffb8c07b..0000000000 Binary files a/share/icons/application/64x64/apps/keepassx-locked.png and /dev/null differ diff --git a/share/icons/application/64x64/apps/keepassx.png b/share/icons/application/64x64/apps/keepassx.png deleted file mode 100644 index b1d1ed1f39..0000000000 Binary files a/share/icons/application/64x64/apps/keepassx.png and /dev/null differ diff --git a/share/icons/application/64x64/apps/keepassxc-dark.png b/share/icons/application/64x64/apps/keepassxc-dark.png new file mode 100644 index 0000000000..439ca7e8e9 Binary files /dev/null and b/share/icons/application/64x64/apps/keepassxc-dark.png differ diff --git a/share/icons/application/64x64/apps/keepassxc-locked.png b/share/icons/application/64x64/apps/keepassxc-locked.png new file mode 100644 index 0000000000..e4ca501a90 Binary files /dev/null and b/share/icons/application/64x64/apps/keepassxc-locked.png differ diff --git a/share/icons/application/64x64/apps/keepassxc.png b/share/icons/application/64x64/apps/keepassxc.png new file mode 100644 index 0000000000..8ade0e85e3 Binary files /dev/null and b/share/icons/application/64x64/apps/keepassxc.png differ diff --git a/share/icons/application/64x64/mimetypes/application-x-keepassx.png b/share/icons/application/64x64/mimetypes/application-x-keepassx.png deleted file mode 100644 index 3f312297d2..0000000000 Binary files a/share/icons/application/64x64/mimetypes/application-x-keepassx.png and /dev/null differ diff --git a/share/icons/application/64x64/mimetypes/application-x-keepassxc.png b/share/icons/application/64x64/mimetypes/application-x-keepassxc.png new file mode 100644 index 0000000000..dc97a7d246 Binary files /dev/null and b/share/icons/application/64x64/mimetypes/application-x-keepassxc.png differ diff --git a/share/icons/application/scalable/apps/keepassx-locked.svgz b/share/icons/application/scalable/apps/keepassx-locked.svgz deleted file mode 100644 index 2c3405c9a9..0000000000 Binary files a/share/icons/application/scalable/apps/keepassx-locked.svgz and /dev/null differ diff --git a/share/icons/application/scalable/apps/keepassx.svgz b/share/icons/application/scalable/apps/keepassx.svgz deleted file mode 100644 index 6490f4310d..0000000000 Binary files a/share/icons/application/scalable/apps/keepassx.svgz and /dev/null differ diff --git a/share/icons/application/scalable/apps/keepassxc-dark.svgz b/share/icons/application/scalable/apps/keepassxc-dark.svgz new file mode 100644 index 0000000000..0f8d75e701 Binary files /dev/null and b/share/icons/application/scalable/apps/keepassxc-dark.svgz differ diff --git a/share/icons/application/scalable/apps/keepassxc-locked.svgz b/share/icons/application/scalable/apps/keepassxc-locked.svgz new file mode 100644 index 0000000000..65aca0592b Binary files /dev/null and b/share/icons/application/scalable/apps/keepassxc-locked.svgz differ diff --git a/share/icons/application/scalable/apps/keepassxc.svgz b/share/icons/application/scalable/apps/keepassxc.svgz new file mode 100644 index 0000000000..84ce139046 Binary files /dev/null and b/share/icons/application/scalable/apps/keepassxc.svgz differ diff --git a/share/icons/application/scalable/mimetypes/application-x-keepassxc.svgz b/share/icons/application/scalable/mimetypes/application-x-keepassxc.svgz new file mode 100644 index 0000000000..0ea2e0b076 Binary files /dev/null and b/share/icons/application/scalable/mimetypes/application-x-keepassxc.svgz differ diff --git a/share/icons/svg/application-x-keepassx-16.svgz b/share/icons/svg/application-x-keepassx-16.svgz deleted file mode 100644 index d7caa86d5f..0000000000 Binary files a/share/icons/svg/application-x-keepassx-16.svgz and /dev/null differ diff --git a/share/icons/svg/application-x-keepassx.svgz b/share/icons/svg/application-x-keepassx.svgz deleted file mode 100644 index 0eea69e284..0000000000 Binary files a/share/icons/svg/application-x-keepassx.svgz and /dev/null differ diff --git a/share/icons/svg/application-x-keepassxc-16.svgz b/share/icons/svg/application-x-keepassxc-16.svgz new file mode 100644 index 0000000000..6ee775350a Binary files /dev/null and b/share/icons/svg/application-x-keepassxc-16.svgz differ diff --git a/share/icons/svg/application-x-keepassxc.svgz b/share/icons/svg/application-x-keepassxc.svgz new file mode 100644 index 0000000000..0ea2e0b076 Binary files /dev/null and b/share/icons/svg/application-x-keepassxc.svgz differ diff --git a/share/linux/keepassx.desktop b/share/linux/keepassxc.desktop similarity index 75% rename from share/linux/keepassx.desktop rename to share/linux/keepassxc.desktop index 41213bbeff..1e72c4f846 100644 --- a/share/linux/keepassx.desktop +++ b/share/linux/keepassxc.desktop @@ -1,12 +1,12 @@ [Desktop Entry] -Name=KeePassX -GenericName=Password Manager +Name=KeePassXC +GenericName=Community Password Manager GenericName[de]=Passwortverwaltung GenericName[es]=Gestor de contraseñas GenericName[fr]=Gestionnaire de mot de passe GenericName[ru]=менеджер паролей -Exec=keepassx %f -Icon=keepassx +Exec=keepassxc %f +Icon=keepassxc Terminal=false Type=Application Categories=Qt;Utility; diff --git a/share/linux/keepassx.xml b/share/linux/keepassxc.xml similarity index 85% rename from share/linux/keepassx.xml rename to share/linux/keepassxc.xml index cd7a0b678c..757047d2ba 100644 --- a/share/linux/keepassx.xml +++ b/share/linux/keepassxc.xml @@ -3,6 +3,6 @@ KeePass 2 database - + diff --git a/share/macosx/Info.plist.cmake b/share/macosx/Info.plist.cmake index 73751a1028..db5b8501e2 100644 --- a/share/macosx/Info.plist.cmake +++ b/share/macosx/Info.plist.cmake @@ -11,9 +11,9 @@ CFBundleExecutable ${PROGNAME} CFBundleIconFile - keepassx.icns + keepassxc.icns CFBundleIdentifier - org.keepassx.keepassx + org.keepassx.keepassxc CFBundleInfoDictionaryVersion 6.0 CFBundleName @@ -21,13 +21,13 @@ CFBundlePackageType APPL CFBundleShortVersionString - ${KEEPASSX_VERSION} + ${KEEPASSXC_VERSION} CFBundleSignature KEPX CFBundleVersion - ${KEEPASSX_VERSION_NUM} + ${KEEPASSXC_VERSION_NUM} NSHumanReadableCopyright - Copyright 2010-2012 KeePassX Development Team + Copyright 2016 KeePassXC Development Team CFBundleDocumentTypes @@ -36,9 +36,9 @@ kdbx CFBundleTypeIconFile - keepassx.icns + keepassxc.icns CFBundleTypeName - KeePassX Password Database + KeePassXC Password Database CFBundleTypeOSTypes kdbx diff --git a/share/macosx/keepassx.icns b/share/macosx/keepassx.icns deleted file mode 100644 index cf988020be..0000000000 Binary files a/share/macosx/keepassx.icns and /dev/null differ diff --git a/share/macosx/keepassxc.icns b/share/macosx/keepassxc.icns new file mode 100644 index 0000000000..dfb98d20d1 Binary files /dev/null and b/share/macosx/keepassxc.icns differ diff --git a/share/windows/icon.rc b/share/windows/icon.rc index db38704894..42221fe4ed 100644 --- a/share/windows/icon.rc +++ b/share/windows/icon.rc @@ -1 +1 @@ -IDI_ICON1 ICON DISCARDABLE "keepassx.ico" +IDI_ICON1 ICON DISCARDABLE "keepassxc.ico" diff --git a/share/windows/keepassx.ico b/share/windows/keepassx.ico deleted file mode 100644 index 7c2b3d5a98..0000000000 Binary files a/share/windows/keepassx.ico and /dev/null differ diff --git a/share/windows/keepassxc.ico b/share/windows/keepassxc.ico new file mode 100644 index 0000000000..a77c8391cc Binary files /dev/null and b/share/windows/keepassxc.ico differ diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 5f7740b612..3d3d3f5f8e 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -213,7 +213,7 @@ if(APPLE) set(CPACK_DMG_VOLUME_NAME "${PROGNAME}") set(CPACK_SYSTEM_NAME "OSX") set(CPACK_STRIP_FILES ON) - set(CPACK_PACKAGE_FILE_NAME "${PROGNAME}-${KEEPASSX_VERSION_NUM}") + set(CPACK_PACKAGE_FILE_NAME "${PROGNAME}-${KEEPASSXC_VERSION_NUM}") include(CPack) include(DeployQt4) @@ -223,7 +223,7 @@ endif() if(MINGW ) set(CPACK_GENERATOR "ZIP") set(CPACK_STRIP_FILES ON) - set(CPACK_PACKAGE_FILE_NAME "${PROGNAME}-${KEEPASSX_VERSION_NUM}") + set(CPACK_PACKAGE_FILE_NAME "${PROGNAME}-${KEEPASSXC_VERSION_NUM}") include(CPack) include(DeployQt4) diff --git a/src/autotype/AutoType.cpp b/src/autotype/AutoType.cpp index 6a727cf1c4..3e95382f37 100644 --- a/src/autotype/AutoType.cpp +++ b/src/autotype/AutoType.cpp @@ -206,7 +206,7 @@ void AutoType::performGlobalAutoType(const QList& dbList) QString message = tr("Couldn't find an entry that matches the window title:"); message.append("\n\n"); message.append(windowTitle); - MessageBox::information(nullptr, tr("Auto-Type - KeePassX"), message); + MessageBox::information(nullptr, tr("Auto-Type - KeePassXC"), message); } else if ((entryList.size() == 1) && !config()->get("security/autotypeask").toBool()) { m_inAutoType = false; diff --git a/src/autotype/AutoTypeSelectDialog.cpp b/src/autotype/AutoTypeSelectDialog.cpp index 61b534b9d2..6bb155b81f 100644 --- a/src/autotype/AutoTypeSelectDialog.cpp +++ b/src/autotype/AutoTypeSelectDialog.cpp @@ -38,7 +38,7 @@ AutoTypeSelectDialog::AutoTypeSelectDialog(QWidget* parent) // Places the window on the active (virtual) desktop instead of where the main window is. setAttribute(Qt::WA_X11BypassTransientForHint); setWindowFlags(windowFlags() | Qt::WindowStaysOnTopHint); - setWindowTitle(tr("Auto-Type - KeePassX")); + setWindowTitle(tr("Auto-Type - KeePassXC")); setWindowIcon(filePath()->applicationIcon()); QRect screenGeometry = QApplication::desktop()->availableGeometry(QCursor::pos()); diff --git a/src/config-keepassx.h.cmake b/src/config-keepassx.h.cmake index dc418b6e69..2ef2836c5e 100644 --- a/src/config-keepassx.h.cmake +++ b/src/config-keepassx.h.cmake @@ -3,7 +3,7 @@ #ifndef KEEPASSX_CONFIG_KEEPASSX_H #define KEEPASSX_CONFIG_KEEPASSX_H -#define KEEPASSX_VERSION "${KEEPASSX_VERSION}" +#define KEEPASSX_VERSION "${KEEPASSXC_VERSION}" #define KEEPASSX_SOURCE_DIR "${CMAKE_SOURCE_DIR}" #define KEEPASSX_BINARY_DIR "${CMAKE_BINARY_DIR}" diff --git a/src/core/Config.cpp b/src/core/Config.cpp index 7fe23c8b5b..35e035a672 100644 --- a/src/core/Config.cpp +++ b/src/core/Config.cpp @@ -68,14 +68,14 @@ Config::Config(QObject* parent) userPath += QFile::decodeName(env); } - userPath += "/keepassx/"; + userPath += "/keepassxc/"; #else userPath = QDir::fromNativeSeparators(QStandardPaths::writableLocation(QStandardPaths::DataLocation)); - // storageLocation() appends the application name ("/keepassx") to the end + // storageLocation() appends the application name ("/keepassxc") to the end userPath += "/"; #endif - userPath += "keepassx2.ini"; + userPath += "keepassxc.ini"; init(userPath); } diff --git a/src/core/FilePath.cpp b/src/core/FilePath.cpp index a572bace58..021234a117 100644 --- a/src/core/FilePath.cpp +++ b/src/core/FilePath.cpp @@ -87,12 +87,12 @@ QString FilePath::pluginPath(const QString& name) QIcon FilePath::applicationIcon() { - return icon("apps", "keepassx"); + return icon("apps", "keepassxc"); } QIcon FilePath::trayIconLocked() { - return icon("apps", "keepassx-locked"); + return icon("apps", "keepassxc-locked"); } QIcon FilePath::trayIconUnlocked() diff --git a/src/core/Metadata.cpp b/src/core/Metadata.cpp index e908fbb243..bf68af3ca0 100644 --- a/src/core/Metadata.cpp +++ b/src/core/Metadata.cpp @@ -28,7 +28,7 @@ Metadata::Metadata(QObject* parent) : QObject(parent) , m_updateDatetime(true) { - m_data.generator = "KeePassX"; + m_data.generator = "KeePassXC"; m_data.maintenanceHistoryDays = 365; m_data.masterKeyChangeRec = -1; m_data.masterKeyChangeForce = -1; diff --git a/src/gui/AboutDialog.ui b/src/gui/AboutDialog.ui index 0a66b602a2..35f0e9e32a 100644 --- a/src/gui/AboutDialog.ui +++ b/src/gui/AboutDialog.ui @@ -6,12 +6,12 @@ 0 0 - 366 + 375 210 - About KeePassX + About KeePassXC @@ -38,7 +38,7 @@ - KeePassX + KeePassXC @@ -69,7 +69,7 @@ - KeePassX is distributed under the term of the GNU General Public License (GPL) version 2 or (at your option) version 3. + KeePassXC is distributed under the term of the GNU General Public License (GPL) version 2 or (at your option) version 3. true diff --git a/src/gui/DatabaseTabWidget.cpp b/src/gui/DatabaseTabWidget.cpp index 0381474ad5..e6ebfce104 100644 --- a/src/gui/DatabaseTabWidget.cpp +++ b/src/gui/DatabaseTabWidget.cpp @@ -159,7 +159,7 @@ void DatabaseTabWidget::openDatabase(const QString& fileName, const QString& pw, // due to lack of permissions if (lockFile->error() != QLockFile::PermissionError) { QMessageBox::StandardButton result = MessageBox::question(this, tr("Open database"), - tr("The database you are trying to open is locked by another instance of KeePassX.\n" + tr("The database you are trying to open is locked by another instance of KeePassXC.\n" "Do you want to open it anyway? Alternatively the database is opened read-only."), QMessageBox::Yes | QMessageBox::No); @@ -497,7 +497,7 @@ bool DatabaseTabWidget::saveDatabaseAs(Database* db) // due to lack of permissions if (lockFile->error() != QLockFile::PermissionError) { QMessageBox::StandardButton result = MessageBox::question(this, tr("Save database as"), - tr("The database you are trying to save as is locked by another instance of KeePassX.\n" + tr("The database you are trying to save as is locked by another instance of KeePassXC.\n" "Do you want to save it anyway?"), QMessageBox::Yes | QMessageBox::No); diff --git a/src/gui/MainWindow.cpp b/src/gui/MainWindow.cpp index 0804610be3..14ec743b67 100644 --- a/src/gui/MainWindow.cpp +++ b/src/gui/MainWindow.cpp @@ -72,7 +72,7 @@ class HttpPlugin: public ISettingsPage Service *m_service; }; -const QString MainWindow::BaseWindowTitle = "KeePassX"; +const QString MainWindow::BaseWindowTitle = "KeePassXC"; MainWindow::MainWindow() : m_ui(new Ui::MainWindow()) diff --git a/src/gui/MainWindow.ui b/src/gui/MainWindow.ui index e016298a8c..3cc2a67ea0 100644 --- a/src/gui/MainWindow.ui +++ b/src/gui/MainWindow.ui @@ -11,7 +11,7 @@ - KeePassX + KeePassXC @@ -337,6 +337,14 @@ &Clone entry + + + false + + + &Find + + false diff --git a/src/http/Service.cpp b/src/http/Service.cpp index dece6b8172..d66b240dc1 100644 --- a/src/http/Service.cpp +++ b/src/http/Service.cpp @@ -150,7 +150,7 @@ QString Service::storeKey(const QString &key) tr("You have received an association " "request for the above key.\n" "If you would like to allow it access " - "to your KeePassX database\n" + "to your KeePassXC database\n" "give it a unique name to identify and accept it."), QLineEdit::Normal, QString(), &ok); if (!ok || id.isEmpty()) @@ -158,7 +158,7 @@ QString Service::storeKey(const QString &key) //Warn if association key already exists } while(config->attributes()->contains(QLatin1String(ASSOCIATE_KEY_PREFIX) + id) && - QMessageBox::warning(0, tr("KeyPassX/Http: Overwrite existing key?"), + QMessageBox::warning(0, tr("KeyPassXC/Http: Overwrite existing key?"), tr("A shared encryption-key with the name \"%1\" already exists.\nDo you want to overwrite it?").arg(id), QMessageBox::Yes | QMessageBox::No) == QMessageBox::No); diff --git a/src/main.cpp b/src/main.cpp index bcbfb9c424..2329713ef4 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -36,7 +36,7 @@ int main(int argc, char** argv) Tools::setupSearchPaths(); Application app(argc, argv); - Application::setApplicationName("keepassx"); + Application::setApplicationName("keepassxc"); Application::setApplicationVersion(KEEPASSX_VERSION); // don't set organizationName as that changes the return value of // QStandardPaths::writableLocation(QDesktopServices::DataLocation) @@ -48,12 +48,12 @@ int main(int argc, char** argv) "Fatal error while testing the cryptographic functions."); error.append("\n"); error.append(Crypto::errorString()); - MessageBox::critical(nullptr, QCoreApplication::translate("Main", "KeePassX - Error"), error); + MessageBox::critical(nullptr, QCoreApplication::translate("Main", "KeePassXC - Error"), error); return 1; } QCommandLineParser parser; - parser.setApplicationDescription(QCoreApplication::translate("main", "KeePassX - cross-platform password manager")); + parser.setApplicationDescription(QCoreApplication::translate("main", "KeePassXC - cross-platform password manager")); parser.addPositionalArgument("filename", QCoreApplication::translate("main", "filename(s) of the password database(s) to open (*.kdbx)"), "[filename(s)]"); QCommandLineOption configOption("config",