From 176274e648252d37a0aa53f24778c297dc42992c Mon Sep 17 00:00:00 2001 From: erinn Date: Tue, 19 May 2020 13:25:56 -0700 Subject: [PATCH] update import paths --- Badge.qml | 2 +- Button.qml | 6 +++--- ButtonTextField.qml | 2 +- ContactList.qml | 2 +- ContactRow.qml | 6 +++--- EllipsisLabel.qml | 4 ++-- EmojiDrawer.qml | 2 +- HLine.qml | 2 +- Icon.qml | 4 ++-- IconTextField.qml | 2 +- InplaceEditText.qml | 2 +- MyProfile.qml | 4 ++-- Portrait.qml | 2 +- PortraitRow.qml | 6 +++--- ScalingLabel.qml | 1 - Statusbar.qml | 2 +- ToggleSwitch.qml | 2 +- Toolbar.qml | 4 ++-- UnderlineTextField.qml | 2 +- 19 files changed, 28 insertions(+), 29 deletions(-) diff --git a/Badge.qml b/Badge.qml index 6369eab..66f5e25 100644 --- a/Badge.qml +++ b/Badge.qml @@ -4,7 +4,7 @@ import QtQuick.Controls 2.4 import QtQuick.Controls.Material 2.0 import QtQuick.Layouts 1.3 import CustomQmlTypes 1.0 -import "../theme" +import "theme" Rectangle { width: parent.width * 0.25 diff --git a/Button.qml b/Button.qml index c341334..690f8d8 100644 --- a/Button.qml +++ b/Button.qml @@ -4,9 +4,9 @@ import QtQuick.Controls 2.4 import QtQuick.Controls.Material 2.0 import QtQuick.Layouts 1.3 -import "../fonts/Twemoji.js" as T -import "../theme" -import "../fonts" +import "fonts/Twemoji.js" as T +import "theme" +import "fonts" Rectangle { id: button diff --git a/ButtonTextField.qml b/ButtonTextField.qml index 9962ce2..f216a92 100644 --- a/ButtonTextField.qml +++ b/ButtonTextField.qml @@ -4,7 +4,7 @@ import QtQuick.Controls 2.13 import QtQuick.Controls.Styles 1.4 import QtGraphicalEffects 1.12 import "." as Widgets -import "../theme" +import "theme" // ButtonTextField integrates a text field and a button diff --git a/ContactList.qml b/ContactList.qml index 2011784..cfac63b 100644 --- a/ContactList.qml +++ b/ContactList.qml @@ -3,7 +3,7 @@ import QtQuick 2.7 import QtQuick.Controls 2.4 import QtQuick.Controls.Material 2.0 import QtQuick.Layouts 1.3 -import "../theme" +import "theme" ColumnLayout { id: root diff --git a/ContactRow.qml b/ContactRow.qml index bed4b98..f49df18 100644 --- a/ContactRow.qml +++ b/ContactRow.qml @@ -4,9 +4,9 @@ import QtQuick.Controls 2.4 import QtQuick.Controls.Material 2.0 import QtQuick.Layouts 1.3 import CustomQmlTypes 1.0 -import "../styles" -import "../widgets" as Widgets -import "../theme" +import "styles" +import "widgets" as Widgets +import "theme" import QtQuick.Controls 1.4 import QtQuick.Controls.Styles 1.4 diff --git a/EllipsisLabel.qml b/EllipsisLabel.qml index a0d042c..5bd6de3 100644 --- a/EllipsisLabel.qml +++ b/EllipsisLabel.qml @@ -3,8 +3,8 @@ import QtQuick.Controls 2.4 import QtQuick.Controls.Material 2.0 import QtQuick.Layouts 1.3 import CustomQmlTypes 1.0 -import "../widgets" as Widgets -import "../theme" +import "widgets" as Widgets +import "theme" // Needs the parent to have an onWidthChanged that calls .textResize() diff --git a/EmojiDrawer.qml b/EmojiDrawer.qml index 7bb9bba..0722bb8 100644 --- a/EmojiDrawer.qml +++ b/EmojiDrawer.qml @@ -6,7 +6,7 @@ import QtQuick.Layouts 1.3 import Qt.labs.folderlistmodel 2.13 import QtQml.Models 2.13 -import "../fonts/MutantStandard.js" as Mutant +import "fonts/MutantStandard.js" as Mutant import "controls" Item { diff --git a/HLine.qml b/HLine.qml index 33c342a..12a6741 100644 --- a/HLine.qml +++ b/HLine.qml @@ -1,5 +1,5 @@ import QtQuick 2.12 -import "../theme" +import "theme" Column { width: parent.width diff --git a/Icon.qml b/Icon.qml index 471a3a4..c8938d4 100644 --- a/Icon.qml +++ b/Icon.qml @@ -4,9 +4,9 @@ import QtQuick.Controls 2.4 import QtQuick.Controls.Material 2.0 import QtQuick.Layouts 1.3 -import "../fonts/Twemoji.js" as T +import "fonts/Twemoji.js" as T import "." as Widgets -import "../theme" +import "theme" Rectangle { id: root diff --git a/IconTextField.qml b/IconTextField.qml index a1a8018..83431b4 100644 --- a/IconTextField.qml +++ b/IconTextField.qml @@ -4,7 +4,7 @@ import QtQuick.Controls 2.13 import QtQuick.Controls.Styles 1.4 import QtGraphicalEffects 1.12 import "." as Widgets -import "../theme" +import "theme" // IconTextField integrates a text field and an icon TextField { diff --git a/InplaceEditText.qml b/InplaceEditText.qml index 6cf68c6..3f04883 100644 --- a/InplaceEditText.qml +++ b/InplaceEditText.qml @@ -3,7 +3,7 @@ import QtQuick 2.7 import QtQuick.Controls 2.4 import QtQuick.Controls.Material 2.0 import QtQuick.Layouts 1.3 -import "../widgets" as Widgets +import "widgets" as Widgets diff --git a/MyProfile.qml b/MyProfile.qml index a8937bf..0dbea35 100644 --- a/MyProfile.qml +++ b/MyProfile.qml @@ -8,8 +8,8 @@ import QtQuick.Window 2.11 import QtQuick.Controls 1.4 import "." as Widgets -import "../styles" -import "../theme" +import "styles" +import "theme" Item { id: root diff --git a/Portrait.qml b/Portrait.qml index 41728cd..49f0519 100644 --- a/Portrait.qml +++ b/Portrait.qml @@ -4,7 +4,7 @@ import QtQuick.Controls 2.4 import QtQuick.Controls.Material 2.0 import QtQuick.Layouts 1.3 import CustomQmlTypes 1.0 -import "../theme" +import "theme" Item { id: imgProfile diff --git a/PortraitRow.qml b/PortraitRow.qml index ba65e88..78b5b6e 100644 --- a/PortraitRow.qml +++ b/PortraitRow.qml @@ -4,9 +4,9 @@ import QtQuick.Controls 2.4 import QtQuick.Controls.Material 2.0 import QtQuick.Layouts 1.3 import CustomQmlTypes 1.0 -import "../styles" -import "../widgets" as Widgets -import "../theme" +import "styles" +import "widgets" as Widgets +import "theme" import QtQuick.Controls 1.4 import QtQuick.Controls.Styles 1.4 diff --git a/ScalingLabel.qml b/ScalingLabel.qml index e0471fd..e5901b0 100644 --- a/ScalingLabel.qml +++ b/ScalingLabel.qml @@ -5,7 +5,6 @@ import QtQuick.Controls.Material 2.0 import QtQuick.Layouts 1.3 import QtQuick.Window 2.11 - Label { font.pixelSize: gcd.themeScale * size wrapMode: Text.WordWrap diff --git a/Statusbar.qml b/Statusbar.qml index 38e4aaf..a72d959 100644 --- a/Statusbar.qml +++ b/Statusbar.qml @@ -2,7 +2,7 @@ import QtQuick 2.7 import QtQuick.Controls 2.4 import "." as Widgets -import "../theme" +import "theme" // Statusbar is a app wide 10-25 tall bar that should be place at the bottom of the app that gives network health information // it changes color and text/icon message based on network health. when netowrk is not healthy it is always in fullsized mode diff --git a/ToggleSwitch.qml b/ToggleSwitch.qml index 4c151aa..b7a970a 100644 --- a/ToggleSwitch.qml +++ b/ToggleSwitch.qml @@ -1,7 +1,7 @@ import QtQuick.Controls 1.4 import QtQuick.Controls.Styles 1.4 import QtQuick 2.12 -import "../theme" +import "theme" // ToggleSwtch implements a stylized toggle switch. It requires the user create a function called onToggled to // perform any additional operations needed to define the behavior of the toggle switch diff --git a/Toolbar.qml b/Toolbar.qml index 70d373d..078c60c 100644 --- a/Toolbar.qml +++ b/Toolbar.qml @@ -4,9 +4,9 @@ import QtQuick.Controls 2.4 import QtQuick.Controls.Material 2.0 import QtQuick.Layouts 1.3 -import "../fonts/Twemoji.js" as T +import "fonts/Twemoji.js" as T import "." as Widgets -import "../theme" +import "theme" Rectangle { // Global Toolbar id: toolbar diff --git a/UnderlineTextField.qml b/UnderlineTextField.qml index c5d2661..e1675c5 100644 --- a/UnderlineTextField.qml +++ b/UnderlineTextField.qml @@ -4,7 +4,7 @@ import QtQuick.Controls 2.13 import QtQuick.Controls.Styles 1.4 import QtGraphicalEffects 1.12 import "." as Widgets -import "../theme" +import "theme" // UnderlineTextField is a textfield styled as just an underline TextField {