mirror of
https://github.com/monero-project/monero-gui
synced 2024-12-25 01:53:43 +01:00
Merge pull request #2876
4354a76
StandardDropdown: drop Qt 5.8 workaround (xiphon)
This commit is contained in:
commit
aa5000f556
@ -58,11 +58,6 @@ Item {
|
||||
|
||||
onExpandedChanged: if(expanded) appWindow.currentItem = dropdown
|
||||
|
||||
// Workaroud for suspected memory leak in 5.8 causing malloc crash on app exit
|
||||
function update() {
|
||||
firstColText.text = columnid.currentIndex < repeater.model.rowCount() ? qsTr(repeater.model.get(columnid.currentIndex).column1) + translationManager.emptyString : ""
|
||||
}
|
||||
|
||||
Item {
|
||||
id: head
|
||||
anchors.left: parent.left
|
||||
@ -80,7 +75,6 @@ Item {
|
||||
}
|
||||
|
||||
MoneroComponents.TextPlain {
|
||||
id: firstColText
|
||||
anchors.verticalCenter: parent.verticalCenter
|
||||
anchors.left: parent.left
|
||||
anchors.leftMargin: 12
|
||||
@ -91,6 +85,7 @@ Item {
|
||||
font.bold: dropdown.headerFontBold
|
||||
font.pixelSize: dropdown.fontHeaderSize
|
||||
color: dropdown.textColor
|
||||
text: columnid.currentIndex < repeater.model.count ? qsTr(repeater.model.get(columnid.currentIndex).column1) + translationManager.emptyString : ""
|
||||
}
|
||||
|
||||
Item {
|
||||
@ -217,7 +212,6 @@ Item {
|
||||
popup.close()
|
||||
columnid.currentIndex = index
|
||||
changed();
|
||||
dropdown.update()
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@ -118,7 +118,6 @@ Rectangle {
|
||||
amountLine.text = ""
|
||||
setDescription("");
|
||||
priorityDropdown.currentIndex = 0
|
||||
updatePriorityDropdown()
|
||||
}
|
||||
|
||||
// Information dialog
|
||||
@ -397,6 +396,7 @@ Rectangle {
|
||||
id: priorityDropdown
|
||||
Layout.topMargin: 5
|
||||
currentIndex: 0
|
||||
dataModel: priorityModelV5
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -745,12 +745,6 @@ Rectangle {
|
||||
function onPageCompleted() {
|
||||
console.log("transfer page loaded")
|
||||
updateStatus();
|
||||
updatePriorityDropdown()
|
||||
}
|
||||
|
||||
function updatePriorityDropdown() {
|
||||
priorityDropdown.dataModel = priorityModelV5;
|
||||
priorityDropdown.update()
|
||||
}
|
||||
|
||||
//TODO: Add daemon sync status
|
||||
|
@ -196,6 +196,7 @@ Rectangle {
|
||||
MoneroComponents.StandardDropdown {
|
||||
id: fiatPriceCurrencyDropdown
|
||||
Layout.fillWidth: true
|
||||
currentIndex: persistentSettings.fiatPriceCurrency === "xmrusd" ? 0 : 1
|
||||
dataModel: fiatPriceCurrencyModel
|
||||
onChanged: {
|
||||
var obj = dataModel.get(currentIndex);
|
||||
@ -281,10 +282,6 @@ Rectangle {
|
||||
i += 1;
|
||||
}
|
||||
|
||||
fiatPriceProviderDropDown.update();
|
||||
fiatPriceCurrencyDropdown.currentIndex = persistentSettings.fiatPriceCurrency === "xmrusd" ? 0 : 1;
|
||||
fiatPriceCurrencyDropdown.update();
|
||||
|
||||
console.log('SettingsLayout loaded');
|
||||
}
|
||||
}
|
||||
|
@ -231,9 +231,6 @@ Rectangle {
|
||||
}
|
||||
|
||||
Component.onCompleted: {
|
||||
logLevelDropdown.currentIndex = appWindow.persistentSettings.logLevel;
|
||||
logLevelDropdown.update();
|
||||
|
||||
if(typeof daemonManager != "undefined")
|
||||
daemonManager.daemonConsoleUpdated.connect(onDaemonConsoleUpdated)
|
||||
}
|
||||
|
@ -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;
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user