forked from Public/monero-gui
Merge pull request #2876
4354a76 StandardDropdown: drop Qt 5.8 workaround (xiphon)
This commit is contained in:
@@ -53,11 +53,6 @@ Rectangle {
|
||||
ListElement { column1: "Trezor Model T"; column2: "Trezor";}
|
||||
}
|
||||
|
||||
function update(){
|
||||
// update device dropdown
|
||||
deviceNameDropdown.update();
|
||||
}
|
||||
|
||||
ColumnLayout {
|
||||
id: pageRoot
|
||||
Layout.alignment: Qt.AlignHCenter;
|
||||
@@ -208,8 +203,6 @@ Rectangle {
|
||||
|
||||
Component.onCompleted: {
|
||||
errorMsg.text = "";
|
||||
wizardCreateDevice1.update();
|
||||
console.log()
|
||||
}
|
||||
|
||||
function onPageCompleted(previousView){
|
||||
|
||||
@@ -191,6 +191,7 @@ Rectangle {
|
||||
|
||||
MoneroComponents.StandardDropdown {
|
||||
id: networkTypeDropdown
|
||||
currentIndex: persistentSettings.nettype
|
||||
dataModel: networkTypeModel
|
||||
Layout.fillWidth: true
|
||||
Layout.maximumWidth: 180
|
||||
@@ -244,11 +245,6 @@ Rectangle {
|
||||
}
|
||||
}
|
||||
|
||||
Component.onCompleted: {
|
||||
networkTypeDropdown.currentIndex = persistentSettings.nettype;
|
||||
networkTypeDropdown.update();
|
||||
}
|
||||
|
||||
function onPageCompleted(){
|
||||
wizardController.walletOptionsIsRecoveringFromDevice = false;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user