From 5489daf279040fca4b1a9670ffd00b4e3f048430 Mon Sep 17 00:00:00 2001 From: Jeff Young Date: Sat, 6 Sep 2025 19:06:36 +0100 Subject: [PATCH] ADDED: collapse/expand for view controls in SYMBOL_FIELDS_TABLE... ... and LIB_FIELDS_TABLE. --- eeschema/dialogs/dialog_lib_fields_table.cpp | 39 +- eeschema/dialogs/dialog_lib_fields_table.h | 1 + .../dialogs/dialog_lib_fields_table_base.cpp | 49 +- .../dialogs/dialog_lib_fields_table_base.fbp | 165 +- .../dialogs/dialog_lib_fields_table_base.h | 2 + .../dialogs/dialog_symbol_fields_table.cpp | 64 +- eeschema/dialogs/dialog_symbol_fields_table.h | 2 + .../dialog_symbol_fields_table_base.cpp | 96 +- .../dialog_symbol_fields_table_base.fbp | 4231 +++++++++-------- .../dialogs/dialog_symbol_fields_table_base.h | 13 +- eeschema/eeschema_settings.cpp | 3 + eeschema/eeschema_settings.h | 1 + .../symbol_editor/symbol_editor_settings.cpp | 2 + .../symbol_editor/symbol_editor_settings.h | 1 + 14 files changed, 2443 insertions(+), 2226 deletions(-) diff --git a/eeschema/dialogs/dialog_lib_fields_table.cpp b/eeschema/dialogs/dialog_lib_fields_table.cpp index 924f35ccda..d3373de7a6 100644 --- a/eeschema/dialogs/dialog_lib_fields_table.cpp +++ b/eeschema/dialogs/dialog_lib_fields_table.cpp @@ -260,6 +260,8 @@ DIALOG_LIB_FIELDS_TABLE::DIALOG_LIB_FIELDS_TABLE( SYMBOL_EDIT_FRAME* parent, DIA m_removeFieldButton->SetBitmap( KiBitmapBundle( BITMAPS::small_trash ) ); m_renameFieldButton->SetBitmap( KiBitmapBundle( BITMAPS::small_edit ) ); + m_sidebarButton->SetBitmap( KiBitmapBundle( BITMAPS::left ) ); + m_viewControlsDataModel = new VIEW_CONTROLS_GRID_DATA_MODEL( false ); m_viewControlsGrid->UseNativeColHeader( true ); @@ -319,7 +321,15 @@ DIALOG_LIB_FIELDS_TABLE::DIALOG_LIB_FIELDS_TABLE( SYMBOL_EDIT_FRAME* parent, DIA CallAfter( [this, cfg]() { - m_splitterMainWindow->SetSashPosition( cfg.sash_pos ); + if( cfg.sidebar_collapsed ) + { + m_splitterMainWindow->Unsplit( m_leftPanel ); + m_sidebarButton->SetBitmap( KiBitmapBundle( BITMAPS::right ) ); + } + else + { + m_splitterMainWindow->SetSashPosition( cfg.sash_pos ); + } } ); Center(); @@ -337,7 +347,11 @@ DIALOG_LIB_FIELDS_TABLE::~DIALOG_LIB_FIELDS_TABLE() SYMBOL_EDITOR_SETTINGS::PANEL_LIB_FIELDS_TABLE& cfg = m_parent->libeditconfig()->m_LibFieldEditor; cfg.view_controls_visible_columns = m_viewControlsGrid->GetShownColumnsAsString(); - cfg.sash_pos = m_splitterMainWindow->GetSashPosition(); + + cfg.sidebar_collapsed = ( m_splitterMainWindow->GetSashPosition() == 0 ); + + if( !cfg.sidebar_collapsed ) + cfg.sash_pos = m_splitterMainWindow->GetSashPosition(); for( int i = 0; i < m_grid->GetNumberCols(); i++ ) { @@ -902,6 +916,27 @@ void DIALOG_LIB_FIELDS_TABLE::OnSizeViewControlsGrid( wxSizeEvent& event ) } +void DIALOG_LIB_FIELDS_TABLE::OnSidebarToggle( wxCommandEvent& event ) +{ + SYMBOL_EDITOR_SETTINGS::PANEL_LIB_FIELDS_TABLE& cfg = m_parent->libeditconfig()->m_LibFieldEditor; + + if( cfg.sidebar_collapsed ) + { + cfg.sidebar_collapsed = false; + m_splitterMainWindow->SplitVertically( m_leftPanel, m_rightPanel, cfg.sash_pos ); + m_sidebarButton->SetBitmap( KiBitmapBundle( BITMAPS::left ) ); + } + else + { + cfg.sash_pos = m_splitterMainWindow->GetSashPosition(); + + cfg.sidebar_collapsed = true; + m_splitterMainWindow->Unsplit( m_leftPanel ); + m_sidebarButton->SetBitmap( KiBitmapBundle( BITMAPS::right ) ); + } +} + + void DIALOG_LIB_FIELDS_TABLE::OnApply(wxCommandEvent& event) { TransferDataFromWindow(); diff --git a/eeschema/dialogs/dialog_lib_fields_table.h b/eeschema/dialogs/dialog_lib_fields_table.h index 3d00f2abe9..981bca1b07 100644 --- a/eeschema/dialogs/dialog_lib_fields_table.h +++ b/eeschema/dialogs/dialog_lib_fields_table.h @@ -76,6 +76,7 @@ private: void OnTableItemContextMenu( wxGridEvent& event ) override; void OnTableColSize( wxGridSizeEvent& event ) override; + void OnSidebarToggle( wxCommandEvent& event ) override; void OnCancel( wxCommandEvent& event ) override; void OnOk( wxCommandEvent& event ) override; void OnApply( wxCommandEvent& event ) override; diff --git a/eeschema/dialogs/dialog_lib_fields_table_base.cpp b/eeschema/dialogs/dialog_lib_fields_table_base.cpp index e3308473cd..358696f616 100644 --- a/eeschema/dialogs/dialog_lib_fields_table_base.cpp +++ b/eeschema/dialogs/dialog_lib_fields_table_base.cpp @@ -63,7 +63,7 @@ DIALOG_LIB_FIELDS_TABLE_BASE::DIALOG_LIB_FIELDS_TABLE_BASE( wxWindow* parent, wx m_viewControlsGrid->SetDefaultCellAlignment( wxALIGN_LEFT, wxALIGN_TOP ); m_viewControlsGrid->SetMinSize( wxSize( -1,250 ) ); - bLeftSizer->Add( m_viewControlsGrid, 1, wxALL|wxEXPAND, 5 ); + bLeftSizer->Add( m_viewControlsGrid, 1, wxEXPAND|wxTOP|wxRIGHT|wxLEFT, 5 ); wxBoxSizer* bFieldsButtons; bFieldsButtons = new wxBoxSizer( wxHORIZONTAL ); @@ -81,7 +81,7 @@ DIALOG_LIB_FIELDS_TABLE_BASE::DIALOG_LIB_FIELDS_TABLE_BASE( wxWindow* parent, wx bFieldsButtons->Add( m_removeFieldButton, 0, wxBOTTOM|wxLEFT, 5 ); - bLeftSizer->Add( bFieldsButtons, 0, wxEXPAND, 5 ); + bLeftSizer->Add( bFieldsButtons, 0, wxEXPAND|wxTOP|wxBOTTOM, 2 ); m_leftPanel->SetSizer( bLeftSizer ); @@ -152,6 +152,29 @@ DIALOG_LIB_FIELDS_TABLE_BASE::DIALOG_LIB_FIELDS_TABLE_BASE( wxWindow* parent, wx bRightSizer->Add( m_grid, 1, wxBOTTOM|wxEXPAND|wxLEFT|wxRIGHT|wxTOP, 5 ); + wxBoxSizer* bButtonsSizer; + bButtonsSizer = new wxBoxSizer( wxHORIZONTAL ); + + m_sidebarButton = new STD_BITMAP_BUTTON( m_rightPanel, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, wxBU_AUTODRAW|0 ); + bButtonsSizer->Add( m_sidebarButton, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT, 5 ); + + + bButtonsSizer->Add( 0, 0, 9, wxEXPAND, 5 ); + + m_sdbSizer = new wxStdDialogButtonSizer(); + m_sdbSizerOK = new wxButton( m_rightPanel, wxID_OK ); + m_sdbSizer->AddButton( m_sdbSizerOK ); + m_sdbSizerApply = new wxButton( m_rightPanel, wxID_APPLY ); + m_sdbSizer->AddButton( m_sdbSizerApply ); + m_sdbSizerCancel = new wxButton( m_rightPanel, wxID_CANCEL ); + m_sdbSizer->AddButton( m_sdbSizerCancel ); + m_sdbSizer->Realize(); + + bButtonsSizer->Add( m_sdbSizer, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 ); + + + bRightSizer->Add( bButtonsSizer, 0, wxEXPAND, 5 ); + m_rightPanel->SetSizer( bRightSizer ); m_rightPanel->Layout(); @@ -162,26 +185,6 @@ DIALOG_LIB_FIELDS_TABLE_BASE::DIALOG_LIB_FIELDS_TABLE_BASE( wxWindow* parent, wx bMainSizer->Add( bEditSizer, 1, wxEXPAND, 5 ); - wxBoxSizer* bButtonsSizer; - bButtonsSizer = new wxBoxSizer( wxHORIZONTAL ); - - - bButtonsSizer->Add( 0, 0, 9, wxEXPAND, 5 ); - - m_sdbSizer = new wxStdDialogButtonSizer(); - m_sdbSizerOK = new wxButton( this, wxID_OK ); - m_sdbSizer->AddButton( m_sdbSizerOK ); - m_sdbSizerApply = new wxButton( this, wxID_APPLY ); - m_sdbSizer->AddButton( m_sdbSizerApply ); - m_sdbSizerCancel = new wxButton( this, wxID_CANCEL ); - m_sdbSizer->AddButton( m_sdbSizerCancel ); - m_sdbSizer->Realize(); - - bButtonsSizer->Add( m_sdbSizer, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 ); - - - bMainSizer->Add( bButtonsSizer, 0, wxEXPAND, 5 ); - this->SetSizer( bMainSizer ); this->Layout(); @@ -209,6 +212,7 @@ DIALOG_LIB_FIELDS_TABLE_BASE::DIALOG_LIB_FIELDS_TABLE_BASE( wxWindow* parent, wx m_grid->Connect( wxEVT_GRID_COL_SIZE, wxGridSizeEventHandler( DIALOG_LIB_FIELDS_TABLE_BASE::OnTableColSize ), NULL, this ); m_grid->Connect( wxEVT_GRID_EDITOR_SHOWN, wxGridEventHandler( DIALOG_LIB_FIELDS_TABLE_BASE::OnEditorShown ), NULL, this ); m_grid->Connect( wxEVT_GRID_SELECT_CELL, wxGridEventHandler( DIALOG_LIB_FIELDS_TABLE_BASE::OnTableSelectCell ), NULL, this ); + m_sidebarButton->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_LIB_FIELDS_TABLE_BASE::OnSidebarToggle ), NULL, this ); m_sdbSizerApply->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_LIB_FIELDS_TABLE_BASE::OnApply ), NULL, this ); m_sdbSizerCancel->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_LIB_FIELDS_TABLE_BASE::OnCancel ), NULL, this ); m_sdbSizerOK->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_LIB_FIELDS_TABLE_BASE::OnOk ), NULL, this ); @@ -236,6 +240,7 @@ DIALOG_LIB_FIELDS_TABLE_BASE::~DIALOG_LIB_FIELDS_TABLE_BASE() m_grid->Disconnect( wxEVT_GRID_COL_SIZE, wxGridSizeEventHandler( DIALOG_LIB_FIELDS_TABLE_BASE::OnTableColSize ), NULL, this ); m_grid->Disconnect( wxEVT_GRID_EDITOR_SHOWN, wxGridEventHandler( DIALOG_LIB_FIELDS_TABLE_BASE::OnEditorShown ), NULL, this ); m_grid->Disconnect( wxEVT_GRID_SELECT_CELL, wxGridEventHandler( DIALOG_LIB_FIELDS_TABLE_BASE::OnTableSelectCell ), NULL, this ); + m_sidebarButton->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_LIB_FIELDS_TABLE_BASE::OnSidebarToggle ), NULL, this ); m_sdbSizerApply->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_LIB_FIELDS_TABLE_BASE::OnApply ), NULL, this ); m_sdbSizerCancel->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_LIB_FIELDS_TABLE_BASE::OnCancel ), NULL, this ); m_sdbSizerOK->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_LIB_FIELDS_TABLE_BASE::OnOk ), NULL, this ); diff --git a/eeschema/dialogs/dialog_lib_fields_table_base.fbp b/eeschema/dialogs/dialog_lib_fields_table_base.fbp index 5635ae0c51..1023506b34 100644 --- a/eeschema/dialogs/dialog_lib_fields_table_base.fbp +++ b/eeschema/dialogs/dialog_lib_fields_table_base.fbp @@ -196,7 +196,7 @@ none 5 - wxALL|wxEXPAND + wxEXPAND|wxTOP|wxRIGHT|wxLEFT 1 1 @@ -286,8 +286,8 @@ - 5 - wxEXPAND + 2 + wxEXPAND|wxTOP|wxBOTTOM 0 @@ -1028,6 +1028,123 @@ OnTableSelectCell + + 5 + wxEXPAND + 0 + + + bButtonsSizer + wxHORIZONTAL + none + + 5 + wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT + 0 + + 1 + 1 + 1 + 1 + 0 + + 0 + 0 + 0 + + + + + 1 + 0 + 1 + + 1 + + 0 + 0 + + Dock + 0 + Left + 0 + 1 + + 1 + + + 0 + 0 + wxID_ANY + Remove Field... + + 0 + + 0 + + + 0 + + 1 + m_sidebarButton + 1 + + + protected + 1 + + + + Resizable + 1 + + + STD_BITMAP_BUTTON; widgets/std_bitmap_button.h; forward_declare + 0 + + + wxFILTER_NONE + wxDefaultValidator + + + + + OnSidebarToggle + + + + 5 + wxEXPAND + 9 + + 0 + protected + 0 + + + + 5 + wxALIGN_CENTER_VERTICAL|wxALL + 0 + + 1 + 1 + 0 + 0 + 0 + 1 + 0 + 0 + + m_sdbSizer + protected + OnApply + OnCancel + OnOk + + + + @@ -1035,48 +1152,6 @@ - - 5 - wxEXPAND - 0 - - - bButtonsSizer - wxHORIZONTAL - none - - 5 - wxEXPAND - 9 - - 0 - protected - 0 - - - - 5 - wxALIGN_CENTER_VERTICAL|wxALL - 0 - - 1 - 1 - 0 - 0 - 0 - 1 - 0 - 0 - - m_sdbSizer - protected - OnApply - OnCancel - OnOk - - - - diff --git a/eeschema/dialogs/dialog_lib_fields_table_base.h b/eeschema/dialogs/dialog_lib_fields_table_base.h index 3e2f5df9ee..9c1f18643d 100644 --- a/eeschema/dialogs/dialog_lib_fields_table_base.h +++ b/eeschema/dialogs/dialog_lib_fields_table_base.h @@ -56,6 +56,7 @@ class DIALOG_LIB_FIELDS_TABLE_BASE : public DIALOG_SHIM wxStaticLine* m_staticline311; STD_BITMAP_BUTTON* m_bRefresh; WX_GRID* m_grid; + STD_BITMAP_BUTTON* m_sidebarButton; wxStdDialogButtonSizer* m_sdbSizer; wxButton* m_sdbSizerOK; wxButton* m_sdbSizerApply; @@ -79,6 +80,7 @@ class DIALOG_LIB_FIELDS_TABLE_BASE : public DIALOG_SHIM virtual void OnTableColSize( wxGridSizeEvent& event ) { event.Skip(); } virtual void OnEditorShown( wxGridEvent& event ) { event.Skip(); } virtual void OnTableSelectCell( wxGridEvent& event ) { event.Skip(); } + virtual void OnSidebarToggle( wxCommandEvent& event ) { event.Skip(); } virtual void OnApply( wxCommandEvent& event ) { event.Skip(); } virtual void OnCancel( wxCommandEvent& event ) { event.Skip(); } virtual void OnOk( wxCommandEvent& event ) { event.Skip(); } diff --git a/eeschema/dialogs/dialog_symbol_fields_table.cpp b/eeschema/dialogs/dialog_symbol_fields_table.cpp index f1d59ee4a1..9a116e2455 100644 --- a/eeschema/dialogs/dialog_symbol_fields_table.cpp +++ b/eeschema/dialogs/dialog_symbol_fields_table.cpp @@ -208,6 +208,8 @@ DIALOG_SYMBOL_FIELDS_TABLE::DIALOG_SYMBOL_FIELDS_TABLE( SCH_EDIT_FRAME* parent, m_removeFieldButton->SetBitmap( KiBitmapBundle( BITMAPS::small_trash ) ); m_renameFieldButton->SetBitmap( KiBitmapBundle( BITMAPS::small_edit ) ); + m_sidebarButton->SetBitmap( KiBitmapBundle( BITMAPS::left ) ); + m_viewControlsDataModel = new VIEW_CONTROLS_GRID_DATA_MODEL( true ); m_viewControlsGrid->UseNativeColHeader( true ); @@ -345,7 +347,15 @@ DIALOG_SYMBOL_FIELDS_TABLE::DIALOG_SYMBOL_FIELDS_TABLE( SCH_EDIT_FRAME* parent, CallAfter( [this, cfg]() { - m_splitterMainWindow->SetSashPosition( cfg.sash_pos ); + if( cfg.sidebar_collapsed ) + { + m_splitterMainWindow->Unsplit( m_leftPanel ); + m_sidebarButton->SetBitmap( KiBitmapBundle( BITMAPS::right ) ); + } + else + { + m_splitterMainWindow->SetSashPosition( cfg.sash_pos ); + } } ); if( m_job ) @@ -386,7 +396,11 @@ DIALOG_SYMBOL_FIELDS_TABLE::~DIALOG_SYMBOL_FIELDS_TABLE() cfg.page = m_nbPages->GetSelection(); cfg.view_controls_visible_columns = m_viewControlsGrid->GetShownColumnsAsString(); - cfg.sash_pos = m_splitterMainWindow->GetSashPosition(); + + cfg.sidebar_collapsed = ( m_splitterMainWindow->GetSashPosition() == 0 ); + + if( !cfg.sidebar_collapsed ) + cfg.sash_pos = m_splitterMainWindow->GetSashPosition(); for( int i = 0; i < m_grid->GetNumberCols(); i++ ) { @@ -1039,7 +1053,12 @@ void DIALOG_SYMBOL_FIELDS_TABLE::ShowHideColumn( int aCol, bool aShow ) m_dataModel->SetShowColumn( aCol, aShow ); syncBomPresetSelection(); - m_grid->ForceRefresh(); + + if( m_nbPages->GetSelection() == 1 ) + PreviewRefresh(); + else + m_grid->ForceRefresh(); + OnModify(); } @@ -1063,8 +1082,12 @@ void DIALOG_SYMBOL_FIELDS_TABLE::OnViewControlsCellChanged( wxGridEvent& aEvent m_dataModel->SetColLabelValue( dataCol, label ); m_grid->SetColLabelValue( dataCol, label ); + if( m_nbPages->GetSelection() == 1 ) + PreviewRefresh(); + else + m_grid->ForceRefresh(); + syncBomPresetSelection(); - m_grid->ForceRefresh(); OnModify(); } @@ -1110,8 +1133,12 @@ void DIALOG_SYMBOL_FIELDS_TABLE::OnViewControlsCellChanged( wxGridEvent& aEvent m_dataModel->SetGroupColumn( dataCol, value ); m_dataModel->RebuildRows(); + if( m_nbPages->GetSelection() == 1 ) + PreviewRefresh(); + else + m_grid->ForceRefresh(); + syncBomPresetSelection(); - m_grid->ForceRefresh(); OnModify(); break; } @@ -1338,6 +1365,27 @@ void DIALOG_SYMBOL_FIELDS_TABLE::OnOutputFileBrowseClicked( wxCommandEvent& even } +void DIALOG_SYMBOL_FIELDS_TABLE::OnSidebarToggle( wxCommandEvent& event ) +{ + EESCHEMA_SETTINGS::PANEL_SYMBOL_FIELDS_TABLE& cfg = m_parent->eeconfig()->m_FieldEditorPanel; + + if( cfg.sidebar_collapsed ) + { + cfg.sidebar_collapsed = false; + m_splitterMainWindow->SplitVertically( m_leftPanel, m_rightPanel, cfg.sash_pos ); + m_sidebarButton->SetBitmap( KiBitmapBundle( BITMAPS::left ) ); + } + else + { + cfg.sash_pos = m_splitterMainWindow->GetSashPosition(); + + cfg.sidebar_collapsed = true; + m_splitterMainWindow->Unsplit( m_leftPanel ); + m_sidebarButton->SetBitmap( KiBitmapBundle( BITMAPS::right ) ); + } +} + + void DIALOG_SYMBOL_FIELDS_TABLE::OnExport( wxCommandEvent& aEvent ) { if( m_dataModel->IsEdited() ) @@ -1937,7 +1985,11 @@ void DIALOG_SYMBOL_FIELDS_TABLE::doApplyBomPreset( const BOM_PRESET& aPreset ) // and labels are right, then we refresh the shown grid data to match m_dataModel->EnableRebuilds(); m_dataModel->RebuildRows(); - m_grid->ForceRefresh(); + + if( m_nbPages->GetSelection() == 1 ) + PreviewRefresh(); + else + m_grid->ForceRefresh(); } diff --git a/eeschema/dialogs/dialog_symbol_fields_table.h b/eeschema/dialogs/dialog_symbol_fields_table.h index 22a12fdce6..72f31a4f1c 100644 --- a/eeschema/dialogs/dialog_symbol_fields_table.h +++ b/eeschema/dialogs/dialog_symbol_fields_table.h @@ -82,6 +82,8 @@ private: void OnTableValueChanged( wxGridEvent& event ) override; void OnTableCellClick( wxGridEvent& event ) override; void OnTableColSize( wxGridSizeEvent& event ) override; + + void OnSidebarToggle( wxCommandEvent& event ) override; void OnExport( wxCommandEvent& aEvent ) override; void OnSaveAndContinue( wxCommandEvent& aEvent ) override; void OnCancel( wxCommandEvent& aEvent ) override; diff --git a/eeschema/dialogs/dialog_symbol_fields_table_base.cpp b/eeschema/dialogs/dialog_symbol_fields_table_base.cpp index c400f04e8c..e97c1f58ea 100644 --- a/eeschema/dialogs/dialog_symbol_fields_table_base.cpp +++ b/eeschema/dialogs/dialog_symbol_fields_table_base.cpp @@ -19,18 +19,16 @@ DIALOG_SYMBOL_FIELDS_TABLE_BASE::DIALOG_SYMBOL_FIELDS_TABLE_BASE( wxWindow* pare wxBoxSizer* bMainSizer; bMainSizer = new wxBoxSizer( wxVERTICAL ); - m_nbPages = new wxNotebook( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, 0 ); - m_panelEdit = new wxPanel( m_nbPages, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL ); - wxBoxSizer* bEditSizer; - bEditSizer = new wxBoxSizer( wxVERTICAL ); - - m_splitterMainWindow = new wxSplitterWindow( m_panelEdit, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxSP_3DSASH|wxSP_LIVE_UPDATE|wxSP_NO_XP_THEME ); + m_splitterMainWindow = new wxSplitterWindow( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxSP_3DSASH|wxSP_LIVE_UPDATE|wxSP_NO_XP_THEME ); m_splitterMainWindow->SetMinimumPaneSize( 120 ); m_leftPanel = new wxPanel( m_splitterMainWindow, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL ); wxBoxSizer* bLeftSizer; bLeftSizer = new wxBoxSizer( wxVERTICAL ); + wxBoxSizer* bMargins; + bMargins = new wxBoxSizer( wxVERTICAL ); + m_viewControlsGrid = new WX_GRID( m_leftPanel, wxID_ANY, wxDefaultPosition, wxDefaultSize, 0 ); // Grid @@ -65,7 +63,7 @@ DIALOG_SYMBOL_FIELDS_TABLE_BASE::DIALOG_SYMBOL_FIELDS_TABLE_BASE( wxWindow* pare m_viewControlsGrid->SetDefaultCellAlignment( wxALIGN_LEFT, wxALIGN_TOP ); m_viewControlsGrid->SetMinSize( wxSize( -1,250 ) ); - bLeftSizer->Add( m_viewControlsGrid, 1, wxALL|wxEXPAND, 5 ); + bMargins->Add( m_viewControlsGrid, 1, wxEXPAND|wxTOP|wxLEFT, 5 ); wxBoxSizer* bFieldsButtons; bFieldsButtons = new wxBoxSizer( wxHORIZONTAL ); @@ -89,17 +87,17 @@ DIALOG_SYMBOL_FIELDS_TABLE_BASE::DIALOG_SYMBOL_FIELDS_TABLE_BASE( wxWindow* pare bFieldsButtons->Add( m_removeFieldButton, 0, wxBOTTOM|wxLEFT, 5 ); - bLeftSizer->Add( bFieldsButtons, 0, wxEXPAND, 5 ); + bMargins->Add( bFieldsButtons, 0, wxEXPAND|wxTOP, 5 ); wxBoxSizer* bPresets; bPresets = new wxBoxSizer( wxVERTICAL ); - m_staticline1 = new wxStaticLine( m_leftPanel, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL ); - bPresets->Add( m_staticline1, 0, wxBOTTOM|wxEXPAND|wxLEFT|wxRIGHT, 5 ); + m_staticline11 = new wxStaticLine( m_leftPanel, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL ); + bPresets->Add( m_staticline11, 0, wxEXPAND|wxBOTTOM, 5 ); m_bomPresetsLabel = new wxStaticText( m_leftPanel, wxID_ANY, _("View presets:"), wxDefaultPosition, wxDefaultSize, 0 ); m_bomPresetsLabel->Wrap( -1 ); - bPresets->Add( m_bomPresetsLabel, 0, wxRIGHT|wxLEFT, 5 ); + bPresets->Add( m_bomPresetsLabel, 0, 0, 5 ); bPresets->Add( 0, 2, 0, 0, 5 ); @@ -108,10 +106,13 @@ DIALOG_SYMBOL_FIELDS_TABLE_BASE::DIALOG_SYMBOL_FIELDS_TABLE_BASE( wxWindow* pare int m_cbBomPresetsNChoices = sizeof( m_cbBomPresetsChoices ) / sizeof( wxString ); m_cbBomPresets = new wxChoice( m_leftPanel, wxID_ANY, wxDefaultPosition, wxDefaultSize, m_cbBomPresetsNChoices, m_cbBomPresetsChoices, 0 ); m_cbBomPresets->SetSelection( 0 ); - bPresets->Add( m_cbBomPresets, 0, wxEXPAND|wxRIGHT|wxLEFT, 4 ); + bPresets->Add( m_cbBomPresets, 0, wxEXPAND|wxBOTTOM, 2 ); - bLeftSizer->Add( bPresets, 0, wxEXPAND|wxTOP|wxBOTTOM, 5 ); + bMargins->Add( bPresets, 0, wxEXPAND|wxTOP|wxBOTTOM|wxLEFT, 5 ); + + + bLeftSizer->Add( bMargins, 1, wxEXPAND|wxALL, 5 ); m_leftPanel->SetSizer( bLeftSizer ); @@ -121,10 +122,15 @@ DIALOG_SYMBOL_FIELDS_TABLE_BASE::DIALOG_SYMBOL_FIELDS_TABLE_BASE( wxWindow* pare wxBoxSizer* bRightSizer; bRightSizer = new wxBoxSizer( wxVERTICAL ); + m_nbPages = new wxNotebook( m_rightPanel, wxID_ANY, wxDefaultPosition, wxDefaultSize, 0 ); + m_panelEdit = new wxPanel( m_nbPages, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL ); + wxBoxSizer* bEditSizer; + bEditSizer = new wxBoxSizer( wxVERTICAL ); + wxBoxSizer* bControls; bControls = new wxBoxSizer( wxHORIZONTAL ); - m_filter = new wxSearchCtrl( m_rightPanel, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); + m_filter = new wxSearchCtrl( m_panelEdit, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); #ifndef __WXMAC__ m_filter->ShowSearchButton( true ); #endif @@ -134,41 +140,41 @@ DIALOG_SYMBOL_FIELDS_TABLE_BASE::DIALOG_SYMBOL_FIELDS_TABLE_BASE( wxWindow* pare bControls->Add( m_filter, 1, wxALIGN_CENTER_VERTICAL|wxRIGHT, 5 ); - m_staticline31 = new wxStaticLine( m_rightPanel, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_VERTICAL ); + m_staticline31 = new wxStaticLine( m_panelEdit, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_VERTICAL ); bControls->Add( m_staticline31, 0, wxEXPAND | wxALL, 3 ); wxString m_scopeChoices[] = { _("Entire Project"), _("Current Sheet Only"), _("Current Sheet and Down") }; int m_scopeNChoices = sizeof( m_scopeChoices ) / sizeof( wxString ); - m_scope = new wxChoice( m_rightPanel, wxID_ANY, wxDefaultPosition, wxDefaultSize, m_scopeNChoices, m_scopeChoices, 0 ); + m_scope = new wxChoice( m_panelEdit, wxID_ANY, wxDefaultPosition, wxDefaultSize, m_scopeNChoices, m_scopeChoices, 0 ); m_scope->SetSelection( 0 ); bControls->Add( m_scope, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 ); - m_staticline311 = new wxStaticLine( m_rightPanel, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_VERTICAL ); + m_staticline311 = new wxStaticLine( m_panelEdit, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_VERTICAL ); bControls->Add( m_staticline311, 0, wxEXPAND | wxALL, 5 ); - m_groupSymbolsBox = new wxCheckBox( m_rightPanel, wxID_ANY, _("Group symbols"), wxDefaultPosition, wxDefaultSize, 0 ); + m_groupSymbolsBox = new wxCheckBox( m_panelEdit, wxID_ANY, _("Group symbols"), wxDefaultPosition, wxDefaultSize, 0 ); m_groupSymbolsBox->SetValue(true); m_groupSymbolsBox->SetToolTip( _("Group symbols together based on common properties") ); bControls->Add( m_groupSymbolsBox, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT, 8 ); - m_staticline3 = new wxStaticLine( m_rightPanel, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_VERTICAL ); + m_staticline3 = new wxStaticLine( m_panelEdit, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_VERTICAL ); bControls->Add( m_staticline3, 0, wxEXPAND|wxTOP|wxBOTTOM|wxRIGHT, 3 ); - m_bRefresh = new STD_BITMAP_BUTTON( m_rightPanel, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, wxBU_AUTODRAW|0 ); + m_bRefresh = new STD_BITMAP_BUTTON( m_panelEdit, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, wxBU_AUTODRAW|0 ); m_bRefresh->SetMinSize( wxSize( 30,30 ) ); bControls->Add( m_bRefresh, 0, wxALIGN_CENTER_VERTICAL|wxLEFT|wxRIGHT, 5 ); - m_bMenu = new STD_BITMAP_BUTTON( m_rightPanel, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, wxBU_AUTODRAW|0 ); + m_bMenu = new STD_BITMAP_BUTTON( m_panelEdit, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, wxBU_AUTODRAW|0 ); m_bMenu->SetMinSize( wxSize( 30,30 ) ); - bControls->Add( m_bMenu, 0, wxTOP|wxBOTTOM|wxRIGHT, 5 ); + bControls->Add( m_bMenu, 0, wxRIGHT, 5 ); - bRightSizer->Add( bControls, 0, wxEXPAND|wxLEFT|wxTOP, 5 ); + bEditSizer->Add( bControls, 0, wxEXPAND|wxLEFT|wxTOP, 5 ); - m_grid = new WX_GRID( m_rightPanel, wxID_ANY, wxDefaultPosition, wxDefaultSize, 0 ); + m_grid = new WX_GRID( m_panelEdit, wxID_ANY, wxDefaultPosition, wxDefaultSize, 0 ); // Grid m_grid->CreateGrid( 5, 5 ); @@ -194,17 +200,7 @@ DIALOG_SYMBOL_FIELDS_TABLE_BASE::DIALOG_SYMBOL_FIELDS_TABLE_BASE( wxWindow* pare m_grid->SetDefaultCellAlignment( wxALIGN_LEFT, wxALIGN_CENTER ); m_grid->SetMinSize( wxSize( 400,200 ) ); - bRightSizer->Add( m_grid, 1, wxEXPAND|wxLEFT|wxRIGHT|wxTOP, 5 ); - - m_staticline7 = new wxStaticLine( m_rightPanel, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL ); - bRightSizer->Add( m_staticline7, 0, wxEXPAND|wxRIGHT|wxLEFT, 5 ); - - - m_rightPanel->SetSizer( bRightSizer ); - m_rightPanel->Layout(); - bRightSizer->Fit( m_rightPanel ); - m_splitterMainWindow->SplitVertically( m_leftPanel, m_rightPanel, -1 ); - bEditSizer->Add( m_splitterMainWindow, 1, wxEXPAND|wxTOP|wxBOTTOM, 5 ); + bEditSizer->Add( m_grid, 1, wxEXPAND|wxLEFT|wxRIGHT|wxTOP, 5 ); m_panelEdit->SetSizer( bEditSizer ); @@ -331,31 +327,43 @@ DIALOG_SYMBOL_FIELDS_TABLE_BASE::DIALOG_SYMBOL_FIELDS_TABLE_BASE( wxWindow* pare gbExport->Fit( m_panelExport ); m_nbPages->AddPage( m_panelExport, _("Export"), false ); - bMainSizer->Add( m_nbPages, 1, wxEXPAND | wxALL, 5 ); + bRightSizer->Add( m_nbPages, 1, wxEXPAND|wxALL, 5 ); wxBoxSizer* bButtonsSizer; bButtonsSizer = new wxBoxSizer( wxHORIZONTAL ); + m_sidebarButton = new STD_BITMAP_BUTTON( m_rightPanel, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, wxBU_AUTODRAW|0 ); + m_sidebarButton->SetToolTip( _("Add a new field") ); + + bButtonsSizer->Add( m_sidebarButton, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT, 5 ); + bButtonsSizer->Add( 0, 0, 9, wxEXPAND, 5 ); - m_buttonExport = new wxButton( this, wxID_ANY, _("Export"), wxDefaultPosition, wxDefaultSize, 0 ); + m_buttonExport = new wxButton( m_rightPanel, wxID_ANY, _("Export"), wxDefaultPosition, wxDefaultSize, 0 ); bButtonsSizer->Add( m_buttonExport, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT, 10 ); - m_buttonApply = new wxButton( this, wxID_ANY, _("Apply, Save Schematic && Continue"), wxDefaultPosition, wxDefaultSize, 0 ); + m_buttonApply = new wxButton( m_rightPanel, wxID_ANY, _("Apply, Save Schematic && Continue"), wxDefaultPosition, wxDefaultSize, 0 ); bButtonsSizer->Add( m_buttonApply, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT, 10 ); m_sdbSizer = new wxStdDialogButtonSizer(); - m_sdbSizerOK = new wxButton( this, wxID_OK ); + m_sdbSizerOK = new wxButton( m_rightPanel, wxID_OK ); m_sdbSizer->AddButton( m_sdbSizerOK ); - m_sdbSizerCancel = new wxButton( this, wxID_CANCEL ); + m_sdbSizerCancel = new wxButton( m_rightPanel, wxID_CANCEL ); m_sdbSizer->AddButton( m_sdbSizerCancel ); m_sdbSizer->Realize(); bButtonsSizer->Add( m_sdbSizer, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 ); - bMainSizer->Add( bButtonsSizer, 0, wxEXPAND, 5 ); + bRightSizer->Add( bButtonsSizer, 0, wxEXPAND, 5 ); + + + m_rightPanel->SetSizer( bRightSizer ); + m_rightPanel->Layout(); + bRightSizer->Fit( m_rightPanel ); + m_splitterMainWindow->SplitVertically( m_leftPanel, m_rightPanel, -1 ); + bMainSizer->Add( m_splitterMainWindow, 1, wxEXPAND, 5 ); this->SetSizer( bMainSizer ); @@ -366,12 +374,12 @@ DIALOG_SYMBOL_FIELDS_TABLE_BASE::DIALOG_SYMBOL_FIELDS_TABLE_BASE( wxWindow* pare // Connect Events this->Connect( wxEVT_CLOSE_WINDOW, wxCloseEventHandler( DIALOG_SYMBOL_FIELDS_TABLE_BASE::OnClose ) ); - m_nbPages->Connect( wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGED, wxNotebookEventHandler( DIALOG_SYMBOL_FIELDS_TABLE_BASE::OnPageChanged ), NULL, this ); m_viewControlsGrid->Connect( wxEVT_GRID_CELL_CHANGED, wxGridEventHandler( DIALOG_SYMBOL_FIELDS_TABLE_BASE::OnViewControlsCellChanged ), NULL, this ); m_viewControlsGrid->Connect( wxEVT_SIZE, wxSizeEventHandler( DIALOG_SYMBOL_FIELDS_TABLE_BASE::OnSizeViewControlsGrid ), NULL, this ); m_addFieldButton->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_SYMBOL_FIELDS_TABLE_BASE::OnAddField ), NULL, this ); m_renameFieldButton->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_SYMBOL_FIELDS_TABLE_BASE::OnRenameField ), NULL, this ); m_removeFieldButton->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_SYMBOL_FIELDS_TABLE_BASE::OnRemoveField ), NULL, this ); + m_nbPages->Connect( wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGED, wxNotebookEventHandler( DIALOG_SYMBOL_FIELDS_TABLE_BASE::OnPageChanged ), NULL, this ); m_filter->Connect( wxEVT_MOTION, wxMouseEventHandler( DIALOG_SYMBOL_FIELDS_TABLE_BASE::OnFilterMouseMoved ), NULL, this ); m_filter->Connect( wxEVT_COMMAND_TEXT_UPDATED, wxCommandEventHandler( DIALOG_SYMBOL_FIELDS_TABLE_BASE::OnFilterText ), NULL, this ); m_scope->Connect( wxEVT_COMMAND_CHOICE_SELECTED, wxCommandEventHandler( DIALOG_SYMBOL_FIELDS_TABLE_BASE::OnScope ), NULL, this ); @@ -390,6 +398,7 @@ DIALOG_SYMBOL_FIELDS_TABLE_BASE::DIALOG_SYMBOL_FIELDS_TABLE_BASE( wxWindow* pare m_checkKeepLineBreaks->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( DIALOG_SYMBOL_FIELDS_TABLE_BASE::OnPreviewRefresh ), NULL, this ); m_browseButton->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_SYMBOL_FIELDS_TABLE_BASE::OnOutputFileBrowseClicked ), NULL, this ); m_bRefreshPreview->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_SYMBOL_FIELDS_TABLE_BASE::OnPreviewRefresh ), NULL, this ); + m_sidebarButton->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_SYMBOL_FIELDS_TABLE_BASE::OnSidebarToggle ), NULL, this ); m_buttonExport->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_SYMBOL_FIELDS_TABLE_BASE::OnExport ), NULL, this ); m_buttonApply->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_SYMBOL_FIELDS_TABLE_BASE::OnSaveAndContinue ), NULL, this ); m_sdbSizerCancel->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_SYMBOL_FIELDS_TABLE_BASE::OnCancel ), NULL, this ); @@ -400,12 +409,12 @@ DIALOG_SYMBOL_FIELDS_TABLE_BASE::~DIALOG_SYMBOL_FIELDS_TABLE_BASE() { // Disconnect Events this->Disconnect( wxEVT_CLOSE_WINDOW, wxCloseEventHandler( DIALOG_SYMBOL_FIELDS_TABLE_BASE::OnClose ) ); - m_nbPages->Disconnect( wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGED, wxNotebookEventHandler( DIALOG_SYMBOL_FIELDS_TABLE_BASE::OnPageChanged ), NULL, this ); m_viewControlsGrid->Disconnect( wxEVT_GRID_CELL_CHANGED, wxGridEventHandler( DIALOG_SYMBOL_FIELDS_TABLE_BASE::OnViewControlsCellChanged ), NULL, this ); m_viewControlsGrid->Disconnect( wxEVT_SIZE, wxSizeEventHandler( DIALOG_SYMBOL_FIELDS_TABLE_BASE::OnSizeViewControlsGrid ), NULL, this ); m_addFieldButton->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_SYMBOL_FIELDS_TABLE_BASE::OnAddField ), NULL, this ); m_renameFieldButton->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_SYMBOL_FIELDS_TABLE_BASE::OnRenameField ), NULL, this ); m_removeFieldButton->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_SYMBOL_FIELDS_TABLE_BASE::OnRemoveField ), NULL, this ); + m_nbPages->Disconnect( wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGED, wxNotebookEventHandler( DIALOG_SYMBOL_FIELDS_TABLE_BASE::OnPageChanged ), NULL, this ); m_filter->Disconnect( wxEVT_MOTION, wxMouseEventHandler( DIALOG_SYMBOL_FIELDS_TABLE_BASE::OnFilterMouseMoved ), NULL, this ); m_filter->Disconnect( wxEVT_COMMAND_TEXT_UPDATED, wxCommandEventHandler( DIALOG_SYMBOL_FIELDS_TABLE_BASE::OnFilterText ), NULL, this ); m_scope->Disconnect( wxEVT_COMMAND_CHOICE_SELECTED, wxCommandEventHandler( DIALOG_SYMBOL_FIELDS_TABLE_BASE::OnScope ), NULL, this ); @@ -424,6 +433,7 @@ DIALOG_SYMBOL_FIELDS_TABLE_BASE::~DIALOG_SYMBOL_FIELDS_TABLE_BASE() m_checkKeepLineBreaks->Disconnect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( DIALOG_SYMBOL_FIELDS_TABLE_BASE::OnPreviewRefresh ), NULL, this ); m_browseButton->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_SYMBOL_FIELDS_TABLE_BASE::OnOutputFileBrowseClicked ), NULL, this ); m_bRefreshPreview->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_SYMBOL_FIELDS_TABLE_BASE::OnPreviewRefresh ), NULL, this ); + m_sidebarButton->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_SYMBOL_FIELDS_TABLE_BASE::OnSidebarToggle ), NULL, this ); m_buttonExport->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_SYMBOL_FIELDS_TABLE_BASE::OnExport ), NULL, this ); m_buttonApply->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_SYMBOL_FIELDS_TABLE_BASE::OnSaveAndContinue ), NULL, this ); m_sdbSizerCancel->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_SYMBOL_FIELDS_TABLE_BASE::OnCancel ), NULL, this ); diff --git a/eeschema/dialogs/dialog_symbol_fields_table_base.fbp b/eeschema/dialogs/dialog_symbol_fields_table_base.fbp index 53d736394b..80cb1a5ea0 100644 --- a/eeschema/dialogs/dialog_symbol_fields_table_base.fbp +++ b/eeschema/dialogs/dialog_symbol_fields_table_base.fbp @@ -67,9 +67,9 @@ none 5 - wxEXPAND | wxALL + wxEXPAND 1 - + 1 1 1 @@ -80,7 +80,6 @@ 0 - 1 0 @@ -102,11 +101,12 @@ 0 + 120 0 - + -1,-1 1 - m_nbPages + m_splitterMainWindow 1 @@ -114,20 +114,20 @@ 1 Resizable + 0.0 + -1 + -1 1 - - ; ; forward_declare + wxSPLIT_VERTICAL + wxSP_3DSASH|wxSP_LIVE_UPDATE|wxSP_NO_XP_THEME + 0 - OnPageChanged - - - Edit - 1 + 1 1 @@ -164,7 +164,7 @@ 0 1 - m_panelEdit + m_leftPanel 1 @@ -174,7 +174,7 @@ Resizable 1 - ; ; forward_declare + 0 @@ -182,14 +182,630 @@ wxTAB_TRAVERSAL - bEditSizer + bLeftSizer wxVERTICAL none 5 - wxEXPAND|wxTOP|wxBOTTOM + wxEXPAND|wxALL 1 - + + + bMargins + wxVERTICAL + none + + 5 + wxEXPAND|wxTOP|wxLEFT + 1 + + 1 + 1 + 1 + 1 + 0 + + 0 + 0 + 0 + 0 + + + + 1 + + + wxALIGN_LEFT + + wxALIGN_TOP + 0 + 1 + wxALIGN_CENTER + 24 + "Field" "BOM Name" "Include" "Group By" + wxALIGN_CENTER + 4 + 60,60,46,56 + + 1 + 0 + Dock + 0 + Left + 0 + 0 + 0 + 0 + 0 + 1 + 1 + + 1 + + + 0 + 0 + 0 + wxID_ANY + + + + 0 + 0 + + 0 + + + 0 + -1,250 + 1 + m_viewControlsGrid + 1 + + + protected + 1 + + Resizable + wxALIGN_CENTER + 0 + + wxALIGN_CENTER + + 1 + 1 + + WX_GRID; widgets/wx_grid.h; forward_declare + 0 + + + + + OnViewControlsCellChanged + OnSizeViewControlsGrid + + + + 5 + wxEXPAND|wxTOP + 0 + + + bFieldsButtons + wxHORIZONTAL + none + + 5 + wxBOTTOM|wxLEFT + 0 + + 1 + 1 + 1 + 1 + 0 + + 0 + 0 + 0 + + + + + 1 + 0 + 1 + + 1 + + 0 + 0 + + Dock + 0 + Left + 0 + 1 + + 1 + + + 0 + 0 + wxID_ANY + Add Field... + + 0 + + 0 + + + 0 + + 1 + m_addFieldButton + 1 + + + protected + 1 + + + + Resizable + 1 + + + STD_BITMAP_BUTTON; widgets/std_bitmap_button.h; forward_declare + 0 + Add a new field + + wxFILTER_NONE + wxDefaultValidator + + + + + OnAddField + + + + 5 + wxBOTTOM|wxLEFT + 0 + + 1 + 1 + 1 + 1 + 0 + + 0 + 0 + 0 + + + + + 1 + 0 + 1 + + 1 + + 0 + 0 + + Dock + 0 + Left + 0 + 1 + + 1 + + + 0 + 0 + wxID_ANY + Rename Field... + + 0 + + 0 + + + 0 + + 1 + m_renameFieldButton + 1 + + + protected + 1 + + + + Resizable + 1 + + + STD_BITMAP_BUTTON; widgets/std_bitmap_button.h; forward_declare + 0 + Rename selected field + + wxFILTER_NONE + wxDefaultValidator + + + + + OnRenameField + + + + 5 + wxEXPAND + 0 + + 0 + protected + 15 + + + + 5 + wxBOTTOM|wxLEFT + 0 + + 1 + 1 + 1 + 1 + 0 + + 0 + 0 + 0 + + + + + 1 + 0 + 1 + + 1 + + 0 + 0 + + Dock + 0 + Left + 0 + 1 + + 1 + + + 0 + 0 + wxID_ANY + Remove Field... + + 0 + + 0 + + + 0 + + 1 + m_removeFieldButton + 1 + + + protected + 1 + + + + Resizable + 1 + + + STD_BITMAP_BUTTON; widgets/std_bitmap_button.h; forward_declare + 0 + Remove selected field + + wxFILTER_NONE + wxDefaultValidator + + + + + OnRemoveField + + + + + + 5 + wxEXPAND|wxTOP|wxBOTTOM|wxLEFT + 0 + + + bPresets + wxVERTICAL + none + + 5 + wxEXPAND|wxBOTTOM + 0 + + 1 + 1 + 1 + 1 + 0 + + 0 + 0 + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 0 + 1 + + 1 + + 0 + 0 + wxID_ANY + + 0 + + + 0 + + 1 + m_staticline11 + 1 + + + protected + 1 + + Resizable + 1 + + wxLI_HORIZONTAL + ; ; forward_declare + 0 + + + + + + + + 5 + + 0 + + 1 + 1 + 1 + 1 + 0 + + 0 + 0 + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 0 + 1 + + 1 + + 0 + 0 + wxID_ANY + View presets: + 0 + + 0 + + + 0 + + 1 + m_bomPresetsLabel + 1 + + + protected + 1 + + Resizable + 1 + + + ; ; forward_declare + 0 + + + + + -1 + + + + 5 + + 0 + + 2 + protected + 0 + + + + 2 + wxEXPAND|wxBOTTOM + 0 + + 1 + 1 + 1 + 1 + 0 + + 0 + 0 + + + + 1 + 0 + "Default" "(unsaved)" + 1 + + 1 + 0 + Dock + 0 + Left + 0 + 1 + + 1 + + 0 + 0 + wxID_ANY + + 0 + + + 0 + + 1 + m_cbBomPresets + 1 + + + protected + 1 + + Resizable + 0 + 1 + + + ; ; forward_declare + 0 + + + wxFILTER_NONE + wxDefaultValidator + + + + + + + + + + + + + + + + 1 + 1 + 1 + 1 + 0 + + 0 + 0 + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 0 + 1 + + 1 + + 0 + 0 + wxID_ANY + + 0 + + + 0 + + 1 + m_rightPanel + 1 + + + protected + 1 + + Resizable + 1 + + + 0 + + + + wxTAB_TRAVERSAL + + + bRightSizer + wxVERTICAL + none + + 5 + wxEXPAND|wxALL + 1 + 1 1 1 @@ -200,6 +816,7 @@ 0 + 1 0 @@ -221,12 +838,11 @@ 0 - 120 0 - -1,-1 + 1 - m_splitterMainWindow + m_nbPages 1 @@ -234,21 +850,21 @@ 1 Resizable - 0.0 - -1 - -1 1 - wxSPLIT_VERTICAL - wxSP_3DSASH|wxSP_LIVE_UPDATE|wxSP_NO_XP_THEME - + + ; ; forward_declare 0 - - + OnPageChanged + + + Edit + 1 + 1 1 1 @@ -284,7 +900,7 @@ 0 1 - m_leftPanel + m_panelEdit 1 @@ -294,627 +910,22 @@ Resizable 1 - + ; ; forward_declare 0 wxTAB_TRAVERSAL - + - bLeftSizer + bEditSizer wxVERTICAL none - - 5 - wxALL|wxEXPAND - 1 - - 1 - 1 - 1 - 1 - 0 - - 0 - 0 - 0 - 0 - - - - 1 - - - wxALIGN_LEFT - - wxALIGN_TOP - 0 - 1 - wxALIGN_CENTER - 24 - "Field" "BOM Name" "Include" "Group By" - wxALIGN_CENTER - 4 - 60,60,46,56 - - 1 - 0 - Dock - 0 - Left - 0 - 0 - 0 - 0 - 0 - 1 - 1 - - 1 - - - 0 - 0 - 0 - wxID_ANY - - - - 0 - 0 - - 0 - - - 0 - -1,250 - 1 - m_viewControlsGrid - 1 - - - protected - 1 - - Resizable - wxALIGN_CENTER - 0 - - wxALIGN_CENTER - - 1 - 1 - - WX_GRID; widgets/wx_grid.h; forward_declare - 0 - - - - - OnViewControlsCellChanged - OnSizeViewControlsGrid - - - - 5 - wxEXPAND - 0 - - - bFieldsButtons - wxHORIZONTAL - none - - 5 - wxBOTTOM|wxLEFT - 0 - - 1 - 1 - 1 - 1 - 0 - - 0 - 0 - 0 - - - - - 1 - 0 - 1 - - 1 - - 0 - 0 - - Dock - 0 - Left - 0 - 1 - - 1 - - - 0 - 0 - wxID_ANY - Add Field... - - 0 - - 0 - - - 0 - - 1 - m_addFieldButton - 1 - - - protected - 1 - - - - Resizable - 1 - - - STD_BITMAP_BUTTON; widgets/std_bitmap_button.h; forward_declare - 0 - Add a new field - - wxFILTER_NONE - wxDefaultValidator - - - - - OnAddField - - - - 5 - wxBOTTOM|wxLEFT - 0 - - 1 - 1 - 1 - 1 - 0 - - 0 - 0 - 0 - - - - - 1 - 0 - 1 - - 1 - - 0 - 0 - - Dock - 0 - Left - 0 - 1 - - 1 - - - 0 - 0 - wxID_ANY - Rename Field... - - 0 - - 0 - - - 0 - - 1 - m_renameFieldButton - 1 - - - protected - 1 - - - - Resizable - 1 - - - STD_BITMAP_BUTTON; widgets/std_bitmap_button.h; forward_declare - 0 - Rename selected field - - wxFILTER_NONE - wxDefaultValidator - - - - - OnRenameField - - - - 5 - wxEXPAND - 0 - - 0 - protected - 15 - - - - 5 - wxBOTTOM|wxLEFT - 0 - - 1 - 1 - 1 - 1 - 0 - - 0 - 0 - 0 - - - - - 1 - 0 - 1 - - 1 - - 0 - 0 - - Dock - 0 - Left - 0 - 1 - - 1 - - - 0 - 0 - wxID_ANY - Remove Field... - - 0 - - 0 - - - 0 - - 1 - m_removeFieldButton - 1 - - - protected - 1 - - - - Resizable - 1 - - - STD_BITMAP_BUTTON; widgets/std_bitmap_button.h; forward_declare - 0 - Remove selected field - - wxFILTER_NONE - wxDefaultValidator - - - - - OnRemoveField - - - - - - 5 - wxEXPAND|wxTOP|wxBOTTOM - 0 - - - bPresets - wxVERTICAL - none - - 5 - wxBOTTOM|wxEXPAND|wxLEFT|wxRIGHT - 0 - - 1 - 1 - 1 - 1 - 0 - - 0 - 0 - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 0 - 1 - - 1 - - 0 - 0 - wxID_ANY - - 0 - - - 0 - - 1 - m_staticline1 - 1 - - - protected - 1 - - Resizable - 1 - - wxLI_HORIZONTAL - ; ; forward_declare - 0 - - - - - - - - 5 - wxRIGHT|wxLEFT - 0 - - 1 - 1 - 1 - 1 - 0 - - 0 - 0 - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 0 - 1 - - 1 - - 0 - 0 - wxID_ANY - View presets: - 0 - - 0 - - - 0 - - 1 - m_bomPresetsLabel - 1 - - - protected - 1 - - Resizable - 1 - - - ; ; forward_declare - 0 - - - - - -1 - - - - 5 - - 0 - - 2 - protected - 0 - - - - 4 - wxEXPAND|wxRIGHT|wxLEFT - 0 - - 1 - 1 - 1 - 1 - 0 - - 0 - 0 - - - - 1 - 0 - "Default" "(unsaved)" - 1 - - 1 - 0 - Dock - 0 - Left - 0 - 1 - - 1 - - 0 - 0 - wxID_ANY - - 0 - - - 0 - - 1 - m_cbBomPresets - 1 - - - protected - 1 - - Resizable - 0 - 1 - - - ; ; forward_declare - 0 - - - wxFILTER_NONE - wxDefaultValidator - - - - - - - - - - - - - - 1 - 1 - 1 - 1 - 0 - - 0 - 0 - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 0 - 1 - - 1 - - 0 - 0 - wxID_ANY - - 0 - - - 0 - - 1 - m_rightPanel - 1 - - - protected - 1 - - Resizable - 1 - - - 0 - - - - wxTAB_TRAVERSAL - - - bRightSizer - wxVERTICAL - none - + 5 wxEXPAND|wxLEFT|wxTOP 0 - + bControls wxHORIZONTAL @@ -987,11 +998,11 @@ OnFilterText - + 3 wxEXPAND | wxALL 0 - + 1 1 1 @@ -1046,11 +1057,11 @@ - + 5 wxALL|wxALIGN_CENTER_VERTICAL 0 - + 1 1 1 @@ -1112,11 +1123,11 @@ OnScope - + 5 wxEXPAND | wxALL 0 - + 1 1 1 @@ -1237,11 +1248,11 @@ OnGroupSymbolsToggled - + 3 wxEXPAND|wxTOP|wxBOTTOM|wxRIGHT 0 - + 1 1 1 @@ -1371,11 +1382,11 @@ OnRegroupSymbols - + 5 - wxTOP|wxBOTTOM|wxRIGHT + wxRIGHT 0 - + 1 1 1 @@ -1541,11 +1552,1350 @@ OnTableColSize - + + + + + + Export + 0 + + 1 + 1 + 1 + 1 + 0 + + 0 + 0 + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 0 + 1 + + 1 + + 0 + 0 + wxID_ANY + + 0 + + + 0 + + 1 + m_panelExport + 1 + + + protected + 1 + + Resizable + 1 + + ; ; forward_declare + 0 + + + + wxTAB_TRAVERSAL + + + wxBOTH + 1 + 3 + 5 + + gbExport + wxFLEX_GROWMODE_SPECIFIED + none + 0 + 5 - wxEXPAND|wxRIGHT|wxLEFT - 0 - + 1 + 0 + wxEXPAND|wxALL + 0 + 3 + + + wxBOTH + + + 5 + + gbExportOptions + wxFLEX_GROWMODE_SPECIFIED + none + 4 + + 5 + 1 + 0 + wxALIGN_CENTER_VERTICAL + 0 + 1 + + 1 + 1 + 1 + 1 + 0 + + 0 + 0 + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 0 + 1 + + 1 + + 0 + 0 + wxID_ANY + Field delimiter: + 0 + + 0 + + + 0 + + 1 + m_labelFieldDelimiter + 1 + + + protected + 1 + + Resizable + 1 + + + ; ; forward_declare + 0 + + + + + -1 + + + + 5 + 1 + 1 + wxALIGN_CENTER_VERTICAL + 0 + 1 + + 1 + 1 + 1 + 1 + 0 + + 0 + 0 + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 0 + 1 + + 1 + + 0 + 0 + wxID_ANY + + 0 + + 0 + + 0 + 60,-1 + 1 + m_textFieldDelimiter + 1 + + + protected + 1 + + Resizable + 1 + + wxTE_PROCESS_TAB + ; ; forward_declare + 0 + + + wxFILTER_NONE + wxDefaultValidator + + , + + + + OnPreviewRefresh + + + + 5 + 1 + 0 + wxALIGN_CENTER_VERTICAL + 1 + 1 + + 1 + 1 + 1 + 1 + 0 + + 0 + 0 + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 0 + 1 + + 1 + + 0 + 0 + wxID_ANY + String delimiter: + 0 + + 0 + + + 0 + + 1 + m_labelStringDelimiter + 1 + + + protected + 1 + + Resizable + 1 + + + ; ; forward_declare + 0 + + + + + -1 + + + + 5 + 1 + 1 + wxALIGN_CENTER_VERTICAL + 1 + 1 + + 1 + 1 + 1 + 1 + 0 + + 0 + 0 + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 0 + 1 + + 1 + + 0 + 0 + wxID_ANY + + 0 + + 0 + + 0 + 60,-1 + 1 + m_textStringDelimiter + 1 + + + protected + 1 + + Resizable + 1 + + wxTE_PROCESS_TAB + ; ; forward_declare + 0 + + + wxFILTER_NONE + wxDefaultValidator + + " + + + + OnPreviewRefresh + + + + 5 + 1 + 0 + wxALIGN_CENTER_VERTICAL + 2 + 1 + + 1 + 1 + 1 + 1 + 0 + + 0 + 0 + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 0 + 1 + + 1 + + 0 + 0 + wxID_ANY + Reference delimiter: + 0 + + 0 + + + 0 + + 1 + m_labelRefDelimiter + 1 + + + protected + 1 + + Resizable + 1 + + + ; ; forward_declare + 0 + + + + + -1 + + + + 5 + 1 + 1 + wxALIGN_CENTER_VERTICAL + 2 + 1 + + 1 + 1 + 1 + 1 + 0 + + 0 + 0 + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 0 + 1 + + 1 + + 0 + 0 + wxID_ANY + + 0 + + 0 + + 0 + 60,-1 + 1 + m_textRefDelimiter + 1 + + + protected + 1 + + Resizable + 1 + + wxTE_PROCESS_TAB + ; ; forward_declare + 0 + + + wxFILTER_NONE + wxDefaultValidator + + , + + + + OnPreviewRefresh + + + + 5 + 1 + 0 + wxALIGN_CENTER_VERTICAL + 3 + 1 + + 1 + 1 + 1 + 1 + 0 + + 0 + 0 + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 0 + 1 + + 1 + + 0 + 0 + wxID_ANY + Range delimiter: + 0 + + 0 + + + 0 + + 1 + m_labelRefRangeDelimiter + 1 + + + protected + 1 + + Resizable + 1 + + + ; ; forward_declare + 0 + + + + + -1 + + + + 5 + 1 + 1 + wxALIGN_CENTER_VERTICAL + 3 + 1 + + 1 + 1 + 1 + 1 + 0 + + 0 + 0 + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 0 + 1 + + 1 + + 0 + 0 + wxID_ANY + + 0 + + 0 + + 0 + 60,-1 + 1 + m_textRefRangeDelimiter + 1 + + + protected + 1 + + Resizable + 1 + + wxTE_PROCESS_TAB + ; ; forward_declare + 0 + Leave blank to disable ranges. + + wxFILTER_NONE + wxDefaultValidator + + - + + + + OnPreviewRefresh + + + + 5 + 2 + 0 + wxALIGN_CENTER_VERTICAL + 4 + 1 + + 1 + 1 + 1 + 1 + 0 + + 0 + 0 + + + + 1 + 0 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 0 + 1 + + 1 + + 0 + 0 + wxID_ANY + Keep tabs + + 0 + + + 0 + + 1 + m_checkKeepTabs + 1 + + + protected + 1 + + Resizable + 1 + + + ; ; forward_declare + 0 + + + wxFILTER_NONE + wxDefaultValidator + + + + + OnPreviewRefresh + + + + 5 + 2 + 0 + wxALIGN_CENTER_VERTICAL + 5 + 1 + + 1 + 1 + 1 + 1 + 0 + + 0 + 0 + + + + 1 + 0 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 0 + 1 + + 1 + + 0 + 0 + wxID_ANY + Keep line breaks + + 0 + + + 0 + + 1 + m_checkKeepLineBreaks + 1 + + + protected + 1 + + Resizable + 1 + + + ; ; forward_declare + 0 + + + wxFILTER_NONE + wxDefaultValidator + + + + + OnPreviewRefresh + + + + 5 + 2 + 0 + wxEXPAND|wxTOP|wxBOTTOM + 7 + 1 + + 1 + 1 + 1 + 1 + 0 + + 0 + 0 + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 0 + 1 + + 1 + + 0 + 0 + wxID_ANY + + 0 + + + 0 + + 1 + m_staticline2 + 1 + + + protected + 1 + + Resizable + 1 + + wxLI_HORIZONTAL + ; ; forward_declare + 0 + + + + + + + + 5 + 2 + 0 + + 8 + 1 + + 1 + 1 + 1 + 1 + 0 + + 0 + 0 + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 0 + 1 + + 1 + + 0 + 0 + wxID_ANY + Format presets: + 0 + + 0 + + + 0 + + 1 + m_labelBomExportPresets + 1 + + + protected + 1 + + Resizable + 1 + + + ; ; forward_declare + 0 + + + + + -1 + + + + 5 + 2 + 0 + wxEXPAND + 9 + 1 + + 1 + 1 + 1 + 1 + 0 + + 0 + 0 + + + + 1 + 0 + "Default" "(unsaved)" + 1 + + 1 + 0 + Dock + 0 + Left + 0 + 1 + + 1 + + 0 + 0 + wxID_ANY + + 0 + + + 0 + + 1 + m_cbBomFmtPresets + 1 + + + protected + 1 + + Resizable + 0 + 1 + + + ; ; forward_declare + 0 + + + wxFILTER_NONE + wxDefaultValidator + + + + + + + + + + 10 + 1 + 1 + wxEXPAND|wxBOTTOM + 0 + 1 + + + bOutputDirectory + wxHORIZONTAL + none + + 5 + wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxLEFT + 0 + + 1 + 1 + 1 + 1 + 0 + + 0 + 0 + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 0 + 1 + + 1 + + 0 + 0 + wxID_ANY + Output file: + 0 + + 0 + + + 0 + + 1 + m_labelOutputDirectory + 1 + + + protected + 1 + + Resizable + 1 + + + ; ; forward_declare + 0 + + + + + -1 + + + + 5 + wxALIGN_CENTER_VERTICAL|wxALL + 1 + + 1 + 1 + 1 + 1 + 0 + + 0 + 0 + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 0 + 1 + + 1 + + 0 + 0 + wxID_ANY + + 0 + + 0 + + 0 + + 1 + m_outputFileName + 1 + + + protected + 1 + + Resizable + 1 + + + ; ; forward_declare + 0 + + + wxFILTER_NONE + wxDefaultValidator + + + + + + + + + 5 + wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxRIGHT + 0 + + 1 + 1 + 1 + 1 + 0 + + 0 + 0 + 0 + + + + + 1 + 0 + 1 + + 1 + + 0 + 0 + + Dock + 0 + Left + 0 + 1 + + 1 + + + 0 + 0 + wxID_ANY + Refresh Grouping + + 0 + + 0 + + + 0 + 30,30 + 1 + m_browseButton + 1 + + + protected + 1 + + + + Resizable + 1 + + + STD_BITMAP_BUTTON; widgets/std_bitmap_button.h; forward_declare + 0 + + + wxFILTER_NONE + wxDefaultValidator + + + + + OnOutputFileBrowseClicked + + + + + + 3 + 1 + 1 + wxEXPAND|wxTOP|wxBOTTOM + 1 + 1 + + + bPreview + wxHORIZONTAL + none + + 5 + wxALIGN_BOTTOM|wxTOP|wxRIGHT|wxLEFT + 0 + + 1 + 1 + 1 + 1 + 0 + + 0 + 0 + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 0 + 1 + + 1 + + 0 + 0 + wxID_ANY + Preview: + 0 + + 0 + + + 0 + + 1 + m_labelPreview + 1 + + + protected + 1 + + Resizable + 1 + + + ; ; forward_declare + 0 + + + + + -1 + + + + 5 + wxEXPAND + 1 + + 0 + protected + 0 + + + + 5 + wxTOP|wxRIGHT + 0 + + 1 + 1 + 1 + 1 + 0 + + 0 + 0 + 0 + + + + + 1 + 0 + 1 + + 1 + + 0 + 0 + + Dock + 0 + Left + 0 + 1 + + 1 + + + 0 + 0 + wxID_ANY + Refresh Grouping + + 0 + + 0 + + + 0 + 30,30 + 1 + m_bRefreshPreview + 1 + + + protected + 1 + + + + Resizable + 1 + + + STD_BITMAP_BUTTON; widgets/std_bitmap_button.h; forward_declare + 0 + + + wxFILTER_NONE + wxDefaultValidator + + + + + OnPreviewRefresh + + + + + + 5 + 1 + 1 + wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT + 2 + 2 + 1 1 1 @@ -1570,18 +2920,19 @@ 1 1 - + ,90,400,-1,76,0 0 0 wxID_ANY 0 + 0 0 1 - m_staticline7 + m_textOutput 1 @@ -1591,10 +2942,15 @@ Resizable 1 - wxLI_HORIZONTAL + wxHSCROLL|wxTE_MULTILINE|wxTE_READONLY ; ; forward_declare 0 + + wxFILTER_NONE + wxDefaultValidator + + @@ -1605,1109 +2961,20 @@ - - - - - - Export - 0 - - 1 - 1 - 1 - 1 - 0 - - 0 - 0 - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 0 - 1 - - 1 - - 0 - 0 - wxID_ANY - - 0 - - - 0 - - 1 - m_panelExport - 1 - - - protected - 1 - - Resizable - 1 - - ; ; forward_declare - 0 - - - - wxTAB_TRAVERSAL - - - wxBOTH - 1 - 3 - 5 - - gbExport - wxFLEX_GROWMODE_SPECIFIED - none - 0 - + 5 - 1 - 0 - wxEXPAND|wxALL - 0 - 3 - - - wxBOTH - - - 5 - - gbExportOptions - wxFLEX_GROWMODE_SPECIFIED - none - 4 - - 5 - 1 - 0 - wxALIGN_CENTER_VERTICAL - 0 - 1 - - 1 - 1 - 1 - 1 - 0 - - 0 - 0 - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 0 - 1 - - 1 - - 0 - 0 - wxID_ANY - Field delimiter: - 0 - - 0 - - - 0 - - 1 - m_labelFieldDelimiter - 1 - - - protected - 1 - - Resizable - 1 - - - ; ; forward_declare - 0 - - - - - -1 - - - - 5 - 1 - 1 - wxALIGN_CENTER_VERTICAL - 0 - 1 - - 1 - 1 - 1 - 1 - 0 - - 0 - 0 - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 0 - 1 - - 1 - - 0 - 0 - wxID_ANY - - 0 - - 0 - - 0 - 60,-1 - 1 - m_textFieldDelimiter - 1 - - - protected - 1 - - Resizable - 1 - - wxTE_PROCESS_TAB - ; ; forward_declare - 0 - - - wxFILTER_NONE - wxDefaultValidator - - , - - - - OnPreviewRefresh - - - - 5 - 1 - 0 - wxALIGN_CENTER_VERTICAL - 1 - 1 - - 1 - 1 - 1 - 1 - 0 - - 0 - 0 - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 0 - 1 - - 1 - - 0 - 0 - wxID_ANY - String delimiter: - 0 - - 0 - - - 0 - - 1 - m_labelStringDelimiter - 1 - - - protected - 1 - - Resizable - 1 - - - ; ; forward_declare - 0 - - - - - -1 - - - - 5 - 1 - 1 - wxALIGN_CENTER_VERTICAL - 1 - 1 - - 1 - 1 - 1 - 1 - 0 - - 0 - 0 - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 0 - 1 - - 1 - - 0 - 0 - wxID_ANY - - 0 - - 0 - - 0 - 60,-1 - 1 - m_textStringDelimiter - 1 - - - protected - 1 - - Resizable - 1 - - wxTE_PROCESS_TAB - ; ; forward_declare - 0 - - - wxFILTER_NONE - wxDefaultValidator - - " - - - - OnPreviewRefresh - - - - 5 - 1 - 0 - wxALIGN_CENTER_VERTICAL - 2 - 1 - - 1 - 1 - 1 - 1 - 0 - - 0 - 0 - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 0 - 1 - - 1 - - 0 - 0 - wxID_ANY - Reference delimiter: - 0 - - 0 - - - 0 - - 1 - m_labelRefDelimiter - 1 - - - protected - 1 - - Resizable - 1 - - - ; ; forward_declare - 0 - - - - - -1 - - - - 5 - 1 - 1 - wxALIGN_CENTER_VERTICAL - 2 - 1 - - 1 - 1 - 1 - 1 - 0 - - 0 - 0 - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 0 - 1 - - 1 - - 0 - 0 - wxID_ANY - - 0 - - 0 - - 0 - 60,-1 - 1 - m_textRefDelimiter - 1 - - - protected - 1 - - Resizable - 1 - - wxTE_PROCESS_TAB - ; ; forward_declare - 0 - - - wxFILTER_NONE - wxDefaultValidator - - , - - - - OnPreviewRefresh - - - - 5 - 1 - 0 - wxALIGN_CENTER_VERTICAL - 3 - 1 - - 1 - 1 - 1 - 1 - 0 - - 0 - 0 - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 0 - 1 - - 1 - - 0 - 0 - wxID_ANY - Range delimiter: - 0 - - 0 - - - 0 - - 1 - m_labelRefRangeDelimiter - 1 - - - protected - 1 - - Resizable - 1 - - - ; ; forward_declare - 0 - - - - - -1 - - - - 5 - 1 - 1 - wxALIGN_CENTER_VERTICAL - 3 - 1 - - 1 - 1 - 1 - 1 - 0 - - 0 - 0 - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 0 - 1 - - 1 - - 0 - 0 - wxID_ANY - - 0 - - 0 - - 0 - 60,-1 - 1 - m_textRefRangeDelimiter - 1 - - - protected - 1 - - Resizable - 1 - - wxTE_PROCESS_TAB - ; ; forward_declare - 0 - Leave blank to disable ranges. - - wxFILTER_NONE - wxDefaultValidator - - - - - - - OnPreviewRefresh - - - - 5 - 2 - 0 - wxALIGN_CENTER_VERTICAL - 4 - 1 - - 1 - 1 - 1 - 1 - 0 - - 0 - 0 - - - - 1 - 0 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 0 - 1 - - 1 - - 0 - 0 - wxID_ANY - Keep tabs - - 0 - - - 0 - - 1 - m_checkKeepTabs - 1 - - - protected - 1 - - Resizable - 1 - - - ; ; forward_declare - 0 - - - wxFILTER_NONE - wxDefaultValidator - - - - - OnPreviewRefresh - - - - 5 - 2 - 0 - wxALIGN_CENTER_VERTICAL - 5 - 1 - - 1 - 1 - 1 - 1 - 0 - - 0 - 0 - - - - 1 - 0 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 0 - 1 - - 1 - - 0 - 0 - wxID_ANY - Keep line breaks - - 0 - - - 0 - - 1 - m_checkKeepLineBreaks - 1 - - - protected - 1 - - Resizable - 1 - - - ; ; forward_declare - 0 - - - wxFILTER_NONE - wxDefaultValidator - - - - - OnPreviewRefresh - - - - 5 - 2 - 0 - wxEXPAND|wxTOP|wxBOTTOM - 7 - 1 - - 1 - 1 - 1 - 1 - 0 - - 0 - 0 - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 0 - 1 - - 1 - - 0 - 0 - wxID_ANY - - 0 - - - 0 - - 1 - m_staticline2 - 1 - - - protected - 1 - - Resizable - 1 - - wxLI_HORIZONTAL - ; ; forward_declare - 0 - - - - - - - - 5 - 2 - 0 - - 8 - 1 - - 1 - 1 - 1 - 1 - 0 - - 0 - 0 - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 0 - 1 - - 1 - - 0 - 0 - wxID_ANY - Format presets: - 0 - - 0 - - - 0 - - 1 - m_labelBomExportPresets - 1 - - - protected - 1 - - Resizable - 1 - - - ; ; forward_declare - 0 - - - - - -1 - - - - 5 - 2 - 0 - wxEXPAND - 9 - 1 - - 1 - 1 - 1 - 1 - 0 - - 0 - 0 - - - - 1 - 0 - "Default" "(unsaved)" - 1 - - 1 - 0 - Dock - 0 - Left - 0 - 1 - - 1 - - 0 - 0 - wxID_ANY - - 0 - - - 0 - - 1 - m_cbBomFmtPresets - 1 - - - protected - 1 - - Resizable - 0 - 1 - - - ; ; forward_declare - 0 - - - wxFILTER_NONE - wxDefaultValidator - - - - - - - - - - 10 - 1 - 1 - wxEXPAND|wxBOTTOM - 0 - 1 + wxEXPAND + 0 - bOutputDirectory + bButtonsSizer wxHORIZONTAL none - + 5 - wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxLEFT + wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT 0 - - 1 - 1 - 1 - 1 - 0 - - 0 - 0 - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 0 - 1 - - 1 - - 0 - 0 - wxID_ANY - Output file: - 0 - - 0 - - - 0 - - 1 - m_labelOutputDirectory - 1 - - - protected - 1 - - Resizable - 1 - - - ; ; forward_declare - 0 - - - - - -1 - - - - 5 - wxALIGN_CENTER_VERTICAL|wxALL - 1 - - 1 - 1 - 1 - 1 - 0 - - 0 - 0 - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 0 - 1 - - 1 - - 0 - 0 - wxID_ANY - - 0 - - 0 - - 0 - - 1 - m_outputFileName - 1 - - - protected - 1 - - Resizable - 1 - - - ; ; forward_declare - 0 - - - wxFILTER_NONE - wxDefaultValidator - - - - - - - - - 5 - wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxRIGHT - 0 - + 1 1 1 @@ -2742,7 +3009,7 @@ 0 0 wxID_ANY - Refresh Grouping + Add Field... 0 @@ -2750,9 +3017,9 @@ 0 - 30,30 + 1 - m_browseButton + m_sidebarButton 1 @@ -2767,7 +3034,7 @@ STD_BITMAP_BUTTON; widgets/std_bitmap_button.h; forward_declare 0 - + Add a new field wxFILTER_NONE wxDefaultValidator @@ -2775,89 +3042,13 @@ - OnOutputFileBrowseClicked - - - - - - 3 - 1 - 1 - wxEXPAND|wxTOP|wxBOTTOM - 1 - 1 - - - bPreview - wxHORIZONTAL - none - - 5 - wxALIGN_BOTTOM|wxTOP|wxRIGHT|wxLEFT - 0 - - 1 - 1 - 1 - 1 - 0 - - 0 - 0 - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 0 - 1 - - 1 - - 0 - 0 - wxID_ANY - Preview: - 0 - - 0 - - - 0 - - 1 - m_labelPreview - 1 - - - protected - 1 - - Resizable - 1 - - - ; ; forward_declare - 0 - - - - - -1 + OnSidebarToggle 5 wxEXPAND - 1 + 9 0 protected @@ -2865,10 +3056,10 @@ - 5 - wxTOP|wxRIGHT + 10 + wxALIGN_CENTER_VERTICAL|wxRIGHT 0 - + 1 1 1 @@ -2903,7 +3094,7 @@ 0 0 wxID_ANY - Refresh Grouping + Export 0 @@ -2911,9 +3102,9 @@ 0 - 30,30 + 1 - m_bRefreshPreview + m_buttonExport 1 @@ -2926,7 +3117,7 @@ 1 - STD_BITMAP_BUTTON; widgets/std_bitmap_button.h; forward_declare + ; forward_declare 0 @@ -2936,275 +3127,111 @@ - OnPreviewRefresh + OnExport + + + + 10 + wxALIGN_CENTER_VERTICAL|wxRIGHT + 0 + + 1 + 1 + 1 + 1 + 0 + + 0 + 0 + 0 + + + + + 1 + 0 + 1 + + 1 + + 0 + 0 + + Dock + 0 + Left + 0 + 1 + + 1 + + + 0 + 0 + wxID_ANY + Apply, Save Schematic && Continue + + 0 + + 0 + + + 0 + + 1 + m_buttonApply + 1 + + + protected + 1 + + + + Resizable + 1 + + + ; forward_declare + 0 + + + wxFILTER_NONE + wxDefaultValidator + + + + + OnSaveAndContinue + + + + 5 + wxALIGN_CENTER_VERTICAL|wxALL + 0 + + 0 + 1 + 0 + 0 + 0 + 1 + 0 + 0 + + m_sdbSizer + protected + OnCancel + OnOk - - 5 - 1 - 1 - wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT - 2 - 2 - - 1 - 1 - 1 - 1 - 0 - - 0 - 0 - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 0 - 1 - - 1 - ,90,400,-1,76,0 - 0 - 0 - wxID_ANY - - 0 - - 0 - - 0 - - 1 - m_textOutput - 1 - - - protected - 1 - - Resizable - 1 - - wxHSCROLL|wxTE_MULTILINE|wxTE_READONLY - ; ; forward_declare - 0 - - - wxFILTER_NONE - wxDefaultValidator - - - - - - - - - 5 - wxEXPAND - 0 - - - bButtonsSizer - wxHORIZONTAL - none - - 5 - wxEXPAND - 9 - - 0 - protected - 0 - - - - 10 - wxALIGN_CENTER_VERTICAL|wxRIGHT - 0 - - 1 - 1 - 1 - 1 - 0 - - 0 - 0 - 0 - - - - - 1 - 0 - 1 - - 1 - - 0 - 0 - - Dock - 0 - Left - 0 - 1 - - 1 - - - 0 - 0 - wxID_ANY - Export - - 0 - - 0 - - - 0 - - 1 - m_buttonExport - 1 - - - protected - 1 - - - - Resizable - 1 - - - ; forward_declare - 0 - - - wxFILTER_NONE - wxDefaultValidator - - - - - OnExport - - - - 10 - wxALIGN_CENTER_VERTICAL|wxRIGHT - 0 - - 1 - 1 - 1 - 1 - 0 - - 0 - 0 - 0 - - - - - 1 - 0 - 1 - - 1 - - 0 - 0 - - Dock - 0 - Left - 0 - 1 - - 1 - - - 0 - 0 - wxID_ANY - Apply, Save Schematic && Continue - - 0 - - 0 - - - 0 - - 1 - m_buttonApply - 1 - - - protected - 1 - - - - Resizable - 1 - - - ; forward_declare - 0 - - - wxFILTER_NONE - wxDefaultValidator - - - - - OnSaveAndContinue - - - - 5 - wxALIGN_CENTER_VERTICAL|wxALL - 0 - - 0 - 1 - 0 - 0 - 0 - 1 - 0 - 0 - - m_sdbSizer - protected - OnCancel - OnOk - - - - diff --git a/eeschema/dialogs/dialog_symbol_fields_table_base.h b/eeschema/dialogs/dialog_symbol_fields_table_base.h index d095191b50..d992508a65 100644 --- a/eeschema/dialogs/dialog_symbol_fields_table_base.h +++ b/eeschema/dialogs/dialog_symbol_fields_table_base.h @@ -32,10 +32,10 @@ class WX_GRID; #include #include #include -#include #include #include #include +#include #include /////////////////////////////////////////////////////////////////////////// @@ -48,18 +48,18 @@ class DIALOG_SYMBOL_FIELDS_TABLE_BASE : public DIALOG_SHIM private: protected: - wxNotebook* m_nbPages; - wxPanel* m_panelEdit; wxSplitterWindow* m_splitterMainWindow; wxPanel* m_leftPanel; WX_GRID* m_viewControlsGrid; STD_BITMAP_BUTTON* m_addFieldButton; STD_BITMAP_BUTTON* m_renameFieldButton; STD_BITMAP_BUTTON* m_removeFieldButton; - wxStaticLine* m_staticline1; + wxStaticLine* m_staticline11; wxStaticText* m_bomPresetsLabel; wxChoice* m_cbBomPresets; wxPanel* m_rightPanel; + wxNotebook* m_nbPages; + wxPanel* m_panelEdit; wxSearchCtrl* m_filter; wxStaticLine* m_staticline31; wxChoice* m_scope; @@ -69,7 +69,6 @@ class DIALOG_SYMBOL_FIELDS_TABLE_BASE : public DIALOG_SHIM STD_BITMAP_BUTTON* m_bRefresh; STD_BITMAP_BUTTON* m_bMenu; WX_GRID* m_grid; - wxStaticLine* m_staticline7; wxPanel* m_panelExport; wxStaticText* m_labelFieldDelimiter; wxTextCtrl* m_textFieldDelimiter; @@ -90,6 +89,7 @@ class DIALOG_SYMBOL_FIELDS_TABLE_BASE : public DIALOG_SHIM wxStaticText* m_labelPreview; STD_BITMAP_BUTTON* m_bRefreshPreview; wxTextCtrl* m_textOutput; + STD_BITMAP_BUTTON* m_sidebarButton; wxButton* m_buttonExport; wxButton* m_buttonApply; wxStdDialogButtonSizer* m_sdbSizer; @@ -98,12 +98,12 @@ class DIALOG_SYMBOL_FIELDS_TABLE_BASE : public DIALOG_SHIM // Virtual event handlers, override them in your derived class virtual void OnClose( wxCloseEvent& event ) { event.Skip(); } - virtual void OnPageChanged( wxNotebookEvent& event ) { event.Skip(); } virtual void OnViewControlsCellChanged( wxGridEvent& event ) { event.Skip(); } virtual void OnSizeViewControlsGrid( wxSizeEvent& event ) { event.Skip(); } virtual void OnAddField( wxCommandEvent& event ) { event.Skip(); } virtual void OnRenameField( wxCommandEvent& event ) { event.Skip(); } virtual void OnRemoveField( wxCommandEvent& event ) { event.Skip(); } + virtual void OnPageChanged( wxNotebookEvent& event ) { event.Skip(); } virtual void OnFilterMouseMoved( wxMouseEvent& event ) { event.Skip(); } virtual void OnFilterText( wxCommandEvent& event ) { event.Skip(); } virtual void OnScope( wxCommandEvent& event ) { event.Skip(); } @@ -115,6 +115,7 @@ class DIALOG_SYMBOL_FIELDS_TABLE_BASE : public DIALOG_SHIM virtual void OnTableColSize( wxGridSizeEvent& event ) { event.Skip(); } virtual void OnPreviewRefresh( wxCommandEvent& event ) { event.Skip(); } virtual void OnOutputFileBrowseClicked( wxCommandEvent& event ) { event.Skip(); } + virtual void OnSidebarToggle( wxCommandEvent& event ) { event.Skip(); } virtual void OnExport( wxCommandEvent& event ) { event.Skip(); } virtual void OnSaveAndContinue( wxCommandEvent& event ) { event.Skip(); } virtual void OnCancel( wxCommandEvent& event ) { event.Skip(); } diff --git a/eeschema/eeschema_settings.cpp b/eeschema/eeschema_settings.cpp index b729365f77..bf239c3b55 100644 --- a/eeschema/eeschema_settings.cpp +++ b/eeschema/eeschema_settings.cpp @@ -529,6 +529,9 @@ EESCHEMA_SETTINGS::EESCHEMA_SETTINGS() : m_params.emplace_back( new PARAM( "field_editor.sash_pos", &m_FieldEditorPanel.sash_pos, 400 ) ); + m_params.emplace_back( new PARAM( "field_editor.sidebar_collapsed", + &m_FieldEditorPanel.sidebar_collapsed, false ) ); + addParamsForWindow( &m_Simulator.window, "simulator.window", 500, 400 ); m_params.emplace_back( new PARAM( "simulator.plot_panel_width", diff --git a/eeschema/eeschema_settings.h b/eeschema/eeschema_settings.h index bdd08f9597..d7cd42a3bd 100644 --- a/eeschema/eeschema_settings.h +++ b/eeschema/eeschema_settings.h @@ -239,6 +239,7 @@ public: int scope; wxString view_controls_visible_columns; int sash_pos; + bool sidebar_collapsed; }; struct PANEL_LIB_VIEW diff --git a/eeschema/symbol_editor/symbol_editor_settings.cpp b/eeschema/symbol_editor/symbol_editor_settings.cpp index 52883bbc42..f2d36d9abb 100644 --- a/eeschema/symbol_editor/symbol_editor_settings.cpp +++ b/eeschema/symbol_editor/symbol_editor_settings.cpp @@ -139,6 +139,8 @@ SYMBOL_EDITOR_SETTINGS::SYMBOL_EDITOR_SETTINGS() : m_params.emplace_back( new PARAM( "lib_field_editor.sash_pos", &m_LibFieldEditor.sash_pos, 400 ) ); + m_params.emplace_back( new PARAM( "lib_field_editor.sidebar_collapsed", + &m_LibFieldEditor.sidebar_collapsed, false ) ); m_params.emplace_back( new PARAM_LAMBDA( "selection_filter", [&]() -> nlohmann::json diff --git a/eeschema/symbol_editor/symbol_editor_settings.h b/eeschema/symbol_editor/symbol_editor_settings.h index e77b4702da..9b0ab3a10b 100644 --- a/eeschema/symbol_editor/symbol_editor_settings.h +++ b/eeschema/symbol_editor/symbol_editor_settings.h @@ -70,6 +70,7 @@ public: std::map field_widths; wxString view_controls_visible_columns; int sash_pos; + bool sidebar_collapsed; }; SYMBOL_EDITOR_SETTINGS();