Added shortcuts to connect to kvirc channels

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

7 files changed, 30 insertions, 9 deletions

diff --git a/ChangeLog b/ChangeLog
index 2fde71d8c..c6022acdf 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -4,6 +4,7 @@
      The theme packages created since Dec 28 aren't compatible anymore.
      (nobody was able to load them yet anyway :D), sorry.
    - Added support for the audacious media player, thnx to Alexander Stillich <torque at pltn dot org> :)
+   - Added #kvirc channel links in the help menu. Please add your own localized #kvirc channel.
 
 06 Jan 2007
    [Alexey]
diff --git a/data/resources_mac/Info.plist b/data/resources_mac/Info.plist
index 16eb912b1..4ac70e065 100644
--- a/data/resources_mac/Info.plist
+++ b/data/resources_mac/Info.plist
@@ -31,7 +31,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>3.2.5</string>
+	<string>3.2.6</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>NSAppleScriptEnabled</key>
diff --git a/src/kvi_configstatus.h b/src/kvi_configstatus.h
index 16932ea9b..57c28eeb4 100644
--- a/src/kvi_configstatus.h
+++ b/src/kvi_configstatus.h
@@ -8,7 +8,7 @@
 /* #undef BIG_ENDIAN_MACHINE_BYTE_ORDER */
 
 /* this is the build date (configure date rather) */
-#define BUILD_DATE "Wed Jan 10 00:14:01 UTC 2007"
+#define BUILD_DATE "Wed Jan 10 02:18:33 UTC 2007"
 
 /* these are the build flags */
 #define BUILD_FLAGS "x86_64-cefgikopsAGTZ"
diff --git a/src/kvirc/kernel/kvi_internalcmd.cpp b/src/kvirc/kernel/kvi_internalcmd.cpp
index 29d4e6539..c29197080 100644
--- a/src/kvirc/kernel/kvi_internalcmd.cpp
+++ b/src/kvirc/kernel/kvi_internalcmd.cpp
@@ -61,9 +61,13 @@ static char * internalCommandTable[KVI_NUM_INTERNAL_COMMANDS]=
 	"dialog.file(open,\"Select a Script File\"){ if(!$str.isEmpty($0))parse $0; }",
 	"actioneditor.open",
 	"quit",
-	"openurl http://www.kvirc.ru"
+	"openurl http://www.kvirc.ru",
+	"openurl irc://freenode/kvirc",
+	"openurl irc://ircnet/kvirc",
+	"openurl irc://azzurra/kvirc.net"
 };
 
+
 char * kvi_getInternalCommandBuffer(int idx)
 {
 	if(idx > 0 && idx < KVI_NUM_INTERNAL_COMMANDS)
diff --git a/src/kvirc/kernel/kvi_internalcmd.h b/src/kvirc/kernel/kvi_internalcmd.h
index 628cbaef0..6ea3ca34d 100644
--- a/src/kvirc/kernel/kvi_internalcmd.h
+++ b/src/kvirc/kernel/kvi_internalcmd.h
@@ -58,8 +58,11 @@
 #define KVI_INTERNALCOMMAND_ACTIONEDITOR_OPEN 31
 #define KVI_INTERNALCOMMAND_QUIT 32
 #define KVI_INTERNALCOMMAND_KVIRC_HOMEPAGE_RU 33
+#define KVI_INTERNALCOMMAND_OPENURL_KVIRC_ON_FREENODE 34
+#define KVI_INTERNALCOMMAND_OPENURL_KVIRC_ON_IRCNET 35
+#define KVI_INTERNALCOMMAND_OPENURL_KVIRC_IT_ON_AZZURRA 36
 
-#define KVI_NUM_INTERNAL_COMMANDS 34
+#define KVI_NUM_INTERNAL_COMMANDS 37
 
 extern KVIRC_API char * kvi_getInternalCommandBuffer(int idx);
 
diff --git a/src/kvirc/ui/kvi_menubar.cpp b/src/kvirc/ui/kvi_menubar.cpp
index be5ee7e88..95cfa7b16 100644
--- a/src/kvirc/ui/kvi_menubar.cpp
+++ b/src/kvirc/ui/kvi_menubar.cpp
@@ -121,10 +121,23 @@ void KviMenuBar::setupHelpPopup()
 	help->setItemParameter(id,KVI_INTERNALCOMMAND_KVIRC_HOMEPAGE);
 	id = help->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_HOMEPAGE)),__tr2qs("KVIrc Russian Home&page"),m_pFrm,SLOT(executeInternalCommand(int)));
 	help->setItemParameter(id,KVI_INTERNALCOMMAND_KVIRC_HOMEPAGE_RU);
+	help->insertSeparator();
 	id = help->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_MESSAGE)),__tr2qs("Subscribe to the Mailing List"),m_pFrm,SLOT(executeInternalCommand(int)));
 	help->setItemParameter(id,KVI_INTERNALCOMMAND_OPENURL_KVIRC_MAILINGLIST);
 	id = help->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_BOMB)),__tr2qs("Report a Bug"),m_pFrm,SLOT(executeInternalCommand(int)));
 	help->setItemParameter(id,KVI_INTERNALCOMMAND_OPENURL_KVIRC_BUGTRACK);
+	help->insertSeparator();
+	id = help->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_CHANNEL)),__tr2qs("Join KVIrc International Channel on Freenode"),m_pFrm,SLOT(executeInternalCommand(int)));
+	help->setItemParameter(id,KVI_INTERNALCOMMAND_OPENURL_KVIRC_ON_FREENODE);
+	id = help->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_CHANNEL)),__tr2qs("Join KVIrc International Channel on IRCNet"),m_pFrm,SLOT(executeInternalCommand(int)));
+	help->setItemParameter(id,KVI_INTERNALCOMMAND_OPENURL_KVIRC_ON_IRCNET);
+	if(kvi_strEqualCIN(KviLocale::localeName(),"it",2))
+	{
+		// join #kvirc.net on azzurra
+		id = help->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_CHANNEL)),__tr2qs("Join KVIrc Italian Channel on AzzurraNet"),m_pFrm,SLOT(executeInternalCommand(int)));
+		help->setItemParameter(id,KVI_INTERNALCOMMAND_OPENURL_KVIRC_IT_ON_AZZURRA);
+	}
+	// add your localized #kvirc channels here...
 }
 
 void KviMenuBar::setupSettingsPopup()
diff --git a/src/modules/objects/class_layout.cpp b/src/modules/objects/class_layout.cpp
index f6d516993..aef8611a7 100644
--- a/src/modules/objects/class_layout.cpp
+++ b/src/modules/objects/class_layout.cpp
@@ -117,8 +117,8 @@ bool KviKvsObject_layout::functionAddWidget(KviKvsObjectFunctionCall *c)
 	kvs_uint_t uCol,uRow;
 	KVSO_PARAMETERS_BEGIN(c)
 		KVSO_PARAMETER("widget",KVS_PT_HOBJECT,0,hObject)
-		KVSO_PARAMETER("col",KVS_PT_UNSIGNEDINTEGER,0,uCol)
 		KVSO_PARAMETER("row",KVS_PT_UNSIGNEDINTEGER,0,uRow)
+		KVSO_PARAMETER("col",KVS_PT_UNSIGNEDINTEGER,0,uCol)
 	KVSO_PARAMETERS_END(c)
 	pObject=KviKvsKernel::instance()->objectController()->lookupObject(hObject);
 	if(!widget())return true;
@@ -137,7 +137,7 @@ bool KviKvsObject_layout::functionAddWidget(KviKvsObjectFunctionCall *c)
 		c->warning(__tr2qs("Can't add a non-widget object"));
 		return true;
 	}
-	((QGridLayout *)object())->addWidget(((QWidget *)(pObject->object())),uCol,uRow);
+	((QGridLayout *)object())->addWidget(((QWidget *)(pObject->object())),uRow,uCol);
 	return true;
 }
 bool KviKvsObject_layout::functionAddMultiCellWidget(KviKvsObjectFunctionCall *c)
@@ -147,10 +147,10 @@ bool KviKvsObject_layout::functionAddMultiCellWidget(KviKvsObjectFunctionCall *c
 	kvs_uint_t uStartCol,uStartRow,uEndCol,uEndRow;
 	KVSO_PARAMETERS_BEGIN(c)
 		KVSO_PARAMETER("widget",KVS_PT_HOBJECT,0,hObject)
-		KVSO_PARAMETER("start_column",KVS_PT_UNSIGNEDINTEGER,0,uStartCol)
-		KVSO_PARAMETER("end_column",KVS_PT_UNSIGNEDINTEGER,0,uEndCol)
 		KVSO_PARAMETER("start_row",KVS_PT_UNSIGNEDINTEGER,0,uStartRow)
 		KVSO_PARAMETER("end_row",KVS_PT_UNSIGNEDINTEGER,0,uEndRow)
+		KVSO_PARAMETER("start_column",KVS_PT_UNSIGNEDINTEGER,0,uStartCol)
+		KVSO_PARAMETER("end_column",KVS_PT_UNSIGNEDINTEGER,0,uEndCol)
 	KVSO_PARAMETERS_END(c)
 	pObject=KviKvsKernel::instance()->objectController()->lookupObject(hObject);
 	if(!widget())return true;
@@ -169,7 +169,7 @@ bool KviKvsObject_layout::functionAddMultiCellWidget(KviKvsObjectFunctionCall *c
 		c->warning(__tr2qs("Can't add a non-widget object"));
 		return true;
 	}
-	((QGridLayout *)object())->addMultiCellWidget(((QWidget *)(pObject->object())),uStartCol,uEndCol,uStartRow,uEndRow);
+	((QGridLayout *)object())->addMultiCellWidget(((QWidget *)(pObject->object())),uStartRow,uEndRow,uStartCol,uEndCol);
 	return true;
 }
 bool KviKvsObject_layout::functionSetRowStretch(KviKvsObjectFunctionCall *c)