Change Splashscreen text to according to Dean's wish

diff --git a/Src/Changes.txt b/Src/Changes.txt
index 067af18..0b59e16 100644 (file)
--- a/Src/Changes.txt
+++ b/Src/Changes.txt
@@ -15,6 +15,8 @@ Add new items to top.
   New Docs/Logos files: readme.txt WinMerge_logo_24bit.png
    WinMerge_logo_shadow_24bit.png WinMerge_logo_shadow_trans.tif
    WinMerge_logo_trans.gif
+ Change Splashscreen text to according to Dean's wish
+  Src: Splash.cpp
 
 2006-03-11 Takashi
  BUG:  [ 1441389 ] Comparing root directory - mysterious

diff --git a/Src/Splash.cpp b/Src/Splash.cpp
index 29ff778..44c1d10 100644 (file)
--- a/Src/Splash.cpp
+++ b/Src/Splash.cpp
@@ -49,15 +49,15 @@ static const CRect VersionTextArea(255, 5, 469, 20);
 /** 
  * @brief Area for developers list.
  */
-static const CRect DevelopersArea(20, 98, 190, 210);
+static const CRect DevelopersArea(20, 93, 190, 210);
 
 /** 
  * @brief Area for copyright text.
  */
-static const CRect CopyrightArea(20, 230, 190, 330);
+static const CRect CopyrightArea(20, 215, 190, 330);
 
-static const TCHAR CopyrightText[] = _T("Copyright (C) 1996-2006 Dean P. Grimm / Thingamahoochie Software All right reserved.");
 static const TCHAR DevelopersText[] = _T("Developers:\nDean Grimm, Christian List, Kimmo Varis, Perry Rapp, Jochen Tucht, Tim Gerundt, Takashi Sawanaki, Laurent Ganier, Dennis Lim, Chris Mumford"); 
+static const TCHAR GPLText[] = _T("WinMerge comes with ABSOLUTELY NO WARRANTY. This is free software and you are welcome to redistribute it under certain circumstances; see the GNU Public License in the Help menu for details.");
 
 /////////////////////////////////////////////////////////////////////////////
 //   Splash Screen class
@@ -243,7 +243,7 @@ void CSplashWnd::OnPaint()
        area = DevelopersArea;
        dc.DrawText(DevelopersText, &area, DT_NOPREFIX | DT_TOP | DT_WORDBREAK);
        area = CopyrightArea;
-       dc.DrawText(CopyrightText, &area, DT_NOPREFIX | DT_TOP | DT_WORDBREAK);
+       dc.DrawText(GPLText, &area, DT_NOPREFIX | DT_TOP | DT_WORDBREAK);
 
        if (oldfont != NULL)
                dc.SelectObject(oldfont);