diff --git a/eeschema/dialogs/dialog_label_properties_base.cpp b/eeschema/dialogs/dialog_label_properties_base.cpp index bb7bad9bdc..b5fdf84c16 100644 --- a/eeschema/dialogs/dialog_label_properties_base.cpp +++ b/eeschema/dialogs/dialog_label_properties_base.cpp @@ -60,7 +60,7 @@ DIALOG_LABEL_PROPERTIES_BASE::DIALOG_LABEL_PROPERTIES_BASE( wxWindow* parent, wx m_grid = new WX_GRID( sbFields->GetStaticBox(), wxID_ANY, wxDefaultPosition, wxDefaultSize, 0 ); // Grid - m_grid->CreateGrid( 4, 11 ); + m_grid->CreateGrid( 4, 13 ); m_grid->EnableEditing( true ); m_grid->EnableGridLines( true ); m_grid->EnableDragGridSize( false ); @@ -78,6 +78,8 @@ DIALOG_LABEL_PROPERTIES_BASE::DIALOG_LABEL_PROPERTIES_BASE( wxWindow* parent, wx m_grid->SetColSize( 8, 48 ); m_grid->SetColSize( 9, 84 ); m_grid->SetColSize( 10, 84 ); + m_grid->SetColSize( 11, 140 ); + m_grid->SetColSize( 12, 48 ); m_grid->EnableDragColMove( false ); m_grid->EnableDragColSize( true ); m_grid->SetColLabelSize( 22 ); @@ -92,6 +94,8 @@ DIALOG_LABEL_PROPERTIES_BASE::DIALOG_LABEL_PROPERTIES_BASE( wxWindow* parent, wx m_grid->SetColLabelValue( 8, _("Orientation") ); m_grid->SetColLabelValue( 9, _("X Position") ); m_grid->SetColLabelValue( 10, _("Y Position") ); + m_grid->SetColLabelValue( 11, _("Font") ); + m_grid->SetColLabelValue( 12, _("Color") ); m_grid->SetColLabelAlignment( wxALIGN_CENTER, wxALIGN_CENTER ); // Rows diff --git a/eeschema/dialogs/dialog_label_properties_base.fbp b/eeschema/dialogs/dialog_label_properties_base.fbp index 7fe2d0f073..a8e2754557 100644 --- a/eeschema/dialogs/dialog_label_properties_base.fbp +++ b/eeschema/dialogs/dialog_label_properties_base.fbp @@ -444,10 +444,10 @@ 1 wxALIGN_CENTER 22 - "Name" "Value" "Show" "H Align" "V Align" "Italic" "Bold" "Text Size" "Orientation" "X Position" "Y Position" + "Name" "Value" "Show" "H Align" "V Align" "Italic" "Bold" "Text Size" "Orientation" "X Position" "Y Position" "Font" "Color" wxALIGN_CENTER - 11 - 72,84,48,72,72,48,48,84,48,84,84 + 13 + 72,84,48,72,72,48,48,84,48,84,84,140,48 1 0 diff --git a/eeschema/dialogs/dialog_lib_symbol_properties_base.cpp b/eeschema/dialogs/dialog_lib_symbol_properties_base.cpp index fc8ad78b5a..e80d95a3d5 100644 --- a/eeschema/dialogs/dialog_lib_symbol_properties_base.cpp +++ b/eeschema/dialogs/dialog_lib_symbol_properties_base.cpp @@ -32,7 +32,7 @@ DIALOG_LIB_SYMBOL_PROPERTIES_BASE::DIALOG_LIB_SYMBOL_PROPERTIES_BASE( wxWindow* m_grid = new WX_GRID( sbSizer4->GetStaticBox(), wxID_ANY, wxDefaultPosition, wxDefaultSize, 0 ); // Grid - m_grid->CreateGrid( 4, 11 ); + m_grid->CreateGrid( 4, 13 ); m_grid->EnableEditing( true ); m_grid->EnableGridLines( true ); m_grid->EnableDragGridSize( false ); @@ -50,6 +50,8 @@ DIALOG_LIB_SYMBOL_PROPERTIES_BASE::DIALOG_LIB_SYMBOL_PROPERTIES_BASE( wxWindow* m_grid->SetColSize( 8, 84 ); m_grid->SetColSize( 9, 84 ); m_grid->SetColSize( 10, 84 ); + m_grid->SetColSize( 11, 140 ); + m_grid->SetColSize( 12, 48 ); m_grid->EnableDragColMove( false ); m_grid->EnableDragColSize( true ); m_grid->SetColLabelSize( 22 ); @@ -64,6 +66,8 @@ DIALOG_LIB_SYMBOL_PROPERTIES_BASE::DIALOG_LIB_SYMBOL_PROPERTIES_BASE( wxWindow* m_grid->SetColLabelValue( 8, _("Orientation") ); m_grid->SetColLabelValue( 9, _("X Position") ); m_grid->SetColLabelValue( 10, _("Y Position") ); + m_grid->SetColLabelValue( 11, _("Font") ); + m_grid->SetColLabelValue( 12, _("Color") ); m_grid->SetColLabelAlignment( wxALIGN_CENTER, wxALIGN_CENTER ); // Rows diff --git a/eeschema/dialogs/dialog_lib_symbol_properties_base.fbp b/eeschema/dialogs/dialog_lib_symbol_properties_base.fbp index c5f6b7e840..2ccbcb12ed 100644 --- a/eeschema/dialogs/dialog_lib_symbol_properties_base.fbp +++ b/eeschema/dialogs/dialog_lib_symbol_properties_base.fbp @@ -225,10 +225,10 @@ 1 wxALIGN_CENTER 22 - "Name" "Value" "Show" "H Align" "V Align" "Italic" "Bold" "Text Size" "Orientation" "X Position" "Y Position" + "Name" "Value" "Show" "H Align" "V Align" "Italic" "Bold" "Text Size" "Orientation" "X Position" "Y Position" "Font" "Color" wxALIGN_CENTER - 11 - 72,120,48,72,72,48,48,84,84,84,84 + 13 + 72,120,48,72,72,48,48,84,84,84,84,140,48 1 0 diff --git a/eeschema/dialogs/dialog_sheet_properties_base.cpp b/eeschema/dialogs/dialog_sheet_properties_base.cpp index 366cdc0e0a..a4e82e9b80 100644 --- a/eeschema/dialogs/dialog_sheet_properties_base.cpp +++ b/eeschema/dialogs/dialog_sheet_properties_base.cpp @@ -34,7 +34,7 @@ DIALOG_SHEET_PROPERTIES_BASE::DIALOG_SHEET_PROPERTIES_BASE( wxWindow* parent, wx m_grid = new WX_GRID( sbFields->GetStaticBox(), wxID_ANY, wxDefaultPosition, wxDefaultSize, 0 ); // Grid - m_grid->CreateGrid( 4, 11 ); + m_grid->CreateGrid( 4, 13 ); m_grid->EnableEditing( true ); m_grid->EnableGridLines( true ); m_grid->EnableDragGridSize( false ); @@ -52,6 +52,8 @@ DIALOG_SHEET_PROPERTIES_BASE::DIALOG_SHEET_PROPERTIES_BASE( wxWindow* parent, wx m_grid->SetColSize( 8, 84 ); m_grid->SetColSize( 9, 84 ); m_grid->SetColSize( 10, 84 ); + m_grid->SetColSize( 11, 140 ); + m_grid->SetColSize( 12, 48 ); m_grid->EnableDragColMove( false ); m_grid->EnableDragColSize( true ); m_grid->SetColLabelSize( 22 ); @@ -66,6 +68,8 @@ DIALOG_SHEET_PROPERTIES_BASE::DIALOG_SHEET_PROPERTIES_BASE( wxWindow* parent, wx m_grid->SetColLabelValue( 8, _("Orientation") ); m_grid->SetColLabelValue( 9, _("X Position") ); m_grid->SetColLabelValue( 10, _("Y Position") ); + m_grid->SetColLabelValue( 11, _("Font") ); + m_grid->SetColLabelValue( 12, _("Color") ); m_grid->SetColLabelAlignment( wxALIGN_CENTER, wxALIGN_CENTER ); // Rows diff --git a/eeschema/dialogs/dialog_sheet_properties_base.fbp b/eeschema/dialogs/dialog_sheet_properties_base.fbp index 7ff2b2569a..646ddb154c 100644 --- a/eeschema/dialogs/dialog_sheet_properties_base.fbp +++ b/eeschema/dialogs/dialog_sheet_properties_base.fbp @@ -169,10 +169,10 @@ 1 wxALIGN_CENTER 22 - "Name" "Value" "Show" "H Align" "V Align" "Italic" "Bold" "Text Size" "Orientation" "X Position" "Y Position" + "Name" "Value" "Show" "H Align" "V Align" "Italic" "Bold" "Text Size" "Orientation" "X Position" "Y Position" "Font" "Color" wxALIGN_CENTER - 11 - 72,120,48,72,72,48,48,84,84,84,84 + 13 + 72,120,48,72,72,48,48,84,84,84,84,140,48 1 0 diff --git a/eeschema/dialogs/dialog_symbol_properties.cpp b/eeschema/dialogs/dialog_symbol_properties.cpp index d3cc2e661f..1d546b89c5 100644 --- a/eeschema/dialogs/dialog_symbol_properties.cpp +++ b/eeschema/dialogs/dialog_symbol_properties.cpp @@ -1006,9 +1006,11 @@ void DIALOG_SYMBOL_PROPERTIES::OnPinTableCellEdited( wxGridEvent& aEvent ) { int row = aEvent.GetRow(); - if( m_pinGrid->GetCellValue( row, COL_ALT_NAME ) == - m_dataModel->GetValue( row, COL_BASE_NAME ) ) + if( m_pinGrid->GetCellValue( row, COL_ALT_NAME ) + == m_dataModel->GetValue( row, COL_BASE_NAME ) ) + { m_dataModel->SetValue( row, COL_ALT_NAME, wxEmptyString ); + } // These are just to get the cells refreshed m_dataModel->SetValue( row, COL_TYPE, m_dataModel->GetValue( row, COL_TYPE ) ); diff --git a/eeschema/dialogs/dialog_symbol_properties_base.cpp b/eeschema/dialogs/dialog_symbol_properties_base.cpp index 9c1948a335..f726eff10b 100644 --- a/eeschema/dialogs/dialog_symbol_properties_base.cpp +++ b/eeschema/dialogs/dialog_symbol_properties_base.cpp @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version 3.10.0-4761b0c5) +// C++ code generated with wxFormBuilder (version Oct 26 2018) // http://www.wxformbuilder.org/ // // PLEASE DO *NOT* EDIT THIS FILE! @@ -29,7 +29,7 @@ DIALOG_SYMBOL_PROPERTIES_BASE::DIALOG_SYMBOL_PROPERTIES_BASE( wxWindow* parent, m_fieldsGrid = new WX_GRID( sbFields->GetStaticBox(), wxID_ANY, wxDefaultPosition, wxDefaultSize, 0 ); // Grid - m_fieldsGrid->CreateGrid( 4, 11 ); + m_fieldsGrid->CreateGrid( 4, 13 ); m_fieldsGrid->EnableEditing( true ); m_fieldsGrid->EnableGridLines( true ); m_fieldsGrid->EnableDragGridSize( false ); @@ -47,8 +47,11 @@ DIALOG_SYMBOL_PROPERTIES_BASE::DIALOG_SYMBOL_PROPERTIES_BASE( wxWindow* parent, m_fieldsGrid->SetColSize( 8, 84 ); m_fieldsGrid->SetColSize( 9, 84 ); m_fieldsGrid->SetColSize( 10, 84 ); + m_fieldsGrid->SetColSize( 11, 140 ); + m_fieldsGrid->SetColSize( 12, 48 ); m_fieldsGrid->EnableDragColMove( false ); m_fieldsGrid->EnableDragColSize( true ); + m_fieldsGrid->SetColLabelSize( 22 ); m_fieldsGrid->SetColLabelValue( 0, _("Name") ); m_fieldsGrid->SetColLabelValue( 1, _("Value") ); m_fieldsGrid->SetColLabelValue( 2, _("Show") ); @@ -60,7 +63,8 @@ DIALOG_SYMBOL_PROPERTIES_BASE::DIALOG_SYMBOL_PROPERTIES_BASE( wxWindow* parent, m_fieldsGrid->SetColLabelValue( 8, _("Orientation") ); m_fieldsGrid->SetColLabelValue( 9, _("X Position") ); m_fieldsGrid->SetColLabelValue( 10, _("Y Position") ); - m_fieldsGrid->SetColLabelSize( 22 ); + m_fieldsGrid->SetColLabelValue( 11, _("Font") ); + m_fieldsGrid->SetColLabelValue( 12, _("Color") ); m_fieldsGrid->SetColLabelAlignment( wxALIGN_CENTER, wxALIGN_CENTER ); // Rows @@ -265,12 +269,12 @@ DIALOG_SYMBOL_PROPERTIES_BASE::DIALOG_SYMBOL_PROPERTIES_BASE( wxWindow* parent, m_pinGrid->SetColSize( 4, 140 ); m_pinGrid->EnableDragColMove( false ); m_pinGrid->EnableDragColSize( true ); + m_pinGrid->SetColLabelSize( 24 ); m_pinGrid->SetColLabelValue( 0, _("Pin Number") ); m_pinGrid->SetColLabelValue( 1, _("Base Pin Name") ); m_pinGrid->SetColLabelValue( 2, _("Alternate Assignment") ); m_pinGrid->SetColLabelValue( 3, _("Electrical Type") ); m_pinGrid->SetColLabelValue( 4, _("Graphic Style") ); - m_pinGrid->SetColLabelSize( 24 ); m_pinGrid->SetColLabelAlignment( wxALIGN_CENTER, wxALIGN_CENTER ); // Rows diff --git a/eeschema/dialogs/dialog_symbol_properties_base.fbp b/eeschema/dialogs/dialog_symbol_properties_base.fbp index 6c0c368cc2..085d71b9ee 100644 --- a/eeschema/dialogs/dialog_symbol_properties_base.fbp +++ b/eeschema/dialogs/dialog_symbol_properties_base.fbp @@ -1,6 +1,6 @@ - + ; C++ @@ -14,7 +14,6 @@ dialog_symbol_properties_base 1000 none - 1 dialog_edit_component_in_schematic_base @@ -26,7 +25,6 @@ 1 1 UI - 0 0 0 @@ -52,7 +50,6 @@ DIALOG_SHIM; dialog_shim.h Symbol Properties - 0 @@ -220,10 +217,10 @@ 1 wxALIGN_CENTER 22 - "Name" "Value" "Show" "H Align" "V Align" "Italic" "Bold" "Text Size" "Orientation" "X Position" "Y Position" + "Name" "Value" "Show" "H Align" "V Align" "Italic" "Bold" "Text Size" "Orientation" "X Position" "Y Position" "Font" "Color" wxALIGN_CENTER - 11 - 72,120,48,72,72,48,48,84,84,84,84 + 13 + 72,120,48,72,72,48,48,84,84,84,84,140,48 1 0 @@ -305,7 +302,6 @@ - 0 @@ -379,7 +375,6 @@ - 0 @@ -453,7 +448,6 @@ - 0 @@ -537,7 +531,6 @@ - 0 @@ -1504,7 +1497,6 @@ - 0 @@ -1578,7 +1570,6 @@ - 0 @@ -1652,7 +1643,6 @@ - 0 @@ -1736,7 +1726,6 @@ - 0 @@ -2138,7 +2127,6 @@ - 0 diff --git a/eeschema/dialogs/dialog_symbol_properties_base.h b/eeschema/dialogs/dialog_symbol_properties_base.h index e6d956ad02..e93aa1fca1 100644 --- a/eeschema/dialogs/dialog_symbol_properties_base.h +++ b/eeschema/dialogs/dialog_symbol_properties_base.h @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version 3.10.0-4761b0c5) +// C++ code generated with wxFormBuilder (version Oct 26 2018) // http://www.wxformbuilder.org/ // // PLEASE DO *NOT* EDIT THIS FILE! @@ -78,7 +78,7 @@ class DIALOG_SYMBOL_PROPERTIES_BASE : public DIALOG_SHIM wxButton* m_stdDialogButtonSizerOK; wxButton* m_stdDialogButtonSizerCancel; - // Virtual event handlers, override them in your derived class + // Virtual event handlers, overide them in your derived class virtual void OnInitDlg( wxInitDialogEvent& event ) { event.Skip(); } virtual void OnUpdateUI( wxUpdateUIEvent& event ) { event.Skip(); } virtual void OnGridEditorHidden( wxGridEvent& event ) { event.Skip(); } @@ -103,7 +103,6 @@ class DIALOG_SYMBOL_PROPERTIES_BASE : public DIALOG_SHIM public: DIALOG_SYMBOL_PROPERTIES_BASE( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Symbol Properties"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( -1,-1 ), long style = wxCAPTION|wxCLOSE_BOX|wxDEFAULT_DIALOG_STYLE|wxMAXIMIZE_BOX|wxMINIMIZE_BOX|wxRESIZE_BORDER|wxSYSTEM_MENU ); - ~DIALOG_SYMBOL_PROPERTIES_BASE(); }; diff --git a/eeschema/fields_grid_table.cpp b/eeschema/fields_grid_table.cpp index 1458ec7922..2a2df29fd5 100644 --- a/eeschema/fields_grid_table.cpp +++ b/eeschema/fields_grid_table.cpp @@ -40,10 +40,14 @@ #include #include #include "eda_doc.h" +#include "widgets/grid_color_swatch_helpers.h" +#include "font/fontconfig.h" +#include "font/kicad_font_name.h" #include #include #include + enum { MYID_SELECT_FOOTPRINT = GRIDTRICKS_FIRST_CLIENT_ID, @@ -51,6 +55,9 @@ enum }; +#define DEFAULT_FONT_NAME _( "Default Font" ) + + template FIELDS_GRID_TABLE::FIELDS_GRID_TABLE( DIALOG_SHIM* aDialog, SCH_BASE_FRAME* aFrame, WX_GRID* aGrid, LIB_SYMBOL* aSymbol ) : @@ -212,6 +219,24 @@ void FIELDS_GRID_TABLE::initGrid( WX_GRID* aGrid ) m_netclassAttr = new wxGridCellAttr; m_netclassAttr->SetEditor( new GRID_CELL_COMBOBOX( existingNetclasses ) ); + wxArrayString fonts; + std::vector fontNames; + Fontconfig()->ListFonts( fontNames ); + + for( const std::string& name : fontNames ) + fonts.Add( wxString( name ) ); + + fonts.Sort(); + fonts.Insert( KICAD_FONT_NAME, 0 ); + fonts.Insert( DEFAULT_FONT_NAME, 0 ); + + m_fontAttr = new wxGridCellAttr; + m_fontAttr->SetEditor( new GRID_CELL_COMBOBOX( fonts ) ); + + m_colorAttr = new wxGridCellAttr; + m_colorAttr->SetRenderer( new GRID_CELL_COLOR_RENDERER( m_dialog ) ); + m_colorAttr->SetEditor( new GRID_CELL_COLOR_SELECTOR( m_dialog, aGrid ) ); + m_frame->Bind( UNITS_CHANGED, &FIELDS_GRID_TABLE::onUnitsChanged, this ); } @@ -232,6 +257,8 @@ FIELDS_GRID_TABLE::~FIELDS_GRID_TABLE() m_hAlignAttr->DecRef(); m_orientationAttr->DecRef(); m_netclassAttr->DecRef(); + m_fontAttr->DecRef(); + m_colorAttr->DecRef(); m_frame->Unbind( UNITS_CHANGED, &FIELDS_GRID_TABLE::onUnitsChanged, this ); } @@ -263,6 +290,8 @@ wxString FIELDS_GRID_TABLE::GetColLabelValue( int aCol ) case FDC_ORIENTATION: return _( "Orientation" ); case FDC_POSX: return _( "X Position" ); case FDC_POSY: return _( "Y Position" ); + case FDC_FONT: return _( "Font" ); + case FDC_COLOR: return _( "Color" ); default: wxFAIL; return wxEmptyString; } } @@ -281,6 +310,8 @@ bool FIELDS_GRID_TABLE::CanGetValueAs( int aRow, int aCol, const wxString& aT case FDC_ORIENTATION: case FDC_POSX: case FDC_POSY: + case FDC_FONT: + case FDC_COLOR: return aTypeName == wxGRID_VALUE_STRING; case FDC_SHOWN: @@ -415,6 +446,14 @@ wxGridCellAttr* FIELDS_GRID_TABLE::GetAttr( int aRow, int aCol, wxGridCellAtt m_boolAttr->IncRef(); return m_boolAttr; + case FDC_FONT: + m_fontAttr->IncRef(); + return m_fontAttr; + + case FDC_COLOR: + m_colorAttr->IncRef(); + return m_colorAttr; + default: wxFAIL; return nullptr; @@ -504,6 +543,15 @@ wxString FIELDS_GRID_TABLE::GetValue( int aRow, int aCol ) case FDC_POSY: return StringFromValue( m_frame->GetUserUnits(), field.GetTextPos().y, true ); + case FDC_FONT: + if( field.GetFont() ) + return field.GetFont()->GetName(); + else + return DEFAULT_FONT_NAME; + + case FDC_COLOR: + return field.GetTextColor().ToWxString( wxC2S_CSS_SYNTAX ); + default: // we can't assert here because wxWidgets sometimes calls this without checking // the column type when trying to see if there's an overflow @@ -567,8 +615,8 @@ void FIELDS_GRID_TABLE::SetValue( int aRow, int aCol, const wxString &aValue } field.SetText( value ); - } break; + } case FDC_SHOWN: field.SetVisible( BoolFromString( aValue ) ); @@ -583,6 +631,7 @@ void FIELDS_GRID_TABLE::SetValue( int aRow, int aCol, const wxString &aValue field.SetHorizJustify( GR_TEXT_H_ALIGN_RIGHT ); else wxFAIL_MSG( wxT( "unknown horizontal alignment: " ) + aValue ); + break; case FDC_V_ALIGN: @@ -594,6 +643,7 @@ void FIELDS_GRID_TABLE::SetValue( int aRow, int aCol, const wxString &aValue field.SetVertJustify( GR_TEXT_V_ALIGN_BOTTOM ); else wxFAIL_MSG( wxT( "unknown vertical alignment: " ) + aValue); + break; case FDC_ITALIC: @@ -616,18 +666,35 @@ void FIELDS_GRID_TABLE::SetValue( int aRow, int aCol, const wxString &aValue field.SetTextAngle( ANGLE_VERTICAL ); else wxFAIL_MSG( wxT( "unknown orientation: " ) + aValue ); + break; case FDC_POSX: case FDC_POSY: pos = field.GetTextPos(); + if( aCol == FDC_POSX ) pos.x = ValueFromString( m_frame->GetUserUnits(), aValue ); else pos.y = ValueFromString( m_frame->GetUserUnits(), aValue ); + field.SetTextPos( pos ); break; + case FDC_FONT: + if( aValue == DEFAULT_FONT_NAME ) + field.SetFont( nullptr ); + else if( aValue == KICAD_FONT_NAME ) + field.SetFont( KIFONT::FONT::GetFont( wxEmptyString, field.IsBold(), field.IsItalic() ) ); + else + field.SetFont( KIFONT::FONT::GetFont( aValue, field.IsBold(), field.IsItalic() ) ); + + break; + + case FDC_COLOR: + field.SetTextColor( wxColor( aValue ) ); + break; + default: wxFAIL_MSG( wxString::Format( wxT( "column %d doesn't hold a string value" ), aCol ) ); break; @@ -650,12 +717,15 @@ void FIELDS_GRID_TABLE::SetValueAsBool( int aRow, int aCol, bool aValue ) case FDC_SHOWN: field.SetVisible( aValue ); break; + case FDC_ITALIC: field.SetItalic( aValue ); break; + case FDC_BOLD: field.SetBold( aValue ); break; + default: wxFAIL_MSG( wxString::Format( wxT( "column %d doesn't hold a bool value" ), aCol ) ); break; diff --git a/eeschema/fields_grid_table.h b/eeschema/fields_grid_table.h index 936627d5c4..604a7f02b5 100644 --- a/eeschema/fields_grid_table.h +++ b/eeschema/fields_grid_table.h @@ -1,7 +1,7 @@ /* * This program source code file is part of KiCad, a free EDA CAD application. * - * Copyright (C) 2018-2021 KiCad Developers, see AUTHORS.txt for contributors. + * Copyright (C) 2018-2022 KiCad Developers, see AUTHORS.txt for contributors. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -64,6 +64,8 @@ enum FIELDS_DATA_COL_ORDER FDC_ORIENTATION, FDC_POSX, FDC_POSY, + FDC_FONT, + FDC_COLOR, FDC_COUNT // keep as last }; @@ -139,6 +141,8 @@ private: wxGridCellAttr* m_hAlignAttr; wxGridCellAttr* m_orientationAttr; wxGridCellAttr* m_netclassAttr; + wxGridCellAttr* m_fontAttr; + wxGridCellAttr* m_colorAttr; };