marko10_000
/
openclonk
forked from Mirrors/openclonk
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Qt Editor: Add Set function options SetGlobal and SetRoot

qteditor
Sven Eberhardt 2016-07-21 00:20:44 -04:00
parent 16a770703a
commit 4fad947980
4 changed files with 36 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
src/editor/C4ConsoleQtPropListViewer.cpp
View File

@ -73,6 +73,10 @@ C4PropertyPath::C4PropertyPath(const C4PropertyPath &parent, const char *child_p
path.Copy(parent.GetPath());
argument.Copy(child_property);
}
else if (path_type == PPT_RootSetFunction)
{
path.Format("%s->%s", parent.GetRoot(), child_property);
}
else
{
assert(false);
@ -83,7 +87,7 @@ void C4PropertyPath::SetProperty(const char *set_string) const
{
// Compose script to update property
StdStrBuf script;
if (path_type == PPT_SetFunction)
if (path_type == PPT_SetFunction || path_type == PPT_RootSetFunction)
script.Format("%s(%s)", path.getData(), set_string);
else if (path_type == PPT_GlobalSetFunction)
script.Format("%s(%s,%s)", argument.getData(), path.getData(), set_string);
@ -117,7 +121,7 @@ void C4PropertyPath::DoCall(const char *call_string) const
/* Property editing */
C4PropertyDelegate::C4PropertyDelegate(const C4PropertyDelegateFactory *factory, C4PropList *props)
: QObject(), factory(factory), set_function_is_global(false)
: QObject(), factory(factory), set_function_type(C4PropertyPath::PPT_SetFunction)
{
// Resolve getter+setter callback names
if (props)
@ -125,7 +129,18 @@ C4PropertyDelegate::C4PropertyDelegate(const C4PropertyDelegateFactory *factory,
creation_props = C4VPropList(props);
name = props->GetPropertyStr(P_Name);
set_function = props->GetPropertyStr(P_Set);
set_function_is_global = props->GetPropertyBool(P_Global);
if (props->GetPropertyBool(P_SetGlobal))
{
set_function_type = C4PropertyPath::PPT_GlobalSetFunction;
}
else if (props->GetPropertyBool(P_SetRoot))
{
set_function_type = C4PropertyPath::PPT_RootSetFunction;
}
else
{
set_function_type = C4PropertyPath::PPT_SetFunction;
}
async_get_function = props->GetPropertyStr(P_AsyncGet);
}
}
@ -190,14 +205,19 @@ C4PropertyPath C4PropertyDelegate::GetPathForProperty(C4ConsoleQtPropListModelPr
path = C4PropertyPath(editor_prop->parent_value.getPropList());
else
path = editor_prop->property_path;
return GetPathForProperty(path, editor_prop->key ? editor_prop->key->GetCStr() : nullptr);
}
C4PropertyPath C4PropertyDelegate::GetPathForProperty(const C4PropertyPath &parent_path, const char *default_subpath) const
{
C4PropertyPath subpath;
if (GetSetFunction())
subpath = C4PropertyPath(path, GetSetFunction(), IsGlobalSetFunction() ? C4PropertyPath::PPT_GlobalSetFunction : C4PropertyPath::PPT_SetFunction);
subpath = C4PropertyPath(parent_path, GetSetFunction(), set_function_type);
else
if (editor_prop->key)
subpath = C4PropertyPath(path, editor_prop->key->GetCStr());
if (default_subpath && *default_subpath)
subpath = C4PropertyPath(parent_path, default_subpath);
else
subpath = path;
subpath = parent_path;
return subpath;
}
@ -1045,7 +1065,7 @@ const C4PropertyDelegateShape *C4PropertyDelegateEnum::GetShapeDelegate(C4Value
if (!option.adelegate) return nullptr;
if (option.value_key.Get())
{
*shape_path = C4PropertyPath(*shape_path, option.value_key->GetCStr());
*shape_path = option.adelegate->GetPathForProperty(*shape_path, option.value_key->GetCStr());
C4PropList *vp = val.getPropList();
if (vp) vp->GetPropertyByS(option.value_key, &val);
}
@ -1624,7 +1644,7 @@ bool C4ConsoleQtPropListModel::AddPropertyGroup(C4PropList *add_proplist, int32_
C4Value v_target_proplist = C4VPropList(target_proplist);
prop->delegate->GetPropertyValue(v_target_proplist, prop->key, 0, &v);
// Connect editable shape to property
C4PropertyPath new_shape_property_path(prop->property_path, prop->key->GetCStr());
C4PropertyPath new_shape_property_path = prop->delegate->GetPathForProperty(prop);
const C4PropertyDelegateShape *new_shape_delegate = prop->delegate->GetShapeDelegate(v, &new_shape_property_path);
if (new_shape_delegate != prop->shape_delegate || !(prop->shape_property_path == new_shape_property_path))
{

5
src/editor/C4ConsoleQtPropListViewer.h
View File

@ -45,6 +45,7 @@ public:
PPT_Index = 2,
PPT_SetFunction = 3,
PPT_GlobalSetFunction = 4,
PPT_RootSetFunction = 5,
} path_type;
public:
C4PropertyPath() {}
@ -74,7 +75,7 @@ protected:
const class C4PropertyDelegateFactory *factory;
C4Value creation_props;
C4RefCntPointer<C4String> set_function, async_get_function, name;
bool set_function_is_global;
C4PropertyPath::PathType set_function_type;
public:
C4PropertyDelegate(const class C4PropertyDelegateFactory *factory, C4PropList *props);
@ -90,12 +91,12 @@ public:
virtual QColor GetDisplayTextColor(const C4Value &val, class C4Object *obj) const;
virtual QColor GetDisplayBackgroundColor(const C4Value &val, class C4Object *obj) const;
const char *GetSetFunction() const { return set_function.Get() ? set_function->GetCStr() : nullptr; } // get name of setter function for this property
bool IsGlobalSetFunction() const { return set_function_is_global; }
virtual const class C4PropertyDelegateShape *GetShapeDelegate(C4Value &val, C4PropertyPath *shape_path) const { return nullptr; }
virtual const class C4PropertyDelegateShape *GetDirectShapeDelegate() const { return nullptr; }
virtual bool HasCustomPaint() const { return false; }
virtual bool Paint(QPainter *painter, const QStyleOptionViewItem &option, const C4Value &val) const { return false; }
C4PropertyPath GetPathForProperty(struct C4ConsoleQtPropListModelProperty *editor_prop) const;
C4PropertyPath GetPathForProperty(const C4PropertyPath &parent_path, const char *default_subpath) const;
C4String *GetNameStr() const { return name.Get(); }
const C4Value &GetCreationProps() const { return creation_props; }

2
src/script/C4StringTable.cpp
View File

@ -262,6 +262,8 @@ C4StringTable::C4StringTable()
P[P_Min] = "Min";
P[P_Max] = "Max";
P[P_Set] = "Set";
P[P_SetGlobal] = "SetGlobal";
P[P_SetRoot] = "SetRoot";
P[P_Options] = "Options";
P[P_Key] = "Key";
P[P_AsyncGet] = "AsyncGet";

2
src/script/C4StringTable.h
View File

@ -486,6 +486,8 @@ enum C4PropertyName
P_Min,
P_Max,
P_Set,
P_SetGlobal,
P_SetRoot,
P_Options,
P_Key,
P_AsyncGet,