diff --git a/common/CMakeLists.txt b/common/CMakeLists.txt index 33b139d86b..56f3fb3fc1 100644 --- a/common/CMakeLists.txt +++ b/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 diff --git a/common/about_kicad.cpp b/common/about_kicad.cpp deleted file mode 100644 index a1c23651c6..0000000000 --- a/common/about_kicad.cpp +++ /dev/null @@ -1,159 +0,0 @@ -/* wxWidgets about dialog */ -#include -#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 for more information." - )); - - /* Add developers */ - info.AddDeveloper( wxT( "Jean-Pierre Charras " ) ); - info.AddDeveloper( SetMsg( wxT( "Dick Hollenbeck " ) ) ); - info.AddDeveloper( SetMsg( wxT( "Hauptmech ") ) ); - info.AddDeveloper( SetMsg( wxT( "Jerry Jacobs " ) ) ); - info.AddDeveloper( SetMsg( wxT( "Jonas Diemer " ) ) ); - info.AddDeveloper( SetMsg( wxT( "KBool Library " ) ) ); - info.AddDeveloper( SetMsg( wxT( "Lorenzo Marcantonio " ) ) ); - info.AddDeveloper( SetMsg( wxT( "Marco Serantoni " ) ) ); - info.AddDeveloper( SetMsg( wxT( "Rok Markovic " ) ) ); - info.AddDeveloper( SetMsg( wxT( "Tim Hanson " ) ) ); - info.AddDeveloper( SetMsg( wxT( "Vesa Solonen " ) ) ); - info.AddDeveloper( SetMsg( wxT( "Wayne Stambaugh " ) ) ); - - /* Add document writers*/ - info.AddDocWriter( wxT( "Jean-Pierre Charras " ) ); - info.AddDocWriter( SetMsg( wxT( "Igor Plyatov " ) ) ); - - /* Add translators */ - info.AddTranslator( wxT( "Czech (CZ) Martin Kratoška " ) ); - info.AddTranslator( SetMsg( wxT( "Dutch (NL) Jerry Jacobs " ) ) ); - info.AddTranslator( SetMsg( wxT( "Finnish (FI) Vesa Solonen " ) ) ); - info.AddTranslator( SetMsg( wxT( "French (FR) Jean-Pierre Charras " ) ) ); - info.AddTranslator( SetMsg( wxT( "Polish (PL) Mateusz Skowroński " ) ) ); - info.AddTranslator( SetMsg( wxT( "Portuguese (PT) Renie Marquet " ) ) ); - info.AddTranslator( SetMsg( wxT( "Russian (RU) Igor Plyatov " ) ) ); - info.AddTranslator( SetMsg( wxT( "Spanish (ES) Pedro Martin del Valle " ) ) ); - info.AddTranslator( SetMsg( wxT( "Spanish (ES) Iñigo Zuluaga " ) ) ); - info.AddTranslator( SetMsg( wxT( "German (DE) Rafael Sokolowski " ) ) ); - - /* 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 " ) ); - info.AddArtist( SetMsg( wxT( "3D modules by Renie Marquet " ) ) ); - info.AddArtist( SetMsg( wxT( "3D modules by Christophe Boschat " ) ) ); -} diff --git a/common/basicframe.cpp b/common/basicframe.cpp index e09d986e93..df635f861a 100644 --- a/common/basicframe.cpp +++ b/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 } diff --git a/cvpcb/cvpcb.cpp b/cvpcb/cvpcb.cpp index 8537f921e9..839ec65ba2 100644 --- a/cvpcb/cvpcb.cpp +++ b/cvpcb/cvpcb.cpp @@ -84,8 +84,8 @@ bool WinEDA_App::OnInit() /* WXMAC application specific */ #ifdef __WXMAC__ // wxApp::SetExitOnFrameDelete(false); -// wxApp::s_macAboutMenuItemId = ID_KICAD_ABOUT; - wxApp::s_macPreferencesMenuItemId = ID_OPTIONS_SETUP; + wxApp::s_macAboutMenuItemId = ID_KICAD_ABOUT; + wxApp::s_macPreferencesMenuItemId = ID_OPTIONS_SETUP; #endif /* __WXMAC__ */ diff --git a/eeschema/eeschema.cpp b/eeschema/eeschema.cpp index b0cf922835..025767c1da 100644 --- a/eeschema/eeschema.cpp +++ b/eeschema/eeschema.cpp @@ -120,8 +120,8 @@ bool WinEDA_App::OnInit() /* WXMAC application specific */ #ifdef __WXMAC__ // wxApp::SetExitOnFrameDelete(false); -// wxApp::s_macAboutMenuItemId = ID_KICAD_ABOUT; - wxApp::s_macPreferencesMenuItemId = ID_OPTIONS_SETUP; + wxApp::s_macAboutMenuItemId = ID_KICAD_ABOUT; + wxApp::s_macPreferencesMenuItemId = ID_OPTIONS_SETUP; #endif /* __WXMAC__ */ wxFileName filename; diff --git a/kicad/kicad.cpp b/kicad/kicad.cpp index 7657bd6742..e0b68d34b6 100644 --- a/kicad/kicad.cpp +++ b/kicad/kicad.cpp @@ -82,8 +82,8 @@ bool WinEDA_App::OnInit() /* TODO fix SetExitOnFrameDelete */ #ifdef __WXMAC__ // wxApp::SetExitOnFrameDelete(false); -// wxApp::s_macAboutMenuItemId = ID_KICAD_ABOUT; - wxApp::s_macPreferencesMenuItemId = ID_OPTIONS_SETUP; + wxApp::s_macAboutMenuItemId = ID_KICAD_ABOUT; + wxApp::s_macPreferencesMenuItemId = ID_OPTIONS_SETUP; #endif /* __WXMAC__ */ WinEDA_MainFrame* frame; diff --git a/pcbnew/pcbnew.cpp b/pcbnew/pcbnew.cpp index d3cd4ee10f..262c02ac96 100644 --- a/pcbnew/pcbnew.cpp +++ b/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__ */