added $countStatusBarItems();

code clean;


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

8 files changed, 59 insertions, 57 deletions

diff --git a/src/kvirc/kvs/kvi_kvs_corefunctions.cpp b/src/kvirc/kvs/kvi_kvs_corefunctions.cpp
index 0ccc6fd23..e12da6d57 100644
--- a/src/kvirc/kvs/kvi_kvs_corefunctions.cpp
+++ b/src/kvirc/kvs/kvi_kvs_corefunctions.cpp
@@ -25,10 +25,8 @@
 #define __KVIRC__
 
 #include "kvi_kvs_corefunctions.h"
-
 #include "kvi_kvs_kernel.h"
 #include "kvi_kvs_object.h"
-
 #include "kvi_locale.h"
 
 namespace KviKvsCoreFunctions
@@ -60,6 +58,7 @@ namespace KviKvsCoreFunctions
 		_REGFNC("classDefined",classDefined)
 		_REGFNC("console",console)
 		_REGFNC("context",context)
+		_REGFNC("countStatusBarItems",countStatusBarItems)
 		_REGFNC("cr",cr)
 		_REGFNC("date",date)
 		_REGFNC("false",falseCKEYWORDWORKAROUND)
diff --git a/src/kvirc/kvs/kvi_kvs_corefunctions.h b/src/kvirc/kvs/kvi_kvs_corefunctions.h
index 9219855ee..b56ebb31b 100644
--- a/src/kvirc/kvs/kvi_kvs_corefunctions.h
+++ b/src/kvirc/kvs/kvi_kvs_corefunctions.h
@@ -64,6 +64,7 @@ namespace KviKvsCoreFunctions
 	KVSCF(classDefined);
 	KVSCF(console);
 	KVSCF(context);
+	KVSCF(countStatusBarItems);
 	KVSCF(cr);
 	KVSCF(date);
 	KVSCF(falseCKEYWORDWORKAROUND);
@@ -71,7 +72,6 @@ namespace KviKvsCoreFunctions
 	KVSCF(firstConnectedConsole);
 	KVSCF(flatten);
 	KVSCF(fmtlink);
-
 	// g_l
 	KVSCF(globals);
 	KVSCF(hash);
diff --git a/src/kvirc/kvs/kvi_kvs_corefunctions_af.cpp b/src/kvirc/kvs/kvi_kvs_corefunctions_af.cpp
index 981d41bc6..3ec8d2d8a 100644
--- a/src/kvirc/kvs/kvi_kvs_corefunctions_af.cpp
+++ b/src/kvirc/kvs/kvi_kvs_corefunctions_af.cpp
@@ -25,10 +25,8 @@
 #define __KVIRC__
 
 #include "kvi_kvs_corefunctions.h"
-
 #include "kvi_kvs_kernel.h"
 #include "kvi_kvs_object_controller.h"
-
 #include "kvi_locale.h"
 #include "kvi_app.h"
 #include "kvi_channel.h"
@@ -39,6 +37,9 @@
 #include "kvi_avatar.h"
 #include "kvi_ircuserdb.h"
 #include "kvi_time.h"
+#include "kvi_frame.h"
+
+#include <QStatusBar>
 
 namespace KviKvsCoreFunctions
 {
@@ -646,6 +647,31 @@ namespace KviKvsCoreFunctions
 	/////////////////////////////////////////////////////////////////////////////////////////////
 
 	/*
+		@doc: countStatusBarItems
+		@type:
+			function
+		@title:
+			$countStatusBarItems
+		@short:
+			Returns the number of items in the statusbar
+		@syntax:
+			<int> $countStatusBarItems
+		@description:
+			Returns the number of items in the statusbar
+		@seealso:
+			[class]widget class[/class]
+	*/
+
+	KVSCF(countStatusBarItems)
+	{
+		QList<QWidget *> widgets = g_pFrame->statusBar()->findChildren<QWidget *>();
+		KVSCF_pRetBuffer->setInteger(widgets.count());
+		return true;
+	}
+
+	/////////////////////////////////////////////////////////////////////////////////////////////
+
+	/*
 		@doc: cr
 		@type:
 			function
@@ -1116,5 +1142,4 @@ namespace KviKvsCoreFunctions
 		KVSCF_pRetBuffer->setString(szLink);
 		return true;
 	}
-
 };
diff --git a/src/kvirc/kvs/kvi_kvs_kernel.cpp b/src/kvirc/kvs/kvi_kvs_kernel.cpp
index a3aac1f4f..4584ec26c 100644
--- a/src/kvirc/kvs/kvi_kvs_kernel.cpp
+++ b/src/kvirc/kvs/kvi_kvs_kernel.cpp
@@ -198,8 +198,6 @@ void KviKvsKernel::completeFunction(const QString &szFunctionBegin,KviPointerLis
 		QString szRight = szFunctionBegin.right(szFunctionBegin.length() - (idx+1));
 		completeModuleFunction(szModuleName,szRight,pMatches);
 	}
-
-	
 }
 
 void KviKvsKernel::completeModuleFunction(const QString &szModuleName,const QString &szCommandBegin,KviPointerList<QString> * pMatches)
diff --git a/src/kvirc/kvs/kvi_kvs_kernel.h b/src/kvirc/kvs/kvi_kvs_kernel.h
index 59cc7e213..69c08620d 100644
--- a/src/kvirc/kvs/kvi_kvs_kernel.h
+++ b/src/kvirc/kvs/kvi_kvs_kernel.h
@@ -147,10 +147,8 @@ public:
 			delete l->at(i);
 		}
 	*/
-	delete l;
-		
+		delete l;
 	}
-
 };
 
 #endif //!_KVI_KVS_KERNEL_H_
diff --git a/src/kvirc/kvs/kvi_kvs_object.cpp b/src/kvirc/kvs/kvi_kvs_object.cpp
index 790c5a445..58946ba17 100644
--- a/src/kvirc/kvs/kvi_kvs_object.cpp
+++ b/src/kvirc/kvs/kvi_kvs_object.cpp
@@ -967,6 +967,7 @@ bool KviKvsObject::function_children(KviKvsObjectFunctionCall * c)
 	c->returnValue()->setArray(a);
 	return true;
 }
+
 bool KviKvsObject::function_findChild(KviKvsObjectFunctionCall * c)
 {
 	QString szClass,szName;
@@ -1076,8 +1077,8 @@ bool KviKvsObject::function_listProperties(KviKvsObjectFunctionCall * c)
 					w->outputNoFmt(KVI_OUT_SYSTEMMESSAGE,szOut);
 				idx++;
 				if (idx<o->propertyCount()){
-						prop = o->property(idx);
-						p = &prop;
+					prop = o->property(idx);
+					p = &prop;
 				}
 				else p=0;
 				cnt++;
@@ -1092,8 +1093,6 @@ bool KviKvsObject::function_listProperties(KviKvsObjectFunctionCall * c)
 	return true;
 }
 
-
-// rewritten using the new KVS features :)
 bool KviKvsObject::function_setProperty(KviKvsObjectFunctionCall * c)
 {
 	QString szName;
@@ -1578,7 +1577,6 @@ bool KviKvsObject::callFunction(KviKvsObject * pCaller,const QString &fncName,Kv
 	return callFunction(pCaller,fncName,QString::null,&ctx,pRetVal,pParams);
 }
 
-
 bool KviKvsObject::callFunction(KviKvsObject * pCaller,const QString &fncName,KviKvsVariantList * pParams)
 {
 	KviKvsVariant fakeRetVal;
@@ -1626,8 +1624,6 @@ bool KviKvsObject::callFunction(
 	//    Help menu, or open the Technical Support help file for more information
 }
 
-
-
 void KviKvsObject::registerPrivateImplementation(const QString &szFunctionName,const QString &szCode)
 {
 	if(szCode.isEmpty())
@@ -1656,7 +1652,6 @@ void KviKvsObject::registerPrivateImplementation(const QString &szFunctionName,c
 	}
 }
 
-
 KviKvsObject * KviKvsObject::findChild(const QString &szClass,const QString &szName)
 {
 	for(KviKvsObject * o = m_pChildList->first();o;o= m_pChildList->next())
@@ -1680,5 +1675,3 @@ KviKvsObject * KviKvsObject::findChild(const QString &szClass,const QString &szN
 	}
 	return 0;
 }
-
-
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();

 };