Bugs 2692
Merge request reports
Activity
Filter activity
1 import QtQuick 2.4 changed this line in version 10 of the diff
184 onPressedBackButtonChanged: rightPanelLoader.source = "DapUiQmlScreenDialogAddWalletForm.ui.qml" 185 onPressedNextButtonForCreateWalletChanged: rightPanelLoader.source = "DapUiQmlWalletCreatedForm.ui.qml" 186 } 187 } 152 DapUiQmlWidgetRightPanel { 153 id: rightPanel 154 anchors.bottom: parent.bottom 155 anchors.top: parent.top 156 anchors.right: parent.right 157 header.initialItem: "DapUiQmlWidgetLastActionsHeaderForm.qml" 158 content.initialItem: "DapUiQmlWidgetHistoryLastActions.qml" 159 } 188 160 } 189 161 } 190 162 191 /*##^## 27 27 } 28 28 } 29 29 30 DapUiQmlWidgetLastActionsHeaderForm { 31 id: dapHeader 32 height: 36 * pt 33 anchors.left: parent.left 34 anchors.top: parent.top 35 anchors.right: parent.right 36 anchors.leftMargin: 1 * pt 37 } 30 // DapUiQmlWidgetLastActionsHeaderForm { changed this line in version 6 of the diff
1 1 import QtQuick 2.4 2 2 3 3 Rectangle { 4 width: 400 * pt 5 border.color: "#B5B5B5" 6 border.width: 1 * pt 7 color: "#EDEFF2" 8 9 anchors { 10 top: parent.top 11 right: parent.right 12 bottom: parent.bottom 13 } 4 anchors.fill: parent 5 color: "transparent" 6 // border.color: "#B5B5B5" changed this line in version 6 of the diff
1 import QtQuick 2.4 2 3 DapUiQmlWidgetRightPanelForm { 4 5 // Connections { changed this line in version 2 of the diff
31 31 } 32 32 } 33 33 34 35 34 36 // onErrorConnect: { changed this line in version 3 of the diff
enabled an automatic merge when the pipeline for dd09cdb4 succeeds
added 5 commits
-
dd09cdb4...750ba747 - 4 commits from branch
master
- 444e5b39 - Merge remote-tracking branch 'remotes/origin/master' into bugs-2692
-
dd09cdb4...750ba747 - 4 commits from branch
154 155 Rectangle { 156 id: rightPanel 157 anchors.bottom: parent.bottom 158 anchors.top: parent.top 159 anchors.right: parent.right 160 width: 400 * pt 161 162 Loader { 163 id: rightPanelLoader 164 clip: true 165 anchors.fill: parent 166 source: "DapUiQmlWidgetLastActions.qml" 167 } 168 169 Connections { 166 source: "DapUiQmlWidgetLastActions.qml" 167 } 168 169 Connections { 170 target: rectangleStatusBar 171 onAddWalletPressedChanged: rightPanelLoader.source = "DapUiQmlScreenDialogAddWalletForm.ui.qml" 172 } 173 174 Connections { 175 target: rightPanelLoader.item 176 onPressedCloseAddWalletChanged: rightPanelLoader.source = "DapUiQmlWidgetLastActions.qml" 177 onPressedDoneCreateWalletChanged: rightPanelLoader.source = "DapUiQmlWidgetLastActions.qml" 178 onPressedNextButtonChanged: { 179 if(rightPanelLoader.item.isWordsRecoveryMethodChecked) rightPanelLoader.source = "DapUiQmlRecoveryNotesForm.ui.qml"; 180 else if(rightPanelLoader.item.isQRCodeRecoveryMethodChecked) rightPanelLoader.source = "DapUiQmlRecoveryQrForm.ui.qml"; 181 else if(rightPanelLoader.item.isExportToFileRecoveryMethodChecked) console.debug("Export to file"); /*TODO: create dialog select file to export */ added 1 commit
- 6b1cddaa - [*] recovered functional for creation wallet