From 5cf1d6a1db7afefb053f697ea46420bd1fabc3cf Mon Sep 17 00:00:00 2001 From: erinn Date: Wed, 20 May 2020 13:49:00 -0700 Subject: [PATCH] change Widgets to Opaque in qml imports --- qml/overlays/BulletinOverlay.qml | 6 ++--- qml/overlays/ChatOverlay.qml | 10 ++++---- qml/overlays/ListOverlay.qml | 4 +-- qml/panes/AddGroupPane.qml | 8 +++--- qml/panes/GroupSettingsPane.qml | 20 +++++++-------- qml/panes/OverlayPane.qml | 12 ++++----- qml/panes/PeerSettingsPane.qml | 22 ++++++++--------- qml/panes/ProfileAddEditPane.qml | 42 ++++++++++++++++---------------- qml/panes/ProfileManagerPane.qml | 10 ++++---- qml/panes/SettingsPane.qml | 14 +++++------ qml/widgets/ContactList.qml | 4 +-- qml/widgets/ContactRow.qml | 4 +-- qml/widgets/Message.qml | 4 +-- qml/widgets/MyProfile.qml | 8 +++--- qml/widgets/ProfileList.qml | 4 +-- qml/widgets/ProfileRow.qml | 6 ++--- qml/widgets/Statusbar.qml | 6 ++--- 17 files changed, 92 insertions(+), 92 deletions(-) diff --git a/qml/overlays/BulletinOverlay.qml b/qml/overlays/BulletinOverlay.qml index 4f2382fe..4be09d70 100644 --- a/qml/overlays/BulletinOverlay.qml +++ b/qml/overlays/BulletinOverlay.qml @@ -6,7 +6,7 @@ import QtQuick.Controls 1.4 import QtQuick.Layouts 1.3 -import "../opaque" as Widgets +import "../opaque" as Opaque import "../opaque/fonts/Twemoji.js" as T import "../opaque/styles" import "../utils.js" as Utils @@ -175,7 +175,7 @@ ColumnLayout { width: parent.width - 50 } - Widgets.Button { + Opaque.Button { id: replybtn visible: selected text: "reply" @@ -230,7 +230,7 @@ ColumnLayout { } - Widgets.Button { // SEND MESSAGE BUTTON + Opaque.Button { // SEND MESSAGE BUTTON id: btnSend icon: "regular/paper-plane" text: "post" diff --git a/qml/overlays/ChatOverlay.qml b/qml/overlays/ChatOverlay.qml index b380b3c4..2d0f34a2 100644 --- a/qml/overlays/ChatOverlay.qml +++ b/qml/overlays/ChatOverlay.qml @@ -4,7 +4,7 @@ import QtQuick.Controls 2.4 import QtQuick.Controls.Material 2.0 import QtQuick.Layouts 1.3 -import "../opaque" as Widgets +import "../opaque" as Opaque import "../opaque/controls" as Awesome import "../opaque/fonts/Twemoji.js" as T import "../utils.js" as Utils @@ -129,7 +129,7 @@ Item { } } - Widgets.EmojiDrawer { + Opaque.EmojiDrawer { id: emojiDrawer anchors.left: parent.left anchors.right: parent.right @@ -266,7 +266,7 @@ Item { spacing: 1 - Widgets.Button { // SEND MESSAGE BUTTON + Opaque.Button { // SEND MESSAGE BUTTON id: btnSend icon: "regular/paper-plane" text: "send" @@ -302,7 +302,7 @@ Item { spacing: 1 - Widgets.Button { // EMOJI DRAWER BUTTON + Opaque.Button { // EMOJI DRAWER BUTTON id: btnEmoji icon: "regular/smile" anchors.right: btnAttach.left @@ -311,7 +311,7 @@ Item { onClicked: emojiDrawer.visible ? emojiDrawer.slideclosed() : emojiDrawer.slideopen() } - Widgets.Button { + Opaque.Button { id: btnAttach icon: "solid/paperclip" anchors.right: parent.right diff --git a/qml/overlays/ListOverlay.qml b/qml/overlays/ListOverlay.qml index 374914c5..0ed706ce 100644 --- a/qml/overlays/ListOverlay.qml +++ b/qml/overlays/ListOverlay.qml @@ -5,7 +5,7 @@ import QtQuick.Controls.Material 2.0 import QtQuick.Controls 1.4 import QtQuick.Layouts 1.3 -import "../opaque" as Widgets +import "../opaque" as Opaque import "../opaque/controls" as Awesome import "../opaque/fonts/Twemoji.js" as T import "../utils.js" as Utils @@ -204,7 +204,7 @@ ColumnLayout { style: CwtchTextFieldStyle{} } - Widgets.Button { // SEND MESSAGE BUTTON + Opaque.Button { // SEND MESSAGE BUTTON id: btnSend icon: "regular/paper-plane" text: "add" diff --git a/qml/panes/AddGroupPane.qml b/qml/panes/AddGroupPane.qml index 93b5bb6e..78b5f6b2 100644 --- a/qml/panes/AddGroupPane.qml +++ b/qml/panes/AddGroupPane.qml @@ -6,7 +6,7 @@ import QtQuick.Layouts 1.3 import QtQuick.Window 2.11 import QtQuick.Controls 1.4 -import "../opaque" as Widgets +import "../opaque" as Opaque import "../opaque/styles" ColumnLayout { // settingsPane @@ -26,7 +26,7 @@ ColumnLayout { // settingsPane spacing: 5 width: root.width - Widgets.ScalingLabel { + Opaque.ScalingLabel { //: Server label text: qsTr("server-label") + ":" } @@ -37,7 +37,7 @@ ColumnLayout { // settingsPane text: "2c3kmoobnyghj2zw6pwv7d57yzld753auo3ugauezzpvfak3ahc4bdyd" } - Widgets.ScalingLabel{ + Opaque.ScalingLabel{ //: Group name label text: qsTr("group-name-label") + ":" } @@ -49,7 +49,7 @@ ColumnLayout { // settingsPane text: qsTr("default-group-name") } - Widgets.Button { + Opaque.Button { //: create group button text: qsTr("create-group-btn") diff --git a/qml/panes/GroupSettingsPane.qml b/qml/panes/GroupSettingsPane.qml index a0ee9fca..d7ece6c2 100644 --- a/qml/panes/GroupSettingsPane.qml +++ b/qml/panes/GroupSettingsPane.qml @@ -6,7 +6,7 @@ import QtQuick.Layouts 1.3 import QtQuick.Window 2.11 import QtQuick.Controls 1.4 -import "../opaque" as Widgets +import "../opaque" as Opaque import "../opaque/styles" import "../utils.js" as Utils @@ -29,7 +29,7 @@ ColumnLayout { // groupSettingsPane leftPadding: 10 spacing: 5 - Widgets.ScalingLabel { + Opaque.ScalingLabel { text: qsTr("server-label") + ":" } @@ -39,7 +39,7 @@ ColumnLayout { // groupSettingsPane readOnly: true } - Widgets.Button { + Opaque.Button { icon: "regular/clipboard" text: qsTr("copy-btn") @@ -50,7 +50,7 @@ ColumnLayout { // groupSettingsPane } } - Widgets.ScalingLabel { + Opaque.ScalingLabel { text: qsTr("invitation-label") + ":" } @@ -60,7 +60,7 @@ ColumnLayout { // groupSettingsPane readOnly: true } - Widgets.Button { + Opaque.Button { icon: "regular/clipboard" text: qsTr("copy-btn") @@ -71,7 +71,7 @@ ColumnLayout { // groupSettingsPane } } - Widgets.ScalingLabel{ + Opaque.ScalingLabel{ text: qsTr("group-name-label") + ":" } @@ -80,7 +80,7 @@ ColumnLayout { // groupSettingsPane style: CwtchTextFieldStyle{ width: tehcol.width * 0.8 } } - Widgets.Button { + Opaque.Button { text: qsTr("save-btn") onClicked: { @@ -91,7 +91,7 @@ ColumnLayout { // groupSettingsPane } //: Invite someone to the group - Widgets.ScalingLabel { text: qsTr("invite-to-group-label") } + Opaque.ScalingLabel { text: qsTr("invite-to-group-label") } ComboBox { id: cbInvite @@ -101,7 +101,7 @@ ColumnLayout { // groupSettingsPane style: CwtchComboBoxStyle{} } - Widgets.Button { + Opaque.Button { text: qsTr("invite-btn") onClicked: { @@ -109,7 +109,7 @@ ColumnLayout { // groupSettingsPane } } - Widgets.Button { + Opaque.Button { icon: "regular/trash-alt" text: qsTr("delete-btn") diff --git a/qml/panes/OverlayPane.qml b/qml/panes/OverlayPane.qml index 296ca16b..453899cb 100644 --- a/qml/panes/OverlayPane.qml +++ b/qml/panes/OverlayPane.qml @@ -4,7 +4,7 @@ import QtQuick.Controls 2.4 import QtQuick.Controls.Material 2.0 import QtQuick.Layouts 1.3 -import "../opaque" as Widgets +import "../opaque" as Opaque import "../opaque/styles" import "../overlays" @@ -24,7 +24,7 @@ ColumnLayout { text: qsTr("accept-group-invite-label") + " " + overlay.name + "?" } - Widgets.Button { + Opaque.Button { //: Accept group invite button text: qsTr("accept-group-btn") icon: "regular/heart" @@ -34,7 +34,7 @@ ColumnLayout { } } - Widgets.Button { + Opaque.Button { //: Reject Group invite button text: qsTr("reject-group-btn") icon: "regular/trash-alt" @@ -49,21 +49,21 @@ ColumnLayout { id: switcher - Widgets.Button { + Opaque.Button { text: qsTr("chat-btn") onClicked: overlayStack.overlay = overlayStack.chatOverlay } - Widgets.Button { + Opaque.Button { text: qsTr("lists-btn") onClicked: overlayStack.overlay = overlayStack.listOverlay } - Widgets.Button { + Opaque.Button { text: qsTr("bulletins-btn") diff --git a/qml/panes/PeerSettingsPane.qml b/qml/panes/PeerSettingsPane.qml index 866552d3..d9f39dbf 100644 --- a/qml/panes/PeerSettingsPane.qml +++ b/qml/panes/PeerSettingsPane.qml @@ -7,7 +7,7 @@ import QtQuick.Window 2.11 import QtQuick.Controls 1.4 import QtQuick.Controls.Styles 1.4 -import "../opaque" as Widgets +import "../opaque" as Opaque import "../opaque/styles" import "../opaque/theme" @@ -32,7 +32,7 @@ ColumnLayout { // peerSettingsPane columns: 1 width:parent.width * 0.95 anchors.horizontalCenter: parent.horizontalCenter - Widgets.EllipsisLabel { + Opaque.EllipsisLabel { anchors.left:parent.left color: Theme.mainTextColor text: qsTr("address-label") @@ -40,7 +40,7 @@ ColumnLayout { // peerSettingsPane font.pointSize: 15 * gcd.themeScale } - Widgets.ButtonTextField { + Opaque.ButtonTextField { id: txtOnion anchors.left:parent.left anchors.right:parent.right @@ -56,13 +56,13 @@ ColumnLayout { // peerSettingsPane } } - Widgets.HLine{} + Opaque.HLine{} GridLayout { columns: 1 width:parent.width * 0.95 anchors.horizontalCenter: parent.horizontalCenter - Widgets.EllipsisLabel { + Opaque.EllipsisLabel { anchors.left:parent.left color: Theme.mainTextColor text: qsTr("display-name-label") @@ -71,7 +71,7 @@ ColumnLayout { // peerSettingsPane } - Widgets.ButtonTextField { + Opaque.ButtonTextField { id: txtDisplayName anchors.left:parent.left anchors.right:parent.right @@ -86,21 +86,21 @@ ColumnLayout { // peerSettingsPane } - Widgets.HLine{} + Opaque.HLine{} GridLayout { columns: 2 width:parent.width * 0.95 anchors.horizontalCenter: parent.horizontalCenter - Widgets.EllipsisLabel { + Opaque.EllipsisLabel { color: Theme.mainTextColor text: qsTr("block-btn") font.styleName: "ExtraBold" font.pointSize: 15 * gcd.themeScale } - Widgets.ToggleSwitch { + Opaque.ToggleSwitch { isToggled: root.blocked // ? qsTr("unblock-btn") : qsTr("block-btn") anchors.right: parent.right onToggled: function() { @@ -117,11 +117,11 @@ ColumnLayout { // peerSettingsPane } - Widgets.HLine{} + Opaque.HLine{} Column { width:parent.width * 0.95 anchors.horizontalCenter: parent.horizontalCenter - Widgets.Button { + Opaque.Button { icon: "regular/trash-alt" text: qsTr("delete-btn") anchors.right: parent.right diff --git a/qml/panes/ProfileAddEditPane.qml b/qml/panes/ProfileAddEditPane.qml index 4e786fce..3f1154e8 100644 --- a/qml/panes/ProfileAddEditPane.qml +++ b/qml/panes/ProfileAddEditPane.qml @@ -6,7 +6,7 @@ import QtQuick.Layouts 1.3 import QtQuick.Window 2.11 -import "../opaque" as Widgets +import "../opaque" as Opaque // import "../styles" ColumnLayout { // Add Profile Pane @@ -71,23 +71,23 @@ ColumnLayout { // Add Profile Pane spacing: 5 width: profileAddEditPane.width - Widgets.ScalingLabel { + Opaque.ScalingLabel { //: Onion text: qsTr("profile-onion-label") + ":" visible: mode == "edit" } - Widgets.ScalingLabel { + Opaque.ScalingLabel { id: onionLabel visible: mode == "edit" } - Widgets.ScalingLabel { + Opaque.ScalingLabel { //: Display name text: qsTr("profile-name") + ":" } - Widgets.TextField { + Opaque.TextField { id: txtProfileName Layout.fillWidth: true //style: CwtchTextFieldStyle{ width: tehcol.width * 0.8 } @@ -100,7 +100,7 @@ ColumnLayout { // Add Profile Pane RowLayout { //id: radioButtons - Widgets.RadioButton { + Opaque.RadioButton { id: radioUsePassword checked: true //: Password @@ -111,7 +111,7 @@ ColumnLayout { // Add Profile Pane } } - Widgets.RadioButton { + Opaque.RadioButton { id: radioNoPassword //: Unencrypted (No password) text: qsTr("radio-no-password") @@ -122,35 +122,35 @@ ColumnLayout { // Add Profile Pane } } - Widgets.ScalingLabel { + Opaque.ScalingLabel { id: noPasswordLabel //: Not using a password on this account means that all data stored locally will not be encrypted text: qsTr("no-password-warning") visible: radioNoPassword.checked } - Widgets.ScalingLabel { + Opaque.ScalingLabel { id: currentPasswordLabel //: Current Password text: qsTr("current-password-label") + ":" visible: radioUsePassword.checked && mode == "edit" && tag != "v1-defaultPassword" } - Widgets.TextField { + Opaque.TextField { id: txtCurrentPassword Layout.fillWidth: true echoMode: TextInput.Password visible: radioUsePassword.checked && mode == "edit" && tag != "v1-defaultPassword" } - Widgets.ScalingLabel { + Opaque.ScalingLabel { id: passwordLabel //: Password text: qsTr("password1-label") + ":" visible: radioUsePassword.checked } - Widgets.TextField { + Opaque.TextField { id: txtPassword1 Layout.fillWidth: true //style: CwtchTextFieldStyle{ width: tehcol.width * 0.8 } @@ -163,14 +163,14 @@ ColumnLayout { // Add Profile Pane } - Widgets.ScalingLabel { + Opaque.ScalingLabel { id: passwordReLabel //: Reenter password text: qsTr("password2-label") + ":" visible: radioUsePassword.checked } - Widgets.TextField { + Opaque.TextField { id: txtPassword2 Layout.fillWidth: true //style: CwtchTextFieldStyle{ width: tehcol.width * 0.8 } @@ -178,7 +178,7 @@ ColumnLayout { // Add Profile Pane visible: radioUsePassword.checked } - Widgets.Button { // ADD or SAVE button + Opaque.Button { // ADD or SAVE button //: Create Profile || Save Profile text: mode == "add" ? qsTr("create-profile-btn") : qsTr("save-profile-btn") @@ -209,7 +209,7 @@ ColumnLayout { // Add Profile Pane } } - Widgets.ScalingLabel { + Opaque.ScalingLabel { id: passwordErrorLabel //: Passwords do not match text: qsTr("password-error-match") @@ -217,7 +217,7 @@ ColumnLayout { // Add Profile Pane color: "red" } - Widgets.ScalingLabel { + Opaque.ScalingLabel { id: passwordChangeErrorLabel //: Error changing password: Supplied password rejected text: qsTr("password-change-error") @@ -227,7 +227,7 @@ ColumnLayout { // Add Profile Pane // ***** Delete button and confirm flow ***** - Widgets.Button { + Opaque.Button { //: Delete Profile text: qsTr("delete-profile-btn") icon: "regular/trash-alt" @@ -239,21 +239,21 @@ ColumnLayout { // Add Profile Pane } } - Widgets.ScalingLabel { + Opaque.ScalingLabel { id: deleteConfirmLabel //: Type DELETE to confirm text: qsTr("delete-confirm-label")+ ":" visible: deleting } - Widgets.TextField { + Opaque.TextField { id: confirmDeleteTxt Layout.fillWidth: true //style: CwtchTextFieldStyle{ width: tehcol.width * 0.8 } visible: deleting } - Widgets.Button { + Opaque.Button { id: confirmDeleteBtn icon: "regular/trash-alt" diff --git a/qml/panes/ProfileManagerPane.qml b/qml/panes/ProfileManagerPane.qml index dbb23cc3..9447004a 100644 --- a/qml/panes/ProfileManagerPane.qml +++ b/qml/panes/ProfileManagerPane.qml @@ -10,7 +10,7 @@ import QtQuick.Controls.Styles 1.4 import "../widgets" -import "../opaque" as Widgets +import "../opaque" as Opaque import "../opaque/controls" import "../opaque/styles" import "../opaque/theme" @@ -22,14 +22,14 @@ ColumnLayout { //leftPadding: 10 //spacing: 5 - Widgets.ScalingLabel { + Opaque.ScalingLabel { anchors.horizontalCenter: parent.horizontalCenter wrapMode: TextEdit.Wrap //: Please enter password: text: qsTr("enter-profile-password")+":" } - Widgets.UnderlineTextField { + Opaque.UnderlineTextField { id: txtPassword anchors.horizontalCenter: parent.horizontalCenter Layout.fillWidth: true @@ -40,7 +40,7 @@ ColumnLayout { onAccepted: button.clicked() } - Widgets.ScalingLabel { + Opaque.ScalingLabel { id: error anchors.horizontalCenter: parent.horizontalCenter color: "red" @@ -49,7 +49,7 @@ ColumnLayout { visible: false } - Widgets.Button { + Opaque.Button { id: "button" anchors.horizontalCenter: parent.horizontalCenter diff --git a/qml/panes/SettingsPane.qml b/qml/panes/SettingsPane.qml index 7906b5e0..91f48e2d 100644 --- a/qml/panes/SettingsPane.qml +++ b/qml/panes/SettingsPane.qml @@ -7,7 +7,7 @@ import QtQuick.Window 2.11 import QtQuick.Controls 1.4 import QtQuick.Controls.Styles 1.4 -import "../opaque" as Widgets +import "../opaque" as Opaque import "../opaque/controls" ColumnLayout { // settingsPane @@ -28,14 +28,14 @@ ColumnLayout { // settingsPane spacing: 5 width: root.width - Widgets.ScalingLabel { + Opaque.ScalingLabel { width: parent.width wrapMode: TextEdit.Wrap //: Version: %1 Built on: %2 text: qsTr("version %1 builddate %2").arg(gcd.version).arg(gcd.buildDate) } - Widgets.ScalingLabel { + Opaque.ScalingLabel { width: parent.width wrapMode: TextEdit.Wrap //: Interface zoom (mostly affects text and button sizes) @@ -67,26 +67,26 @@ ColumnLayout { // settingsPane } } style: CheckBoxStyle { - label: Widgets.ScalingLabel { + label: Opaque.ScalingLabel { text: qsTr("block-unknown-label") } } } - Widgets.ScalingLabel { + Opaque.ScalingLabel { wrapMode: TextEdit.Wrap text: qsTr("large-text-label") size: 20 } - Widgets.ScalingLabel{ + Opaque.ScalingLabel{ width: parent.width wrapMode: TextEdit.Wrap //: "Default size text (scale factor: " text: qsTr("default-scaling-text") + " " + Math.round(zoomSlider.value * 100) / 100 + ")" } - Widgets.ScalingLabel { + Opaque.ScalingLabel { text: qsTr("small-text-label") size: 8 } diff --git a/qml/widgets/ContactList.qml b/qml/widgets/ContactList.qml index 01168889..6420d707 100644 --- a/qml/widgets/ContactList.qml +++ b/qml/widgets/ContactList.qml @@ -4,7 +4,7 @@ import QtQuick.Controls 2.4 import QtQuick.Controls.Material 2.0 import QtQuick.Layouts 1.3 -import "../opaque" as Widgets +import "../opaque" as Opaque import "../opaque/theme" ColumnLayout { @@ -27,7 +27,7 @@ ColumnLayout { } - Widgets.IconTextField { + Opaque.IconTextField { id: searchAddText anchors.horizontalCenter: parent.horizontalCenter diff --git a/qml/widgets/ContactRow.qml b/qml/widgets/ContactRow.qml index 9ac34c2f..061fe130 100644 --- a/qml/widgets/ContactRow.qml +++ b/qml/widgets/ContactRow.qml @@ -7,11 +7,11 @@ import CustomQmlTypes 1.0 import QtQuick.Controls 1.4 import QtQuick.Controls.Styles 1.4 -import "../opaque" as Widgets +import "../opaque" as Opaque import "../opaque/styles" import "../opaque/theme" -Widgets.PortraitRow { +Opaque.PortraitRow { property int status: 0 property int badge property bool loading diff --git a/qml/widgets/Message.qml b/qml/widgets/Message.qml index af4d7709..10ea3911 100644 --- a/qml/widgets/Message.qml +++ b/qml/widgets/Message.qml @@ -4,7 +4,7 @@ import QtQuick.Controls 2.4 import QtQuick.Controls.Material 2.0 import QtQuick.Layouts 1.3 -import "../opaque" as Widgets +import "../opaque" as Opaque import "../opaque/controls" as Awesome Item { @@ -43,7 +43,7 @@ Item { } - Widgets.Portrait { + Opaque.Portrait { id: imgProfile anchors.left: parent.left // TODO: currently unused? diff --git a/qml/widgets/MyProfile.qml b/qml/widgets/MyProfile.qml index 5fcf436f..8a9b8898 100644 --- a/qml/widgets/MyProfile.qml +++ b/qml/widgets/MyProfile.qml @@ -7,7 +7,7 @@ import QtQuick.Layouts 1.3 import QtQuick.Window 2.11 import QtQuick.Controls 1.4 -import "../opaque" as Widgets +import "../opaque" as Opaque import "../opaque/styles" import "../opaque/theme" @@ -78,7 +78,7 @@ Item { id: profile color: Theme.backgroundMainColor - Widgets.Portrait { + Opaque.Portrait { id: portrait source: root.image @@ -105,7 +105,7 @@ Item { id: nameCenter width: name.width + addBtn.width - Widgets.EllipsisLabel { + Opaque.EllipsisLabel { id: name anchors.right: undefined @@ -119,7 +119,7 @@ Item { container: nameRow } - Widgets.Button { // Add Button + Opaque.Button { // Add Button id: addBtn anchors.left: name.right diff --git a/qml/widgets/ProfileList.qml b/qml/widgets/ProfileList.qml index da8c7f1c..1a65846c 100644 --- a/qml/widgets/ProfileList.qml +++ b/qml/widgets/ProfileList.qml @@ -4,7 +4,7 @@ import QtQuick.Controls 2.4 import QtQuick.Controls.Material 2.0 import QtQuick.Layouts 1.3 -import "../opaque" as Widgets +import "../opaque" as Opaque import "../opaque/theme" ColumnLayout { @@ -103,7 +103,7 @@ ColumnLayout { } } - Widgets.PortraitRow { + Opaque.PortraitRow { handle: "" displayName: qsTr("add-new-profile-btn") nameColor: Theme.mainTextColor diff --git a/qml/widgets/ProfileRow.qml b/qml/widgets/ProfileRow.qml index 0479ef3b..03fd71db 100644 --- a/qml/widgets/ProfileRow.qml +++ b/qml/widgets/ProfileRow.qml @@ -7,11 +7,11 @@ import CustomQmlTypes 1.0 import QtQuick.Controls 1.4 import QtQuick.Controls.Styles 1.4 -import "../opaque" as Widgets +import "../opaque" as Opaque import "../opaque/styles" import "../opaque/theme" -Widgets.PortraitRow { +Opaque.PortraitRow { badgeColor: Theme.portraitProfileBadgeColor portraitBorderColor: Theme.portraitOnlineBorderColor @@ -26,7 +26,7 @@ Widgets.PortraitRow { width: height } - Widgets.Button {// Edit BUTTON + Opaque.Button {// Edit BUTTON id: btnEdit icon: "solid/user-edit" diff --git a/qml/widgets/Statusbar.qml b/qml/widgets/Statusbar.qml index 9b708e11..e1dfa0c0 100644 --- a/qml/widgets/Statusbar.qml +++ b/qml/widgets/Statusbar.qml @@ -1,7 +1,7 @@ import QtQuick 2.7 import QtQuick.Controls 2.4 -import "../opaque" as Widgets +import "../opaque" as Opaque import "../opaque/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 @@ -37,7 +37,7 @@ Rectangle { font.pixelSize: Theme.statusTextSize * gcd.themeScale } - Widgets.Icon { + Opaque.Icon { id: networkStatus opacity: 0 anchors.right: connectionStatus.left @@ -48,7 +48,7 @@ Rectangle { } - Widgets.Icon { + Opaque.Icon { id: connectionStatus opacity: 0 anchors.right: parent.right