From be4b15e4844894ec1a78ef0124afd4d2deb21e2f Mon Sep 17 00:00:00 2001 From: miruka Date: Sun, 28 Apr 2019 11:21:19 -0400 Subject: [PATCH] Add missing H prefix to some base componants --- .../base/{Avatar.qml => HAvatar.qml} | 0 .../base/{RichLabel.qml => HRichLabel.qml} | 0 .../{StatusAvatar.qml => HStatusAvatar.qml} | 2 +- harmonyqml/components/base/ToolTipLabel.qml | 19 ------------------- harmonyqml/components/chat/Banner.qml | 2 +- harmonyqml/components/chat/EventContent.qml | 2 +- harmonyqml/components/chat/MessageContent.qml | 4 ++-- harmonyqml/components/chat/RoomHeader.qml | 2 +- harmonyqml/components/chat/SendBox.qml | 2 +- .../components/sidePane/AccountDelegate.qml | 2 +- .../components/sidePane/RoomDelegate.qml | 2 +- 11 files changed, 9 insertions(+), 28 deletions(-) rename harmonyqml/components/base/{Avatar.qml => HAvatar.qml} (100%) rename harmonyqml/components/base/{RichLabel.qml => HRichLabel.qml} (100%) rename harmonyqml/components/base/{StatusAvatar.qml => HStatusAvatar.qml} (96%) delete mode 100644 harmonyqml/components/base/ToolTipLabel.qml diff --git a/harmonyqml/components/base/Avatar.qml b/harmonyqml/components/base/HAvatar.qml similarity index 100% rename from harmonyqml/components/base/Avatar.qml rename to harmonyqml/components/base/HAvatar.qml diff --git a/harmonyqml/components/base/RichLabel.qml b/harmonyqml/components/base/HRichLabel.qml similarity index 100% rename from harmonyqml/components/base/RichLabel.qml rename to harmonyqml/components/base/HRichLabel.qml diff --git a/harmonyqml/components/base/StatusAvatar.qml b/harmonyqml/components/base/HStatusAvatar.qml similarity index 96% rename from harmonyqml/components/base/StatusAvatar.qml rename to harmonyqml/components/base/HStatusAvatar.qml index 1f3ad059..78b68c57 100644 --- a/harmonyqml/components/base/StatusAvatar.qml +++ b/harmonyqml/components/base/HStatusAvatar.qml @@ -2,7 +2,7 @@ import QtQuick 2.7 import QtQuick.Controls 2.0 import QtQuick.Layouts 1.4 -Avatar { +HAvatar { Image { id: status anchors.right: parent.right diff --git a/harmonyqml/components/base/ToolTipLabel.qml b/harmonyqml/components/base/ToolTipLabel.qml deleted file mode 100644 index 5adbd9f8..00000000 --- a/harmonyqml/components/base/ToolTipLabel.qml +++ /dev/null @@ -1,19 +0,0 @@ -import QtQuick 2.7 -import QtQuick.Controls 2.0 - -HLabel { - property string toolTipText: "" - - id: text - - ToolTip { - delay: Qt.styleHints.mousePressAndHoldInterval - visible: text ? toolTipZone.containsMouse : false - text: toolTipText - } - MouseArea { - id: toolTipZone - anchors.fill: parent - hoverEnabled: true - } -} diff --git a/harmonyqml/components/chat/Banner.qml b/harmonyqml/components/chat/Banner.qml index db469a0e..641a9ec1 100644 --- a/harmonyqml/components/chat/Banner.qml +++ b/harmonyqml/components/chat/Banner.qml @@ -19,7 +19,7 @@ Base.HGlassRectangle { id: bannerRow anchors.fill: parent - Base.Avatar { + Base.HAvatar { id: bannerAvatar dimmension: banner.Layout.preferredHeight } diff --git a/harmonyqml/components/chat/EventContent.qml b/harmonyqml/components/chat/EventContent.qml index e57cab48..0a2c473f 100644 --- a/harmonyqml/components/chat/EventContent.qml +++ b/harmonyqml/components/chat/EventContent.qml @@ -13,7 +13,7 @@ RowLayout { readonly property string contentText: isMessage ? "" : ChatJS.getEventText(type, dict) - Base.Avatar { + Base.HAvatar { id: avatar name: displayName invisible: combine diff --git a/harmonyqml/components/chat/MessageContent.qml b/harmonyqml/components/chat/MessageContent.qml index 2ac9d182..5cd84bcb 100644 --- a/harmonyqml/components/chat/MessageContent.qml +++ b/harmonyqml/components/chat/MessageContent.qml @@ -9,7 +9,7 @@ Row { layoutDirection: isOwn ? Qt.RightToLeft : Qt.LeftToRight anchors.right: isOwn ? parent.right : undefined - Base.Avatar { id: avatar; invisible: combine; name: displayName } + Base.HAvatar { id: avatar; invisible: combine; name: displayName } ColumnLayout { spacing: 0 @@ -33,7 +33,7 @@ Row { topPadding: verticalPadding } - Base.RichLabel { + Base.HRichLabel { id: contentLabel text: (dict.formatted_body ? Backend.htmlFilter.filter(dict.formatted_body) : diff --git a/harmonyqml/components/chat/RoomHeader.qml b/harmonyqml/components/chat/RoomHeader.qml index 713b7e27..914901c2 100644 --- a/harmonyqml/components/chat/RoomHeader.qml +++ b/harmonyqml/components/chat/RoomHeader.qml @@ -18,7 +18,7 @@ Base.HGlassRectangle { spacing: 12 anchors.fill: parent - Base.Avatar { + Base.HAvatar { id: avatar Layout.alignment: Qt.AlignTop dimmension: root.Layout.minimumHeight diff --git a/harmonyqml/components/chat/SendBox.qml b/harmonyqml/components/chat/SendBox.qml index 4bb206a5..f53a058c 100644 --- a/harmonyqml/components/chat/SendBox.qml +++ b/harmonyqml/components/chat/SendBox.qml @@ -18,7 +18,7 @@ Base.HGlassRectangle { anchors.fill: parent spacing: 0 - Base.Avatar { + Base.HAvatar { id: avatar name: Backend.getUserDisplayName(chatPage.userId) dimmension: root.Layout.minimumHeight diff --git a/harmonyqml/components/sidePane/AccountDelegate.qml b/harmonyqml/components/sidePane/AccountDelegate.qml index 1fedbe81..9659a45a 100644 --- a/harmonyqml/components/sidePane/AccountDelegate.qml +++ b/harmonyqml/components/sidePane/AccountDelegate.qml @@ -12,7 +12,7 @@ ColumnLayout { id: row spacing: 0 - Base.Avatar { id: avatar; name: displayName; dimmension: 36 } + Base.HAvatar { id: avatar; name: displayName; dimmension: 36 } ColumnLayout { Layout.fillWidth: true diff --git a/harmonyqml/components/sidePane/RoomDelegate.qml b/harmonyqml/components/sidePane/RoomDelegate.qml index 6c13fbea..cbc37665 100644 --- a/harmonyqml/components/sidePane/RoomDelegate.qml +++ b/harmonyqml/components/sidePane/RoomDelegate.qml @@ -16,7 +16,7 @@ MouseArea { id: row spacing: 1 - Base.Avatar { id: avatar; name: displayName; dimmension: root.height } + Base.HAvatar { id: avatar; name: displayName; dimmension: root.height } ColumnLayout { spacing: 0