Rename application to KeePassXC and change icon (#70)

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(KEEPASSXC_VERSION "2.1.0")
-set(KEEPASSX_VERSION_NUM "2.0.3")
+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(PLUGIN_INSTALL_DIR "${CMAKE_INSTALL_LIBDIR}/keepassxc")
-  set(DATA_INSTALL_DIR   "${CMAKE_INSTALL_DATADIR}/keepassx")
+  set(DATA_INSTALL_DIR   "${CMAKE_INSTALL_DATADIR}/keepassxc")
 endif()
 
 if(WITH_TESTS)

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")
+            FILES_MATCHING PATTERN "application-x-keepassxc.png" PATTERN "application-x-keepassxc.svgz")
-    install(FILES linux/keepassx.desktop DESTINATION ${CMAKE_INSTALL_DATADIR}/applications)
+    install(FILES linux/keepassxc.desktop DESTINATION ${CMAKE_INSTALL_DATADIR}/applications)
-    install(FILES linux/keepassx.xml DESTINATION ${CMAKE_INSTALL_DATADIR}/mime/packages)
+    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
+                  # SVGZ to PNGs for KeePassXC
-                    icons/application/16x16/apps/keepassx.png
+                  COMMAND inkscape -z -w 16 -h 16
-                    icons/application/32x32/apps/keepassx.png
+                    icons/application/scalable/apps/keepassxc.svgz -e icons/application/16x16/apps/keepassxc.png
-                    icons/application/48x48/apps/keepassx.png
+                  COMMAND inkscape -z -w  24 -h 24
-                    icons/application/128x128/apps/keepassx.png
+                    icons/application/scalable/apps/keepassxc.svgz -e icons/application/24x24/apps/keepassxc.png
-                    icons/application/256x256/apps/keepassx.png
+                  COMMAND inkscape -z -w  32 -h 32
-                  COMMAND icotool -c -o windows/keepassx.ico
+                    icons/application/scalable/apps/keepassxc.svgz -e icons/application/32x32/apps/keepassxc.png
-                    icons/application/16x16/apps/keepassx.png
+                  COMMAND inkscape -z -w 48 -h 48
-                    icons/application/24x24/apps/keepassx.png
+                    icons/application/scalable/apps/keepassxc.svgz -e icons/application/48x48/apps/keepassxc.png
-                    icons/application/32x32/apps/keepassx.png
+                  COMMAND inkscape -z -w 64 -h 64
-                    icons/application/48x48/apps/keepassx.png
+                    icons/application/scalable/apps/keepassxc.svgz -e icons/application/64x64/apps/keepassxc.png
-                    icons/application/64x64/apps/keepassx.png
+                  COMMAND inkscape -z -w 128 -h 128
-                    icons/application/128x128/apps/keepassx.png
+                    icons/application/scalable/apps/keepassxc.svgz -e icons/application/128x128/apps/keepassxc.png
-                    icons/application/256x256/apps/keepassx.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})

share/linux/keepassxc.desktop

@@ -1,12 +1,12 @@
 [Desktop Entry]
-Name=KeePassX
+Name=KeePassXC
-GenericName=Password Manager
+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
+Exec=keepassxc %f
-Icon=keepassx
+Icon=keepassxc
 Terminal=false
 Type=Application
 Categories=Qt;Utility;

share/linux/keepassxc.xml

@@ -3,6 +3,6 @@
   <mime-type type="application/x-keepass2">
     <comment>KeePass 2 database</comment>
     <glob pattern="*.kdbx"/>
-    <icon name="application-x-keepassx"/>
+    <icon name="application-x-keepassxc"/>
   </mime-type>
 </mime-info>

share/macosx/Info.plist.cmake

@@ -11,9 +11,9 @@
   <key>CFBundleExecutable</key>
   <string>${PROGNAME}</string>
   <key>CFBundleIconFile</key>
-  <string>keepassx.icns</string>
+  <string>keepassxc.icns</string>
   <key>CFBundleIdentifier</key>
-  <string>org.keepassx.keepassx</string>
+  <string>org.keepassx.keepassxc</string>
   <key>CFBundleInfoDictionaryVersion</key>
   <string>6.0</string>
   <key>CFBundleName</key>
@@ -21,13 +21,13 @@
   <key>CFBundlePackageType</key>
   <string>APPL</string>
   <key>CFBundleShortVersionString</key>
-  <string>${KEEPASSX_VERSION}</string>
+  <string>${KEEPASSXC_VERSION}</string>
   <key>CFBundleSignature</key>
   <string>KEPX</string>
   <key>CFBundleVersion</key>
-  <string>${KEEPASSX_VERSION_NUM}</string>
+  <string>${KEEPASSXC_VERSION_NUM}</string>
   <key>NSHumanReadableCopyright</key>
-    <string>Copyright 2010-2012 KeePassX Development Team</string>
+    <string>Copyright 2016 KeePassXC Development Team</string>
     <key>CFBundleDocumentTypes</key>
     <array>
       <dict>
@@ -36,9 +36,9 @@
           <string>kdbx</string>
         </array>
         <key>CFBundleTypeIconFile</key>
-        <string>keepassx.icns</string>
+        <string>keepassxc.icns</string>
         <key>CFBundleTypeName</key>
-        <string>KeePassX Password Database</string>
+        <string>KeePassXC Password Database</string>
         <key>CFBundleTypeOSTypes</key>
         <array>
           <string>kdbx</string>

share/windows/icon.rc

@@ -1 +1 @@
-IDI_ICON1    ICON    DISCARDABLE    "keepassx.ico"
+IDI_ICON1    ICON    DISCARDABLE    "keepassxc.ico"

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)

src/autotype/AutoType.cpp

@@ -206,7 +206,7 @@ void AutoType::performGlobalAutoType(const QList<Database*>& 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;

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());

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}"

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);
 }

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()

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;

src/gui/AboutDialog.ui

@@ -6,12 +6,12 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>366</width>
+    <width>375</width>
     <height>210</height>
    </rect>
   </property>
   <property name="windowTitle">
-   <string>About KeePassX</string>
+   <string>About KeePassXC</string>
   </property>
   <layout class="QVBoxLayout" name="verticalLayout">
    <property name="sizeConstraint">
@@ -38,7 +38,7 @@
         </sizepolicy>
        </property>
        <property name="text">
-        <string notr="true">  KeePassX</string>
+        <string notr="true">  KeePassXC</string>
        </property>
       </widget>
      </item>
@@ -69,7 +69,7 @@
       </sizepolicy>
      </property>
      <property name="text">
-      <string>KeePassX is distributed under the term of the GNU General Public License (GPL) version 2 or (at your option) version 3.</string>
+      <string>KeePassXC is distributed under the term of the GNU General Public License (GPL) version 2 or (at your option) version 3.</string>
      </property>
      <property name="wordWrap">
       <bool>true</bool>

src/gui/DatabaseTabWidget.cpp

@@ -153,7 +153,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);
 
@@ -356,7 +356,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);
 

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())

src/gui/MainWindow.ui

@@ -11,7 +11,7 @@
    </rect>
   </property>
   <property name="windowTitle">
-   <string notr="true">KeePassX</string>
+   <string notr="true">KeePassXC</string>
   </property>
   <widget class="QWidget" name="centralwidget">
    <layout class="QVBoxLayout" name="verticalLayout">
@@ -331,6 +331,14 @@
     <string>&amp;Clone entry</string>
    </property>
   </action>
+  <action name="actionSearch">
+   <property name="enabled">
+    <bool>false</bool>
+   </property>
+   <property name="text">
+    <string>&amp;Find</string>
+   </property>
+  </action>
   <action name="actionEntryCopyUsername">
    <property name="enabled">
     <bool>false</bool>

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);
 

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",