Commit ec4d74c9 authored by Wayne Stambaugh's avatar Wayne Stambaugh
Browse files

Minor 3D viewer improvements (fixes lp:1406680). 

* Make OK button the default action in the 3D viewer option dialog per UI
  policy.
* Fix standard button sizer padding in 3D viewer options dialog.
* Let sizers do their job by using default size for 3D viewer options
  dialog.
* Set 3D viewer hot key to Alt+3 in all parent windows where 3D viewer is
  accessible.
* Minor code cleaning and coding policy fixes.
parent 45808deb

3d-viewer/dialogs/dialog_3D_view_option.cpp

+5 −2
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@ 
 * This program source code file is part of KiCad, a free EDA CAD application.

 *

 * Copyright (C) 2013 Jean-Pierre Charras, jp.charras at wanadoo.fr

 * Copyright (C) 2014 KiCad Developers, see CHANGELOG.TXT for contributors.

 * Copyright (C) 2014-2015 KiCad Developers, see CHANGELOG.TXT for contributors.

 *

 * This program is free software; you can redistribute it and/or

 * modify it under the terms of the GNU General Public License
@@ -43,9 +43,11 @@ private: 
    void OnOKClick( wxCommandEvent& event );

};





void EDA_3D_FRAME::Install_3D_ViewOptionDialog( wxCommandEvent& event )

{

    DIALOG_3D_VIEW_OPTIONS dlg( this );



    if( dlg.ShowModal() == wxID_OK )

    {

        SetMenuBarOptionsState();
@@ -61,6 +63,7 @@ DIALOG_3D_VIEW_OPTIONS::DIALOG_3D_VIEW_OPTIONS( EDA_3D_FRAME* parent ) 


    initDialog();



    SetDefaultItem( (wxWindow*) m_sdbSizerOK );

	Layout();

    GetSizer()->SetSizeHints( this );

	Centre();

3d-viewer/dialogs/dialog_3D_view_option_base.cpp

+5 −4
Original line number Diff line number Diff line 
///////////////////////////////////////////////////////////////////////////

// C++ code generated with wxFormBuilder (version Oct  8 2012)

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

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

//

// PLEASE DO "NOT" EDIT THIS FILE!
@@ -69,13 +69,13 @@ DIALOG_3D_VIEW_OPTIONS_BASE::DIALOG_3D_VIEW_OPTIONS_BASE( wxWindow* parent, wxWi 
	m_bitmapComments = new wxStaticBitmap( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );

	fgSizeShowOpts->Add( m_bitmapComments, 0, wxALL, 5 );

	

	m_checkBoxComments = new wxCheckBox( this, wxID_ANY, _("Show comments and drawings Layers"), wxDefaultPosition, wxDefaultSize, 0 );

	m_checkBoxComments = new wxCheckBox( this, wxID_ANY, _("Show comments and drawings layers"), wxDefaultPosition, wxDefaultSize, 0 );

	fgSizeShowOpts->Add( m_checkBoxComments, 0, wxALL, 5 );

	

	m_bitmapECO = new wxStaticBitmap( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );

	fgSizeShowOpts->Add( m_bitmapECO, 0, wxALL, 5 );

	

	m_checkBoxECO = new wxCheckBox( this, wxID_ANY, _("Show ECOs layers"), wxDefaultPosition, wxDefaultSize, 0 );

	m_checkBoxECO = new wxCheckBox( this, wxID_ANY, _("Show ECO layers"), wxDefaultPosition, wxDefaultSize, 0 );

	fgSizeShowOpts->Add( m_checkBoxECO, 0, wxALL, 5 );
@@ -106,11 +106,12 @@ DIALOG_3D_VIEW_OPTIONS_BASE::DIALOG_3D_VIEW_OPTIONS_BASE( wxWindow* parent, wxWi 
	m_sdbSizer->AddButton( m_sdbSizerCancel );

	m_sdbSizer->Realize();

	

	bSizerMain->Add( m_sdbSizer, 0, wxALIGN_RIGHT, 5 );

	bSizerMain->Add( m_sdbSizer, 0, wxALL|wxEXPAND, 5 );

	

	

	this->SetSizer( bSizerMain );

	this->Layout();

	bSizerMain->Fit( this );

	

	this->Centre( wxBOTH );

3d-viewer/dialogs/dialog_3D_view_option_base.fbp

+1086 −1084

File changed.

Preview size limit exceeded, changes collapsed.

3d-viewer/dialogs/dialog_3D_view_option_base.h

+2 −2
Original line number Diff line number Diff line 
///////////////////////////////////////////////////////////////////////////

// C++ code generated with wxFormBuilder (version Oct  8 2012)

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

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

//

// PLEASE DO "NOT" EDIT THIS FILE!
@@ -74,7 +74,7 @@ class DIALOG_3D_VIEW_OPTIONS_BASE : public DIALOG_SHIM 
	

	public:

		

		DIALOG_3D_VIEW_OPTIONS_BASE( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("3D Display Options"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 340,344 ), long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER ); 

		DIALOG_3D_VIEW_OPTIONS_BASE( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("3D Display Options"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( -1,-1 ), long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER ); 

		~DIALOG_3D_VIEW_OPTIONS_BASE();

	

};

cvpcb/class_DisplayFootprintsFrame.cpp

+6 −1
Original line number Diff line number Diff line
@@ -236,7 +236,7 @@ void DISPLAY_FOOTPRINTS_FRAME::ReCreateHToolbar() 


    m_mainToolBar->AddSeparator();

    m_mainToolBar->AddTool( ID_CVPCB_SHOW3D_FRAME, wxEmptyString, KiBitmap( three_d_xpm ),

                            _( "3D Display" ) );

                            _( "3D Display (Alt+3)" ) );



    // after adding the buttons to the toolbar, must call Realize() to reflect

    // the changes
@@ -363,6 +363,11 @@ bool DISPLAY_FOOTPRINTS_FRAME::GeneralControl( wxDC* aDC, const wxPoint& aPositi 
        GetScreen()->m_O_Curseur = GetCrossHairPosition();

        break;



    case GR_KB_ALT + '3':

        cmd.SetId( ID_CVPCB_SHOW3D_FRAME );

        GetEventHandler()->ProcessEvent( cmd );

        break;



    default:

        eventHandled = false;

    }