From a97ba79883829e75aa9b1f4b43f2891c744108d3 Mon Sep 17 00:00:00 2001 From: Jeff Young Date: Thu, 24 Aug 2023 11:20:55 +0100 Subject: [PATCH] Give Symbol Fields Table GUI a KiCad look & feel. --- .../dialogs/dialog_symbol_fields_table.cpp | 5 +- .../dialog_symbol_fields_table_base.cpp | 136 +- .../dialog_symbol_fields_table_base.fbp | 1548 ++++++++--------- .../dialogs/dialog_symbol_fields_table_base.h | 13 +- 4 files changed, 839 insertions(+), 863 deletions(-) diff --git a/eeschema/dialogs/dialog_symbol_fields_table.cpp b/eeschema/dialogs/dialog_symbol_fields_table.cpp index 0a0743b4f4..24a18f33a5 100644 --- a/eeschema/dialogs/dialog_symbol_fields_table.cpp +++ b/eeschema/dialogs/dialog_symbol_fields_table.cpp @@ -182,7 +182,8 @@ DIALOG_SYMBOL_FIELDS_TABLE::DIALOG_SYMBOL_FIELDS_TABLE( SCH_EDIT_FRAME* parent ) m_removeFieldButton->Enable( false ); m_renameFieldButton->Enable( false ); - m_bomPresetsLabel->SetFont( KIUI::GetStatusFont( this ) ); + m_bomPresetsLabel->SetFont( KIUI::GetInfoFont( this ) ); + m_labelBomExportPresets->SetFont( KIUI::GetInfoFont( this ) ); m_separator11->SetIsSeparator(); m_fieldsCtrl->AppendTextColumn( _( "Field" ), wxDATAVIEW_CELL_INERT, 0, wxALIGN_LEFT, 0 ); @@ -1066,7 +1067,7 @@ void DIALOG_SYMBOL_FIELDS_TABLE::OnSizeFieldList( wxSizeEvent& event ) // TODO: something in wxWidgets 3.1.x pads checkbox columns with extra space. (It used to // also be that the width of the column would get set too wide (to 30), but that's patched in // our local wxWidgets fork.) - m_labelColWidth -= 30; + m_labelColWidth -= 50; #endif // GTK loses its head and messes these up when resizing the splitter bar: diff --git a/eeschema/dialogs/dialog_symbol_fields_table_base.cpp b/eeschema/dialogs/dialog_symbol_fields_table_base.cpp index 53ecaeedbb..fe5b8c63d2 100644 --- a/eeschema/dialogs/dialog_symbol_fields_table_base.cpp +++ b/eeschema/dialogs/dialog_symbol_fields_table_base.cpp @@ -61,7 +61,7 @@ DIALOG_SYMBOL_FIELDS_TABLE_BASE::DIALOG_SYMBOL_FIELDS_TABLE_BASE( wxWindow* pare m_staticline1 = new wxStaticLine( m_leftPanel, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL ); bPresets->Add( m_staticline1, 0, wxEXPAND|wxBOTTOM, 5 ); - m_bomPresetsLabel = new wxStaticText( m_leftPanel, wxID_ANY, _("View Preset:"), wxDefaultPosition, wxDefaultSize, 0 ); + m_bomPresetsLabel = new wxStaticText( m_leftPanel, wxID_ANY, _("View presets:"), wxDefaultPosition, wxDefaultSize, 0 ); m_bomPresetsLabel->Wrap( -1 ); bPresets->Add( m_bomPresetsLabel, 0, wxTOP|wxRIGHT|wxLEFT, 5 ); @@ -69,7 +69,7 @@ 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( 1 ); - bPresets->Add( m_cbBomPresets, 0, wxEXPAND|wxTOP|wxLEFT, 5 ); + bPresets->Add( m_cbBomPresets, 0, wxEXPAND|wxTOP|wxLEFT, 4 ); bLeftSizer->Add( bPresets, 0, wxEXPAND|wxTOP, 5 ); @@ -118,7 +118,7 @@ DIALOG_SYMBOL_FIELDS_TABLE_BASE::DIALOG_SYMBOL_FIELDS_TABLE_BASE( wxWindow* pare bControls->Add( m_separator3, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 ); - m_bRefresh = new wxBitmapButton( m_rightPanel, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, wxBU_AUTODRAW|0 ); + m_bRefresh = new STD_BITMAP_BUTTON( m_rightPanel, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, wxBU_AUTODRAW|0 ); m_bRefresh->SetMinSize( wxSize( 30,30 ) ); bControls->Add( m_bRefresh, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT, 5 ); @@ -205,74 +205,76 @@ DIALOG_SYMBOL_FIELDS_TABLE_BASE::DIALOG_SYMBOL_FIELDS_TABLE_BASE( wxWindow* pare m_panelEdit->SetSizer( bEditSizer ); m_panelEdit->Layout(); bEditSizer->Fit( m_panelEdit ); - m_nbPages->AddPage( m_panelEdit, _("Edit"), true ); + m_nbPages->AddPage( m_panelEdit, _("Edit"), false ); m_panelExport = new wxPanel( m_nbPages, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL ); wxGridBagSizer* gbExport; - gbExport = new wxGridBagSizer( 0, 0 ); + gbExport = new wxGridBagSizer( 0, 5 ); gbExport->SetFlexibleDirection( wxBOTH ); gbExport->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED ); - wxFlexGridSizer* fgExportOptions; - fgExportOptions = new wxFlexGridSizer( 7, 2, 0, 0 ); - fgExportOptions->SetFlexibleDirection( wxBOTH ); - fgExportOptions->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED ); + wxGridBagSizer* gbExportOptions; + gbExportOptions = new wxGridBagSizer( 4, 5 ); + gbExportOptions->SetFlexibleDirection( wxBOTH ); + gbExportOptions->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED ); - m_labelBomExportPresets = new wxStaticText( m_panelExport, wxID_ANY, _("Format Preset:"), wxDefaultPosition, wxDefaultSize, 0 ); + m_labelFieldDelimiter = new wxStaticText( m_panelExport, wxID_ANY, _("Field delimeter:"), wxDefaultPosition, wxDefaultSize, 0 ); + m_labelFieldDelimiter->Wrap( -1 ); + gbExportOptions->Add( m_labelFieldDelimiter, wxGBPosition( 0, 0 ), wxGBSpan( 1, 1 ), wxALIGN_CENTER_VERTICAL|wxRIGHT, 5 ); + + m_textFieldDelimiter = new wxTextCtrl( m_panelExport, wxID_ANY, _(","), wxDefaultPosition, wxDefaultSize, wxTE_PROCESS_TAB ); + m_textFieldDelimiter->SetMinSize( wxSize( 60,-1 ) ); + + gbExportOptions->Add( m_textFieldDelimiter, wxGBPosition( 0, 1 ), wxGBSpan( 1, 1 ), wxALIGN_CENTER_VERTICAL, 5 ); + + m_labelStringDelimiter = new wxStaticText( m_panelExport, wxID_ANY, _("String delimeter:"), wxDefaultPosition, wxDefaultSize, 0 ); + m_labelStringDelimiter->Wrap( -1 ); + gbExportOptions->Add( m_labelStringDelimiter, wxGBPosition( 1, 0 ), wxGBSpan( 1, 1 ), wxALIGN_CENTER_VERTICAL, 5 ); + + m_textStringDelimiter = new wxTextCtrl( m_panelExport, wxID_ANY, _("\""), wxDefaultPosition, wxDefaultSize, wxTE_PROCESS_TAB ); + m_textStringDelimiter->SetMinSize( wxSize( 60,-1 ) ); + + gbExportOptions->Add( m_textStringDelimiter, wxGBPosition( 1, 1 ), wxGBSpan( 1, 1 ), wxALIGN_CENTER_VERTICAL, 5 ); + + m_labelRefDelimiter = new wxStaticText( m_panelExport, wxID_ANY, _("Reference delimiter:"), wxDefaultPosition, wxDefaultSize, 0 ); + m_labelRefDelimiter->Wrap( -1 ); + gbExportOptions->Add( m_labelRefDelimiter, wxGBPosition( 2, 0 ), wxGBSpan( 1, 1 ), wxALIGN_CENTER_VERTICAL, 5 ); + + m_textRefDelimiter = new wxTextCtrl( m_panelExport, wxID_ANY, _(","), wxDefaultPosition, wxDefaultSize, wxTE_PROCESS_TAB ); + m_textRefDelimiter->SetMinSize( wxSize( 60,-1 ) ); + + gbExportOptions->Add( m_textRefDelimiter, wxGBPosition( 2, 1 ), wxGBSpan( 1, 1 ), wxALIGN_CENTER_VERTICAL, 5 ); + + m_labelRefRangeDelimiter = new wxStaticText( m_panelExport, wxID_ANY, _("Range delimiter:"), wxDefaultPosition, wxDefaultSize, 0 ); + m_labelRefRangeDelimiter->Wrap( -1 ); + gbExportOptions->Add( m_labelRefRangeDelimiter, wxGBPosition( 3, 0 ), wxGBSpan( 1, 1 ), wxALIGN_CENTER_VERTICAL, 5 ); + + m_textRefRangeDelimiter = new wxTextCtrl( m_panelExport, wxID_ANY, _("-"), wxDefaultPosition, wxDefaultSize, wxTE_PROCESS_TAB ); + m_textRefRangeDelimiter->SetToolTip( _("Leave blank to disable ranges.") ); + m_textRefRangeDelimiter->SetMinSize( wxSize( 60,-1 ) ); + + gbExportOptions->Add( m_textRefRangeDelimiter, wxGBPosition( 3, 1 ), wxGBSpan( 1, 1 ), wxALIGN_CENTER_VERTICAL, 5 ); + + m_checkKeepTabs = new wxCheckBox( m_panelExport, wxID_ANY, _("Keep tabs"), wxDefaultPosition, wxDefaultSize, 0 ); + gbExportOptions->Add( m_checkKeepTabs, wxGBPosition( 4, 0 ), wxGBSpan( 1, 2 ), wxALIGN_CENTER_VERTICAL, 5 ); + + m_checkKeepLineBreaks = new wxCheckBox( m_panelExport, wxID_ANY, _("Keep line breaks"), wxDefaultPosition, wxDefaultSize, 0 ); + gbExportOptions->Add( m_checkKeepLineBreaks, wxGBPosition( 5, 0 ), wxGBSpan( 1, 2 ), wxALIGN_CENTER_VERTICAL, 5 ); + + m_staticline2 = new wxStaticLine( m_panelExport, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL ); + gbExportOptions->Add( m_staticline2, wxGBPosition( 7, 0 ), wxGBSpan( 1, 2 ), wxEXPAND|wxTOP|wxBOTTOM, 5 ); + + m_labelBomExportPresets = new wxStaticText( m_panelExport, wxID_ANY, _("Format presets:"), wxDefaultPosition, wxDefaultSize, 0 ); m_labelBomExportPresets->Wrap( -1 ); - fgExportOptions->Add( m_labelBomExportPresets, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT|wxALL, 5 ); + gbExportOptions->Add( m_labelBomExportPresets, wxGBPosition( 8, 0 ), wxGBSpan( 1, 2 ), 0, 5 ); wxString m_cbBomFmtPresetsChoices[] = { _("Default"), _("(unsaved)") }; int m_cbBomFmtPresetsNChoices = sizeof( m_cbBomFmtPresetsChoices ) / sizeof( wxString ); m_cbBomFmtPresets = new wxChoice( m_panelExport, wxID_ANY, wxDefaultPosition, wxDefaultSize, m_cbBomFmtPresetsNChoices, m_cbBomFmtPresetsChoices, 0 ); m_cbBomFmtPresets->SetSelection( 0 ); - fgExportOptions->Add( m_cbBomFmtPresets, 0, wxALL|wxEXPAND, 5 ); - - m_labelFieldDelimiter = new wxStaticText( m_panelExport, wxID_ANY, _("Field Delimeter:"), wxDefaultPosition, wxDefaultSize, 0 ); - m_labelFieldDelimiter->Wrap( -1 ); - fgExportOptions->Add( m_labelFieldDelimiter, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT|wxALL, 5 ); - - m_textFieldDelimiter = new wxTextCtrl( m_panelExport, wxID_ANY, _(","), wxDefaultPosition, wxDefaultSize, wxTE_PROCESS_TAB ); - fgExportOptions->Add( m_textFieldDelimiter, 0, wxALL|wxEXPAND, 5 ); - - m_labelStringDelimiter = new wxStaticText( m_panelExport, wxID_ANY, _("String Delimeter:"), wxDefaultPosition, wxDefaultSize, 0 ); - m_labelStringDelimiter->Wrap( -1 ); - fgExportOptions->Add( m_labelStringDelimiter, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT|wxALL, 5 ); - - m_textStringDelimiter = new wxTextCtrl( m_panelExport, wxID_ANY, _("\""), wxDefaultPosition, wxDefaultSize, wxTE_PROCESS_TAB ); - fgExportOptions->Add( m_textStringDelimiter, 0, wxALL|wxEXPAND, 5 ); - - m_labelRefDelimiter = new wxStaticText( m_panelExport, wxID_ANY, _("Reference Delimiter:"), wxDefaultPosition, wxDefaultSize, 0 ); - m_labelRefDelimiter->Wrap( -1 ); - fgExportOptions->Add( m_labelRefDelimiter, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT|wxALL, 5 ); - - m_textRefDelimiter = new wxTextCtrl( m_panelExport, wxID_ANY, _(","), wxDefaultPosition, wxDefaultSize, wxTE_PROCESS_TAB ); - fgExportOptions->Add( m_textRefDelimiter, 0, wxALL, 5 ); - - m_labelRefRangeDelimiter = new wxStaticText( m_panelExport, wxID_ANY, _("Range Delimiter:"), wxDefaultPosition, wxDefaultSize, 0 ); - m_labelRefRangeDelimiter->Wrap( -1 ); - fgExportOptions->Add( m_labelRefRangeDelimiter, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT|wxALL, 5 ); - - m_textRefRangeDelimiter = new wxTextCtrl( m_panelExport, wxID_ANY, _("-"), wxDefaultPosition, wxDefaultSize, wxTE_PROCESS_TAB ); - m_textRefRangeDelimiter->SetToolTip( _("Leave blank to disable ranges.") ); - - fgExportOptions->Add( m_textRefRangeDelimiter, 0, wxALL, 5 ); - - m_labelKeepTabs = new wxStaticText( m_panelExport, wxID_ANY, _("Keep Tabs:"), wxDefaultPosition, wxDefaultSize, 0 ); - m_labelKeepTabs->Wrap( -1 ); - fgExportOptions->Add( m_labelKeepTabs, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT|wxALL, 5 ); - - m_checkKeepTabs = new wxCheckBox( m_panelExport, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); - fgExportOptions->Add( m_checkKeepTabs, 0, wxALL, 5 ); - - m_labelKeepLineBreaks = new wxStaticText( m_panelExport, wxID_ANY, _("Keep Line Breaks:"), wxDefaultPosition, wxDefaultSize, 0 ); - m_labelKeepLineBreaks->Wrap( -1 ); - fgExportOptions->Add( m_labelKeepLineBreaks, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT|wxALL, 5 ); - - m_checkKeepLineBreaks = new wxCheckBox( m_panelExport, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); - fgExportOptions->Add( m_checkKeepLineBreaks, 0, wxALL, 5 ); + gbExportOptions->Add( m_cbBomFmtPresets, wxGBPosition( 9, 0 ), wxGBSpan( 1, 2 ), wxEXPAND, 5 ); - gbExport->Add( fgExportOptions, wxGBPosition( 0, 0 ), wxGBSpan( 3, 1 ), wxEXPAND, 5 ); + gbExport->Add( gbExportOptions, wxGBPosition( 0, 0 ), wxGBSpan( 3, 1 ), wxEXPAND|wxALL, 5 ); wxBoxSizer* bOutputDirectory; bOutputDirectory = new wxBoxSizer( wxHORIZONTAL ); @@ -282,38 +284,38 @@ DIALOG_SYMBOL_FIELDS_TABLE_BASE::DIALOG_SYMBOL_FIELDS_TABLE_BASE( wxWindow* pare bOutputDirectory->Add( m_labelOutputDirectory, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 ); m_outputFileName = new wxTextCtrl( m_panelExport, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); - bOutputDirectory->Add( m_outputFileName, 1, wxALL|wxEXPAND, 5 ); + bOutputDirectory->Add( m_outputFileName, 1, wxALIGN_CENTER_VERTICAL, 5 ); - m_browseButton = new wxBitmapButton( m_panelExport, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, wxBU_AUTODRAW|0 ); + m_browseButton = new STD_BITMAP_BUTTON( m_panelExport, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, wxBU_AUTODRAW|0 ); m_browseButton->SetMinSize( wxSize( 30,30 ) ); - bOutputDirectory->Add( m_browseButton, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 ); + bOutputDirectory->Add( m_browseButton, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT, 5 ); - gbExport->Add( bOutputDirectory, wxGBPosition( 0, 1 ), wxGBSpan( 1, 1 ), wxEXPAND, 5 ); + gbExport->Add( bOutputDirectory, wxGBPosition( 0, 1 ), wxGBSpan( 1, 1 ), wxEXPAND|wxBOTTOM, 10 ); wxBoxSizer* bPreview; bPreview = new wxBoxSizer( wxHORIZONTAL ); m_labelPreview = new wxStaticText( m_panelExport, wxID_ANY, _("Preview:"), wxDefaultPosition, wxDefaultSize, 0 ); m_labelPreview->Wrap( -1 ); - bPreview->Add( m_labelPreview, 0, wxALIGN_BOTTOM|wxALL, 5 ); + bPreview->Add( m_labelPreview, 0, wxALIGN_BOTTOM|wxTOP|wxRIGHT|wxLEFT, 5 ); bPreview->Add( 0, 0, 1, wxEXPAND, 5 ); - m_bRefreshPreview = new wxBitmapButton( m_panelExport, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, wxBU_AUTODRAW|0 ); + m_bRefreshPreview = new STD_BITMAP_BUTTON( m_panelExport, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, wxBU_AUTODRAW|0 ); m_bRefreshPreview->SetMinSize( wxSize( 30,30 ) ); - bPreview->Add( m_bRefreshPreview, 0, wxALL, 5 ); + bPreview->Add( m_bRefreshPreview, 0, wxTOP|wxRIGHT, 5 ); - gbExport->Add( bPreview, wxGBPosition( 1, 1 ), wxGBSpan( 1, 1 ), wxEXPAND, 5 ); + gbExport->Add( bPreview, wxGBPosition( 1, 1 ), wxGBSpan( 1, 1 ), wxEXPAND|wxTOP|wxBOTTOM, 3 ); m_textOutput = new wxTextCtrl( m_panelExport, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxHSCROLL|wxTE_MULTILINE|wxTE_READONLY ); m_textOutput->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), wxFONTFAMILY_TELETYPE, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_NORMAL, false, wxEmptyString ) ); - gbExport->Add( m_textOutput, wxGBPosition( 2, 1 ), wxGBSpan( 2, 1 ), wxALL|wxEXPAND, 5 ); + gbExport->Add( m_textOutput, wxGBPosition( 2, 1 ), wxGBSpan( 2, 1 ), wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT, 5 ); gbExport->AddGrowableCol( 1 ); @@ -322,7 +324,7 @@ DIALOG_SYMBOL_FIELDS_TABLE_BASE::DIALOG_SYMBOL_FIELDS_TABLE_BASE( wxWindow* pare m_panelExport->SetSizer( gbExport ); m_panelExport->Layout(); gbExport->Fit( m_panelExport ); - m_nbPages->AddPage( m_panelExport, _("Export"), false ); + m_nbPages->AddPage( m_panelExport, _("Export"), true ); bMainSizer->Add( m_nbPages, 1, wxEXPAND | wxALL, 5 ); diff --git a/eeschema/dialogs/dialog_symbol_fields_table_base.fbp b/eeschema/dialogs/dialog_symbol_fields_table_base.fbp index 83e52e94b0..47392568c1 100644 --- a/eeschema/dialogs/dialog_symbol_fields_table_base.fbp +++ b/eeschema/dialogs/dialog_symbol_fields_table_base.fbp @@ -123,7 +123,7 @@ Edit - 1 + 0 1 1 @@ -670,7 +670,7 @@ 0 0 wxID_ANY - View Preset: + View presets: 0 0 @@ -700,7 +700,7 @@ - 5 + 4 wxEXPAND|wxTOP|wxLEFT 0 @@ -1311,7 +1311,7 @@ 1 - ; forward_declare + STD_BITMAP_BUTTON; widgets/std_bitmap_button.h; forward_declare 0 @@ -2033,7 +2033,7 @@ Export - 0 + 1 1 1 @@ -2090,7 +2090,7 @@ wxBOTH 1 3 - 0 + 5 gbExport wxFLEX_GROWMODE_SPECIFIED @@ -2100,25 +2100,27 @@ 5 1 0 - wxEXPAND + wxEXPAND|wxALL 0 3 - - 2 + + wxBOTH - 0 + 5 - fgExportOptions + gbExportOptions wxFLEX_GROWMODE_SPECIFIED none - 7 - 0 - + 4 + 5 - wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT|wxALL - 0 + 1 + 0 + wxALIGN_CENTER_VERTICAL|wxRIGHT + 0 + 1 1 1 @@ -2147,7 +2149,732 @@ 0 0 wxID_ANY - Format Preset: + Field delimeter: + 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 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + wxID_ANY + + 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 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + wxID_ANY + String delimeter: + 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 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + wxID_ANY + + 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 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 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 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + wxID_ANY + + 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 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 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 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + wxID_ANY + + 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 + + + + + + + + 1 + 0 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 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 + + + + + + + + 1 + 0 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 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 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 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 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + wxID_ANY + Format presets: 0 0 @@ -2176,10 +2903,13 @@ -1 - + 5 - wxALL|wxEXPAND - 0 + 2 + 0 + wxEXPAND + 9 + 1 1 1 @@ -2240,769 +2970,13 @@ - - 5 - wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT|wxALL - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - Field Delimeter: - 0 - - 0 - - - 0 - - 1 - m_labelFieldDelimiter - 1 - - - protected - 1 - - Resizable - 1 - - - ; ; forward_declare - 0 - - - - - -1 - - - - 5 - wxALL|wxEXPAND - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - - 0 - - - - 0 - - 1 - m_textFieldDelimiter - 1 - - - protected - 1 - - Resizable - 1 - - wxTE_PROCESS_TAB - ; ; forward_declare - 0 - - - wxFILTER_NONE - wxDefaultValidator - - , - - - - OnPreviewRefresh - - - - 5 - wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT|wxALL - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - String Delimeter: - 0 - - 0 - - - 0 - - 1 - m_labelStringDelimiter - 1 - - - protected - 1 - - Resizable - 1 - - - ; ; forward_declare - 0 - - - - - -1 - - - - 5 - wxALL|wxEXPAND - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - - 0 - - - - 0 - - 1 - m_textStringDelimiter - 1 - - - protected - 1 - - Resizable - 1 - - wxTE_PROCESS_TAB - ; ; forward_declare - 0 - - - wxFILTER_NONE - wxDefaultValidator - - " - - - - OnPreviewRefresh - - - - 5 - wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT|wxALL - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - Reference Delimiter: - 0 - - 0 - - - 0 - - 1 - m_labelRefDelimiter - 1 - - - protected - 1 - - Resizable - 1 - - - ; ; forward_declare - 0 - - - - - -1 - - - - 5 - wxALL - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - - 0 - - - - 0 - - 1 - m_textRefDelimiter - 1 - - - protected - 1 - - Resizable - 1 - - wxTE_PROCESS_TAB - ; ; forward_declare - 0 - - - wxFILTER_NONE - wxDefaultValidator - - , - - - - OnPreviewRefresh - - - - 5 - wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT|wxALL - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - Range Delimiter: - 0 - - 0 - - - 0 - - 1 - m_labelRefRangeDelimiter - 1 - - - protected - 1 - - Resizable - 1 - - - ; ; forward_declare - 0 - - - - - -1 - - - - 5 - wxALL - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - - 0 - - - - 0 - - 1 - m_textRefRangeDelimiter - 1 - - - protected - 1 - - Resizable - 1 - - wxTE_PROCESS_TAB - ; ; forward_declare - 0 - Leave blank to disable ranges. - - wxFILTER_NONE - wxDefaultValidator - - - - - - - OnPreviewRefresh - - - - 5 - wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT|wxALL - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - Keep Tabs: - 0 - - 0 - - - 0 - - 1 - m_labelKeepTabs - 1 - - - protected - 1 - - Resizable - 1 - - - ; ; forward_declare - 0 - - - - - -1 - - - - 5 - wxALL - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - - - 0 - - - 0 - - 1 - m_checkKeepTabs - 1 - - - protected - 1 - - Resizable - 1 - - - ; ; forward_declare - 0 - - - wxFILTER_NONE - wxDefaultValidator - - - - - OnPreviewRefresh - - - - 5 - wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT|wxALL - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - Keep Line Breaks: - 0 - - 0 - - - 0 - - 1 - m_labelKeepLineBreaks - 1 - - - protected - 1 - - Resizable - 1 - - - ; ; forward_declare - 0 - - - - - -1 - - - - 5 - wxALL - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - - - 0 - - - 0 - - 1 - m_checkKeepLineBreaks - 1 - - - protected - 1 - - Resizable - 1 - - - ; ; forward_declare - 0 - - - wxFILTER_NONE - wxDefaultValidator - - - - - OnPreviewRefresh - - - 5 + 10 1 1 - wxEXPAND + wxEXPAND|wxBOTTOM 0 1 @@ -3073,7 +3047,7 @@ 5 - wxALL|wxEXPAND + wxALIGN_CENTER_VERTICAL 1 1 @@ -3137,7 +3111,7 @@ 5 - wxALIGN_CENTER_VERTICAL|wxALL + wxALIGN_CENTER_VERTICAL|wxRIGHT 0 1 @@ -3196,7 +3170,7 @@ 1 - ; forward_declare + STD_BITMAP_BUTTON; widgets/std_bitmap_button.h; forward_declare 0 @@ -3212,10 +3186,10 @@ - 5 + 3 1 1 - wxEXPAND + wxEXPAND|wxTOP|wxBOTTOM 1 1 @@ -3225,7 +3199,7 @@ none 5 - wxALIGN_BOTTOM|wxALL + wxALIGN_BOTTOM|wxTOP|wxRIGHT|wxLEFT 0 1 @@ -3296,7 +3270,7 @@ 5 - wxALL + wxTOP|wxRIGHT 0 1 @@ -3355,7 +3329,7 @@ 1 - ; forward_declare + STD_BITMAP_BUTTON; widgets/std_bitmap_button.h; forward_declare 0 @@ -3374,7 +3348,7 @@ 5 1 1 - wxALL|wxEXPAND + wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT 2 2 diff --git a/eeschema/dialogs/dialog_symbol_fields_table_base.h b/eeschema/dialogs/dialog_symbol_fields_table_base.h index 5eac25bca5..b3353cde59 100644 --- a/eeschema/dialogs/dialog_symbol_fields_table_base.h +++ b/eeschema/dialogs/dialog_symbol_fields_table_base.h @@ -71,7 +71,7 @@ class DIALOG_SYMBOL_FIELDS_TABLE_BASE : public DIALOG_SHIM BITMAP_BUTTON* m_separator2; wxCheckBox* m_groupSymbolsBox; BITMAP_BUTTON* m_separator3; - wxBitmapButton* m_bRefresh; + STD_BITMAP_BUTTON* m_bRefresh; WX_GRID* m_grid; wxStaticText* m_scopeLabel; wxRadioButton* m_radioProject; @@ -83,8 +83,6 @@ class DIALOG_SYMBOL_FIELDS_TABLE_BASE : public DIALOG_SHIM wxRadioButton* m_radioSelect; wxRadioButton* m_radioOff; wxPanel* m_panelExport; - wxStaticText* m_labelBomExportPresets; - wxChoice* m_cbBomFmtPresets; wxStaticText* m_labelFieldDelimiter; wxTextCtrl* m_textFieldDelimiter; wxStaticText* m_labelStringDelimiter; @@ -93,15 +91,16 @@ class DIALOG_SYMBOL_FIELDS_TABLE_BASE : public DIALOG_SHIM wxTextCtrl* m_textRefDelimiter; wxStaticText* m_labelRefRangeDelimiter; wxTextCtrl* m_textRefRangeDelimiter; - wxStaticText* m_labelKeepTabs; wxCheckBox* m_checkKeepTabs; - wxStaticText* m_labelKeepLineBreaks; wxCheckBox* m_checkKeepLineBreaks; + wxStaticLine* m_staticline2; + wxStaticText* m_labelBomExportPresets; + wxChoice* m_cbBomFmtPresets; wxStaticText* m_labelOutputDirectory; wxTextCtrl* m_outputFileName; - wxBitmapButton* m_browseButton; + STD_BITMAP_BUTTON* m_browseButton; wxStaticText* m_labelPreview; - wxBitmapButton* m_bRefreshPreview; + STD_BITMAP_BUTTON* m_bRefreshPreview; wxTextCtrl* m_textOutput; wxButton* m_buttonExport; wxButton* m_buttonApply;