see 2007-Oct-25 change_log.txt

change_log.txt

@@ -4,6 +4,17 @@ Started 2007-June-11
 Please add newer entries at the top, list the date and your name with 
 email address.
 
+2007-Oct-25 UPDATE   Geoff Harland <gharlandau@yahoo.com.au>
+================================================================================
++ cvpcb
+  * Fine-tuned contents of dialog_display_options.cpp, dialog_display_options.h,
+    and dialog_display_options.pjd, so that the controls within the associated
+    ("Display Options") dialog box now also expand if that dialog is expanded.
++ all
+  * The share/selcolor.cpp file (which is no longer used) has been removed, and
+    replaced with share/selcolor.cpp.notused
+
+
 2007-Oct-24 UPDATE  Jean-Pierre Charras <jean-pierre.charras@inpg.fr>
 ================================================================================
 + cvpcb:

cvpcb/dialog_display_options.cpp

@@ -46,7 +46,7 @@ void WinEDA_DisplayFrame::InstallOptionsDisplay(wxCommandEvent& event)
 /*********************************************************************/
 /* Creation de la fenetre d'options de la fenetre de visu */
 {
-	KiDisplayOptionsFrame * OptionWindow = new KiDisplayOptionsFrame(this);
+	WinEDA_FootprintDisplayOptionsFrame * OptionWindow = new WinEDA_FootprintDisplayOptionsFrame(this);
 	OptionWindow->ShowModal();
 	OptionWindow->Destroy();
 }
@@ -54,47 +54,39 @@ void WinEDA_DisplayFrame::InstallOptionsDisplay(wxCommandEvent& event)
 
 
 /*!
- * KiDisplayOptionsFrame type definition
+ * WinEDA_FootprintDisplayOptionsFrame type definition
  */
 
-IMPLEMENT_DYNAMIC_CLASS( KiDisplayOptionsFrame, wxDialog )
+IMPLEMENT_DYNAMIC_CLASS( WinEDA_FootprintDisplayOptionsFrame, wxDialog )
 
 /*!
- * KiDisplayOptionsFrame event table definition
+ * WinEDA_FootprintDisplayOptionsFrame event table definition
  */
 
-BEGIN_EVENT_TABLE( KiDisplayOptionsFrame, wxDialog )
+BEGIN_EVENT_TABLE( WinEDA_FootprintDisplayOptionsFrame, wxDialog )
 
-////@begin KiDisplayOptionsFrame event table entries
-    EVT_RADIOBOX( EDGE_SELECT, KiDisplayOptionsFrame::OnEdgeSelectSelected )
+////@begin WinEDA_FootprintDisplayOptionsFrame event table entries
+    EVT_BUTTON( ID_SAVE_CONFIG, WinEDA_FootprintDisplayOptionsFrame::OnSaveConfigClick )
 
-    EVT_RADIOBOX( TEXT_SELECT, KiDisplayOptionsFrame::OnTextSelectSelected )
+    EVT_BUTTON( wxID_OK, WinEDA_FootprintDisplayOptionsFrame::OnOkClick )
 
-    EVT_CHECKBOX( PADFILL_OPT, KiDisplayOptionsFrame::OnPadfillOptClick )
+    EVT_BUTTON( wxID_CANCEL, WinEDA_FootprintDisplayOptionsFrame::OnCancelClick )
 
-    EVT_CHECKBOX( PADNUM_OPT, KiDisplayOptionsFrame::OnPadnumOptClick )
+    EVT_BUTTON( wxID_APPLY, WinEDA_FootprintDisplayOptionsFrame::OnApplyClick )
 
-    EVT_BUTTON( ID_SAVE_CONFIG, KiDisplayOptionsFrame::OnSaveConfigClick )
-
-    EVT_BUTTON( wxID_OK, KiDisplayOptionsFrame::OnOkClick )
-
-    EVT_BUTTON( wxID_CANCEL, KiDisplayOptionsFrame::OnCancelClick )
-
-    EVT_BUTTON( wxID_APPLY, KiDisplayOptionsFrame::OnApplyClick )
-
-////@end KiDisplayOptionsFrame event table entries
+////@end WinEDA_FootprintDisplayOptionsFrame event table entries
 
 END_EVENT_TABLE()
 
 /*!
- * KiDisplayOptionsFrame constructors
+ * WinEDA_FootprintDisplayOptionsFrame constructors
  */
 
-KiDisplayOptionsFrame::KiDisplayOptionsFrame( )
+WinEDA_FootprintDisplayOptionsFrame::WinEDA_FootprintDisplayOptionsFrame( )
 {
 }
 
-KiDisplayOptionsFrame::KiDisplayOptionsFrame( WinEDA_BasePcbFrame* parent, wxWindowID id, const wxString& caption, const wxPoint& pos, const wxSize& size, long style )
+WinEDA_FootprintDisplayOptionsFrame::WinEDA_FootprintDisplayOptionsFrame( WinEDA_BasePcbFrame* parent, wxWindowID id, const wxString& caption, const wxPoint& pos, const wxSize& size, long style )
 {
 	m_Parent = parent;
 
@@ -102,19 +94,23 @@ KiDisplayOptionsFrame::KiDisplayOptionsFrame( WinEDA_BasePcbFrame* parent, wxWin
 }
 
 /*!
- * KiDisplayOptionsFrame creator
+ * WinEDA_FootprintDisplayOptionsFrame creator
  */
 
-bool KiDisplayOptionsFrame::Create( wxWindow* parent, wxWindowID id, const wxString& caption, const wxPoint& pos, const wxSize& size, long style )
+bool WinEDA_FootprintDisplayOptionsFrame::Create( wxWindow* parent, wxWindowID id, const wxString& caption, const wxPoint& pos, const wxSize& size, long style )
 {
-////@begin KiDisplayOptionsFrame member initialisation
+////@begin WinEDA_FootprintDisplayOptionsFrame member initialisation
+    OuterBoxSizer = NULL;
+    MainBoxSizer = NULL;
     m_EdgesDisplayOption = NULL;
     m_TextDisplayOption = NULL;
+    ColumnBoxSizer = NULL;
     m_IsShowPadFill = NULL;
     m_IsShowPadNum = NULL;
-////@end KiDisplayOptionsFrame member initialisation
+    BottomBoxSizer = NULL;
+////@end WinEDA_FootprintDisplayOptionsFrame member initialisation
 
-////@begin KiDisplayOptionsFrame creation
+////@begin WinEDA_FootprintDisplayOptionsFrame creation
     SetExtraStyle(wxWS_EX_BLOCK_EVENTS);
     wxDialog::Create( parent, id, caption, pos, size, style );
 
@@ -124,28 +120,28 @@ bool KiDisplayOptionsFrame::Create( wxWindow* parent, wxWindowID id, const wxStr
         GetSizer()->SetSizeHints(this);
     }
     Centre();
-////@end KiDisplayOptionsFrame creation
+////@end WinEDA_FootprintDisplayOptionsFrame creation
     return true;
 }
 
 /*!
- * Control creation for KiDisplayOptionsFrame
+ * Control creation for WinEDA_FootprintDisplayOptionsFrame
  */
 
-void KiDisplayOptionsFrame::CreateControls()
+void WinEDA_FootprintDisplayOptionsFrame::CreateControls()
 {    
 	SetFont(*g_DialogFont);
 
-////@begin KiDisplayOptionsFrame content construction
-    // Generated by DialogBlocks, 24/10/2007 22:11:46 (unregistered)
+////@begin WinEDA_FootprintDisplayOptionsFrame content construction
+    // Generated by DialogBlocks, 25/10/2007 10:39:07 (unregistered)
 
-    KiDisplayOptionsFrame* itemDialog1 = this;
+    WinEDA_FootprintDisplayOptionsFrame* itemDialog1 = this;
 
-    wxBoxSizer* itemBoxSizer2 = new wxBoxSizer(wxVERTICAL);
-    itemDialog1->SetSizer(itemBoxSizer2);
+    OuterBoxSizer = new wxBoxSizer(wxVERTICAL);
+    itemDialog1->SetSizer(OuterBoxSizer);
 
-    wxBoxSizer* itemBoxSizer3 = new wxBoxSizer(wxHORIZONTAL);
-    itemBoxSizer2->Add(itemBoxSizer3, 0, wxGROW|wxALL, 5);
+    MainBoxSizer = new wxBoxSizer(wxHORIZONTAL);
+    OuterBoxSizer->Add(MainBoxSizer, 1, wxGROW|wxALL, 5);
 
     wxArrayString m_EdgesDisplayOptionStrings;
     m_EdgesDisplayOptionStrings.Add(_("&Line"));
@@ -153,7 +149,7 @@ void KiDisplayOptionsFrame::CreateControls()
     m_EdgesDisplayOptionStrings.Add(_("&Sketch"));
     m_EdgesDisplayOption = new wxRadioBox( itemDialog1, EDGE_SELECT, _("Edges:"), wxDefaultPosition, wxDefaultSize, m_EdgesDisplayOptionStrings, 1, wxRA_SPECIFY_COLS );
     m_EdgesDisplayOption->SetSelection(0);
-    itemBoxSizer3->Add(m_EdgesDisplayOption, 0, wxGROW|wxALL, 5);
+    MainBoxSizer->Add(m_EdgesDisplayOption, 1, wxALIGN_TOP|wxALL, 5);
 
     wxArrayString m_TextDisplayOptionStrings;
     m_TextDisplayOptionStrings.Add(_("&Line"));
@@ -161,57 +157,57 @@ void KiDisplayOptionsFrame::CreateControls()
     m_TextDisplayOptionStrings.Add(_("&Sketch"));
     m_TextDisplayOption = new wxRadioBox( itemDialog1, TEXT_SELECT, _("Texts:"), wxDefaultPosition, wxDefaultSize, m_TextDisplayOptionStrings, 1, wxRA_SPECIFY_COLS );
     m_TextDisplayOption->SetSelection(0);
-    itemBoxSizer3->Add(m_TextDisplayOption, 0, wxGROW|wxALL, 5);
+    MainBoxSizer->Add(m_TextDisplayOption, 1, wxALIGN_TOP|wxALL, 5);
 
-    wxBoxSizer* itemBoxSizer6 = new wxBoxSizer(wxVERTICAL);
-    itemBoxSizer3->Add(itemBoxSizer6, 0, wxGROW|wxALL, 5);
+    ColumnBoxSizer = new wxBoxSizer(wxVERTICAL);
+    MainBoxSizer->Add(ColumnBoxSizer, 1, wxALIGN_TOP|wxLEFT|wxRIGHT|wxTOP, 5);
 
     m_IsShowPadFill = new wxCheckBox( itemDialog1, PADFILL_OPT, _("&Pad Filled"), wxDefaultPosition, wxDefaultSize, wxCHK_2STATE );
     m_IsShowPadFill->SetValue(false);
-    itemBoxSizer6->Add(m_IsShowPadFill, 0, wxGROW|wxALL, 5);
+    ColumnBoxSizer->Add(m_IsShowPadFill, 1, wxGROW|wxALL, 5);
 
     m_IsShowPadNum = new wxCheckBox( itemDialog1, PADNUM_OPT, _("Display Pad &Num"), wxDefaultPosition, wxDefaultSize, wxCHK_2STATE );
     m_IsShowPadNum->SetValue(false);
-    if (ShowToolTips())
+    if (WinEDA_FootprintDisplayOptionsFrame::ShowToolTips())
         m_IsShowPadNum->SetToolTip(_("Display pad number"));
-    itemBoxSizer6->Add(m_IsShowPadNum, 0, wxGROW|wxALL, 5);
+    ColumnBoxSizer->Add(m_IsShowPadNum, 1, wxGROW|wxALL, 5);
 
-    itemBoxSizer6->Add(5, 5, 0, wxGROW|wxLEFT|wxTOP|wxBOTTOM, 5);
+    ColumnBoxSizer->Add(5, 5, 0, wxGROW|wxTOP, 5);
 
     wxButton* itemButton10 = new wxButton( itemDialog1, ID_SAVE_CONFIG, _("Save Cfg"), wxDefaultPosition, wxDefaultSize, 0 );
-    itemBoxSizer6->Add(itemButton10, 0, wxGROW|wxALL, 5);
+    ColumnBoxSizer->Add(itemButton10, 0, wxALIGN_LEFT|wxLEFT|wxRIGHT|wxTOP, 5);
 
     wxStaticLine* itemStaticLine11 = new wxStaticLine( itemDialog1, ID_STATICLINE1, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
-    itemBoxSizer2->Add(itemStaticLine11, 0, wxGROW|wxALL, 5);
+    OuterBoxSizer->Add(itemStaticLine11, 0, wxGROW|wxALL, 5);
 
-    wxBoxSizer* itemBoxSizer12 = new wxBoxSizer(wxHORIZONTAL);
-    itemBoxSizer2->Add(itemBoxSizer12, 0, wxALIGN_CENTER_HORIZONTAL|wxALL, 5);
+    BottomBoxSizer = new wxBoxSizer(wxHORIZONTAL);
+    OuterBoxSizer->Add(BottomBoxSizer, 0, wxALIGN_RIGHT|wxALL, 5);
 
     wxButton* itemButton13 = new wxButton( itemDialog1, wxID_OK, _("&OK"), wxDefaultPosition, wxDefaultSize, 0 );
     itemButton13->SetDefault();
     itemButton13->SetForegroundColour(wxColour(255, 0, 0));
-    itemBoxSizer12->Add(itemButton13, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5);
+    BottomBoxSizer->Add(itemButton13, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5);
 
     wxButton* itemButton14 = new wxButton( itemDialog1, wxID_CANCEL, _("&Cancel"), wxDefaultPosition, wxDefaultSize, 0 );
     itemButton14->SetForegroundColour(wxColour(0, 0, 255));
-    itemBoxSizer12->Add(itemButton14, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5);
+    BottomBoxSizer->Add(itemButton14, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5);
 
     wxButton* itemButton15 = new wxButton( itemDialog1, wxID_APPLY, _("&Apply"), wxDefaultPosition, wxDefaultSize, 0 );
-    itemBoxSizer12->Add(itemButton15, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5);
+    BottomBoxSizer->Add(itemButton15, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5);
 
     // Set validators
     m_EdgesDisplayOption->SetValidator( wxGenericValidator(& DisplayOpt.DisplayModEdge) );
     m_TextDisplayOption->SetValidator( wxGenericValidator(& DisplayOpt.DisplayModText) );
     m_IsShowPadFill->SetValidator( wxGenericValidator(& DisplayOpt.DisplayPadFill) );
     m_IsShowPadNum->SetValidator( wxGenericValidator(& DisplayOpt.DisplayPadNum) );
-////@end KiDisplayOptionsFrame content construction
+////@end WinEDA_FootprintDisplayOptionsFrame content construction
 }
 
 /*!
  * Should we show tooltips?
  */
 
-bool KiDisplayOptionsFrame::ShowToolTips()
+bool WinEDA_FootprintDisplayOptionsFrame::ShowToolTips()
 {
     return true;
 }
@@ -220,36 +216,36 @@ bool KiDisplayOptionsFrame::ShowToolTips()
  * Get bitmap resources
  */
 
-wxBitmap KiDisplayOptionsFrame::GetBitmapResource( const wxString& name )
+wxBitmap WinEDA_FootprintDisplayOptionsFrame::GetBitmapResource( const wxString& name )
 {
     // Bitmap retrieval
-////@begin KiDisplayOptionsFrame bitmap retrieval
+////@begin WinEDA_FootprintDisplayOptionsFrame bitmap retrieval
     wxUnusedVar(name);
     return wxNullBitmap;
-////@end KiDisplayOptionsFrame bitmap retrieval
+////@end WinEDA_FootprintDisplayOptionsFrame bitmap retrieval
 }
 
 /*!
  * Get icon resources
  */
 
-wxIcon KiDisplayOptionsFrame::GetIconResource( const wxString& name )
+wxIcon WinEDA_FootprintDisplayOptionsFrame::GetIconResource( const wxString& name )
 {
     // Icon retrieval
-////@begin KiDisplayOptionsFrame icon retrieval
+////@begin WinEDA_FootprintDisplayOptionsFrame icon retrieval
     wxUnusedVar(name);
     return wxNullIcon;
-////@end KiDisplayOptionsFrame icon retrieval
+////@end WinEDA_FootprintDisplayOptionsFrame icon retrieval
 }
 
 /*!
  * Update settings related to edges, text strings, and pads
  */
 
-void KiDisplayOptionsFrame::UpdateObjectSettings(void)
+void WinEDA_FootprintDisplayOptionsFrame::UpdateObjectSettings(void)
 {
     // Update settings
-////@begin KiDisplayOptionsFrame update settings
+////@begin WinEDA_FootprintDisplayOptionsFrame update settings
 	DisplayOpt.DisplayModEdge = m_Parent->m_DisplayModEdge =
 		m_EdgesDisplayOption->GetSelection();
 
@@ -263,14 +259,14 @@ void KiDisplayOptionsFrame::UpdateObjectSettings(void)
 		m_IsShowPadFill->GetValue();
 
 	m_Parent->ReDrawPanel();
-////@end KiDisplayOptionsFrame update settings
+////@end WinEDA_FootprintDisplayOptionsFrame update settings
 }
 
 /*!
  * wxEVT_COMMAND_BUTTON_CLICKED event handler for ID_SAVE_CONFIG
  */
 
-void KiDisplayOptionsFrame::OnSaveConfigClick( wxCommandEvent& event )
+void WinEDA_FootprintDisplayOptionsFrame::OnSaveConfigClick( wxCommandEvent& event )
 {
 	Save_Config(this);
 }
@@ -279,7 +275,7 @@ void KiDisplayOptionsFrame::OnSaveConfigClick( wxCommandEvent& event )
  * wxEVT_COMMAND_BUTTON_CLICKED event handler for wxID_OK
  */
 
-void KiDisplayOptionsFrame::OnOkClick( wxCommandEvent& event )
+void WinEDA_FootprintDisplayOptionsFrame::OnOkClick( wxCommandEvent& event )
 {
 	UpdateObjectSettings();
     EndModal( 1 );
@@ -289,7 +285,7 @@ void KiDisplayOptionsFrame::OnOkClick( wxCommandEvent& event )
  * wxEVT_COMMAND_BUTTON_CLICKED event handler for wxID_CANCEL
  */
 
-void KiDisplayOptionsFrame::OnCancelClick( wxCommandEvent& event )
+void WinEDA_FootprintDisplayOptionsFrame::OnCancelClick( wxCommandEvent& event )
 {
     EndModal( -1 );
 }
@@ -298,61 +294,7 @@ void KiDisplayOptionsFrame::OnCancelClick( wxCommandEvent& event )
  * wxEVT_COMMAND_BUTTON_CLICKED event handler for wxID_APPLY
  */
 
-void KiDisplayOptionsFrame::OnApplyClick( wxCommandEvent& event )
+void WinEDA_FootprintDisplayOptionsFrame::OnApplyClick( wxCommandEvent& event )
 {
 	UpdateObjectSettings();
 }
-
-
-
-/*!
- * wxEVT_COMMAND_RADIOBOX_SELECTED event handler for EDGE_SELECT
- */
-
-void KiDisplayOptionsFrame::OnEdgeSelectSelected( wxCommandEvent& event )
-{
-////@begin wxEVT_COMMAND_RADIOBOX_SELECTED event handler for EDGE_SELECT in KiDisplayOptionsFrame.
-    // Before editing this code, remove the block markers.
-    event.Skip();
-////@end wxEVT_COMMAND_RADIOBOX_SELECTED event handler for EDGE_SELECT in KiDisplayOptionsFrame. 
-}
-
-
-/*!
- * wxEVT_COMMAND_RADIOBOX_SELECTED event handler for TEXT_SELECT
- */
-
-void KiDisplayOptionsFrame::OnTextSelectSelected( wxCommandEvent& event )
-{
-////@begin wxEVT_COMMAND_RADIOBOX_SELECTED event handler for TEXT_SELECT in KiDisplayOptionsFrame.
-    // Before editing this code, remove the block markers.
-    event.Skip();
-////@end wxEVT_COMMAND_RADIOBOX_SELECTED event handler for TEXT_SELECT in KiDisplayOptionsFrame. 
-}
-
-
-/*!
- * wxEVT_COMMAND_CHECKBOX_CLICKED event handler for PADFILL_OPT
- */
-
-void KiDisplayOptionsFrame::OnPadfillOptClick( wxCommandEvent& event )
-{
-////@begin wxEVT_COMMAND_CHECKBOX_CLICKED event handler for PADFILL_OPT in KiDisplayOptionsFrame.
-    // Before editing this code, remove the block markers.
-    event.Skip();
-////@end wxEVT_COMMAND_CHECKBOX_CLICKED event handler for PADFILL_OPT in KiDisplayOptionsFrame. 
-}
-
-
-/*!
- * wxEVT_COMMAND_CHECKBOX_CLICKED event handler for PADNUM_OPT
- */
-
-void KiDisplayOptionsFrame::OnPadnumOptClick( wxCommandEvent& event )
-{
-////@begin wxEVT_COMMAND_CHECKBOX_CLICKED event handler for PADNUM_OPT in KiDisplayOptionsFrame.
-    // Before editing this code, remove the block markers.
-    event.Skip();
-////@end wxEVT_COMMAND_CHECKBOX_CLICKED event handler for PADNUM_OPT in KiDisplayOptionsFrame. 
-}
-

cvpcb/dialog_display_options.h

@@ -32,6 +32,7 @@
  */
 
 ////@begin forward declarations
+class wxBoxSizer;
 ////@end forward declarations
 
 /*!
@@ -40,17 +41,17 @@
 
 ////@begin control identifiers
 #define ID_DIALOG 10000
-#define EDGE_SELECT 10003
-#define TEXT_SELECT 10004
-#define PADFILL_OPT 10001
-#define PADNUM_OPT 10002
+#define EDGE_SELECT 10001
+#define TEXT_SELECT 10002
+#define PADFILL_OPT 10003
+#define PADNUM_OPT 10004
 #define ID_SAVE_CONFIG 10005
-#define ID_STATICLINE1 10007
-#define SYMBOL_KIDISPLAYOPTIONSFRAME_STYLE wxCAPTION|wxRESIZE_BORDER|wxSYSTEM_MENU|wxCLOSE_BOX
-#define SYMBOL_KIDISPLAYOPTIONSFRAME_TITLE _("Options")
-#define SYMBOL_KIDISPLAYOPTIONSFRAME_IDNAME ID_DIALOG
-#define SYMBOL_KIDISPLAYOPTIONSFRAME_SIZE wxSize(400, 300)
-#define SYMBOL_KIDISPLAYOPTIONSFRAME_POSITION wxDefaultPosition
+#define ID_STATICLINE1 10006
+#define SYMBOL_WINEDA_FOOTPRINTDISPLAYOPTIONSFRAME_STYLE wxDEFAULT_DIALOG_STYLE|MAYBE_RESIZE_BORDER
+#define SYMBOL_WINEDA_FOOTPRINTDISPLAYOPTIONSFRAME_TITLE _("Display Options")
+#define SYMBOL_WINEDA_FOOTPRINTDISPLAYOPTIONSFRAME_IDNAME ID_DIALOG
+#define SYMBOL_WINEDA_FOOTPRINTDISPLAYOPTIONSFRAME_SIZE wxSize(400, 300)
+#define SYMBOL_WINEDA_FOOTPRINTDISPLAYOPTIONSFRAME_POSITION wxDefaultPosition
 ////@end control identifiers
 
 /*!
@@ -62,38 +63,26 @@
 #endif
 
 /*!
- * KiDisplayOptionsFrame class declaration
+ * WinEDA_FootprintDisplayOptionsFrame class declaration
  */
 
-class KiDisplayOptionsFrame: public wxDialog
+class WinEDA_FootprintDisplayOptionsFrame: public wxDialog
 {    
-    DECLARE_DYNAMIC_CLASS( KiDisplayOptionsFrame )
+    DECLARE_DYNAMIC_CLASS( WinEDA_FootprintDisplayOptionsFrame )
     DECLARE_EVENT_TABLE()
 
 public:
     /// Constructors
-    KiDisplayOptionsFrame( );
-    KiDisplayOptionsFrame( WinEDA_BasePcbFrame* parent, wxWindowID id = SYMBOL_KIDISPLAYOPTIONSFRAME_IDNAME, const wxString& caption = SYMBOL_KIDISPLAYOPTIONSFRAME_TITLE, const wxPoint& pos = SYMBOL_KIDISPLAYOPTIONSFRAME_POSITION, const wxSize& size = SYMBOL_KIDISPLAYOPTIONSFRAME_SIZE, long style = SYMBOL_KIDISPLAYOPTIONSFRAME_STYLE );
+    WinEDA_FootprintDisplayOptionsFrame( );
+    WinEDA_FootprintDisplayOptionsFrame( WinEDA_BasePcbFrame* parent, wxWindowID id = SYMBOL_WINEDA_FOOTPRINTDISPLAYOPTIONSFRAME_IDNAME, const wxString& caption = SYMBOL_WINEDA_FOOTPRINTDISPLAYOPTIONSFRAME_TITLE, const wxPoint& pos = SYMBOL_WINEDA_FOOTPRINTDISPLAYOPTIONSFRAME_POSITION, const wxSize& size = SYMBOL_WINEDA_FOOTPRINTDISPLAYOPTIONSFRAME_SIZE, long style = SYMBOL_WINEDA_FOOTPRINTDISPLAYOPTIONSFRAME_STYLE );
 
     /// Creation
-    bool Create( wxWindow* parent, wxWindowID id = SYMBOL_KIDISPLAYOPTIONSFRAME_IDNAME, const wxString& caption = SYMBOL_KIDISPLAYOPTIONSFRAME_TITLE, const wxPoint& pos = SYMBOL_KIDISPLAYOPTIONSFRAME_POSITION, const wxSize& size = SYMBOL_KIDISPLAYOPTIONSFRAME_SIZE, long style = SYMBOL_KIDISPLAYOPTIONSFRAME_STYLE );
+    bool Create( wxWindow* parent, wxWindowID id = SYMBOL_WINEDA_FOOTPRINTDISPLAYOPTIONSFRAME_IDNAME, const wxString& caption = SYMBOL_WINEDA_FOOTPRINTDISPLAYOPTIONSFRAME_TITLE, const wxPoint& pos = SYMBOL_WINEDA_FOOTPRINTDISPLAYOPTIONSFRAME_POSITION, const wxSize& size = SYMBOL_WINEDA_FOOTPRINTDISPLAYOPTIONSFRAME_SIZE, long style = SYMBOL_WINEDA_FOOTPRINTDISPLAYOPTIONSFRAME_STYLE );
 
     /// Creates the controls and sizers
     void CreateControls();
 
-////@begin KiDisplayOptionsFrame event handler declarations
-
-    /// wxEVT_COMMAND_RADIOBOX_SELECTED event handler for EDGE_SELECT
-    void OnEdgeSelectSelected( wxCommandEvent& event );
-
-    /// wxEVT_COMMAND_RADIOBOX_SELECTED event handler for TEXT_SELECT
-    void OnTextSelectSelected( wxCommandEvent& event );
-
-    /// wxEVT_COMMAND_CHECKBOX_CLICKED event handler for PADFILL_OPT
-    void OnPadfillOptClick( wxCommandEvent& event );
-
-    /// wxEVT_COMMAND_CHECKBOX_CLICKED event handler for PADNUM_OPT
-    void OnPadnumOptClick( wxCommandEvent& event );
+////@begin WinEDA_FootprintDisplayOptionsFrame event handler declarations
 
     /// wxEVT_COMMAND_BUTTON_CLICKED event handler for ID_SAVE_CONFIG
     void OnSaveConfigClick( wxCommandEvent& event );
@@ -107,28 +96,32 @@ public:
     /// wxEVT_COMMAND_BUTTON_CLICKED event handler for wxID_APPLY
     void OnApplyClick( wxCommandEvent& event );
 
-////@end KiDisplayOptionsFrame event handler declarations
+////@end WinEDA_FootprintDisplayOptionsFrame event handler declarations
 
-////@begin KiDisplayOptionsFrame member function declarations
+////@begin WinEDA_FootprintDisplayOptionsFrame member function declarations
 
     /// Retrieves bitmap resources
     wxBitmap GetBitmapResource( const wxString& name );
 
     /// Retrieves icon resources
     wxIcon GetIconResource( const wxString& name );
-////@end KiDisplayOptionsFrame member function declarations
+////@end WinEDA_FootprintDisplayOptionsFrame member function declarations
 
     /// Should we show tooltips?
     static bool ShowToolTips();
 
 	void UpdateObjectSettings(void);
 	
-////@begin KiDisplayOptionsFrame member variables
+////@begin WinEDA_FootprintDisplayOptionsFrame member variables
+    wxBoxSizer* OuterBoxSizer;
+    wxBoxSizer* MainBoxSizer;
     wxRadioBox* m_EdgesDisplayOption;
     wxRadioBox* m_TextDisplayOption;
+    wxBoxSizer* ColumnBoxSizer;
     wxCheckBox* m_IsShowPadFill;
     wxCheckBox* m_IsShowPadNum;
-////@end KiDisplayOptionsFrame member variables
+    wxBoxSizer* BottomBoxSizer;
+////@end WinEDA_FootprintDisplayOptionsFrame member variables
 
 	WinEDA_BasePcbFrame * m_Parent;
 

cvpcb/dialog_display_options.pjd

@@ -10,8 +10,10 @@
     <bool name="convert_images_to_xpm">0</bool>
     <bool name="inline_images">0</bool>
     <bool name="generate_cpp_for_xrc">0</bool>
+    <long name="working_mode">1</long>
     <bool name="use_help_text_for_tooltips">1</bool>
     <bool name="translate_strings">1</bool>
+    <bool name="make_unicode_strings">1</bool>
     <bool name="extract_strings">0</bool>
     <string name="user_name">"jean-pierre Charras"</string>
     <string name="copyright_string">"License GNU"</string>
@@ -197,7 +199,7 @@
         <long name="title-mode">0</long>
         <long name="locked">1</long>
         <document>
-          <string name="title">"Options"</string>
+          <string name="title">"Display Options"</string>
           <string name="type">"dialog-document"</string>
           <string name="filename">""</string>
           <string name="icon-name">"dialog"</string>
@@ -213,15 +215,16 @@
           <bool name="use-id-suffix">0</bool>
           <string name="id-suffix">""</string>
           <long name="use-xrc">0</long>
+          <long name="working-mode">0</long>
           <string name="proxy-Id name">"ID_DIALOG"</string>
           <long name="proxy-Id value">10000</long>
-          <string name="proxy-Class">"KiDisplayOptionsFrame"</string>
+          <string name="proxy-Class">"WinEDA_FootprintDisplayOptionsFrame"</string>
           <string name="proxy-Base class">"wxDialog"</string>
           <string name="proxy-Window kind">"wxDialog"</string>
           <string name="proxy-Implementation filename">"dialog_display_options.cpp"</string>
           <string name="proxy-Header filename">"dialog_display_options.h"</string>
           <string name="proxy-XRC filename">""</string>
-          <string name="proxy-Title">"Options"</string>
+          <string name="proxy-Title">"Display Options"</string>
           <bool name="proxy-Centre">1</bool>
           <string name="proxy-Icon">""</string>
           <bool name="proxy-Dialog units">0</bool>
@@ -233,14 +236,21 @@
           <bool name="proxy-Hidden">0</bool>
           <bool name="proxy-Enabled">1</bool>
           <string name="proxy-Platform">"&lt;Any platform&gt;"</string>
-          <bool name="proxy-wxDEFAULT_DIALOG_STYLE">0</bool>
-          <bool name="proxy-wxCAPTION">1</bool>
-          <bool name="proxy-wxRESIZE_BORDER">1</bool>
+          <string name="proxy-Data source">""</string>
+          <string name="proxy-Data class name">""</string>
+          <string name="proxy-Data class implementation filename">""</string>
+          <string name="proxy-Data class header filename">""</string>
+          <string name="proxy-Data class manager window">""</string>
+          <string name="proxy-Texture">""</string>
+          <string name="proxy-Texture style">"Tiled"</string>
+          <bool name="proxy-wxDEFAULT_DIALOG_STYLE">1</bool>
+          <bool name="proxy-wxCAPTION">0</bool>
+          <bool name="proxy-wxRESIZE_BORDER">0</bool>
           <bool name="proxy-wxTHICK_FRAME">0</bool>
-          <bool name="proxy-wxSYSTEM_MENU">1</bool>
+          <bool name="proxy-wxSYSTEM_MENU">0</bool>
           <bool name="proxy-wxSTAY_ON_TOP">0</bool>
           <bool name="proxy-wxDIALOG_NO_PARENT">0</bool>
-          <bool name="proxy-wxCLOSE_BOX">1</bool>
+          <bool name="proxy-wxCLOSE_BOX">0</bool>
           <bool name="proxy-wxMAXIMIZE_BOX">0</bool>
           <bool name="proxy-wxMINIMIZE_BOX">0</bool>
           <bool name="proxy-wxDIALOG_MODAL">0</bool>
@@ -258,7 +268,7 @@
           <bool name="proxy-wxWS_EX_VALIDATE_RECURSIVELY">0</bool>
           <bool name="proxy-wxWS_EX_BLOCK_EVENTS">1</bool>
           <bool name="proxy-wxWS_EX_TRANSIENT">0</bool>
-          <string name="proxy-Custom styles">""</string>
+          <string name="proxy-Custom styles">"MAYBE_RESIZE_BORDER"</string>
           <bool name="proxy-wxDIALOG_EX_CONTEXTHELP">0</bool>
           <bool name="proxy-Fit to content">1</bool>
           <long name="proxy-X">-1</long>
@@ -279,7 +289,7 @@
             <string name="created">"24/10/2007"</string>
             <string name="proxy-type">"wbBoxSizerProxy"</string>
             <string name="proxy-Orientation">"Vertical"</string>
-            <string name="proxy-Member variable name">""</string>
+            <string name="proxy-Member variable name">"OuterBoxSizer"</string>
             <bool name="proxy-wxSHAPED">0</bool>
             <bool name="proxy-wxADJUST_MINSIZE">0</bool>
             <bool name="proxy-wxFIXED_MINSIZE">0</bool>
@@ -296,10 +306,10 @@
               <string name="created">"24/10/2007"</string>
               <string name="proxy-type">"wbBoxSizerProxy"</string>
               <string name="proxy-Orientation">"Horizontal"</string>
-              <string name="proxy-Member variable name">""</string>
+              <string name="proxy-Member variable name">"MainBoxSizer"</string>
               <string name="proxy-AlignH">"Expand"</string>
               <string name="proxy-AlignV">"Centre"</string>
-              <long name="proxy-Stretch factor">0</long>
+              <long name="proxy-Stretch factor">1</long>
               <long name="proxy-Border">5</long>
               <bool name="proxy-wxLEFT">1</bool>
               <bool name="proxy-wxRIGHT">1</bool>
@@ -320,9 +330,8 @@
                 <long name="locked">0</long>
                 <string name="created">"24/10/2007"</string>
                 <string name="proxy-type">"wbRadioBoxProxy"</string>
-                <string name="event-handler-0">"wxEVT_COMMAND_RADIOBOX_SELECTED|OnEdgeSelectSelected"</string>
                 <string name="proxy-Id name">"EDGE_SELECT"</string>
-                <long name="proxy-Id value">10003</long>
+                <long name="proxy-Id value">10001</long>
                 <string name="proxy-Class">"wxRadioBox"</string>
                 <string name="proxy-Base class">"wxRadioBox"</string>
                 <bool name="proxy-External implementation">1</bool>
@@ -344,6 +353,11 @@
                 <string name="proxy-Platform">"&lt;Any platform&gt;"</string>
                 <string name="proxy-Data variable">"DisplayOpt.DisplayModEdge"</string>
                 <string name="proxy-Data validator">"wxGenericValidator(&amp; %VARIABLE%)"</string>
+                <string name="proxy-Data source">""</string>
+                <string name="proxy-Data class name">""</string>
+                <string name="proxy-Data class implementation filename">""</string>
+                <string name="proxy-Data class header filename">""</string>
+                <string name="proxy-Data class manager window">""</string>
                 <bool name="proxy-wxRA_SPECIFY_ROWS">0</bool>
                 <bool name="proxy-wxRA_SPECIFY_COLS">1</bool>
                 <bool name="proxy-wxWANTS_CHARS">0</bool>
@@ -354,9 +368,9 @@
                 <long name="proxy-Y">-1</long>
                 <long name="proxy-Width">-1</long>
                 <long name="proxy-Height">-1</long>
-                <string name="proxy-AlignH">"Left"</string>
-                <string name="proxy-AlignV">"Expand"</string>
-                <long name="proxy-Stretch factor">0</long>
+                <string name="proxy-AlignH">"Centre"</string>
+                <string name="proxy-AlignV">"Top"</string>
+                <long name="proxy-Stretch factor">1</long>
                 <long name="proxy-Border">5</long>
                 <bool name="proxy-wxLEFT">1</bool>
                 <bool name="proxy-wxRIGHT">1</bool>
@@ -379,9 +393,8 @@
                 <long name="locked">0</long>
                 <string name="created">"24/10/2007"</string>
                 <string name="proxy-type">"wbRadioBoxProxy"</string>
-                <string name="event-handler-0">"wxEVT_COMMAND_RADIOBOX_SELECTED|OnTextSelectSelected"</string>
                 <string name="proxy-Id name">"TEXT_SELECT"</string>
-                <long name="proxy-Id value">10004</long>
+                <long name="proxy-Id value">10002</long>
                 <string name="proxy-Class">"wxRadioBox"</string>
                 <string name="proxy-Base class">"wxRadioBox"</string>
                 <bool name="proxy-External implementation">1</bool>
@@ -403,6 +416,11 @@
                 <string name="proxy-Platform">"&lt;Any platform&gt;"</string>
                 <string name="proxy-Data variable">"DisplayOpt.DisplayModText"</string>
                 <string name="proxy-Data validator">"wxGenericValidator(&amp; %VARIABLE%)"</string>
+                <string name="proxy-Data source">""</string>
+                <string name="proxy-Data class name">""</string>
+                <string name="proxy-Data class implementation filename">""</string>
+                <string name="proxy-Data class header filename">""</string>
+                <string name="proxy-Data class manager window">""</string>
                 <bool name="proxy-wxRA_SPECIFY_ROWS">0</bool>
                 <bool name="proxy-wxRA_SPECIFY_COLS">1</bool>
                 <bool name="proxy-wxWANTS_CHARS">0</bool>
@@ -414,8 +432,8 @@
                 <long name="proxy-Width">-1</long>
                 <long name="proxy-Height">-1</long>
                 <string name="proxy-AlignH">"Centre"</string>
-                <string name="proxy-AlignV">"Expand"</string>
-                <long name="proxy-Stretch factor">0</long>
+                <string name="proxy-AlignV">"Top"</string>
+                <long name="proxy-Stretch factor">1</long>
                 <long name="proxy-Border">5</long>
                 <bool name="proxy-wxLEFT">1</bool>
                 <bool name="proxy-wxRIGHT">1</bool>
@@ -439,15 +457,15 @@
                 <string name="created">"24/10/2007"</string>
                 <string name="proxy-type">"wbBoxSizerProxy"</string>
                 <string name="proxy-Orientation">"Vertical"</string>
-                <string name="proxy-Member variable name">""</string>
+                <string name="proxy-Member variable name">"ColumnBoxSizer"</string>
                 <string name="proxy-AlignH">"Centre"</string>
-                <string name="proxy-AlignV">"Expand"</string>
-                <long name="proxy-Stretch factor">0</long>
+                <string name="proxy-AlignV">"Top"</string>
+                <long name="proxy-Stretch factor">1</long>
                 <long name="proxy-Border">5</long>
                 <bool name="proxy-wxLEFT">1</bool>
                 <bool name="proxy-wxRIGHT">1</bool>
                 <bool name="proxy-wxTOP">1</bool>
-                <bool name="proxy-wxBOTTOM">1</bool>
+                <bool name="proxy-wxBOTTOM">0</bool>
                 <bool name="proxy-wxSHAPED">0</bool>
                 <bool name="proxy-wxADJUST_MINSIZE">0</bool>
                 <bool name="proxy-wxFIXED_MINSIZE">0</bool>
@@ -463,9 +481,8 @@
                   <long name="locked">0</long>
                   <string name="created">"24/10/2007"</string>
                   <string name="proxy-type">"wbCheckBoxProxy"</string>
-                  <string name="event-handler-0">"wxEVT_COMMAND_CHECKBOX_CLICKED|OnPadfillOptClick"</string>
                   <string name="proxy-Id name">"PADFILL_OPT"</string>
-                  <long name="proxy-Id value">10001</long>
+                  <long name="proxy-Id value">10003</long>
                   <string name="proxy-Class">"wxCheckBox"</string>
                   <string name="proxy-Base class">"wxCheckBox"</string>
                   <bool name="proxy-External implementation">1</bool>
@@ -479,6 +496,11 @@
                   <string name="proxy-Tooltip text">""</string>
                   <string name="proxy-Data variable">"DisplayOpt.DisplayPadFill"</string>
                   <string name="proxy-Data validator">"wxGenericValidator(&amp; %VARIABLE%)"</string>
+                  <string name="proxy-Data source">""</string>
+                  <string name="proxy-Data class name">""</string>
+                  <string name="proxy-Data class implementation filename">""</string>
+                  <string name="proxy-Data class header filename">""</string>
+                  <string name="proxy-Data class manager window">""</string>
                   <string name="proxy-Background colour">""</string>
                   <string name="proxy-Foreground colour">""</string>
                   <string name="proxy-Font">""</string>
@@ -499,7 +521,7 @@
                   <long name="proxy-Height">-1</long>
                   <string name="proxy-AlignH">"Expand"</string>
                   <string name="proxy-AlignV">"Centre"</string>
-                  <long name="proxy-Stretch factor">0</long>
+                  <long name="proxy-Stretch factor">1</long>
                   <long name="proxy-Border">5</long>
                   <bool name="proxy-wxLEFT">1</bool>
                   <bool name="proxy-wxRIGHT">1</bool>
@@ -522,9 +544,8 @@
                   <long name="locked">0</long>
                   <string name="created">"24/10/2007"</string>
                   <string name="proxy-type">"wbCheckBoxProxy"</string>
-                  <string name="event-handler-0">"wxEVT_COMMAND_CHECKBOX_CLICKED|OnPadnumOptClick"</string>
                   <string name="proxy-Id name">"PADNUM_OPT"</string>
-                  <long name="proxy-Id value">10002</long>
+                  <long name="proxy-Id value">10004</long>
                   <string name="proxy-Class">"wxCheckBox"</string>
                   <string name="proxy-Base class">"wxCheckBox"</string>
                   <bool name="proxy-External implementation">1</bool>
@@ -538,6 +559,11 @@
                   <string name="proxy-Tooltip text">"Display pad number"</string>
                   <string name="proxy-Data variable">"DisplayOpt.DisplayPadNum"</string>
                   <string name="proxy-Data validator">"wxGenericValidator(&amp; %VARIABLE%)"</string>
+                  <string name="proxy-Data source">""</string>
+                  <string name="proxy-Data class name">""</string>
+                  <string name="proxy-Data class implementation filename">""</string>
+                  <string name="proxy-Data class header filename">""</string>
+                  <string name="proxy-Data class manager window">""</string>
                   <string name="proxy-Background colour">""</string>
                   <string name="proxy-Foreground colour">""</string>
                   <string name="proxy-Font">""</string>
@@ -558,7 +584,7 @@
                   <long name="proxy-Height">-1</long>
                   <string name="proxy-AlignH">"Expand"</string>
                   <string name="proxy-AlignV">"Centre"</string>
-                  <long name="proxy-Stretch factor">0</long>
+                  <long name="proxy-Stretch factor">1</long>
                   <long name="proxy-Border">5</long>
                   <bool name="proxy-wxLEFT">1</bool>
                   <bool name="proxy-wxRIGHT">1</bool>
@@ -587,10 +613,10 @@
                   <string name="proxy-AlignV">"Centre"</string>
                   <long name="proxy-Stretch factor">0</long>
                   <long name="proxy-Border">5</long>
-                  <bool name="proxy-wxLEFT">1</bool>
+                  <bool name="proxy-wxLEFT">0</bool>
                   <bool name="proxy-wxRIGHT">0</bool>
                   <bool name="proxy-wxTOP">1</bool>
-                  <bool name="proxy-wxBOTTOM">1</bool>
+                  <bool name="proxy-wxBOTTOM">0</bool>
                   <bool name="proxy-wxSHAPED">0</bool>
                   <bool name="proxy-wxADJUST_MINSIZE">0</bool>
                   <bool name="proxy-wxFIXED_MINSIZE">0</bool>
@@ -621,6 +647,13 @@
                   <bool name="proxy-Default">0</bool>
                   <string name="proxy-Help text">""</string>
                   <string name="proxy-Tooltip text">""</string>
+                  <string name="proxy-Data variable">""</string>
+                  <string name="proxy-Data validator">""</string>
+                  <string name="proxy-Data source">""</string>
+                  <string name="proxy-Data class name">""</string>
+                  <string name="proxy-Data class implementation filename">""</string>
+                  <string name="proxy-Data class header filename">""</string>
+                  <string name="proxy-Data class manager window">""</string>
                   <string name="proxy-Background colour">""</string>
                   <string name="proxy-Foreground colour">""</string>
                   <string name="proxy-Font">""</string>
@@ -641,14 +674,14 @@
                   <long name="proxy-Y">-1</long>
                   <long name="proxy-Width">-1</long>
                   <long name="proxy-Height">-1</long>
-                  <string name="proxy-AlignH">"Expand"</string>
+                  <string name="proxy-AlignH">"Left"</string>
                   <string name="proxy-AlignV">"Centre"</string>
                   <long name="proxy-Stretch factor">0</long>
                   <long name="proxy-Border">5</long>
                   <bool name="proxy-wxLEFT">1</bool>
                   <bool name="proxy-wxRIGHT">1</bool>
                   <bool name="proxy-wxTOP">1</bool>
-                  <bool name="proxy-wxBOTTOM">1</bool>
+                  <bool name="proxy-wxBOTTOM">0</bool>
                   <bool name="proxy-wxSHAPED">0</bool>
                   <bool name="proxy-wxADJUST_MINSIZE">0</bool>
                   <bool name="proxy-wxFIXED_MINSIZE">0</bool>
@@ -669,7 +702,7 @@
               <string name="created">"24/10/2007"</string>
               <string name="proxy-type">"wbStaticLineProxy"</string>
               <string name="proxy-Id name">"ID_STATICLINE1"</string>
-              <long name="proxy-Id value">10007</long>
+              <long name="proxy-Id value">10006</long>
               <string name="proxy-Class">"wxStaticLine"</string>
               <string name="proxy-Base class">"wxStaticLine"</string>
               <bool name="proxy-External implementation">1</bool>
@@ -723,8 +756,8 @@
               <string name="created">"24/10/2007"</string>
               <string name="proxy-type">"wbBoxSizerProxy"</string>
               <string name="proxy-Orientation">"Horizontal"</string>
-              <string name="proxy-Member variable name">""</string>
-              <string name="proxy-AlignH">"Centre"</string>
+              <string name="proxy-Member variable name">"BottomBoxSizer"</string>
+              <string name="proxy-AlignH">"Right"</string>
               <string name="proxy-AlignV">"Centre"</string>
               <long name="proxy-Stretch factor">0</long>
               <long name="proxy-Border">5</long>
@@ -761,6 +794,13 @@
                 <bool name="proxy-Default">1</bool>
                 <string name="proxy-Help text">""</string>
                 <string name="proxy-Tooltip text">""</string>
+                <string name="proxy-Data variable">""</string>
+                <string name="proxy-Data validator">""</string>
+                <string name="proxy-Data source">""</string>
+                <string name="proxy-Data class name">""</string>
+                <string name="proxy-Data class implementation filename">""</string>
+                <string name="proxy-Data class header filename">""</string>
+                <string name="proxy-Data class manager window">""</string>
                 <string name="proxy-Background colour">""</string>
                 <string name="proxy-Foreground colour">"FF0000"</string>
                 <string name="proxy-Font">""</string>
@@ -820,6 +860,13 @@
                 <bool name="proxy-Default">0</bool>
                 <string name="proxy-Help text">""</string>
                 <string name="proxy-Tooltip text">""</string>
+                <string name="proxy-Data variable">""</string>
+                <string name="proxy-Data validator">""</string>
+                <string name="proxy-Data source">""</string>
+                <string name="proxy-Data class name">""</string>
+                <string name="proxy-Data class implementation filename">""</string>
+                <string name="proxy-Data class header filename">""</string>
+                <string name="proxy-Data class manager window">""</string>
                 <string name="proxy-Background colour">""</string>
                 <string name="proxy-Foreground colour">"0000FF"</string>
                 <string name="proxy-Font">""</string>
@@ -879,6 +926,13 @@
                 <bool name="proxy-Default">0</bool>
                 <string name="proxy-Help text">""</string>
                 <string name="proxy-Tooltip text">""</string>
+                <string name="proxy-Data variable">""</string>
+                <string name="proxy-Data validator">""</string>
+                <string name="proxy-Data source">""</string>
+                <string name="proxy-Data class name">""</string>
+                <string name="proxy-Data class implementation filename">""</string>
+                <string name="proxy-Data class header filename">""</string>
+                <string name="proxy-Data class manager window">""</string>
                 <string name="proxy-Background colour">""</string>
                 <string name="proxy-Foreground colour">""</string>
                 <string name="proxy-Font">""</string>