Commit 0eb40500 authored by jean-pierre charras's avatar jean-pierre charras
Browse files

* Fix 3D frame issue (3D frame not show) when it is iconized and reactivated... 

* Fix 3D frame issue (3D frame not show) when it is iconized and reactivated by Pcbnew or CvPcb menus (Windows only)
* Add in help menu a direct link to the new doc Getting_Started_in_KiCad.pdf, written by contributors (useful for beginners)
* Fix other very minor issues in CvPcb.
* Update howto doc about translation
parents 04bf11c2 0b9f39fa

Documentation/GUI_Translation_HOWTO.odt

+6.81 KiB (220 KiB)

File changed.

No diff preview for this file type.

View original file
View changed file

Documentation/GUI_Translation_HOWTO.pdf

+17.6 KiB (323 KiB)

File changed.

No diff preview for this file type.

View original file
View changed file

common/basicframe.cpp

+24 −0
Original line number Diff line number Diff line
@@ -258,6 +258,30 @@ void EDA_BASE_FRAME::GetKicadHelp( wxCommandEvent& event ) 
{

    wxString msg;



    /* We have to get document for beginners,

     * or the the full specific doc

     * if event id is wxID_INDEX, we want the document for beginners.

     * else the specific doc file (its name is in wxGetApp().m_HelpFileName)

     * The document for beginners is the same for all kicad utilities

     */

    if( event.GetId() == wxID_INDEX )

    {

        // Temporary change the help filename

        wxString tmp = wxGetApp().m_HelpFileName;

        wxGetApp().m_HelpFileName = "Getting_Started_in_KiCad.pdf";

        wxString helpFile = wxGetApp().GetHelpFile();

        if( !helpFile )

        {

            msg.Printf( _( "Help file %s could not be found." ),

                        GetChars( wxGetApp().m_HelpFileName ) );

            DisplayError( this, msg );

        }

        else

            GetAssociatedDocument( this, helpFile );

        wxGetApp().m_HelpFileName = tmp;

        return;

    }



#if defined ONLINE_HELP_FILES_FORMAT_IS_HTML



    if( wxGetApp().m_HtmlCtrl == NULL )

common/build_version.cpp

+1 −1
Original line number Diff line number Diff line
@@ -6,7 +6,7 @@ 
#endif



#ifndef KICAD_BUILD_VERSION

#define KICAD_BUILD_VERSION "(2011-07-19)"

#define KICAD_BUILD_VERSION "(2011-aug-04)"

#endif

cvpcb/class_DisplayFootprintsFrame.cpp

+8 −8
Original line number Diff line number Diff line
@@ -106,7 +106,7 @@ DISPLAY_FOOTPRINTS_FRAME::DISPLAY_FOOTPRINTS_FRAME( CVPCB_MAINFRAME* father, 
                          wxAuiPaneInfo( vert ).Name( wxT( "m_VToolBar" ) ).Right() );



    m_auimgr.AddPane( DrawPanel,

                      wxAuiPaneInfo().Name( wxT( "DrawFrame" ) ).CentrePane() );

                      wxAuiPaneInfo().Name( wxT( "DisplayFrame" ) ).CentrePane() );



    m_auimgr.AddPane( MsgPanel,

                      wxAuiPaneInfo( horiz ).Name( wxT( "MsgPanel" ) ).Bottom() );
@@ -126,7 +126,7 @@ DISPLAY_FOOTPRINTS_FRAME::~DISPLAY_FOOTPRINTS_FRAME() 
    delete GetScreen();

    SetScreen( NULL );



    ( (CVPCB_MAINFRAME*) wxGetApp().GetTopWindow() )->DrawFrame = NULL;

    ( (CVPCB_MAINFRAME*) wxGetApp().GetTopWindow() )->m_DisplayFootprintFrame = NULL;

}



/* Called when the frame is closed
@@ -134,12 +134,8 @@ DISPLAY_FOOTPRINTS_FRAME::~DISPLAY_FOOTPRINTS_FRAME() 
 */

void DISPLAY_FOOTPRINTS_FRAME::OnCloseWindow( wxCloseEvent& event )

{

    wxPoint pos;

    wxSize  size;



    size = GetSize();

    pos  = GetPosition();



    if( m_Draw3DFrame )

        m_Draw3DFrame->Close(true);

    SaveSettings();

    Destroy();

}
@@ -408,6 +404,10 @@ void DISPLAY_FOOTPRINTS_FRAME::Show3D_Frame( wxCommandEvent& event ) 
{

    if( m_Draw3DFrame )

    {

        // Raising the window does not show the window on Windows if iconized.

        // This should work on any platform.

        if( m_Draw3DFrame->IsIconized() )

             m_Draw3DFrame->Iconize( false );

        m_Draw3DFrame->Raise();



        // Raising the window does not set the focus on Linux.  This should work on any platform.