From 21cc8e0dc00319d08b52811c53ccd96ab2336bd5 Mon Sep 17 00:00:00 2001 From: jean-pierre charras Date: Mon, 22 Dec 2014 17:58:43 +0100 Subject: [PATCH] Freeroute dialog: remove freeroute access via java web start, because freeroutecanot be run now via java web start. freeroute.jarcan be run by Kicad, as long freeroute.jar is found by Kicad (for instance if it is in kicad bin folder) --- pcbnew/dialogs/dialog_freeroute_exchange.cpp | 210 +++---- pcbnew/dialogs/dialog_freeroute_exchange.h | 8 +- .../dialog_freeroute_exchange_base.cpp | 81 +-- .../dialog_freeroute_exchange_base.fbp | 569 +----------------- .../dialogs/dialog_freeroute_exchange_base.h | 25 +- 5 files changed, 107 insertions(+), 786 deletions(-) diff --git a/pcbnew/dialogs/dialog_freeroute_exchange.cpp b/pcbnew/dialogs/dialog_freeroute_exchange.cpp index 43755778d3..8ca84c3513 100644 --- a/pcbnew/dialogs/dialog_freeroute_exchange.cpp +++ b/pcbnew/dialogs/dialog_freeroute_exchange.cpp @@ -27,7 +27,6 @@ */ #include -//#include #include #include #include @@ -45,7 +44,6 @@ #endif -#define FREEROUTE_URL_KEY wxT( "freeroute_url" ) #define FREEROUTE_RUN_KEY wxT( "freeroute_command" ) @@ -63,7 +61,7 @@ DIALOG_FREEROUTE::DIALOG_FREEROUTE( PCB_EDIT_FRAME* parent ): m_Parent = parent; MyInit(); - m_sdbSizer1OK->SetDefault(); + m_sdbSizerOK->SetDefault(); GetSizer()->SetSizeHints( this ); Centre(); } @@ -76,27 +74,25 @@ DIALOG_FREEROUTE::DIALOG_FREEROUTE( PCB_EDIT_FRAME* parent ): void DIALOG_FREEROUTE::MyInit() { SetFocus(); - m_FreeRouteSetupChanged = false; - m_freeRouterIsLocal = false; - - wxString msg; + m_freeRouterFound = false; +/* wxString msg; wxConfigBase* cfg = Kiface().KifaceSettings(); - - cfg->Read( FREEROUTE_URL_KEY, &msg ); - - if( msg.IsEmpty() ) - m_FreerouteURLName->SetValue( wxT( "http://www.freerouting.net/" ) ); - else - m_FreerouteURLName->SetValue( msg ); - + cfg->Read( FREEROUTE_RUN_KEY, &msg ); +*/ wxFileName fileName( FindKicadFile( wxT( "freeroute.jar" ) ), wxPATH_UNIX ); if( fileName.FileExists() ) { - m_freeRouterIsLocal = true; + m_freeRouterFound = true; m_buttonLaunchFreeroute->SetLabel( _("Create .dsn File and Launch FreeRouter") ); } + + else + m_buttonLaunchFreeroute->SetLabel( _("Create .dsn File") ); + + m_buttonLaunchFreeroute->Enable( m_freeRouterFound ); + } const char * s_FreeRouteHelpInfo = @@ -138,146 +134,97 @@ void DIALOG_FREEROUTE::OnImportButtonClick( wxCommandEvent& event ) */ void DIALOG_FREEROUTE::OnLaunchButtonClick( wxCommandEvent& event ) { - wxString javaCommand; - wxString command; + wxString dsnFile; - if( m_freeRouterIsLocal ) + if( m_freeRouterFound ) { - javaCommand = CmdRunFreeRouterLocal(); + dsnFile = createDSN_File(); - if( javaCommand.IsEmpty() ) // Something is wrong + if( dsnFile.IsEmpty() ) // Something is wrong or command cancelled return; } - else - javaCommand = wxT( "javaws" ); - wxString url; - wxFileName fileName( FindKicadFile( wxT( "freeroute.jnlp" ) ), wxPATH_UNIX ); + wxFileName jarfileName( FindKicadFile( wxT( "freeroute.jar" ) ), wxPATH_UNIX ); + wxString command; - if( m_freeRouterIsLocal || fileName.FileExists() ) - { - - // Find the Java web start application on Windows. + // Find the Java application on Windows. + // Colud be no more needed since we now have to run only java, not java web start #ifdef __WINDOWS__ -#if wxCHECK_VERSION( 2, 9, 0 ) - // If you thought the registry was brain dead before, now you have to deal with - // accessing it in either 64 or 32 bit mode depending on the build version of - // Windows and the build version of KiCad. + // If you thought the registry was brain dead before, now you have to deal with + // accessing it in either 64 or 32 bit mode depending on the build version of + // Windows and the build version of KiCad. - // This key works for 32 bit Java on 32 bit Windows and 64 bit Java on 64 bit Windows. - wxString keyName = m_freeRouterIsLocal ? wxT( "SOFTWARE\\JavaSoft\\Java Runtime Environment" ) - : wxT( "SOFTWARE\\JavaSoft\\Java Web Start" ); - wxRegKey key( wxRegKey::HKLM, keyName, - wxIsPlatform64Bit() ? wxRegKey::WOW64ViewMode_64 : - wxRegKey::WOW64ViewMode_Default ); + // This key works for 32 bit Java on 32 bit Windows and 64 bit Java on 64 bit Windows. + wxString keyName = wxT( "SOFTWARE\\JavaSoft\\Java Runtime Environment" ); + wxRegKey key( wxRegKey::HKLM, keyName, + wxIsPlatform64Bit() ? wxRegKey::WOW64ViewMode_64 : + wxRegKey::WOW64ViewMode_Default ); - // It's possible that 32 bit Java is installed on 64 bit Windows. - if( !key.Exists() && wxIsPlatform64Bit() ) - { - keyName = m_freeRouterIsLocal ? - wxT( "SOFTWARE\\Wow6432Node\\JavaSoft\\Java Runtime Environment" ) - : wxT( "SOFTWARE\\Wow6432Node\\JavaSoft\\Java Web Start" ); - key.SetName( wxRegKey::HKLM, keyName ); - } + // It's possible that 32 bit Java is installed on 64 bit Windows. + if( !key.Exists() && wxIsPlatform64Bit() ) + { + keyName = wxT( "SOFTWARE\\Wow6432Node\\JavaSoft\\Java Runtime Environment" ); + key.SetName( wxRegKey::HKLM, keyName ); + } - if( !key.Exists() ) - { - ::wxMessageBox( _( "It appears that the Java run time environment is not " - "installed on this computer. Java is required to use " - "FreeRoute." ), - _( "Pcbnew Error" ), wxOK | wxICON_ERROR ); - return; - } - - key.Open( wxRegKey::Read ); - - // Get the current version of java installed to determine the executable path. - wxString value; - key.QueryValue( wxT( "CurrentVersion" ), value ); - key.SetName( key.GetName() + wxT( "\\" ) + value ); - - key.QueryValue( m_freeRouterIsLocal ? wxT( "JavaHome" ) : wxT( "Home" ), value ); - wxString javaCommandPath = value + wxFileName::GetPathSeparator(); - command = javaCommandPath; -#else - #warning Kicad needs wxWidgets >= 2.9.4. version 2.8 is only supported for testing purposes -#endif // wxCHECK_VERSION( 2, 9, 0 ) - - if( m_freeRouterIsLocal ) - command << wxT("bin\\") << javaCommand; -#else // __WINDOWS__ - - if( m_freeRouterIsLocal ) - command << javaCommand; -#endif - else - // Wrap FullFileName in double quotes in case it has C:\Program Files in it. - // The space is interpreted as an argument separator. - command << javaCommand << wxChar( ' ' ) << wxChar( '"' ) - << fileName.GetFullPath() << wxChar( '"' ); - - ProcessExecute( command ); + if( !key.Exists() ) + { + ::wxMessageBox( _( "It appears that the Java run time environment is not " + "installed on this computer. Java is required to use " + "FreeRoute." ), + _( "Pcbnew Error" ), wxOK | wxICON_ERROR ); return; } - url = m_FreerouteURLName->GetValue() + wxT( "/java/freeroute.jnlp" ); + key.Open( wxRegKey::Read ); - wxLaunchDefaultBrowser( url ); -} + // Get the current version of java installed to determine the executable path. + wxString value; + key.QueryValue( wxT( "CurrentVersion" ), value ); + key.SetName( key.GetName() + wxT( "\\" ) + value ); -wxString DIALOG_FREEROUTE::CmdRunFreeRouterLocal() -{ - wxString fullFileName = m_Parent->GetBoard()->GetFileName(); - wxString path; - wxString name; - wxString ext; - wxString dsn_ext = wxT( ".dsn" ); - wxString mask = wxT( "*" ) + dsn_ext; + key.QueryValue( wxT( "JavaHome" ), value ); + command = value + wxFileName::GetPathSeparator(); + command << wxT("bin\\java"); +#else // __WINDOWS__ + command = wxT( "java" );; +#endif - wxFileName::SplitPath( fullFileName, &path, &name, &ext ); - - name += dsn_ext; - - fullFileName = EDA_FileSelector( _( "Specctra DSN file:" ), - path, - name, // name.ext without path! - dsn_ext, - mask, - this, - wxFD_SAVE, - false - ); - - if( fullFileName == wxEmptyString ) - return fullFileName; - - if( ! m_Parent->ExportSpecctraFile( fullFileName ) ) // the file was not created - return fullFileName; - - wxFileName jarfileName( FindKicadFile( wxT( "freeroute.jar" ) ), wxPATH_UNIX ); - - wxString command = wxT("java -jar "); + command << wxT(" -jar "); // add "freeroute.jar" to command line: command << wxChar( '"' ) << jarfileName.GetFullPath() << wxChar( '"' ); // add option to load the .dsn file command << wxT( " -de " ); // add *.dsn full filename (quoted): - command << wxChar( '"' ) << fullFileName << wxChar( '"' ); + command << wxChar( '"' ) << dsnFile << wxChar( '"' ); - return command; + ProcessExecute( command ); } -/* wxEVT_COMMAND_BUTTON_CLICKED event handler for ID_BUTTON - */ -void DIALOG_FREEROUTE::OnVisitButtonClick( wxCommandEvent& event ) +const wxString DIALOG_FREEROUTE::createDSN_File() { - wxString command = m_FreerouteURLName->GetValue(); + wxFileName fn( m_Parent->GetBoard()->GetFileName() ); + wxString dsn_ext = wxT( "dsn" ); + fn.SetExt( dsn_ext ); + wxString mask = wxT( "*." ) + dsn_ext; - wxLaunchDefaultBrowser( command ); + wxString fullFileName = EDA_FileSelector( _( "Specctra DSN file:" ), + fn.GetPath(), fn.GetFullName(), + dsn_ext, mask, + this, wxFD_SAVE, false ); + + if( !fullFileName.IsEmpty() ) + { + if( ! m_Parent->ExportSpecctraFile( fullFileName ) ) // the file was not created + return wxEmptyString; + } + + return fullFileName; } + /* wxEVT_COMMAND_BUTTON_CLICKED event handler for wxID_CLOSE */ void DIALOG_FREEROUTE::OnCancelButtonClick( wxCommandEvent& event ) @@ -288,19 +235,6 @@ void DIALOG_FREEROUTE::OnCancelButtonClick( wxCommandEvent& event ) void DIALOG_FREEROUTE::OnOKButtonClick( wxCommandEvent& event ) { - if( m_FreeRouteSetupChanged ) // Save new config - { - Kiface().KifaceSettings()->Write( - FREEROUTE_URL_KEY, m_FreerouteURLName->GetValue() ); - } - EndModal(wxID_OK); } - -/* wxEVT_COMMAND_TEXT_UPDATED event handler for ID_TEXT_EDIT_FR_URL - */ -void DIALOG_FREEROUTE::OnTextEditFrUrlUpdated( wxCommandEvent& event ) -{ - m_FreeRouteSetupChanged = true; -} diff --git a/pcbnew/dialogs/dialog_freeroute_exchange.h b/pcbnew/dialogs/dialog_freeroute_exchange.h index 6b00dbec24..7debe7bee2 100644 --- a/pcbnew/dialogs/dialog_freeroute_exchange.h +++ b/pcbnew/dialogs/dialog_freeroute_exchange.h @@ -31,8 +31,7 @@ class DIALOG_FREEROUTE : public DIALOG_FREEROUTE_BASE { private: PCB_EDIT_FRAME* m_Parent; - bool m_FreeRouteSetupChanged; - bool m_freeRouterIsLocal; + bool m_freeRouterFound; private: // Virtual event handlers @@ -40,12 +39,11 @@ private: void OnExportButtonClick( wxCommandEvent& event ); void OnLaunchButtonClick( wxCommandEvent& event ); void OnImportButtonClick( wxCommandEvent& event ); - void OnVisitButtonClick( wxCommandEvent& event ); void OnHelpButtonClick( wxCommandEvent& event ); void OnCancelButtonClick( wxCommandEvent& event ); - void OnTextEditFrUrlUpdated( wxCommandEvent& event ); + void MyInit ( ); - wxString CmdRunFreeRouterLocal(); + const wxString createDSN_File(); public: DIALOG_FREEROUTE( PCB_EDIT_FRAME* parent ); diff --git a/pcbnew/dialogs/dialog_freeroute_exchange_base.cpp b/pcbnew/dialogs/dialog_freeroute_exchange_base.cpp index 1a12b490ae..6be55d2f32 100644 --- a/pcbnew/dialogs/dialog_freeroute_exchange_base.cpp +++ b/pcbnew/dialogs/dialog_freeroute_exchange_base.cpp @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version Apr 10 2012) +// C++ code generated with wxFormBuilder (version Jun 5 2014) // http://www.wxformbuilder.org/ // // PLEASE DO "NOT" EDIT THIS FILE! @@ -42,7 +42,7 @@ DIALOG_FREEROUTE_BASE::DIALOG_FREEROUTE_BASE( wxWindow* parent, wxWindowID id, c bLeftButtonsSizer->Add( m_ExportDSN, 0, wxALL|wxEXPAND, 5 ); - m_buttonLaunchFreeroute = new wxButton( this, wxID_BUTTON_LAUNCH, _("Launch FreeRouter via Java Web Start"), wxDefaultPosition, wxDefaultSize, 0 ); + m_buttonLaunchFreeroute = new wxButton( this, wxID_BUTTON_LAUNCH, _("Launch FreeRouter and Launch FreeRouter"), wxDefaultPosition, wxDefaultSize, 0 ); m_buttonLaunchFreeroute->SetToolTip( _("Use Java Web Start function to run FreeRouter via Internet (or your Browser if not found)") ); bLeftButtonsSizer->Add( m_buttonLaunchFreeroute, 0, wxALL|wxEXPAND, 5 ); @@ -61,65 +61,22 @@ DIALOG_FREEROUTE_BASE::DIALOG_FREEROUTE_BASE( wxWindow* parent, wxWindowID id, c bUpperSizer->Add( bLeftSizer, 1, wxALIGN_TOP|wxALL|wxEXPAND, 5 ); - m_staticline2 = new wxStaticLine( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_VERTICAL ); - bUpperSizer->Add( m_staticline2, 0, wxALL|wxEXPAND, 5 ); - - wxBoxSizer* bRightSizer; - bRightSizer = new wxBoxSizer( wxVERTICAL ); - - m_staticText3 = new wxStaticText( this, wxID_ANY, _("FreeRoute Info:"), wxDefaultPosition, wxDefaultSize, 0 ); - m_staticText3->Wrap( -1 ); - m_staticText3->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), 70, 90, 92, false, wxEmptyString ) ); - - bRightSizer->Add( m_staticText3, 0, wxALL, 5 ); - - wxBoxSizer* bRightSubSizer; - bRightSubSizer = new wxBoxSizer( wxHORIZONTAL ); - - - bRightSubSizer->Add( 20, 20, 0, 0, 5 ); - - wxBoxSizer* bRightButtonsSizer; - bRightButtonsSizer = new wxBoxSizer( wxVERTICAL ); - - m_buttonVisit = new wxButton( this, wxID_BUTTON_VISIT, _("Visit the FreeRouting.net Website with your Browser"), wxDefaultPosition, wxDefaultSize, 0 ); - bRightButtonsSizer->Add( m_buttonVisit, 0, wxALL|wxEXPAND, 5 ); - - m_staticText1 = new wxStaticText( this, wxID_ANY, _("FreeRouting.net URL"), wxDefaultPosition, wxDefaultSize, 0 ); - m_staticText1->Wrap( -1 ); - bRightButtonsSizer->Add( m_staticText1, 0, wxTOP|wxRIGHT|wxLEFT, 5 ); - - m_FreerouteURLName = new wxTextCtrl( this, wxID_TEXT_URL, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); - m_FreerouteURLName->SetToolTip( _("The URL of the FreeRouting.net website") ); - - bRightButtonsSizer->Add( m_FreerouteURLName, 0, wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT, 5 ); - - m_buttonHelp = new wxButton( this, wxID_BUTTON_HELP, _("Help"), wxDefaultPosition, wxDefaultSize, 0 ); - bRightButtonsSizer->Add( m_buttonHelp, 0, wxALL|wxEXPAND, 5 ); - - - bRightSubSizer->Add( bRightButtonsSizer, 1, wxEXPAND, 5 ); - - - bRightSizer->Add( bRightSubSizer, 1, wxEXPAND, 5 ); - - - bUpperSizer->Add( bRightSizer, 1, wxALIGN_TOP|wxALL|wxEXPAND, 5 ); - bMainSizer->Add( bUpperSizer, 1, wxEXPAND, 5 ); m_staticline1 = new wxStaticLine( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL ); bMainSizer->Add( m_staticline1, 0, wxEXPAND|wxALL, 5 ); - m_sdbSizer1 = new wxStdDialogButtonSizer(); - m_sdbSizer1OK = new wxButton( this, wxID_OK ); - m_sdbSizer1->AddButton( m_sdbSizer1OK ); - m_sdbSizer1Cancel = new wxButton( this, wxID_CANCEL ); - m_sdbSizer1->AddButton( m_sdbSizer1Cancel ); - m_sdbSizer1->Realize(); + m_sdbSizer = new wxStdDialogButtonSizer(); + m_sdbSizerOK = new wxButton( this, wxID_OK ); + m_sdbSizer->AddButton( m_sdbSizerOK ); + m_sdbSizerCancel = new wxButton( this, wxID_CANCEL ); + m_sdbSizer->AddButton( m_sdbSizerCancel ); + m_sdbSizerHelp = new wxButton( this, wxID_HELP ); + m_sdbSizer->AddButton( m_sdbSizerHelp ); + m_sdbSizer->Realize(); - bMainSizer->Add( m_sdbSizer1, 0, wxEXPAND|wxALL, 5 ); + bMainSizer->Add( m_sdbSizer, 0, wxEXPAND|wxALL, 5 ); this->SetSizer( bMainSizer ); @@ -130,11 +87,9 @@ DIALOG_FREEROUTE_BASE::DIALOG_FREEROUTE_BASE( wxWindow* parent, wxWindowID id, c m_ExportDSN->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_FREEROUTE_BASE::OnExportButtonClick ), NULL, this ); m_buttonLaunchFreeroute->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_FREEROUTE_BASE::OnLaunchButtonClick ), NULL, this ); m_buttonImport->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_FREEROUTE_BASE::OnImportButtonClick ), NULL, this ); - m_buttonVisit->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_FREEROUTE_BASE::OnVisitButtonClick ), NULL, this ); - m_FreerouteURLName->Connect( wxEVT_COMMAND_TEXT_UPDATED, wxCommandEventHandler( DIALOG_FREEROUTE_BASE::OnTextEditFrUrlUpdated ), NULL, this ); - m_buttonHelp->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_FREEROUTE_BASE::OnHelpButtonClick ), NULL, this ); - m_sdbSizer1Cancel->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_FREEROUTE_BASE::OnCancelButtonClick ), NULL, this ); - m_sdbSizer1OK->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_FREEROUTE_BASE::OnOKButtonClick ), NULL, this ); + m_sdbSizerCancel->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_FREEROUTE_BASE::OnCancelButtonClick ), NULL, this ); + m_sdbSizerHelp->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_FREEROUTE_BASE::OnHelpButtonClick ), NULL, this ); + m_sdbSizerOK->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_FREEROUTE_BASE::OnOKButtonClick ), NULL, this ); } DIALOG_FREEROUTE_BASE::~DIALOG_FREEROUTE_BASE() @@ -143,10 +98,8 @@ DIALOG_FREEROUTE_BASE::~DIALOG_FREEROUTE_BASE() m_ExportDSN->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_FREEROUTE_BASE::OnExportButtonClick ), NULL, this ); m_buttonLaunchFreeroute->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_FREEROUTE_BASE::OnLaunchButtonClick ), NULL, this ); m_buttonImport->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_FREEROUTE_BASE::OnImportButtonClick ), NULL, this ); - m_buttonVisit->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_FREEROUTE_BASE::OnVisitButtonClick ), NULL, this ); - m_FreerouteURLName->Disconnect( wxEVT_COMMAND_TEXT_UPDATED, wxCommandEventHandler( DIALOG_FREEROUTE_BASE::OnTextEditFrUrlUpdated ), NULL, this ); - m_buttonHelp->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_FREEROUTE_BASE::OnHelpButtonClick ), NULL, this ); - m_sdbSizer1Cancel->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_FREEROUTE_BASE::OnCancelButtonClick ), NULL, this ); - m_sdbSizer1OK->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_FREEROUTE_BASE::OnOKButtonClick ), NULL, this ); + m_sdbSizerCancel->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_FREEROUTE_BASE::OnCancelButtonClick ), NULL, this ); + m_sdbSizerHelp->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_FREEROUTE_BASE::OnHelpButtonClick ), NULL, this ); + m_sdbSizerOK->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_FREEROUTE_BASE::OnOKButtonClick ), NULL, this ); } diff --git a/pcbnew/dialogs/dialog_freeroute_exchange_base.fbp b/pcbnew/dialogs/dialog_freeroute_exchange_base.fbp index 1422766334..07b989a0f9 100644 --- a/pcbnew/dialogs/dialog_freeroute_exchange_base.fbp +++ b/pcbnew/dialogs/dialog_freeroute_exchange_base.fbp @@ -1,6 +1,6 @@ - + C++ @@ -20,8 +20,10 @@ . 1 + 1 1 1 + UI 0 0 @@ -341,7 +343,7 @@ 0 0 wxID_BUTTON_LAUNCH - Launch FreeRouter via Java Web Start + Launch FreeRouter and Launch FreeRouter 0 @@ -490,563 +492,6 @@ - - 5 - wxALL|wxEXPAND - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - - 0 - - - 0 - - 1 - m_staticline2 - 1 - - - protected - 1 - - Resizable - 1 - - wxLI_VERTICAL - - 0 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 5 - wxALIGN_TOP|wxALL|wxEXPAND - 1 - - - bRightSizer - wxVERTICAL - none - - 5 - wxALL - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - ,90,92,-1,70,0 - 0 - 0 - wxID_ANY - FreeRoute Info: - - 0 - - - 0 - - 1 - m_staticText3 - 1 - - - protected - 1 - - Resizable - 1 - - - - 0 - - - - - -1 - - - - - - - - - - - - - - - - - - - - - - - - - - - 5 - wxEXPAND - 1 - - - bRightSubSizer - wxHORIZONTAL - none - - 5 - - 0 - - 20 - protected - 20 - - - - 5 - wxEXPAND - 1 - - - bRightButtonsSizer - wxVERTICAL - none - - 5 - wxALL|wxEXPAND - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 1 - 0 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_BUTTON_VISIT - Visit the FreeRouting.net Website with your Browser - - 0 - - - 0 - - 1 - m_buttonVisit - 1 - - - protected - 1 - - Resizable - 1 - - - - 0 - - - wxFILTER_NONE - wxDefaultValidator - - - - - OnVisitButtonClick - - - - - - - - - - - - - - - - - - - - - - - - - - - 5 - wxTOP|wxRIGHT|wxLEFT - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - FreeRouting.net URL - - 0 - - - 0 - - 1 - m_staticText1 - 1 - - - protected - 1 - - Resizable - 1 - - - - 0 - - - - - -1 - - - - - - - - - - - - - - - - - - - - - - - - - - - 5 - wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_TEXT_URL - - 0 - - 0 - - 0 - - 1 - m_FreerouteURLName - 1 - - - protected - 1 - - Resizable - 1 - - - - 0 - The URL of the FreeRouting.net website - - wxFILTER_NONE - wxDefaultValidator - - - - - - - - - - - - - - - - - - - - - - - - - - - - OnTextEditFrUrlUpdated - - - - - - - - 5 - wxALL|wxEXPAND - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 1 - 0 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_BUTTON_HELP - Help - - 0 - - - 0 - - 1 - m_buttonHelp - 1 - - - protected - 1 - - Resizable - 1 - - - - 0 - - - wxFILTER_NONE - wxDefaultValidator - - - - - OnHelpButtonClick - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -1138,18 +583,18 @@ 0 1 0 - 0 + 1 0 1 0 0 - m_sdbSizer1 + m_sdbSizer protected OnCancelButtonClick - + OnHelpButtonClick OnOKButtonClick diff --git a/pcbnew/dialogs/dialog_freeroute_exchange_base.h b/pcbnew/dialogs/dialog_freeroute_exchange_base.h index 307fa3fdb5..365d524f32 100644 --- a/pcbnew/dialogs/dialog_freeroute_exchange_base.h +++ b/pcbnew/dialogs/dialog_freeroute_exchange_base.h @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version Apr 10 2012) +// C++ code generated with wxFormBuilder (version Jun 5 2014) // http://www.wxformbuilder.org/ // // PLEASE DO "NOT" EDIT THIS FILE! @@ -11,6 +11,8 @@ #include #include #include +class DIALOG_SHIM; + #include "dialog_shim.h" #include #include @@ -21,7 +23,6 @@ #include #include #include -#include #include /////////////////////////////////////////////////////////////////////////// @@ -29,9 +30,6 @@ #define ID_BUTTON_EXPORT_DSN 1000 #define wxID_BUTTON_LAUNCH 1001 #define wxID_BUTTON_IMPORT 1002 -#define wxID_BUTTON_VISIT 1003 -#define wxID_TEXT_URL 1004 -#define wxID_BUTTON_HELP 1005 /////////////////////////////////////////////////////////////////////////////// /// Class DIALOG_FREEROUTE_BASE @@ -45,25 +43,18 @@ class DIALOG_FREEROUTE_BASE : public DIALOG_SHIM wxButton* m_ExportDSN; wxButton* m_buttonLaunchFreeroute; wxButton* m_buttonImport; - wxStaticLine* m_staticline2; - wxStaticText* m_staticText3; - wxButton* m_buttonVisit; - wxStaticText* m_staticText1; - wxTextCtrl* m_FreerouteURLName; - wxButton* m_buttonHelp; wxStaticLine* m_staticline1; - wxStdDialogButtonSizer* m_sdbSizer1; - wxButton* m_sdbSizer1OK; - wxButton* m_sdbSizer1Cancel; + wxStdDialogButtonSizer* m_sdbSizer; + wxButton* m_sdbSizerOK; + wxButton* m_sdbSizerCancel; + wxButton* m_sdbSizerHelp; // Virtual event handlers, overide them in your derived class virtual void OnExportButtonClick( wxCommandEvent& event ) { event.Skip(); } virtual void OnLaunchButtonClick( wxCommandEvent& event ) { event.Skip(); } virtual void OnImportButtonClick( wxCommandEvent& event ) { event.Skip(); } - virtual void OnVisitButtonClick( wxCommandEvent& event ) { event.Skip(); } - virtual void OnTextEditFrUrlUpdated( wxCommandEvent& event ) { event.Skip(); } - virtual void OnHelpButtonClick( wxCommandEvent& event ) { event.Skip(); } virtual void OnCancelButtonClick( wxCommandEvent& event ) { event.Skip(); } + virtual void OnHelpButtonClick( wxCommandEvent& event ) { event.Skip(); } virtual void OnOKButtonClick( wxCommandEvent& event ) { event.Skip(); }