linuxdcpp-team team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 3264
committer: poy <poy@xxxxxxxxxx>
branch nick: trunk
timestamp: Tue 2013-04-16 19:39:15 +0200
message:
  add compiler info in the about box
modified:
  win32/AboutDlg.cpp
  win32/CrashLogger.cpp


--
lp:dcplusplus
https://code.launchpad.net/~dcplusplus-team/dcplusplus/trunk

Your team Dcplusplus-team is subscribed to branch lp:dcplusplus.
To unsubscribe from this branch go to https://code.launchpad.net/~dcplusplus-team/dcplusplus/trunk/+edit-subscription

=== modified file 'win32/AboutDlg.cpp'
--- win32/AboutDlg.cpp	2013-04-14 20:28:35 +0000
+++ win32/AboutDlg.cpp	2013-04-16 17:39:15 +0000
@@ -75,7 +75,7 @@
 }
 
 int AboutDlg::run() {
-	create(dwt::Point(371, 490));
+	create(dwt::Point(400, 600));
 	return show();
 }
 
@@ -93,7 +93,7 @@
 	ls.style |= SS_CENTER;
 
 	{
-		auto cur = grid->addChild(gs)->addChild(Grid::Seed(4, 1));
+		auto cur = grid->addChild(gs)->addChild(Grid::Seed(5, 1));
 		cur->column(0).mode = GridInfo::FILL;
 		cur->column(0).align = GridInfo::CENTER;
 
@@ -105,12 +105,34 @@
 
 		cur->addChild(Link::Seed(_T("http://dcplusplus.sourceforge.net/";), true));
 
+		auto ts = WinUtil::Seeds::Dialog::textBox;
+		ts.style |= ES_READONLY;
+		ts.exStyle &= ~WS_EX_CLIENTEDGE;
+
 		gs.caption = T_("TTH");
-		auto seed = WinUtil::Seeds::Dialog::textBox;
-		seed.style |= ES_READONLY;
-		seed.exStyle &= ~WS_EX_CLIENTEDGE;
-		seed.caption = WinUtil::tth;
-		cur->addChild(gs)->addChild(seed);
+		ts.caption = WinUtil::tth;
+		cur->addChild(gs)->addChild(ts);
+
+		gs.caption = T_("Compiler");
+		// see also CrashLogger.cpp for similar tests.
+#ifdef __MINGW32__
+#ifdef HAVE_MINGW64
+		ts.caption = Text::toT("MinGW-w64's GCC " __VERSION__);
+#else
+		ts.caption = Text::toT("MinGW's GCC " __VERSION__);
+#endif
+#elif defined(_MSC_VER)
+		ts.caption = Text::toT("MS Visual Studio " + Util::toString(_MSC_VER));
+#else
+		ts.caption = _T("Unknown");
+#endif
+#ifdef _DEBUG
+		ts.caption += _T(" (debug)");
+#endif
+#ifdef _WIN64
+		ts.caption += _T(" (x64)");
+#endif
+		cur->addChild(gs)->addChild(ts);
 	}
 
 	{

=== modified file 'win32/CrashLogger.cpp'
--- win32/CrashLogger.cpp	2013-04-09 16:12:25 +0000
+++ win32/CrashLogger.cpp	2013-04-16 17:39:15 +0000
@@ -465,10 +465,17 @@
 	fprintf(f, APPNAME " version: %s\n", fullVersionString.c_str());
 	fprintf(f, "TTH: %S\n", WinUtil::tth.c_str());
 
+	// see also AboutDlg.cpp for similar tests.
 #ifdef __MINGW32__
-	fputs("Compiled with GCC " __VERSION__, f);
+#ifdef HAVE_MINGW64
+	fputs("Compiled with MinGW-w64's GCC " __VERSION__, f);
 #else
+	fputs("Compiled with MinGW's GCC " __VERSION__, f);
+#endif
+#elif defined(_MSC_VER)
 	fprintf(f, "Compiled with MS Visual Studio %d", _MSC_VER);
+#else
+	fputs(f, "Compiled with an unknown compiler");
 #endif
 #ifdef _DEBUG
 	fputs(" (debug)", f);