Fix missing changes

This commit is contained in:
woblight
2019-12-01 22:44:45 +01:00
parent d5550336ca
commit ce9b720578
2 changed files with 41 additions and 14 deletions
+4
View File
@@ -48,6 +48,10 @@ Pane {
ToolTip.visible: hovered ToolTip.visible: hovered
ToolTip.text: qsTr("Choose the folder containing the addons") ToolTip.text: qsTr("Choose the folder containing the addons")
} }
Button {
icon.name: "delete"
onClicked: Engine.setAddonsPath(index)
}
} }
} }
Button { Button {
+37 -14
View File
@@ -224,25 +224,34 @@ ApplicationWindow {
id: addDialog id: addDialog
title: "Clone Repository" title: "Clone Repository"
standardButtons: Dialog.Ok | Dialog.Cancel standardButtons: Dialog.Ok | Dialog.Cancel
RowLayout { ColumnLayout {
anchors.fill: parent anchors.fill: parent
TextField { RowLayout {
Layout.fillWidth: true TextField {
id: addField Layout.fillWidth: true
placeholderText: "Git clone url" id: addField
onAccepted: addDialog.accept() placeholderText: "Git clone url"
focus: visible onAccepted: addDialog.accept()
focus: visible
}
ToolButton {
id: cloneHelpBtn
icon.name: "help-whatsthis"
onClicked: cloneHelpDialog.visible = true
}
} }
ToolButton { ComboBox {
id: cloneHelpBtn id: pathChooser
icon.name: "help-whatsthis" visible: Engine.addonsPaths.length > 1
onClicked: cloneHelpDialog.visible = true model: Engine.addonsPaths
currentIndex: 1
Layout.fillWidth: true
} }
} }
focus: visible focus: visible
modal: true modal: true
onAccepted: { onAccepted: {
Engine.clone(addField.text) Engine.clone(addField.text, pathChooser.currentIndex)
addField.clear() addField.clear()
} }
onRejected: addField.clear() onRejected: addField.clear()
@@ -285,11 +294,25 @@ ApplicationWindow {
Dialog { Dialog {
x: (parent.width - width) / 2 x: (parent.width - width) / 2
y: (parent.height - height) / 2 y: (parent.height - height) / 2
visible: Engine.addonsPaths[0] != "" && !Engine.addonsPaths[0].toLowerCase().match("interface/addons$") property var invalidPaths: {
var l = []
for (var i = 0; i < Engine.addonsPaths.length; i++)
if (Engine.addonsPaths[i] != "" && !Engine.addonsPaths[i].toLowerCase().match("interface/addons$"))
l.push(Engine.addonsPaths[i])
return l
}
id: invalidDialog
visible: invalidPaths.length > 0
title: qsTr("Warning") title: qsTr("Warning")
Label { Label {
anchors.fill: parent anchors.fill: parent
text: qsTr("The path set for addons does not appear to be valid. Please make sure it is set to the Interface/AddOns folder inside your World of Warcraft folder.") text: {
var m = qsTr("Following paths don't appears to be valid. Please make sure it is set to the Interface/AddOns folder inside your World of Warcraft folder.", "", invalidDialog.invalidPaths.length)
for (var i = 0; i < invalidDialog.invalidPaths.length; i++)
m += "<br/><b>" + invalidDialog.invalidPaths[i]+"</b>"
return m
}
textFormat: Text.RichText
wrapMode: Text.WordWrap wrapMode: Text.WordWrap
} }
modal: true modal: true