Merge release 2.1.2 into develop

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

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)

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>
@@ -648,14 +652,6 @@ Do you want to save it anyway?</source>
         <source>Enable Auto-Type for this entry</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Inherit default Auto-Type sequence from the group</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Use custom Auto-Type sequence:</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <source>+</source>
         <translation type="unfinished"></translation>
@@ -669,11 +665,19 @@ Do you want to save it anyway?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Use default sequence</source>
+        <source>Inherit default Auto-Type sequence from the &amp;group</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Set custom sequence:</source>
+        <source>&amp;Use custom Auto-Type sequence:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Use default se&amp;quence</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <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>

src/gui/entry/EntryView.cpp

@@ -140,15 +140,21 @@ Entry* EntryView::entryFromIndex(const QModelIndex& index)
 void EntryView::switchToEntryListMode()
 {
     m_sortModel->hideColumn(0, false);
-    sortByColumn(1, Qt::AscendingOrder); // TODO: should probably be improved
+
+    m_sortModel->sort(1, Qt::AscendingOrder);
+    m_sortModel->sort(0, Qt::AscendingOrder);
     sortByColumn(0, Qt::AscendingOrder);
+
     m_inEntryListMode = true;
 }
 
 void EntryView::switchToGroupMode()
 {
     m_sortModel->hideColumn(0, true);
-    sortByColumn(-1, Qt::AscendingOrder);
+
+    m_sortModel->sort(-1, Qt::AscendingOrder);
+    m_sortModel->sort(0, Qt::AscendingOrder);
     sortByColumn(0, Qt::AscendingOrder);
+
     m_inEntryListMode = false;
 }