diff options
Diffstat (limited to 'src/modules')
| -rw-r--r-- | src/modules/objects/class_button.cpp | 4 | ||||
| -rw-r--r-- | src/modules/objects/class_buttongroup.cpp | 6 | ||||
| -rw-r--r-- | src/modules/objects/class_combobox.cpp | 12 | ||||
| -rw-r--r-- | src/modules/objects/class_window.cpp | 17 | ||||
| -rw-r--r-- | src/modules/objects/class_window.h | 4 | ||||
| -rw-r--r-- | src/modules/objects/class_wizard.cpp | 94 | ||||
| -rw-r--r-- | src/modules/objects/class_wizard.h | 28 |
7 files changed, 86 insertions, 79 deletions
diff --git a/src/modules/objects/class_button.cpp b/src/modules/objects/class_button.cpp index 38b98a0f2..2e439a546 100644 --- a/src/modules/objects/class_button.cpp +++ b/src/modules/objects/class_button.cpp @@ -122,13 +122,13 @@ KVSO_CLASS_FUNCTION(button,setImage) KviKvsObject *pObject=KviKvsKernel::instance()->objectController()->lookupObject(hObj); if (!pObject) { - c->warning(__tr2qs("Pixmap parameter is not an object!")); + c->warning(__tr2qs_ctx("Pixmap parameter is not an object!","object")); return true; } if(pObject->inherits("KviKvsObject_pixmap")) ((QPushButton *)widget())->setIcon(QIcon(*((KviKvsObject_pixmap *)pObject)->getPixmap())); else{ - c->warning(__tr2qs("Object Pixmap required!")); + c->warning(__tr2qs_ctx("Object Pixmap required!","object")); } return true; } diff --git a/src/modules/objects/class_buttongroup.cpp b/src/modules/objects/class_buttongroup.cpp index bbbd1df21..9c41bdb52 100644 --- a/src/modules/objects/class_buttongroup.cpp +++ b/src/modules/objects/class_buttongroup.cpp @@ -84,12 +84,12 @@ KVSO_CLASS_FUNCTION(buttongroup,addButton) pObject=KviKvsKernel::instance()->objectController()->lookupObject(hObject); if (!pObject) { - c->warning(__tr2qs("Widget parameter is not an object")); + c->warning(__tr2qs_ctx("Widget parameter is not an object","object")); return true; } if (!pObject->object()) { - c->warning(__tr2qs("Widget parameter is not a valid object")); + c->warning(__tr2qs_ctx("Widget parameter is not a valid object","object")); return true; } if(!pObject->object()->isWidgetType()) @@ -104,7 +104,7 @@ KVSO_CLASS_FUNCTION(buttongroup,addButton) m_iId++; } else{ - c->warning(__tr2qs("Buttongroup support only checkbox and radiobox object")); + c->warning(__tr2qs_ctx("Buttongroup support only checkbox and radiobox object","object")); return true; } return true; diff --git a/src/modules/objects/class_combobox.cpp b/src/modules/objects/class_combobox.cpp index 6a2b54ea3..7a2686341 100644 --- a/src/modules/objects/class_combobox.cpp +++ b/src/modules/objects/class_combobox.cpp @@ -171,11 +171,11 @@ KVSO_CLASS_FUNCTION(combobox,changeItem) KVSO_PARAMETER("text",KVS_PT_STRING,0,szText) KVSO_PARAMETER("index",KVS_PT_UNSIGNEDINTEGER,0,uIndex) KVSO_PARAMETERS_END(c) - if (szText.isEmpty()) c->warning(__tr2qs("No string parameter given - using empty string")); + if (szText.isEmpty()) c->warning(__tr2qs_ctx("No string parameter given - using empty string","object")); if(uIndex >= (cnt = ((QComboBox *)widget())->count())) { - c->warning(__tr2qs("Item index [%d] is too big - defaulting to " \ - "$count() - 1 [%d]"), uIndex, cnt); + c->warning(__tr2qs_ctx("Item index [%d] is too big - defaulting to " \ + "$count() - 1 [%d]","object"), uIndex, cnt); uIndex = cnt - 1; } ((QComboBox *)widget())->setItemText( uIndex,szText); @@ -191,8 +191,8 @@ KVSO_CLASS_FUNCTION(combobox,removeItem) KVSO_PARAMETERS_END(c) if(uIndex >= (cnt = ((QComboBox *)widget())->count())) { - c->warning(__tr2qs("Item index [%d] is too big - defaulting to " \ - "$count() - 1 [%d]"), uIndex, cnt); + c->warning(__tr2qs_ctx("Item index [%d] is too big - defaulting to " \ + "$count() - 1 [%d]","object"), uIndex, cnt); uIndex = cnt - 1; } @@ -328,7 +328,7 @@ KVSO_CLASS_FUNCTION(combobox,setInsertionPolicy) ((QComboBox *)widget())->setInsertPolicy(QComboBox::InsertAfterCurrent); else if(KviQString::equalCI(szPolicy,"BeforeCurrent")) ((QComboBox *)widget())->setInsertPolicy(QComboBox::InsertBeforeCurrent); - else c->warning(__tr2qs("Invalid insertion Policy %Q"),&szPolicy); + else c->warning(__tr2qs_ctx("Invalid insertion Policy %Q","object"),&szPolicy); return true; } diff --git a/src/modules/objects/class_window.cpp b/src/modules/objects/class_window.cpp index b33bdd952..9108ca47f 100644 --- a/src/modules/objects/class_window.cpp +++ b/src/modules/objects/class_window.cpp @@ -96,10 +96,8 @@ void KviKvsScriptWindowWindow::centralWidgetDestroyed() KVSO_BEGIN_REGISTERCLASS(KviKvsObject_window,"window","widget") - - KVSO_REGISTER_HANDLER(KviKvsObject_window,"setWindowTitle", functionsetWindowTitle) - KVSO_REGISTER_HANDLER(KviKvsObject_window,"setCentralWidget", functionsetCentralWidget) -// KVSO_REGISTER_HANDLER(KviKvsObject_window,"setIcon", functionsetIcon) + KVSO_REGISTER_HANDLER_NEW(KviKvsObject_window,setWindowTitle) + KVSO_REGISTER_HANDLER_NEW(KviKvsObject_window,setCentralWidget) KVSO_END_REGISTERCLASS(KviKvsObject_window) KVSO_BEGIN_CONSTRUCTOR(KviKvsObject_window,KviKvsObject_widget) @@ -120,25 +118,26 @@ bool KviKvsObject_window::init(KviKvsRunTimeContext * pContext,KviKvsVariantList return true; } -bool KviKvsObject_window::functionsetWindowTitle(KviKvsObjectFunctionCall *c) +KVSO_CLASS_FUNCTION(window,setWindowTitle) { + CHECK_INTERNAL_QPOINTER(widget()) QString szCaption; KVSO_PARAMETERS_BEGIN(c) KVSO_PARAMETER("caption",KVS_PT_STRING,0,szCaption) KVSO_PARAMETERS_END(c) - if(widget()) - ((KviKvsScriptWindowWindow *)widget())->setWindowTitleString(szCaption); + ((KviKvsScriptWindowWindow *)widget())->setWindowTitleString(szCaption); return true; } -bool KviKvsObject_window::functionsetCentralWidget(KviKvsObjectFunctionCall *c) +KVSO_CLASS_FUNCTION(window,setCentralWidget) { + CHECK_INTERNAL_QPOINTER(widget()) + KviKvsObject *ob; kvs_hobject_t hObject; KVSO_PARAMETERS_BEGIN(c) KVSO_PARAMETER("widget",KVS_PT_HOBJECT,0,hObject) KVSO_PARAMETERS_END(c) ob=KviKvsKernel::instance()->objectController()->lookupObject(hObject); - if(!widget())return true; if(!ob->object()->isWidgetType()) { c->warning(__tr2qs("Can't add a non-widget object")); diff --git a/src/modules/objects/class_window.h b/src/modules/objects/class_window.h index fd02643cb..b5d39212c 100644 --- a/src/modules/objects/class_window.h +++ b/src/modules/objects/class_window.h @@ -38,8 +38,8 @@ public: protected: virtual bool init(KviKvsRunTimeContext * pContext,KviKvsVariantList *pParams); - bool functionsetWindowTitle(KviKvsObjectFunctionCall *c); - bool functionsetCentralWidget(KviKvsObjectFunctionCall *c); + bool setWindowTitle(KviKvsObjectFunctionCall *c); + bool setCentralWidget(KviKvsObjectFunctionCall *c); }; diff --git a/src/modules/objects/class_wizard.cpp b/src/modules/objects/class_wizard.cpp index 89ad4bd27..f23f803ee 100644 --- a/src/modules/objects/class_wizard.cpp +++ b/src/modules/objects/class_wizard.cpp @@ -93,21 +93,21 @@ KVSO_BEGIN_REGISTERCLASS(KviKvsObject_wizard,"wizard","widget") - KVSO_REGISTER_HANDLER(KviKvsObject_wizard,"addPage", functionaddPage) - KVSO_REGISTER_HANDLER(KviKvsObject_wizard,"insertPage", functioninsertPage) - KVSO_REGISTER_HANDLER(KviKvsObject_wizard,"setTitle", functionsetTitle) + KVSO_REGISTER_HANDLER_NEW(KviKvsObject_wizard,addPage) + KVSO_REGISTER_HANDLER_NEW(KviKvsObject_wizard,insertPage) + KVSO_REGISTER_HANDLER_NEW(KviKvsObject_wizard,setTitle) - KVSO_REGISTER_HANDLER(KviKvsObject_wizard,"setBackEnabled", functionsetBackEnabled); - KVSO_REGISTER_HANDLER(KviKvsObject_wizard,"setNextEnabled", functionsetNextEnabled); - KVSO_REGISTER_HANDLER(KviKvsObject_wizard,"setFinishEnabled", functionsetFinishEnabled); - KVSO_REGISTER_HANDLER(KviKvsObject_wizard,"setHelpEnabled", functionsetHelpEnabled); + KVSO_REGISTER_HANDLER_NEW(KviKvsObject_wizard,setBackEnabled); + KVSO_REGISTER_HANDLER_NEW(KviKvsObject_wizard,setNextEnabled); + KVSO_REGISTER_HANDLER_NEW(KviKvsObject_wizard,setFinishEnabled); + KVSO_REGISTER_HANDLER_NEW(KviKvsObject_wizard,setHelpEnabled); - KVSO_REGISTER_HANDLER(KviKvsObject_wizard,"setBackBtnText", functionsetBackBtnText); - KVSO_REGISTER_HANDLER(KviKvsObject_wizard,"setNextBtnText", functionsetNextBtnText); - KVSO_REGISTER_HANDLER(KviKvsObject_wizard,"setFinishBtnText", functionsetFinishBtnText); - KVSO_REGISTER_HANDLER(KviKvsObject_wizard,"setHelpBtnText", functionsetHelpBtnText); - KVSO_REGISTER_HANDLER(KviKvsObject_wizard,"nextClickedEvent", functionnextClickedEvent); - KVSO_REGISTER_HANDLER(KviKvsObject_wizard,"backClickedEvent", functionbackClickedEvent); + KVSO_REGISTER_HANDLER_NEW(KviKvsObject_wizard,setBackBtnText); + KVSO_REGISTER_HANDLER_NEW(KviKvsObject_wizard,setNextBtnText); + KVSO_REGISTER_HANDLER_NEW(KviKvsObject_wizard,setFinishBtnText); + KVSO_REGISTER_HANDLER_NEW(KviKvsObject_wizard,setHelpBtnText); + KVSO_REGISTER_HANDLER_NEW(KviKvsObject_wizard,nextClickedEvent); + KVSO_REGISTER_HANDLER_NEW(KviKvsObject_wizard,backClickedEvent); KVSO_REGISTER_STANDARD_NOTHINGRETURN_HANDLER(KviKvsObject_wizard,"acceptEvent") @@ -130,8 +130,9 @@ bool KviKvsObject_wizard::init(KviKvsRunTimeContext * pContext,KviKvsVariantList return true; } -bool KviKvsObject_wizard::functionaddPage(KviKvsObjectFunctionCall *c) +KVSO_CLASS_FUNCTION(wizard,addPage) { + CHECK_INTERNAL_QPOINTER(widget()) KviKvsObject *ob; QString szLabel; kvs_hobject_t hObject; @@ -140,7 +141,6 @@ bool KviKvsObject_wizard::functionaddPage(KviKvsObjectFunctionCall *c) KVSO_PARAMETER("label",KVS_PT_STRING,0,szLabel) KVSO_PARAMETERS_END(c) ob=KviKvsKernel::instance()->objectController()->lookupObject(hObject); - if(!widget())return true; if(!ob->object()->isWidgetType()) { c->warning(__tr2qs("Can't add a non-widget object")); @@ -149,8 +149,10 @@ bool KviKvsObject_wizard::functionaddPage(KviKvsObjectFunctionCall *c) ((KviTalWizard *)widget())->addPage(((QWidget *)(ob->object())),szLabel); return true; } -bool KviKvsObject_wizard::functioninsertPage(KviKvsObjectFunctionCall *c) -{ +KVSO_CLASS_FUNCTION(wizard,insertPage) +{ + CHECK_INTERNAL_QPOINTER(widget()) + KviKvsObject *ob; QString szLabel; kvs_int_t uIndex; @@ -161,7 +163,6 @@ bool KviKvsObject_wizard::functioninsertPage(KviKvsObjectFunctionCall *c) KVSO_PARAMETER("index",KVS_PT_UNSIGNEDINTEGER,0,uIndex) KVSO_PARAMETERS_END(c) ob=KviKvsKernel::instance()->objectController()->lookupObject(hObject); - if(!widget())return true; if(!ob->object()->isWidgetType()) { c->warning(__tr2qs("Can't add a non-widget object")); @@ -172,8 +173,9 @@ bool KviKvsObject_wizard::functioninsertPage(KviKvsObjectFunctionCall *c) } -bool KviKvsObject_wizard::functionsetTitle(KviKvsObjectFunctionCall *c) -{ +KVSO_CLASS_FUNCTION(wizard,setTitle) +{ + CHECK_INTERNAL_QPOINTER(widget()) KviKvsObject *ob; QString szTitle; kvs_hobject_t hObject; @@ -182,7 +184,6 @@ bool KviKvsObject_wizard::functionsetTitle(KviKvsObjectFunctionCall *c) KVSO_PARAMETER("title",KVS_PT_STRING,0,szTitle) KVSO_PARAMETERS_END(c) ob=KviKvsKernel::instance()->objectController()->lookupObject(hObject); - if(!widget())return true; if(!ob->object()->isWidgetType()) { c->warning(__tr2qs("Widget object required")); @@ -191,8 +192,9 @@ bool KviKvsObject_wizard::functionsetTitle(KviKvsObjectFunctionCall *c) ((KviTalWizard *)widget())->setPageTitle(((QWidget *)(ob->object())),szTitle); return true; } -bool KviKvsObject_wizard::functionsetBackEnabled(KviKvsObjectFunctionCall *c) +KVSO_CLASS_FUNCTION(wizard,setBackEnabled) { + CHECK_INTERNAL_QPOINTER(widget()) bool bEnabled; KviKvsObject *ob; kvs_hobject_t hObject; @@ -201,7 +203,6 @@ bool KviKvsObject_wizard::functionsetBackEnabled(KviKvsObjectFunctionCall *c) KVSO_PARAMETER("bEnabled",KVS_PT_BOOL,0,bEnabled) KVSO_PARAMETERS_END(c) ob=KviKvsKernel::instance()->objectController()->lookupObject(hObject); - if(!widget())return true; if(!ob->object()->isWidgetType()) { c->warning(__tr2qs("Widget object required")); @@ -211,8 +212,10 @@ bool KviKvsObject_wizard::functionsetBackEnabled(KviKvsObjectFunctionCall *c) return true; } -bool KviKvsObject_wizard::functionsetNextEnabled(KviKvsObjectFunctionCall *c) +KVSO_CLASS_FUNCTION(wizard,setNextEnabled) { + CHECK_INTERNAL_QPOINTER(widget()) + bool bEnabled; KviKvsObject *ob; kvs_hobject_t hObject; @@ -221,7 +224,6 @@ bool KviKvsObject_wizard::functionsetNextEnabled(KviKvsObjectFunctionCall *c) KVSO_PARAMETER("bEnabled",KVS_PT_BOOL,0,bEnabled) KVSO_PARAMETERS_END(c) ob=KviKvsKernel::instance()->objectController()->lookupObject(hObject); - if(!widget())return true; if(!ob->object()->isWidgetType()) { c->warning(__tr2qs("Widget object required")); @@ -230,8 +232,10 @@ bool KviKvsObject_wizard::functionsetNextEnabled(KviKvsObjectFunctionCall *c) ((KviTalWizard *)widget())->setNextEnabled(((QWidget *)(ob->object())),bEnabled); return true; } -bool KviKvsObject_wizard::functionsetFinishEnabled(KviKvsObjectFunctionCall *c) +KVSO_CLASS_FUNCTION(wizard,setFinishEnabled) { + CHECK_INTERNAL_QPOINTER(widget()) + bool bEnabled; KviKvsObject *ob; kvs_hobject_t hObject; @@ -240,7 +244,6 @@ bool KviKvsObject_wizard::functionsetFinishEnabled(KviKvsObjectFunctionCall *c) KVSO_PARAMETER("bEnabled",KVS_PT_BOOL,0,bEnabled) KVSO_PARAMETERS_END(c) ob=KviKvsKernel::instance()->objectController()->lookupObject(hObject); - if(!widget())return true; if(!ob->object()->isWidgetType()) { c->warning(__tr2qs("Widget object required")); @@ -249,8 +252,10 @@ bool KviKvsObject_wizard::functionsetFinishEnabled(KviKvsObjectFunctionCall *c) ((KviTalWizard *)widget())->setFinishEnabled(((QWidget *)(ob->object())),bEnabled); return true; } -bool KviKvsObject_wizard::functionsetHelpEnabled(KviKvsObjectFunctionCall *c) +KVSO_CLASS_FUNCTION(wizard,setHelpEnabled) { + CHECK_INTERNAL_QPOINTER(widget()) + bool bEnabled; KviKvsObject *ob; kvs_hobject_t hObject; @@ -259,7 +264,6 @@ bool KviKvsObject_wizard::functionsetHelpEnabled(KviKvsObjectFunctionCall *c) KVSO_PARAMETER("bEnabled",KVS_PT_BOOL,0,bEnabled) KVSO_PARAMETERS_END(c) ob=KviKvsKernel::instance()->objectController()->lookupObject(hObject); - if(!widget())return true; if(!ob->object()->isWidgetType()) { c->warning(__tr2qs("Widget object required")); @@ -268,44 +272,48 @@ bool KviKvsObject_wizard::functionsetHelpEnabled(KviKvsObjectFunctionCall *c) ((KviTalWizard *)widget())->setHelpEnabled(((QWidget *)(ob->object())),bEnabled); return true; } -bool KviKvsObject_wizard::functionsetBackBtnText(KviKvsObjectFunctionCall *c) +KVSO_CLASS_FUNCTION(wizard,setBackBtnText) { + CHECK_INTERNAL_QPOINTER(widget()) + QString szText; KVSO_PARAMETERS_BEGIN(c) KVSO_PARAMETER("text",KVS_PT_STRING,0,szText) KVSO_PARAMETERS_END(c) - if (widget()) - ((KviTalWizard *)widget())->KviTalWizard::backButton()->setText(szText); + ((KviTalWizard *)widget())->KviTalWizard::backButton()->setText(szText); return true; } -bool KviKvsObject_wizard::functionsetNextBtnText(KviKvsObjectFunctionCall *c) +KVSO_CLASS_FUNCTION(wizard,setNextBtnText) { + CHECK_INTERNAL_QPOINTER(widget()) + QString szText; KVSO_PARAMETERS_BEGIN(c) KVSO_PARAMETER("text",KVS_PT_STRING,0,szText) KVSO_PARAMETERS_END(c) - if (widget()) - ((KviTalWizard *)widget())->KviTalWizard::nextButton()->setText(szText); + ((KviTalWizard *)widget())->KviTalWizard::nextButton()->setText(szText); return true; } -bool KviKvsObject_wizard::functionsetHelpBtnText(KviKvsObjectFunctionCall *c) +KVSO_CLASS_FUNCTION(wizard,setHelpBtnText) { + CHECK_INTERNAL_QPOINTER(widget()) + QString szText; KVSO_PARAMETERS_BEGIN(c) KVSO_PARAMETER("text",KVS_PT_STRING,0,szText) KVSO_PARAMETERS_END(c) - if (widget()) - ((KviTalWizard *)widget())->KviTalWizard::helpButton()->setText(szText); + ((KviTalWizard *)widget())->KviTalWizard::helpButton()->setText(szText); return true; } -bool KviKvsObject_wizard::functionsetFinishBtnText(KviKvsObjectFunctionCall *c) +KVSO_CLASS_FUNCTION(wizard,setFinishBtnText) { + CHECK_INTERNAL_QPOINTER(widget()) + QString szText; KVSO_PARAMETERS_BEGIN(c) KVSO_PARAMETER("text",KVS_PT_STRING,0,szText) KVSO_PARAMETERS_END(c) - if (widget()) - ((KviTalWizard *)widget())->KviTalWizard::finishButton()->setText(szText); + ((KviTalWizard *)widget())->KviTalWizard::finishButton()->setText(szText); return true; } bool KviKvsObject_wizard::accept() @@ -320,7 +328,7 @@ bool KviKvsObject_wizard::reject() callFunction(this,"rejectEvent",0,pParams); return true; } -bool KviKvsObject_wizard::functionnextClickedEvent(KviKvsObjectFunctionCall *c) +KVSO_CLASS_FUNCTION(wizard,nextClickedEvent) { emitSignal("nextClicked",c); return true; @@ -331,7 +339,7 @@ void KviKvsObject_wizard::nextClicked() KviKvsVariantList *params=0; callFunction(this,"nextClickedEvent",params); } -bool KviKvsObject_wizard::functionbackClickedEvent(KviKvsObjectFunctionCall *c) +KVSO_CLASS_FUNCTION(wizard,backClickedEvent) { emitSignal("backClicked",c); return true; diff --git a/src/modules/objects/class_wizard.h b/src/modules/objects/class_wizard.h index 9723a0c7f..66d588104 100644 --- a/src/modules/objects/class_wizard.h +++ b/src/modules/objects/class_wizard.h @@ -44,22 +44,22 @@ public: protected: virtual bool init(KviKvsRunTimeContext * pContext,KviKvsVariantList *pParams); - bool functionaddPage(KviKvsObjectFunctionCall *c); - bool functioninsertPage(KviKvsObjectFunctionCall *c); - bool functionremovePage(KviKvsObjectFunctionCall *c); - bool functionsetTitle(KviKvsObjectFunctionCall *c); - bool functionsetBackEnabled(KviKvsObjectFunctionCall *c); - bool functionsetNextEnabled(KviKvsObjectFunctionCall *c); - bool functionsetFinishEnabled(KviKvsObjectFunctionCall *c); - bool functionsetHelpEnabled(KviKvsObjectFunctionCall *c); + bool addPage(KviKvsObjectFunctionCall *c); + bool insertPage(KviKvsObjectFunctionCall *c); + bool removePage(KviKvsObjectFunctionCall *c); + bool setTitle(KviKvsObjectFunctionCall *c); + bool setBackEnabled(KviKvsObjectFunctionCall *c); + bool setNextEnabled(KviKvsObjectFunctionCall *c); + bool setFinishEnabled(KviKvsObjectFunctionCall *c); + bool setHelpEnabled(KviKvsObjectFunctionCall *c); - bool functionsetBackBtnText(KviKvsObjectFunctionCall *c); - bool functionsetNextBtnText(KviKvsObjectFunctionCall *c); - bool functionsetFinishBtnText(KviKvsObjectFunctionCall *c); - bool functionsetHelpBtnText(KviKvsObjectFunctionCall *c); + bool setBackBtnText(KviKvsObjectFunctionCall *c); + bool setNextBtnText(KviKvsObjectFunctionCall *c); + bool setFinishBtnText(KviKvsObjectFunctionCall *c); + bool setHelpBtnText(KviKvsObjectFunctionCall *c); - bool functionnextClickedEvent(KviKvsObjectFunctionCall *c); - bool functionbackClickedEvent(KviKvsObjectFunctionCall *c); + bool nextClickedEvent(KviKvsObjectFunctionCall *c); + bool backClickedEvent(KviKvsObjectFunctionCall *c); }; class KviKvsMdmWizard : public KviTalWizard |
