added $countStatusBarItems();

code clean;


git-svn-id: https://svn.kvirc.de/svn/trunk/kvirc@1709 17fca916-40b9-46aa-a4ea-0a15b648b75c

2 files changed, 25 insertions, 36 deletions

diff --git a/src/modules/objects/class_widget.cpp b/src/modules/objects/class_widget.cpp
index 5b50cfc4f..4a55b3099 100644
--- a/src/modules/objects/class_widget.cpp
+++ b/src/modules/objects/class_widget.cpp
@@ -47,6 +47,7 @@
 #include <QMetaObject>

 #include <QIcon>

 #include <QStatusBar>

+#include <QList>

 

 KviKvsWidget::KviKvsWidget(KviKvsObject_widget * object,QWidget * par)

 :QWidget(par), m_pObject(object)

@@ -675,16 +676,13 @@ KVSO_BEGIN_REGISTERCLASS(KviKvsObject_widget,"widget","object")
 	KVSO_REGISTER_HANDLER(KviKvsObject_widget,"backgroundColor",function_backgroundColor)

 	KVSO_REGISTER_HANDLER(KviKvsObject_widget,"foregroundColor",function_foregroundColor)

 	KVSO_REGISTER_HANDLER(KviKvsObject_widget,"setMask",function_setMask)

-

-	// QT4 only

-

-

 	KVSO_REGISTER_HANDLER(KviKvsObject_widget,"setAttribute",function_setAttribute)

 	KVSO_REGISTER_HANDLER(KviKvsObject_widget,"colorPalette",function_colorPalette)

 	KVSO_REGISTER_HANDLER(KviKvsObject_widget,"setStyleSheet",function_setStyleSheet)

 	KVSO_REGISTER_HANDLER(KviKvsObject_widget,"setKeyShortcut",function_setKeyShortcut)

-	KVSO_REGISTER_HANDLER(KviKvsObject_widget,"insertIntoStatusBar",function_insertIntoStatusBar)

 

+	// statusbar

+	KVSO_REGISTER_HANDLER(KviKvsObject_widget,"insertIntoStatusBar",function_insertIntoStatusBar)

 

 	// events

 	KVSO_REGISTER_STANDARD_NOTHINGRETURN_HANDLER(KviKvsObject_widget,"mousePressEvent")

@@ -703,9 +701,6 @@ KVSO_BEGIN_REGISTERCLASS(KviKvsObject_widget,"widget","object")
 	KVSO_REGISTER_STANDARD_NOTHINGRETURN_HANDLER(KviKvsObject_widget,"paintEvent")

 	KVSO_REGISTER_STANDARD_NOTHINGRETURN_HANDLER(KviKvsObject_widget,"keyPressEvent")

 	KVSO_REGISTER_STANDARD_NOTHINGRETURN_HANDLER(KviKvsObject_widget,"sizeHintRequestEvent")

-

-

-// QT4

 	KVSO_REGISTER_STANDARD_NOTHINGRETURN_HANDLER(KviKvsObject_widget,"maybeTipEvent")

 	KVSO_REGISTER_STANDARD_NOTHINGRETURN_HANDLER(KviKvsObject_widget,"shortCutEvent")

 

@@ -1653,16 +1648,16 @@ bool KviKvsObject_widget::function_setFocusPolicy(KviKvsObjectFunctionCall *c)
 		KVSO_PARAMETER("focus",KVS_PT_STRING,0,szMode)

 	KVSO_PARAMETERS_END(c)

 	if(!widget())return true;

-	if(KviQString::equalCI(szMode, "TabFocus"))

+	if(KviQString::equalCI(szMode,"TabFocus"))

 		widget()->setFocusPolicy(QT_WIDGET_TABFOCUS);

 	else

-	if(KviQString::equalCI(szMode, "ClickFocus"))

+	if(KviQString::equalCI(szMode,"ClickFocus"))

 		widget()->setFocusPolicy(QT_WIDGET_CLICKFOCUS);

 	else

-	if(KviQString::equalCI(szMode, "StrongFocus"))

+	if(KviQString::equalCI(szMode,"StrongFocus"))

 		widget()->setFocusPolicy(QT_WIDGET_STRONGFOCUS);

 	else

-	if(KviQString::equalCI(szMode, "NoFocus"))

+	if(KviQString::equalCI(szMode,"NoFocus"))

 		widget()->setFocusPolicy(QT_WIDGET_NOFOCUS);

 	else c->warning(__tr2qs("Invalid parameters"));

 	return true;

@@ -1699,7 +1694,6 @@ bool KviKvsObject_widget::function_setWFlags(KviKvsObjectFunctionCall *c)
 

 bool KviKvsObject_widget::function_setFont(KviKvsObjectFunctionCall *c)

 {

-

 	QString szFamily,szStyle;

 	kvs_int_t uSize;

 	KVSO_PARAMETERS_BEGIN(c)

@@ -1805,9 +1799,9 @@ bool KviKvsObject_widget::function_setBackgroundImage(KviKvsObjectFunctionCall *
 	if(!widget())return true;

 	QPixmap * pix = g_pIconManager->getImage(image);

 	if(pix){

-			QPalette palette=widget()->palette();

-			palette.setBrush(widget()->backgroundRole(), QBrush(*pix));

-			widget()->setPalette(palette);

+		QPalette palette=widget()->palette();

+		palette.setBrush(widget()->backgroundRole(), QBrush(*pix));

+		widget()->setPalette(palette);

 	}

 	else

 	{

diff --git a/src/modules/objects/class_widget.h b/src/modules/objects/class_widget.h
index 3cd931bcf..518b72beb 100644
--- a/src/modules/objects/class_widget.h
+++ b/src/modules/objects/class_widget.h
@@ -21,11 +21,11 @@
 //   along with this program. If not, write to the Free Software Foundation,

 //   Inc. ,59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.

 //

-#include <kvi_tal_tooltip.h>

+

 #include "kvi_string.h"

+#include "kvi_tal_tooltip.h"

 #include "object_macros.h"

 

-

 class KviKvsObject_widget : public KviKvsObject

 {

 	Q_OBJECT

@@ -52,8 +52,8 @@ protected:
 

 	bool function_addWidgetToWrappedLayout(KviKvsObjectFunctionCall *c);

 	bool function_backgroundColor(KviKvsObjectFunctionCall *c);

-	bool function_windowTitle(KviKvsObjectFunctionCall *c);

 	bool function_centerToScreen(KviKvsObjectFunctionCall *c);

+	bool function_colorPalette(KviKvsObjectFunctionCall *c);

 	bool function_fontAscent(KviKvsObjectFunctionCall * c);

 	bool function_fontDescent(KviKvsObjectFunctionCall * c);

 	bool function_fontMetricsHeight(KviKvsObjectFunctionCall * c);

@@ -75,43 +75,38 @@ protected:
 	bool function_parentWidget(KviKvsObjectFunctionCall *c);

 	bool function_raise(KviKvsObjectFunctionCall *);

 	bool function_repaint(KviKvsObjectFunctionCall *c);

-	bool function_update(KviKvsObjectFunctionCall *c);

-	

+	bool function_insertIntoStatusBar(KviKvsObjectFunctionCall *c);

 	bool function_reparent(KviKvsObjectFunctionCall *c);

 	bool function_resize(KviKvsObjectFunctionCall *c);

 	bool function_screenResolution(KviKvsObjectFunctionCall * c);

+	bool function_setAttribute(KviKvsObjectFunctionCall *c);

 	bool function_setBackgroundColor(KviKvsObjectFunctionCall *c);

 	bool function_setBackgroundImage(KviKvsObjectFunctionCall *c);

-	bool function_setWindowTitle(KviKvsObjectFunctionCall *c);

 	bool function_setEnabled(KviKvsObjectFunctionCall *c);

 	bool function_setFocus(KviKvsObjectFunctionCall *c);

 	bool function_setFocusPolicy(KviKvsObjectFunctionCall *c);

 	bool function_setFont(KviKvsObjectFunctionCall *c);

-	bool function_setWindowIcon(KviKvsObjectFunctionCall *c);

-	bool function_setMaximumWidth(KviKvsObjectFunctionCall *c);

+	bool function_setGeometry(KviKvsObjectFunctionCall *c);

+	bool function_setKeyShortcut(KviKvsObjectFunctionCall *c);

+	bool function_setMask(KviKvsObjectFunctionCall *c);

 	bool function_setMaximumHeight(KviKvsObjectFunctionCall *c);

-	bool function_setMinimumWidth(KviKvsObjectFunctionCall *c);

+	bool function_setMaximumWidth(KviKvsObjectFunctionCall *c);

 	bool function_setMinimumHeight(KviKvsObjectFunctionCall *c);

+	bool function_setMinimumWidth(KviKvsObjectFunctionCall *c);

 	bool function_setMouseTracking(KviKvsObjectFunctionCall *c);

 	bool function_setPaletteForeground(KviKvsObjectFunctionCall *c);

+	bool function_setStyleSheet(KviKvsObjectFunctionCall *c);

 	bool function_setToolTip(KviKvsObjectFunctionCall *);

-	bool function_setGeometry(KviKvsObjectFunctionCall *c);

+	bool function_setWindowIcon(KviKvsObjectFunctionCall *c);

+	bool function_setWindowTitle(KviKvsObjectFunctionCall *c);

 	bool function_setWFlags(KviKvsObjectFunctionCall *c);

 	bool function_show(KviKvsObjectFunctionCall *c);

 	bool function_sizeHint(KviKvsObjectFunctionCall *c);

+	bool function_update(KviKvsObjectFunctionCall *c);

 	bool function_width(KviKvsObjectFunctionCall *);

+	bool function_windowTitle(KviKvsObjectFunctionCall *c);

 	bool function_x(KviKvsObjectFunctionCall *);

 	bool function_y(KviKvsObjectFunctionCall *);

-	bool function_setMask(KviKvsObjectFunctionCall *c);

-

-	bool function_insertIntoStatusBar(KviKvsObjectFunctionCall *c);

-

-//QT4

-bool function_setAttribute(KviKvsObjectFunctionCall *c);

-	bool function_colorPalette(KviKvsObjectFunctionCall *c);

-	bool function_setStyleSheet(KviKvsObjectFunctionCall *c);

-	bool function_setKeyShortcut(KviKvsObjectFunctionCall *c);

-

 signals:

 	void aboutToDie();

 };