diff --git a/lib/python/Plugins/Extensions/FileCommander/plugin.py b/lib/python/Plugins/Extensions/FileCommander/plugin.py index c36056d0157..8d613c3b02c 100644 --- a/lib/python/Plugins/Extensions/FileCommander/plugin.py +++ b/lib/python/Plugins/Extensions/FileCommander/plugin.py @@ -1010,7 +1010,7 @@ def makeSymlinkCallback(newName): def keyManageBookmarks(self, current): bookmarks = config.plugins.FileCommander.bookmarks.value - order = config.misc.pluginlist.fc_bookmarks_order.value.split(",") + order = eval(config.misc.pluginlist.fcBookmarksOrder.value) directory = current and self.sourceColumn.getCurrentDirectory() or self.sourceColumn.getPath() if directory in bookmarks: bookmarks.remove(directory) @@ -1024,8 +1024,8 @@ def keyManageBookmarks(self, current): self.displayStatus(_("Bookmark added.")) config.plugins.FileCommander.bookmarks.value = bookmarks config.plugins.FileCommander.bookmarks.save() - config.misc.pluginlist.fc_bookmarks_order.value = ",".join(order) - config.misc.pluginlist.fc_bookmarks_order.save() + config.misc.pluginlist.fcBookmarksOrder.value = str(order) + config.misc.pluginlist.fcBookmarksOrder.save() def keyMediaInfo(self): self.shortcutAction("mediainfo") @@ -1576,13 +1576,13 @@ def selectBookmarkCallback(answer): bookmarks = [(x, x) for x in config.plugins.FileCommander.bookmarks.value] bookmarks.insert(0, (_("Storage Devices"), None)) - order = config.misc.pluginlist.fc_bookmarks_order.value.split(",") + order = eval(config.misc.pluginlist.fcBookmarksOrder.value) if order and _("Storage Devices") in order: order.remove(_("Storage Devices")) order.insert(0, _("Storage Devices")) - config.misc.pluginlist.fc_bookmarks_order.value = ",".join(order) - config.misc.pluginlist.fc_bookmarks_order.save() - self.session.openWithCallback(selectBookmarkCallback, ChoiceBox, title=_("Select Bookmark"), list=bookmarks, reorderConfig="fc_bookmarks_order") + config.misc.pluginlist.fcBookmarksOrder.value = str(order) + config.misc.pluginlist.fcBookmarksOrder.save() + self.session.openWithCallback(selectBookmarkCallback, ChoiceBox, title=_("Select Bookmark"), list=bookmarks, reorderConfig="fcBookmarksOrder") def keySettings(self): def settingsCallback(*answer): diff --git a/lib/python/Screens/ChoiceBox.py b/lib/python/Screens/ChoiceBox.py index b6d2cbb4112..5f47aa0615b 100644 --- a/lib/python/Screens/ChoiceBox.py +++ b/lib/python/Screens/ChoiceBox.py @@ -7,9 +7,9 @@ from Screens.Screen import Screen, ScreenSummary config.misc.pluginlist = ConfigSubsection() -config.misc.pluginlist.eventinfo_order = ConfigText(default="") -config.misc.pluginlist.extension_order = ConfigText(default="") -config.misc.pluginlist.fc_bookmarks_order = ConfigText(default="") +config.misc.pluginlist.eventinfoOrder = ConfigText(default="[]") +config.misc.pluginlist.extensionOrder = ConfigText(default="[]") +config.misc.pluginlist.fcBookmarksOrder = ConfigText(default=f"['{_("Storage Devices")}']") class ChoiceBoxNew(Screen): @@ -32,7 +32,7 @@ def __init__(self, session, text="", choiceList=None, selection=0, buttonList=No if self.configOrder.value: prevList = [x for x in zip(choiceList, buttonList)] newList = [] - for button in self.configOrder.value.split(","): + for button in eval(self.configOrder.value): for entry in prevList: if entry[0][0] == button: prevList.remove(entry) @@ -181,7 +181,7 @@ def moveItem(self, direction): self["list"].instance.goLineDown() else: self["list"].instance.goLineUp() - self.configOrder.value = ",".join(x[0][0] for x in self.choiceList) + self.configOrder.value = str([x[0][0] for x in self.choiceList]) self.configOrder.save() def keyResetList(self):