From 2ac1d6da173b0996993f8c50cbea38e7fcb26d71 Mon Sep 17 00:00:00 2001 From: miruka Date: Sat, 6 Jul 2019 21:06:18 -0400 Subject: [PATCH] Remove "readonly"s from Theme for readability --- TODO.md | 3 --- src/qml/Theme.qml | 50 +++++++++++++++++++++++------------------------ 2 files changed, 25 insertions(+), 28 deletions(-) diff --git a/TODO.md b/TODO.md index a1cfd07b..6b3d4690 100644 --- a/TODO.md +++ b/TODO.md @@ -2,8 +2,6 @@ - html links color - invite/leave/forget backend funcs - license headers -- replace "property var" by "property " where applicable and - var by string and readonly - [debug mode](https://docs.python.org/3/library/asyncio-dev.html) - `pyotherside.atexit()` - way to put sidepane back to auto-sizing (snap) @@ -63,7 +61,6 @@ OLD - Client improvements - Filtering rooms: search more than display names? - - nio.MatrixRoom has `typing_users`, no need to handle it on our own - Initial sync filter and lazy load, see weechat-matrix `_handle_login()` - See also `handle_response()`'s `keys_query` request - Direct chats category diff --git a/src/qml/Theme.qml b/src/qml/Theme.qml index baa6e459..e18d5086 100644 --- a/src/qml/Theme.qml +++ b/src/qml/Theme.qml @@ -5,7 +5,7 @@ QtObject { property int animationDuration: 100 - readonly property QtObject fontSize: QtObject { + property QtObject fontSize: QtObject { property int smallest: 6 property int smaller: 8 property int small: 13 @@ -15,7 +15,7 @@ QtObject { property int biggest: 48 } - readonly property QtObject fontFamily: QtObject { + property QtObject fontFamily: QtObject { property string sans: "SFNS Display" property string serif: "Roboto Slab" property string mono: "Hack" @@ -23,7 +23,7 @@ QtObject { property int radius: 5 - readonly property QtObject colors: QtObject { + property QtObject colors: QtObject { property color background0: Qt.hsla(0, 0, 0.9, 0.5) property color background1: Qt.hsla(0, 0, 0.9, 0.6) property color background2: Qt.hsla(0, 0, 0.9, 0.7) @@ -33,90 +33,90 @@ QtObject { property color textBorder: Qt.hsla(0, 0, 0, 0.07) } - readonly property QtObject controls: QtObject { - readonly property QtObject button: QtObject { + property QtObject controls: QtObject { + property QtObject button: QtObject { property color background: colors.background2 } - readonly property QtObject textField: QtObject { + property QtObject textField: QtObject { property color background: colors.background2 } - readonly property QtObject textArea: QtObject { + property QtObject textArea: QtObject { property color background: colors.background2 } } - readonly property QtObject sidePane: QtObject { + property QtObject sidePane: QtObject { property color background: colors.background2 - readonly property QtObject settingsButton: QtObject { + property QtObject settingsButton: QtObject { property color background: colors.background2 } - readonly property QtObject filterRooms: QtObject { + property QtObject filterRooms: QtObject { property color background: colors.background2 } } - readonly property QtObject chat: QtObject { - readonly property QtObject selectViewBar: QtObject { + property QtObject chat: QtObject { + property QtObject selectViewBar: QtObject { property color background: colors.background2 } - readonly property QtObject roomHeader: QtObject { + property QtObject roomHeader: QtObject { property color background: colors.background2 } - readonly property QtObject roomEventList: QtObject { + property QtObject roomEventList: QtObject { property color background: "transparent" } - readonly property QtObject message: QtObject { + property QtObject message: QtObject { property color ownBackground: Qt.hsla(0.07, 0.4, 0.82, 0.7) property color background: colors.background2 property color body: colors.foreground property color date: colors.foregroundDim } - readonly property QtObject daybreak: QtObject { + property QtObject daybreak: QtObject { property color background: colors.background2 property color foreground: colors.foreground property int radius: theme.radius } - readonly property QtObject inviteBanner: QtObject { + property QtObject inviteBanner: QtObject { property color background: colors.background2 } - readonly property QtObject leftBanner: QtObject { + property QtObject leftBanner: QtObject { property color background: colors.background2 } - readonly property QtObject unknownDevices: QtObject { + property QtObject unknownDevices: QtObject { property color background: colors.background2 } - readonly property QtObject typingMembers: QtObject { + property QtObject typingMembers: QtObject { property color background: colors.background1 } - readonly property QtObject sendBox: QtObject { + property QtObject sendBox: QtObject { property color background: colors.background2 } } - readonly property QtObject box: QtObject { + property QtObject box: QtObject { property color background: colors.background0 property int radius: theme.radius } - readonly property QtObject avatar: QtObject { + property QtObject avatar: QtObject { property int size: 36 property int radius: theme.radius property color letter: "white" - readonly property QtObject background: QtObject { + property QtObject background: QtObject { property real saturation: 0.22 property real lightness: 0.5 property real alpha: 1 @@ -124,7 +124,7 @@ QtObject { } } - readonly property QtObject displayName: QtObject { + property QtObject displayName: QtObject { property real saturation: 0.32 property real lightness: 0.3 }