Zergling_man/moment
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use Base components without namespace prefix

Browse Source
This commit is contained in:
miruka
2019-04-28 15:18:36 -04:00
parent 89fcfbea82
commit d0089df051
25 changed files with 123 additions and 128 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
harmonyqml/components/Chat/RoomEventList/Daybreak.qml
View File

@@ -1,9 +1,9 @@
import QtQuick 2.7
import "../../Base" as Base
import "../../Base"
Base.HNoticeLabel {
HNoticeLabel {
text: dateTime.toLocaleDateString()
color: Base.HStyle.chat.daybreak.foreground
backgroundColor: Base.HStyle.chat.daybreak.background
radius: Base.HStyle.chat.daybreak.radius
color: HStyle.chat.daybreak.foreground
backgroundColor: HStyle.chat.daybreak.background
radius: HStyle.chat.daybreak.radius
}

18
harmonyqml/components/Chat/RoomEventList/EventContent.qml
View File

@@ -1,41 +1,41 @@
import QtQuick 2.7
import QtQuick.Controls 2.0
import QtQuick.Layouts 1.4
import "../../Base" as Base
import "../../Base"
import "../utils.js" as ChatJS
Base.HRowLayout {
HRowLayout {
id: eventContent
spacing: standardSpacing / 2
layoutDirection: isOwn ? Qt.RightToLeft : Qt.LeftToRight
Base.HAvatar {
HAvatar {
id: avatar
name: displayName
hidden: combine
dimension: 28
}
Base.HLabel {
HLabel {
id: contentLabel
text: "<font color='" +
Qt.hsla(Backend.hueFromString(displayName.value || dict.sender),
Base.HStyle.chat.event.saturation,
Base.HStyle.chat.event.lightness,
HStyle.chat.event.saturation,
HStyle.chat.event.lightness,
1) +
"'>" +
(displayName.value || dict.sender) + " " +
ChatJS.getEventText(type, dict) +
"&nbsp;&nbsp;" +
"<font size=" + Base.HStyle.fontSize.small + "px " +
"color=" + Base.HStyle.chat.event.date + ">" +
"<font size=" + HStyle.fontSize.small + "px " +
"color=" + HStyle.chat.event.date + ">" +
Qt.formatDateTime(dateTime, "hh:mm:ss") +
"</font> " +
"</font>"
textFormat: Text.RichText
background: Rectangle {color: Base.HStyle.chat.event.background}
background: Rectangle {color: HStyle.chat.event.background}
wrapMode: Text.Wrap
leftPadding: horizontalPadding

26
harmonyqml/components/Chat/RoomEventList/MessageContent.qml
View File

@@ -1,26 +1,26 @@
import QtQuick 2.7
import QtQuick.Controls 2.0
import QtQuick.Layouts 1.4
import "../../Base" as Base
import "../../Base"
Row {
id: row
spacing: standardSpacing
layoutDirection: isOwn ? Qt.RightToLeft : Qt.LeftToRight
Base.HAvatar { id: avatar; hidden: combine; name: displayName }
HAvatar { id: avatar; hidden: combine; name: displayName }
Base.HColumnLayout {
HColumnLayout {
spacing: 0
Base.HLabel {
HLabel {
visible: ! combine
id: nameLabel
text: displayName.value || dict.sender
background: Rectangle {color: Base.HStyle.chat.message.background}
background: Rectangle {color: HStyle.chat.message.background}
color: Qt.hsla(Backend.hueFromString(text),
Base.HStyle.displayName.saturation,
Base.HStyle.displayName.lightness,
HStyle.displayName.saturation,
HStyle.displayName.lightness,
1)
elide: Text.ElideRight
maximumLineCount: 1
@@ -32,21 +32,21 @@ Row {
topPadding: verticalPadding
}
Base.HRichLabel {
HRichLabel {
id: contentLabel
text: (dict.formatted_body ?
Backend.htmlFilter.filter(dict.formatted_body) :
dict.body) +
"&nbsp;&nbsp;<font size=" + Base.HStyle.fontSize.small +
"px color=" + Base.HStyle.chat.message.date + ">" +
"&nbsp;&nbsp;<font size=" + HStyle.fontSize.small +
"px color=" + HStyle.chat.message.date + ">" +
Qt.formatDateTime(dateTime, "hh:mm:ss") +
"</font>" +
(isLocalEcho ?
"&nbsp;<font size=" + Base.HStyle.fontSize.small +
"&nbsp;<font size=" + HStyle.fontSize.small +
"px>⏳</font>" : "")
textFormat: Text.RichText
background: Rectangle {color: Base.HStyle.chat.message.background}
color: Base.HStyle.chat.message.body
background: Rectangle {color: HStyle.chat.message.background}
color: HStyle.chat.message.body
wrapMode: Text.Wrap
leftPadding: horizontalPadding

2
harmonyqml/components/Chat/RoomEventList/RoomEventDelegate.qml
View File

@@ -1,7 +1,7 @@
import QtQuick 2.7
import QtQuick.Controls 2.0
import QtQuick.Layouts 1.4
import "../../Base" as Base
import "../../Base"
import "../utils.js" as ChatJS
Column {

8
harmonyqml/components/Chat/RoomEventList/RoomEventList.qml
View File

@@ -1,13 +1,13 @@
import QtQuick 2.7
import QtQuick.Controls 2.2
import QtQuick.Layouts 1.4
import "../../Base" as Base
import "../../Base"
Base.HGlassRectangle {
HGlassRectangle {
property bool canLoadPastEvents: true
property int space: 8
color: Base.HStyle.chat.roomEventList.background
color: HStyle.chat.roomEventList.background
Layout.fillWidth: true
Layout.fillHeight: true
@@ -40,7 +40,7 @@ Base.HGlassRectangle {
}
}
Base.HNoticeLabel {
HNoticeLabel {
text: qsTr("Nothing to show here yet...")
visible: roomEventListView.model.count < 1