forked from qt-creator/qt-creator
Lua: Allow category icon as filepath
Change-Id: I364b9d7c33e17986df3156dd59c359f111f05c00 Reviewed-by: Christian Stenger <christian.stenger@qt.io>
This commit is contained in:
@@ -553,8 +553,10 @@ void addSettingsModule()
|
|||||||
setDisplayName(options.get<QString>("displayName"));
|
setDisplayName(options.get<QString>("displayName"));
|
||||||
setCategory(Id::fromString(options.get<QString>("categoryId")));
|
setCategory(Id::fromString(options.get<QString>("categoryId")));
|
||||||
setDisplayCategory(options.get<QString>("displayCategory"));
|
setDisplayCategory(options.get<QString>("displayCategory"));
|
||||||
setCategoryIconPath(
|
const FilePath catIcon = options.get<std::optional<FilePath>>("categoryIconPath")
|
||||||
FilePath::fromUserInput(options.get<QString>("categoryIconPath")));
|
.value_or(FilePath::fromUserInput(
|
||||||
|
options.get_or<QString>("categoryIconPath", {})));
|
||||||
|
setCategoryIconPath(catIcon);
|
||||||
AspectContainer *container = options.get<AspectContainer *>("aspectContainer");
|
AspectContainer *container = options.get<AspectContainer *>("aspectContainer");
|
||||||
setSettingsProvider([container]() { return container; });
|
setSettingsProvider([container]() { return container; });
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -202,7 +202,7 @@ settings.OptionsPage = {}
|
|||||||
---@field displayName string
|
---@field displayName string
|
||||||
---@field categoryId string
|
---@field categoryId string
|
||||||
---@field displayCategory string
|
---@field displayCategory string
|
||||||
---@field categoryIconPath string
|
---@field categoryIconPath string|FilePath
|
||||||
---@field aspectContainer AspectContainer
|
---@field aspectContainer AspectContainer
|
||||||
OptionsPageCreate = {}
|
OptionsPageCreate = {}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user