From 530ced4228a6297c3c72a1f39062d5e27ef91123 Mon Sep 17 00:00:00 2001
From: "littletux89@gmail.com" <littletux89@gmail.com>
Date: Thu, 12 Dec 2019 15:49:54 +0300
Subject: [PATCH] [*] Eliminated the merge conflict.
---
CellFrameDashboardGUI/qml.qrc | 7 --
.../DapUiQmlWidgetStatusBarComboBox.qml | 85 -------------------
...apUiQmlWidgetStatusBarComboBoxDelegate.qml | 27 ------
.../DapUiQmlWidgetStatusBarContentItem.qml | 11 ---
.../DapUiQmlScreenDialogAddWallet.qml | 2 -
.../DapUiQmlScreenDialogAddWalletForm.ui.qml | 15 ----
.../DapUiQmlWidgetSignatureTypeComboBox.qml | 52 ------------
.../StatusBar/DapUiQmlWidgetStatusBar.qml | 7 --
.../DapUiQmlWidgetStatusBarComboBoxWallet.qml | 20 -----
...mlWidgetStatusBarComboBoxWalletForm.ui.qml | 6 --
10 files changed, 232 deletions(-)
delete mode 100644 CellFrameDashboardGUI/screen/DapUiQmlWidgetStatusBarComboBox.qml
delete mode 100644 CellFrameDashboardGUI/screen/DapUiQmlWidgetStatusBarComboBoxDelegate.qml
delete mode 100644 CellFrameDashboardGUI/screen/DapUiQmlWidgetStatusBarContentItem.qml
delete mode 100644 CellFrameDashboardGUI/screen/LastAction/DapUiQmlWidgetSignatureTypeComboBox.qml
delete mode 100644 CellFrameDashboardGUI/screen/StatusBar/DapUiQmlWidgetStatusBarComboBoxWallet.qml
delete mode 100644 CellFrameDashboardGUI/screen/StatusBar/DapUiQmlWidgetStatusBarComboBoxWalletForm.ui.qml
diff --git a/CellFrameDashboardGUI/qml.qrc b/CellFrameDashboardGUI/qml.qrc
index e3b3644..5993bd3 100755
--- a/CellFrameDashboardGUI/qml.qrc
+++ b/CellFrameDashboardGUI/qml.qrc
@@ -43,9 +43,6 @@
<file>screen/DapUiQmlScreen.qml</file>
<file>screen/DapUiQmlScreenMainWindow.qml</file>
<file>screen/DapUiQmlScreenMainWindowForm.ui.qml</file>
- <file>screen/DapUiQmlWidgetStatusBarComboBox.qml</file>
- <file>screen/DapUiQmlWidgetStatusBarComboBoxDelegate.qml</file>
- <file>screen/DapUiQmlWidgetStatusBarContentItem.qml</file>
<file>screen/main.qml</file>
<file>screen/Console/DapUiQmlScreenConsoleForm.ui.qml</file>
<file>screen/Console/DapUiQmlWidgetConsole.qml</file>
@@ -80,8 +77,6 @@
<file>screen/LastAction/DapUiQmlWidgetRightPanel.qml</file>
<file>screen/LastAction/DapUiQmlWidgetRightPanelForm.ui.qml</file>
<file>screen/LastAction/DapUiQmlWidgetScreenDialogAddWallet.ui.qml</file>
- <file>screen/LastAction/DapUiQmlWidgetSignatureTypeComboBox.qml</file>
- <file>screen/LastAction/DapUiQmlWidgetSignatureTypeComboBox.qml</file>
<file>screen/LastAction/DapRadioButton.qml</file>
<file>screen/Log/DapUiQmlWidgetChainNodeLogs.qml</file>
<file>screen/Log/DapUiQmlWidgetChainNodeLogsForm.ui.qml</file>
@@ -92,8 +87,6 @@
<file>screen/Settings/DapUiQmlWidgetSettingsNetworkForm.ui.qml</file>
<file>screen/StatusBar/DapUiQmlWidgetStatusBar.qml</file>
<file>screen/StatusBar/DapUiQmlWidgetStatusBarButtonForm.ui.qml</file>
- <file>screen/StatusBar/DapUiQmlWidgetStatusBarComboBoxWallet.qml</file>
- <file>screen/StatusBar/DapUiQmlWidgetStatusBarComboBoxWalletForm.ui.qml</file>
<file>screen/VPN/DapUiQmlScreenVpn.qml</file>
<file>screen/VPN/DapUiQmlScreenVpnForm.ui.qml</file>
<file>screen/VPN/DapUiQmlWidgetSettingsVpn.qml</file>
diff --git a/CellFrameDashboardGUI/screen/DapUiQmlWidgetStatusBarComboBox.qml b/CellFrameDashboardGUI/screen/DapUiQmlWidgetStatusBarComboBox.qml
deleted file mode 100644
index c3e42b4..0000000
--- a/CellFrameDashboardGUI/screen/DapUiQmlWidgetStatusBarComboBox.qml
+++ /dev/null
@@ -1,85 +0,0 @@
-import QtQuick 2.0
-import QtQuick.Controls 2.5
-import QtQuick.Controls.Styles 1.4
-import QtGraphicalEffects 1.0
-
-ComboBox {
- property alias headerTextColor: headerText.color
- property alias widthArrow: arrow.width
- property alias heightArrow: arrow.height
- property alias sourceArrow: arrow.source
-
- id: customComboBox
- width: 190 * pt
- indicator: Image {
- id: arrow
- source: parent.popup.visible ? "qrc:/res/icons/ic_arrow_drop_up.png" : "qrc:/res/icons/ic_arrow_drop_down.png"
- width: 24 * pt
- height: 24 * pt
- anchors.verticalCenter: parent.verticalCenter
- anchors.right: parent.right
- anchors.rightMargin: 16 * pt
- }
-
- background: Rectangle {
- anchors.fill: parent
- color: parent.popup.visible ? "#FFFFFF" : "transparent"
- radius: 2 * pt
- }
-
- contentItem: Text {
- id: headerText
- anchors.fill: parent
- anchors.leftMargin: 12 * pt
- anchors.rightMargin: 48 * pt
- anchors.topMargin: 0 * pt
- text: parent.displayText
- font.family: fontRobotoRegular.name
- font.pixelSize: 14 * pt
- color: parent.popup.visible ? "#332F49" : "#FFFFFF"
- verticalAlignment: Text.AlignTop
- elide: Text.ElideRight
- }
-
- popup: Popup {
- y: parent.height - 1
- width: parent.width + 1
- implicitHeight: contentItem.implicitHeight
- padding: 1
-
- contentItem: ListView {
- clip: true
- implicitHeight: contentHeight
- model: customComboBox.popup.visible ? customComboBox.delegateModel : null
- currentIndex: customComboBox.highlightedIndex
-
- ScrollIndicator.vertical: ScrollIndicator { }
- }
-
- background: Rectangle {
- width: customComboBox.background.width
-
- Rectangle {
- id: contentCorner
- anchors.fill: parent
- }
-
- DropShadow {
- anchors.fill: parent
- source: contentCorner
- verticalOffset: 9 * pt
- samples: 13 * pt
- color: "#40000000"
- }
- }
- }
-
- DropShadow {
- anchors.fill: parent
- source: background
- verticalOffset: 9 * pt
- samples: 13 * pt
- color: "#40000000"
- }
-
-}
diff --git a/CellFrameDashboardGUI/screen/DapUiQmlWidgetStatusBarComboBoxDelegate.qml b/CellFrameDashboardGUI/screen/DapUiQmlWidgetStatusBarComboBoxDelegate.qml
deleted file mode 100644
index 174defb..0000000
--- a/CellFrameDashboardGUI/screen/DapUiQmlWidgetStatusBarComboBoxDelegate.qml
+++ /dev/null
@@ -1,27 +0,0 @@
-import QtQuick 2.0
-import QtQuick.Controls 2.5
-
-ItemDelegate {
- property string delegateContentText: ""
-
- width: parent.width
- height: 42 * pt
- contentItem: DapUiQmlWidgetStatusBarContentItem {
- anchors.fill: parent
- anchors.topMargin: 8 * pt
- anchors.leftMargin: 12 * pt
- anchors.rightMargin: 16 * pt
- verticalAlignment: Qt.AlignTop
- text: delegateContentText
- color: hovered ? "#FFFFFF" : "#332F49"
- }
-
- background: Rectangle {
- anchors.fill: parent
- anchors.bottomMargin: 10 * pt
- color: hovered ? "#332F49" : "#FFFFFF"
- }
-
- highlighted: parent.highlightedIndex === index
-
-}
diff --git a/CellFrameDashboardGUI/screen/DapUiQmlWidgetStatusBarContentItem.qml b/CellFrameDashboardGUI/screen/DapUiQmlWidgetStatusBarContentItem.qml
deleted file mode 100644
index e985354..0000000
--- a/CellFrameDashboardGUI/screen/DapUiQmlWidgetStatusBarContentItem.qml
+++ /dev/null
@@ -1,11 +0,0 @@
-import QtQuick 2.0
-import QtQuick.Controls 2.5
-import QtQuick.Controls.Styles 1.4
-
-Text {
- color: "#A7A7A7"
- font.family: fontRobotoRegular.name
- font.pixelSize: 14 * pt
- elide: Text.ElideRight
- verticalAlignment: Text.AlignVCenter
-}
diff --git a/CellFrameDashboardGUI/screen/LastAction/DapUiQmlScreenDialogAddWallet.qml b/CellFrameDashboardGUI/screen/LastAction/DapUiQmlScreenDialogAddWallet.qml
index 3f4e866..2b86a29 100644
--- a/CellFrameDashboardGUI/screen/LastAction/DapUiQmlScreenDialogAddWallet.qml
+++ b/CellFrameDashboardGUI/screen/LastAction/DapUiQmlScreenDialogAddWallet.qml
@@ -5,8 +5,6 @@ DapUiQmlScreenDialogAddWalletForm {
id: dialogAddWallet
focus: true
- sourceCustomArrow: popup.visible ? "qrc:/res/icons/ic_arrow_drop_up.png" : "qrc:/res/icons/icon_arrow_down.png"
-
Connections {
target: nextButton
onClicked: {
diff --git a/CellFrameDashboardGUI/screen/LastAction/DapUiQmlScreenDialogAddWalletForm.ui.qml b/CellFrameDashboardGUI/screen/LastAction/DapUiQmlScreenDialogAddWalletForm.ui.qml
index 7951d8c..e764661 100644
--- a/CellFrameDashboardGUI/screen/LastAction/DapUiQmlScreenDialogAddWalletForm.ui.qml
+++ b/CellFrameDashboardGUI/screen/LastAction/DapUiQmlScreenDialogAddWalletForm.ui.qml
@@ -5,7 +5,6 @@ import "../"
DapUiQmlScreen {
property alias nextButton: nextButton
- property alias sourceCustomArrow: comboBoxChooseSignatureType.sourceArrow
property bool isWordsRecoveryMethodChecked: selectionWords.checked
property bool isQRCodeRecoveryMethodChecked: selectionQRcode.checked
property bool isExportToFileRecoveryMethodChecked: selectionExportToFile.checked
@@ -95,20 +94,6 @@ DapUiQmlScreen {
anchors.left: parent.left
anchors.right: parent.right
anchors.top: chooseSignatureTypeTextArea.bottom
-
- DapUiQmlWidgetSignatureTypeComboBox {
- id: comboBoxChooseSignatureType
- width: 368 * pt
- height: 20 * pt
- anchors {
- verticalCenter: chooseSignatureTypeArea.verticalCenter
- fill: parent
- topMargin: 24 * pt
- bottomMargin: 24 * pt
- leftMargin: 8 * pt
- rightMargin: 32 * pt
- }
- }
}
Rectangle {
diff --git a/CellFrameDashboardGUI/screen/LastAction/DapUiQmlWidgetSignatureTypeComboBox.qml b/CellFrameDashboardGUI/screen/LastAction/DapUiQmlWidgetSignatureTypeComboBox.qml
deleted file mode 100644
index 9c6fa5d..0000000
--- a/CellFrameDashboardGUI/screen/LastAction/DapUiQmlWidgetSignatureTypeComboBox.qml
+++ /dev/null
@@ -1,52 +0,0 @@
-import QtQuick 2.0
-import QtQuick.Controls 2.5
-import QtQuick.Controls.Styles 1.4
-import "../"
-
-DapUiQmlWidgetStatusBarComboBox {
-
- model: ListModel {
- id: signatureType
- ListElement {
- signatureName: "Dilithium"
- }
- ListElement {
- signatureName: "Bliss"
- }
- ListElement {
- signatureName: "Picnic"
- }
- ListElement {
- signatureName: "Tesla"
- }
- }
-
- headerTextColor: "#070023"
- widthArrow: 20 * pt
- heightArrow: 20 * pt
-
- font {
- pointSize: 16 * pt
- family: "Roboto"
- styleName: "Normal"
- weight: Font.Normal
- }
-
- currentIndex: 0
- displayText: currentText
-
- delegate: ItemDelegate {
- width: parent.width
- contentItem: DapUiQmlWidgetStatusBarContentItem {
- text: signatureName
- color: hovered ? "#FFFFFF" : "#070023"
- }
-
- background: Rectangle {
- height: 32 * pt
- color: hovered ? "#330F54" : "#FFFFFF"
- }
-
- highlighted: parent.highlightedIndex === index
- }
-}
diff --git a/CellFrameDashboardGUI/screen/StatusBar/DapUiQmlWidgetStatusBar.qml b/CellFrameDashboardGUI/screen/StatusBar/DapUiQmlWidgetStatusBar.qml
index 1bc7287..f3f0684 100644
--- a/CellFrameDashboardGUI/screen/StatusBar/DapUiQmlWidgetStatusBar.qml
+++ b/CellFrameDashboardGUI/screen/StatusBar/DapUiQmlWidgetStatusBar.qml
@@ -30,13 +30,6 @@ Rectangle {
color: "#A7A7A7"
}
- DapUiQmlWidgetStatusBarComboBoxWallet {
- id: comboboxWallet
- anchors.top: parent.top
- anchors.bottom: parent.bottom
- fieldBalance: fieldWalletBalance
- }
-
Label {
id: titleWalletBalance
anchors.top: parent.top
diff --git a/CellFrameDashboardGUI/screen/StatusBar/DapUiQmlWidgetStatusBarComboBoxWallet.qml b/CellFrameDashboardGUI/screen/StatusBar/DapUiQmlWidgetStatusBarComboBoxWallet.qml
deleted file mode 100644
index 572e877..0000000
--- a/CellFrameDashboardGUI/screen/StatusBar/DapUiQmlWidgetStatusBarComboBoxWallet.qml
+++ /dev/null
@@ -1,20 +0,0 @@
-import QtQuick 2.4
-import QtQuick.Controls 2.5
-import QtQuick.Controls.Styles 1.4
-import QtGraphicalEffects 1.0
-import QtQml 2.13
-import "../"
-
-DapUiQmlWidgetStatusBarComboBoxWalletForm {
- property Label fieldBalance: Label {}
- model: dapWalletModel.wallets
-
- delegate: DapUiQmlWidgetStatusBarComboBoxDelegate {
- delegateContentText: modelData
- }
-
- onCurrentTextChanged: {
- dapWalletFilterModel.setWalletFilter(currentText);
-
- }
-}
diff --git a/CellFrameDashboardGUI/screen/StatusBar/DapUiQmlWidgetStatusBarComboBoxWalletForm.ui.qml b/CellFrameDashboardGUI/screen/StatusBar/DapUiQmlWidgetStatusBarComboBoxWalletForm.ui.qml
deleted file mode 100644
index 9554555..0000000
--- a/CellFrameDashboardGUI/screen/StatusBar/DapUiQmlWidgetStatusBarComboBoxWalletForm.ui.qml
+++ /dev/null
@@ -1,6 +0,0 @@
-import QtQuick 2.4
-import "../"
-
-DapUiQmlWidgetStatusBarComboBox {
-
-}
--
GitLab