Release 2.1.2

- Ask for save location when creating a new database [#302] - Remove Libmicrohttpd dependency to clean up the code and ensure better OS X compatibility [#317, #265] - Prevent Qt from degrading Wifi network performance on certain platforms [#318] - Visually refine user interface on OS X and other platforms [#299] - Remove unusable tray icon setting on OS X [#293] - Fix compositing glitches on Ubuntu and prevent flashing when minimizing to the tray at startup [#307] - Fix AppImage tray icon on Ubuntu [#277, #273] - Fix global menu disappearing after restoring KeePassXC from the tray on Ubuntu [#276] - Fix result order in entry search [#320] - Enable HiDPI scaling on supported platforms [#315] - Remove empty directories from installation target [#282]
keepassxreboot · Feb 17, 2017 · b9279f7 · b9279f7
2 parents 44c58a6 + d892312
commit b9279f7
Show file tree

Hide file tree

Showing 73 changed files with 7,707 additions and 703 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,2 +1,6 @@
 CMakeLists.txt.*
 build*/
+release*/
+.idea/
+*.iml
+*.kdev4
diff --git a/AppImage-Recipe.sh b/AppImage-Recipe.sh
@@ -49,8 +49,6 @@ cp -a ../../bin-release/* .
 cp -a ./usr/local/* ./usr
 rm -R ./usr/local
 rmdir ./opt 2> /dev/null
-patch_strings_in_file /usr/local ././
-patch_strings_in_file /usr ./
 
 # bundle Qt platform plugins and themes
 QXCB_PLUGIN="$(find /usr/lib -name 'libqxcb.so' 2> /dev/null)"
@@ -76,6 +74,11 @@ cat << EOF > ./usr/bin/keepassxc_env
 #export QT_QPA_PLATFORMTHEME=gtk2
 export LD_LIBRARY_PATH="../opt/qt58/lib:\${LD_LIBRARY_PATH}"
 export QT_PLUGIN_PATH="..${QT_PLUGIN_PATH}"
+
+# unset XDG_DATA_DIRS to make tray icon work in Ubuntu Unity
+# see https://github.com/probonopd/AppImageKit/issues/351
+unset XDG_DATA_DIRS
+
 exec keepassxc "\$@"
 EOF
 chmod +x ./usr/bin/keepassxc_env

diff --git a/CHANGELOG b/CHANGELOG
@@ -1,3 +1,18 @@
+2.1.2 (2017-02-17)
+=========================
+
+- Ask for save location when creating a new database [#302]
+- Remove Libmicrohttpd dependency to clean up the code and ensure better OS X compatibility [#317, #265]
+- Prevent Qt from degrading Wifi network performance on certain platforms [#318]
+- Visually refine user interface on OS X and other platforms [#299]
+- Remove unusable tray icon setting on OS X [#293]
+- Fix compositing glitches on Ubuntu and prevent flashing when minimizing to the tray at startup [#307]
+- Fix AppImage tray icon on Ubuntu [#277, #273]
+- Fix global menu disappearing after restoring KeePassXC from the tray on Ubuntu [#276]
+- Fix result order in entry search [#320]
+- Enable HiDPI scaling on supported platforms [#315]
+- Remove empty directories from installation target [#282]
+
 2.1.1 (2017-02-06)
 =========================
 

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -38,8 +38,8 @@ option(WITH_XC_AUTOTYPE "Include Autotype." OFF)
 option(WITH_XC_HTTP "Include KeePassHTTP." OFF)
 option(WITH_XC_YUBIKEY "Include Yubikey support." OFF)
 
-set(KEEPASSXC_VERSION "2.1.1")
-set(KEEPASSXC_VERSION_NUM "2.1.1")
+set(KEEPASSXC_VERSION "2.1.2")
+set(KEEPASSXC_VERSION_NUM "2.1.2")
 
 if("${CMAKE_C_COMPILER}" MATCHES "clang$" OR "${CMAKE_C_COMPILER_ID}" STREQUAL "Clang")
   set(CMAKE_COMPILER_IS_CLANG 1)
@@ -166,6 +166,9 @@ find_package(Qt5Widgets       5.2 REQUIRED)
 find_package(Qt5Test          5.2 REQUIRED)
 find_package(Qt5LinguistTools 5.2 REQUIRED)
 find_package(Qt5Network       5.2 REQUIRED)
+if (UNIX AND NOT APPLE)
+    find_package(Qt5DBus 5.2 REQUIRED)
+endif()
 set(CMAKE_AUTOMOC ON)
 
 # Debian sets the the build type to None for package builds.
@@ -176,10 +179,6 @@ find_package(LibGPGError REQUIRED)
 
 find_package(Gcrypt 1.6.0 REQUIRED)
 
-if (WITH_XC_HTTP)
-    find_package(LibMicroHTTPD REQUIRED)
-endif(WITH_XC_HTTP)
-
 find_package(ZLIB REQUIRED)
 
 check_cxx_source_compiles("
@@ -217,7 +216,7 @@ if(UNIX)
   endif()
 endif()
 
-include_directories(SYSTEM ${GCRYPT_INCLUDE_DIR} ${MHD_INCLUDE_DIR} ${ZLIB_INCLUDE_DIR})
+include_directories(SYSTEM ${GCRYPT_INCLUDE_DIR} ${ZLIB_INCLUDE_DIR})
 
 include(FeatureSummary)
 

diff --git a/share/CMakeLists.txt b/share/CMakeLists.txt
@@ -21,9 +21,11 @@ install(FILES ${DATABASE_ICONS} DESTINATION ${DATA_INSTALL_DIR}/icons/database)
 
 if(UNIX AND NOT APPLE)
     install(DIRECTORY icons/application/ DESTINATION ${CMAKE_INSTALL_DATADIR}/icons/hicolor
-            FILES_MATCHING PATTERN "keepassx*.png" PATTERN "keepassx*.svgz")
+            FILES_MATCHING PATTERN "keepassx*.png" PATTERN "keepassx*.svgz"
+            PATTERN "status" EXCLUDE PATTERN "actions" EXCLUDE)
     install(DIRECTORY icons/application/ DESTINATION ${CMAKE_INSTALL_DATADIR}/icons/hicolor
-            FILES_MATCHING PATTERN "application-x-keepassxc.png" PATTERN "application-x-keepassxc.svgz")
+            FILES_MATCHING PATTERN "application-x-keepassxc.png" PATTERN "application-x-keepassxc.svgz"
+            PATTERN "status" EXCLUDE PATTERN "actions" EXCLUDE)
     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)

diff --git a/share/translations/keepassx_en.ts b/share/translations/keepassx_en.ts
@@ -16,12 +16,12 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>KeePassXC is distributed under the term of the GNU General Public License (GPL) version 2 or (at your option) version 3.</source>
+        <source>Extensions:
+</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Extensions:
-</source>
+        <source>KeePassXC is distributed under the terms of the GNU General Public License (GPL) version 2 or (at your option) version 3.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -100,10 +100,6 @@ Please select whether you want to allow access.</source>
         <source>Repeat password:</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Key file</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <source>Browse</source>
         <translation type="unfinished"></translation>
@@ -157,6 +153,10 @@ Please select whether you want to allow access.</source>
 %2</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>&amp;Key file</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>DatabaseOpenWidget</name>
@@ -255,10 +255,6 @@ You can now save it.</source>
         <source>Default username:</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Use recycle bin:</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <source> MiB</source>
         <translation type="unfinished"></translation>
@@ -275,6 +271,10 @@ You can now save it.</source>
         <source>Max. history size:</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Use recycle bin</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>DatabaseTabWidget</name>
@@ -402,6 +402,10 @@ Do you want to open it anyway? Alternatively the database is opened read-only.</
 Do you want to save it anyway?</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Passwords</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>DatabaseWidget</name>
@@ -649,31 +653,31 @@ Do you want to save it anyway?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Inherit default Auto-Type sequence from the group</source>
+        <source>+</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Use custom Auto-Type sequence:</source>
+        <source>-</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>+</source>
+        <source>Window title:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>-</source>
+        <source>Inherit default Auto-Type sequence from the &amp;group</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Window title:</source>
+        <source>&amp;Use custom Auto-Type sequence:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Use default sequence</source>
+        <source>Use default se&amp;quence</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Set custom sequence:</source>
+        <source>Set custo&amp;m sequence:</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -799,14 +803,6 @@ Do you want to save it anyway?</source>
 </context>
 <context>
     <name>EditWidgetIcons</name>
-    <message>
-        <source>Use default icon</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Use custom icon</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <source>Add custom icon</source>
         <translation type="unfinished"></translation>
@@ -851,6 +847,14 @@ Do you want to save it anyway?</source>
         <source>Can&apos;t delete icon. Still used by %1 items.</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>&amp;Use default icon</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Use custo&amp;m icon</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>EditWidgetProperties</name>

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -149,24 +149,9 @@ set(keepassx_FORMS
 add_feature_info(KeePassHTTP WITH_XC_HTTP "KeePassHTTP support for ChromeIPass and PassIFox")
 add_feature_info(Autotype WITH_XC_AUTOTYPE "Auto-type passwords in Input fields")
 
+add_subdirectory(http)
 if(WITH_XC_HTTP)
-  set(keepasshttp_SOURCES
-      http/AccessControlDialog.cpp
-      http/EntryConfig.cpp
-      http/HttpPasswordGeneratorWidget.cpp
-      http/HttpSettings.cpp
-      http/OptionDialog.cpp
-      http/Protocol.cpp
-      http/Server.cpp
-      http/Service.cpp
-  )
-  set(keepasshttp_FORMS
-      http/AccessControlDialog.ui
-      http/HttpPasswordGeneratorWidget.ui
-      http/OptionDialog.ui
-  )
-  set(keepasshttp_LIB keepasshttp)
-  qt5_wrap_ui(keepasshttp_SOURCES ${keepasshttp_FORMS})
+    set(keepasshttp_LIB keepasshttp)
 endif()
 
 add_subdirectory(autotype)
@@ -195,31 +180,32 @@ qt5_wrap_ui(keepassx_SOURCES ${keepassx_FORMS})
 add_library(zxcvbn STATIC zxcvbn/zxcvbn.cpp)
 target_link_libraries(zxcvbn)
 
-if(WITH_XC_HTTP)
-  add_library(keepasshttp STATIC ${keepasshttp_SOURCES})
-  target_link_libraries(keepasshttp ${MHD_LIBRARIES} Qt5::Core Qt5::Concurrent Qt5::Widgets Qt5::Network)
-endif()
-
 add_library(autotype STATIC ${autotype_SOURCES})
 target_link_libraries(autotype Qt5::Core Qt5::Widgets)
 
 set(autotype_LIB autotype)
 
 add_library(keepassx_core STATIC ${keepassx_SOURCES})
-set_target_properties(keepassx_core PROPERTIES COMPILE_DEFINITIONS KEEPASSX_BUILDING_CORE)
-target_link_libraries(keepassx_core zxcvbn ${keepasshttp_LIB} ${autotype_LIB} Qt5::Core Qt5::Concurrent Qt5::Widgets Qt5::Network)
 
-add_executable(${PROGNAME} WIN32 MACOSX_BUNDLE ${keepassx_SOURCES_MAINEXE})
-target_link_libraries(${PROGNAME}
-                      keepassx_core
+set_target_properties(keepassx_core PROPERTIES COMPILE_DEFINITIONS KEEPASSX_BUILDING_CORE)
+target_link_libraries(keepassx_core
+                      ${keepasshttp_LIB}
+                      ${autotype_LIB}
                       zxcvbn
+                      qhttp
                       Qt5::Core
                       Qt5::Concurrent
                       Qt5::Widgets
                       Qt5::Network
                       ${GCRYPT_LIBRARIES}
                       ${GPGERROR_LIBRARIES}
                       ${ZLIB_LIBRARIES})
+if (UNIX AND NOT APPLE)
+    target_link_libraries(keepassx_core Qt5::DBus)
+endif()
+
+add_executable(${PROGNAME} WIN32 MACOSX_BUNDLE ${keepassx_SOURCES_MAINEXE})
+target_link_libraries(${PROGNAME} keepassx_core)
 
 set_target_properties(${PROGNAME} PROPERTIES ENABLE_EXPORTS ON)
 

diff --git a/src/gui/AboutDialog.ui b/src/gui/AboutDialog.ui
@@ -7,7 +7,7 @@
     <x>0</x>
     <y>0</y>
     <width>455</width>
-    <height>238</height>
+    <height>266</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -53,7 +53,7 @@
       </sizepolicy>
      </property>
      <property name="text">
-      <string notr="true">&lt;a href=&quot;https://www.keepassxc.org/&quot;&gt;https://www.keepassxc.org/&lt;/a&gt;</string>
+      <string notr="true">&lt;a href=&quot;https://keepassxc.org/&quot;&gt;https://keepassxc.org/&lt;/a&gt;</string>
      </property>
      <property name="openExternalLinks">
       <bool>true</bool>
@@ -69,7 +69,7 @@
       </sizepolicy>
      </property>
      <property name="text">
-      <string>KeePassXC 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 terms of the GNU General Public License (GPL) version 2 or (at your option) version 3.</string>
      </property>
      <property name="wordWrap">
       <bool>true</bool>
@@ -82,7 +82,7 @@
       <string/>
      </property>
      <property name="textInteractionFlags">
-      <set>Qt::LinksAccessibleByMouse|Qt::TextSelectableByMouse</set>
+      <set>Qt::LinksAccessibleByMouse|Qt::TextSelectableByKeyboard|Qt::TextSelectableByMouse</set>
      </property>
     </widget>
    </item>
@@ -91,6 +91,9 @@
      <property name="text">
       <string>Using:</string>
      </property>
+     <property name="textInteractionFlags">
+      <set>Qt::LinksAccessibleByMouse|Qt::TextSelectableByMouse</set>
+     </property>
     </widget>
    </item>
    <item>
@@ -99,6 +102,9 @@
       <string>Extensions:
 </string>
      </property>
+     <property name="textInteractionFlags">
+      <set>Qt::LinksAccessibleByMouse|Qt::TextSelectableByMouse</set>
+     </property>
     </widget>
    </item>
    <item>

diff --git a/src/gui/ChangeMasterKeyWidget.cpp b/src/gui/ChangeMasterKeyWidget.cpp
@@ -136,3 +136,8 @@ void ChangeMasterKeyWidget::reject()
 {
     Q_EMIT editFinished(false);
 }
+
+void ChangeMasterKeyWidget::setCancelEnabled(bool enabled)
+{
+    m_ui->buttonBox->button(QDialogButtonBox::Cancel)->setEnabled(enabled);
+}
diff --git a/src/gui/ChangeMasterKeyWidget.h b/src/gui/ChangeMasterKeyWidget.h
@@ -38,6 +38,7 @@ class ChangeMasterKeyWidget : public DialogyWidget
     void clearForms();
     CompositeKey newMasterKey();
     QLabel* headlineLabel();
+    void setCancelEnabled(bool enabled);
 
 Q_SIGNALS:
     void editFinished(bool accepted);