details: http://crayzedsgui.hg.sourceforge.net/hgweb/crayzedsgui/cegui_mk2/rev/fffb8a6c4ac8
changeset: 2761:fffb8a6c4ac8
user: Martin Preisler <preisler.m@...>
date: Thu Aug 25 23:10:00 2011 +0200
branch:
description:
MOD: propertyOrigin is WidgetTypeName where possible, inbuilt widget classes except "Window" have "CEGUI/" prefix
MOD: Added Inconsistency notes where applicable (property name, setter and getter inconsistencies)
FIX: Various property related cleanup and fixes (mostly formatting and typos)
diffstat:
cegui/include/elements/CEGUIThumb.h | 3 ++
cegui/src/CEGUIWindow.cpp | 6 ++--
cegui/src/elements/CEGUICheckbox.cpp | 5 ++-
cegui/src/elements/CEGUICombobox.cpp | 11 +++++----
cegui/src/elements/CEGUIDragContainer.cpp | 14 ++++++++---
cegui/src/elements/CEGUIEditbox.cpp | 14 +++++++++--
cegui/src/elements/CEGUIFrameWindow.cpp | 2 +-
cegui/src/elements/CEGUIGridLayoutContainer.cpp | 4 +-
cegui/src/elements/CEGUIItemEntry.cpp | 12 ++++++----
cegui/src/elements/CEGUIListHeader.cpp | 16 ++++++++------
cegui/src/elements/CEGUIListHeaderSegment.cpp | 11 +++++++--
cegui/src/elements/CEGUIListbox.cpp | 27 ++++++++++++++---------
cegui/src/elements/CEGUIMenuBase.cpp | 6 +++-
cegui/src/elements/CEGUIMenuItem.cpp | 4 ++-
cegui/src/elements/CEGUIMultiColumnList.cpp | 22 +++++++++---------
cegui/src/elements/CEGUIMultiLineEditbox.cpp | 12 ++++++----
cegui/src/elements/CEGUIPopupMenu.cpp | 3 +-
cegui/src/elements/CEGUIProgressBar.cpp | 5 ++-
cegui/src/elements/CEGUIRadioButton.cpp | 2 +-
cegui/src/elements/CEGUIScrollablePane.cpp | 23 ++++++++++++--------
cegui/src/elements/CEGUIScrollbar.cpp | 7 +++++-
cegui/src/elements/CEGUIScrolledContainer.cpp | 2 +
cegui/src/elements/CEGUIScrolledItemListBase.cpp | 8 +++---
cegui/src/elements/CEGUISlider.cpp | 9 ++++---
cegui/src/elements/CEGUISpinner.cpp | 7 ++++-
cegui/src/elements/CEGUITabControl.cpp | 4 ++-
cegui/src/elements/CEGUIThumb.cpp | 13 +++++++----
cegui/src/elements/CEGUITitlebar.cpp | 3 +-
cegui/src/elements/CEGUITooltip.cpp | 2 +-
cegui/src/elements/CEGUITree.cpp | 16 ++++++++-----
30 files changed, 169 insertions(+), 104 deletions(-)
diffs (948 lines):
diff -r 3492ef63e155 -r fffb8a6c4ac8 cegui/include/elements/CEGUIThumb.h
--- a/cegui/include/elements/CEGUIThumb.h Thu Aug 25 11:59:55 2011 +0200
+++ b/cegui/include/elements/CEGUIThumb.h Thu Aug 25 23:10:00 2011 +0200
@@ -320,6 +320,9 @@
void addThumbProperties(void);
};
+/*
+TODO: This is horrible, PropertyHelper for std::pair<float, float> would be fine but enforcing min: %f max: %f is just horrible
+*/
template<>
class PropertyHelper<std::pair<float,float> >
{
diff -r 3492ef63e155 -r fffb8a6c4ac8 cegui/src/CEGUIWindow.cpp
--- a/cegui/src/CEGUIWindow.cpp Thu Aug 25 11:59:55 2011 +0200
+++ b/cegui/src/CEGUIWindow.cpp Thu Aug 25 23:10:00 2011 +0200
@@ -1670,7 +1670,7 @@
"window's representation onto a texture (although no such "
"implementation requirement is specified.)"
" Value is either \"True\" or \"False\".",
- &Window::setUsingAutoRenderingSurface, &Window::isUsingAutoRenderingSurface, false
+ &Window::setUsingAutoRenderingSurface, &Window::isUsingAutoRenderingSurface, false /* TODO: Inconsistency*/
);
CEGUI_DEFINE_PROPERTY(Window, Quaternion,
@@ -1681,7 +1681,7 @@
CEGUI_DEFINE_PROPERTY(Window, bool,
"NonClient", "Property to get/set the 'non-client' setting for the Window. "
"Value is either \"True\" or \"False\".",
- &Window::setNonClientWindow, &Window::isNonClientWindow, false
+ &Window::setNonClientWindow, &Window::isNonClientWindow, false /* TODO: Inconsistency*/
);
CEGUI_DEFINE_PROPERTY(Window, bool,
@@ -1699,7 +1699,7 @@
CEGUI_DEFINE_PROPERTY(Window, WindowUpdateMode,
"UpdateMode", "Property to get/set the window update mode setting. "
"Value is one of \"Always\", \"Never\" or \"Visible\".",
- &Window::setUpdateMode,&Window::getUpdateMode,WUM_VISIBLE
+ &Window::setUpdateMode,&Window::getUpdateMode, WUM_VISIBLE
);
CEGUI_DEFINE_PROPERTY(Window, AspectMode,
diff -r 3492ef63e155 -r fffb8a6c4ac8 cegui/src/elements/CEGUICheckbox.cpp
--- a/cegui/src/elements/CEGUICheckbox.cpp Thu Aug 25 11:59:55 2011 +0200
+++ b/cegui/src/elements/CEGUICheckbox.cpp Thu Aug 25 23:10:00 2011 +0200
@@ -122,8 +122,9 @@
*************************************************************************/
void Checkbox::addCheckboxProperties(void)
{
- const String propertyOrigin("Checkbox");
- CEGUI_DEFINE_PROPERTY(Checkbox, bool,
+ const String& propertyOrigin = WidgetTypeName;
+
+ CEGUI_DEFINE_PROPERTY(Checkbox, bool,
"Selected","Property to get/set the selected state of the Checkbox. Value is either \"True\" or \"False\".",
&Checkbox::setSelected, &Checkbox::isSelected, false
);
diff -r 3492ef63e155 -r fffb8a6c4ac8 cegui/src/elements/CEGUICombobox.cpp
--- a/cegui/src/elements/CEGUICombobox.cpp Thu Aug 25 11:59:55 2011 +0200
+++ b/cegui/src/elements/CEGUICombobox.cpp Thu Aug 25 23:10:00 2011 +0200
@@ -824,7 +824,8 @@
*************************************************************************/
void Combobox::addComboboxProperties(void)
{
- const String propertyOrigin("Combobox");
+ const String& propertyOrigin = WidgetTypeName;
+
CEGUI_DEFINE_PROPERTY(Combobox, bool,
"ReadOnly","Property to get/set the read-only setting for the Editbox. Value is either \"True\" or \"False\".",
&Combobox::setReadOnly, &Combobox::isReadOnly, false
@@ -851,19 +852,19 @@
);
CEGUI_DEFINE_PROPERTY(Combobox, bool,
"SortList","Property to get/set the sort setting of the list box. Value is either \"True\" or \"False\".",
- &Combobox::setSortingEnabled, &Combobox::isSortEnabled, false
+ &Combobox::setSortingEnabled, &Combobox::isSortEnabled, false /* TODO: Inconsistency between setter, getter and property name */
);
CEGUI_DEFINE_PROPERTY(Combobox, bool,
"ForceVertScrollbar", "Property to get/set the 'always show' setting for the vertical scroll bar of the list box. Value is either \"True\" or \"False\".",
- &Combobox::setShowVertScrollbar, &Combobox::isVertScrollbarAlwaysShown, false
+ &Combobox::setShowVertScrollbar, &Combobox::isVertScrollbarAlwaysShown, false /* TODO: Inconsistency between setter, getter and property name */
);
CEGUI_DEFINE_PROPERTY(Combobox, bool,
"ForceHorzScrollbar","Property to get/set the 'always show' setting for the horizontal scroll bar of the list box. Value is either \"True\" or \"False\".",
- &Combobox::setShowHorzScrollbar, &Combobox::isHorzScrollbarAlwaysShown, false
+ &Combobox::setShowHorzScrollbar, &Combobox::isHorzScrollbarAlwaysShown, false /* TODO: Inconsistency between setter, getter and property name */
);
CEGUI_DEFINE_PROPERTY(Combobox, bool,
"SingleClickMode","Property to get/set the 'single click mode' setting for the combo box. Value is either \"True\" or \"False\".",
- &Combobox::setSingleClickEnabled, &Combobox::getSingleClickEnabled, false
+ &Combobox::setSingleClickEnabled, &Combobox::getSingleClickEnabled, false /* TODO: Inconsistency between setter, getter and property name */
);
}
diff -r 3492ef63e155 -r fffb8a6c4ac8 cegui/src/elements/CEGUIDragContainer.cpp
--- a/cegui/src/elements/CEGUIDragContainer.cpp Thu Aug 25 11:59:55 2011 +0200
+++ b/cegui/src/elements/CEGUIDragContainer.cpp Thu Aug 25 23:10:00 2011 +0200
@@ -161,40 +161,46 @@
void DragContainer::addDragContainerProperties(void)
{
- const String propertyOrigin("DragContainer");
+ const String& propertyOrigin = WidgetTypeName;
CEGUI_DEFINE_PROPERTY(DragContainer, bool,
"DraggingEnabled", "Property to get/set the state of the dragging enabled setting for the DragContainer. Value is either \"True\" or \"False\".",
&DragContainer::setDraggingEnabled, &DragContainer::isDraggingEnabled, true
);
+
CEGUI_DEFINE_PROPERTY(DragContainer, float,
"DragAlpha", "Property to get/set the dragging alpha value. Value is a float.",
&DragContainer::setDragAlpha, &DragContainer::getDragAlpha, 0.5f
);
+
CEGUI_DEFINE_PROPERTY(DragContainer, float,
"DragThreshold", "Property to get/set the dragging threshold value. Value is a float.",
- &DragContainer::setPixelDragThreshold, &DragContainer::getPixelDragThreshold, 8.0f
+ &DragContainer::setPixelDragThreshold, &DragContainer::getPixelDragThreshold, 8.0f /* TODO: Inconsistency */
);
+
CEGUI_DEFINE_PROPERTY(DragContainer, Image*,
"DragCursorImage", "Property to get/set the mouse cursor image used when dragging. Value should be \"set:<imageset name> image:<image name>\".",
&DragContainer::setDragCursorImage, &DragContainer::getDragCursorImage, 0
);
+
CEGUI_DEFINE_PROPERTY(DragContainer, bool,
"StickyMode", "Property to get/set the state of the sticky mode setting for the "
"DragContainer. Value is either \"True\" or \"False\".",
- &DragContainer::setStickyModeEnabled, &DragContainer::isStickyModeEnabled, true
+ &DragContainer::setStickyModeEnabled, &DragContainer::isStickyModeEnabled, true /* TODO: Inconsistency */
);
+
CEGUI_DEFINE_PROPERTY(DragContainer, UVector2,
"FixedDragOffset", "Property to get/set the state of the fixed dragging offset "
"setting for the DragContainer. "
"Value is a UVector2 property value.",
&DragContainer::setFixedDragOffset, &DragContainer::getFixedDragOffset, UVector2::zero()
);
+
CEGUI_DEFINE_PROPERTY(DragContainer, bool,
"UseFixedDragOffset", "Property to get/set the setting that control whether the fixed "
"dragging offset will be used. "
"Value is either \"True\" or \"False\".",
- &DragContainer::setUsingFixedDragOffset, &DragContainer::isUsingFixedDragOffset, false
+ &DragContainer::setUsingFixedDragOffset, &DragContainer::isUsingFixedDragOffset, false /* TODO: Inconsistency */
);
}
diff -r 3492ef63e155 -r fffb8a6c4ac8 cegui/src/elements/CEGUIEditbox.cpp
--- a/cegui/src/elements/CEGUIEditbox.cpp Thu Aug 25 11:59:55 2011 +0200
+++ b/cegui/src/elements/CEGUIEditbox.cpp Thu Aug 25 23:10:00 2011 +0200
@@ -927,35 +927,43 @@
//----------------------------------------------------------------------------//
void Editbox::addEditboxProperties(void)
{
- const String propertyOrigin("Editbox");
+ const String& propertyOrigin = WidgetTypeName;
+
CEGUI_DEFINE_PROPERTY(Editbox, bool,
"ReadOnly","Property to get/set the read-only setting for the Editbox. Value is either \"True\" or \"False\".",
&Editbox::setReadOnly, &Editbox::isReadOnly, false
);
+
CEGUI_DEFINE_PROPERTY(Editbox, bool,
"MaskText","Property to get/set the mask text setting for the Editbox. Value is either \"True\" or \"False\".",
- &Editbox::setTextMasked, &Editbox::isTextMasked, false
+ &Editbox::setTextMasked, &Editbox::isTextMasked, false /* TODO: Inconsistency */
);
+
CEGUI_DEFINE_PROPERTY(Editbox, uint,
"MaskCodepoint","Property to get/set the utf32 codepoint value used for masking text. Value is \"[uint]\".",
&Editbox::setMaskCodePoint, &Editbox::getMaskCodePoint, 42
);
+
CEGUI_DEFINE_PROPERTY(Editbox, String,
"ValidationString","Property to get/set the validation string Editbox. Value is a text string.",
&Editbox::setValidationString, &Editbox::getValidationString, ".*"
);
+
CEGUI_DEFINE_PROPERTY(Editbox, size_t,
"CaretIndex","Property to get/set the current caret index. Value is \"[uint]\".",
&Editbox::setCaretIndex, &Editbox::getCaretIndex, 0
);
+
CEGUI_DEFINE_PROPERTY(Editbox, size_t,
"SelectionStart","Property to get/set the zero based index of the selection start position within the text. Value is \"[uint]\".",
- &Editbox::setSelectionStart, &Editbox::getSelectionStartIndex, 0
+ &Editbox::setSelectionStart, &Editbox::getSelectionStartIndex, 0 /* TODO: getter inconsistency */
);
+
CEGUI_DEFINE_PROPERTY(Editbox, size_t,
"SelectionLength","Property to get/set the length of the selection (as a count of the number of code points selected). Value is \"[uint]\".",
&Editbox::setSelectionLength, &Editbox::getSelectionLength, 0
);
+
CEGUI_DEFINE_PROPERTY(Editbox, size_t,
"MaxTextLength","Property to get/set the the maximum allowed text length (as a count of code points). Value is \"[uint]\".",
&Editbox::setMaxTextLength, &Editbox::getMaxTextLength, String().max_size()
diff -r 3492ef63e155 -r fffb8a6c4ac8 cegui/src/elements/CEGUIFrameWindow.cpp
--- a/cegui/src/elements/CEGUIFrameWindow.cpp Thu Aug 25 11:59:55 2011 +0200
+++ b/cegui/src/elements/CEGUIFrameWindow.cpp Thu Aug 25 23:10:00 2011 +0200
@@ -769,7 +769,7 @@
CEGUI_DEFINE_PROPERTY(FrameWindow, bool,
"RollUpState", "Property to get/set the roll-up / shade state of the window. Value is either \"True\" or \"False\".",
- &FrameWindow::setRolledup, &FrameWindow::isRolledup, false
+ &FrameWindow::setRolledup, &FrameWindow::isRolledup, false /* TODO: Inconsistency */
);
CEGUI_DEFINE_PROPERTY(FrameWindow, bool,
diff -r 3492ef63e155 -r fffb8a6c4ac8 cegui/src/elements/CEGUIGridLayoutContainer.cpp
--- a/cegui/src/elements/CEGUIGridLayoutContainer.cpp Thu Aug 25 11:59:55 2011 +0200
+++ b/cegui/src/elements/CEGUIGridLayoutContainer.cpp Thu Aug 25 23:10:00 2011 +0200
@@ -589,8 +589,7 @@
//----------------------------------------------------------------------------//
void GridLayoutContainer::addGridLayoutContainerProperties(void)
{
-
- const String propertyOrigin("GridLayoutContainer");
+ const String& propertyOrigin = WidgetTypeName;
CEGUI_DEFINE_PROPERTY(GridLayoutContainer, Sizef,
"GridSize", "Size of the grid of this layout container. "
@@ -598,6 +597,7 @@
"only integer values are valid as grid size.",
&GridLayoutContainer::setGrid, &GridLayoutContainer::getGrid, Sizef::zero()
);
+
CEGUI_DEFINE_PROPERTY(GridLayoutContainer, AutoPositioning,
"AutoPositioning", "Sets the method used for auto positioning. "
"Possible values: 'Disabled', 'Left to Right', 'Top to Bottom'.",
diff -r 3492ef63e155 -r fffb8a6c4ac8 cegui/src/elements/CEGUIItemEntry.cpp
--- a/cegui/src/elements/CEGUIItemEntry.cpp Thu Aug 25 11:59:55 2011 +0200
+++ b/cegui/src/elements/CEGUIItemEntry.cpp Thu Aug 25 23:10:00 2011 +0200
@@ -142,14 +142,16 @@
*************************************************************************/
void ItemEntry::addItemEntryProperties(void)
{
- const String propertyOrigin("ItemEntry");
+ const String& propertyOrigin = WidgetTypeName;
+
CEGUI_DEFINE_PROPERTY(ItemEntry, bool,
- "Selectable","Property to get/set the state of the selectable setting for the ItemEntry. Value is either \"True\" or \"False\".",
- &ItemEntry::setSelectable, &ItemEntry::isSelectable, false
+ "Selectable","Property to get/set the state of the selectable setting for the ItemEntry. Value is either \"True\" or \"False\".",
+ &ItemEntry::setSelectable, &ItemEntry::isSelectable, false
);
+
CEGUI_DEFINE_PROPERTY(ItemEntry, bool,
- "Selected","Property to get/set the state of the selected setting for the ItemEntry. Value is either \"True\" or \"False\".",
- &ItemEntry::setSelected, &ItemEntry::isSelected, false
+ "Selected","Property to get/set the state of the selected setting for the ItemEntry. Value is either \"True\" or \"False\".",
+ &ItemEntry::setSelected, &ItemEntry::isSelected, false
);
}
diff -r 3492ef63e155 -r fffb8a6c4ac8 cegui/src/elements/CEGUIListHeader.cpp
--- a/cegui/src/elements/CEGUIListHeader.cpp Thu Aug 25 11:59:55 2011 +0200
+++ b/cegui/src/elements/CEGUIListHeader.cpp Thu Aug 25 23:10:00 2011 +0200
@@ -1030,26 +1030,28 @@
*************************************************************************/
void ListHeader::addHeaderProperties(void)
{
-
- const String propertyOrigin("ListHeader");
-
+ const String& propertyOrigin = WidgetTypeName;
CEGUI_DEFINE_PROPERTY(ListHeader, bool,
"SortSettingEnabled", "Property to get/set the setting for for user modification of the sort column & direction. Value is either \"True\" or \"False\".",
- &ListHeader::setSortingEnabled, &ListHeader::isSortingEnabled, true
+ &ListHeader::setSortingEnabled, &ListHeader::isSortingEnabled, true /* TODO: Inconsistency */
);
+
CEGUI_DEFINE_PROPERTY(ListHeader, bool,
"ColumnsSizable", "Property to get/set the setting for user sizing of the column headers. Value is either \"True\" or \"False\".",
- &ListHeader::setColumnSizingEnabled, &ListHeader::isColumnSizingEnabled, true
+ &ListHeader::setColumnSizingEnabled, &ListHeader::isColumnSizingEnabled, true /* TODO: Inconsistency */
);
+
CEGUI_DEFINE_PROPERTY(ListHeader, bool,
"ColumnsMovable", "Property to get/set the setting for user moving of the column headers. Value is either \"True\" or \"False\".",
- &ListHeader::setColumnDraggingEnabled, &ListHeader::isColumnDraggingEnabled, true
+ &ListHeader::setColumnDraggingEnabled, &ListHeader::isColumnDraggingEnabled, true /* TODO: Inconsistency */
);
+
CEGUI_DEFINE_PROPERTY(ListHeader, uint,
"SortColumnID", "Property to get/set the current sort column (via ID code). Value is an unsigned integer number.",
- &ListHeader::setSortColumnFromID, &ListHeader::getSortSegmentID, 0
+ &ListHeader::setSortColumnFromID, &ListHeader::getSortSegmentID, 0 /* TODO: Inconsistency */
);
+
CEGUI_DEFINE_PROPERTY(ListHeader, ListHeaderSegment::SortDirection,
"SortDirection", "Property to get/set the sort direction setting of the header. Value is the text of one of the SortDirection enumerated value names.",
&ListHeader::setSortDirection, &ListHeader::getSortDirection, ListHeaderSegment::None
diff -r 3492ef63e155 -r fffb8a6c4ac8 cegui/src/elements/CEGUIListHeaderSegment.cpp
--- a/cegui/src/elements/CEGUIListHeaderSegment.cpp Thu Aug 25 11:59:55 2011 +0200
+++ b/cegui/src/elements/CEGUIListHeaderSegment.cpp Thu Aug 25 23:10:00 2011 +0200
@@ -613,28 +613,33 @@
*************************************************************************/
void ListHeaderSegment::addHeaderSegmentProperties(void)
{
- const String propertyOrigin("ListHeaderSegment");
+ const String& propertyOrigin = WidgetTypeName;
CEGUI_DEFINE_PROPERTY(ListHeaderSegment, bool,
"Sizable", "Property to get/set the sizable setting of the header segment. Value is either \"True\" or \"False\".",
- &ListHeaderSegment::setSizingEnabled, &ListHeaderSegment::isSizingEnabled, true
+ &ListHeaderSegment::setSizingEnabled, &ListHeaderSegment::isSizingEnabled, true /* TODO: Inconsistency */
);
+
CEGUI_DEFINE_PROPERTY(ListHeaderSegment, bool,
"Clickable", "Property to get/set the click-able setting of the header segment. Value is either \"True\" or \"False\".",
&ListHeaderSegment::setClickable, &ListHeaderSegment::isClickable, true
);
+
CEGUI_DEFINE_PROPERTY(ListHeaderSegment, bool,
"Dragable", "Property to get/set the drag-able setting of the header segment. Value is either \"True\" or \"False\".",
- &ListHeaderSegment::setDragMovingEnabled, &ListHeaderSegment::isDragMovingEnabled, true
+ &ListHeaderSegment::setDragMovingEnabled, &ListHeaderSegment::isDragMovingEnabled, true /* TODO: Inconsistency */
);
+
CEGUI_DEFINE_PROPERTY(ListHeaderSegment, ListHeaderSegment::SortDirection,
"SortDirection", "Property to get/set the sort direction setting of the header segment. Value is the text of one of the SortDirection enumerated value names.",
&ListHeaderSegment::setSortDirection, &ListHeaderSegment::getSortDirection, ListHeaderSegment::None
);
+
CEGUI_DEFINE_PROPERTY(ListHeaderSegment, Image*,
"SizingCursorImage", "Property to get/set the sizing cursor image for the List Header Segment. Value should be \"set:[imageset name] image:[image name]\".",
&ListHeaderSegment::setSizingCursorImage, &ListHeaderSegment::getSizingCursorImage, 0
);
+
CEGUI_DEFINE_PROPERTY(ListHeaderSegment, Image*,
"MovingCursorImage", "Property to get/set the moving cursor image for the List Header Segment. Value should be \"set:[imageset name] image:[image name]\".",
&ListHeaderSegment::setMovingCursorImage, &ListHeaderSegment::getMovingCursorImage, 0
diff -r 3492ef63e155 -r fffb8a6c4ac8 cegui/src/elements/CEGUIListbox.cpp
--- a/cegui/src/elements/CEGUIListbox.cpp Thu Aug 25 11:59:55 2011 +0200
+++ b/cegui/src/elements/CEGUIListbox.cpp Thu Aug 25 23:10:00 2011 +0200
@@ -1036,26 +1036,31 @@
*************************************************************************/
void Listbox::addListboxProperties(void)
{
- const String propertyOrigin("Listbox");
- CEGUI_DEFINE_PROPERTY(Listbox, bool,
+ const String& propertyOrigin = WidgetTypeName;
+
+ CEGUI_DEFINE_PROPERTY(Listbox, bool,
"Sort","Property to get/set the sort setting of the list box. Value is either \"True\" or \"False\".",
- &Listbox::setSortingEnabled, &Listbox::isSortEnabled, false
+ &Listbox::setSortingEnabled, &Listbox::isSortEnabled, false /* TODO: Inconsistency */
);
- CEGUI_DEFINE_PROPERTY(Listbox, bool,
+
+ CEGUI_DEFINE_PROPERTY(Listbox, bool,
"MultiSelect","Property to get/set the multi-select setting of the list box. Value is either \"True\" or \"False\".",
- &Listbox::setMultiselectEnabled, &Listbox::isMultiselectEnabled, false
+ &Listbox::setMultiselectEnabled, &Listbox::isMultiselectEnabled, false /* TODO: Inconsistency */
);
- CEGUI_DEFINE_PROPERTY(Listbox, bool,
+
+ CEGUI_DEFINE_PROPERTY(Listbox, bool,
"ForceVertScrollbar","Property to get/set the 'always show' setting for the vertical scroll bar of the list box. Value is either \"True\" or \"False\".",
- &Listbox::setShowVertScrollbar, &Listbox::isVertScrollbarAlwaysShown, false
+ &Listbox::setShowVertScrollbar, &Listbox::isVertScrollbarAlwaysShown, false /* TODO: Inconsistency */
);
- CEGUI_DEFINE_PROPERTY(Listbox, bool,
+
+ CEGUI_DEFINE_PROPERTY(Listbox, bool,
"ForceHorzScrollbar","Property to get/set the 'always show' setting for the horizontal scroll bar of the list box. Value is either \"True\" or \"False\".",
- &Listbox::setShowHorzScrollbar, &Listbox::isHorzScrollbarAlwaysShown, false
+ &Listbox::setShowHorzScrollbar, &Listbox::isHorzScrollbarAlwaysShown, false /* TODO: Inconsistency */
);
- CEGUI_DEFINE_PROPERTY(Listbox, bool,
+
+ CEGUI_DEFINE_PROPERTY(Listbox, bool,
"ItemTooltips","Property to access the show item tooltips setting of the list box. Value is either \"True\" or \"False\".",
- &Listbox::setItemTooltipsEnabled, &Listbox::isItemTooltipsEnabled, false
+ &Listbox::setItemTooltipsEnabled, &Listbox::isItemTooltipsEnabled, false /* TODO: Inconsistency */
);
}
diff -r 3492ef63e155 -r fffb8a6c4ac8 cegui/src/elements/CEGUIMenuBase.cpp
--- a/cegui/src/elements/CEGUIMenuBase.cpp Thu Aug 25 11:59:55 2011 +0200
+++ b/cegui/src/elements/CEGUIMenuBase.cpp Thu Aug 25 23:10:00 2011 +0200
@@ -116,16 +116,18 @@
*************************************************************************/
void MenuBase::addMenuBaseProperties(void)
{
- const String propertyOrigin("MenuBase");
+ const String propertyOrigin = "CEGUI/MenuBase";
CEGUI_DEFINE_PROPERTY(MenuBase, float,
"ItemSpacing", "Property to get/set the item spacing of the menu. Value is a float.",
&MenuBase::setItemSpacing, &MenuBase::getItemSpacing, 10.0f
);
+
CEGUI_DEFINE_PROPERTY(MenuBase, bool,
"AllowMultiplePopups", "Property to get/set the state of the allow multiple popups setting for the menu. Value is either \"True\" or \"False\".",
- &MenuBase::setAllowMultiplePopups, &MenuBase::isMultiplePopupsAllowed, false
+ &MenuBase::setAllowMultiplePopups, &MenuBase::isMultiplePopupsAllowed, false /* TODO: Inconsistency and awful English */
);
+
CEGUI_DEFINE_PROPERTY(MenuBase, bool,
"AutoCloseNestedPopups", "Property to set if the menu should close all its open child popups, when it gets hidden. Value is either \"True\" or \"False\".",
&MenuBase::setAutoCloseNestedPopups, &MenuBase::getAutoCloseNestedPopups, false
diff -r 3492ef63e155 -r fffb8a6c4ac8 cegui/src/elements/CEGUIMenuItem.cpp
--- a/cegui/src/elements/CEGUIMenuItem.cpp Thu Aug 25 11:59:55 2011 +0200
+++ b/cegui/src/elements/CEGUIMenuItem.cpp Thu Aug 25 23:10:00 2011 +0200
@@ -564,11 +564,13 @@
*************************************************************************/
void MenuItem::addMenuItemProperties(void)
{
- const String propertyOrigin("MenuItem");
+ const String& propertyOrigin = WidgetTypeName;
+
CEGUI_DEFINE_PROPERTY(MenuItem, UVector2,
"PopupOffset","Property to specify an offset for the popup menu position. Value is a UVector2 property value.",
&MenuItem::setPopupOffset, &MenuItem::getPopupOffset, UVector2::zero()
);
+
CEGUI_DEFINE_PROPERTY(MenuItem, float,
"AutoPopupTimeout","Property to specify the time, which has to elapse before the popup window is opened/closed if the hovering state changes. Value is a float property value.",
&MenuItem::setAutoPopupTimeout, &MenuItem::getAutoPopupTimeout, 0.0f
diff -r 3492ef63e155 -r fffb8a6c4ac8 cegui/src/elements/CEGUIMultiColumnList.cpp
--- a/cegui/src/elements/CEGUIMultiColumnList.cpp Thu Aug 25 11:59:55 2011 +0200
+++ b/cegui/src/elements/CEGUIMultiColumnList.cpp Thu Aug 25 23:10:00 2011 +0200
@@ -2194,21 +2194,22 @@
*************************************************************************/
void MultiColumnList::addMultiColumnListProperties(void)
{
- const String propertyOrigin("MultiColumnList");
+ const String& propertyOrigin = WidgetTypeName;
CEGUI_DEFINE_PROPERTY(MultiColumnList, bool,
"ColumnsSizable", "Property to get/set the setting for user sizing of the column headers. Value is either \"True\" or \"False\".",
- &MultiColumnList::setUserColumnSizingEnabled, &MultiColumnList::isUserColumnSizingEnabled, true
+ &MultiColumnList::setUserColumnSizingEnabled, &MultiColumnList::isUserColumnSizingEnabled, true /* TODO: Inconsistency */
);
CEGUI_DEFINE_PROPERTY(MultiColumnList, bool,
"ColumnsMovable", "Property to get/set the setting for user moving of the column headers. Value is either \"True\" or \"False\".",
- &MultiColumnList::setUserColumnDraggingEnabled, &MultiColumnList::isUserColumnDraggingEnabled, true
+ &MultiColumnList::setUserColumnDraggingEnabled, &MultiColumnList::isUserColumnDraggingEnabled, true /* TODO: Inconsistency */
);
+
CEGUI_DEFINE_PROPERTY(MultiColumnList, bool,
"SortSettingEnabled", "Property to get/set the setting for for user modification of the sort column & direction."
" Value is either \"True\" or \"False\".",
- &MultiColumnList::setUserSortControlEnabled, &MultiColumnList::isUserSortControlEnabled, true
+ &MultiColumnList::setUserSortControlEnabled, &MultiColumnList::isUserSortControlEnabled, true /* TODO: Inconsistency */
);
CEGUI_DEFINE_PROPERTY(MultiColumnList, ListHeaderSegment::SortDirection,
@@ -2220,18 +2221,18 @@
CEGUI_DEFINE_PROPERTY(MultiColumnList, bool,
"ForceVertScrollbar", "Property to get/set the 'always show' setting for the vertical scroll bar of the list box."
" Value is either \"True\" or \"False\".",
- &MultiColumnList::setShowVertScrollbar, &MultiColumnList::isVertScrollbarAlwaysShown, false
+ &MultiColumnList::setShowVertScrollbar, &MultiColumnList::isVertScrollbarAlwaysShown, false /* TODO: Inconsistency */
);
+
CEGUI_DEFINE_PROPERTY(MultiColumnList, bool,
"ForceHorzScrollbar", "Property to get/set the 'always show' setting for the horizontal scroll bar of the list box."
" Value is either \"True\" or \"False\".",
- &MultiColumnList::setShowHorzScrollbar, &MultiColumnList::isHorzScrollbarAlwaysShown, false
+ &MultiColumnList::setShowHorzScrollbar, &MultiColumnList::isHorzScrollbarAlwaysShown, false /* TODO: Inconsistency */
);
-
CEGUI_DEFINE_PROPERTY(MultiColumnList, uint,
"NominatedSelectionColumnID", "Property to get/set the nominated selection column (via ID). Value is an unsigned integer number.",
- &MultiColumnList::setNominatedSelectionColumn, &MultiColumnList::getNominatedSelectionColumnID, 0
+ &MultiColumnList::setNominatedSelectionColumn, &MultiColumnList::getNominatedSelectionColumnID, 0 /* TODO: Inconsistency */
);
CEGUI_DEFINE_PROPERTY(MultiColumnList, uint,
@@ -2241,7 +2242,7 @@
CEGUI_DEFINE_PROPERTY_NO_XML(MultiColumnList, uint,
"RowCount", "Property to access the number of rows in the list (read only)",
- 0, &MultiColumnList::getRowCount, 0
+ 0, &MultiColumnList::getRowCount, 0
);
CEGUI_DEFINE_PROPERTY(MultiColumnList, MultiColumnList::SelectionMode,
@@ -2250,10 +2251,9 @@
&MultiColumnList::setSelectionMode, &MultiColumnList::getSelectionMode, MultiColumnList::RowSingle
);
-
CEGUI_DEFINE_PROPERTY_NO_XML(MultiColumnList, String,
"ColumnHeader", "Property to set up a column (there is no getter for this property)",
- &MultiColumnList::addColumn, 0, ""
+ &MultiColumnList::addColumn, 0, "" /* TODO: This is quite a hack, isn't it? */
);
}
diff -r 3492ef63e155 -r fffb8a6c4ac8 cegui/src/elements/CEGUIMultiLineEditbox.cpp
--- a/cegui/src/elements/CEGUIMultiLineEditbox.cpp Thu Aug 25 11:59:55 2011 +0200
+++ b/cegui/src/elements/CEGUIMultiLineEditbox.cpp Thu Aug 25 23:10:00 2011 +0200
@@ -1616,16 +1616,18 @@
*************************************************************************/
void MultiLineEditbox::addMultiLineEditboxProperties(void)
{
-
- const String propertyOrigin("MultiLineEditbox");
+ const String& propertyOrigin = WidgetTypeName;
+
CEGUI_DEFINE_PROPERTY(MultiLineEditbox, bool,
"ReadOnly","Property to get/set the read-only setting for the Editbox. Value is either \"True\" or \"False\".",
&MultiLineEditbox::setReadOnly, &MultiLineEditbox::isReadOnly, false
);
+
CEGUI_DEFINE_PROPERTY(MultiLineEditbox, size_t,
"CaretIndex","Property to get/set the current caret index. Value is \"[uint]\".",
&MultiLineEditbox::setCaretIndex, &MultiLineEditbox::getCaretIndex, 0
);
+
CEGUI_DEFINE_PROPERTY(MultiLineEditbox, size_t,
"SelectionStart","Property to get/set the zero based index of the selection start position within the text. Value is \"[uint]\".",
&MultiLineEditbox::setSelectionStart, &MultiLineEditbox::getSelectionStartIndex, 0
@@ -1634,6 +1636,7 @@
"SelectionLength","Property to get/set the length of the selection (as a count of the number of code points selected). Value is \"[uint]\".",
&MultiLineEditbox::setSelectionLength, &MultiLineEditbox::getSelectionLength, 0
);
+
CEGUI_DEFINE_PROPERTY(MultiLineEditbox, size_t,
"MaxTextLength","Property to get/set the the maximum allowed text length (as a count of code points). Value is \"[uint]\".",
&MultiLineEditbox::setMaxTextLength, &MultiLineEditbox::getMaxTextLength, String().max_size()
@@ -1641,7 +1644,7 @@
CEGUI_DEFINE_PROPERTY(MultiLineEditbox, bool,
"WordWrap", "Property to get/set the word-wrap setting of the edit box. Value is either \"True\" or \"False\".",
- &MultiLineEditbox::setWordWrapping, &MultiLineEditbox::isWordWrapped, true
+ &MultiLineEditbox::setWordWrapping, &MultiLineEditbox::isWordWrapped, true /* TODO: Inconsistency */
);
CEGUI_DEFINE_PROPERTY(MultiLineEditbox, Image*,
@@ -1652,9 +1655,8 @@
CEGUI_DEFINE_PROPERTY(MultiLineEditbox, bool,
"ForceVertScrollbar", "Property to get/set the 'always show' setting for the vertical scroll bar of the list box."
"Value is either \"True\" or \"False\".",
- &MultiLineEditbox::setShowVertScrollbar, &MultiLineEditbox::isVertScrollbarAlwaysShown, false
+ &MultiLineEditbox::setShowVertScrollbar, &MultiLineEditbox::isVertScrollbarAlwaysShown, false /* TODO: Inconsistency */
);
-
}
/*************************************************************************
diff -r 3492ef63e155 -r fffb8a6c4ac8 cegui/src/elements/CEGUIPopupMenu.cpp
--- a/cegui/src/elements/CEGUIPopupMenu.cpp Thu Aug 25 11:59:55 2011 +0200
+++ b/cegui/src/elements/CEGUIPopupMenu.cpp Thu Aug 25 23:10:00 2011 +0200
@@ -380,12 +380,13 @@
*************************************************************************/
void PopupMenu::addPopupMenuProperties(void)
{
- const String propertyOrigin("PopupMenu");
+ const String& propertyOrigin = WidgetTypeName;
CEGUI_DEFINE_PROPERTY(PopupMenu, float,
"FadeInTime", "Property to get/set the fade in time in seconds of the popup menu. Value is a float.",
&PopupMenu::setFadeInTime, &PopupMenu::getFadeInTime, 0.0f
);
+
CEGUI_DEFINE_PROPERTY(PopupMenu, float,
"FadeOutTime", "Property to get/set the fade out time in seconds of the popup menu. Value is a float.",
&PopupMenu::setFadeOutTime, &PopupMenu::getFadeOutTime, 0.0f
diff -r 3492ef63e155 -r fffb8a6c4ac8 cegui/src/elements/CEGUIProgressBar.cpp
--- a/cegui/src/elements/CEGUIProgressBar.cpp Thu Aug 25 11:59:55 2011 +0200
+++ b/cegui/src/elements/CEGUIProgressBar.cpp Thu Aug 25 23:10:00 2011 +0200
@@ -112,12 +112,13 @@
*************************************************************************/
void ProgressBar::addProgressBarProperties(void)
{
- const String propertyOrigin("ProgressBar");
+ const String& propertyOrigin = WidgetTypeName;
CEGUI_DEFINE_PROPERTY(ProgressBar, float,
"CurrentProgress", "Property to get/set the current progress of the progress bar. Value is a float value between 0.0 and 1.0 specifying the progress.",
- &ProgressBar::setProgress, &ProgressBar::getProgress, 0.0f
+ &ProgressBar::setProgress, &ProgressBar::getProgress, 0.0f /* TODO: Inconsistency */
);
+
CEGUI_DEFINE_PROPERTY(ProgressBar, float,
"StepSize", "Property to get/set the step size setting for the progress bar. Value is a float value.",
&ProgressBar::setStepSize, &ProgressBar::getStepSize, 0.0f
diff -r 3492ef63e155 -r fffb8a6c4ac8 cegui/src/elements/CEGUIRadioButton.cpp
--- a/cegui/src/elements/CEGUIRadioButton.cpp Thu Aug 25 11:59:55 2011 +0200
+++ b/cegui/src/elements/CEGUIRadioButton.cpp Thu Aug 25 23:10:00 2011 +0200
@@ -216,7 +216,7 @@
*************************************************************************/
void RadioButton::addRadioButtonProperties(void)
{
- const String propertyOrigin("RadioButton");
+ const String& propertyOrigin = WidgetTypeName;
CEGUI_DEFINE_PROPERTY(RadioButton, bool,
"Selected", "Property to get/set the selected state of the RadioButton. Value is either \"True\" or \"False\".",
diff -r 3492ef63e155 -r fffb8a6c4ac8 cegui/src/elements/CEGUIScrollablePane.cpp
--- a/cegui/src/elements/CEGUIScrollablePane.cpp Thu Aug 25 11:59:55 2011 +0200
+++ b/cegui/src/elements/CEGUIScrollablePane.cpp Thu Aug 25 23:10:00 2011 +0200
@@ -507,27 +507,30 @@
//----------------------------------------------------------------------------//
void ScrollablePane::addScrollablePaneProperties(void)
{
- const String propertyOrigin("ScrollablePane");
+ const String& propertyOrigin = WidgetTypeName;
CEGUI_DEFINE_PROPERTY(ScrollablePane, bool,
"ForceVertScrollbar", "Property to get/set the 'always show' setting for the vertical scroll "
"bar of the tree. Value is either \"True\" or \"False\".",
- &ScrollablePane::setShowVertScrollbar, &ScrollablePane::isVertScrollbarAlwaysShown, false
+ &ScrollablePane::setShowVertScrollbar, &ScrollablePane::isVertScrollbarAlwaysShown, false /* TODO: Inconsistency */
);
+
CEGUI_DEFINE_PROPERTY(ScrollablePane, bool,
"ForceHorzScrollbar", "Property to get/set the 'always show' setting for the horizontal "
"scroll bar of the tree. Value is either \"True\" or \"False\".",
- &ScrollablePane::setShowHorzScrollbar, &ScrollablePane::isHorzScrollbarAlwaysShown, false
+ &ScrollablePane::setShowHorzScrollbar, &ScrollablePane::isHorzScrollbarAlwaysShown, false /* TODO: Inconsistency */
);
CEGUI_DEFINE_PROPERTY(ScrollablePane, float,
"HorzStepSize", "Property to get/set the step size for the horizontal Scrollbar. Value is a float.",
- &ScrollablePane::setHorizontalStepSize, &ScrollablePane::getHorizontalStepSize, 0.1f
+ &ScrollablePane::setHorizontalStepSize, &ScrollablePane::getHorizontalStepSize, 0.1f /* TODO: Inconsistency */
);
+
CEGUI_DEFINE_PROPERTY(ScrollablePane, float,
"HorzOverlapSize", "Property to get/set the overlap size for the horizontal Scrollbar. Value is a float.",
- &ScrollablePane::setHorizontalOverlapSize, &ScrollablePane::getHorizontalOverlapSize, 0.01f
+ &ScrollablePane::setHorizontalOverlapSize, &ScrollablePane::getHorizontalOverlapSize, 0.01f /* TODO: Inconsistency */
);
+
CEGUI_DEFINE_PROPERTY(ScrollablePane, float,
"HorzScrollPosition", "Property to get/set the scroll position of the horizontal Scrollbar as a fraction. Value is a float.",
&ScrollablePane::setHorizontalScrollPosition, &ScrollablePane::getHorizontalScrollPosition, 0.0f
@@ -535,15 +538,17 @@
CEGUI_DEFINE_PROPERTY(ScrollablePane, float,
"VertStepSize", "Property to get/set the step size for the vertical Scrollbar. Value is a float.",
- &ScrollablePane::setVerticalStepSize, &ScrollablePane::getHorizontalStepSize, 0.1f
+ &ScrollablePane::setVerticalStepSize, &ScrollablePane::getVerticalStepSize, 0.1f /* TODO: Inconsistency */
);
+
CEGUI_DEFINE_PROPERTY(ScrollablePane, float,
"VertOverlapSize", "Property to get/set the overlap size for the vertical Scrollbar. Value is a float.",
- &ScrollablePane::setVerticalOverlapSize, &ScrollablePane::getVerticalOverlapSize, 0.01f
+ &ScrollablePane::setVerticalOverlapSize, &ScrollablePane::getVerticalOverlapSize, 0.01f /* TODO: Inconsistency */
);
+
CEGUI_DEFINE_PROPERTY(ScrollablePane, float,
"VertScrollPosition", "Property to get/set the scroll position of the vertical Scrollbar as a fraction. Value is a float.",
- &ScrollablePane::setVerticalScrollPosition, &ScrollablePane::getVerticalScrollPosition, 0.0f
+ &ScrollablePane::setVerticalScrollPosition, &ScrollablePane::getVerticalScrollPosition, 0.0f /* TODO: Inconsistency */
);
CEGUI_DEFINE_PROPERTY(ScrollablePane, bool,
@@ -553,7 +558,7 @@
CEGUI_DEFINE_PROPERTY(ScrollablePane, Rectf,
"ContentArea", "Property to get/set the current content area rectangle of the content pane. Value is \"l:[float] t:[float] r:[float] b:[float]\" (where l is left, t is top, r is right, and b is bottom).",
- &ScrollablePane::setContentPaneArea, &ScrollablePane::getContentPaneArea, Rectf::zero()
+ &ScrollablePane::setContentPaneArea, &ScrollablePane::getContentPaneArea, Rectf::zero() /* TODO: Inconsistency */
);
}
diff -r 3492ef63e155 -r fffb8a6c4ac8 cegui/src/elements/CEGUIScrollbar.cpp
--- a/cegui/src/elements/CEGUIScrollbar.cpp Thu Aug 25 11:59:55 2011 +0200
+++ b/cegui/src/elements/CEGUIScrollbar.cpp Thu Aug 25 23:10:00 2011 +0200
@@ -298,28 +298,33 @@
//----------------------------------------------------------------------------//
void Scrollbar::addScrollbarProperties(void)
{
- const String propertyOrigin("Scrollbar");
+ const String& propertyOrigin = WidgetTypeName;
CEGUI_DEFINE_PROPERTY(Scrollbar, float,
"DocumentSize", "Property to get/set the document size for the Scrollbar. Value is a float.",
&Scrollbar::setDocumentSize, &Scrollbar::getDocumentSize, 1.0f
);
+
CEGUI_DEFINE_PROPERTY(Scrollbar, float,
"PageSize", "Property to get/set the page size for the Scrollbar. Value is a float.",
&Scrollbar::setPageSize, &Scrollbar::getPageSize, 0.0f
);
+
CEGUI_DEFINE_PROPERTY(Scrollbar, float,
"StepSize", "Property to get/set the step size for the Scrollbar. Value is a float.",
&Scrollbar::setStepSize, &Scrollbar::getStepSize, 1.0f
);
+
CEGUI_DEFINE_PROPERTY(Scrollbar, float,
"OverlapSize", "Property to get/set the overlap size for the Scrollbar. Value is a float.",
&Scrollbar::setOverlapSize, &Scrollbar::getOverlapSize, 0.0f
);
+
CEGUI_DEFINE_PROPERTY(Scrollbar, float,
"ScrollPosition", "Property to get/set the scroll position of the Scrollbar. Value is a float.",
&Scrollbar::setScrollPosition, &Scrollbar::getScrollPosition, 0.0f
);
+
CEGUI_DEFINE_PROPERTY(Scrollbar, bool,
"EndLockEnabled", "Property to get/set the 'end lock' mode setting for the Scrollbar. "
"Value is either \"True\" or \"False\".",
diff -r 3492ef63e155 -r fffb8a6c4ac8 cegui/src/elements/CEGUIScrolledContainer.cpp
--- a/cegui/src/elements/CEGUIScrolledContainer.cpp Thu Aug 25 11:59:55 2011 +0200
+++ b/cegui/src/elements/CEGUIScrolledContainer.cpp Thu Aug 25 23:10:00 2011 +0200
@@ -261,11 +261,13 @@
" Value is either \"True\" or \"False\".",
&ScrolledContainer::setContentPaneAutoSized, &ScrolledContainer::isContentPaneAutoSized, true
);
+
CEGUI_DEFINE_PROPERTY(ScrolledContainer, Rectf,
"ContentArea", "Property to get/set the current content area rectangle of the content pane."
" Value is \"l:[float] t:[float] r:[float] b:[float]\" (where l is left, t is top, r is right, and b is bottom).",
&ScrolledContainer::setContentArea, &ScrolledContainer::getContentArea, Rectf::zero()
);
+
CEGUI_DEFINE_PROPERTY(ScrolledContainer, Rectf,
"ChildExtentsArea", "Property to get the current content extents rectangle."
" Value is \"l:[float] t:[float] r:[float] b:[float]\" (where l is left, t is top, r is right, and b is bottom).",
diff -r 3492ef63e155 -r fffb8a6c4ac8 cegui/src/elements/CEGUIScrolledItemListBase.cpp
--- a/cegui/src/elements/CEGUIScrolledItemListBase.cpp Thu Aug 25 11:59:55 2011 +0200
+++ b/cegui/src/elements/CEGUIScrolledItemListBase.cpp Thu Aug 25 23:10:00 2011 +0200
@@ -297,16 +297,16 @@
*************************************************************************/
void ScrolledItemListBase::addScrolledItemListBaseProperties()
{
-
- const String propertyOrigin("ScrolledItemListBase");
+ const String propertyOrigin = "CEGUI/ScrolledItemListBase";
CEGUI_DEFINE_PROPERTY(ScrolledItemListBase, bool,
"ForceVertScrollbar", "Property to get/set the state of the force vertical scrollbar setting for the ScrolledItemListBase. Value is either \"True\" or \"False\".",
- &ScrolledItemListBase::setShowVertScrollbar, &ScrolledItemListBase::isVertScrollbarAlwaysShown, false
+ &ScrolledItemListBase::setShowVertScrollbar, &ScrolledItemListBase::isVertScrollbarAlwaysShown, false /* TODO: Inconsistency */
);
+
CEGUI_DEFINE_PROPERTY(ScrolledItemListBase, bool,
"ForceHorzScrollbar", "Property to get/set the state of the force horizontal scrollbar setting for the ScrolledItemListBase. Value is either \"True\" or \"False\".",
- &ScrolledItemListBase::setShowHorzScrollbar, &ScrolledItemListBase::isHorzScrollbarAlwaysShown, false
+ &ScrolledItemListBase::setShowHorzScrollbar, &ScrolledItemListBase::isHorzScrollbarAlwaysShown, false /* TODO: Inconsistency */
);
}
diff -r 3492ef63e155 -r fffb8a6c4ac8 cegui/src/elements/CEGUISlider.cpp
--- a/cegui/src/elements/CEGUISlider.cpp Thu Aug 25 11:59:55 2011 +0200
+++ b/cegui/src/elements/CEGUISlider.cpp Thu Aug 25 23:10:00 2011 +0200
@@ -254,20 +254,21 @@
*************************************************************************/
void Slider::addSliderProperties(void)
{
-
- const String propertyOrigin("Slider");
+ const String& propertyOrigin = WidgetTypeName;
CEGUI_DEFINE_PROPERTY(Slider, float,
"CurrentValue", "Property to get/set the current value of the slider. Value is a float.",
&Slider::setCurrentValue, &Slider::getCurrentValue, 0.0f
);
+
CEGUI_DEFINE_PROPERTY(Slider, float,
"MaximumValue", "Property to get/set the maximum value of the slider. Value is a float.",
- &Slider::setMaxValue, &Slider::getMaxValue, 1.0f
+ &Slider::setMaxValue, &Slider::getMaxValue, 1.0f /* TODO: Inconsistency */
);
+
CEGUI_DEFINE_PROPERTY(Slider, float,
"ClickStepSize", "Property to get/set the click-step size for the slider. Value is a float.",
- &Slider::setClickStep, &Slider::getClickStep, 0.01f
+ &Slider::setClickStep, &Slider::getClickStep, 0.01f /* TODO: Inconsistency */
);
}
diff -r 3492ef63e155 -r fffb8a6c4ac8 cegui/src/elements/CEGUISpinner.cpp
--- a/cegui/src/elements/CEGUISpinner.cpp Thu Aug 25 11:59:55 2011 +0200
+++ b/cegui/src/elements/CEGUISpinner.cpp Thu Aug 25 23:10:00 2011 +0200
@@ -207,29 +207,32 @@
void Spinner::addSpinnerProperties(void)
{
- const String propertyOrigin("Spinner");
+ const String& propertyOrigin = WidgetTypeName;
CEGUI_DEFINE_PROPERTY(Spinner, double,
"CurrentValue", "Property to get/set the current value of the spinner. Value is a float.",
&Spinner::setCurrentValue, &Spinner::getCurrentValue, 0.0f
);
+
CEGUI_DEFINE_PROPERTY(Spinner, double,
"StepSize", "Property to get/set the step size of the spinner. Value is a float.",
&Spinner::setStepSize, &Spinner::getStepSize, 1.0f
);
+
CEGUI_DEFINE_PROPERTY(Spinner, double,
"MinimumValue", "Property to get/set the minimum value setting of the spinner. Value is a float.",
&Spinner::setMinimumValue, &Spinner::getMinimumValue, -32768.000000f
);
+
CEGUI_DEFINE_PROPERTY(Spinner, double,
"MaximumValue", "Property to get/set the maximum value setting of the spinner. Value is a float.",
&Spinner::setMaximumValue, &Spinner::getMaximumValue, 32767.000000f
);
+
CEGUI_DEFINE_PROPERTY(Spinner, Spinner::TextInputMode,
"TextInputMode", "Property to get/set the TextInputMode setting for the spinner. Value is \"FloatingPoint\", \"Integer\", \"Hexadecimal\", or \"Octal\".",
&Spinner::setTextInputMode, &Spinner::getTextInputMode, Spinner::Integer
);
-
}
double Spinner::getValueFromText(void) const
diff -r 3492ef63e155 -r fffb8a6c4ac8 cegui/src/elements/CEGUITabControl.cpp
--- a/cegui/src/elements/CEGUITabControl.cpp Thu Aug 25 11:59:55 2011 +0200
+++ b/cegui/src/elements/CEGUITabControl.cpp Thu Aug 25 23:10:00 2011 +0200
@@ -433,16 +433,18 @@
*************************************************************************/
void TabControl::addTabControlProperties(void)
{
- const String propertyOrigin("TabControl");
+ const String& propertyOrigin = WidgetTypeName;
CEGUI_DEFINE_PROPERTY(TabControl, UDim,
"TabHeight", "Property to get/set the height of the tabs.",
&TabControl::setTabHeight, &TabControl::getTabHeight, UDim(0.05f,0.0f)
);
+
CEGUI_DEFINE_PROPERTY(TabControl, UDim,
"TabTextPadding", "Property to get/set the padding either side of the tab buttons.",
&TabControl::setTabTextPadding, &TabControl::getTabTextPadding, UDim(0.0f,0.5f)
);
+
CEGUI_DEFINE_PROPERTY(TabControl, TabPanePosition,
"TabPanePosition", "Property to get/set the position of the buttons pane.",
&TabControl::setTabPanePosition, &TabControl::getTabPanePosition, TabControl::Top
diff -r 3492ef63e155 -r fffb8a6c4ac8 cegui/src/elements/CEGUIThumb.cpp
--- a/cegui/src/elements/CEGUIThumb.cpp Thu Aug 25 11:59:55 2011 +0200
+++ b/cegui/src/elements/CEGUIThumb.cpp Thu Aug 25 23:10:00 2011 +0200
@@ -312,28 +312,31 @@
*************************************************************************/
void Thumb::addThumbProperties(void)
{
- const String propertyOrigin("Thumb");
+ const String& propertyOrigin = WidgetTypeName;
+
CEGUI_DEFINE_PROPERTY(Thumb, bool,
"HotTracked", "Property to get/set the state of the state of the 'hot-tracked' setting for the thumb."
" Value is either \"True\" or \"False\".",
&Thumb::setHotTracked, &Thumb::isHotTracked, true
);
- typedef std::pair<float,float> range;
+
+ typedef std::pair<float,float> range;
+
CEGUI_DEFINE_PROPERTY(Thumb, range,
"VertRange", "Property to get/set the vertical movement range for the thumb. Value is \"min:[float] max:[float]\".",
- &Thumb::setVertRange, &Thumb::getVertRange, range(0.0f,1.0f)
+ &Thumb::setVertRange, &Thumb::getVertRange, range(0.0f, 1.0f)
);
CEGUI_DEFINE_PROPERTY(Thumb, range,
"HorzRange", "Property to get/set the horizontal movement range for the thumb. Value is \"min:[float] max:[float]\".",
- &Thumb::setVertRange, &Thumb::getVertRange, range(0.0f,1.0f)
+ &Thumb::setHorzRange, &Thumb::getHorzRange, range(0.0f, 1.0f)
);
-
CEGUI_DEFINE_PROPERTY(Thumb, bool,
"VertFree", "Property to get/set the state the setting to free the thumb vertically. Value is either \"True\" or \"False\".",
&Thumb::setVertFree, &Thumb::isVertFree, false
);
+
CEGUI_DEFINE_PROPERTY(Thumb, bool,
"HorzFree", "Property to get/set the state the setting to free the thumb horizontally. Value is either \"True\" or \"False\".",
&Thumb::setHorzFree, &Thumb::isHorzFree, false
diff -r 3492ef63e155 -r fffb8a6c4ac8 cegui/src/elements/CEGUITitlebar.cpp
--- a/cegui/src/elements/CEGUITitlebar.cpp Thu Aug 25 11:59:55 2011 +0200
+++ b/cegui/src/elements/CEGUITitlebar.cpp Thu Aug 25 23:10:00 2011 +0200
@@ -235,8 +235,7 @@
*************************************************************************/
void Titlebar::addTitlebarProperties(void)
{
-
- const String propertyOrigin("Titlebar");
+ const String& propertyOrigin = WidgetTypeName;
CEGUI_DEFINE_PROPERTY(Titlebar, bool,
"DraggingEnabled", "Property to get/set the state of the dragging enabled setting for the Titlebar. Value is either \"True\" or \"False\".",
diff -r 3492ef63e155 -r fffb8a6c4ac8 cegui/src/elements/CEGUITooltip.cpp
--- a/cegui/src/elements/CEGUITooltip.cpp Thu Aug 25 11:59:55 2011 +0200
+++ b/cegui/src/elements/CEGUITooltip.cpp Thu Aug 25 23:10:00 2011 +0200
@@ -389,7 +389,7 @@
void Tooltip::addTooltipProperties(void)
{
- const String propertyOrigin("Tooltip");
+ const String& propertyOrigin = WidgetTypeName;
CEGUI_DEFINE_PROPERTY(Tooltip, float,
"HoverTime", "Property to get/set the hover timeout value in seconds. Value is a float.",
diff -r 3492ef63e155 -r fffb8a6c4ac8 cegui/src/elements/CEGUITree.cpp
--- a/cegui/src/elements/CEGUITree.cpp Thu Aug 25 11:59:55 2011 +0200
+++ b/cegui/src/elements/CEGUITree.cpp Thu Aug 25 23:10:00 2011 +0200
@@ -1286,32 +1286,36 @@
*************************************************************************/
void Tree::addTreeProperties(void)
{
- const String propertyOrigin("Tree");
+ const String& propertyOrigin = WidgetTypeName;
CEGUI_DEFINE_PROPERTY(Tree, bool,
"Sort", "Property to get/set the sort setting of the tree. "
"Value is either \"True\" or \"False\".",
- &Tree::setSortingEnabled, &Tree::isSortEnabled, false
+ &Tree::setSortingEnabled, &Tree::isSortEnabled, false /* TODO: Inconsistency */
);
+
CEGUI_DEFINE_PROPERTY(Tree, bool,
"MultiSelect", "Property to get/set the multi-select setting of the tree. "
"Value is either \"True\" or \"False\".",
- &Tree::setMultiselectEnabled, &Tree::isMultiselectEnabled, false
+ &Tree::setMultiselectEnabled, &Tree::isMultiselectEnabled, false /* TODO: Inconsistency */
);
+
CEGUI_DEFINE_PROPERTY(Tree, bool,
"ForceVertScrollbar", "Property to get/set the 'always show' setting for the vertical scroll "
"bar of the tree. Value is either \"True\" or \"False\".",
- &Tree::setShowVertScrollbar, &Tree::isVertScrollbarAlwaysShown, false
+ &Tree::setShowVertScrollbar, &Tree::isVertScrollbarAlwaysShown, false /* TODO: Inconsistency */
);
+
CEGUI_DEFINE_PROPERTY(Tree, bool,
"ForceHorzScrollbar", "Property to get/set the 'always show' setting for the horizontal "
"scroll bar of the tree. Value is either \"True\" or \"False\".",
- &Tree::setShowHorzScrollbar, &Tree::isHorzScrollbarAlwaysShown, false
+ &Tree::setShowHorzScrollbar, &Tree::isHorzScrollbarAlwaysShown, false /* TODO: Inconsistency */
);
+
CEGUI_DEFINE_PROPERTY(Tree, bool,
"ItemTooltips", "Property to access the show item tooltips setting of the tree. "
"Value is either \"True\" or \"False\".",
- &Tree::setItemTooltipsEnabled, &Tree::isItemTooltipsEnabled, false
+ &Tree::setItemTooltipsEnabled, &Tree::isItemTooltipsEnabled, false /* TODO: Inconsistency */
);
}
|