From 522dfb2ad8401b0cbe7c8aa2adb2213c669aa132 Mon Sep 17 00:00:00 2001 From: Noldor Date: Tue, 27 Feb 2007 17:11:32 +0000 Subject: objects module QT4 porting (wip) git-svn-id: https://svn.kvirc.de/svn/trunk/kvirc@384 17fca916-40b9-46aa-a4ea-0a15b648b75c --- src/modules/objects/class_label.cpp | 51 +++++++++++++++++++++++++++++-------- 1 file changed, 40 insertions(+), 11 deletions(-) (limited to 'src/modules/objects/class_label.cpp') diff --git a/src/modules/objects/class_label.cpp b/src/modules/objects/class_label.cpp index 9c89fd300..01ae24fe5 100644 --- a/src/modules/objects/class_label.cpp +++ b/src/modules/objects/class_label.cpp @@ -45,16 +45,36 @@ const char * const align_tbl[] = { "Bottom", "WordBreak" }; +#ifdef COMPILE_USE_QT4 + #define QT_LABEL_ALIGNLEFT Qt::AlignLeft + #define QT_LABEL_ALIGNRIGHT Qt::AlignRight + #define QT_LABEL_ALIGNHCENTER Qt::AlignHCenter + #define QT_LABEL_ALIGNVCENTER Qt::AlignVCenter + #define QT_LABEL_ALIGNCENTER Qt::AlignCenter + #define QT_LABEL_ALIGNTOP Qt::AlignTop + #define QT_LABEL_ALIGNBOTTOM Qt::AlignBottom + #define QT_LABEL_JUSTIFY Qt::AlignJustify +#else + #define QT_LABEL_ALIGNLEFT QLabel::AlignLeft + #define QT_LABEL_ALIGNRIGHT QLabel::AlignRight + #define QT_LABEL_ALIGNHCENTER QLabel::AlignHCenter + #define QT_LABEL_ALIGNVCENTER QLabel::AlignVCenter + #define QT_LABEL_ALIGNCENTER QLabel::AlignCenter + #define QT_LABEL_ALIGNTOP QLabel::AlignTop + #define QT_LABEL_ALIGNBOTTOM QLabel::AlignBottom + #define QT_LABEL_JUSTIFY QLabel::WordBreak +#endif + const int align_cod[] = { - QLabel::AlignLeft, - QLabel::AlignRight, - QLabel::AlignHCenter, - QLabel::AlignVCenter, - QLabel::AlignCenter, - QLabel::AlignTop, - QLabel::AlignBottom, - QLabel::WordBreak - }; + QT_LABEL_ALIGNLEFT, + QT_LABEL_ALIGNRIGHT, + QT_LABEL_ALIGNHCENTER, + QT_LABEL_ALIGNVCENTER, + QT_LABEL_ALIGNCENTER, + QT_LABEL_ALIGNTOP, + QT_LABEL_ALIGNBOTTOM, + QT_LABEL_JUSTIFY, + }; #define align_num (sizeof(align_tbl) / sizeof(align_tbl[0])) @@ -250,22 +270,31 @@ bool KviKvsObject_label::functionMargin(KviKvsObjectFunctionCall *c) return true; } +// FIX ME bool KviKvsObject_label::functionSetAutoResize(KviKvsObjectFunctionCall *c) { bool bEnabled; KVSO_PARAMETERS_BEGIN(c) KVSO_PARAMETER("bEnabled",KVS_PT_BOOL,0,bEnabled) KVSO_PARAMETERS_END(c) + #ifdef COMPILE_USE_QT4 + return true; + #else if(widget()) ((QLabel *)widget())->setAutoResize(bEnabled); return true; + #endif } bool KviKvsObject_label::functionAutoResize(KviKvsObjectFunctionCall *c) { - if (widget()) c->returnValue()->setBoolean(((QLabel *)widget())->autoResize()); + #ifdef COMPILE_USE_QT4 + if (widget()) c->returnValue()->setBoolean(true); + #else + if (widget()) c->returnValue()->setBoolean(((QLabel *)widget())->autoResize()); + #endif return true; } - +// bool KviKvsObject_label::functionSetAlignment(KviKvsObjectFunctionCall *c) { QStringList alignment; -- cgit v1.3.1-10-gc9f91