Merge pull request #3624 from defmys/0.8.0

uglide · uglide · commit b46fa98cd8f7 · 2016-06-08T17:39:21.000+02:00
fix bug: renameKey, removeKey and setTTL only affects the 1st tab.
diff --git a/src/resources/qml/ValueTabs.qml b/src/resources/qml/ValueTabs.qml
@@ -123,7 +123,7 @@ Repeater {
                                     return open()
                                 }
 
-                                viewModel.renameKey(keyTab.keyIndex, newKeyName.text)
+                                viewModel.renameKey(keyTab.tabIndex, newKeyName.text)
                             }
 
                             visible: false
@@ -149,7 +149,7 @@ Repeater {
                             text: "Do you really want to delete this key?"
                             onYes: {
                                 console.log("remove key")
-                                viewModel.removeKey(keyTab.keyIndex)
+                                viewModel.removeKey(keyTab.tabIndex)
                             }
                             visible: false
                             modality: Qt.ApplicationModal
@@ -195,7 +195,7 @@ Repeater {
                                     return open()
                                 }
 
-                                viewModel.setTTL(keyTab.keyIndex, newTTL.text)
+                                viewModel.setTTL(keyTab.tabIndex, newTTL.text)
                             }
 
                             visible: false

Original file line number	Diff line number	Diff line change
`@@ -123,7 +123,7 @@ Repeater {`
`123`	`123`	`return open()`
`124`	`124`	`}`
`125`	`125`
`126`		`- viewModel.renameKey(keyTab.keyIndex, newKeyName.text)`
	`126`	`+ viewModel.renameKey(keyTab.tabIndex, newKeyName.text)`
`127`	`127`	`}`
`128`	`128`
`129`	`129`	`visible: false`
`@@ -149,7 +149,7 @@ Repeater {`
`149`	`149`	`text: "Do you really want to delete this key?"`
`150`	`150`	`onYes: {`
`151`	`151`	`console.log("remove key")`
`152`		`- viewModel.removeKey(keyTab.keyIndex)`
	`152`	`+ viewModel.removeKey(keyTab.tabIndex)`
`153`	`153`	`}`
`154`	`154`	`visible: false`
`155`	`155`	`modality: Qt.ApplicationModal`
`@@ -195,7 +195,7 @@ Repeater {`
`195`	`195`	`return open()`
`196`	`196`	`}`
`197`	`197`
`198`		`- viewModel.setTTL(keyTab.keyIndex, newTTL.text)`
	`198`	`+ viewModel.setTTL(keyTab.tabIndex, newTTL.text)`
`199`	`199`	`}`
`200`	`200`
`201`	`201`	`visible: false`