added function

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

4 files changed, 41 insertions, 10 deletions

diff --git a/src/kvirc/kvs/kvi_kvs_corefunctions.cpp b/src/kvirc/kvs/kvi_kvs_corefunctions.cpp
index c7b3bff30..0ccc6fd23 100644
--- a/src/kvirc/kvs/kvi_kvs_corefunctions.cpp
+++ b/src/kvirc/kvs/kvi_kvs_corefunctions.cpp
@@ -68,6 +68,7 @@ namespace KviKvsCoreFunctions
 		_REGFNC("flatten",flatten)
 		_REGFNC("fmtlink",fmtlink)
 		// g_l
+		_REGFNC("globals",globals);
 		_REGFNC("hash",hash);
 //		_REGFNC("inputText",inputText);
 		_REGFNC("hexToAscii",hexToAscii);
@@ -153,4 +154,3 @@ namespace KviKvsCoreFunctions
 		return true;
 	}
 };
-
diff --git a/src/kvirc/kvs/kvi_kvs_corefunctions.h b/src/kvirc/kvs/kvi_kvs_corefunctions.h
index f04f83dd8..9219855ee 100644
--- a/src/kvirc/kvs/kvi_kvs_corefunctions.h
+++ b/src/kvirc/kvs/kvi_kvs_corefunctions.h
@@ -73,6 +73,7 @@ namespace KviKvsCoreFunctions
 	KVSCF(fmtlink);
 
 	// g_l
+	KVSCF(globals);
 	KVSCF(hash);
 	KVSCF(inputText);
 	KVSCF(hexToAscii);
diff --git a/src/kvirc/kvs/kvi_kvs_corefunctions_gl.cpp b/src/kvirc/kvs/kvi_kvs_corefunctions_gl.cpp
index adeadda28..bf67a4087 100644
--- a/src/kvirc/kvs/kvi_kvs_corefunctions_gl.cpp
+++ b/src/kvirc/kvs/kvi_kvs_corefunctions_gl.cpp
@@ -48,6 +48,33 @@ namespace KviKvsCoreFunctions
 	///////////////////////////////////////////////////////////////////////////////////////////////
 
 	/*
+		@doc: globals
+		@type:
+			function
+		@title:
+			$globals
+		@short:
+			Dump globals variables
+		@syntax:
+			<hash> $globals()
+		@description:
+			Returns an hashtable of all global variables set.
+		@examples:
+			echo $globals()
+		@seealso:
+			[cmd]global[/cmd]
+			[fnc]$hash[/fnc]
+	*/
+
+	KVSCF(globals)
+	{
+		KVSCF_pRetBuffer->setHash(new KviKvsHash( *(KviKvsKernel::instance()->globalVariables()) ));
+		return true;
+	}
+
+	///////////////////////////////////////////////////////////////////////////////////////////////
+
+	/*
 		@doc: hash
 		@type:
 			function
diff --git a/src/modules/objects/class_widget.cpp b/src/modules/objects/class_widget.cpp
index 166978974..5b50cfc4f 100644
--- a/src/modules/objects/class_widget.cpp
+++ b/src/modules/objects/class_widget.cpp
@@ -480,22 +480,22 @@ const Qt::WindowType widgettypes_cod[] = {
 		Return the x coordinate of mouse pointer global position.

 	   	!fn: integer $globalCursorY()

 		Return the y coordinate of the mo>use pointer global position.

-		!fn: <tip:string> $maybeTipEvent(<x_tip_pos:integer>,<y_tip_pos:integer>)[QT4 only]

+		!fn: <tip:string> $maybeTipEvent(<x_tip_pos:integer>,<y_tip_pos:integer>)

 		This event handler is called when a eventualy tip is going to be show.

 		You can be reimplement this event and set a dynamic tool tip by using "[cmd]return[/cmd] <tooltip_string>".

 		If a tooltip has setted with [classfnc]$setTooltip[/classfnc] the dynamic tooltip will be ignored.

 		The default implementation does nothing.

 

-		!fn: integer $setAttribute(<string>,<bool_flag>)[QT4 only]

+		!fn: integer $setAttribute(<string>,<bool_flag>)

 		Sets the attribute attribute on this widget if on is true; otherwise clears the attribute.

 		Valid attributes are:

 		OpaquePaintEvent - Indicates that the widget paints all its pixels when it receives a paint event.

-	    NoSystemBackground - Indicates that the widget has no background, i.e. when the widget receives paint events, the background is not automatically repainted.

-	    PaintOnScreen - Indicates that the widget wants to draw directly onto the screen.

-	    NoMousePropagation - Prohibits mouse events from being propagated to the widget's parent.

+		NoSystemBackground - Indicates that the widget has no background, i.e. when the widget receives paint events, the background is not automatically repainted.

+		PaintOnScreen - Indicates that the widget wants to draw directly onto the screen.

+		NoMousePropagation - Prohibits mouse events from being propagated to the widget's parent.

 		!fn: $setStyleSheet(<string>)[QT4 only]

 

-		!fn: $array(<red:integer,green:integer,blue:integer) $colorPalette(<color_role:string><color_group:string>)[QT4 only]

+		!fn: $array(<red:integer,green:integer,blue:integer) $colorPalette(<color_role:string><color_group:string>)

 		Returns the color in color_group(disabled, active or inactive), used for color_role.

 		Valid color role are:

 		Window - A general background color.

@@ -507,12 +507,16 @@ const Qt::WindowType widgettypes_cod[] = {
 		Highlight - A color to indicate a selected item or the current item.

 		HighlightedText - A text color that contrasts with Highlight.

 

-		!fn: <short_cut_id:integer> $setKeyShortCut(<key:char>)[QT4 only]

+		!fn: <short_cut_id:integer> $setKeyShortCut(<key:char>)

 		Adds a shortcut whith key. A [classfnc]$shortCutEvent[/classfnc] will be triggered when the user will press alt+key.

 		!fn: $shortCutEvent(<shortcut_id:integer>)[QT4 only]

 		This function will be called when a shortcut key has been triggered.

 		You must reimplement this event to manage a shortcut system in a custom widget.

 		The default implementation does nothing.

+

+		!fn: $insertIntoStatusBar(<index:unsigned integer>)

+		Insert the widget into the statusbar at the given index.

+		If index is out of range, the widget is appended.

 	@examples:

 		[example]

 			%Widget = $new(widget)

@@ -1941,12 +1945,11 @@ bool KviKvsObject_widget::function_insertIntoStatusBar(KviKvsObjectFunctionCall
 {

 	kvs_int_t iIndex;

 	KVSO_PARAMETERS_BEGIN(c)

-		KVSO_PARAMETER("row",KVS_PT_UNSIGNEDINTEGER,0,iIndex)

+		KVSO_PARAMETER("index",KVS_PT_UNSIGNEDINTEGER,0,iIndex)

 	KVSO_PARAMETERS_END(c)

 	if (widget())

 		g_pFrame->statusBar()->insertPermanentWidget(iIndex,widget());

 	return true;

-

 }

 

 #ifndef COMPILE_USE_STANDALONE_MOC_SOURCES