Switch to new Kicad about dialog: removing old code.

common/CMakeLists.txt

@@ -13,7 +13,6 @@ set( COMMON_ABOUT_DLG_SRCS
 
 set(COMMON_SRCS
     ${COMMON_ABOUT_DLG_SRCS}
-    about_kicad.cpp
     base_screen.cpp
     base_struct.cpp
     basicframe.cpp

common/about_kicad.cpp

-/* wxWidgets about dialog */
-#include <wx/aboutdlg.h>
-#include "wx/statline.h"
-#include "wx/generic/aboutdlgg.h"
-
-#include "fctsys.h"
-#include "common.h"
-#include "appl_wxstruct.h"
-
-#include "build_version.h"
-
-
-/**********************************/
-wxString SetMsg( const wxString& msg )
-/**********************************/
-/* add \n at the beginning of msg under Windows, and do nothing under other version of wxWidgets
- * Needed under wxWidgets 2.8 because wxGTK and wxMSW do not have the same behavior
- * Add Developer needs \n between names under wxMSW, and nothing under wxGTK
- * when displaying developer and others.
- * Perhaps depending on wxWidgets versions
- */
-{
-    wxString message;
-
-#if 1	/* Windows */
-    message = wxT( "\n" );
-#endif
-    message << msg;
-    return message;
-}
-
-
-/**************************************************/
-void InitKiCadAbout( wxAboutDialogInfo& info )
-/**************************************************/
-{
-    /* Set name and title */
-    info.SetName( wxGetApp().GetTitle() );
-
-    /* Set description */
-    wxString description;
-
-    /* KiCad build version */
-    description << ( _T( "Build: " ) ) << GetBuildVersion();
-
-    /* Print for wxversion */
-    description << ( wxT( "\n\nwxWidgets " ) )
-        << wxMAJOR_VERSION
-        << wxT( "." )
-        << wxMINOR_VERSION << wxT( "." )
-        << wxRELEASE_NUMBER
-
-    /* Show Unicode or Ansi version */
-#if wxUSE_UNICODE
-        << ( wxT( " Unicode " ) );
-#		else
-        << ( wxT( " Ansi " ) );
-#endif
-
-
-
-    /**************************
-     * Check Operating System *
-     **************************/
-#if defined __WINDOWS__
-
-    description << wxT( "on " );
-
-#if defined _WIN64
-    description << wxT( "64 bit" );
-#else
-    description << wxT( "32 bit" );
-#endif
-
-    description << wxT( " Windows" );
-
-    /* Check for wxMAC */
-#	elif defined __WXMAC__
-    description << ( wxT( "on Macintosh" ) );
-
-    /* Linux 64 bits */
-#	elif defined _LP64 && __LINUX__
-    description << ( wxT( "on 64 bit GNU/Linux" ) );
-
-    /* Linux 32 bits */
-#	elif defined __LINUX__
-    description << ( wxT( "on 32 bit GNU/Linux" ) );
-
-    /* OpenBSD */
-#	elif defined __OpenBSD__
-    description << ( wxT ("on OpenBSD") );
-
-    /* FreeBSD */
-#	elif defined __FreeBSD__
-    description << ( wxT ("on FreeBSD") );
-
-#endif
-
-    /* Websites */
-    description << wxT( "\n\nKiCad on the web\n\n" );
-    description << wxT( "http://iut-tice.ujf-grenoble.fr/kicad \n" );
-    description << wxT( "http://kicad.sourceforge.net \n" );
-    description << wxT( "http://www.kicadlib.org" );
-
-    /* Set the complete about description */
-    info.SetDescription( description );
-
-    /* Set copyright dialog */
-    info.SetCopyright( _T( "(C) 1992-2010 KiCad Developers Team" ) );
-
-    /* Set license dialog */
-    info.SetLicence( wxString::FromAscii
-    (	"The complete KiCad EDA Suite is released under the\n"
-        "GNU General Public License version 2.\n"
-        "See <http://www.gnu.org/licenses/> for more information."
-    ));
-
-    /* Add developers */
-    info.AddDeveloper( wxT( "Jean-Pierre Charras <jean-pierre.charras@gipsa-lab.inpg.fr>" ) );
-    info.AddDeveloper( SetMsg( wxT( "Dick Hollenbeck <dick@softplc.com>" ) ) );
-    info.AddDeveloper( SetMsg( wxT( "Hauptmech <hauptmech@gmail.com>") ) );
-    info.AddDeveloper( SetMsg( wxT( "Jerry Jacobs <xor.gate.engineering@gmail.com>" ) ) );
-    info.AddDeveloper( SetMsg( wxT( "Jonas Diemer <diemer@gmx.de>" ) ) );
-    info.AddDeveloper( SetMsg( wxT( "KBool Library <http://boolean.klaasholwerda.nl/bool.html>" ) ) );
-    info.AddDeveloper( SetMsg( wxT( "Lorenzo Marcantonio <lomarcan@tin.it>" ) ) );
-    info.AddDeveloper( SetMsg( wxT( "Marco Serantoni <marco.serantoni@gmail.com>" ) ) );
-    info.AddDeveloper( SetMsg( wxT( "Rok Markovic <rok@kanardia.eu>" ) ) );
-    info.AddDeveloper( SetMsg( wxT( "Tim Hanson <sideskate@gmail.com>" ) ) );
-    info.AddDeveloper( SetMsg( wxT( "Vesa Solonen <vesa.solonen@hut.fi>" ) ) );
-    info.AddDeveloper( SetMsg( wxT( "Wayne Stambaugh <stambaughw@verizon.net>" ) ) );
-
-    /* Add document writers*/
-    info.AddDocWriter( wxT( "Jean-Pierre Charras <jean-pierre.charras@gipsa-lab.inpg.fr>" ) );
-    info.AddDocWriter( SetMsg( wxT( "Igor Plyatov <plyatov@gmail.com>" ) ) );
-
-    /* Add translators */
-    info.AddTranslator( wxT( "Czech (CZ) Martin Kratoška <martin@ok1rr.com>" ) );
-    info.AddTranslator( SetMsg( wxT( "Dutch (NL) Jerry Jacobs <xor.gate.engineering@gmail.com>" ) ) );
-    info.AddTranslator( SetMsg( wxT( "Finnish (FI) Vesa Solonen <vesa.solonen@hut.fi>" ) ) );
-    info.AddTranslator( SetMsg( wxT( "French (FR) Jean-Pierre Charras <jean-pierre.charras@gipsa-lab.inpg.fr>" ) ) );
-    info.AddTranslator( SetMsg( wxT( "Polish (PL) Mateusz Skowroński <skowri@gmail.com>" ) ) );
-    info.AddTranslator( SetMsg( wxT( "Portuguese (PT) Renie Marquet <reniemarquet@uol.com.br>" ) ) );
-    info.AddTranslator( SetMsg( wxT( "Russian (RU) Igor Plyatov <plyatov@gmail.com>" ) ) );
-    info.AddTranslator( SetMsg( wxT( "Spanish (ES) Pedro Martin del Valle <pkicad@yahoo.es>" ) ) );
-    info.AddTranslator( SetMsg( wxT( "Spanish (ES) Iñigo Zuluaga <inigo_zuluaga@yahoo.es>" ) ) );
-    info.AddTranslator( SetMsg( wxT( "German (DE) Rafael Sokolowski <rafael.sokolowski@web.de>" ) ) );
-
-    /* TODO are these all russian translators, placed them here now              TODO
-        TODO or else align them below other language maintainer with mail adres   TODO*/
-    info.AddTranslator( SetMsg( wxT( "\nRemy Halvick" ) ) );
-    info.AddTranslator( SetMsg( wxT( "David Briscoe" ) ) );
-    info.AddTranslator( SetMsg( wxT( "Dominique Laigle" ) ) );
-    info.AddTranslator( SetMsg( wxT( "Paul Burke" ) ) );
-
-    /* Add programm credits for icons */
-    info.AddArtist( wxT( "Icons by Iñigo Zuluagaz <inigo_zuluaga@yahoo.es>" ) );
-    info.AddArtist( SetMsg( wxT( "3D modules by Renie Marquet <reniemarquet@uol.com.br>" ) ) );
-    info.AddArtist( SetMsg( wxT( "3D modules by Christophe Boschat <nox454@hotmail.fr>" ) ) );
-}

common/basicframe.cpp

@@ -22,9 +22,6 @@
 #include "macros.h"
 #include "bitmaps.h"
 
-// Uncomment this line to use the new KiCad About dialog
-#define USE_NEW_ABOUT_DIALOG
-
 /*
  * Class constructor for WinEDA_BasicFrame general options
  */
@@ -288,14 +285,8 @@ void WinEDA_BasicFrame::GetKicadHelp( wxCommandEvent& event )
  */
 void WinEDA_BasicFrame::GetKicadAbout( wxCommandEvent& WXUNUSED(event) )
 {
-#ifdef USE_NEW_ABOUT_DIALOG
     bool ShowAboutDialog(wxWindow * parent);
     ShowAboutDialog(this);
-#else
-    wxAboutDialogInfo info;
-    InitKiCadAbout(info);
-    wxAboutBox(info);
-#endif
 }
 
 

cvpcb/cvpcb.cpp

@@ -84,7 +84,7 @@ bool WinEDA_App::OnInit()
      /* WXMAC application specific */
 #ifdef __WXMAC__
 //	wxApp::SetExitOnFrameDelete(false);
-//	wxApp::s_macAboutMenuItemId = ID_KICAD_ABOUT;
+    wxApp::s_macAboutMenuItemId = ID_KICAD_ABOUT;
     wxApp::s_macPreferencesMenuItemId = ID_OPTIONS_SETUP;
 #endif /* __WXMAC__ */
 

eeschema/eeschema.cpp

@@ -120,7 +120,7 @@ bool WinEDA_App::OnInit()
     /* WXMAC application specific */
 #ifdef __WXMAC__
 //	wxApp::SetExitOnFrameDelete(false);
-//	wxApp::s_macAboutMenuItemId = ID_KICAD_ABOUT;
+    wxApp::s_macAboutMenuItemId = ID_KICAD_ABOUT;
     wxApp::s_macPreferencesMenuItemId = ID_OPTIONS_SETUP;
 #endif /* __WXMAC__ */
 

kicad/kicad.cpp

@@ -82,7 +82,7 @@ bool WinEDA_App::OnInit()
     /* TODO fix SetExitOnFrameDelete */
 #ifdef __WXMAC__
 //	wxApp::SetExitOnFrameDelete(false);
-//	wxApp::s_macAboutMenuItemId = ID_KICAD_ABOUT;
+    wxApp::s_macAboutMenuItemId = ID_KICAD_ABOUT;
     wxApp::s_macPreferencesMenuItemId = ID_OPTIONS_SETUP;
 #endif /* __WXMAC__ */
 

pcbnew/pcbnew.cpp

@@ -94,9 +94,8 @@ bool WinEDA_App::OnInit()
 {
     /* WXMAC application specific */
 #ifdef __WXMAC__
-
 //	wxApp::SetExitOnFrameDelete(false);
-//	wxApp::s_macAboutMenuItemId = ID_KICAD_ABOUT;
+    wxApp::s_macAboutMenuItemId = ID_KICAD_ABOUT;
     wxApp::s_macPreferencesMenuItemId = ID_OPTIONS_SETUP;
 #endif /* __WXMAC__ */