From 02888eb63d59d7d7905345a604fc25bc3a6fbf05 Mon Sep 17 00:00:00 2001 From: miruka Date: Sat, 9 Nov 2019 11:10:00 -0400 Subject: [PATCH] Change join/create room button icons --- src/icons/thin/add-chat.svg | 3 +++ src/icons/thin/room-create.svg | 3 +++ src/qml/Pages/AddChat/CreateRoom.qml | 2 +- src/qml/Pages/AddChat/JoinRoom.qml | 2 +- src/qml/SidePane/AccountDelegate.qml | 4 ++-- 5 files changed, 10 insertions(+), 4 deletions(-) create mode 100644 src/icons/thin/add-chat.svg create mode 100644 src/icons/thin/room-create.svg diff --git a/src/icons/thin/add-chat.svg b/src/icons/thin/add-chat.svg new file mode 100644 index 00000000..b0ca843e --- /dev/null +++ b/src/icons/thin/add-chat.svg @@ -0,0 +1,3 @@ + + + diff --git a/src/icons/thin/room-create.svg b/src/icons/thin/room-create.svg new file mode 100644 index 00000000..481e7fe5 --- /dev/null +++ b/src/icons/thin/room-create.svg @@ -0,0 +1,3 @@ + + + diff --git a/src/qml/Pages/AddChat/CreateRoom.qml b/src/qml/Pages/AddChat/CreateRoom.qml index c6c351da..d450053a 100644 --- a/src/qml/Pages/AddChat/CreateRoom.qml +++ b/src/qml/Pages/AddChat/CreateRoom.qml @@ -10,7 +10,7 @@ HBox { onFocusChanged: nameField.forceActiveFocus() buttonModel: [ - { name: "apply", text: qsTr("Create"), iconName: "apply" }, + { name: "apply", text: qsTr("Create"), iconName: "room-create" }, { name: "cancel", text: qsTr("Cancel"), iconName: "cancel" }, ] diff --git a/src/qml/Pages/AddChat/JoinRoom.qml b/src/qml/Pages/AddChat/JoinRoom.qml index 794b09e1..6176eab7 100644 --- a/src/qml/Pages/AddChat/JoinRoom.qml +++ b/src/qml/Pages/AddChat/JoinRoom.qml @@ -10,7 +10,7 @@ HBox { onFocusChanged: roomField.forceActiveFocus() buttonModel: [ - { name: "apply", text: qsTr("Join"), iconName: "apply", + { name: "apply", text: qsTr("Join"), iconName: "join", enabled: Boolean(roomField.text), }, { name: "cancel", text: qsTr("Cancel"), iconName: "cancel" }, ] diff --git a/src/qml/SidePane/AccountDelegate.qml b/src/qml/SidePane/AccountDelegate.qml index a8504161..187ad696 100644 --- a/src/qml/SidePane/AccountDelegate.qml +++ b/src/qml/SidePane/AccountDelegate.qml @@ -60,7 +60,7 @@ HTileDelegate { HButton { id: addChat iconItem.dimension: 16 - icon.name: "add-account" // TODO + icon.name: "add-chat" backgroundColor: "transparent" toolTip.text: qsTr("Add new chat") onClicked: pageLoader.showPage( @@ -81,7 +81,7 @@ HTileDelegate { HButton { id: expand loading: ! model.data.first_sync_done || ! model.data.profile_updated - iconItem.dimension: 16 + iconItem.dimension: addChat.iconItem.dimension icon.name: "expand" backgroundColor: "transparent" toolTip.text: collapsed ? qsTr("Expand") : qsTr("Collapse")