Commit a2765a85 authored by Jerry Jacobs's avatar Jerry Jacobs
Browse files

Merge

parents d2994d58 727f77db

CHANGELOG.txt

+11 −0
Original line number Diff line number Diff line
@@ -4,6 +4,17 @@ KiCad ChangeLog 2010 
Please add newer entries at the top, list the date and your name with

email address.



2010-may-18, UPDATE Jean-Pierre Charras <jean-pierre.charras@gipsa-lab.inpg.fr>

================================================================================

++All:

    Set minimum cmake version requirement to 2.6.4

    (does not works with 2.6.1)

++Pcbnew, Module Editor:

    Added footprint name edition in the module properties dialog.

    Until now, the footprint name used to retrieve a footprint in lib was

    set only when saving the footprint in lib, and could not be edited without saving

    the footprint in lib.



2010-may-01, UPDATE Jean-Pierre Charras <jean-pierre.charras@gipsa-lab.inpg.fr>

================================================================================

++Pcbnew:

CMakeLists.txt

+2 −2
Original line number Diff line number Diff line
@@ -2,9 +2,9 @@ project(kicad) 


# test the minimum Cmake version requirement (could be different under unix or Windows

if(WIN32)

    cmake_minimum_required(VERSION 2.8.0 FATAL_ERROR)

    cmake_minimum_required(VERSION 2.6.4 FATAL_ERROR)

else(WIN32)

    cmake_minimum_required(VERSION 2.8.0 FATAL_ERROR)

    cmake_minimum_required(VERSION 2.6.4 FATAL_ERROR)

endif(WIN32)



# Path to local CMake modules.

common/common_plot_functions.cpp

+3 −2
Original line number Diff line number Diff line
@@ -284,6 +284,7 @@ void WinEDA_DrawFrame::PlotWorkSheet( PLOTTER* plotter, BASE_SCREEN* screen ) 
            case WS_IDENTSHEET:

                if( WsItem->m_Legende )

                    msg = WsItem->m_Legende;

                if( screen->m_NumberOfScreen > 1 )

            	    msg << screen->m_ScreenNumber;

                plotter->text( pos, color,

                               msg, TEXT_ORIENT_HORIZ, text_size,

common/confirm.cpp

+2 −2
Original line number Diff line number Diff line
@@ -121,8 +121,8 @@ bool IsOK( wxWindow* parent, const wxString& text ) 
 * Leading and trailing spaces are removed

 * Buffer is the initial text displayed, anr the returned text

 * Return:

 * 1 if OK

 * 0 if ESCAPE

 * 0 if OK

 * 1 if CANCEL

 */

int Get_Message( const wxString& title,           // The question

                 const wxString& frame_caption,   // The frame caption

common/worksheet.cpp

+3 −2
Original line number Diff line number Diff line
@@ -549,7 +549,7 @@ Ki_WorkSheetData WS_Art = 
    &WS_Mass,

    STAMP_X_50 - 30, STAMP_Y_35 + 90,

    0,               0,

    wxT( "Арт." ),NULL

    wxT( "Лит." ),NULL

};



Ki_WorkSheetData WS_Mass =
@@ -1147,6 +1147,7 @@ void WinEDA_DrawFrame::TraceWorkSheet( wxDC* DC, BASE_SCREEN* screen, 
            case WS_IDENTSHEET:

                if( WsItem->m_Legende )

                    msg = WsItem->m_Legende;

                if( screen->m_NumberOfScreen > 1 )

                    msg << screen->m_ScreenNumber;

                DrawGraphicText( DrawPanel, DC, pos, Color, msg,

                                 TEXT_ORIENT_HORIZ, size, GR_TEXT_HJUSTIFY_LEFT,