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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
harmonyqml/components/Base/HAvatar.qml
View File

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

2
harmonyqml/components/Base/HButton.qml
View File

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

2
harmonyqml/components/Base/HColumnLayout.qml
View File

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

3
harmonyqml/components/Base/HInterfaceBox.qml
View File

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

6
harmonyqml/components/Base/HLabel.qml
View File

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

3
harmonyqml/components/Base/HNoticeLabel.qml
View File

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

1
harmonyqml/components/Base/HRichLabel.qml
View File

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

3
harmonyqml/components/Base/HRowLayout.qml
View File

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

2
harmonyqml/components/Base/HSpacer.qml
View File

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

2
harmonyqml/components/Base/HStatusAvatar.qml
View File

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

2
harmonyqml/components/Base/HTextField.qml
View File

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

3
harmonyqml/components/Chat/RoomHeader.qml
View File

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

3
harmonyqml/components/Chat/SendBox.qml
View File

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

3
harmonyqml/components/Chat/TypingUsersBar.qml
View File

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

3
harmonyqml/components/Pages/Default.qml
View File

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

3
harmonyqml/components/Pages/RememberAccount.qml
View File

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

5
harmonyqml/components/Pages/SignIn.qml
View File

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

6
harmonyqml/components/SidePane/AccountDelegate.qml
View File

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

3
harmonyqml/components/SidePane/AccountList.qml
View File

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

4
harmonyqml/components/SidePane/PaneToolBar.qml
View File

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

3
harmonyqml/components/SidePane/RoomDelegate.qml
View File

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

3
harmonyqml/components/SidePane/RoomList.qml
View File

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

4
harmonyqml/components/SidePane/SidePane.qml
View File

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

2
harmonyqml/components/UI.qml
View File

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