diff --git a/CHANGELOG b/CHANGELOG
index 24ed5ea73..f8a0e33bf 100644
--- 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
index 96b6067ea..852ccae5c 100644
--- 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)
diff --git a/share/translations/keepassx_en.ts b/share/translations/keepassx_en.ts
index d55617134..a6e09aa23 100644
--- a/share/translations/keepassx_en.ts
+++ b/share/translations/keepassx_en.ts
@@ -16,12 +16,12 @@
- KeePassXC is distributed under the term of the GNU General Public License (GPL) version 2 or (at your option) version 3.
+ Extensions:
+
- Extensions:
-
+ KeePassXC is distributed under the terms of the GNU General Public License (GPL) version 2 or (at your option) version 3.
@@ -100,10 +100,6 @@ Please select whether you want to allow access.
Repeat password:
-
- Key file
-
- Browse
@@ -157,6 +153,10 @@ Please select whether you want to allow access.
%2
+
+ &Key file
+
+ DatabaseOpenWidget
@@ -255,10 +255,6 @@ You can now save it.
Default username:
-
- Use recycle bin:
-
- MiB
@@ -275,6 +271,10 @@ You can now save it.
Max. history size:
+
+ Use recycle bin
+
+ DatabaseTabWidget
@@ -402,6 +402,10 @@ Do you want to open it anyway? Alternatively the database is opened read-only.
+
+ Passwords
+
+ DatabaseWidget
@@ -648,14 +652,6 @@ Do you want to save it anyway?
Enable Auto-Type for this entry
-
- Inherit default Auto-Type sequence from the group
-
-
-
- Use custom Auto-Type sequence:
-
- +
@@ -669,11 +665,19 @@ Do you want to save it anyway?
- Use default sequence
+ Inherit default Auto-Type sequence from the &group
- Set custom sequence:
+ &Use custom Auto-Type sequence:
+
+
+
+ Use default se&quence
+
+
+
+ Set custo&m sequence:
@@ -799,14 +803,6 @@ Do you want to save it anyway?
EditWidgetIcons
-
- Use default icon
-
-
-
- Use custom icon
-
- Add custom icon
@@ -851,6 +847,14 @@ Do you want to save it anyway?
Can't delete icon. Still used by %1 items.
+
+ &Use default icon
+
+
+
+ Use custo&m icon
+
+ EditWidgetProperties
diff --git a/src/gui/entry/EntryView.cpp b/src/gui/entry/EntryView.cpp
index d692c23c6..31fae3e58 100644
--- a/src/gui/entry/EntryView.cpp
+++ b/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;
}