From 18c16ca486e246196e842cfcc1ad364d94263a6f Mon Sep 17 00:00:00 2001 From: miruka Date: Sun, 22 Mar 2020 13:24:38 -0400 Subject: [PATCH] =?UTF-8?q?Rename=20compact=20mode=20setting=20=E2=86=92?= =?UTF-8?q?=20compactModeByDefault?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/backend/user_files.py | 2 +- src/gui/Base/HTile.qml | 2 +- src/gui/Pages/Chat/Timeline/EventDelegate.qml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/backend/user_files.py b/src/backend/user_files.py index 07046582..fe3a6332 100644 --- a/src/backend/user_files.py +++ b/src/backend/user_files.py @@ -208,7 +208,7 @@ class UISettings(JSONDataFile): return { "alertOnMessageForMsec": 4000, "alwaysCenterRoomHeader": False, - "alwaysUseCompactMode": False, + "compactModeByDefault": False, "clearRoomFilterOnEnter": True, "clearRoomFilterOnEscape": True, "collapseSidePanesUnderWindowWidth": 400, diff --git a/src/gui/Base/HTile.qml b/src/gui/Base/HTile.qml index cd4c3474..1cc67b37 100644 --- a/src/gui/Base/HTile.qml +++ b/src/gui/Base/HTile.qml @@ -11,7 +11,7 @@ HButton { default property alias additionalData: contentItem.data - property bool compact: window.settings.alwaysUseCompactMode + property bool compact: window.settings.compactModeByDefault property real contentOpacity: 1 readonly property alias title: title diff --git a/src/gui/Pages/Chat/Timeline/EventDelegate.qml b/src/gui/Pages/Chat/Timeline/EventDelegate.qml index 83fec57c..9176ab6e 100644 --- a/src/gui/Pages/Chat/Timeline/EventDelegate.qml +++ b/src/gui/Pages/Chat/Timeline/EventDelegate.qml @@ -20,7 +20,7 @@ HColumnLayout { readonly property var nextModel: eventList.model.get(model.index - 1) readonly property QtObject currentModel: model - property bool compact: window.settings.alwaysUseCompactMode + property bool compact: window.settings.compactModeByDefault property bool isOwn: chat.userId === model.sender_id property bool onRight: eventList.ownEventsOnRight && isOwn property bool combine: eventList.canCombine(previousModel, model)