Browse Source

move reusable controls into controls/ subdir

patch-4
Sander van Grieken 3 years ago
parent
commit
6cb3a07500
  1. 2
      electrum/gui/qml/components/OpenWallet.qml
  2. 2
      electrum/gui/qml/components/Receive.qml
  3. 2
      electrum/gui/qml/components/Scan.qml
  4. 2
      electrum/gui/qml/components/Wallets.qml
  5. 2
      electrum/gui/qml/components/controls/InfoTextArea.qml
  6. 0
      electrum/gui/qml/components/controls/MessageDialog.qml
  7. 0
      electrum/gui/qml/components/controls/MessagePane.qml
  8. 0
      electrum/gui/qml/components/controls/NotificationPopup.qml
  9. 7
      electrum/gui/qml/components/controls/PaneInsetBackground.qml
  10. 0
      electrum/gui/qml/components/controls/QRScan.qml
  11. 0
      electrum/gui/qml/components/controls/SeedTextArea.qml
  12. 2
      electrum/gui/qml/components/main.qml
  13. 1
      electrum/gui/qml/components/wizard/WCAutoConnect.qml
  14. 1
      electrum/gui/qml/components/wizard/WCBIP39Refine.qml
  15. 1
      electrum/gui/qml/components/wizard/WCConfirmSeed.qml
  16. 1
      electrum/gui/qml/components/wizard/WCCreateSeed.qml
  17. 1
      electrum/gui/qml/components/wizard/WCHaveSeed.qml

2
electrum/gui/qml/components/OpenWallet.qml

@ -4,6 +4,8 @@ import QtQuick.Controls 2.1
import org.electrum 1.0
import "controls"
Pane {
id: openwalletdialog

2
electrum/gui/qml/components/Receive.qml

@ -6,6 +6,8 @@ import QtQml.Models 2.1
import org.electrum 1.0
import "controls"
Pane {
id: rootItem
visible: Daemon.currentWallet !== undefined

2
electrum/gui/qml/components/Scan.qml

@ -3,6 +3,8 @@ import QtQuick.Controls 2.0
import org.electrum 1.0
import "controls"
Item {
id: scanPage
property string title: qsTr('Scan')

2
electrum/gui/qml/components/Wallets.qml

@ -5,6 +5,8 @@ import QtQuick.Controls.Material 2.0
import org.electrum 1.0
import "controls"
Pane {
id: rootItem

2
electrum/gui/qml/components/InfoTextArea.qml → electrum/gui/qml/components/controls/InfoTextArea.qml

@ -37,7 +37,7 @@ GridLayout {
}
Image {
source: iconStyle == InfoTextArea.IconStyle.Info ? "../../icons/info.png" : InfoTextArea.IconStyle.Warn ? "../../icons/warning.png" : InfoTextArea.IconStyle.Error ? "../../icons/expired.png" : ""
source: iconStyle == InfoTextArea.IconStyle.Info ? "../../../icons/info.png" : InfoTextArea.IconStyle.Warn ? "../../../icons/warning.png" : InfoTextArea.IconStyle.Error ? "../../../icons/expired.png" : ""
anchors.left: parent.left
anchors.top: parent.top
anchors.leftMargin: 16

0
electrum/gui/qml/components/MessageDialog.qml → electrum/gui/qml/components/controls/MessageDialog.qml

0
electrum/gui/qml/components/MessagePane.qml → electrum/gui/qml/components/controls/MessagePane.qml

0
electrum/gui/qml/components/NotificationPopup.qml → electrum/gui/qml/components/controls/NotificationPopup.qml

7
electrum/gui/qml/components/PaneInsetBackground.qml → electrum/gui/qml/components/controls/PaneInsetBackground.qml

@ -23,11 +23,4 @@ Rectangle {
color: Qt.lighter(Material.background, 1.50)
}
color: Qt.darker(Material.background, 1.15)
Image {
source: '../../icons/electrum_lightblue.svg'
anchors.centerIn: parent
sourceSize.width: 128
sourceSize.height: 128
opacity: 0.1
}
}

0
electrum/gui/qml/components/QRScan.qml → electrum/gui/qml/components/controls/QRScan.qml

0
electrum/gui/qml/components/SeedTextArea.qml → electrum/gui/qml/components/controls/SeedTextArea.qml

2
electrum/gui/qml/components/main.qml

@ -6,6 +6,8 @@ import QtQuick.Controls.Material 2.0
import QtQml 2.6
import QtMultimedia 5.6
import "controls"
ApplicationWindow
{
id: app

1
electrum/gui/qml/components/wizard/WCAutoConnect.qml

@ -2,6 +2,7 @@ import QtQuick.Layouts 1.0
import QtQuick.Controls 2.1
import ".."
import "../controls"
WizardComponent {
valid: true

1
electrum/gui/qml/components/wizard/WCBIP39Refine.qml

@ -5,6 +5,7 @@ import QtQuick.Controls 2.1
import org.electrum 1.0
import ".."
import "../controls"
WizardComponent {
valid: false

1
electrum/gui/qml/components/wizard/WCConfirmSeed.qml

@ -5,6 +5,7 @@ import QtQuick.Controls 2.1
import org.electrum 1.0
import ".."
import "../controls"
WizardComponent {
valid: false

1
electrum/gui/qml/components/wizard/WCCreateSeed.qml

@ -5,6 +5,7 @@ import QtQuick.Controls 2.1
import org.electrum 1.0
import ".."
import "../controls"
WizardComponent {
valid: seedtext.text != ''

1
electrum/gui/qml/components/wizard/WCHaveSeed.qml

@ -6,6 +6,7 @@ import QtQuick.Controls.Material 2.0
import org.electrum 1.0
import ".."
import "../controls"
WizardComponent {
id: root

Loading…
Cancel
Save