Merge branch 'master' of https://github.com/redsky17/nheko

.ci/bintray-release.json

@@ -17,7 +17,7 @@
   ],
   "package": {
     "desc": "Desktop client for the Matrix protocol",
-    "issue_tracker_url": "https://github.com/mujx/nheko/issues",
+    "issue_tracker_url": "https://github.com/nheko-reborn/nheko/issues",
     "licenses": [
       "GPL-3.0"
     ],
@@ -26,8 +26,8 @@
     "public_stats": true,
     "repo": "matrix",
     "subject": "mujx",
-    "vcs_url": "https://github.com/mujx/nheko",
+    "vcs_url": "https://github.com/nheko-reborn/nheko",
-    "website_url": "https://github.com/mujx/nheko"
+    "website_url": "https://github.com/nheko-reborn/nheko"
   },
   "publish": true,
   "version": {

.travis.yml

@@ -87,7 +87,7 @@ deploy:
       file: "bintray-release.json"
       on:
           condition: $DEPLOYMENT == 1
-          repo: redsky17/nheko
+          repo: nheko-reborn/nheko
           tags: true
           deploy:
     - skip_cleanup: true

README.md

@@ -1,9 +1,9 @@
 nheko
 ----
-[![Build Status](https://travis-ci.org/redsky17/nheko.svg?branch=master)](https://travis-ci.org/mujx/nheko)
+[![Build Status](https://travis-ci.org/Nheko-Reborn/nheko.svg?branch=master)](https://travis-ci.org/Nheko-Reborn/nheko)
 [![Build status](https://ci.appveyor.com/api/projects/status/07qrqbfylsg4hw2h/branch/master?svg=true)](https://ci.appveyor.com/project/redsky17/nheko/branch/master)
-[![Stable Version](https://img.shields.io/badge/download-stable-green.svg)](https://github.com/redsky17/nheko/releases/v0.6.2)
+[![Stable Version](https://img.shields.io/badge/download-stable-green.svg)](https://github.com/Nheko-Reborn/nheko/releases/v0.6.2)
-[![Nightly](https://img.shields.io/badge/download-nightly-green.svg)](https://github.com/redsky17/nheko/releases/nightly)
+[![Nightly](https://img.shields.io/badge/download-nightly-green.svg)](https://github.com/Nheko-Reborn/nheko/releases/nightly)
 [![#nheko-reborn:matrix.org](https://img.shields.io/matrix/nheko-reborn:matrix.org.svg?label=%23nheko-reborn:matrix.org)](https://matrix.to/#/#nheko-reborn:matrix.org)
 [![AUR: nheko](https://img.shields.io/badge/AUR-nheko-blue.svg)](https://aur.archlinux.org/packages/nheko)
 
@@ -39,7 +39,7 @@ Specifically there is support for:
 ### Releases
 
 Releases for Linux (AppImage), macOS (disk image) & Windows (x64 installer)
-can be found in the [Github releases](https://github.com/mujx/nheko/releases).
+can be found in the [Github releases](https://github.com/Nheko-Reborn/nheko/releases).
 
 ### Repositories
 
@@ -86,7 +86,7 @@ sudo port install nheko
 - Qt5 (5.7 or greater). Qt 5.7 adds support for color font rendering with
   Freetype, which is essential to properly support emoji.
 - CMake 3.1 or greater.
-- [mtxclient](https://github.com/mujx/mtxclient)
+- [mtxclient](https://github.com/Nheko-Reborn/mtxclient)
 - [LMDB](https://symas.com/lightning-memory-mapped-database/)
 - [cmark](https://github.com/commonmark/cmark)
 - Boost 1.66 or greater.

appveyor.yml

@@ -8,7 +8,7 @@ platform: x64
 
 environment:
     BINTRAY_APIKEY:
-        secure: "hhhAH6csIrPEVH92NNQkiGCkuON6l6sfhbZk+pvzDAM3vHex7YbqFKW6v5UjAS8v"
+        secure: "iGl5mzE9/ta9kFELUxDw9XtlYMSCMai9xowXIkYzU8WKHz7NfW0mLwMJZvblZFXJ"
 
 cache: c:\tools\vcpkg\installed\
 
@@ -127,13 +127,13 @@ after_build:
     - mv nheko-installer.exe nheko-%APPVEYOR_REPO_TAG_NAME%-installer.exe
 
 on_success:
-    - if "%APPVEYOR_REPO_TAG%" == "true" (curl -T nheko-%APPVEYOR_REPO_TAG_NAME%-installer.exe -umujx:%BINTRAY_APIKEY% https://api.bintray.com/content/mujx/matrix/nheko/%APPVEYOR_REPO_TAG_NAME%/nheko/%APPVEYOR_REPO_TAG_NAME%/)
+    - if "%APPVEYOR_REPO_TAG%" == "true" (curl -T nheko-%APPVEYOR_REPO_TAG_NAME%-installer.exe -uredsky17:%BINTRAY_APIKEY% https://api.bintray.com/content/nheko-reborn/nheko/%APPVEYOR_REPO_TAG_NAME%/nheko/%APPVEYOR_REPO_TAG_NAME%/)
 
 deploy:
     description: "Development builds"
     provider: GitHub
     auth_token:
-        secure: "YqB7hcM+4482eSHhtVR7ZA7N7lE78y8BC897/7UDTBQd+NWdWFW/6S+oKDie9TT7"
+        secure: "ShStWeqp+TkYqJPQr7uFZb+B8ZTgC7Iwth+IkhjfRDCTLhy8gtWvlPzlQilder3E"
     artifact: nheko-${APPVEYOR_REPO_TAG_NAME}-installer.exe
     force_update: true
     prerelease: true

src/RoomInfoListItem.h

@@ -47,7 +47,8 @@ class RoomInfoListItem : public QWidget
         Q_PROPERTY(QColor subtitleColor READ subtitleColor WRITE setSubtitleColor)
 
         Q_PROPERTY(QColor timestampColor READ timestampColor WRITE setTimestampColor)
-        Q_PROPERTY(QColor highlightedTimestampColor READ highlightedTimestampColor WRITE setHighlightedTimestampColor)
+        Q_PROPERTY(QColor highlightedTimestampColor READ highlightedTimestampColor WRITE
+                     setHighlightedTimestampColor)
         Q_PROPERTY(QColor hoverTimestampColor READ hoverTimestampColor WRITE setHoverTimestampColor)
 
         Q_PROPERTY(
@@ -55,10 +56,8 @@ class RoomInfoListItem : public QWidget
         Q_PROPERTY(QColor highlightedSubtitleColor READ highlightedSubtitleColor WRITE
                      setHighlightedSubtitleColor)
 
-        Q_PROPERTY(
+        Q_PROPERTY(QColor hoverTitleColor READ hoverTitleColor WRITE setHoverTitleColor)
-          QColor hoverTitleColor READ hoverTitleColor WRITE setHoverTitleColor)
+        Q_PROPERTY(QColor hoverSubtitleColor READ hoverSubtitleColor WRITE setHoverSubtitleColor)
-        Q_PROPERTY(QColor hoverSubtitleColor READ hoverSubtitleColor WRITE
-                     setHoverSubtitleColor)
 
         Q_PROPERTY(QColor btnColor READ btnColor WRITE setBtnColor)
         Q_PROPERTY(QColor btnTextColor READ btnTextColor WRITE setBtnTextColor)