Commit 09870e96 authored by jean-pierre charras's avatar jean-pierre charras
Browse files

Eeschema: add dialog libedit options and move options relative to libedit from... 

Eeschema: add dialog libedit options and move options relative to libedit from eeschema options to this dialog.
Ensure some values initialized by the schematic editor and used by libedit are also initialized in libedit even if the schematic editor was not started.
Remove useless commands (save/load project config) in libedit, because now they have no sense.
parents 7bf06a38 ed4fee76

3d-viewer/3d_toolbar.cpp

+5 −5
Original line number Original line Diff line number Diff line
@@ -158,7 +158,7 @@ void EDA_3D_FRAME::CreateMenuBar() 




    wxMenu * renderOptionsMenu = new wxMenu;

    wxMenu * renderOptionsMenu = new wxMenu;

    AddMenuItem( prefsMenu, renderOptionsMenu, ID_MENU3D_COLOR,

    AddMenuItem( prefsMenu, renderOptionsMenu, ID_MENU3D_COLOR,

           _( "Render options" ), KiBitmap( tools_xpm ) );

           _( "Render Options" ), KiBitmap( tools_xpm ) );





    AddMenuItem( renderOptionsMenu, ID_MENU3D_FL_RENDER_SHADOWS,

    AddMenuItem( renderOptionsMenu, ID_MENU3D_FL_RENDER_SHADOWS,

        _( "Render Shadows" ),

        _( "Render Shadows" ),
@@ -180,7 +180,7 @@ void EDA_3D_FRAME::CreateMenuBar() 
        KiBitmap( green_xpm ), wxITEM_CHECK );

        KiBitmap( green_xpm ), wxITEM_CHECK );





    AddMenuItem( renderOptionsMenu, ID_MENU3D_FL_RENDER_MATERIAL,

    AddMenuItem( renderOptionsMenu, ID_MENU3D_FL_RENDER_MATERIAL,

        _( "Render Material properties" ),

        _( "Render Material Properties" ),

        KiBitmap( green_xpm ), wxITEM_CHECK );

        KiBitmap( green_xpm ), wxITEM_CHECK );





    prefsMenu->AppendSeparator();

    prefsMenu->AppendSeparator();
@@ -224,10 +224,10 @@ void EDA_3D_FRAME::CreateMenuBar() 
    prefsMenu->AppendSeparator();

    prefsMenu->AppendSeparator();





    AddMenuItem( prefsMenu, ID_MENU3D_SHOW_BOARD_BODY,

    AddMenuItem( prefsMenu, ID_MENU3D_SHOW_BOARD_BODY,

           _( "Show Board Body" ), KiBitmap( use_3D_copper_thickness_xpm ), wxITEM_CHECK );

           _( "Show Board Bod&y" ), KiBitmap( use_3D_copper_thickness_xpm ), wxITEM_CHECK );





    AddMenuItem( prefsMenu, ID_MENU3D_USE_COPPER_THICKNESS,

    AddMenuItem( prefsMenu, ID_MENU3D_USE_COPPER_THICKNESS,

           _( "Show Copper Thickness" ), KiBitmap( use_3D_copper_thickness_xpm ), wxITEM_CHECK );

           _( "Show Copper &Thickness" ), KiBitmap( use_3D_copper_thickness_xpm ), wxITEM_CHECK );





    AddMenuItem( prefsMenu, ID_MENU3D_MODULE_ONOFF,

    AddMenuItem( prefsMenu, ID_MENU3D_MODULE_ONOFF,

           _( "Show 3D F&ootprints" ), KiBitmap( shape_3d_xpm ), wxITEM_CHECK );

           _( "Show 3D F&ootprints" ), KiBitmap( shape_3d_xpm ), wxITEM_CHECK );
@@ -239,7 +239,7 @@ void EDA_3D_FRAME::CreateMenuBar() 




    wxMenu * layersMenu = new wxMenu;

    wxMenu * layersMenu = new wxMenu;

    AddMenuItem( prefsMenu, layersMenu, ID_MENU3D_LAYERS,

    AddMenuItem( prefsMenu, layersMenu, ID_MENU3D_LAYERS,

           _( "Show Layers" ), KiBitmap( tools_xpm ) );

           _( "Show &Layers" ), KiBitmap( tools_xpm ) );





    AddMenuItem( layersMenu, ID_MENU3D_ADHESIVE_ONOFF,

    AddMenuItem( layersMenu, ID_MENU3D_ADHESIVE_ONOFF,

           _( "Show &Adhesive Layers" ), KiBitmap( tools_xpm ), wxITEM_CHECK );

           _( "Show &Adhesive Layers" ), KiBitmap( tools_xpm ), wxITEM_CHECK );

eeschema/CMakeLists.txt

+2 −0
Original line number Original line Diff line number Diff line
@@ -48,6 +48,8 @@ set( EESCHEMA_DLGS 
    dialogs/dialog_libedit_dimensions_base.cpp

    dialogs/dialog_libedit_dimensions_base.cpp

    dialogs/dialog_lib_edit_draw_item.cpp

    dialogs/dialog_lib_edit_draw_item.cpp

    dialogs/dialog_lib_edit_draw_item_base.cpp

    dialogs/dialog_lib_edit_draw_item_base.cpp

    dialogs/dialog_libedit_options_base.cpp

    dialogs/dialog_libedit_options.cpp

    dialogs/dialog_lib_edit_pin.cpp

    dialogs/dialog_lib_edit_pin.cpp

    dialogs/dialog_lib_edit_pin_base.cpp

    dialogs/dialog_lib_edit_pin_base.cpp

    dialogs/dialog_lib_new_component.cpp

    dialogs/dialog_lib_new_component.cpp

eeschema/dialogs/dialog_eeschema_options.h

+0 −3
Original line number Original line Diff line number Diff line
@@ -58,9 +58,6 @@ public: 
    void SetLineWidth( int aWidth ) { m_spinLineWidth->SetValue( aWidth ); }

    void SetLineWidth( int aWidth ) { m_spinLineWidth->SetValue( aWidth ); }

    int GetLineWidth( void ) { return m_spinLineWidth->GetValue(); }

    int GetLineWidth( void ) { return m_spinLineWidth->GetValue(); }





    void SetPinLength( int aLength ) { m_spinPinLength->SetValue( aLength ); }

    int GetPinLength( void ) { return m_spinPinLength->GetValue(); }



    void SetTextSize( int text_size ) { m_spinTextSize->SetValue( text_size ); }

    void SetTextSize( int text_size ) { m_spinTextSize->SetValue( text_size ); }

    int GetTextSize( void ) { return m_spinTextSize->GetValue(); }

    int GetTextSize( void ) { return m_spinTextSize->GetValue(); }

eeschema/dialogs/dialog_eeschema_options_base.cpp

+10 −13
Original line number Original line Diff line number Diff line 
///////////////////////////////////////////////////////////////////////////

///////////////////////////////////////////////////////////////////////////

// C++ code generated with wxFormBuilder (version Apr 10 2012)

// C++ code generated with wxFormBuilder (version Jun  5 2014)

// http://www.wxformbuilder.org/

// http://www.wxformbuilder.org/

//

//

// PLEASE DO "NOT" EDIT THIS FILE!

// PLEASE DO "NOT" EDIT THIS FILE!
@@ -35,7 +35,7 @@ DIALOG_EESCHEMA_OPTIONS_BASE::DIALOG_EESCHEMA_OPTIONS_BASE( wxWindow* parent, wx 
	bSizer3 = new wxBoxSizer( wxVERTICAL );

	bSizer3 = new wxBoxSizer( wxVERTICAL );

	

	

	wxFlexGridSizer* fgSizer1;

	wxFlexGridSizer* fgSizer1;

	fgSizer1 = new wxFlexGridSizer( 11, 3, 0, 0 );

	fgSizer1 = new wxFlexGridSizer( 0, 3, 0, 0 );

	fgSizer1->AddGrowableCol( 0 );

	fgSizer1->AddGrowableCol( 0 );

	fgSizer1->AddGrowableCol( 1 );

	fgSizer1->AddGrowableCol( 1 );

	fgSizer1->AddGrowableCol( 2 );

	fgSizer1->AddGrowableCol( 2 );
@@ -89,17 +89,6 @@ DIALOG_EESCHEMA_OPTIONS_BASE::DIALOG_EESCHEMA_OPTIONS_BASE( wxWindow* parent, wx 
	m_staticLineWidthUnits->Wrap( -1 );

	m_staticLineWidthUnits->Wrap( -1 );

	fgSizer1->Add( m_staticLineWidthUnits, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT, 3 );

	fgSizer1->Add( m_staticLineWidthUnits, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT, 3 );

	

	

	m_staticText52 = new wxStaticText( m_panel1, wxID_ANY, _("Default pin length:"), wxDefaultPosition, wxDefaultSize, 0 );

	m_staticText52->Wrap( -1 );

	fgSizer1->Add( m_staticText52, 0, wxALIGN_CENTER_VERTICAL|wxLEFT|wxRIGHT, 3 );

	

	m_spinPinLength = new wxSpinCtrl( m_panel1, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxSP_ARROW_KEYS|wxSP_WRAP, 50, 1000, 100 );

	fgSizer1->Add( m_spinPinLength, 0, wxALIGN_CENTER|wxALL|wxEXPAND, 3 );

	

	m_staticPinLengthUnits = new wxStaticText( m_panel1, wxID_ANY, _("mils"), wxDefaultPosition, wxDefaultSize, 0 );

	m_staticPinLengthUnits->Wrap( -1 );

	fgSizer1->Add( m_staticPinLengthUnits, 0, wxALIGN_CENTER_VERTICAL|wxLEFT|wxRIGHT, 3 );

	

	m_staticText7 = new wxStaticText( m_panel1, wxID_ANY, _("Default text &size:"), wxDefaultPosition, wxDefaultSize, 0 );

	m_staticText7 = new wxStaticText( m_panel1, wxID_ANY, _("Default text &size:"), wxDefaultPosition, wxDefaultSize, 0 );

	m_staticText7->Wrap( -1 );

	m_staticText7->Wrap( -1 );

	fgSizer1->Add( m_staticText7, 1, wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT, 3 );

	fgSizer1->Add( m_staticText7, 1, wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT, 3 );
@@ -247,6 +236,7 @@ DIALOG_EESCHEMA_OPTIONS_BASE::DIALOG_EESCHEMA_OPTIONS_BASE( wxWindow* parent, wx 
	fgSizer2->Add( m_staticText15, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT|wxALL, 3 );

	fgSizer2->Add( m_staticText15, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT|wxALL, 3 );

	

	

	m_fieldName1 = new wxTextCtrl( m_panel2, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );

	m_fieldName1 = new wxTextCtrl( m_panel2, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );

	m_fieldName1->SetMaxLength( 0 ); 

	fgSizer2->Add( m_fieldName1, 0, wxALIGN_CENTER_VERTICAL|wxALL|wxEXPAND, 3 );

	fgSizer2->Add( m_fieldName1, 0, wxALIGN_CENTER_VERTICAL|wxALL|wxEXPAND, 3 );

	

	

	m_staticText161 = new wxStaticText( m_panel2, wxID_ANY, _("Custom field 2"), wxDefaultPosition, wxDefaultSize, 0 );

	m_staticText161 = new wxStaticText( m_panel2, wxID_ANY, _("Custom field 2"), wxDefaultPosition, wxDefaultSize, 0 );
@@ -254,6 +244,7 @@ DIALOG_EESCHEMA_OPTIONS_BASE::DIALOG_EESCHEMA_OPTIONS_BASE( wxWindow* parent, wx 
	fgSizer2->Add( m_staticText161, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT|wxALL, 3 );

	fgSizer2->Add( m_staticText161, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT|wxALL, 3 );

	

	

	m_fieldName2 = new wxTextCtrl( m_panel2, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );

	m_fieldName2 = new wxTextCtrl( m_panel2, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );

	m_fieldName2->SetMaxLength( 0 ); 

	fgSizer2->Add( m_fieldName2, 0, wxALIGN_CENTER_VERTICAL|wxALL|wxEXPAND, 3 );

	fgSizer2->Add( m_fieldName2, 0, wxALIGN_CENTER_VERTICAL|wxALL|wxEXPAND, 3 );

	

	

	m_staticText17 = new wxStaticText( m_panel2, wxID_ANY, _("Custom field 3"), wxDefaultPosition, wxDefaultSize, 0 );

	m_staticText17 = new wxStaticText( m_panel2, wxID_ANY, _("Custom field 3"), wxDefaultPosition, wxDefaultSize, 0 );
@@ -261,6 +252,7 @@ DIALOG_EESCHEMA_OPTIONS_BASE::DIALOG_EESCHEMA_OPTIONS_BASE( wxWindow* parent, wx 
	fgSizer2->Add( m_staticText17, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT|wxALL, 3 );

	fgSizer2->Add( m_staticText17, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT|wxALL, 3 );

	

	

	m_fieldName3 = new wxTextCtrl( m_panel2, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );

	m_fieldName3 = new wxTextCtrl( m_panel2, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );

	m_fieldName3->SetMaxLength( 0 ); 

	fgSizer2->Add( m_fieldName3, 0, wxALIGN_CENTER_VERTICAL|wxALL|wxEXPAND, 3 );

	fgSizer2->Add( m_fieldName3, 0, wxALIGN_CENTER_VERTICAL|wxALL|wxEXPAND, 3 );

	

	

	m_staticText18 = new wxStaticText( m_panel2, wxID_ANY, _("Custom field 4"), wxDefaultPosition, wxDefaultSize, 0 );

	m_staticText18 = new wxStaticText( m_panel2, wxID_ANY, _("Custom field 4"), wxDefaultPosition, wxDefaultSize, 0 );
@@ -268,6 +260,7 @@ DIALOG_EESCHEMA_OPTIONS_BASE::DIALOG_EESCHEMA_OPTIONS_BASE( wxWindow* parent, wx 
	fgSizer2->Add( m_staticText18, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT|wxALL, 3 );

	fgSizer2->Add( m_staticText18, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT|wxALL, 3 );

	

	

	m_fieldName4 = new wxTextCtrl( m_panel2, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );

	m_fieldName4 = new wxTextCtrl( m_panel2, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );

	m_fieldName4->SetMaxLength( 0 ); 

	fgSizer2->Add( m_fieldName4, 0, wxALIGN_CENTER_VERTICAL|wxALL|wxEXPAND, 3 );

	fgSizer2->Add( m_fieldName4, 0, wxALIGN_CENTER_VERTICAL|wxALL|wxEXPAND, 3 );

	

	

	m_staticText19 = new wxStaticText( m_panel2, wxID_ANY, _("Custom field 5"), wxDefaultPosition, wxDefaultSize, 0 );

	m_staticText19 = new wxStaticText( m_panel2, wxID_ANY, _("Custom field 5"), wxDefaultPosition, wxDefaultSize, 0 );
@@ -275,6 +268,7 @@ DIALOG_EESCHEMA_OPTIONS_BASE::DIALOG_EESCHEMA_OPTIONS_BASE( wxWindow* parent, wx 
	fgSizer2->Add( m_staticText19, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT|wxALL, 3 );

	fgSizer2->Add( m_staticText19, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT|wxALL, 3 );

	

	

	m_fieldName5 = new wxTextCtrl( m_panel2, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );

	m_fieldName5 = new wxTextCtrl( m_panel2, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );

	m_fieldName5->SetMaxLength( 0 ); 

	fgSizer2->Add( m_fieldName5, 0, wxALIGN_CENTER_VERTICAL|wxALL|wxEXPAND, 3 );

	fgSizer2->Add( m_fieldName5, 0, wxALIGN_CENTER_VERTICAL|wxALL|wxEXPAND, 3 );

	

	

	m_staticText20 = new wxStaticText( m_panel2, wxID_ANY, _("Custom field 6"), wxDefaultPosition, wxDefaultSize, 0 );

	m_staticText20 = new wxStaticText( m_panel2, wxID_ANY, _("Custom field 6"), wxDefaultPosition, wxDefaultSize, 0 );
@@ -282,6 +276,7 @@ DIALOG_EESCHEMA_OPTIONS_BASE::DIALOG_EESCHEMA_OPTIONS_BASE( wxWindow* parent, wx 
	fgSizer2->Add( m_staticText20, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT|wxALL, 3 );

	fgSizer2->Add( m_staticText20, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT|wxALL, 3 );

	

	

	m_fieldName6 = new wxTextCtrl( m_panel2, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );

	m_fieldName6 = new wxTextCtrl( m_panel2, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );

	m_fieldName6->SetMaxLength( 0 ); 

	fgSizer2->Add( m_fieldName6, 0, wxALIGN_CENTER_VERTICAL|wxALL|wxEXPAND, 3 );

	fgSizer2->Add( m_fieldName6, 0, wxALIGN_CENTER_VERTICAL|wxALL|wxEXPAND, 3 );

	

	

	m_staticText21 = new wxStaticText( m_panel2, wxID_ANY, _("Custom field 7"), wxDefaultPosition, wxDefaultSize, 0 );

	m_staticText21 = new wxStaticText( m_panel2, wxID_ANY, _("Custom field 7"), wxDefaultPosition, wxDefaultSize, 0 );
@@ -289,6 +284,7 @@ DIALOG_EESCHEMA_OPTIONS_BASE::DIALOG_EESCHEMA_OPTIONS_BASE( wxWindow* parent, wx 
	fgSizer2->Add( m_staticText21, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT|wxALL, 3 );

	fgSizer2->Add( m_staticText21, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT|wxALL, 3 );

	

	

	m_fieldName7 = new wxTextCtrl( m_panel2, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );

	m_fieldName7 = new wxTextCtrl( m_panel2, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );

	m_fieldName7->SetMaxLength( 0 ); 

	fgSizer2->Add( m_fieldName7, 0, wxALIGN_CENTER_VERTICAL|wxALL|wxEXPAND, 3 );

	fgSizer2->Add( m_fieldName7, 0, wxALIGN_CENTER_VERTICAL|wxALL|wxEXPAND, 3 );

	

	

	m_staticText22 = new wxStaticText( m_panel2, wxID_ANY, _("Custom field 8"), wxDefaultPosition, wxDefaultSize, 0 );

	m_staticText22 = new wxStaticText( m_panel2, wxID_ANY, _("Custom field 8"), wxDefaultPosition, wxDefaultSize, 0 );
@@ -296,6 +292,7 @@ DIALOG_EESCHEMA_OPTIONS_BASE::DIALOG_EESCHEMA_OPTIONS_BASE( wxWindow* parent, wx 
	fgSizer2->Add( m_staticText22, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT|wxALL, 3 );

	fgSizer2->Add( m_staticText22, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT|wxALL, 3 );

	

	

	m_fieldName8 = new wxTextCtrl( m_panel2, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );

	m_fieldName8 = new wxTextCtrl( m_panel2, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );

	m_fieldName8->SetMaxLength( 0 ); 

	fgSizer2->Add( m_fieldName8, 0, wxALIGN_CENTER_VERTICAL|wxALL|wxEXPAND, 3 );

	fgSizer2->Add( m_fieldName8, 0, wxALIGN_CENTER_VERTICAL|wxALL|wxEXPAND, 3 );

eeschema/dialogs/dialog_eeschema_options_base.fbp

+12 −256

File changed.

Preview size limit exceeded, changes collapsed.