aboutsummaryrefslogtreecommitdiffstats
path: root/src/modules/objects
diff options
context:
space:
mode:
Diffstat (limited to 'src/modules/objects')
-rw-r--r--src/modules/objects/class_hbox.cpp10
-rw-r--r--src/modules/objects/class_painter.cpp92
-rw-r--r--src/modules/objects/class_popupmenu.cpp39
-rw-r--r--src/modules/objects/class_widget.cpp274
4 files changed, 222 insertions, 193 deletions
diff --git a/src/modules/objects/class_hbox.cpp b/src/modules/objects/class_hbox.cpp
index 9f77e4179..77c7c6d5f 100644
--- a/src/modules/objects/class_hbox.cpp
+++ b/src/modules/objects/class_hbox.cpp
@@ -67,16 +67,17 @@ KVSO_END_CONSTRUCTOR(KviKvsObject_hbox)
bool KviKvsObject_hbox::init(KviKvsRunTimeContext * pContext,KviKvsVariantList *pParams)
{
- setObject(new KviTalHBox(parentScriptWidget()), true);
+ setObject(new KviTalHBox(parentScriptWidget()), true);
return true;
}
+
bool KviKvsObject_hbox::functionsetMargin(KviKvsObjectFunctionCall *c)
{
kvs_uint_t uMargin;
KVSO_PARAMETERS_BEGIN(c)
KVSO_PARAMETER("margin",KVS_PT_UNSIGNEDINTEGER,0,uMargin)
KVSO_PARAMETERS_END(c)
- if (widget()) ((KviTalHBox *)widget())->setMargin(uMargin);
+ if (widget()) ((KviTalHBox *)widget())->setMargin(uMargin);
return true;
}
@@ -86,9 +87,10 @@ bool KviKvsObject_hbox::functionsetSpacing(KviKvsObjectFunctionCall *c)
KVSO_PARAMETERS_BEGIN(c)
KVSO_PARAMETER("spacing",KVS_PT_UNSIGNEDINTEGER,0,uSpacing)
KVSO_PARAMETERS_END(c)
- if (widget()) ((KviTalHBox *)widget())->setSpacing(uSpacing);
+ if (widget()) ((KviTalHBox *)widget())->setSpacing(uSpacing);
return true;
}
+
bool KviKvsObject_hbox::functionsetStretchFactor(KviKvsObjectFunctionCall *c)
{
KviKvsObject * pObject;
@@ -123,5 +125,3 @@ bool KviKvsObject_hbox::functionsetStretchFactor(KviKvsObjectFunctionCall *c)
((KviTalHBox *)widget())->setStretchFactor(((QWidget *)(pObject->object())),uStretch);
return true;
}
-
-
diff --git a/src/modules/objects/class_painter.cpp b/src/modules/objects/class_painter.cpp
index 133fc95db..322123fc8 100644
--- a/src/modules/objects/class_painter.cpp
+++ b/src/modules/objects/class_painter.cpp
@@ -24,6 +24,7 @@
#include "class_painter.h"
#include "class_pixmap.h"
#include "class_widget.h"
+
#include "kvi_debug.h"
#include "kvi_locale.h"
#include "kvi_error.h"
@@ -33,7 +34,7 @@
#include <QTextDocument>
#include <QIcon>
-const Qt::PenStyle penstyles_cod[]= {
+const Qt::PenStyle penstyles_cod[] = {
Qt::NoPen,
Qt::SolidLine,
Qt::DashLine,
@@ -50,10 +51,10 @@ const char * const penstyles_tbl[] = {
"dashDotLine",
"dashDotDotLine"
};
-#define penstyles_num (sizeof(penstyles_tbl) / sizeof(penstyles_tbl[0]))
+#define penstyles_num (sizeof(penstyles_tbl) / sizeof(penstyles_tbl[0]))
-const Qt::BrushStyle brushstyles_cod[]= {
+const Qt::BrushStyle brushstyles_cod[] = {
Qt::NoBrush,
Qt::SolidPattern,
Qt::Dense1Pattern,
@@ -88,13 +89,14 @@ const char * const brushstyles_tbl[] = {
"FDiagPattern",
"DiagCrossPattern"
};
+
#define brushstyles_num (sizeof(brushstyles_tbl) / sizeof(brushstyles_tbl[0]))
/*
- @doc: painter
+ @doc: painter
@keyterms:
- painter object class, line editor, input
+ painter object class, line editor, input
@title:
painter class
@type:
@@ -641,6 +643,7 @@ bool KviKvsObject_painter::functionSetFont(KviKvsObjectFunctionCall *c)
m_pPainter->setFont(font);
return true;
}
+
bool KviKvsObject_painter::functionSetFontSize(KviKvsObjectFunctionCall *c)
{
kvs_uint_t uSize;
@@ -653,6 +656,7 @@ bool KviKvsObject_painter::functionSetFontSize(KviKvsObjectFunctionCall *c)
m_pPainter->setFont(font);
return true;
}
+
bool KviKvsObject_painter::functionsetBackGroundMode(KviKvsObjectFunctionCall *c)
{
QString szMode;
@@ -664,7 +668,6 @@ bool KviKvsObject_painter::functionsetBackGroundMode(KviKvsObjectFunctionCall *c
else if(KviQString::equalCI(szMode,"Opaque")) m_pPainter->setBackgroundMode(Qt::OpaqueMode);
else c->warning( __tr2qs("Unknown orientation"));
return true;
-
}
bool KviKvsObject_painter::functiondrawLine(KviKvsObjectFunctionCall *c)
@@ -682,6 +685,7 @@ bool KviKvsObject_painter::functiondrawLine(KviKvsObjectFunctionCall *c)
if(m_pPainter) m_pPainter->drawLine(iX,iY,iX1,iY1);
return true;
}
+
bool KviKvsObject_painter::functiondrawRect(KviKvsObjectFunctionCall *c)
{
KviKvsVariant * pXOrArray;
@@ -697,7 +701,7 @@ bool KviKvsObject_painter::functiondrawRect(KviKvsObjectFunctionCall *c)
if(m_pPainter) m_pPainter->drawRect(iX,iY,iW,iH);
return true;
}
-//FIX ME: REMOVE functiondrawWinFocusRect
+//FIXME: REMOVE functiondrawWinFocusRect
bool KviKvsObject_painter::functiondrawWinFocusRect(KviKvsObjectFunctionCall *c)
{
KviKvsVariant * pXOrArray;
@@ -713,6 +717,7 @@ bool KviKvsObject_painter::functiondrawWinFocusRect(KviKvsObjectFunctionCall *c)
return true;
}
+
bool KviKvsObject_painter::functiondrawEllipse(KviKvsObjectFunctionCall *c)
{
KviKvsVariant * pXOrArray;
@@ -728,6 +733,7 @@ bool KviKvsObject_painter::functiondrawEllipse(KviKvsObjectFunctionCall *c)
if(m_pPainter) m_pPainter->drawEllipse(iX,iY,iW,iH);
return true;
}
+
bool KviKvsObject_painter::functiondrawRoundRect(KviKvsObjectFunctionCall *c)
{
KviKvsVariant * pXOrArray;
@@ -746,6 +752,7 @@ bool KviKvsObject_painter::functiondrawRoundRect(KviKvsObjectFunctionCall *c)
m_pPainter->drawRoundRect(iX,iY,iW,iH,iXrnd,iYrnd);
return true;
}
+
bool KviKvsObject_painter::functiondrawArc(KviKvsObjectFunctionCall *c)
{
KviKvsVariant * pXOrArray;
@@ -764,6 +771,7 @@ bool KviKvsObject_painter::functiondrawArc(KviKvsObjectFunctionCall *c)
m_pPainter->drawArc(iX,iY,iW,iH,iSangle,iLena);
return true;
}
+
bool KviKvsObject_painter::functiondrawChord(KviKvsObjectFunctionCall *c)
{
KviKvsVariant * pXOrArray;
@@ -782,9 +790,9 @@ bool KviKvsObject_painter::functiondrawChord(KviKvsObjectFunctionCall *c)
m_pPainter->drawChord(iX,iY,iW,iH,iSangle,iLena);
return true;
}
+
bool KviKvsObject_painter::functionsetBrush(KviKvsObjectFunctionCall *c)
{
-
kvs_int_t iCol1,iCol2,iCol3,iOpacity;
KviKvsVariant *var1,*var2,*var3;
@@ -860,7 +868,7 @@ bool KviKvsObject_painter::functionsetPen(KviKvsObjectFunctionCall *c)
QString szColorMode,szColor;
KviKvsVariant *var1,*var2,*var3;
-KVSO_PARAMETERS_BEGIN(c)
+ KVSO_PARAMETERS_BEGIN(c)
KVSO_PARAMETER("Color_1_Or_Colorname",KVS_PT_VARIANT,0,var1)
KVSO_PARAMETER("Color_2",KVS_PT_VARIANT,KVS_PF_OPTIONAL,var2)
KVSO_PARAMETER("Colo3_3",KVS_PT_VARIANT,KVS_PF_OPTIONAL,var3)
@@ -906,11 +914,10 @@ KVSO_PARAMETERS_BEGIN(c)
m_pPainter->setPen(col);
}
-
-
return true;
}
+
bool KviKvsObject_painter::functiondrawPie(KviKvsObjectFunctionCall *c)
{
KviKvsVariant * pXOrArray;
@@ -929,6 +936,7 @@ bool KviKvsObject_painter::functiondrawPie(KviKvsObjectFunctionCall *c)
m_pPainter->drawPie(iX,iY,iW,iH,iSangle,iLena);
return true;
}
+
bool KviKvsObject_painter::functiondrawPoint(KviKvsObjectFunctionCall *c)
{
KviKvsVariant * pXOrArray;
@@ -943,18 +951,19 @@ bool KviKvsObject_painter::functiondrawPoint(KviKvsObjectFunctionCall *c)
m_pPainter->drawPoint(iX,iY);
return true;
}
+
bool KviKvsObject_painter::functionfontDescent(KviKvsObjectFunctionCall * c)
{
if(m_pPainter)
c->returnValue()->setInteger(m_pPainter->fontMetrics().descent());
- return true;
+ return true;
}
bool KviKvsObject_painter::functionfontAscent(KviKvsObjectFunctionCall * c)
{
if(m_pPainter)
c->returnValue()->setInteger(m_pPainter->fontMetrics().ascent());
- return true;
+ return true;
}
@@ -981,8 +990,9 @@ bool KviKvsObject_painter::functionfontMetricsHeight(KviKvsObjectFunctionCall *
c->returnValue()->setInteger(m_pPainter->fontMetrics().height());
else c->warning("$fontMetricsHeight: the painter is not active!");
}
- return true;
+ return true;
}
+
bool KviKvsObject_painter::functionbegin(KviKvsObjectFunctionCall *c)
{
KviKvsObject * pObject;
@@ -1009,6 +1019,7 @@ bool KviKvsObject_painter::functionbegin(KviKvsObjectFunctionCall *c)
if (pObject->inherits("KviKvsObject_pixmap")) ((KviKvsObject_pixmap *)pObject)->pixmapChanged();
return true;
}
+
void KviKvsObject_painter::attachDevice(KviKvsObject * o,QPaintDevice * p)
{
if(!m_pPainter)return;
@@ -1062,8 +1073,6 @@ bool KviKvsObject_painter::functiondrawText(KviKvsObjectFunctionCall *c)
return true;
}
-
-
bool KviKvsObject_painter::functiondrawPixmap(KviKvsObjectFunctionCall *c)
{
kvs_real_t iX,iY;
@@ -1100,10 +1109,6 @@ bool KviKvsObject_painter::functiondrawPixmap(KviKvsObjectFunctionCall *c)
return true;
}
-
-
-
-
bool KviKvsObject_painter::functionrotateMatrix(KviKvsObjectFunctionCall *c)
{
kvs_real_t dAngle;
@@ -1112,10 +1117,11 @@ bool KviKvsObject_painter::functionrotateMatrix(KviKvsObjectFunctionCall *c)
KVSO_PARAMETERS_END(c)
if(!m_pPainter)return true;
//m_pMatrix.rotate(dAngle);
- //m_pPainter->setWorldMatrix( m_pMatrix,false );
+ //m_pPainter->setWorldMatrix( m_pMatrix,false );
m_pPainter->rotate(dAngle);
return true;
}
+
bool KviKvsObject_painter::functiontranslateMatrix(KviKvsObjectFunctionCall *c)
{
kvs_real_t dXtrasl,dYtrasl;
@@ -1125,13 +1131,14 @@ bool KviKvsObject_painter::functiontranslateMatrix(KviKvsObjectFunctionCall *c)
KVSO_PARAMETERS_END(c)
if(!m_pPainter)return true;
//QWMatrix tmpMatrix;
- //tmpMatrix.translate(dXtrasl,dYtrasl);
- //tmpMatrix = m_pMatrix * tmpMatrix;
- //m_pPainter->setWorldMatrix( tmpMatrix );
- //m_pMatrix=tmpMatrix;
+ //tmpMatrix.translate(dXtrasl,dYtrasl);
+ //tmpMatrix = m_pMatrix * tmpMatrix;
+ //m_pPainter->setWorldMatrix( tmpMatrix );
+ //m_pMatrix=tmpMatrix;
m_pPainter->translate(dXtrasl,dYtrasl);
return true;
}
+
bool KviKvsObject_painter::functionshearMatrix(KviKvsObjectFunctionCall *c)
{
kvs_real_t dShearh,dShearv;
@@ -1145,6 +1152,7 @@ bool KviKvsObject_painter::functionshearMatrix(KviKvsObjectFunctionCall *c)
m_pPainter->shear(dShearh,dShearv);
return true;
}
+
bool KviKvsObject_painter::functionscaleMatrix(KviKvsObjectFunctionCall *c)
{
kvs_real_t dScalex,dScaley;
@@ -1158,8 +1166,8 @@ bool KviKvsObject_painter::functionscaleMatrix(KviKvsObjectFunctionCall *c)
m_pPainter->scale(dScalex,dScaley);
return true;
}
-bool KviKvsObject_painter::functionresetMatrix(KviKvsObjectFunctionCall *c)
+bool KviKvsObject_painter::functionresetMatrix(KviKvsObjectFunctionCall *c)
{
if(!m_pPainter)return true;
//m_pMatrix.reset();
@@ -1190,6 +1198,7 @@ bool KviKvsObject_painter::functiondrawHtmlText(KviKvsObjectFunctionCall *c)
m_pPainter->restore();
return true;
}
+
bool KviKvsObject_painter::functionhtmlTextSize(KviKvsObjectFunctionCall *c)
{
QString szText;
@@ -1207,7 +1216,6 @@ bool KviKvsObject_painter::functionhtmlTextSize(KviKvsObjectFunctionCall *c)
return true;
}
-
bool KviKvsObject_painter::functiondrawIcon(KviKvsObjectFunctionCall *c)
{
QString szIcon,szState;
@@ -1241,25 +1249,25 @@ bool KviKvsObject_painter::functiondrawIcon(KviKvsObjectFunctionCall *c)
else if (KviQString::equalCI(szState,"Active"))mode=QIcon::Active;
else if (KviQString::equalCI(szState,"Selected"))mode=QIcon::Selected;
if (c->parameterCount()<5)
- m_pPainter->drawPixmap(iX,iY,ico.pixmap(pixsize,mode));
+ m_pPainter->drawPixmap(iX,iY,ico.pixmap(pixsize,mode));
else
- m_pPainter->drawPixmap(iX,iY,ico.pixmap(QSize(iW,iH),mode));
+ m_pPainter->drawPixmap(iX,iY,ico.pixmap(QSize(iW,iH),mode));
}
return true;
}
-
bool KviKvsObject_painter::functionsetOpacity(KviKvsObjectFunctionCall *c)
{
if(!m_pPainter)return true;
kvs_real_t dOpacity;
KVSO_PARAMETERS_BEGIN(c)
- KVSO_PARAMETER("opacity_factor",KVS_PT_DOUBLE,0,dOpacity)
+ KVSO_PARAMETER("opacity_factor",KVS_PT_DOUBLE,0,dOpacity)
KVSO_PARAMETERS_END(c)
m_pPainter->setOpacity(dOpacity);
return true;
}
+
bool KviKvsObject_painter::functionsetTextAntialiasing(KviKvsObjectFunctionCall *c)
{
if(!m_pPainter)return true;
@@ -1271,6 +1279,7 @@ bool KviKvsObject_painter::functionsetTextAntialiasing(KviKvsObjectFunctionCall
m_pPainter->setRenderHint(QPainter::TextAntialiasing,bEnabled);
return true;
}
+
bool KviKvsObject_painter::functionsetAntialiasing(KviKvsObjectFunctionCall *c)
{
if(!m_pPainter)return true;
@@ -1282,6 +1291,7 @@ bool KviKvsObject_painter::functionsetAntialiasing(KviKvsObjectFunctionCall *c)
m_pPainter->setRenderHint(QPainter::Antialiasing,bEnabled);
return true;
}
+
bool KviKvsObject_painter::functionsetSmoothPixmapTransform(KviKvsObjectFunctionCall *c)
{
if(!m_pPainter)return true;
@@ -1293,6 +1303,7 @@ bool KviKvsObject_painter::functionsetSmoothPixmapTransform(KviKvsObjectFunction
m_pPainter->setRenderHint(QPainter::SmoothPixmapTransform,bEnabled);
return true;
}
+
bool KviKvsObject_painter::functionsetPenJoinStyle(KviKvsObjectFunctionCall *c)
{
QString szStyle;
@@ -1325,7 +1336,6 @@ bool KviKvsObject_painter::functionsetPenCapStyle(KviKvsObjectFunctionCall *c)
return true;
}
-
bool KviKvsObject_painter::functionsave(KviKvsObjectFunctionCall * c)
{
if(m_pPainter)
@@ -1392,8 +1402,6 @@ bool KviKvsObject_painter::functionsetBrushStyle(KviKvsObjectFunctionCall *c)
return true;
}
-
-
bool KviKvsObject_painter::functionsetGradientStart(KviKvsObjectFunctionCall *c)
{
kvs_real_t dX,dY;
@@ -1405,6 +1413,7 @@ bool KviKvsObject_painter::functionsetGradientStart(KviKvsObjectFunctionCall *c)
m_pGradient->setStart(dX,dY);
return true;
}
+
bool KviKvsObject_painter::functionsetGradientStop(KviKvsObjectFunctionCall *c)
{
kvs_real_t dX,dY;
@@ -1416,6 +1425,7 @@ bool KviKvsObject_painter::functionsetGradientStop(KviKvsObjectFunctionCall *c)
m_pGradient->setFinalStop(dX,dY);
return true;
}
+
bool KviKvsObject_painter::functionsetGradientColor(KviKvsObjectFunctionCall *c)
{
kvs_real_t dAt;
@@ -1436,7 +1446,7 @@ bool KviKvsObject_painter::functionsetGradientColor(KviKvsObjectFunctionCall *c)
{
var1->asString(szColor);
if (c->paramCount()<3) iOpacity=255;
- else
+ else
{
if (!var2->asInteger(iOpacity))
{
@@ -1474,6 +1484,7 @@ bool KviKvsObject_painter::functionsetGradientColor(KviKvsObjectFunctionCall *c)
return true;
}
+
bool KviKvsObject_painter::functionsetGradientAsBrush(KviKvsObjectFunctionCall *c)
{
if (!m_pPainter) return true;
@@ -1481,12 +1492,14 @@ bool KviKvsObject_painter::functionsetGradientAsBrush(KviKvsObjectFunctionCall *
m_pPainter->setBrush(*m_pGradient);
return true;
}
+
bool KviKvsObject_painter::functionclearGradient(KviKvsObjectFunctionCall *c)
{
if (!m_pGradient) delete m_pGradient;
m_pGradient=0;
return true;
}
+
bool KviKvsObject_painter::functionsetPenWidth(KviKvsObjectFunctionCall *c)
{
kvs_real_t iWidth;
@@ -1499,6 +1512,7 @@ bool KviKvsObject_painter::functionsetPenWidth(KviKvsObjectFunctionCall *c)
m_pPainter->setPen(pen);
return true;
}
+
bool KviKvsObject_painter::functionfillRect(KviKvsObjectFunctionCall *c)
{
kvs_int_t iX,iY,iW,iH;
@@ -1527,6 +1541,7 @@ bool KviKvsObject_painter::functionfillRect(KviKvsObjectFunctionCall *c)
m_pPainter->fillRect(iX,iY,iW,iH,col);
return true;
}
+
bool KviKvsObject_painter::functioncolorNames(KviKvsObjectFunctionCall *c)
{
QStringList color=QColor::colorNames();
@@ -1539,6 +1554,7 @@ bool KviKvsObject_painter::functioncolorNames(KviKvsObjectFunctionCall *c)
c->returnValue()->setArray(a);
return true;
}
+
bool KviKvsObject_painter::functionpathMoveTo(KviKvsObjectFunctionCall *c)
{
kvs_real_t dX,dY;
@@ -1551,6 +1567,7 @@ bool KviKvsObject_painter::functionpathMoveTo(KviKvsObjectFunctionCall *c)
m_pPainterPath->moveTo(dX,dY);
return true;
}
+
bool KviKvsObject_painter::functionpathLineTo(KviKvsObjectFunctionCall *c)
{
kvs_real_t dX,dY;
@@ -1563,6 +1580,7 @@ bool KviKvsObject_painter::functionpathLineTo(KviKvsObjectFunctionCall *c)
m_pPainterPath->lineTo(dX,dY);
return true;
}
+
bool KviKvsObject_painter::functionpathAddText(KviKvsObjectFunctionCall *c)
{
kvs_real_t dX,dY;
@@ -1577,6 +1595,7 @@ bool KviKvsObject_painter::functionpathAddText(KviKvsObjectFunctionCall *c)
m_pPainterPath->addText(dX,dY,m_pPainter->font(),szText);
return true;
}
+
bool KviKvsObject_painter::functiondrawPath(KviKvsObjectFunctionCall *c)
{
if (m_pPainter) m_pPainter->drawPath(*m_pPainterPath);
@@ -1584,6 +1603,7 @@ bool KviKvsObject_painter::functiondrawPath(KviKvsObjectFunctionCall *c)
//m_pPainterPath=0;
return true;
}
+
bool KviKvsObject_painter::functionresetPath(KviKvsObjectFunctionCall *c)
{
if (m_pPainterPath){
@@ -1594,8 +1614,6 @@ bool KviKvsObject_painter::functionresetPath(KviKvsObjectFunctionCall *c)
}
-
#ifndef COMPILE_USE_STANDALONE_MOC_SOURCES
#include "m_class_painter.moc"
#endif //!COMPILE_USE_STANDALONE_MOC_SOURCES
-
diff --git a/src/modules/objects/class_popupmenu.cpp b/src/modules/objects/class_popupmenu.cpp
index 4745938ec..50b14e9a0 100644
--- a/src/modules/objects/class_popupmenu.cpp
+++ b/src/modules/objects/class_popupmenu.cpp
@@ -23,6 +23,7 @@
#include "class_popupmenu.h"
+
#include "kvi_error.h"
#include "kvi_debug.h"
#include "kvi_locale.h"
@@ -36,7 +37,7 @@
/*
- @doc: popupmenu
+ @doc: popupmenu
@keyterms:
popupmenu object class,
@title:
@@ -204,13 +205,12 @@ bool KviKvsObject_popupmenu::functioninsertItem(KviKvsObjectFunctionCall *c)
if(!widget())return true;
QPixmap *pix = 0;
int id=0;
- QAction * action;
- if(!szIcon.isEmpty())
+ QAction * action;
+ if(!szIcon.isEmpty())
{
pix = g_pIconManager->getImage(szIcon);
if (pix) action=((QMenu *)widget())->addAction(*pix,szItem);
else c->warning(__tr2qs("pix '%Q' doesn't exists"),&szIcon);
-
}
else
action=((QMenu *)widget())->addAction(szItem);
@@ -251,10 +251,10 @@ bool KviKvsObject_popupmenu::functioninsertWidget(KviKvsObjectFunctionCall *c)
return true;
}
if(!pObject->object()->isWidgetType())
- {
+ {
c->warning(__tr2qs("Can't add a non-widget object"));
- return TRUE;
- }
+ return TRUE;
+ }
if (widget()) ((KviTalPopupMenu *)widget())->insertItem(((KviTalPopupMenu *)(pObject->object())));
return true;
}
@@ -272,19 +272,18 @@ bool KviKvsObject_popupmenu::functioninsertHandle(KviKvsObjectFunctionCall *c)
KVSO_PARAMETERS_END(c)
ob=KviKvsKernel::instance()->objectController()->lookupObject(hObject);
if(!ob->object()->inherits("KviKvsObject_popupmenu"))
- {
+ {
c->warning(__tr2qs("Can't add a non - popupmenu object"));
- return TRUE;
- }
+ return TRUE;
+ }
if(!widget())return true;
QPixmap *pix = 0;
int id=0;
- if(!szIcon.isEmpty())
+ if(!szIcon.isEmpty())
{
pix = g_pIconManager->getImage(szIcon);
- if (pix) id=((KviTalPopupMenu *)widget())->insertItem(*pix,szLabel,((KviTalPopupMenu *)(ob->object())));
+ if (pix) id=((KviTalPopupMenu *)widget())->insertItem(*pix,szLabel,((KviTalPopupMenu *)(ob->object())));
else c->warning(__tr2qs("pix '%Q' doesn't exists"),&szIcon);
-
}
else
id=((KviTalPopupMenu *)widget())->insertItem(szLabel,((KviTalPopupMenu *)(ob->object())));
@@ -297,7 +296,7 @@ bool KviKvsObject_popupmenu::functionexec(KviKvsObjectFunctionCall *c)
if(!c->params()->count())
{
((QMenu *)widget())->exec(QCursor::pos());
- return true;
+ return true;
}
KviKvsObject *pObject;
@@ -330,6 +329,7 @@ bool KviKvsObject_popupmenu::functionexec(KviKvsObjectFunctionCall *c)
return true;
}
+
bool KviKvsObject_popupmenu::functionremoveItem(KviKvsObjectFunctionCall *c)
{
kvs_uint_t uItem;
@@ -344,7 +344,6 @@ bool KviKvsObject_popupmenu::functionremoveItem(KviKvsObjectFunctionCall *c)
return true;
}
-
bool KviKvsObject_popupmenu::functioninsertSeparator(KviKvsObjectFunctionCall *c)
{
kvs_uint_t iIndex;
@@ -361,11 +360,13 @@ void KviKvsObject_popupmenu::slothighlighted(int i)
KviKvsVariantList params(new KviKvsVariant((kvs_int_t)i));
callFunction(this,"highlightedEvent",&params);
}
+
bool KviKvsObject_popupmenu::functionhighlightedEvent(KviKvsObjectFunctionCall *c)
{
emitSignal("highlighted",c,c->params());
return true;
}
+
void KviKvsObject_popupmenu::slottriggered(QAction *a)
{
QHashIterator<int, QAction *> i(actionsDict);
@@ -373,13 +374,14 @@ void KviKvsObject_popupmenu::slottriggered(QAction *a)
bool found=false;
while (i.hasNext())
{
- i.next();
- if (i.value()!= a) count++;
- else break;
+ i.next();
+ if (i.value()!= a) count++;
+ else break;
}
KviKvsVariantList params(new KviKvsVariant(count));
callFunction(this,"activatedEvent",&params);
}
+
bool KviKvsObject_popupmenu::functionactivatedEvent(KviKvsObjectFunctionCall *c)
{
emitSignal("activated",c,c->params());
@@ -390,4 +392,3 @@ bool KviKvsObject_popupmenu::functionactivatedEvent(KviKvsObjectFunctionCall *c)
#ifndef COMPILE_USE_STANDALONE_MOC_SOURCES
#include "m_class_popupmenu.moc"
#endif //!COMPILE_USE_STANDALONE_MOC_SOURCES
-
diff --git a/src/modules/objects/class_widget.cpp b/src/modules/objects/class_widget.cpp
index 07048ce78..ac086bb53 100644
--- a/src/modules/objects/class_widget.cpp
+++ b/src/modules/objects/class_widget.cpp
@@ -22,6 +22,9 @@
//
//=============================================================================
+#include "class_widget.h"
+#include "class_pixmap.h"
+
#include "kvi_malloc.h"
#include "kvi_debug.h"
#include "kvi_error.h"
@@ -29,8 +32,6 @@
#include "kvi_iconmanager.h"
#include "kvi_window.h"
#include "kvi_app.h"
-#include "class_widget.h"
-#include "class_pixmap.h"
#include <QKeyEvent>
#include <QDesktopWidget>
@@ -44,15 +45,16 @@
#include <QBitmap>
#include <QMetaObject>
#include <QIcon>
+
KviKvsWidget::KviKvsWidget(KviKvsObject_widget * object,QWidget * par)
:QWidget(par), m_pObject(object)
{
}
+
KviKvsWidget::~KviKvsWidget()
{
}
-
QSize KviKvsWidget::sizeHint() const
{
QSize size=QWidget::sizeHint();
@@ -71,36 +73,38 @@ QSize KviKvsWidget::sizeHint() const
}
-// FIX ME: WFLAGS
+// FIXME: WFLAGS
const char * const widgettypes_tbl[] = {
- "TopLevel",
- "Dialog",
- "Popup",
- "Desktop",
- "Customize",
- "Title",
- "StaysOnTop",
- "SysMenu",
- "Minimize",
- "Maximize",
- "NoAutoErase"
- };
-const Qt::WidgetAttribute widgetattributes_cod[]= {
+ "TopLevel",
+ "Dialog",
+ "Popup",
+ "Desktop",
+ "Customize",
+ "Title",
+ "StaysOnTop",
+ "SysMenu",
+ "Minimize",
+ "Maximize",
+ "NoAutoErase"
+};
+
+const Qt::WidgetAttribute widgetattributes_cod[] = {
Qt::WA_OpaquePaintEvent,
Qt::WA_NoSystemBackground,
Qt::WA_PaintOnScreen,
- Qt::WA_NoMousePropagation,
+ Qt::WA_NoMousePropagation
};
const char * const widgetattributes_tbl[] = {
"opaquePaintEvent",
"noSystemBackground",
"paintOnScreen",
- "noMousePropagation",
+ "noMousePropagation"
};
+
#define widgetattributes_num (sizeof(widgetattributes_tbl) / sizeof(widgetattributes_tbl[0]))
-const QPalette::ColorRole colorrole_cod[]= {
+const QPalette::ColorRole colorrole_cod[] = {
QPalette::Window,
QPalette::Background,
QPalette::WindowText,
@@ -112,7 +116,7 @@ const QPalette::ColorRole colorrole_cod[]= {
QPalette::ButtonText,
QPalette::BrightText,
QPalette::Highlight,
- QPalette::HighlightedText,
+ QPalette::HighlightedText
};
const char * const colorrole_tbl[] = {
@@ -129,31 +133,28 @@ const char * const colorrole_tbl[] = {
"Highlight",
"HighlightedText"
};
+
#define colorrole_num (sizeof(colorrole_tbl) / sizeof(colorrole_tbl[0]))
const Qt::WindowType widgettypes_cod[] = {
- Qt::WType_TopLevel,
- Qt::WType_Dialog,
- Qt::WType_Popup,
- Qt::WType_Desktop,
- Qt::WStyle_Customize,
- Qt::WStyle_Title,
- Qt::WStyle_StaysOnTop,
- Qt::WStyle_SysMenu,
- Qt::WStyle_Minimize,
- Qt::WStyle_Maximize,
- Qt::WNoAutoErase
+ Qt::WType_TopLevel,
+ Qt::WType_Dialog,
+ Qt::WType_Popup,
+ Qt::WType_Desktop,
+ Qt::WStyle_Customize,
+ Qt::WStyle_Title,
+ Qt::WStyle_StaysOnTop,
+ Qt::WStyle_SysMenu,
+ Qt::WStyle_Minimize,
+ Qt::WStyle_Maximize,
+ Qt::WNoAutoErase
};
-
-
- #define QT_WIDGET_TABFOCUS Qt::TabFocus
- #define QT_WIDGET_CLICKFOCUS Qt::ClickFocus
- #define QT_WIDGET_STRONGFOCUS Qt::StrongFocus
- #define QT_WIDGET_NOFOCUS Qt::NoFocus
-
-
+#define QT_WIDGET_TABFOCUS Qt::TabFocus
+#define QT_WIDGET_CLICKFOCUS Qt::ClickFocus
+#define QT_WIDGET_STRONGFOCUS Qt::StrongFocus
+#define QT_WIDGET_NOFOCUS Qt::NoFocus
#define widgettypes_num (sizeof(widgettypes_tbl) / sizeof(widgettypes_tbl[0]))
@@ -794,7 +795,6 @@ bool KviKvsObject_widget::eventFilter(QObject *o,QEvent *e)
case Qt::Key_Delete:
tmp="Del";
break;
-
case Qt::Key_Enter:
tmp="Enter";
break;
@@ -961,6 +961,7 @@ bool KviKvsObject_widget::function_show(KviKvsObjectFunctionCall *c)
wid->show();
return true;
}
+
bool KviKvsObject_widget::function_update(KviKvsObjectFunctionCall *c)
{
kvs_int_t iX,iY,iW,iH;
@@ -987,28 +988,30 @@ bool KviKvsObject_widget::function_setEnabled(KviKvsObjectFunctionCall *c)
widget()->setEnabled(bEnabled);
return true;
}
+
bool KviKvsObject_widget::function_isEnabled(KviKvsObjectFunctionCall *c)
{
if(!widget()) return true;
c->returnValue()->setBoolean(widget()->isEnabled());
return true;
}
+
bool KviKvsObject_widget::function_fontDescent(KviKvsObjectFunctionCall * c)
{
if(!widget()) return true;
QFontMetrics fm = widget()->fontMetrics();
- int d = fm.descent();
+ int d = fm.descent();
c->returnValue()->setInteger(d);
- return true;
+ return true;
}
bool KviKvsObject_widget::function_fontAscent(KviKvsObjectFunctionCall * c)
{
if(!widget()) return true;
- QFontMetrics fm = widget()->fontMetrics();
- int d = fm.ascent();
+ QFontMetrics fm = widget()->fontMetrics();
+ int d = fm.ascent();
c->returnValue()->setInteger(d);
- return true;
+ return true;
}
@@ -1019,7 +1022,7 @@ bool KviKvsObject_widget::function_repaint(KviKvsObjectFunctionCall * c)
KVSO_PARAMETER("bEnabled",KVS_PT_BOOL,0,bEnabled)
KVSO_PARAMETERS_END(c)
if(!widget()) return true;
- widget()->repaint(bEnabled);
+ widget()->repaint(bEnabled);
return true;
}
@@ -1037,10 +1040,11 @@ bool KviKvsObject_widget::function_fontMetricsWidth(KviKvsObjectFunctionCall * c
bool KviKvsObject_widget::function_fontMetricsHeight(KviKvsObjectFunctionCall * c)
{
if(!widget())return true;
- int fm = widget()->fontMetrics().height();
+ int fm = widget()->fontMetrics().height();
c->returnValue()->setInteger(fm);
- return true;
+ return true;
}
+
bool KviKvsObject_widget::function_screenResolution(KviKvsObjectFunctionCall * c)
{
KviKvsArray * a = new KviKvsArray();
@@ -1135,8 +1139,8 @@ bool KviKvsObject_widget::function_setGeometry(KviKvsObjectFunctionCall *c)
return true;
}
-bool KviKvsObject_widget::function_mapToGlobal(KviKvsObjectFunctionCall *c)
+bool KviKvsObject_widget::function_mapToGlobal(KviKvsObjectFunctionCall *c)
{
if(!widget())return true;
kvs_int_t iX,iY;
@@ -1153,7 +1157,6 @@ bool KviKvsObject_widget::function_mapToGlobal(KviKvsObjectFunctionCall *c)
}
bool KviKvsObject_widget::function_mapFromGlobal(KviKvsObjectFunctionCall *c)
-
{
if(!widget())return true;
kvs_int_t iX,iY;
@@ -1168,6 +1171,7 @@ bool KviKvsObject_widget::function_mapFromGlobal(KviKvsObjectFunctionCall *c)
c->returnValue()->setArray(a);
return true;
}
+
bool KviKvsObject_widget::function_centerToScreen(KviKvsObjectFunctionCall *c)
{
if(widget()) widget()->move((g_pApp->desktop()->width() - widget()->width())/2,(g_pApp->desktop()->height() - widget()->height())/2);
@@ -1176,7 +1180,6 @@ bool KviKvsObject_widget::function_centerToScreen(KviKvsObjectFunctionCall *c)
bool KviKvsObject_widget::function_setPaletteForeground(KviKvsObjectFunctionCall *c)
{
-
KviKvsVariant * pColArray;
kvs_int_t iColR,iColG,iColB;
@@ -1209,40 +1212,39 @@ bool KviKvsObject_widget::function_setPaletteForeground(KviKvsObjectFunctionCall
c->error(__tr2qs("One of the colors array parameters didn't evaluate to an integer"));
return false;
}
-
- }
- else
+ }
+ else
{
- if (c->params()->count()==1)
+ if (c->params()->count()==1)
+ {
+ bool bOk,bOk1,bOk2;
+ QString value;
+ pColArray->asString(value);
+ int i=0;
+ if (value.length()!=6)
{
- bool bOk,bOk1,bOk2;
- QString value;
- pColArray->asString(value);
- int i=0;
- if (value.length()!=6)
- {
- c->warning(__tr2qs("A string of 6 digits hex is required"));
- return true;
- }
- QString buffer(value.mid(0,2));
- iColR=buffer.toInt(&bOk,16);
- buffer=value.mid(2,2);
- iColG=buffer.toInt(&bOk1,16);
- buffer=value.mid(4,2);
- iColB=buffer.toInt(&bOk2,16);
- if (!bOk || !bOk1 || !bOk2)
- {
- c->warning(__tr2qs("Not an hex digits"));
+ c->warning(__tr2qs("A string of 6 digits hex is required"));
+ return true;
+ }
+ QString buffer(value.mid(0,2));
+ iColR=buffer.toInt(&bOk,16);
+ buffer=value.mid(2,2);
+ iColG=buffer.toInt(&bOk1,16);
+ buffer=value.mid(4,2);
+ iColB=buffer.toInt(&bOk2,16);
+ if (!bOk || !bOk1 || !bOk2)
+ {
+ c->warning(__tr2qs("Not an hex digits"));
+ return true;
+ }
+ if (widget())
+ {
+ QPalette p = widget()->palette();
+ p.setColor(widget()->foregroundRole(), QColor(iColR,iColG,iColB));
+ widget()->setPalette(p);
return true;
- }
- if (widget())
- {
- QPalette p = widget()->palette();
- p.setColor(widget()->foregroundRole(), QColor(iColR,iColG,iColB));
- widget()->setPalette(p);
- return true;
- }
}
+ }
if(c->params()->count() < 3)
{
@@ -1299,38 +1301,37 @@ bool KviKvsObject_widget::function_setBackgroundColor(KviKvsObjectFunctionCall *
c->error(__tr2qs("One of the colors array parameters didn't evaluate to an integer"));
return false;
}
-
} else {
- if (c->params()->count()==1)
+ if (c->params()->count()==1)
+ {
+ bool bOk,bOk1,bOk2;
+ QString value;
+ pColArray->asString(value);
+ int i=0;
+ if (value.length()!=6)
{
- bool bOk,bOk1,bOk2;
- QString value;
- pColArray->asString(value);
- int i=0;
- if (value.length()!=6)
- {
- c->warning(__tr2qs("A string of 6 digits hex is required"));
- return true;
- }
- QString buffer(value.mid(0,2));
- iColR=buffer.toInt(&bOk,16);
- buffer=value.mid(2,2);
- iColG=buffer.toInt(&bOk1,16);
- buffer=value.mid(4,2);
- iColB=buffer.toInt(&bOk2,16);
- if (!bOk || !bOk1 || !bOk2)
- {
- c->warning(__tr2qs("Not an hex digits"));
+ c->warning(__tr2qs("A string of 6 digits hex is required"));
return true;
- }
- if (widget())
- {
- QPalette p = widget()->palette();
- p.setColor(widget()->backgroundRole(), QColor(iColR,iColG,iColB));
- widget()->setPalette(p);
- }
- return true;
}
+ QString buffer(value.mid(0,2));
+ iColR=buffer.toInt(&bOk,16);
+ buffer=value.mid(2,2);
+ iColG=buffer.toInt(&bOk1,16);
+ buffer=value.mid(4,2);
+ iColB=buffer.toInt(&bOk2,16);
+ if (!bOk || !bOk1 || !bOk2)
+ {
+ c->warning(__tr2qs("Not an hex digits"));
+ return true;
+ }
+ if (widget())
+ {
+ QPalette p = widget()->palette();
+ p.setColor(widget()->backgroundRole(), QColor(iColR,iColG,iColB));
+ widget()->setPalette(p);
+ }
+ return true;
+ }
if(c->params()->count() < 3)
{
@@ -1344,8 +1345,8 @@ bool KviKvsObject_widget::function_setBackgroundColor(KviKvsObjectFunctionCall *
return false;
}
}
- if (widget())
- {
+ if (widget())
+ {
QPalette p = widget()->palette();
p.setColor(widget()->backgroundRole(), QColor(iColR,iColG,iColB));
widget()->setPalette(p);
@@ -1383,9 +1384,10 @@ bool KviKvsObject_widget::function_parentWidget(KviKvsObjectFunctionCall *c)
if(parentScriptWidget()) c->returnValue()->setHObject(parentObject()->handle());
else
c->returnValue()->setHObject((kvs_hobject_t)0);
- return true;
+ return true;
}
+
bool KviKvsObject_widget::function_setMouseTracking(KviKvsObjectFunctionCall *c)
{
bool bEnabled;
@@ -1447,6 +1449,7 @@ bool KviKvsObject_widget::function_setFocus(KviKvsObjectFunctionCall *c)
if (widget())widget()->setFocus();
return true;
}
+
bool KviKvsObject_widget::function_hide(KviKvsObjectFunctionCall *)
{
if(widget())widget()->hide();
@@ -1513,7 +1516,7 @@ bool KviKvsObject_widget::function_setMaximumWidth(KviKvsObjectFunctionCall *c)
KVSO_PARAMETERS_BEGIN(c)
KVSO_PARAMETER("w",KVS_PT_INT,0,iW)
KVSO_PARAMETERS_END(c)
- if (widget()) widget()->setMaximumWidth(iW);
+ if (widget()) widget()->setMaximumWidth(iW);
return true;
}
@@ -1535,8 +1538,8 @@ bool KviKvsObject_widget::function_move(KviKvsObjectFunctionCall *c)
KVSO_PARAMETERS_BEGIN(c)
KVSO_PARAMETER("x_or_array",KVS_PT_VARIANT,0,pXOrArray)
KVSO_PARAMETER("y",KVS_PT_INT,KVS_PF_OPTIONAL,iY)
- KVSO_PARAMETERS_END(c)
- if(pXOrArray->isArray())
+ KVSO_PARAMETERS_END(c)
+ if(pXOrArray->isArray())
{
if(pXOrArray->array()->size() < 2)
{
@@ -1574,6 +1577,7 @@ bool KviKvsObject_widget::function_move(KviKvsObjectFunctionCall *c)
widget()->move(QPoint(iX,iY));
return true;
}
+
bool KviKvsObject_widget::function_sizeHint(KviKvsObjectFunctionCall *c)
{
if(!widget())return true;
@@ -1592,8 +1596,8 @@ bool KviKvsObject_widget::function_resize(KviKvsObjectFunctionCall *c)
KVSO_PARAMETERS_BEGIN(c)
KVSO_PARAMETER("width_or_array",KVS_PT_VARIANT,0,pWOrArray)
KVSO_PARAMETER("height",KVS_PT_INT,KVS_PF_OPTIONAL,iH)
- KVSO_PARAMETERS_END(c)
- if(pWOrArray->isArray())
+ KVSO_PARAMETERS_END(c)
+ if(pWOrArray->isArray())
{
if(pWOrArray->array()->size() < 2)
{
@@ -1631,6 +1635,7 @@ bool KviKvsObject_widget::function_resize(KviKvsObjectFunctionCall *c)
widget()->resize(QSize(iW,iH));
return true;
}
+
bool KviKvsObject_widget::function_setFocusPolicy(KviKvsObjectFunctionCall *c)
{
QString szMode;
@@ -1663,22 +1668,20 @@ bool KviKvsObject_widget::function_setWFlags(KviKvsObjectFunctionCall *c)
Qt::WindowFlags flag,sum=0;
for ( QStringList::Iterator it = wflags.begin(); it != wflags.end(); ++it )
{
-
- flag=0;
- for(unsigned int j = 0; j < widgettypes_num; j++)
+ flag=0;
+ for(unsigned int j = 0; j < widgettypes_num; j++)
+ {
+ if(KviQString::equalCI((*it), widgettypes_tbl[j]))
{
- if(KviQString::equalCI((*it), widgettypes_tbl[j]))
- {
- flag=widgettypes_cod[j];
- break;
- }
+ flag=widgettypes_cod[j];
+ break;
}
- if(flag)
- sum = sum | flag;
- else
- c->warning(__tr2qs("Unknown widget flag '%Q'"),&(*it));
-
}
+ if(flag)
+ sum = sum | flag;
+ else
+ c->warning(__tr2qs("Unknown widget flag '%Q'"),&(*it));
+ }
widget()->setWindowFlags(sum);
return true;
@@ -1769,6 +1772,7 @@ bool KviKvsObject_widget::function_reparent(KviKvsObjectFunctionCall *c)
widget()->reparent(((QWidget *)(ob->object())),QPoint(((QWidget *)(ob->object()))->x(),((QWidget *)(ob->object()))->y()));
return true;
}
+
bool KviKvsObject_widget::function_setWindowIcon(KviKvsObjectFunctionCall *c)
{
@@ -1802,16 +1806,19 @@ bool KviKvsObject_widget::function_setBackgroundImage(KviKvsObjectFunctionCall *
}
return true;
}
+
bool KviKvsObject_widget::function_globalCursorX(KviKvsObjectFunctionCall *c)
{
if(widget())c->returnValue()->setInteger(QCursor::pos().x());
return true;
}
+
bool KviKvsObject_widget::function_globalCursorY(KviKvsObjectFunctionCall *c)
{
if(widget())c->returnValue()->setInteger(QCursor::pos().y());
return true;
}
+
bool KviKvsObject_widget::function_setMask(KviKvsObjectFunctionCall *c)
{
KviKvsObject *obj;
@@ -1837,6 +1844,7 @@ bool KviKvsObject_widget::function_setMask(KviKvsObjectFunctionCall *c)
widget()->setMask(mask);
return true;
}
+
bool KviKvsObject_widget::function_setAttribute(KviKvsObjectFunctionCall *c)
{
QString attribute;
@@ -1860,6 +1868,7 @@ bool KviKvsObject_widget::function_setAttribute(KviKvsObjectFunctionCall *c)
else c->warning(__tr2qs("Unknown widget attribute '%Q'"),&attribute);
return true;
}
+
bool KviKvsObject_widget::function_colorPalette(KviKvsObjectFunctionCall *c)
{
QString szColorRole,szColorGroup;
@@ -1900,6 +1909,7 @@ bool KviKvsObject_widget::function_colorPalette(KviKvsObjectFunctionCall *c)
c->returnValue()->setArray(a);
return true;
}
+
bool KviKvsObject_widget::function_setStyleSheet(KviKvsObjectFunctionCall *c)
{
QString szStyleSheet;
@@ -1909,6 +1919,7 @@ bool KviKvsObject_widget::function_setStyleSheet(KviKvsObjectFunctionCall *c)
if(widget())widget()->setStyleSheet(szStyleSheet);
return true;
}
+
bool KviKvsObject_widget::function_setKeyShortcut(KviKvsObjectFunctionCall *c)
{
QString szKey;
@@ -1923,4 +1934,3 @@ bool KviKvsObject_widget::function_setKeyShortcut(KviKvsObjectFunctionCall *c)
#ifndef COMPILE_USE_STANDALONE_MOC_SOURCES
#include "m_class_widget.moc"
#endif //!COMPILE_USE_STANDALONE_MOC_SOURCES
-
generated by cgit v1.3.1-10-gc9f91 (git 2.54.0) at 2026-08-08 13:40:51 +0000