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

Clean up QML imports

Browse Source
This commit is contained in:
miruka 2019-04-28 15:36:43 -04:00
parent f714c85d75
commit ef60a1129f
32 changed files with 28 additions and 66 deletions

2
harmonyqml/components/Base/HAvatar.qml

@ -1,6 +1,4 @@
import QtQuick 2.7
import QtQuick.Controls 2.0
import QtQuick.Layouts 1.4
import "../Base"
Rectangle {

2
harmonyqml/components/Base/HButton.qml

@ -1,6 +1,6 @@
import QtQuick 2.7
import QtQuick.Controls 2.2
import QtQuick.Layouts 1.4
import QtQuick.Layouts 1.0
Button {
property string iconName: ""

2
harmonyqml/components/Base/HColumnLayout.qml

@ -1,6 +1,6 @@
import QtQuick 2.7
import QtQuick.Controls 2.2
import QtQuick.Layouts 1.4
import QtQuick.Layouts 1.0
ColumnLayout {
id: columnLayout

3
harmonyqml/components/Base/HInterfaceBox.qml

@ -1,6 +1,5 @@
import QtQuick 2.7
import QtQuick.Controls 2.2
import QtQuick.Layouts 1.4
import QtQuick.Layouts 1.0
HScalingBox {
id: interfaceBox

6
harmonyqml/components/Base/HLabel.qml

@ -1,9 +1,7 @@
import QtQuick 2.7
import QtQuick.Controls 2.0
import "."
import QtQuick.Controls 2.2
Label {
font.family: HStyle.fontFamily.sans
font.pixelSize: HStyle.fontSize.normal
textFormat: Text.PlainText
textFormat: Label.PlainText
}

3
harmonyqml/components/Base/HNoticeLabel.qml

@ -1,6 +1,5 @@
import QtQuick 2.7
import QtQuick.Controls 2.2
import QtQuick.Layouts 1.4
import QtQuick.Layouts 1.0
import "../Base"
HRowLayout {

1
harmonyqml/components/Base/HRichLabel.qml

@ -1,5 +1,4 @@
import QtQuick 2.7
import QtQuick.Controls 2.0
HLabel {
id: label

3
harmonyqml/components/Base/HRowLayout.qml

@ -1,6 +1,5 @@
import QtQuick 2.7
import QtQuick.Controls 2.2
import QtQuick.Layouts 1.4
import QtQuick.Layouts 1.0
RowLayout {
id: rowLayout

2
harmonyqml/components/Base/HSpacer.qml

@ -1,5 +1,5 @@
import QtQuick 2.7
import QtQuick.Layouts 1.4
import QtQuick.Layouts 1.0
Item {
Layout.fillWidth: true

2
harmonyqml/components/Base/HStatusAvatar.qml

@ -1,6 +1,4 @@
import QtQuick 2.7
import QtQuick.Controls 2.0
import QtQuick.Layouts 1.4
HAvatar {
HImage {

2
harmonyqml/components/Base/HTextField.qml

@ -1,5 +1,5 @@
import QtQuick 2.7
import QtQuick.Controls 2.0
import QtQuick.Controls 2.2
TextField {
property alias backgroundColor: textFieldBackground.color

3
harmonyqml/components/Chat/Banners/Banner.qml

@ -1,6 +1,5 @@
import QtQuick 2.7
import QtQuick.Controls 2.2
import QtQuick.Layouts 1.4
import QtQuick.Layouts 1.0
import "../../Base"
HGlassRectangle {

2
harmonyqml/components/Chat/Banners/InviteBanner.qml

@ -1,6 +1,4 @@
import QtQuick 2.7
import QtQuick.Controls 2.2
import QtQuick.Layouts 1.4
import "../../Base"
Banner {

2
harmonyqml/components/Chat/Banners/LeftBanner.qml

@ -1,6 +1,4 @@
import QtQuick 2.7
import QtQuick.Controls 2.2
import QtQuick.Layouts 1.4
import "../../Base"
import "../utils.js" as ChatJS

2
harmonyqml/components/Chat/Chat.qml

@ -1,6 +1,4 @@
import QtQuick 2.7
import QtQuick.Controls 2.2
import QtQuick.Layouts 1.4
import "../Base"
import "Banners"
import "RoomEventList"

3
harmonyqml/components/Chat/RoomEventList/EventContent.qml

@ -1,6 +1,5 @@
import QtQuick 2.7
import QtQuick.Controls 2.0
import QtQuick.Layouts 1.4
import QtQuick.Layouts 1.0
import "../../Base"
import "../utils.js" as ChatJS

3
harmonyqml/components/Chat/RoomEventList/MessageContent.qml

@ -1,6 +1,5 @@
import QtQuick 2.7
import QtQuick.Controls 2.0
import QtQuick.Layouts 1.4
import QtQuick.Layouts 1.0
import "../../Base"
Row {

3
harmonyqml/components/Chat/RoomEventList/RoomEventDelegate.qml

@ -1,6 +1,5 @@
import QtQuick 2.7
import QtQuick.Controls 2.0
import QtQuick.Layouts 1.4
import QtQuick.Layouts 1.0
import "../../Base"
import "../utils.js" as ChatJS

3
harmonyqml/components/Chat/RoomEventList/RoomEventList.qml

@ -1,6 +1,5 @@
import QtQuick 2.7
import QtQuick.Controls 2.2
import QtQuick.Layouts 1.4
import QtQuick.Layouts 1.0
import "../../Base"
HGlassRectangle {

3
harmonyqml/components/Chat/RoomHeader.qml

@ -1,6 +1,5 @@
import QtQuick 2.7
import QtQuick.Controls 2.2
import QtQuick.Layouts 1.4
import QtQuick.Layouts 1.0
import "../Base"
HGlassRectangle {

3
harmonyqml/components/Chat/SendBox.qml

@ -1,6 +1,5 @@
import QtQuick 2.7
import QtQuick.Controls 2.2
import QtQuick.Layouts 1.4
import QtQuick.Layouts 1.0
import "../Base"
HGlassRectangle {

3
harmonyqml/components/Chat/TypingUsersBar.qml

@ -1,6 +1,5 @@
import QtQuick 2.7
import QtQuick.Controls 2.2
import QtQuick.Layouts 1.4
import QtQuick.Layouts 1.0
import "../Base"
import "utils.js" as ChatJS

3
harmonyqml/components/Pages/Default.qml

@ -1,6 +1,3 @@
import QtQuick 2.7
import QtQuick.Controls 2.2
import QtQuick.Layouts 1.4
import "../Base"
HNoticeLabel {

3
harmonyqml/components/Pages/RememberAccount.qml

@ -1,6 +1,5 @@
import QtQuick 2.7
import QtQuick.Controls 2.2
import QtQuick.Layouts 1.4
import QtQuick.Layouts 1.0
import "../Base"
Item {

5
harmonyqml/components/Pages/SignIn.qml

@ -1,6 +1,5 @@
import QtQuick 2.7
import QtQuick.Controls 2.2
import QtQuick.Layouts 1.4
import QtQuick.Layouts 1.0
import "../Base"
Item {
@ -76,7 +75,7 @@ Item {
HTextField {
id: passwordField
placeholderText: qsTr("Password")
echoMode: TextField.Password
echoMode: HTextField.Password
onAccepted: signInBox.clickEnterButtonTarget()
Layout.fillWidth: true

6
harmonyqml/components/SidePane/AccountDelegate.qml

@ -1,6 +1,4 @@
import QtQuick 2.7
import QtQuick.Controls 2.0
import QtQuick.Layouts 1.4
import QtQuick.Layouts 1.0
import "../Base"
HColumnLayout {
@ -21,7 +19,7 @@ HColumnLayout {
HLabel {
id: accountLabel
text: displayName.value || userId
elide: Text.ElideRight
elide: HLabel.ElideRight
maximumLineCount: 1
Layout.fillWidth: true
leftPadding: 6

3
harmonyqml/components/SidePane/AccountList.qml

@ -1,6 +1,5 @@
import QtQuick 2.7
import QtQuick.Controls 2.2
import QtQuick.Layouts 1.4
import QtQuick.Layouts 1.0
ListView {
id: accountList

4
harmonyqml/components/SidePane/PaneToolBar.qml

@ -1,6 +1,4 @@
import QtQuick 2.7
import QtQuick.Controls 2.2
import QtQuick.Layouts 1.4
import QtQuick.Layouts 1.0
import "../Base"
HRowLayout {

3
harmonyqml/components/SidePane/RoomDelegate.qml

@ -1,6 +1,5 @@
import QtQuick 2.7
import QtQuick.Controls 2.0
import QtQuick.Layouts 1.4
import QtQuick.Layouts 1.0
import "../Base"
import "utils.js" as SidePaneJS

3
harmonyqml/components/SidePane/RoomList.qml

@ -1,6 +1,5 @@
import QtQuick 2.7
import QtQuick.Controls 2.2
import QtQuick.Layouts 1.4
import QtQuick.Layouts 1.0
import "../Base"
ListView {

4
harmonyqml/components/SidePane/SidePane.qml

@ -1,6 +1,4 @@
import QtQuick 2.7
import QtQuick.Controls 2.2
import QtQuick.Layouts 1.4
import QtQuick.Layouts 1.0
import QtGraphicalEffects 1.0
import "../Base"

2
harmonyqml/components/UI.qml

@ -1,6 +1,6 @@
import QtQuick 2.7
import QtQuick.Controls 2.2
import QtQuick.Layouts 1.4
import QtQuick.Layouts 1.0
import "Base"
import "SidePane"