[wpdev-commits] wolfpack/win console_win.cpp,1.27,1.28

[Correa <thi...@us...>]

Update of /cvsroot/wpdev/wolfpack/win
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10727/win

Modified Files:
	console_win.cpp 
Log Message:
- Added missing copyright headers to some new files
- Console will show if Python is UCS2 or UCS4
- Removed few lines of dead code
- Some internationalization fixes

Index: console_win.cpp
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/win/console_win.cpp,v
retrieving revision 1.27
retrieving revision 1.28
diff -C2 -d -r1.27 -r1.28
*** console_win.cpp	14 Sep 2004 18:05:17 -0000	1.27
--- console_win.cpp	19 Sep 2004 16:25:38 -0000	1.28
***************
*** 38,43 ****
--- 38,45 ----
  #include "../python/engine.h"
  #include "../network/network.h"
+ #include "../network/uosocket.h"
  #include "../player.h"
  #include "../server.h"
+ #include "../inlines.h"
  
  #define _WIN32_IE 0x0500
***************
*** 220,225 ****
  
  			QString credits;
! 			credits += "Compiled: " __DATE__ " " __TIME__ "\n";
! 			credits += QString( "QT: %1 %2 (Compiled: %3)\n" ).arg( qVersion() ).arg( qSharedBuild() ? "Shared" : "Static" ).arg( QT_VERSION_STR );
  
  			QString pythonBuild = Py_GetVersion();
--- 222,227 ----
  
  			QString credits;
! 			credits += tr("Compiled: %1 %2\n").arg( __DATE__, __TIME__ );
! 			credits += tr( "Qt: %1 %2 (Compiled: %3)\n" ).arg( qVersion() ).arg( qSharedBuild() ? "Shared" : "Static" ).arg( QT_VERSION_STR );
  
  			QString pythonBuild = Py_GetVersion();
***************
*** 227,239 ****
  
  #if defined(Py_ENABLE_SHARED)
! 			credits += QString( "Python: %1 Shared (Compiled: %2)\n" ).arg( pythonBuild ).arg( PY_VERSION );
  #else
! 			credits += QString( "Python: %1 Static (Compiled: %2)\n" ).arg( pythonBuild ).arg( PY_VERSION );
  #endif
! 			credits += "Compiled with SQLite " SQLITE_VERSION "\n";
  #if defined (MYSQL_DRIVER)
! 			credits += QString( "Compiled for MySQL " MYSQL_SERVER_VERSION " (Using: %1)\n" ).arg( mysql_get_client_info() );
  #else
! 			credits += "MySQL Support: disabled\n";
  #endif
  
--- 229,241 ----
  
  #if defined(Py_ENABLE_SHARED)
! 			credits += tr( "Python: %1 Shared (Compiled: %2)\n" ).arg( pythonBuild ).arg( PY_VERSION );
  #else
! 			credits += tr( "Python: %1 Static (Compiled: %2)\n" ).arg( pythonBuild ).arg( PY_VERSION );
  #endif
! 			credits += tr( "Compiled with SQLite %1\n" ).arg(SQLITE_VERSION);
  #if defined (MYSQL_DRIVER)
! 			credits += tr( "Compiled for MySQL %1 (Using: %2)\n" ).arg( MYSQL_SERVER_VERSION, mysql_get_client_info() );
  #else
! 			credits += tr("MySQL Support: disabled\n");
  #endif
  
***************
*** 244,248 ****
  			SendMessage( richtext, EM_REPLACESEL, FALSE, ( LPARAM ) credits.latin1() );
  
! 			credits = "\nThis is an unsorted and not neccesarily complete list of people who contributed to Wolfpack:\n\n";
  
  			cr.cpMin = GetWindowTextLength( richtext );
--- 246,250 ----
  			SendMessage( richtext, EM_REPLACESEL, FALSE, ( LPARAM ) credits.latin1() );
  
! 			credits = tr("\nThis is an unsorted and not neccesarily complete list of people who contributed to Wolfpack:\n\n");
  
  			cr.cpMin = GetWindowTextLength( richtext );
***************
*** 588,596 ****
  
  		/*
! 						Parse the Windows command line string.  If an argument begins with a
! 						double quote, then spaces are considered part of the argument until the
! 						next double quote.  The argument terminates at the second quote. Note
! 						that this is different from the usual Unix semantics.
! 					*/
  
  		char* p = cmdLine;
--- 590,598 ----
  
  		/*
! 			Parse the Windows command line string.  If an argument begins with a
! 			double quote, then spaces are considered part of the argument until the
! 			next double quote.  The argument terminates at the second quote. Note
! 			that this is different from the usual Unix semantics.
! 		*/
  
  		char* p = cmdLine;
***************
*** 641,645 ****
  		if ( returnValue_ != 0 )
  		{
! 			Console::instance()->send( "\nThe server has been shut down. You can close this window now.\n" );
  			canClose = true;
  		}
--- 643,647 ----
  		if ( returnValue_ != 0 )
  		{
! 			Console::instance()->send( tr("\nThe server has been shut down. You can close this window now.\n") );
  			canClose = true;
  		}