cmclark00/retro-imager
1
0
Fork 0
mirror of https://github.com/cmclark00/retro-imager.git synced 2025-05-18 16:05:21 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Allow nested subitems

Browse source 
Fixes "Can't assign to existing role 'subitems' of different type"
or hang (depending on Qt version) on using nested subitems.

Keep nested subitems flattenend as json string in memory while not
being used, to simplify dealing with ListElement expectation that
all elements have the same data type, as well as QML/Ecmascript's
memory management.
This commit is contained in:
Floris Bos 2022-01-23 19:30:16 +01:00
parent 10b50d5f8e
commit c17795c48e
2 changed files with 42 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

51
main.qml
View file

@ -478,7 +478,7 @@ ApplicationWindow {
contains_multiple_files: false
release_date: ""
subitems_url: "internal://back"
subitems: []
subitems_json: ""
name: qsTr("Back")
description: qsTr("Go back to main menu")
tooltip: ""
@ -520,7 +520,7 @@ ApplicationWindow {
contains_multiple_files: false
release_date: ""
subitems_url: ""
subitems: []
subitems_json: ""
name: qsTr("Erase")
description: qsTr("Format card as FAT32")
tooltip: ""
@ -632,7 +632,7 @@ ApplicationWindow {
Column {
Image {
source: "icons/ic_chevron_right_40px.svg"
visible: (typeof(subitems) == "object" && subitems.count) || (typeof(subitems_url) == "string" && subitems_url != "" && subitems_url != "internal://back")
visible: (typeof(subitems_json) == "string" && subitems_json != "") || (typeof(subitems_url) == "string" && subitems_url != "" && subitems_url != "internal://back")
height: parent.parent.parent.height
fillMode: Image.Pad
}
@ -1084,24 +1084,38 @@ ApplicationWindow {
}
function oslistFromJson(o) {
var oslist = false
var lang_country = Qt.locale().name
if ("os_list_"+lang_country in o) {
return o["os_list_"+lang_country]
oslist = o["os_list_"+lang_country]
}
if (lang_country.includes("_")) {
else if (lang_country.includes("_")) {
var lang = lang_country.substr(0, lang_country.indexOf("_"))
if ("os_list_"+lang in o) {
return o["os_list_"+lang]
oslist = o["os_list_"+lang]
}
}
if (!"os_list" in o) {
onError(qsTr("Error parsing os_list.json"))
return false
if (!oslist) {
if (!"os_list" in o) {
onError(qsTr("Error parsing os_list.json"))
return false
}
oslist = o["os_list"]
}
var oslist = o["os_list"]
checkForRandom(oslist)
/* Flatten subitems to subitems_json */
for (var i in oslist) {
var entry = oslist[i];
if ("subitems" in entry) {
entry["subitems_json"] = JSON.stringify(entry["subitems"])
delete entry["subitems"]
}
}
return oslist
}
@ -1110,8 +1124,8 @@ ApplicationWindow {
for (var i = 0; i < collection.count; i++) {
var os = collection.get(i)
if (typeof(os.subitems) !== "undefined") {
selectNamedOS(name, os.subitems)
if (typeof(os.subitems_json) == "string" && os.subitems_json != "") {
selectNamedOS(name, os.subitems_json)
}
else if (typeof(os.url) !== "undefined" && name === os.name) {
selectOSitem(os, false)
@ -1197,12 +1211,19 @@ ApplicationWindow {
function selectOSitem(d, selectFirstSubitem)
{
if (typeof(d.subitems) == "object" && d.subitems.count) {
if (typeof(d.subitems_json) == "string" && d.subitems_json !== "") {
var m = newSublist()
var subitems = JSON.parse(d.subitems_json)
for (var i=0; i<d.subitems.count; i++)
for (var i in subitems)
{
m.append(d.subitems.get(i))
var entry = subitems[i];
if ("subitems" in entry) {
/* Flatten sub-subitems entry */
entry["subitems_json"] = JSON.stringify(entry["subitems"])
delete entry["subitems"]
}
m.append(entry)
}
osswipeview.itemAt(osswipeview.currentIndex+1).currentIndex = (selectFirstSubitem === true) ? 0 : -1