added info tab to about module, need more work

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

2 files changed, 42 insertions, 20 deletions

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 7c074e7a8..cb027c6bc 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -43,23 +43,9 @@ ENDIF()
 # Set var to link with, for later use
 SET(LIBS)
 
-
 # Set verbose makefiles
 SET(CMAKE_VERBOSE_MAKEFILE ON CACHE BOOL "Generate verbose Makefiles")
 
-# Make MacOS X universal binaries
-IF(COMPILE_UNIVERSAL)
-	IF(APPLE)
-		SET(CMAKE_OSX_ARCHITECTURES ppc;i386)
-		SET(CMAKE_STATUS_UNIVERSAL_SUPPORT "yes")
-		#FIXME: This should be handled with CMAKE_OSX_SYSROOT (TOM)
-		#SET(CMAKE_SHARED_LINKER_FLAGS "-mmacosx-version-min=10.4")
-		#SET(CMAKE_EXE_LINKER_FLAGS "-mmacosx-version-min=10.4")
-	ENDIF()
-ELSE()
-	SET(CMAKE_STATUS_UNIVERSAL_SUPPORT "not available")
-ENDIF()
-
 # Use DBus
 IF(UNIX)
 	IF(NOT APPLE)
@@ -201,6 +187,19 @@ ELSE()
 	SET(CMAKE_STATUS_KDE4_SUPPORT "not requested")
 ENDIF()
 
+# Check for MacOS X universal binary
+IF(COMPILE_UNIVERSAL)
+	IF(APPLE)
+		SET(CMAKE_OSX_ARCHITECTURES ppc;i386)
+		SET(CMAKE_STATUS_UNIVERSAL_SUPPORT "yes")
+		#FIXME: This should be handled with CMAKE_OSX_SYSROOT (TOM)
+		#SET(CMAKE_SHARED_LINKER_FLAGS "-mmacosx-version-min=10.4")
+		#SET(CMAKE_EXE_LINKER_FLAGS "-mmacosx-version-min=10.4")
+	ENDIF()
+ELSE()
+	SET(CMAKE_STATUS_UNIVERSAL_SUPPORT "not available")
+ENDIF()
+
 # Check for Perl
 # FIXME: This shouldn't be required (we should be able to live without it)
 FIND_PACKAGE(Perl REQUIRED)
diff --git a/src/modules/about/aboutdialog.cpp b/src/modules/about/aboutdialog.cpp
index 919c2a257..67176d4cc 100644
--- a/src/modules/about/aboutdialog.cpp
+++ b/src/modules/about/aboutdialog.cpp
@@ -75,6 +75,7 @@ KviAboutDialog::KviAboutDialog()
 	setCaption(__tr2qs_ctx("About KVIrc...","about"));
 	setOkButton(__tr2qs_ctx("Close","about"));
 
+	// About tab
 	KviStr buffer;
 	g_pApp->findImage(buffer,"kvi_splash.png");
 
@@ -93,19 +94,15 @@ KviAboutDialog::KviAboutDialog()
 
 	QString aboutString= "KVIrc <b>" KVI_VERSION " '" KVI_RELEASE_NAME "'</b><br>";
 	aboutString += __tr2qs_ctx("Forged by the <b>KVIrc Development Team</b>","about");
-	aboutString += "<br>";
-	aboutString += __tr2qs_ctx("Sources date","about");
-	aboutString += ": ";
-	aboutString += KVI_SOURCES_DATE;
 
 	l = new QLabel(aboutString,w);
 	l->setAlignment(Qt::AlignCenter);
 	g->addWidget(l,1,0);
 
 	addTab(w,__tr2qs_ctx("About","about"));
-	
 
 
+	// Info tab
 	w = new QWidget(this);
 	g = new QGridLayout(w,1,1,4,8);
 
@@ -113,12 +110,38 @@ KviAboutDialog::KviAboutDialog()
 	v->setReadOnly(true);
 	g->addWidget(v,0,0);
 
+	// Get info
+	QString infoString = __tr2qs_ctx("Sources date","about");
+	infoString += ": ";
+	infoString += KVI_SOURCES_DATE;
+	infoString += "<br>";
+	infoString += __tr2qs_ctx("Build date","about");
+	infoString += ": ";
+	infoString += KVI_BUILD_DATE;
+	infoString += "<br>";
+	infoString += __tr2qs_ctx("Build flags","about");
+	infoString += ": ";
+	infoString += KVI_BUILD_FLAGS;
+
+	v->setText(infoString);
+
+	addTab(w,__tr2qs_ctx("Executable Informations","about"));
+
+
+	// Honor & Glory tab
+	w = new QWidget(this);
+	g = new QGridLayout(w,1,1,4,8);
+
+	v = new KviTalTextEdit(w);
+	v->setReadOnly(true);
+	g->addWidget(v,0,0);
+
 	v->setText(g_szAboutText);
 
 	addTab(w,__tr2qs_ctx("Honor && Glory","about"));
 
 
-
+	// License tab
 	w = new QWidget(this);
 	g = new QGridLayout(w,1,1,4,8);