haskal
/
kicad
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Improve dialog spacing and remove 'auto' type decls. 

Also fixes a couple more coding style issues.
This commit is contained in:
Jeff Young 2020-03-09 01:40:48 +00:00
parent becc66b583
commit bbf5ad6160
4 changed files with 59 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
common/dialogs/panel_color_settings_base.cpp
View File

@ -26,7 +26,7 @@ PANEL_COLOR_SETTINGS_BASE::PANEL_COLOR_SETTINGS_BASE( wxWindow* parent, wxWindow
m_cbTheme->SetSelection( 0 ); m_cbTheme->SetSelection( 0 );
m_cbTheme->SetMinSize( wxSize( 150,-1 ) ); m_cbTheme->SetMinSize( wxSize( 150,-1 ) );
bControlSizer->Add( m_cbTheme, 0, wxALL, 5 ); bControlSizer->Add( m_cbTheme, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxRIGHT, 5 );
m_btnSave = new wxButton( this, wxID_ANY, _("&Save"), wxDefaultPosition, wxDefaultSize, 0 ); m_btnSave = new wxButton( this, wxID_ANY, _("&Save"), wxDefaultPosition, wxDefaultSize, 0 );
m_btnSave->Enable( false ); m_btnSave->Enable( false );
@ -48,18 +48,18 @@ PANEL_COLOR_SETTINGS_BASE::PANEL_COLOR_SETTINGS_BASE( wxWindow* parent, wxWindow
bControlSizer->Add( 0, 0, 1, wxEXPAND, 5 ); bControlSizer->Add( 0, 0, 1, wxEXPAND, 5 );
m_btnReset = new wxButton( this, wxID_ANY, _("&Reset colors to default"), wxDefaultPosition, wxDefaultSize, 0 ); m_btnReset = new wxButton( this, wxID_ANY, _("&Reset to Defaults"), wxDefaultPosition, wxDefaultSize, 0 );
m_btnReset->SetToolTip( _("Reset all colors in this theme to the KiCad defaults") ); m_btnReset->SetToolTip( _("Reset all colors in this theme to the KiCad defaults") );
bControlSizer->Add( m_btnReset, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 ); bControlSizer->Add( m_btnReset, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
m_btnOpenFolder = new wxButton( this, wxID_ANY, _("Open theme folder"), wxDefaultPosition, wxDefaultSize, 0 ); m_btnOpenFolder = new wxButton( this, wxID_ANY, _("Open Theme Folder"), wxDefaultPosition, wxDefaultSize, 0 );
m_btnOpenFolder->SetToolTip( _("Open the folder containing color themes") ); m_btnOpenFolder->SetToolTip( _("Open the folder containing color themes") );
bControlSizer->Add( m_btnOpenFolder, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 ); bControlSizer->Add( m_btnOpenFolder, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
m_mainSizer->Add( bControlSizer, 0, wxEXPAND, 5 ); m_mainSizer->Add( bControlSizer, 0, wxEXPAND|wxRIGHT, 10 );
m_panelThemeProperties = new wxPanel( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL ); m_panelThemeProperties = new wxPanel( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
m_panelThemeProperties->Hide(); m_panelThemeProperties->Hide();
@ -115,7 +115,7 @@ PANEL_COLOR_SETTINGS_BASE::PANEL_COLOR_SETTINGS_BASE( wxWindow* parent, wxWindow
m_colorsListWindow->SetScrollRate( 5, 5 ); m_colorsListWindow->SetScrollRate( 5, 5 );
m_colorsListWindow->SetMinSize( wxSize( 240,-1 ) ); m_colorsListWindow->SetMinSize( wxSize( 240,-1 ) );
m_colorsGridSizer = new wxFlexGridSizer( 0, 2, 5, 5 ); m_colorsGridSizer = new wxFlexGridSizer( 0, 2, 0, 0 );
m_colorsGridSizer->AddGrowableCol( 0 ); m_colorsGridSizer->AddGrowableCol( 0 );
m_colorsGridSizer->SetFlexibleDirection( wxHORIZONTAL ); m_colorsGridSizer->SetFlexibleDirection( wxHORIZONTAL );
m_colorsGridSizer->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_NONE ); m_colorsGridSizer->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_NONE );

14
common/dialogs/panel_color_settings_base.fbp
View File

@ -56,8 +56,8 @@
<property name="orient">wxVERTICAL</property> <property name="orient">wxVERTICAL</property>
<property name="permission">protected</property> <property name="permission">protected</property>
<object class="sizeritem" expanded="1"> <object class="sizeritem" expanded="1">
<property name="border">5</property> <property name="border">10</property>
<property name="flag">wxEXPAND</property> <property name="flag">wxEXPAND|wxRIGHT</property>
<property name="proportion">0</property> <property name="proportion">0</property>
<object class="wxBoxSizer" expanded="1"> <object class="wxBoxSizer" expanded="1">
<property name="minimum_size"></property> <property name="minimum_size"></property>
@ -127,7 +127,7 @@
</object> </object>
<object class="sizeritem" expanded="1"> <object class="sizeritem" expanded="1">
<property name="border">5</property> <property name="border">5</property>
<property name="flag">wxALL</property> <property name="flag">wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxRIGHT</property>
<property name="proportion">0</property> <property name="proportion">0</property>
<object class="wxChoice" expanded="1"> <object class="wxChoice" expanded="1">
<property name="BottomDockable">1</property> <property name="BottomDockable">1</property>
@ -456,7 +456,7 @@
<property name="gripper">0</property> <property name="gripper">0</property>
<property name="hidden">0</property> <property name="hidden">0</property>
<property name="id">wxID_ANY</property> <property name="id">wxID_ANY</property>
<property name="label">&amp;Reset colors to default</property> <property name="label">&amp;Reset to Defaults</property>
<property name="margins"></property> <property name="margins"></property>
<property name="markup">0</property> <property name="markup">0</property>
<property name="max_size"></property> <property name="max_size"></property>
@ -529,7 +529,7 @@
<property name="gripper">0</property> <property name="gripper">0</property>
<property name="hidden">0</property> <property name="hidden">0</property>
<property name="id">wxID_ANY</property> <property name="id">wxID_ANY</property>
<property name="label">Open theme folder</property> <property name="label">Open Theme Folder</property>
<property name="margins"></property> <property name="margins"></property>
<property name="markup">0</property> <property name="markup">0</property>
<property name="max_size"></property> <property name="max_size"></property>
@ -1025,13 +1025,13 @@
<property name="flexible_direction">wxHORIZONTAL</property> <property name="flexible_direction">wxHORIZONTAL</property>
<property name="growablecols">0</property> <property name="growablecols">0</property>
<property name="growablerows"></property> <property name="growablerows"></property>
<property name="hgap">5</property> <property name="hgap">0</property>
<property name="minimum_size"></property> <property name="minimum_size"></property>
<property name="name">m_colorsGridSizer</property> <property name="name">m_colorsGridSizer</property>
<property name="non_flexible_grow_mode">wxFLEX_GROWMODE_NONE</property> <property name="non_flexible_grow_mode">wxFLEX_GROWMODE_NONE</property>
<property name="permission">protected</property> <property name="permission">protected</property>
<property name="rows">0</property> <property name="rows">0</property>
<property name="vgap">5</property> <property name="vgap">0</property>
</object> </object>
</object> </object>
</object> </object>

87
eeschema/dialogs/panel_eeschema_color_settings.cpp
View File

@ -71,15 +71,14 @@ PANEL_EESCHEMA_COLOR_SETTINGS::PANEL_EESCHEMA_COLOR_SETTINGS( EDA_DRAW_FRAME* aF
{ {
m_buttonSizePx = ConvertDialogToPixels( BUTTON_SIZE ); m_buttonSizePx = ConvertDialogToPixels( BUTTON_SIZE );
auto common_settings = Pgm().GetCommonSettings(); SETTINGS_MANAGER& mgr = Pgm().GetSettingsManager();
auto app_settings = Pgm().GetSettingsManager().GetAppSettings<EESCHEMA_SETTINGS>(); COMMON_SETTINGS* common_settings = Pgm().GetCommonSettings();
EESCHEMA_SETTINGS* app_settings = mgr.GetAppSettings<EESCHEMA_SETTINGS>();
COLOR_SETTINGS* current = COLOR_SETTINGS* current = mgr.GetColorSettings( app_settings->m_ColorTheme );
Pgm().GetSettingsManager().GetColorSettings( app_settings->m_ColorTheme );
m_cbTheme->Clear(); m_cbTheme->Clear();
for( COLOR_SETTINGS* settings : Pgm().GetSettingsManager().GetColorSettingsList() ) for( COLOR_SETTINGS* settings : mgr.GetColorSettingsList() )
{ {
int pos = m_cbTheme->Append( settings->GetName(), static_cast<void*>( settings ) ); int pos = m_cbTheme->Append( settings->GetName(), static_cast<void*>( settings ) );
@ -95,17 +94,19 @@ PANEL_EESCHEMA_COLOR_SETTINGS::PANEL_EESCHEMA_COLOR_SETTINGS( EDA_DRAW_FRAME* aF
auto type = static_cast<EDA_DRAW_PANEL_GAL::GAL_TYPE>( app_settings->m_Graphics.canvas_type ); auto type = static_cast<EDA_DRAW_PANEL_GAL::GAL_TYPE>( app_settings->m_Graphics.canvas_type );
m_preview = new SCH_PREVIEW_PANEL( this, wxID_ANY, wxDefaultPosition, wxSize( -1, -1 ), m_preview = new SCH_PREVIEW_PANEL( this, wxID_ANY, wxDefaultPosition, wxSize( -1, -1 ),
options, type ); options, type );
m_preview->SetStealsFocus( false ); m_preview->SetStealsFocus( false );
m_preview->ShowScrollbars( wxSHOW_SB_NEVER, wxSHOW_SB_NEVER ); m_preview->ShowScrollbars( wxSHOW_SB_NEVER, wxSHOW_SB_NEVER );
createButtons(); createButtons();
Connect( FIRST_BUTTON_ID, FIRST_BUTTON_ID + ( SCH_LAYER_ID_END - SCH_LAYER_ID_START ), Connect( FIRST_BUTTON_ID, FIRST_BUTTON_ID + ( SCH_LAYER_ID_END - SCH_LAYER_ID_START ),
wxEVT_COMMAND_BUTTON_CLICKED, wxEVT_COMMAND_BUTTON_CLICKED,
wxCommandEventHandler( PANEL_EESCHEMA_COLOR_SETTINGS::SetColor ) ); wxCommandEventHandler( PANEL_EESCHEMA_COLOR_SETTINGS::SetColor ) );
m_colorsMainSizer->Add( 10, 0, 0, wxEXPAND, 5 );
m_colorsMainSizer->Add( m_preview, 1, wxALL | wxEXPAND, 5 ); m_colorsMainSizer->Add( m_preview, 1, wxALL | wxEXPAND, 5 );
m_colorsMainSizer->Add( 10, 0, 0, wxEXPAND, 5 );
createPreviewItems(); createPreviewItems();
updatePreview(); updatePreview();
@ -118,7 +119,7 @@ PANEL_EESCHEMA_COLOR_SETTINGS::~PANEL_EESCHEMA_COLOR_SETTINGS()
delete m_page; delete m_page;
delete m_titleBlock; delete m_titleBlock;
for( auto item : m_previewItems ) for( EDA_ITEM* item : m_previewItems )
delete item; delete item;
} }
@ -138,16 +139,16 @@ bool PANEL_EESCHEMA_COLOR_SETTINGS::TransferDataToWindow()
bool PANEL_EESCHEMA_COLOR_SETTINGS::saveCurrentTheme() bool PANEL_EESCHEMA_COLOR_SETTINGS::saveCurrentTheme()
{ {
SETTINGS_MANAGER& settingsMgr = Pgm().GetSettingsManager();
COLOR4D bgcolor = m_currentSettings->GetColor( LAYER_SCHEMATIC_BACKGROUND ); COLOR4D bgcolor = m_currentSettings->GetColor( LAYER_SCHEMATIC_BACKGROUND );
for( SCH_LAYER_ID clyr = SCH_LAYER_ID_START; clyr < SCH_LAYER_ID_END; ++clyr ) for( SCH_LAYER_ID clyr = SCH_LAYER_ID_START; clyr < SCH_LAYER_ID_END; ++clyr )
{ {
if( bgcolor == m_currentSettings->GetColor( clyr ) && clyr != LAYER_SCHEMATIC_BACKGROUND ) if( bgcolor == m_currentSettings->GetColor( clyr ) && clyr != LAYER_SCHEMATIC_BACKGROUND )
{ {
wxString msg = wxString msg = _( "Some items have the same color as the background\n"
_( "Some items have the same color as the background\n" "and they will not be seen on the screen. Are you\n"
"and they will not be seen on the screen. Are you\n" "sure you want to use these colors?" );
"sure you want to use these colors?" );
if( wxMessageBox( msg, _( "Warning" ), wxYES_NO | wxICON_QUESTION, this ) == wxNO ) if( wxMessageBox( msg, _( "Warning" ), wxYES_NO | wxICON_QUESTION, this ) == wxNO )
return false; return false;
@ -169,15 +170,14 @@ bool PANEL_EESCHEMA_COLOR_SETTINGS::saveCurrentTheme()
if( !validateFilename() ) if( !validateFilename() )
return false; return false;
selected = Pgm().GetSettingsManager().AddNewColorSettings( selected = settingsMgr.AddNewColorSettings( m_txtFilename->GetValue().ToStdString() );
m_txtFilename->GetValue().ToStdString() );
selected->SetName( m_txtThemeName->GetValue() ); selected->SetName( m_txtThemeName->GetValue() );
Pgm().GetSettingsManager().Save( selected ); settingsMgr.Save( selected );
dirty = true; dirty = true;
m_cbTheme->SetSelection( m_cbTheme->SetSelection( m_cbTheme->Append( m_txtThemeName->GetValue(),
m_cbTheme->Append( m_txtThemeName->GetValue(), static_cast<void*>( selected ) ) ); static_cast<void*>( selected ) ) );
} }
for( SCH_LAYER_ID clyr = SCH_LAYER_ID_START; clyr < SCH_LAYER_ID_END; ++clyr ) for( SCH_LAYER_ID clyr = SCH_LAYER_ID_START; clyr < SCH_LAYER_ID_END; ++clyr )
@ -194,16 +194,16 @@ bool PANEL_EESCHEMA_COLOR_SETTINGS::saveCurrentTheme()
selected->SetColor( clyr, color ); selected->SetColor( clyr, color );
} }
auto settings = m_frame->GetCanvas()->GetView()->GetPainter()->GetSettings(); KIGFX::RENDER_SETTINGS* settings = m_frame->GetCanvas()->GetView()->GetPainter()->GetSettings();
settings->LoadColors( selected ); settings->LoadColors( selected );
if( dirty ) if( dirty )
{ {
Pgm().GetSettingsManager().SaveColorSettings( selected, "schematic" ); settingsMgr.SaveColorSettings( selected, "schematic" );
m_dirty = false; m_dirty = false;
} }
auto app_settings = Pgm().GetSettingsManager().GetAppSettings<EESCHEMA_SETTINGS>(); EESCHEMA_SETTINGS* app_settings = settingsMgr.GetAppSettings<EESCHEMA_SETTINGS>();
app_settings->m_ColorTheme = selected->GetFilename(); app_settings->m_ColorTheme = selected->GetFilename();
@ -221,9 +221,11 @@ void PANEL_EESCHEMA_COLOR_SETTINGS::createButtons()
for( SCH_LAYER_ID i = SCH_LAYER_ID_START; i < SCH_LAYER_ID_END; ++i ) for( SCH_LAYER_ID i = SCH_LAYER_ID_START; i < SCH_LAYER_ID_END; ++i )
layers.push_back( i ); layers.push_back( i );
std::sort( layers.begin(), layers.end(), []( SCH_LAYER_ID a, SCH_LAYER_ID b ) { std::sort( layers.begin(), layers.end(),
return LayerName( a ) < LayerName( b ); []( SCH_LAYER_ID a, SCH_LAYER_ID b )
} ); {
return LayerName( a ) < LayerName( b );
} );
for( SCH_LAYER_ID layer : layers ) for( SCH_LAYER_ID layer : layers )
{ {
@ -231,12 +233,12 @@ void PANEL_EESCHEMA_COLOR_SETTINGS::createButtons()
if( layer == LAYER_SHEET_BACKGROUND ) if( layer == LAYER_SHEET_BACKGROUND )
continue; continue;
wxString name = LayerName( layer ); wxString name = LayerName( layer );
auto label = new wxStaticText( m_colorsListWindow, wxID_ANY, name ); wxStaticText* label = new wxStaticText( m_colorsListWindow, wxID_ANY, name );
COLOR4D color = m_currentSettings->GetColor( layer ); COLOR4D color = m_currentSettings->GetColor( layer );
wxMemoryDC iconDC; wxMemoryDC iconDC;
wxBitmap bitmap( m_buttonSizePx ); wxBitmap bitmap( m_buttonSizePx );
iconDC.SelectObject( bitmap ); iconDC.SelectObject( bitmap );
iconDC.SetPen( *wxBLACK_PEN ); iconDC.SetPen( *wxBLACK_PEN );
@ -253,14 +255,16 @@ void PANEL_EESCHEMA_COLOR_SETTINGS::createButtons()
m_buttonSizePx + border + wxSize( 1, 1 ) ); m_buttonSizePx + border + wxSize( 1, 1 ) );
button->SetToolTip( _( "Edit color (right click for options)" ) ); button->SetToolTip( _( "Edit color (right click for options)" ) );
m_colorsGridSizer->Add( label, 1, flags, 5 ); m_colorsGridSizer->Add( label, 0, flags, 5 );
m_colorsGridSizer->Add( button, 1, flags, 5 ); m_colorsGridSizer->Add( button, 0, flags, 5 );
m_buttons[layer] = button; m_buttons[layer] = button;
button->Bind( wxEVT_RIGHT_DOWN, [&, layer]( wxMouseEvent& aEvent ) { button->Bind( wxEVT_RIGHT_DOWN,
ShowColorContextMenu( aEvent, layer ); [&, layer]( wxMouseEvent& aEvent )
} ); {
ShowColorContextMenu( aEvent, layer );
} );
} }
} }
@ -286,7 +290,7 @@ void PANEL_EESCHEMA_COLOR_SETTINGS::drawButton( wxBitmapButton* aButton, const C
void PANEL_EESCHEMA_COLOR_SETTINGS::createPreviewItems() void PANEL_EESCHEMA_COLOR_SETTINGS::createPreviewItems()
{ {
auto view = m_preview->GetView(); KIGFX::VIEW* view = m_preview->GetView();
m_page = new PAGE_INFO( PAGE_INFO::Custom ); m_page = new PAGE_INFO( PAGE_INFO::Custom );
m_titleBlock = new TITLE_BLOCK; m_titleBlock = new TITLE_BLOCK;
@ -301,10 +305,11 @@ void PANEL_EESCHEMA_COLOR_SETTINGS::createPreviewItems()
// NOTE: It would be nice to parse a schematic file here. // NOTE: It would be nice to parse a schematic file here.
// This is created from the color_settings.sch file in demos folder // This is created from the color_settings.sch file in demos folder
auto addItem = [&]( EDA_ITEM* aItem ) { auto addItem = [&]( EDA_ITEM* aItem )
view->Add( aItem ); {
m_previewItems.push_back( aItem ); view->Add( aItem );
}; m_previewItems.push_back( aItem );
};
std::vector<std::pair<SCH_LAYER_ID, std::pair<wxPoint, wxPoint>>> lines = { std::vector<std::pair<SCH_LAYER_ID, std::pair<wxPoint, wxPoint>>> lines = {
{ LAYER_WIRE, { { 1950, 1500 }, { 2325, 1500 } } }, { LAYER_WIRE, { { 1950, 1500 }, { 2325, 1500 } } },
@ -325,7 +330,7 @@ void PANEL_EESCHEMA_COLOR_SETTINGS::createPreviewItems()
for( const auto& line : lines ) for( const auto& line : lines )
{ {
auto wire = new SCH_LINE; SCH_LINE* wire = new SCH_LINE;
wire->SetLayer( line.first ); wire->SetLayer( line.first );
wire->SetStartPoint( wire->SetStartPoint(
wxPoint( Mils2iu( line.second.first.x ), Mils2iu( line.second.first.y ) ) ); wxPoint( Mils2iu( line.second.first.x ), Mils2iu( line.second.first.y ) ) );

2
eeschema/sch_preview_panel.cpp
View File

@ -68,7 +68,7 @@ SCH_PREVIEW_PANEL::SCH_PREVIEW_PANEL( wxWindow* aParentWindow, wxWindowID aWindo
m_viewControls = new KIGFX::WX_VIEW_CONTROLS( m_view, this ); m_viewControls = new KIGFX::WX_VIEW_CONTROLS( m_view, this );
m_gal->SetGridColor( GetLayerColor( LAYER_SCHEMATIC_GRID ) ); m_gal->SetGridColor( GetLayerColor( LAYER_SCHEMATIC_GRID ) );
m_gal->SetCursorColor( GetLayerColor( LAYER_SCHEMATIC_CURSOR ) ); m_gal->SetCursorEnabled( false );
m_gal->SetGridSize( VECTOR2D( Mils2iu( 50.0 ), Mils2iu( 50.0 ) ) ); m_gal->SetGridSize( VECTOR2D( Mils2iu( 50.0 ), Mils2iu( 50.0 ) ) );
m_viewControls->SetSnapping( true ); m_viewControls->SetSnapping( true );