Skip to content

Commit

Permalink
Gui: change string from Document to Documentation
Browse files Browse the repository at this point in the history
The add property dialog (introduced by the LinkMerge) previously
showed "Document" which is confusing. The edit box is there
to provide an explanation on the new property, that is,
"Documentation".

Also improve the tooltips. Also change "Append" to "Prefix"
in the checkbox as it's more clear that the `Group` is added
at the beginning to form the full name of the property.
  • Loading branch information
vocx-fc authored and wwmayer committed Apr 30, 2020
1 parent d8b41f7 commit 383bca9
Showing 1 changed file with 20 additions and 9 deletions.
29 changes: 20 additions & 9 deletions src/Gui/DlgAddProperty.ui
Expand Up @@ -6,7 +6,7 @@
<rect>
<x>0</x>
<y>0</y>
<width>354</width>
<width>418</width>
<height>258</height>
</rect>
</property>
Expand All @@ -15,7 +15,7 @@
</property>
<layout class="QFormLayout" name="formLayout">
<item row="0" column="0">
<widget class="QLabel" name="label">
<widget class="QLabel" name="label_type">
<property name="text">
<string>Type</string>
</property>
Expand All @@ -25,7 +25,7 @@
<widget class="QComboBox" name="comboType"/>
</item>
<item row="1" column="0">
<widget class="QLabel" name="label_2">
<widget class="QLabel" name="label_group">
<property name="text">
<string>Group</string>
</property>
Expand All @@ -35,7 +35,7 @@
<widget class="QLineEdit" name="edtGroup"/>
</item>
<item row="2" column="0">
<widget class="QLabel" name="label_3">
<widget class="QLabel" name="label_name">
<property name="text">
<string>Name</string>
</property>
Expand All @@ -45,22 +45,33 @@
<widget class="QLineEdit" name="edtName"/>
</item>
<item row="3" column="0">
<widget class="QLabel" name="label_4">
<widget class="QLabel" name="label_doc">
<property name="toolTip">
<string>Verbose description of the new property.</string>
</property>
<property name="text">
<string>Document</string>
<string>Documentation</string>
</property>
</widget>
</item>
<item row="3" column="1">
<widget class="QPlainTextEdit" name="edtDoc"/>
<widget class="QPlainTextEdit" name="edtDoc">
<property name="toolTip">
<string>Verbose description of the new property.</string>
</property>
</widget>
</item>
<item row="4" column="1">
<widget class="QCheckBox" name="chkAppend">
<property name="toolTip">
<string>Append the group name in front of the property name in the form of 'group'_'name' to avoid conflict with existing property. The prefixed group name will be auto trimmed when shown in the property editor.</string>
<string>Prefix the property name with the group name in the form 'Group_Name' to avoid conflicts with an existing property.
In this case the prefix will be automatically trimmed when shown in the property editor.
However, the property is still used in a script with the full name, like 'obj.Group_Name'.

If this is not ticked, then the property must be uniquely named, and it is accessed like 'obj.Name'.</string>
</property>
<property name="text">
<string>Append group name</string>
<string>Prefix group name</string>
</property>
</widget>
</item>
Expand Down

0 comments on commit 383bca9

Please sign in to comment.