Mirrors
/
kicad
mirror of https://github.com/KiCad/kicad-source-mirror
3
0
Fork 0
Code Releases Activity
Browse Source

Add Show Name column to FormBuilder files.

7.0
Jeff Young 3 years ago
parent
b4a75cd1d5
commit
4c18dfebb9
6 changed files with 67 additions and 61 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 38
      eeschema/dialogs/dialog_label_properties_base.cpp
  2. 6
      eeschema/dialogs/dialog_label_properties_base.fbp
  3. 36
      eeschema/dialogs/dialog_lib_symbol_properties_base.cpp
  4. 6
      eeschema/dialogs/dialog_lib_symbol_properties_base.fbp
  5. 36
      eeschema/dialogs/dialog_symbol_properties_base.cpp
  6. 6
      eeschema/dialogs/dialog_symbol_properties_base.fbp

38
eeschema/dialogs/dialog_label_properties_base.cpp
View File

@ -61,7 +61,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, 13 );
m_grid->CreateGrid( 4, 14 );
m_grid->EnableEditing( true );
m_grid->EnableGridLines( true );
m_grid->EnableDragGridSize( false );
@ -71,31 +71,33 @@ DIALOG_LABEL_PROPERTIES_BASE::DIALOG_LABEL_PROPERTIES_BASE( wxWindow* parent, wx
m_grid->SetColSize( 0, 72 );
m_grid->SetColSize( 1, 84 );
m_grid->SetColSize( 2, 48 );
m_grid->SetColSize( 3, 70 );
m_grid->SetColSize( 3, 84 );
m_grid->SetColSize( 4, 70 );
m_grid->SetColSize( 5, 48 );
m_grid->SetColSize( 5, 70 );
m_grid->SetColSize( 6, 48 );
m_grid->SetColSize( 7, 80 );
m_grid->SetColSize( 8, 48 );
m_grid->SetColSize( 9, 80 );
m_grid->SetColSize( 7, 48 );
m_grid->SetColSize( 8, 80 );
m_grid->SetColSize( 9, 48 );
m_grid->SetColSize( 10, 80 );
m_grid->SetColSize( 11, 100 );
m_grid->SetColSize( 12, 48 );
m_grid->SetColSize( 11, 80 );
m_grid->SetColSize( 12, 100 );
m_grid->SetColSize( 13, 48 );
m_grid->EnableDragColMove( false );
m_grid->EnableDragColSize( true );
m_grid->SetColLabelValue( 0, _("Name") );
m_grid->SetColLabelValue( 1, _("Value") );
m_grid->SetColLabelValue( 2, _("Show") );
m_grid->SetColLabelValue( 3, _("H Align") );
m_grid->SetColLabelValue( 4, _("V Align") );
m_grid->SetColLabelValue( 5, _("Italic") );
m_grid->SetColLabelValue( 6, _("Bold") );
m_grid->SetColLabelValue( 7, _("Text Size") );
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->SetColLabelValue( 3, _("Show Name") );
m_grid->SetColLabelValue( 4, _("H Align") );
m_grid->SetColLabelValue( 5, _("V Align") );
m_grid->SetColLabelValue( 6, _("Italic") );
m_grid->SetColLabelValue( 7, _("Bold") );
m_grid->SetColLabelValue( 8, _("Text Size") );
m_grid->SetColLabelValue( 9, _("Orientation") );
m_grid->SetColLabelValue( 10, _("X Position") );
m_grid->SetColLabelValue( 11, _("Y Position") );
m_grid->SetColLabelValue( 12, _("Font") );
m_grid->SetColLabelValue( 13, _("Color") );
m_grid->SetColLabelSize( 22 );
m_grid->SetColLabelAlignment( wxALIGN_CENTER, wxALIGN_CENTER );

6
eeschema/dialogs/dialog_label_properties_base.fbp
View File

@ -449,10 +449,10 @@
<property name="close_button">1</property>
<property name="col_label_horiz_alignment">wxALIGN_CENTER</property>
<property name="col_label_size">22</property>
<property name="col_label_values">&quot;Name&quot; &quot;Value&quot; &quot;Show&quot; &quot;H Align&quot; &quot;V Align&quot; &quot;Italic&quot; &quot;Bold&quot; &quot;Text Size&quot; &quot;Orientation&quot; &quot;X Position&quot; &quot;Y Position&quot; &quot;Font&quot; &quot;Color&quot;</property>
<property name="col_label_values">&quot;Name&quot; &quot;Value&quot; &quot;Show&quot; &quot;Show Name&quot; &quot;H Align&quot; &quot;V Align&quot; &quot;Italic&quot; &quot;Bold&quot; &quot;Text Size&quot; &quot;Orientation&quot; &quot;X Position&quot; &quot;Y Position&quot; &quot;Font&quot; &quot;Color&quot;</property>
<property name="col_label_vert_alignment">wxALIGN_CENTER</property>
<property name="cols">13</property>
<property name="column_sizes">72,84,48,70,70,48,48,80,48,80,80,100,48</property>
<property name="cols">14</property>
<property name="column_sizes">72,84,48,84,70,70,48,48,80,48,80,80,100,48</property>
<property name="context_help"></property>
<property name="context_menu">1</property>
<property name="default_pane">0</property>

36
eeschema/dialogs/dialog_lib_symbol_properties_base.cpp
View File

@ -33,7 +33,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, 13 );
m_grid->CreateGrid( 4, 14 );
m_grid->EnableEditing( true );
m_grid->EnableGridLines( true );
m_grid->EnableDragGridSize( false );
@ -43,31 +43,33 @@ DIALOG_LIB_SYMBOL_PROPERTIES_BASE::DIALOG_LIB_SYMBOL_PROPERTIES_BASE( wxWindow*
m_grid->SetColSize( 0, 72 );
m_grid->SetColSize( 1, 120 );
m_grid->SetColSize( 2, 48 );
m_grid->SetColSize( 3, 72 );
m_grid->SetColSize( 4, 72 );
m_grid->SetColSize( 5, 48 );
m_grid->SetColSize( 3, 84 );
m_grid->SetColSize( 4, 70 );
m_grid->SetColSize( 5, 70 );
m_grid->SetColSize( 6, 48 );
m_grid->SetColSize( 7, 84 );
m_grid->SetColSize( 7, 48 );
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->SetColSize( 11, 84 );
m_grid->SetColSize( 12, 140 );
m_grid->SetColSize( 13, 48 );
m_grid->EnableDragColMove( false );
m_grid->EnableDragColSize( true );
m_grid->SetColLabelValue( 0, _("Name") );
m_grid->SetColLabelValue( 1, _("Value") );
m_grid->SetColLabelValue( 2, _("Show") );
m_grid->SetColLabelValue( 3, _("H Align") );
m_grid->SetColLabelValue( 4, _("V Align") );
m_grid->SetColLabelValue( 5, _("Italic") );
m_grid->SetColLabelValue( 6, _("Bold") );
m_grid->SetColLabelValue( 7, _("Text Size") );
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->SetColLabelValue( 3, _("Show Name") );
m_grid->SetColLabelValue( 4, _("H Align") );
m_grid->SetColLabelValue( 5, _("V Align") );
m_grid->SetColLabelValue( 6, _("Italic") );
m_grid->SetColLabelValue( 7, _("Bold") );
m_grid->SetColLabelValue( 8, _("Text Size") );
m_grid->SetColLabelValue( 9, _("Orientation") );
m_grid->SetColLabelValue( 10, _("X Position") );
m_grid->SetColLabelValue( 11, _("Y Position") );
m_grid->SetColLabelValue( 12, _("Font") );
m_grid->SetColLabelValue( 13, _("Color") );
m_grid->SetColLabelSize( 22 );
m_grid->SetColLabelAlignment( wxALIGN_CENTER, wxALIGN_CENTER );

6
eeschema/dialogs/dialog_lib_symbol_properties_base.fbp
View File

@ -228,10 +228,10 @@
<property name="close_button">1</property>
<property name="col_label_horiz_alignment">wxALIGN_CENTER</property>
<property name="col_label_size">22</property>
<property name="col_label_values">&quot;Name&quot; &quot;Value&quot; &quot;Show&quot; &quot;H Align&quot; &quot;V Align&quot; &quot;Italic&quot; &quot;Bold&quot; &quot;Text Size&quot; &quot;Orientation&quot; &quot;X Position&quot; &quot;Y Position&quot; &quot;Font&quot; &quot;Color&quot;</property>
<property name="col_label_values">&quot;Name&quot; &quot;Value&quot; &quot;Show&quot; &quot;Show Name&quot; &quot;H Align&quot; &quot;V Align&quot; &quot;Italic&quot; &quot;Bold&quot; &quot;Text Size&quot; &quot;Orientation&quot; &quot;X Position&quot; &quot;Y Position&quot; &quot;Font&quot; &quot;Color&quot;</property>
<property name="col_label_vert_alignment">wxALIGN_CENTER</property>
<property name="cols">13</property>
<property name="column_sizes">72,120,48,72,72,48,48,84,84,84,84,140,48</property>
<property name="cols">14</property>
<property name="column_sizes">72,120,48,84,70,70,48,48,84,84,84,84,140,48</property>
<property name="context_help"></property>
<property name="context_menu">1</property>
<property name="default_pane">0</property>

36
eeschema/dialogs/dialog_symbol_properties_base.cpp
View File

@ -30,7 +30,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, 13 );
m_fieldsGrid->CreateGrid( 4, 14 );
m_fieldsGrid->EnableEditing( true );
m_fieldsGrid->EnableGridLines( true );
m_fieldsGrid->EnableDragGridSize( false );
@ -40,31 +40,33 @@ DIALOG_SYMBOL_PROPERTIES_BASE::DIALOG_SYMBOL_PROPERTIES_BASE( wxWindow* parent,
m_fieldsGrid->SetColSize( 0, 72 );
m_fieldsGrid->SetColSize( 1, 120 );
m_fieldsGrid->SetColSize( 2, 48 );
m_fieldsGrid->SetColSize( 3, 72 );
m_fieldsGrid->SetColSize( 4, 72 );
m_fieldsGrid->SetColSize( 5, 48 );
m_fieldsGrid->SetColSize( 3, 84 );
m_fieldsGrid->SetColSize( 4, 70 );
m_fieldsGrid->SetColSize( 5, 70 );
m_fieldsGrid->SetColSize( 6, 48 );
m_fieldsGrid->SetColSize( 7, 84 );
m_fieldsGrid->SetColSize( 7, 48 );
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->SetColSize( 11, 84 );
m_fieldsGrid->SetColSize( 12, 140 );
m_fieldsGrid->SetColSize( 13, 48 );
m_fieldsGrid->EnableDragColMove( false );
m_fieldsGrid->EnableDragColSize( true );
m_fieldsGrid->SetColLabelValue( 0, _("Name") );
m_fieldsGrid->SetColLabelValue( 1, _("Value") );
m_fieldsGrid->SetColLabelValue( 2, _("Show") );
m_fieldsGrid->SetColLabelValue( 3, _("H Align") );
m_fieldsGrid->SetColLabelValue( 4, _("V Align") );
m_fieldsGrid->SetColLabelValue( 5, _("Italic") );
m_fieldsGrid->SetColLabelValue( 6, _("Bold") );
m_fieldsGrid->SetColLabelValue( 7, _("Text Size") );
m_fieldsGrid->SetColLabelValue( 8, _("Orientation") );
m_fieldsGrid->SetColLabelValue( 9, _("X Position") );
m_fieldsGrid->SetColLabelValue( 10, _("Y Position") );
m_fieldsGrid->SetColLabelValue( 11, _("Font") );
m_fieldsGrid->SetColLabelValue( 12, _("Color") );
m_fieldsGrid->SetColLabelValue( 3, _("Show Name") );
m_fieldsGrid->SetColLabelValue( 4, _("H Align") );
m_fieldsGrid->SetColLabelValue( 5, _("V Align") );
m_fieldsGrid->SetColLabelValue( 6, _("Italic") );
m_fieldsGrid->SetColLabelValue( 7, _("Bold") );
m_fieldsGrid->SetColLabelValue( 8, _("Text Size") );
m_fieldsGrid->SetColLabelValue( 9, _("Orientation") );
m_fieldsGrid->SetColLabelValue( 10, _("X Position") );
m_fieldsGrid->SetColLabelValue( 11, _("Y Position") );
m_fieldsGrid->SetColLabelValue( 12, _("Font") );
m_fieldsGrid->SetColLabelValue( 13, _("Color") );
m_fieldsGrid->SetColLabelSize( 22 );
m_fieldsGrid->SetColLabelAlignment( wxALIGN_CENTER, wxALIGN_CENTER );

6
eeschema/dialogs/dialog_symbol_properties_base.fbp
View File

@ -220,10 +220,10 @@
<property name="close_button">1</property>
<property name="col_label_horiz_alignment">wxALIGN_CENTER</property>
<property name="col_label_size">22</property>
<property name="col_label_values">&quot;Name&quot; &quot;Value&quot; &quot;Show&quot; &quot;H Align&quot; &quot;V Align&quot; &quot;Italic&quot; &quot;Bold&quot; &quot;Text Size&quot; &quot;Orientation&quot; &quot;X Position&quot; &quot;Y Position&quot; &quot;Font&quot; &quot;Color&quot;</property>
<property name="col_label_values">&quot;Name&quot; &quot;Value&quot; &quot;Show&quot; &quot;Show Name&quot; &quot;H Align&quot; &quot;V Align&quot; &quot;Italic&quot; &quot;Bold&quot; &quot;Text Size&quot; &quot;Orientation&quot; &quot;X Position&quot; &quot;Y Position&quot; &quot;Font&quot; &quot;Color&quot;</property>
<property name="col_label_vert_alignment">wxALIGN_CENTER</property>
<property name="cols">13</property>
<property name="column_sizes">72,120,48,72,72,48,48,84,84,84,84,140,48</property>
<property name="cols">14</property>
<property name="column_sizes">72,120,48,84,70,70,48,48,84,84,84,84,140,48</property>
<property name="context_help"></property>
<property name="context_menu">1</property>
<property name="default_pane">0</property>

Write Preview
Loading…
Cancel
Save