Commit f8490ff4 authored by Dick Hollenbeck's avatar Dick Hollenbeck
Browse files

Remove g_PcbPlotOptions, use wxformbuilder to subclass DIALOG_SHIM on several dialogs

parent e4309287

.bzrignore

+1 −1
Original line number Diff line number Diff line
@@ -18,7 +18,7 @@ Documentation/doxygen 
*.cmake

*.bak

common/pcb_plot_params_keywords.cpp

common/pcb_plot_params_lexer.h

include/pcb_plot_params_lexer.h

pcbnew/specctra_keywords.cpp

pcbnew/specctra_lexer.h

new/html

CMakeLists.txt

+1 −2
Original line number Diff line number Diff line
@@ -254,7 +254,6 @@ set(INC_AFTER 
############

# Binaries #

############

add_subdirectory(3d-viewer)



if( USE_PNG_BITMAPS )

    add_subdirectory(bitmaps_png)
@@ -262,8 +261,8 @@ else() 
    add_subdirectory(bitmaps_xpm)

endif()





add_subdirectory(common)

add_subdirectory(3d-viewer)

add_subdirectory(cvpcb)

add_subdirectory(eeschema)

add_subdirectory(gerbview)

common/CMakeLists.txt

+2 −1
Original line number Diff line number Diff line
@@ -113,6 +113,7 @@ set(PCB_COMMON_SRCS 
    ../pcbnew/classpcb.cpp

    ../pcbnew/collectors.cpp

    ../pcbnew/sel_layer.cpp

    ../pcbnew/pcb_plot_params.cpp

    pcb_plot_params_keywords.cpp

    dialogs/dialog_page_settings.cpp

)
@@ -142,7 +143,7 @@ make_lexer( 
# auto-generate pcb_plot_params_lexer.h and pcb_plot_params_keywords.cpp

make_lexer(

    ${CMAKE_CURRENT_SOURCE_DIR}/pcb_plot_params.keywords

    ${CMAKE_CURRENT_SOURCE_DIR}/pcb_plot_params_lexer.h

    ${PROJECT_SOURCE_DIR}/include/pcb_plot_params_lexer.h

    ${CMAKE_CURRENT_SOURCE_DIR}/pcb_plot_params_keywords.cpp

    PCBPLOTPARAMS_T

    )

common/dialogs/dialog_page_settings.cpp

+1 −1
Original line number Diff line number Diff line
@@ -438,9 +438,9 @@ limits\n%.1f - %.1f %s!\nSelect another custom paper size?" ), 


            PAGE_INFO::SetCustomWidthMils( m_layout_size.x );

            PAGE_INFO::SetCustomHeightMils( m_layout_size.y );



            m_pageInfo.SetWidthMils( m_layout_size.x );

            m_pageInfo.SetHeightMils( m_layout_size.y );

            m_pageInfo.SetPortrait( m_layout_size.x < m_layout_size.y );

        }

    }

    else

eeschema/general.h

+13 −14
Original line number Diff line number Diff line
@@ -139,22 +139,21 @@ extern const wxString g_SchematicBackupFileExtension; 


extern LayerStruct    g_LayerDescr;



extern bool           g_EditPinByPinIsOn;   /* True to prevent displacing

                                             * pins, when they are at the

                                             * same position. */



extern int            g_DrawDefaultLineThickness; /* Default line (in Eeschema

                                                   * units) thickness used to

                                                   * draw/plot items having a

                                                   * default thickness line

                                                   * value (i.e. = 0 ).

                                                   * 0 = single pixel line width

/// True to prevent displacing pins, when they are at the same position.

extern bool           g_EditPinByPinIsOn;



/**

 * Default line (in Eeschema units) thickness used to draw/plot items having a

 * default thickness line value (i.e. = 0 ).

 * 0 = single pixel line width.

 */

extern int            g_DrawDefaultLineThickness;





// Color to draw selected items

/// Color to draw selected items

extern int g_ItemSelectetColor;



// Color to draw items flagged invisible, in libedit (they are invisible in Eeschema

/// Color to draw items flagged invisible, in libedit (they are invisible in Eeschema

extern int g_InvisibleItemColor;



/* Global Variables */