aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/modules/objects/class_dockwindow.cpp2
-rw-r--r--src/modules/objects/class_file.cpp2
-rw-r--r--src/modules/objects/class_hbox.cpp6
-rw-r--r--src/modules/objects/class_layout.cpp8
-rw-r--r--src/modules/objects/class_listwidget.cpp4
-rw-r--r--src/modules/objects/class_pixmap.cpp4
-rw-r--r--src/modules/objects/class_socket.cpp4
-rw-r--r--src/modules/objects/class_tabwidget.cpp2
-rw-r--r--src/modules/objects/class_treewidget.cpp2
-rw-r--r--src/modules/objects/class_window.cpp4
-rw-r--r--src/modules/objects/class_wrapper.cpp6
-rw-r--r--src/modules/objects/class_xmlreader.cpp16
-rw-r--r--src/modules/objects/libkviobjects.cpp38
13 files changed, 51 insertions, 47 deletions
diff --git a/src/modules/objects/class_dockwindow.cpp b/src/modules/objects/class_dockwindow.cpp
index e40fc1c28..cec0abfaa 100644
--- a/src/modules/objects/class_dockwindow.cpp
+++ b/src/modules/objects/class_dockwindow.cpp
@@ -190,7 +190,7 @@ KVSO_CLASS_FUNCTION(dockwindow,dock)
else if(szDock.indexOf('b',Qt::CaseInsensitive) != -1)g_pFrame->addDockWidget(Qt::BottomDockWidgetArea,_pDockWindow);
else if(szDock.indexOf('f',Qt::CaseInsensitive) != -1)_pDockWindow->setFloating(true);
else if(szDock.indexOf('m',Qt::CaseInsensitive) != -1)qDebug("Sorry: no support for minimized dock widgets in Qt4");
- else c->warning(__tr2qs("Invalid dock area specified"));
+ else c->warning(__tr2qs_ctx("Invalid dock area specified","objects"));
return true;
}
diff --git a/src/modules/objects/class_file.cpp b/src/modules/objects/class_file.cpp
index 7ecf96d90..dd49911a2 100644
--- a/src/modules/objects/class_file.cpp
+++ b/src/modules/objects/class_file.cpp
@@ -477,7 +477,7 @@ KVSO_CLASS_FUNCTION(file,writeBlock)
KVSO_PARAMETER("string_or_hobject",KVS_PT_VARIANT,0,pVariantData)
KVSO_PARAMETER("length",KVS_PT_UNSIGNEDINTEGER,KVS_PF_OPTIONAL,uLen)
KVSO_PARAMETERS_END(c)
- if(!m_pFile->isOpen())c->warning(__tr2qs("File is not open!"));
+ if(!m_pFile->isOpen())c->warning(__tr2qs_ctx("File is not open!","objects"));
else
{
if (pVariantData->isHObject())
diff --git a/src/modules/objects/class_hbox.cpp b/src/modules/objects/class_hbox.cpp
index db16a2bfb..cb237b6d0 100644
--- a/src/modules/objects/class_hbox.cpp
+++ b/src/modules/objects/class_hbox.cpp
@@ -143,7 +143,7 @@ KVSO_CLASS_FUNCTION(hbox,setStretchFactor)
CHECK_HOBJECT_IS_WIDGET(pObject)
if(((KviKvsObject_widget *)pObject)->widget()->parentWidget() != widget())
{
- c->warning(__tr2qs("The widget must be a child of this hbox"));
+ c->warning(__tr2qs_ctx("The widget must be a child of this hbox","objects"));
return true;
}
((KviTalHBox *)widget())->setStretchFactor(((QWidget *)(pObject->object())),uStretch);
@@ -173,7 +173,7 @@ KVSO_CLASS_FUNCTION(hbox,setAlignment)
CHECK_HOBJECT_IS_WIDGET(pObject)
if(((KviKvsObject_widget *)pObject)->widget()->parentWidget() != widget())
{
- c->warning(__tr2qs("The widget must be a child of this hbox"));
+ c->warning(__tr2qs_ctx("The widget must be a child of this hbox","objects"));
return true;
}
int align,sum=0;
@@ -192,7 +192,7 @@ KVSO_CLASS_FUNCTION(hbox,setAlignment)
if(align)
sum = sum | align;
else
- c->warning(__tr2qs("Unknown alignment: '%Q'"),&(*it));
+ c->warning(__tr2qs_ctx("Unknown alignment: '%Q'","objects"),&(*it));
}
if (widget()) ((KviTalHBox *)widget())->setAlignment(((QWidget *)(pObject->object())),(Qt::Alignment)sum);
diff --git a/src/modules/objects/class_layout.cpp b/src/modules/objects/class_layout.cpp
index 9423cdf7a..77117c554 100644
--- a/src/modules/objects/class_layout.cpp
+++ b/src/modules/objects/class_layout.cpp
@@ -136,10 +136,12 @@ bool KviKvsObject_layout::init(KviKvsRunTimeContext * pContext,KviKvsVariantList
if(!w)
{
- pContext->warning(__tr2qs("The parent of a layout must be a widget!"));
+ pContext->warning(__tr2qs_ctx("The parent of a layout must be a widget!","objects"));
return false;
}
setObject(new QGridLayout(w));
+ ((QGridLayout *)object())->setVerticalSpacing(0);
+ ((QGridLayout *)object())->setHorizontalSpacing(0);
setObjectName(getName());
return true;
}
@@ -309,4 +311,6 @@ KVSO_CLASS_FUNCTION(layout,setAlignment)
if (widget()) ((QGridLayout *)widget())->setAlignment(((QWidget *)(pObject->object())),(Qt::Alignment)sum);
return true;
}
-
+#ifndef COMPILE_USE_STANDALONE_MOC_SOURCES
+#include "m_class_layout.moc"
+#endif //!COMPILE_USE_STANDALONE_MOC_SOURCES
diff --git a/src/modules/objects/class_listwidget.cpp b/src/modules/objects/class_listwidget.cpp
index 89519d441..11a78c502 100644
--- a/src/modules/objects/class_listwidget.cpp
+++ b/src/modules/objects/class_listwidget.cpp
@@ -188,8 +188,8 @@ KVSO_CLASS_FUNCTION(listwidget,changeItem)
if (szText.isEmpty()) c->warning(__tr2qs_ctx("No string parameter given - using empty string","objects"));
if(iIndex >= (cnt = ((QListWidget *)widget())->count()))
{
- c->warning(__tr2qs("Item index [%d] is too big - defaulting to "
- "$count() - 1 [%d]"), iIndex, cnt);
+ c->warning(__tr2qs_ctx("Item index [%d] is too big - defaulting to "
+ "$count() - 1 [%d]","objects"), iIndex, cnt);
iIndex = cnt - 1;
}
((QListWidget *)widget())->item(iIndex)->setText(szText);
diff --git a/src/modules/objects/class_pixmap.cpp b/src/modules/objects/class_pixmap.cpp
index d7a38fcec..b836b1072 100644
--- a/src/modules/objects/class_pixmap.cpp
+++ b/src/modules/objects/class_pixmap.cpp
@@ -141,11 +141,11 @@ KVSO_CLASS_FUNCTION(pixmap,scale)
if (KviQString::equalCI(szAspectRatio,"IgnoreAspectRatio")) ratio=Qt::IgnoreAspectRatio;
else if (KviQString::equalCI(szAspectRatio,"KeepAspectRatio")) ratio=Qt::KeepAspectRatio;
else if (KviQString::equalCI(szAspectRatio,"KeepAspectRatioByExpanding")) ratio=Qt::KeepAspectRatioByExpanding;
- else if (!szAspectRatio.isEmpty())c->warning(__tr2qs("Unknown aspect ratio: using default value IgnoreAspectRatio"));
+ else if (!szAspectRatio.isEmpty())c->warning(__tr2qs_ctx("Unknown aspect ratio: using default value IgnoreAspectRatio","objects"));
Qt::TransformationMode tmode=Qt::FastTransformation;
if (KviQString::equalCI(szTransformation,"Fast")) tmode=Qt::FastTransformation;
else if (KviQString::equalCI(szTransformation,"Smooth")) tmode=Qt::SmoothTransformation;
- else if (!szAspectRatio.isEmpty())c->warning(__tr2qs("Unknown tranformation mode: using default value Fast"));
+ else if (!szAspectRatio.isEmpty())c->warning(__tr2qs_ctx("Unknown tranformation mode: using default value Fast","objects"));
*m_pPixmap = m_pPixmap->scaled(iScaleW, iScaleH,ratio,tmode);
bPixmapModified=true;
diff --git a/src/modules/objects/class_socket.cpp b/src/modules/objects/class_socket.cpp
index 4ced37506..a8b6dafef 100644
--- a/src/modules/objects/class_socket.cpp
+++ b/src/modules/objects/class_socket.cpp
@@ -702,7 +702,7 @@ KVSO_CLASS_FUNCTION(socket,listen)
#ifndef COMPILE_IPV6_SUPPORT
if(m_bIPv6)
{
- c->warning(__tr2qs("No IPv6 support in this executable"));
+ c->warning(__tr2qs_ctx("No IPv6 support in this executable","objects"));
c->returnValue()->setBoolean(false);
reset();
return true;
@@ -960,7 +960,7 @@ debug ("Socket created");
{
unsigned int uOldConnectionId = m_uConnectionId;
callFunction(this,"connectFailedEvent",new KviKvsVariantList(
- new KviKvsVariant(__tr2qs("Failed to create the socket"))));
+ new KviKvsVariant(__tr2qs_ctx("Failed to create the socket","objects"))));
if(m_uConnectionId == uOldConnectionId)reset();
// else it has already been called!
return;
diff --git a/src/modules/objects/class_tabwidget.cpp b/src/modules/objects/class_tabwidget.cpp
index 454cb3677..766743fe0 100644
--- a/src/modules/objects/class_tabwidget.cpp
+++ b/src/modules/objects/class_tabwidget.cpp
@@ -393,7 +393,7 @@ KVSO_CLASS_FUNCTION(tabwidget,setTabPosition)
((QTabWidget *)widget())->setTabPosition(QTabWidget::North);
else if(KviQString::equalCI(szPos,"Bottom"))
((QTabWidget *)widget())->setTabPosition(QTabWidget::South);
- else c->warning( __tr2qs("Unknown position '%Q'"),&szPos);
+ else c->warning( __tr2qs_ctx("Unknown position '%Q'","objects"),&szPos);
return true;
}
diff --git a/src/modules/objects/class_treewidget.cpp b/src/modules/objects/class_treewidget.cpp
index a741052ea..5106c2618 100644
--- a/src/modules/objects/class_treewidget.cpp
+++ b/src/modules/objects/class_treewidget.cpp
@@ -397,7 +397,7 @@ KVSO_CLASS_FUNCTION(treewidget,setSelectionMode)
((QTreeWidget *)widget())->setSelectionMode(QTreeWidget::ExtendedSelection);
else if(KviQString::equalCI(szMode,"Single"))
((QTreeWidget *)widget())->setSelectionMode(QTreeWidget::SingleSelection);
- else c->warning(__tr2qs("Invalid selection mode '%Q'"),&szMode);
+ else c->warning(__tr2qs_ctx("Invalid selection mode '%Q'","objects"),&szMode);
return true;
}
diff --git a/src/modules/objects/class_window.cpp b/src/modules/objects/class_window.cpp
index 6ed2133ad..081568e05 100644
--- a/src/modules/objects/class_window.cpp
+++ b/src/modules/objects/class_window.cpp
@@ -140,12 +140,12 @@ KVSO_CLASS_FUNCTION(window,setCentralWidget)
ob=KviKvsKernel::instance()->objectController()->lookupObject(hObject);
if(!ob->object()->isWidgetType())
{
- c->warning(__tr2qs("Can't add a non-widget object"));
+ c->warning(__tr2qs_ctx("Can't add a non-widget object","objects"));
return true;
}
if(!ob->inheritsClass("widget"))
{
- c->warning(__tr2qs("Can't add a non-widget object"));
+ c->warning(__tr2qs_ctx("Can't add a non-widget object","objects"));
return true;
}
((KviKvsScriptWindowWindow *)widget())->setCentralWidget((KviKvsObject_widget *)ob,((KviKvsObject_widget *)ob)->widget());
diff --git a/src/modules/objects/class_wrapper.cpp b/src/modules/objects/class_wrapper.cpp
index 57ee4452e..a69560d63 100644
--- a/src/modules/objects/class_wrapper.cpp
+++ b/src/modules/objects/class_wrapper.cpp
@@ -145,7 +145,7 @@ bool KviKvsObject_wrapper::init(KviKvsRunTimeContext * pContext,KviKvsVariantLis
{
if(pWidget)
{
- pContext->warning(__tr2qs("The window identifier preceded by WinId must be the first object in the search path"));
+ pContext->warning(__tr2qs_ctx("The window identifier preceded by WinId must be the first object in the search path","objects"));
return false;
} else {
pWidget = g_pApp->findWindow(szName);
@@ -161,7 +161,7 @@ bool KviKvsObject_wrapper::init(KviKvsRunTimeContext * pContext,KviKvsVariantLis
}
if( !pWidget )
{
- pContext->warning(__tr2qs("Failed to find one of the wrap path widgets (%Q::%Q)"),&szClass,&szName);
+ pContext->warning(__tr2qs_ctx("Failed to find one of the wrap path widgets ('%Q'::'%Q')","objects"),&szClass,&szName);
return false;
}
}
@@ -170,7 +170,7 @@ bool KviKvsObject_wrapper::init(KviKvsRunTimeContext * pContext,KviKvsVariantLis
}
if( !pWidget )
{
- pContext->warning(__tr2qs("Failed to find the widget to wrap"));
+ pContext->warning(__tr2qs_ctx("Failed to find the widget to wrap","objects"));
return false;
}
setObject(pWidget,false);
diff --git a/src/modules/objects/class_xmlreader.cpp b/src/modules/objects/class_xmlreader.cpp
index defac7b3b..47f4fe5ef 100644
--- a/src/modules/objects/class_xmlreader.cpp
+++ b/src/modules/objects/class_xmlreader.cpp
@@ -148,20 +148,20 @@ public:
private:
bool kvsCodeFailure()
{
- m_szErrorString = __tr2qs("Error in KVS class implementation: processing aborted");
+ m_szErrorString = __tr2qs_ctx("Error in KVS class implementation: processing aborted","objects");
return false;
}
bool kvsCodeAbort()
{
- m_szErrorString = __tr2qs("Processing aborted");
+ m_szErrorString = __tr2qs_ctx("Processing aborted","objects");
return false;
}
void decodeException(QString &szMsg,bool bError,const QXmlParseException &exception)
{
if(bError)
- KviQString::sprintf(szMsg,__tr2qs("Error near line %d, column %d"),exception.lineNumber(),exception.columnNumber());
+ KviQString::sprintf(szMsg,__tr2qs_ctx("Error near line %d, column %d","objects"),exception.lineNumber(),exception.columnNumber());
else
- KviQString::sprintf(szMsg,__tr2qs("Warning near line %d, column %d"),exception.lineNumber(),exception.columnNumber());
+ KviQString::sprintf(szMsg,__tr2qs_ctx("Warning near line %d, column %d","objects"),exception.lineNumber(),exception.columnNumber());
szMsg += ": ";
szMsg += exception.message();
}
@@ -312,7 +312,7 @@ KVSO_CLASS_FUNCTION(xmlreader,parse)
KVSO_PARAMETER("string_or_memorybuffer_object",KVS_PT_VARIANT,0,pVariantData)
KVSO_PARAMETERS_END(c)
#ifdef QT_NO_XML
- fatalError(__tr2qs("XML support not available in the Qt library"));
+ fatalError(__tr2qs_ctx("XML support not available in the Qt library"));
c->returnValue()->setBoolean(false);
#else
m_szLastError = "";
@@ -327,7 +327,7 @@ KVSO_CLASS_FUNCTION(xmlreader,parse)
pObject=KviKvsKernel::instance()->objectController()->lookupObject(hObject);
if (!pObject)
{
- c->warning(__tr2qs("Data parameter is not an object"));
+ c->warning(__tr2qs_ctx("Data parameter is not an object","objects"));
return true;
}
if (pObject->inheritsClass("memorybuffer"))
@@ -336,7 +336,7 @@ KVSO_CLASS_FUNCTION(xmlreader,parse)
}
else
{
- c->warning(__tr2qs("Data parameter is not a memorybuffer object"));
+ c->warning(__tr2qs_ctx("Data parameter is not a memorybuffer object","objects"));
return true;
}
}
@@ -355,7 +355,7 @@ KVSO_CLASS_FUNCTION(xmlreader,parse)
}
else
{
- c->warning(__tr2qs("Data is not a memorybuffer object or string"));
+ c->warning(__tr2qs_ctx("Data is not a memorybuffer object or string","objects"));
return true;
}
QXmlSimpleReader reader;
diff --git a/src/modules/objects/libkviobjects.cpp b/src/modules/objects/libkviobjects.cpp
index 6b0ea11e9..7391ac990 100644
--- a/src/modules/objects/libkviobjects.cpp
+++ b/src/modules/objects/libkviobjects.cpp
@@ -180,7 +180,7 @@ static bool objects_kvs_cmd_killClass(KviKvsModuleCommandCall * c)
KviKvsKernel::instance()->objectController()->deleteClass(pClass); //Yahoo!!
}
}
- else if(!c->hasSwitch('q',"quiet"))c->warning(__tr2qs("Class '%Q' is not defined"),&szClass);
+ else if(!c->hasSwitch('q',"quiet"))c->warning(__tr2qs_ctx("Class '%Q' is not defined","objects"),&szClass);
return true;
}
@@ -254,17 +254,17 @@ static bool objects_kvs_cmd_connect(KviKvsModuleCommandCall * c)
obSrc=KviKvsKernel::instance()->objectController()->lookupObject(hSrc);
if(!obTrg)
{
- c->warning(__tr2qs("Inexisting target object for objects.connect"));
+ c->warning(__tr2qs_ctx("Inexisting target object for objects.connect","objects"));
return true;
}
if(!obSrc)
{
- c->warning(__tr2qs("Inexisting source object for objects.connect"));
+ c->warning(__tr2qs_ctx("Inexisting source object for objects.connect","objects"));
return true;
}
if(!obSrc->connectSignal(szSignal,obTrg,szSlot))
{
- c->warning(__tr2qs("Inexisting target slot '%Q' for objects.connect"),&szSlot);
+ c->warning(__tr2qs_ctx("Inexisting target slot '%Q' for objects.connect","objects"),&szSlot);
return true;
}
return true;
@@ -349,7 +349,7 @@ static bool objects_kvs_fnc_instances(KviKvsModuleFunctionCall * c)
if(!pClass)
{
if(!szFlags.contains(QChar('q')))
- c->warning(__tr2qs("The class '%Q' does not exist"),&szClassName);
+ c->warning(__tr2qs_ctx("The class '%Q' does not exist","objects"),&szClassName);
return true;
}
KviPointerHashTable<void *,KviKvsObject> * od = KviKvsKernel::instance()->objectController()->objectDict();
@@ -406,7 +406,7 @@ static bool objects_kvs_fnc_variables(KviKvsModuleFunctionCall * c)
KviKvsObject *ob=KviKvsKernel::instance()->objectController()->lookupObject(hObj);
if (!ob)
{
- c->warning(__tr2qs("Object does not exists"));
+ c->warning(__tr2qs_ctx("Object does not exists","objects"));
return true;
}
KviPointerHashTableIterator<QString,KviKvsVariant> it(* ob->dataContainer()->dict());
@@ -448,7 +448,7 @@ static bool objects_kvs_fnc_classAllHandlers(KviKvsModuleFunctionCall * c)
KviKvsObjectClass * pClass = KviKvsKernel::instance()->objectController()->lookupClass(szClassName);
if(!pClass)
{
- c->warning(__tr2qs("The class '%Q' does not exist"),&szClassName);
+ c->warning(__tr2qs_ctx("The class '%Q' does not exist","objects"),&szClassName);
return true;
}
@@ -550,7 +550,7 @@ static bool objects_kvs_fnc_name(KviKvsModuleFunctionCall * c)
obSrcClass = KviKvsKernel::instance()->objectController()->lookupObject(hClass);
if(!obSrcClass)
{
- c->warning(__tr2qs("Inexisting class object for objects.name"));
+ c->warning(__tr2qs_ctx("Inexisting class object for objects.name","objects"));
return true;
}
@@ -593,12 +593,12 @@ static bool objects_kvs_cmd_disconnect(KviKvsModuleCommandCall * c)
obSrc=KviKvsKernel::instance()->objectController()->lookupObject(hSrc);
if(!obTrg)
{
- c->warning(__tr2qs("Inexisting target object for objects.disconnect"));
+ c->warning(__tr2qs_ctx("Inexisting target object for objects.disconnect","objects"));
return true;
}
if(!obSrc)
{
- c->warning(__tr2qs("Inexisting source object for objects.disconnect"));
+ c->warning(__tr2qs_ctx("Inexisting source object for objects.disconnect","objects"));
return true;
}
obSrc->disconnectSignal(szSignal,obTrg,szSlot);
@@ -644,13 +644,13 @@ static bool objects_kvs_cmd_bitBlt(KviKvsModuleCommandCall * c)
obSrc=KviKvsKernel::instance()->objectController()->lookupObject(hSrc);
if (!obSrc)
{
- c->warning(__tr2qs("Source is not an object"));
+ c->warning(__tr2qs_ctx("Source is not an object","objects"));
return true;
}
obDst=KviKvsKernel::instance()->objectController()->lookupObject(hDst);
if (!obDst)
{
- c->warning(__tr2qs("Destination is not an object"));
+ c->warning(__tr2qs_ctx("Destination is not an object","objects"));
return true;
}
@@ -660,7 +660,7 @@ static bool objects_kvs_cmd_bitBlt(KviKvsModuleCommandCall * c)
else if (obSrc->inheritsClass("widget")) pdSource=((KviKvsObject_widget *)obSrc)->widget();
if (!pdSource)
{
- c->warning(__tr2qs("Widget, Image or Pixmap required "));
+ c->warning(__tr2qs_ctx("Widget, Image or Pixmap required ","objects"));
return true;
}
QPaintDevice * pdDest = 0;
@@ -670,7 +670,7 @@ static bool objects_kvs_cmd_bitBlt(KviKvsModuleCommandCall * c)
else if (obDst->inheritsClass("widget")) pdDest=((KviKvsObject_widget *)obDst)->widget();
if (!pdDest)
{
- c->warning(__tr2qs("Widget or Pixmap required"));
+ c->warning(__tr2qs_ctx("Widget or Pixmap required","objects"));
return true;
}
if(obDst->inheritsClass("pixmap")){
@@ -746,13 +746,13 @@ static bool objects_kvs_cmd_blend(KviKvsModuleCommandCall * c)
obDest=KviKvsKernel::instance()->objectController()->lookupObject(hDest);
if (!obFor || !obBck || !obDest)
{
- c->warning(__tr2qs("One or more of background, foreground or destination aren't objects"));
+ c->warning(__tr2qs_ctx("One or more of background, foreground or destination aren't objects","objects"));
return true;
}
if (!obBck->inheritsClass("pixmap") || !obFor->inherits("KviKvsObject_pixmap"))
{
- c->warning(__tr2qs("Pixmap objects required"));
+ c->warning(__tr2qs_ctx("Pixmap objects required","objects"));
return true;
}
@@ -762,7 +762,7 @@ static bool objects_kvs_cmd_blend(KviKvsModuleCommandCall * c)
if (!pdDest)
{
- c->warning(__tr2qs("Widget or Pixmap required "));
+ c->warning(__tr2qs_ctx("Widget or Pixmap required ","objects"));
return true;
}
@@ -775,12 +775,12 @@ static bool objects_kvs_cmd_blend(KviKvsModuleCommandCall * c)
// check size
if ((iBkX+uW>img_back->width())||(iBkY+uH>img_back->height()))
{
- c->warning(__tr2qs("Values for background are out of image size "));
+ c->warning(__tr2qs_ctx("Values for background are out of image size ","objects"));
return true;
}
if ((iFoX+uW>img_fore->width())||(iFoY+uH>img_fore->height()))
{
- c->warning(__tr2qs("Values for foreground are out of image size "));
+ c->warning(__tr2qs_ctx("Values for foreground are out of image size ","objects"));
return true;
}
QImage buffer;
generated by cgit v1.3.1-10-gc9f91 (git 2.54.0) at 2026-08-08 08:15:29 +0000