aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--src/modules/objects/KvsObject_comboBox.cpp6
-rw-r--r--src/modules/objects/KvsObject_comboBox.h2
-rw-r--r--src/modules/objects/KvsObject_listWidget.cpp6
-rw-r--r--src/modules/objects/KvsObject_listWidget.h2
-rw-r--r--src/modules/objects/KvsObject_menuBar.cpp6
-rw-r--r--src/modules/objects/KvsObject_menuBar.h2
-rw-r--r--src/modules/objects/KvsObject_popupMenu.cpp24
-rw-r--r--src/modules/objects/KvsObject_popupMenu.h4
-rw-r--r--src/modules/objects/KvsObject_treeWidgeteItem.h2
-rw-r--r--src/modules/objects/KvsObject_widget.cpp8
10 files changed, 31 insertions, 31 deletions
diff --git a/src/modules/objects/KvsObject_comboBox.cpp b/src/modules/objects/KvsObject_comboBox.cpp
index 9cd49b01c..7bda7adf4 100644
--- a/src/modules/objects/KvsObject_comboBox.cpp
+++ b/src/modules/objects/KvsObject_comboBox.cpp
@@ -49,7 +49,7 @@
[class]widget[/class]
@description:
@functions:
- !fn: $addAction(<text:string>, <index:int>)
+ !fn: $insertItem(<text:string>, <index:int>)
Inserts a text item at position <index>. If index is negative or
not specified the item is appended.
!fn: $changeItem(<text:string>, <index:uint>)
@@ -99,7 +99,7 @@
*/
KVSO_BEGIN_REGISTERCLASS(KvsObject_comboBox,"combobox","widget")
- KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_comboBox,addAction)
+ KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_comboBox,insertItem)
KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_comboBox,changeItem)
KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_comboBox,removeItem)
KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_comboBox,clear)
@@ -139,7 +139,7 @@ bool KvsObject_comboBox::init(KviKvsRunTimeContext *,KviKvsVariantList *)
return true;
}
-KVSO_CLASS_FUNCTION(comboBox,addAction)
+KVSO_CLASS_FUNCTION(comboBox,insertItem)
{
CHECK_INTERNAL_POINTER(widget())
kvs_int_t iIndex;
diff --git a/src/modules/objects/KvsObject_comboBox.h b/src/modules/objects/KvsObject_comboBox.h
index c9aa9a382..cd178310a 100644
--- a/src/modules/objects/KvsObject_comboBox.h
+++ b/src/modules/objects/KvsObject_comboBox.h
@@ -41,7 +41,7 @@ public:
protected:
virtual bool init(KviKvsRunTimeContext * pContext,KviKvsVariantList *pParams);
- bool addAction(KviKvsObjectFunctionCall *c);
+ bool insertItem(KviKvsObjectFunctionCall *c);
bool changeItem(KviKvsObjectFunctionCall *c);
bool removeItem(KviKvsObjectFunctionCall *c);
bool clear(KviKvsObjectFunctionCall *c);
diff --git a/src/modules/objects/KvsObject_listWidget.cpp b/src/modules/objects/KvsObject_listWidget.cpp
index 7570a3b11..709a8b24c 100644
--- a/src/modules/objects/KvsObject_listWidget.cpp
+++ b/src/modules/objects/KvsObject_listWidget.cpp
@@ -106,7 +106,7 @@ const char * const itemflags_tbl[] = {
Returns '1' if the eventual item check box is checked, '0' otherwise.[br]
!fn: <string> $selectionMode()
Returns the current selection mode
- !fn: $addAction(<text:string>, <index:uint>)
+ !fn: $insertItem(<text:string>, <index:uint>)
Inserts a text item at position <index>. If index is negative or
not specified the item is appended.
!fn: $changeItem(<text:string>, <index:uint>)
@@ -156,7 +156,7 @@ const char * const itemflags_tbl[] = {
KVSO_BEGIN_REGISTERCLASS(KvsObject_listWidget,"listbox","widget")
- KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_listWidget,addAction)
+ KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_listWidget,insertItem)
KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_listWidget,insertWidgetItem)
KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_listWidget,changeItem)
KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_listWidget,removeItem)
@@ -214,7 +214,7 @@ bool KvsObject_listWidget::init(KviKvsRunTimeContext *,KviKvsVariantList *)
return true;
}
-KVSO_CLASS_FUNCTION(listWidget,addAction)
+KVSO_CLASS_FUNCTION(listWidget,insertItem)
{
CHECK_INTERNAL_POINTER(widget())
kvs_int_t iRow;
diff --git a/src/modules/objects/KvsObject_listWidget.h b/src/modules/objects/KvsObject_listWidget.h
index 79031639c..d27653431 100644
--- a/src/modules/objects/KvsObject_listWidget.h
+++ b/src/modules/objects/KvsObject_listWidget.h
@@ -40,7 +40,7 @@ protected:
virtual bool init(KviKvsRunTimeContext * pContext,KviKvsVariantList *pParams);
- bool addAction(KviKvsObjectFunctionCall *c);
+ bool insertItem(KviKvsObjectFunctionCall *c);
bool changeItem(KviKvsObjectFunctionCall *c);
bool removeItem(KviKvsObjectFunctionCall *c);
bool count(KviKvsObjectFunctionCall *c);
diff --git a/src/modules/objects/KvsObject_menuBar.cpp b/src/modules/objects/KvsObject_menuBar.cpp
index 69c2257fc..306a8a451 100644
--- a/src/modules/objects/KvsObject_menuBar.cpp
+++ b/src/modules/objects/KvsObject_menuBar.cpp
@@ -42,12 +42,12 @@
@description:
@functions:
- !fn: <integer> $addAction(<text:string>)
+ !fn: <integer> $insertItem(<text:string>)
Returns an integer that identifies the inserted item.
*/
KVSO_BEGIN_REGISTERCLASS(KvsObject_menuBar,"menubar","widget")
- KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_menuBar,addAction)
+ KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_menuBar,insertItem)
KVSO_END_REGISTERCLASS(KvsObject_menuBar)
KVSO_BEGIN_CONSTRUCTOR(KvsObject_menuBar,KvsObject_widget)
@@ -65,7 +65,7 @@ bool KvsObject_menuBar::init(KviKvsRunTimeContext *,KviKvsVariantList *)
return true;
}
-KVSO_CLASS_FUNCTION(menuBar,addAction)
+KVSO_CLASS_FUNCTION(menuBar,insertItem)
{
CHECK_INTERNAL_POINTER(widget())
QString szItem;
diff --git a/src/modules/objects/KvsObject_menuBar.h b/src/modules/objects/KvsObject_menuBar.h
index 820491a18..f2348a248 100644
--- a/src/modules/objects/KvsObject_menuBar.h
+++ b/src/modules/objects/KvsObject_menuBar.h
@@ -37,6 +37,6 @@ public:
protected:
virtual bool init(KviKvsRunTimeContext * pContext,KviKvsVariantList *pParams);
- bool addAction(KviKvsObjectFunctionCall *c);
+ bool insertItem(KviKvsObjectFunctionCall *c);
};
#endif // !_CLASS_MENUBAR_H_
diff --git a/src/modules/objects/KvsObject_popupMenu.cpp b/src/modules/objects/KvsObject_popupMenu.cpp
index 891404f3e..fa1930c87 100644
--- a/src/modules/objects/KvsObject_popupMenu.cpp
+++ b/src/modules/objects/KvsObject_popupMenu.cpp
@@ -52,9 +52,9 @@
[class]widget[/class]
@description:
This widget can be used to display a popup menu.Technically, a popup menu consists of a list of menu items.[br]
- You add items with addAction(). An item is either a string. In addition, items can have an optional icon drawn on the very left side.[br]
+ You add items with insertItem(). An item is either a string. In addition, items can have an optional icon drawn on the very left side.[br]
@functions:
- !fn: $addAction(<text:string>,[icon_id:string])
+ !fn: $insertItem(<text:string>,[icon_id:string])
Inserts menu items into a popup menu with optional icon and return the popup identifier.
!fn: $addMenu(<popupmenu:hobject,[idx:uinteger])
Add a popupmenu.
@@ -68,7 +68,7 @@
Removes the menu item that has the identifier id.
!fn: $removeItemAt(<index:uinteger>)
Removes the menu item at position index.
- !fn: $addSeparator(<index:uinteger>)
+ !fn: $insertSeparator(<index:uinteger>)
Inserts a separator at position index.[br]
If the index is negative the separator becomes the last menu item.
!fn: $activatedEvent(<popup_id:uinteger>)
@@ -91,11 +91,11 @@
constructor()
{
// we store the item's id for checkit in activatedEvent
- @%tile_id=@$addAction("Tile",118)
- @%cascade_id=@$addAction("Cascade",115)
- @$addSeparator(3)
- @%closeactw_id=@$addAction("Close Active Window",08)
- @%closeallw_id=@$addAction("Close All Window",58)
+ @%tile_id=@$insertItem("Tile",118)
+ @%cascade_id=@$insertItem("Cascade",115)
+ @$insertSeparator(3)
+ @%closeactw_id=@$insertItem("Close Active Window",08)
+ @%closeallw_id=@$insertItem("Close All Window",58)
}
activatedEvent()
{
@@ -197,10 +197,10 @@ static void removeAction(int idx)
KVSO_BEGIN_REGISTERCLASS(KvsObject_popupMenu,"popupmenu","widget")
- KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_popupMenu,addAction)
+ KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_popupMenu,insertItem)
KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_popupMenu,setTitle)
KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_popupMenu,exec)
- KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_popupMenu,addSeparator)
+ KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_popupMenu,insertSeparator)
KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_popupMenu,removeItem)
KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_popupMenu,addMenu)
@@ -228,7 +228,7 @@ bool KvsObject_popupMenu::init(KviKvsRunTimeContext *,KviKvsVariantList *)
return true;
}
-KVSO_CLASS_FUNCTION(popupMenu,addAction)
+KVSO_CLASS_FUNCTION(popupMenu,insertItem)
{
CHECK_INTERNAL_POINTER(widget())
QString szItem,szIcon;
@@ -348,7 +348,7 @@ KVSO_CLASS_FUNCTION(popupMenu,removeItem)
return true;
}
-KVSO_CLASS_FUNCTION(popupMenu,addSeparator)
+KVSO_CLASS_FUNCTION(popupMenu,insertSeparator)
{
CHECK_INTERNAL_POINTER(widget())
kvs_uint_t iIndex;
diff --git a/src/modules/objects/KvsObject_popupMenu.h b/src/modules/objects/KvsObject_popupMenu.h
index 20c547d60..732d43f26 100644
--- a/src/modules/objects/KvsObject_popupMenu.h
+++ b/src/modules/objects/KvsObject_popupMenu.h
@@ -44,13 +44,13 @@ public:
protected:
virtual bool init(KviKvsRunTimeContext * pContext,KviKvsVariantList *pParams);
- bool addAction(KviKvsObjectFunctionCall *c);
+ bool insertItem(KviKvsObjectFunctionCall *c);
bool setTitle(KviKvsObjectFunctionCall *c);
bool addMenu(KviKvsObjectFunctionCall *c);
bool exec(KviKvsObjectFunctionCall *c);
bool removeItem(KviKvsObjectFunctionCall *c);
bool removeItemAt(KviKvsObjectFunctionCall *c);
- bool addSeparator(KviKvsObjectFunctionCall *c);
+ bool insertSeparator(KviKvsObjectFunctionCall *c);
bool activatedEvent(KviKvsObjectFunctionCall *c);
bool highlightedEvent(KviKvsObjectFunctionCall *c);
diff --git a/src/modules/objects/KvsObject_treeWidgeteItem.h b/src/modules/objects/KvsObject_treeWidgeteItem.h
index 98491f6a4..4c99d5049 100644
--- a/src/modules/objects/KvsObject_treeWidgeteItem.h
+++ b/src/modules/objects/KvsObject_treeWidgeteItem.h
@@ -42,7 +42,7 @@ protected:
virtual bool init(KviKvsRunTimeContext * pContext,KviKvsVariantList *pParams);
protected:
bool setText(KviKvsObjectFunctionCall *c);
- bool addAction(KviKvsObjectFunctionCall *c);
+ bool insertItem(KviKvsObjectFunctionCall *c);
bool setPixmap(KviKvsObjectFunctionCall *c);
bool setItemEditable(KviKvsObjectFunctionCall *c);
bool isItemEditable(KviKvsObjectFunctionCall *c);
diff --git a/src/modules/objects/KvsObject_widget.cpp b/src/modules/objects/KvsObject_widget.cpp
index 7aca679ad..3a9fa11c4 100644
--- a/src/modules/objects/KvsObject_widget.cpp
+++ b/src/modules/objects/KvsObject_widget.cpp
@@ -550,12 +550,12 @@ const char * const widgettypes_tbl[] = {
%checkbox->$setText("This is a checkbox")
%combobox = $new(combobox,%box)
- %combobox->$addAction("This is a combobox")
- %combobox->$addAction("This is a combobox's item")
+ %combobox->$insertItem("This is a combobox")
+ %combobox->$insertItem("This is a combobox's item")
%listbox = $new(listbox,%box)
- %listbox->$addAction("This is a listbox item")
- %listbox->$addAction("This is another item")
+ %listbox->$insertItem("This is a listbox item")
+ %listbox->$insertItem("This is another item")
%radiobutton = $new(radiobutton,%box)
%radiobutton->$setText("This is a radiobutton")
generated by cgit v1.3.1-10-gc9f91 (git 2.54.0) at 2026-08-08 05:36:06 +0000