v0.6.0

mujx · Sep 21, 2018 · dec643e · dec643e
1 parent 269519d
commit dec643e
Show file tree

Hide file tree

Showing 7 changed files with 29 additions and 19 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -87,7 +87,7 @@ deploy:
       overwrite: true
       provider: releases
       api_key:
-          secure: "CAVzWZPxYSOTollo9bpD4tvEbfxXjqelc32aApV48GKyJrMQljQ+mvSe25BuUtnDehxnw8affgGX23AYXmvG8P7w4hM2d7//8Lgan1zCmusV8JE432jknev6X641B4cvrywqSe0Dj3l0kS9Xgirq4BGavlI0y2vUjeJfQEv0y8GYoI72LwgyH0i82v/1Qi92Fh8429IJIb0eKmC1wGWXCmo2kd8StZRL5mSlc4TmyWI0SHpA5GrLMiQwLAuD7DjDl5mpaK2yQx+H4vBcI2SUMvmlHGgVjXikJG5gURlHbnIaaBFvO67INc1/65KtMokWuMP12zxqJiaMPtsAskOpQv4FLAYDfnigH3NxufyOIGp2cxS5RhJDQhbNsxHEDnUo1kHcO23ZYNWCuC1yUdn0RXzKhWcUsz8mKF8KJs22Ty4VjfUMZ+vqK/AbHyq4rkl8DizVRZqKF1KjSWrSv/2sT4itnHk9pmcgxAYfGuALcjrJJveI4MTwDhzXB62CKnMOqLq3sAMqvE0+BdA0BykQr7qrKtptuyP2/OFx6RDbfHQl5Klkb6cSOjxm0oUzh/8iaxgsVdCrhfE67eqkhFZ+a8lJkB/rZ4zSK1Q2Cp4nLtnxenUCW+Ptk2l7zZN6kXM1/+tcgqVROChYJ6asMUpsjFOOAVQ8SZ4TcxX1rq+pxlA="
+          secure: "JROFCxI1Dj0j8GKftCk1M16PovGmbCQb/i6JKm+YKWIhoYoMJBFl3TzhN0D0KlT8VeClZ0WV4MOom6elAkxlYTGR1kcoJ5ESt/AS0B1ULxq2exbmqzqJgJJBb65JVo4nglLHZPnUHOY5s/QGtg05nPeexcK8b3lFvhMRI+Y5jqX9i4FGsEBk6tG2OLfXB0odU8f6rhEeIGWgJw1LVyiTk3VoQcJtBi7Vsg3p4othMaLDlkVHsepNY+xSO14NbNpUjXSzYWZJEM9HqCOaOlAjZR5Q0Ad365TqN9zj6NOVwxEdN4Zl3/Ux838Or6TobhdhGjqqO2JmWt6C+xV4XJ9wX+8LPb+hYYVBrItp32g3grtW/e4nNsp4j3nm1P87kzKPxC4oAaskyn0dlwC4Vo3LH67beQiceAIuM9ywej4Zwr94+MeKjIVtqI6Qz7Tjlt1pFGI1lmfkKQOXiFlkwPbyCPV3smpJ1WSOC4Npkht6tFPBlLV2DFySYUMRAdH2RwBxWhjzwsSJlx/dEKUUL5yffKtg2tANM6aCCyXMEqEXXVkFe9e9ymPbGmmQuf56xo3rYQj5BcQWA9JHAancqLkxoR0rbRBBmai5qDQP7rBss/HR7Uec5xSnYkS6YYI9zpZ+FTfPa7lnVI3c8hj+ukua1EnsYytB8F8l95jrO8fnTxU="
       file_glob: true
       file:
           - nheko-${TRAVIS_TAG}-x86_64.AppImage
@@ -99,7 +99,7 @@ deploy:
       overwrite: true
       provider: releases
       api_key:
-          secure: "CAVzWZPxYSOTollo9bpD4tvEbfxXjqelc32aApV48GKyJrMQljQ+mvSe25BuUtnDehxnw8affgGX23AYXmvG8P7w4hM2d7//8Lgan1zCmusV8JE432jknev6X641B4cvrywqSe0Dj3l0kS9Xgirq4BGavlI0y2vUjeJfQEv0y8GYoI72LwgyH0i82v/1Qi92Fh8429IJIb0eKmC1wGWXCmo2kd8StZRL5mSlc4TmyWI0SHpA5GrLMiQwLAuD7DjDl5mpaK2yQx+H4vBcI2SUMvmlHGgVjXikJG5gURlHbnIaaBFvO67INc1/65KtMokWuMP12zxqJiaMPtsAskOpQv4FLAYDfnigH3NxufyOIGp2cxS5RhJDQhbNsxHEDnUo1kHcO23ZYNWCuC1yUdn0RXzKhWcUsz8mKF8KJs22Ty4VjfUMZ+vqK/AbHyq4rkl8DizVRZqKF1KjSWrSv/2sT4itnHk9pmcgxAYfGuALcjrJJveI4MTwDhzXB62CKnMOqLq3sAMqvE0+BdA0BykQr7qrKtptuyP2/OFx6RDbfHQl5Klkb6cSOjxm0oUzh/8iaxgsVdCrhfE67eqkhFZ+a8lJkB/rZ4zSK1Q2Cp4nLtnxenUCW+Ptk2l7zZN6kXM1/+tcgqVROChYJ6asMUpsjFOOAVQ8SZ4TcxX1rq+pxlA="
+          secure: "JROFCxI1Dj0j8GKftCk1M16PovGmbCQb/i6JKm+YKWIhoYoMJBFl3TzhN0D0KlT8VeClZ0WV4MOom6elAkxlYTGR1kcoJ5ESt/AS0B1ULxq2exbmqzqJgJJBb65JVo4nglLHZPnUHOY5s/QGtg05nPeexcK8b3lFvhMRI+Y5jqX9i4FGsEBk6tG2OLfXB0odU8f6rhEeIGWgJw1LVyiTk3VoQcJtBi7Vsg3p4othMaLDlkVHsepNY+xSO14NbNpUjXSzYWZJEM9HqCOaOlAjZR5Q0Ad365TqN9zj6NOVwxEdN4Zl3/Ux838Or6TobhdhGjqqO2JmWt6C+xV4XJ9wX+8LPb+hYYVBrItp32g3grtW/e4nNsp4j3nm1P87kzKPxC4oAaskyn0dlwC4Vo3LH67beQiceAIuM9ywej4Zwr94+MeKjIVtqI6Qz7Tjlt1pFGI1lmfkKQOXiFlkwPbyCPV3smpJ1WSOC4Npkht6tFPBlLV2DFySYUMRAdH2RwBxWhjzwsSJlx/dEKUUL5yffKtg2tANM6aCCyXMEqEXXVkFe9e9ymPbGmmQuf56xo3rYQj5BcQWA9JHAancqLkxoR0rbRBBmai5qDQP7rBss/HR7Uec5xSnYkS6YYI9zpZ+FTfPa7lnVI3c8hj+ukua1EnsYytB8F8l95jrO8fnTxU="
       file: nheko-${TRAVIS_TAG}.dmg
       on:
           condition: $TRAVIS_OS_NAME == osx && $DEPLOYMENT == 1

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,9 +1,13 @@
 # Changelog
 
 ## [Unreleased]
+
+## [0.6.0] - 2018-09-21
+
 ### Features
 - Support for sending & receiving markdown formatted messages. (#283)
 - Import/Export of megolm session keys. (Incompatible with Riot) (#358)
+- macOS: The native emoji picker can be used.
 - Context menu option to show the raw text message of an event. (#437)
 - Rooms with unread messages are marked in the room list. (#313)
 - Clicking on a user pill link will open the user profile.
@@ -12,6 +16,7 @@
 - Update Polish translation (#430)
 - Enable Qt auto scaling. (#397)
 - Enable colors in the console logger.
+- Refactor styling to better work with the system theme.
 
 ### Bug fixes
 - Fixed crash when switching rooms. (#433)
@@ -20,6 +25,7 @@
 - macOS: Add missing border on the top bar.
 - Fallback to the login screen when the one-time keys cannot be uploaded.
 - Show the sidebar after initial sync. (#412)
+- Fix regression, where cache format changes didn't trigger a logout.
 
 ## [0.5.5] - 2018-09-01
 

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -15,8 +15,8 @@ include(QtCommon)
 
 project(nheko LANGUAGES C CXX)
 set(CPACK_PACKAGE_VERSION_MAJOR "0")
-set(CPACK_PACKAGE_VERSION_MINOR "5")
-set(CPACK_PACKAGE_VERSION_PATCH "5")
+set(CPACK_PACKAGE_VERSION_MINOR "6")
+set(CPACK_PACKAGE_VERSION_PATCH "0")
 set(PROJECT_VERSION_MAJOR ${CPACK_PACKAGE_VERSION_MAJOR})
 set(PROJECT_VERSION_MINOR ${CPACK_PACKAGE_VERSION_MINOR})
 set(PROJECT_VERSION_PATCH ${CPACK_PACKAGE_VERSION_PATCH})

diff --git a/README.md b/README.md
@@ -2,8 +2,8 @@ nheko
 ----
 [![Build Status](https://travis-ci.org/mujx/nheko.svg?branch=master)](https://travis-ci.org/mujx/nheko)
 [![Build status](https://ci.appveyor.com/api/projects/status/07qrqbfylsg4hw2h/branch/master?svg=true)](https://ci.appveyor.com/project/mujx/nheko/branch/master)
-[![Latest Stable Version](https://img.shields.io/badge/download-stable-green.svg)](https://bintray.com/mujx/matrix/nheko/v0.5.5)
-[![Nightly](https://img.shields.io/badge/download-nightly-green.svg)](https://bintray.com/mujx/matrix/nheko/nightly)
+[![Stable Version](https://img.shields.io/badge/download-stable-green.svg)](https://github.com/mujx/nheko/releases/v0.6.0)
+[![Nightly](https://img.shields.io/badge/download-nightly-green.svg)](https://github.com/mujx/nheko/releases/nightly)
 [![Chat on Matrix](https://img.shields.io/badge/chat-on%20matrix-blue.svg)](https://matrix.to/#/#nheko:matrix.org)
 [![AUR: nheko](https://img.shields.io/badge/AUR-nheko-blue.svg)](https://aur.archlinux.org/packages/nheko)
 
@@ -38,7 +38,9 @@ Specifically there is support for:
 
 ### Releases
 
-Releases for Linux (AppImage), macOS (disk image) & Windows (x64 installer) can be found on the [Bintray repo](https://bintray.com/mujx/matrix/nheko).
+Releases for Linux (AppImage), macOS (disk image) & Windows (x64 installer) 
+can be found on the [Bintray repo](https://bintray.com/mujx/matrix/nheko) and
+in the [Github releases](https://github.com/mujx/nheko/releases).
 
 ### Repositories
 

diff --git a/appveyor.yml b/appveyor.yml
@@ -1,6 +1,6 @@
 ---
 
-version: 0.5.5-{build}
+version: 0.6.0-{build}
 
 configuration: Release
 image: Visual Studio 2017
@@ -37,8 +37,8 @@ build_script:
     # VERSION format:     branch-master/branch-1.2
     # INSTVERSION format: x.y.z
     # WINVERSION format:  9999.0.0.123/1.2.0.234
-    - if "%APPVEYOR_REPO_TAG%"=="false" set INSTVERSION=0.5.5
-    - if "%APPVEYOR_REPO_TAG%"=="false" set VERSION=0.5.5
+    - if "%APPVEYOR_REPO_TAG%"=="false" set INSTVERSION=0.6.0
+    - if "%APPVEYOR_REPO_TAG%"=="false" set VERSION=0.6.0
     - if "%APPVEYOR_REPO_TAG%"=="false" if "%APPVEYOR_REPO_BRANCH%"=="master" set INSTVERSION=9999.0
     - if "%APPVEYOR_REPO_TAG%"=="false" set WINVERSION=%INSTVERSION%.0.%APPVEYOR_BUILD_NUMBER%
     # VERSION format:     v1.2.3/v1.3.4
@@ -107,9 +107,9 @@ after_build:
     - copy %BUILD%\deploy\installer\cleanup\package.xml installer\packages\com.mujx.nheko.cleanup\meta
     - copy %BUILD%\deploy\installer\cleanup\installscript.qs installer\packages\com.mujx.nheko.cleanup\meta
     # Amend version and date
-    - sed -i "s/__VERSION__/0.5.5/" installer\config\config.xml
-    - sed -i "s/__VERSION__/0.5.5/" installer\packages\com.mujx.nheko\meta\package.xml
-    - sed -i "s/__VERSION__/0.5.5/" installer\packages\com.mujx.nheko.cleanup\meta\package.xml
+    - sed -i "s/__VERSION__/0.6.0/" installer\config\config.xml
+    - sed -i "s/__VERSION__/0.6.0/" installer\packages\com.mujx.nheko\meta\package.xml
+    - sed -i "s/__VERSION__/0.6.0/" installer\packages\com.mujx.nheko.cleanup\meta\package.xml
     - sed -i "s/__DATE__/%DATE%/" installer\packages\com.mujx.nheko\meta\package.xml
     - sed -i "s/__DATE__/%DATE%/" installer\packages\com.mujx.nheko.cleanup\meta\package.xml
     # Copy nheko data

diff --git a/resources/nheko.appdata.xml b/resources/nheko.appdata.xml
@@ -19,6 +19,7 @@
     <url type="homepage">https://github.com/mujx/nheko</url>
     <update_contact>https://github.com/mujx</update_contact>
     <releases>
+        <release version="0.6.0" date="2018-09-21" />
         <release version="0.5.5" date="2018-09-01" />
         <release version="0.5.4" date="2018-08-21" />
         <release version="0.5.3" date="2018-08-12" />

diff --git a/src/Utils.cpp b/src/Utils.cpp
@@ -388,14 +388,15 @@ utils::linkColor()
 void
 utils::centerWidget(QWidget *widget, QWidget *parent)
 {
+        auto findCenter = [childRect = widget->rect()](QRect hostRect) -> QPoint {
+                return QPoint(hostRect.center().x() - (childRect.width() * 0.5),
+                              hostRect.center().y() - (childRect.height() * 0.5));
+        };
+
         if (parent) {
-                widget->move(parent->geometry().center() - widget->rect().center());
+                widget->move(findCenter(parent->geometry()));
                 return;
         }
 
-        const QRect screenGeometry = QApplication::desktop()->screenGeometry();
-        const int x                = (screenGeometry.width() - widget->width()) / 2;
-        const int y                = (screenGeometry.height() - widget->height()) / 2;
-
-        widget->move(x, y);
+        widget->move(findCenter(QApplication::desktop()->screenGeometry()));
 }