diff --git a/harmonyqml/components/UI.qml b/harmonyqml/components/UI.qml index af608dd4..b637b896 100644 --- a/harmonyqml/components/UI.qml +++ b/harmonyqml/components/UI.qml @@ -22,7 +22,7 @@ Controls1.SplitView { console.log("replaced") } - id: "pageStack" + id: pageStack onCurrentItemChanged: currentItem.forceActiveFocus() diff --git a/harmonyqml/components/base/Avatar.qml b/harmonyqml/components/base/Avatar.qml index ec4e1f2d..3fd581d6 100644 --- a/harmonyqml/components/base/Avatar.qml +++ b/harmonyqml/components/base/Avatar.qml @@ -13,12 +13,12 @@ Item { typeof(name) == "string" ? name : (name.value ? name.value : "?") - id: "root" + id: root width: dimmension height: invisible ? 1 : dimmension Rectangle { - id: "letterRectangle" + id: letterRectangle anchors.fill: parent visible: ! invisible && imageSource === null color: resolvedName === "?" ? @@ -34,7 +34,7 @@ Item { } Image { - id: "avatarImage" + id: avatarImage anchors.fill: parent visible: ! invisible && imageSource !== null diff --git a/harmonyqml/components/base/HToolButton.qml b/harmonyqml/components/base/HToolButton.qml index 6b3e0b12..6883e3ad 100644 --- a/harmonyqml/components/base/HToolButton.qml +++ b/harmonyqml/components/base/HToolButton.qml @@ -6,7 +6,7 @@ ToolButton { property string tooltip: "" property string iconName: "" - id: "button" + id: button display: ToolButton.IconOnly icon.source: "../../icons/" + iconName + ".svg" background: Rectangle { color: "transparent" } @@ -20,7 +20,7 @@ ToolButton { visible: text ? toolTipZone.containsMouse : false } MouseArea { - id: "toolTipZone" + id: toolTipZone anchors.fill: parent hoverEnabled: true acceptedButtons: Qt.NoButton // Make button receive clicks normally diff --git a/harmonyqml/components/base/RichLabel.qml b/harmonyqml/components/base/RichLabel.qml index c454d9a8..beff9fc1 100644 --- a/harmonyqml/components/base/RichLabel.qml +++ b/harmonyqml/components/base/RichLabel.qml @@ -2,11 +2,11 @@ import QtQuick 2.7 import QtQuick.Controls 2.0 HLabel { - id: "label" + id: label textFormat: Text.RichText MouseArea { - id: "mouseArea" + id: mouseArea anchors.fill: parent hoverEnabled: true diff --git a/harmonyqml/components/base/StatusAvatar.qml b/harmonyqml/components/base/StatusAvatar.qml index 596cd0c5..1f3ad059 100644 --- a/harmonyqml/components/base/StatusAvatar.qml +++ b/harmonyqml/components/base/StatusAvatar.qml @@ -4,7 +4,7 @@ import QtQuick.Layouts 1.4 Avatar { Image { - id: "status" + id: status anchors.right: parent.right anchors.bottom: parent.bottom source: "../../icons/status.svg" diff --git a/harmonyqml/components/chat/MessageDelegate.qml b/harmonyqml/components/chat/MessageDelegate.qml index beb8be53..89ae31cf 100644 --- a/harmonyqml/components/chat/MessageDelegate.qml +++ b/harmonyqml/components/chat/MessageDelegate.qml @@ -5,7 +5,7 @@ import "../base" as Base import "utils.js" as ChatJS Column { - id: "messageDelegate" + id: messageDelegate function minsBetween(date1, date2) { return Math.round((((date2 - date1) % 86400000) % 3600000) / 60000) diff --git a/harmonyqml/components/chat/RoomHeader.qml b/harmonyqml/components/chat/RoomHeader.qml index 5854e3cf..06221a97 100644 --- a/harmonyqml/components/chat/RoomHeader.qml +++ b/harmonyqml/components/chat/RoomHeader.qml @@ -7,26 +7,26 @@ Rectangle { property string displayName: "" property string topic: "" - id: "root" + id: root Layout.fillWidth: true Layout.minimumHeight: 36 Layout.maximumHeight: Layout.minimumHeight color: "#BBB" RowLayout { - id: "row" + id: row spacing: 12 anchors.fill: parent Base.Avatar { - id: "avatar" + id: avatar Layout.alignment: Qt.AlignTop dimmension: root.Layout.minimumHeight name: displayName } Base.HLabel { - id: "roomName" + id: roomName text: displayName font.pixelSize: bigSize elide: Text.ElideRight @@ -37,7 +37,7 @@ Rectangle { } Base.HLabel { - id: "roomTopic" + id: roomTopic text: topic font.pixelSize: smallSize elide: Text.ElideRight diff --git a/harmonyqml/components/chat/Root.qml b/harmonyqml/components/chat/Root.qml index 0dea78f0..523153fa 100644 --- a/harmonyqml/components/chat/Root.qml +++ b/harmonyqml/components/chat/Root.qml @@ -9,17 +9,17 @@ ColumnLayout { property var roomInfo: Backend.models.rooms.get(userId).getWhere("roomId", roomId) - id: "chatPage" + id: chatPage spacing: 0 onFocusChanged: sendBox.setFocus() RoomHeader { - id: "roomHeader" + id: roomHeader displayName: roomInfo.displayName topic: roomInfo.topic } MessageList {} TypingUsersBar {} - SendBox { id: "sendBox" } + SendBox { id: sendBox } } diff --git a/harmonyqml/components/chat/SendBox.qml b/harmonyqml/components/chat/SendBox.qml index 4f866383..cf59b940 100644 --- a/harmonyqml/components/chat/SendBox.qml +++ b/harmonyqml/components/chat/SendBox.qml @@ -6,7 +6,7 @@ import "../base" as Base Rectangle { function setFocus() { textArea.forceActiveFocus() } - id: "root" + id: root Layout.fillWidth: true Layout.minimumHeight: 32 Layout.preferredHeight: textArea.implicitHeight @@ -19,7 +19,7 @@ Rectangle { spacing: 0 Base.Avatar { - id: "avatar" + id: avatar name: Backend.getUserDisplayName(chatPage.userId) dimmension: root.Layout.minimumHeight //visible: textArea.text === "" diff --git a/harmonyqml/components/chat/TypingUsersBar.qml b/harmonyqml/components/chat/TypingUsersBar.qml index 090b56d9..adcd860f 100644 --- a/harmonyqml/components/chat/TypingUsersBar.qml +++ b/harmonyqml/components/chat/TypingUsersBar.qml @@ -14,7 +14,7 @@ Rectangle { property var typingUsers: chatPage.roomInfo.typingUsers Base.HLabel { - id: "usersLabel" + id: usersLabel anchors.fill: parent text: ChatJS.getTypingUsersText(typingUsers, chatPage.userId) diff --git a/harmonyqml/components/sidePane/AccountDelegate.qml b/harmonyqml/components/sidePane/AccountDelegate.qml index cb004f5b..1fedbe81 100644 --- a/harmonyqml/components/sidePane/AccountDelegate.qml +++ b/harmonyqml/components/sidePane/AccountDelegate.qml @@ -4,15 +4,15 @@ import QtQuick.Layouts 1.4 import "../base" as Base ColumnLayout { - id: "accountDelegate" + id: accountDelegate spacing: 0 width: parent.width RowLayout { - id: "row" + id: row spacing: 0 - Base.Avatar { id: "avatar"; name: displayName; dimmension: 36 } + Base.Avatar { id: avatar; name: displayName; dimmension: 36 } ColumnLayout { Layout.fillWidth: true @@ -20,7 +20,7 @@ ColumnLayout { spacing: 0 Base.HLabel { - id: "accountLabel" + id: accountLabel text: displayName.value || userId elide: Text.ElideRight maximumLineCount: 1 @@ -30,7 +30,7 @@ ColumnLayout { } TextField { - id: "statusEdit" + id: statusEdit text: statusMessage || "" placeholderText: qsTr("Set status message") background: null @@ -51,7 +51,7 @@ ColumnLayout { } Base.HToolButton { - id: "toggleExpand" + id: toggleExpand iconName: roomList.visible ? "up" : "down" Layout.maximumWidth: 28 Layout.minimumHeight: row.height @@ -64,7 +64,7 @@ ColumnLayout { } RoomList { - id: "roomList" + id: roomList visible: true interactive: false // no scrolling forUserId: userId diff --git a/harmonyqml/components/sidePane/AccountList.qml b/harmonyqml/components/sidePane/AccountList.qml index a589ea05..7aae9041 100644 --- a/harmonyqml/components/sidePane/AccountList.qml +++ b/harmonyqml/components/sidePane/AccountList.qml @@ -3,7 +3,7 @@ import QtQuick.Controls 2.2 import QtQuick.Layouts 1.4 ListView { - id: "accountList" + id: accountList spacing: 8 model: Backend.models.accounts delegate: AccountDelegate {} diff --git a/harmonyqml/components/sidePane/HToolBar.qml b/harmonyqml/components/sidePane/HToolBar.qml index 39faf7fa..5ea8ea86 100644 --- a/harmonyqml/components/sidePane/HToolBar.qml +++ b/harmonyqml/components/sidePane/HToolBar.qml @@ -4,7 +4,7 @@ import QtQuick.Layouts 1.4 import "../base" as Base RowLayout { - id: "toolBar" + id: toolBar Layout.fillWidth: true Layout.maximumHeight: 32 spacing: 0 diff --git a/harmonyqml/components/sidePane/HToolButton.qml b/harmonyqml/components/sidePane/HToolButton.qml index f8b011fc..56860c42 100644 --- a/harmonyqml/components/sidePane/HToolButton.qml +++ b/harmonyqml/components/sidePane/HToolButton.qml @@ -9,7 +9,7 @@ Base.HToolButton { Layout.minimumWidth * (toolBar.children.length - 2) } - id: "button" + id: button visible: toolBarIsBig() Layout.fillHeight: true Layout.fillWidth: true diff --git a/harmonyqml/components/sidePane/RoomDelegate.qml b/harmonyqml/components/sidePane/RoomDelegate.qml index 66a91934..78745cdb 100644 --- a/harmonyqml/components/sidePane/RoomDelegate.qml +++ b/harmonyqml/components/sidePane/RoomDelegate.qml @@ -5,7 +5,7 @@ import "../base" as Base import "utils.js" as SidePaneJS MouseArea { - id: "root" + id: root width: roomList.width height: roomList.childrenHeight diff --git a/harmonyqml/components/sidePane/RoomList.qml b/harmonyqml/components/sidePane/RoomList.qml index 5d80b9da..abaf6611 100644 --- a/harmonyqml/components/sidePane/RoomList.qml +++ b/harmonyqml/components/sidePane/RoomList.qml @@ -14,7 +14,7 @@ ListView { spacing * (model.count - 1) } - id: "roomList" + id: roomList spacing: 8 model: Backend.models.rooms.get(forUserId) delegate: RoomDelegate {}