diff --git a/utils/configtool/src/configbrowser.cpp b/utils/configtool/src/configbrowser.cpp new file mode 100644 index 0000000000..0ca4c267f9 --- /dev/null +++ b/utils/configtool/src/configbrowser.cpp @@ -0,0 +1,246 @@ +///////////////////////////////////////////////////////////////////////////// +// Name: configbrowser.cpp +// Purpose: +// Author: +// Modified by: +// Created: +// RCS-ID: +// Copyright: +// Licence: +///////////////////////////////////////////////////////////////////////////// + +////@begin includes +#include "wx/wx.h" +#include "wx/splitter.h" +#include "wx/treectrl.h" +////@end includes + +#include "configbrowser.h" + +////@begin XPM images +////@end XPM images + +/*! + * ctConfigurationBrowserWindow type definition + */ + +IMPLEMENT_CLASS( ctConfigurationBrowserWindow, wxPanel ) + +/*! + * ctConfigurationBrowserWindow event table definition + */ + +BEGIN_EVENT_TABLE( ctConfigurationBrowserWindow, wxPanel ) + +////@begin ctConfigurationBrowserWindow event table entries + EVT_TREE_SEL_CHANGED( ID_CONFIGURATION_BROWSER_TREECTRL, ctConfigurationBrowserWindow::OnConfigurationBrowserTreectrl ) + +////@end ctConfigurationBrowserWindow event table entries + +END_EVENT_TABLE() + +/*! + * ctConfigurationBrowserWindow constructor + */ + +ctConfigurationBrowserWindow::ctConfigurationBrowserWindow( wxWindow* parent, wxWindowID id, const wxPoint& pos, const wxSize& size, long style ) +{ +////@begin ctConfigurationBrowserWindow member initialisation +////@end ctConfigurationBrowserWindow member initialisation + + wxPanel::Create( parent, id, pos, size, style ); + + CreateControls(); +} + +/*! + * Control creation for ctConfigurationBrowserWindow + */ + +void ctConfigurationBrowserWindow::CreateControls() +{ +////@begin ctConfigurationBrowserWindow content construction + + ctConfigurationBrowserWindow* item1 = this; + + wxBoxSizer* item2 = new wxBoxSizer(wxVERTICAL); + item1->SetSizer(item2); + item1->SetAutoLayout(TRUE); + + wxSplitterWindow* item3 = new wxSplitterWindow(item1, ID_CONFIGBROWSER_SPLITTERWINDOW, wxDefaultPosition, wxSize(400, 400), wxSP_3DBORDER|wxSP_3DSASH|wxNO_BORDER|wxNO_FULL_REPAINT_ON_RESIZE); + wxTreeCtrl* item4 = new wxTreeCtrl(item3, ID_CONFIGURATION_BROWSER_TREECTRL, wxDefaultPosition, wxSize(100, 100), wxTR_SINGLE|wxNO_BORDER); + ctConfigurationBrowserControlPanel* item5 = new ctConfigurationBrowserControlPanel(item3, ID_PANEL, wxDefaultPosition, wxSize(100, 80), wxNO_BORDER|wxTAB_TRAVERSAL); + item3->SplitVertically(item4, item5, 200); + item2->Add(item3, 1, wxGROW, 5); + +////@end ctConfigurationBrowserWindow content construction +} + +/*! + * Event handler for ID_CONFIGURATION_BROWSER_TREECTRL + */ + +void ctConfigurationBrowserWindow::OnConfigurationBrowserTreectrl( wxTreeEvent& event ) +{ + // Replace with custom code + event.Skip(); +} + +/*! + * Should we show tooltips? + */ + +bool ctConfigurationBrowserWindow::ShowToolTips() +{ + return TRUE; +} + +/*! + * ctConfigurationBrowserControlPanel type definition + */ + +IMPLEMENT_CLASS( ctConfigurationBrowserControlPanel, wxPanel ) + +/*! + * ctConfigurationBrowserControlPanel event table definition + */ + +BEGIN_EVENT_TABLE( ctConfigurationBrowserControlPanel, wxPanel ) + +////@begin ctConfigurationBrowserControlPanel event table entries + EVT_BUTTON( ID_ADD_CONFIGURATION, ctConfigurationBrowserControlPanel::OnAddConfiguration ) + EVT_UPDATE_UI( ID_ADD_CONFIGURATION, ctConfigurationBrowserControlPanel::OnUpdateAddConfiguration ) + + EVT_BUTTON( ID_REMOVE_CONFIGURATION, ctConfigurationBrowserControlPanel::OnRemoveConfiguration ) + EVT_UPDATE_UI( ID_REMOVE_CONFIGURATION, ctConfigurationBrowserControlPanel::OnUpdateRemoveConfiguration ) + + EVT_BUTTON( ID_RENAME_CONFIGURATION, ctConfigurationBrowserControlPanel::OnRenameConfiguration ) + EVT_UPDATE_UI( ID_RENAME_CONFIGURATION, ctConfigurationBrowserControlPanel::OnUpdateRenameConfiguration ) + +////@end ctConfigurationBrowserControlPanel event table entries + +END_EVENT_TABLE() + +/*! + * ctConfigurationBrowserControlPanel constructor + */ + +ctConfigurationBrowserControlPanel::ctConfigurationBrowserControlPanel( wxWindow* parent, wxWindowID id, const wxPoint& pos, const wxSize& size, long style ) +{ +////@begin ctConfigurationBrowserControlPanel member initialisation +////@end ctConfigurationBrowserControlPanel member initialisation + +////@begin ctConfigurationBrowserControlPanel creation + wxPanel::Create( parent, id, pos, size, style ); + + CreateControls(); +////@end ctConfigurationBrowserControlPanel creation +} + +/*! + * Control creation for ctConfigurationBrowserControlPanel + */ + +void ctConfigurationBrowserControlPanel::CreateControls() +{ +////@begin ctConfigurationBrowserControlPanel content construction + + ctConfigurationBrowserControlPanel* item5 = this; + + wxBoxSizer* item6 = new wxBoxSizer(wxVERTICAL); + item5->SetSizer(item6); + item5->SetAutoLayout(TRUE); + + wxStaticText* item7 = new wxStaticText(item5, wxID_STATIC, _("Browse, add and remove configurations"), wxDefaultPosition, wxDefaultSize, 0); + item6->Add(item7, 0, wxALIGN_CENTER_HORIZONTAL|wxALL|wxADJUST_MINSIZE, 5); + + item6->Add(5, 5, 0, wxALIGN_CENTER_HORIZONTAL|wxALL, 5); + + wxButton* item9 = new wxButton(item5, ID_ADD_CONFIGURATION, _("&Add..."), wxDefaultPosition, wxDefaultSize, 0); + item6->Add(item9, 0, wxALIGN_CENTER_HORIZONTAL|wxALL, 5); + + wxButton* item10 = new wxButton(item5, ID_REMOVE_CONFIGURATION, _("&Remove..."), wxDefaultPosition, wxDefaultSize, 0); + item6->Add(item10, 0, wxALIGN_CENTER_HORIZONTAL|wxALL, 5); + + wxButton* item11 = new wxButton(item5, ID_RENAME_CONFIGURATION, _("&Rename..."), wxDefaultPosition, wxDefaultSize, 0); + item6->Add(item11, 0, wxALIGN_CENTER_HORIZONTAL|wxALL, 5); + + item6->Add(5, 5, 0, wxALIGN_CENTER_HORIZONTAL|wxALL, 5); + + wxStaticText* item13 = new wxStaticText(item5, ID_CONFIGURATION_NAME, _("Configuration:"), wxDefaultPosition, wxDefaultSize, 0); + item6->Add(item13, 0, wxALIGN_LEFT|wxLEFT|wxRIGHT|wxTOP|wxADJUST_MINSIZE, 5); + + wxTextCtrl* item14 = new wxTextCtrl(item5, ID_CONFIGURATION_DESCRIPTION, _(""), wxDefaultPosition, wxDefaultSize, wxTE_MULTILINE|wxTE_RICH); + item6->Add(item14, 1, wxGROW|wxALL, 5); + +////@end ctConfigurationBrowserControlPanel content construction +} + +/*! + * Event handler for ID_ADD_CONFIGURATION + */ + +void ctConfigurationBrowserControlPanel::OnAddConfiguration( wxCommandEvent& event ) +{ + // Replace with custom code + event.Skip(); +} + +/*! + * Update event handler for ID_ADD_CONFIGURATION + */ + +void ctConfigurationBrowserControlPanel::OnUpdateAddConfiguration( wxUpdateUIEvent& event ) +{ + // Replace with custom code + event.Skip(); +} + +/*! + * Event handler for ID_REMOVE_CONFIGURATION + */ + +void ctConfigurationBrowserControlPanel::OnRemoveConfiguration( wxCommandEvent& event ) +{ + // Replace with custom code + event.Skip(); +} + +/*! + * Update event handler for ID_REMOVE_CONFIGURATION + */ + +void ctConfigurationBrowserControlPanel::OnUpdateRemoveConfiguration( wxUpdateUIEvent& event ) +{ + // Replace with custom code + event.Skip(); +} + +/*! + * Event handler for ID_RENAME_CONFIGURATION + */ + +void ctConfigurationBrowserControlPanel::OnRenameConfiguration( wxCommandEvent& event ) +{ + // Replace with custom code + event.Skip(); +} + +/*! + * Update event handler for ID_RENAME_CONFIGURATION + */ + +void ctConfigurationBrowserControlPanel::OnUpdateRenameConfiguration( wxUpdateUIEvent& event ) +{ + // Replace with custom code + event.Skip(); +} + +/*! + * Should we show tooltips? + */ + +bool ctConfigurationBrowserControlPanel::ShowToolTips() +{ + return TRUE; +} diff --git a/utils/configtool/src/configbrowser.h b/utils/configtool/src/configbrowser.h new file mode 100644 index 0000000000..10fdac59fb --- /dev/null +++ b/utils/configtool/src/configbrowser.h @@ -0,0 +1,130 @@ +///////////////////////////////////////////////////////////////////////////// +// Name: configbrowser.h +// Purpose: +// Author: +// Modified by: +// Created: +// RCS-ID: +// Copyright: +// Licence: +///////////////////////////////////////////////////////////////////////////// + +#ifndef _CONFIGBROWSER_H_ +#define _CONFIGBROWSER_H_ + +/*! + * Includes + */ + +////@begin includes +////@end includes + +/*! + * Forward declarations + */ + +////@begin forward declarations +class ctConfigurationBrowserControlPanel; +////@end forward declarations + +/*! + * Control identifiers + */ + +////@begin control identifiers +#define ID_DIALOG 2000 +#define ID_CONFIGBROWSER_SPLITTERWINDOW 2001 +#define ID_CONFIGURATION_BROWSER_TREECTRL 2002 +#define ID_PANEL 2003 +#define ID_ADD_CONFIGURATION 2004 +#define ID_REMOVE_CONFIGURATION 2005 +#define ID_RENAME_CONFIGURATION 2006 +#define ID_CONFIGURATION_NAME 2007 +#define ID_CONFIGURATION_DESCRIPTION 2008 +////@end control identifiers + +/*! + * ctConfigurationBrowserWindow class declaration + */ + +class ctConfigurationBrowserWindow: public wxPanel +{ + DECLARE_CLASS( ctConfigurationBrowserWindow ) + DECLARE_EVENT_TABLE() + +public: + /// Constructor + ctConfigurationBrowserWindow( wxWindow* parent, wxWindowID id = -1, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxCAPTION|wxRESIZE_BORDER|wxSYSTEM_MENU|wxNO_FULL_REPAINT_ON_RESIZE|wxCLIP_CHILDREN ); + + /// Creates the controls and sizers + void CreateControls(); + +////@begin ctConfigurationBrowserWindow event handler declarations + + /// Event handler for ID_CONFIGURATION_BROWSER_TREECTRL + void OnConfigurationBrowserTreectrl( wxTreeEvent& event ); + +////@end ctConfigurationBrowserWindow event handler declarations + +////@begin ctConfigurationBrowserWindow member function declarations + +////@end ctConfigurationBrowserWindow member function declarations + + /// Should we show tooltips? + static bool ShowToolTips(); + +////@begin ctConfigurationBrowserWindow member variables +////@end ctConfigurationBrowserWindow member variables +}; + +/*! + * ctConfigurationBrowserControlPanel class declaration + */ + +class ctConfigurationBrowserControlPanel: public wxPanel +{ + DECLARE_CLASS( ctConfigurationBrowserControlPanel ) + DECLARE_EVENT_TABLE() + +public: + /// Constructor + ctConfigurationBrowserControlPanel( wxWindow* parent, wxWindowID id = -1, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxNO_BORDER|wxTAB_TRAVERSAL ); + + /// Creates the controls and sizers + void CreateControls(); + +////@begin ctConfigurationBrowserControlPanel event handler declarations + + /// Event handler for ID_ADD_CONFIGURATION + void OnAddConfiguration( wxCommandEvent& event ); + + /// Update event handler for ID_ADD_CONFIGURATION + void OnUpdateAddConfiguration( wxUpdateUIEvent& event ); + + /// Event handler for ID_REMOVE_CONFIGURATION + void OnRemoveConfiguration( wxCommandEvent& event ); + + /// Update event handler for ID_REMOVE_CONFIGURATION + void OnUpdateRemoveConfiguration( wxUpdateUIEvent& event ); + + /// Event handler for ID_RENAME_CONFIGURATION + void OnRenameConfiguration( wxCommandEvent& event ); + + /// Update event handler for ID_RENAME_CONFIGURATION + void OnUpdateRenameConfiguration( wxUpdateUIEvent& event ); + +////@end ctConfigurationBrowserControlPanel event handler declarations + +////@begin ctConfigurationBrowserControlPanel member function declarations + +////@end ctConfigurationBrowserControlPanel member function declarations + + /// Should we show tooltips? + static bool ShowToolTips(); + +////@begin ctConfigurationBrowserControlPanel member variables +////@end ctConfigurationBrowserControlPanel member variables +}; + +#endif + // _CONFIGBROWSER_H_ diff --git a/utils/configtool/src/configtooldoc.cpp b/utils/configtool/src/configtooldoc.cpp index 660af43535..bd5af0ba9a 100644 --- a/utils/configtool/src/configtooldoc.cpp +++ b/utils/configtool/src/configtooldoc.cpp @@ -1039,4 +1039,210 @@ bool ctConfigCommand::DoAndUndo(bool doCmd) return TRUE; } +IMPLEMENT_CLASS(ctConfiguration, wxObject) + +ctConfiguration::ctConfiguration() +{ + m_treeItemId = wxTreeItemId(); + m_parent = NULL; + m_topItem = NULL; +} + +ctConfiguration::ctConfiguration(ctConfiguration* parent, const wxString& name) +{ + m_treeItemId = wxTreeItemId(); + SetName(name); + m_parent = parent; + if (parent) + parent->AddChild(this); +} + +ctConfiguration::~ctConfiguration() +{ +/* + ctConfigTreeCtrl* treeCtrl = wxGetApp().GetMainFrame()->GetConfigTreeCtrl(); + if (m_treeItemId.IsOk() && treeCtrl) + { + ctTreeItemData* data = (ctTreeItemData*) treeCtrl->GetItemData(m_treeItemId); + if (data) + data->SetConfigItem(NULL); + } + if (GetParent()) + GetParent()->RemoveChild(this); + else + { + if (wxGetApp().GetMainFrame()->GetDocument() && + wxGetApp().GetMainFrame()->GetDocument()->GetTopItem() == this) + wxGetApp().GetMainFrame()->GetDocument()->SetTopItem(NULL); + } +*/ + + Clear(); +} + +/// Assignment operator. +void ctConfiguration::operator= (const ctConfiguration& configuration) +{ + m_name = configuration.m_name; + m_description = configuration.m_description; +} + +/// Clear children +void ctConfiguration::Clear() +{ + wxNode* node = m_children.GetFirst(); + while (node) + { + wxNode* next = node->GetNext(); + ctConfiguration* child = (ctConfiguration*) node->GetData(); + + // This should delete 'node' too, assuming + // child's m_parent points to 'this'. If not, + // it'll be cleaned up by m_children.Clear(). + delete child; + + node = next; + } + m_children.Clear(); +} + +// Get the nth child +ctConfiguration* ctConfiguration::GetChild(int n) const +{ + wxASSERT ( n < GetChildCount() && n > -1 ); + + if ( n < GetChildCount() && n > -1 ) + { + ctConfiguration* child = wxDynamicCast(m_children.Item(n)->GetData(), ctConfiguration); + return child; + } + else + return NULL; +} + +// Get the child count +int ctConfiguration::GetChildCount() const +{ + return m_children.GetCount(); +} + +/// Add a child +void ctConfiguration::AddChild(ctConfiguration* configuration) +{ + m_children.Append(configuration); + configuration->SetParent(this); +} + +/// Remove (but don't delete) a child +void ctConfiguration::RemoveChild(ctConfiguration* configuration) +{ + m_children.DeleteObject(configuration); + configuration->SetParent(NULL); +} + +/// Get the associated document (currently, assumes +/// there's only ever one document active) +ctConfigToolDoc* ctConfiguration::GetDocument() +{ + ctConfigToolDoc* doc = wxGetApp().GetMainFrame()->GetDocument(); + return doc; +} + +/// Find an item in this hierarchy +// TODO: ensure that names are unique, somehow. +ctConfiguration* ctConfiguration::FindConfiguration(const wxString& name) +{ + if (GetName() == name) + return this; + + for ( wxNode* node = GetChildren().GetFirst(); node; node = node->GetNext() ) + { + ctConfiguration* child = (ctConfiguration*) node->GetData(); + ctConfiguration* found = child->FindConfiguration(name); + if (found) + return found; + } + return NULL; +} + +/// Find the next sibling +ctConfiguration* ctConfiguration::FindNextSibling() +{ + if (!GetParent()) + return NULL; + wxNode* node = GetParent()->GetChildren().Member(this); + if (node && node->GetNext()) + { + return (ctConfiguration*) node->GetNext()->GetData(); + } + return NULL; +} + +/// Find the previous sibling +ctConfiguration* ctConfiguration::FindPreviousSibling() +{ + if (!GetParent()) + return NULL; + wxNode* node = GetParent()->GetChildren().Member(this); + if (node && node->GetPrevious()) + { + return (ctConfiguration*) node->GetPrevious()->GetData(); + } + return NULL; +} + +/// Create a clone of this and children +ctConfiguration* ctConfiguration::DeepClone() +{ + ctConfiguration* newItem = Clone(); + + for ( wxNode* node = GetChildren().GetFirst(); node; node = node->GetNext() ) + { + ctConfiguration* child = (ctConfiguration*) node->GetData(); + ctConfiguration* newChild = child->DeepClone(); + newItem->AddChild(newChild); + } + return newItem; +} + +/// Detach: remove from parent, and remove tree items +void ctConfiguration::Detach() +{ + // TODO + if (GetParent()) + GetParent()->RemoveChild(this); + else + GetDocument()->SetTopItem(NULL); + SetParent(NULL); + +/* + wxTreeItemId treeItem = GetTreeItemId(); + + DetachFromTree(); + + // Will delete the branch, but not the config items. + wxGetApp().GetMainFrame()->GetConfigTreeCtrl()->Delete(treeItem); +*/ +} + +/// Hide from tree: make sure tree deletions won't delete +/// the config items +void ctConfiguration::DetachFromTree() +{ + wxTreeItemId item = GetTreeItemId(); + + // TODO +/* + ctTreeItemData* data = (ctTreeItemData*) wxGetApp().GetMainFrame()->GetConfigTreeCtrl()->GetItemData(item); + data->SetConfigItem(NULL); + m_treeItemId = wxTreeItemId(); + + for ( wxNode* node = GetChildren().GetFirst(); node; node = node->GetNext() ) + { + ctConfiguration* child = (ctConfiguration*) node->GetData(); + child->DetachFromTree(); + } +*/ +} + diff --git a/utils/configtool/src/configtooldoc.h b/utils/configtool/src/configtooldoc.h index 4d069533b4..f5b036e108 100644 --- a/utils/configtool/src/configtooldoc.h +++ b/utils/configtool/src/configtooldoc.h @@ -22,6 +22,7 @@ #include "configitem.h" class wxSimpleHtmlTag; +class ctConfiguration; /*! * ctConfigToolDoc @@ -112,6 +113,135 @@ protected: ctConfigItem* m_clipboardItem; }; +/*! + * ctConfiguration is a configuration or a place-holder node within the + * hierarchy of configurations. + */ + +class ctConfiguration: public wxObject +{ +public: + /// Ctor and dtor + ctConfiguration(ctConfiguration* parent, const wxString& name); + ctConfiguration(); + ~ctConfiguration(); + + /// Copy constructor. + ctConfiguration(const ctConfiguration& configuration) + { + (*this) = configuration; + } + +/// Operations + + /// Assignment operator. + void operator= (const ctConfiguration& configuration); + + /// Create a clone + ctConfiguration* Clone() + { + ctConfiguration* configuration = new ctConfiguration; + *configuration = *this; + return configuration; + } + + /// Create a clone of this and children + ctConfiguration* DeepClone(); + + /// Clear children + void Clear(); + + /// Add a child + void AddChild(ctConfiguration* config); + + /// Remove (but don't delete) a child + void RemoveChild(ctConfiguration* config); + + /// Find an item in this hierarchy + ctConfiguration* FindConfiguration(const wxString& name); + + /// Find the next sibling + ctConfiguration* FindNextSibling(); + + /// Find the previous sibling + ctConfiguration* FindPreviousSibling(); + + /// Detach: remove from parent, and remove tree items + void Detach(); + + /// Attach: insert before the given position + void Attach(ctConfiguration* parent, ctConfiguration* insertbefore); + + void DetachFromTree(); + +/// Accessors + + /// Returns the top-level item. + ctConfigItem* GetTopItem() const { return m_topItem; } + + /// Sets the top-level item. + void SetTopItem(ctConfigItem* item) { m_topItem = item; } + + /// Returns the name. + wxString GetName() const { return m_name; } + + /// Sets the name. + void SetName(const wxString& name ) { m_name = name; } + + /// Get description. + wxString GetDescription() const { return m_description; } + + /// Set description. + void SetDescription(const wxString& descr) { m_description = descr; } + + /// Set the tree item id + void SetTreeItem(wxTreeItemId id) { m_treeItemId = id; } + + // Get the type + wxTreeItemId GetTreeItemId() const { return m_treeItemId ; } + + /// Get the list of children + wxList& GetChildren() { return m_children; } + + /// Get the nth child + ctConfiguration* GetChild(int n) const; + + /// Get the child count + int GetChildCount() const; + + /// Get the parent + ctConfiguration* GetParent() const { return m_parent; } + + /// Set the parent + void SetParent(ctConfiguration* parent) { m_parent = parent; } + + /// Get the associated document (currently, assumes + /// there's only ever one document active) + ctConfigToolDoc* GetDocument() ; + +protected: + + /// The corresponding tree item + wxTreeItemId m_treeItemId; + + /// The list of children. + wxList m_children; + + /// The parent config item + ctConfiguration* m_parent; + + /// The name + wxString m_name; + + /// The description + wxString m_description; + + /// The top-level item of this description, if any + ctConfigItem* m_topItem; + +DECLARE_CLASS(ctConfiguration) +}; + /*! * Implements a document editing command. diff --git a/utils/configtool/src/mainframe.cpp b/utils/configtool/src/mainframe.cpp index bfd09b31e7..917ad0b8b4 100644 --- a/utils/configtool/src/mainframe.cpp +++ b/utils/configtool/src/mainframe.cpp @@ -33,6 +33,7 @@ #include "propeditor.h" #include "configtooldoc.h" #include "configtoolview.h" +#include "configbrowser.h" #include "bitmaps/wxconfigtool.xpm" @@ -96,24 +97,35 @@ ctMainFrame::ctMainFrame(wxDocManager *manager, wxFrame *parent, wxWindowID id, m_editMenu = NULL; m_configurePage = NULL; m_setupPage = NULL; + m_configBrowserPage = NULL; m_mainNotebook = NULL; m_findDialog = NULL; m_treeSplitterWindow = new wxSplitterWindow(this, -1, wxDefaultPosition, wxSize(400, 300), - wxSP_3DSASH|wxSP_3DBORDER); + wxSP_3DSASH|wxSP_3DBORDER|wxNO_FULL_REPAINT_ON_RESIZE|wxCLIP_CHILDREN); m_configTreeCtrl = new ctConfigTreeCtrl(m_treeSplitterWindow, -1, wxDefaultPosition, wxDefaultSize, - wxTR_HAS_BUTTONS|wxNO_BORDER); + wxTR_HAS_BUTTONS|wxNO_BORDER|wxNO_FULL_REPAINT_ON_RESIZE|wxCLIP_CHILDREN); - m_mainNotebook = new wxNotebook(m_treeSplitterWindow, -1, wxDefaultPosition, wxSize(300, 300)); + m_mainNotebook = new wxNotebook(m_treeSplitterWindow, -1, wxDefaultPosition, wxSize(300, 300), + wxNO_FULL_REPAINT_ON_RESIZE|wxCLIP_CHILDREN); m_propertyEditor = new ctPropertyEditor(m_mainNotebook, -1, wxDefaultPosition, wxSize(300, 200), - wxNO_BORDER); + wxNO_BORDER|wxNO_FULL_REPAINT_ON_RESIZE|wxCLIP_CHILDREN); m_setupPage = new ctOutputWindow(m_mainNotebook, -1, wxDefaultPosition, wxSize(300, 200), - wxNO_BORDER); + wxNO_BORDER|wxNO_FULL_REPAINT_ON_RESIZE|wxCLIP_CHILDREN); m_configurePage = new ctOutputWindow(m_mainNotebook, -1, wxDefaultPosition, wxSize(300, 200), - wxNO_BORDER); + wxNO_BORDER|wxNO_FULL_REPAINT_ON_RESIZE|wxCLIP_CHILDREN); + +#if 0 + m_configBrowserPage = new ctConfigurationBrowserWindow(m_mainNotebook, -1, wxDefaultPosition, wxSize(300, 200), + wxNO_BORDER|wxNO_FULL_REPAINT_ON_RESIZE|wxCLIP_CHILDREN); +#endif + m_mainNotebook->AddPage(m_propertyEditor, _T("Properties")); +#if 0 + m_mainNotebook->AddPage(m_configBrowserPage, _T("Configuration Browser")); +#endif m_mainNotebook->AddPage(m_setupPage, _T("setup.h")); m_mainNotebook->AddPage(m_configurePage, _T("configure")); @@ -131,7 +143,7 @@ ctMainFrame::ctMainFrame(wxDocManager *manager, wxFrame *parent, wxWindowID id, wxMenuBar* menuBar = CreateMenuBar(); SetMenuBar(menuBar); - CreateToolBar(wxNO_BORDER|wxTB_FLAT|wxTB_HORIZONTAL); + CreateToolBar(wxNO_BORDER|wxTB_FLAT|wxTB_HORIZONTAL|wxNO_FULL_REPAINT_ON_RESIZE|wxCLIP_CHILDREN); InitToolBar(GetToolBar()); if (wxGetApp().GetSettings().m_showToolBar) diff --git a/utils/configtool/src/mainframe.h b/utils/configtool/src/mainframe.h index 9057369d05..9ad6366a86 100644 --- a/utils/configtool/src/mainframe.h +++ b/utils/configtool/src/mainframe.h @@ -27,6 +27,7 @@ class ctConfigTreeCtrl; class ctPropertyEditor; class ctOutputWindow; class ctFindReplaceDialog; +class ctConfigurationBrowserWindow; /*! * \brief The main window of the application. @@ -153,6 +154,10 @@ protected: ctOutputWindow* m_setupPage; ctOutputWindow* m_configurePage; + // The control panel for browsing, adding and removing + // configurations. + ctConfigurationBrowserWindow* m_configBrowserPage; + ctFindReplaceDialog* m_findDialog; }; diff --git a/utils/configtool/src/wxconfigtool.cpp b/utils/configtool/src/wxconfigtool.cpp index 17fbe701db..05baa5d69b 100644 --- a/utils/configtool/src/wxconfigtool.cpp +++ b/utils/configtool/src/wxconfigtool.cpp @@ -122,7 +122,7 @@ bool ctApp::OnInit(void) ctMainFrame* frame = new ctMainFrame(m_docManager, NULL, -1, wxGetApp().GetSettings().GetAppName(), GetSettings().m_frameSize.GetPosition(), GetSettings().m_frameSize.GetSize(), - wxDEFAULT_FRAME_STYLE); + wxDEFAULT_FRAME_STYLE|wxNO_FULL_REPAINT_ON_RESIZE|wxCLIP_CHILDREN); SetTopWindow(frame); switch (wxGetApp().GetSettings().m_frameStatus) diff --git a/utils/configtool/src/wxconfigtool.dsp b/utils/configtool/src/wxconfigtool.dsp index e86c8efb0d..f87880a55e 100644 --- a/utils/configtool/src/wxconfigtool.dsp +++ b/utils/configtool/src/wxconfigtool.dsp @@ -159,8 +159,7 @@ LINK32=link.exe # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "$(WXWINDEV)\include" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "__WINDOWS__" /D "__WXMSW__" /D DEBUG=1 /D "__WXDEBUG__" /D "__WIN95__" /D "__WIN32__" /D WINVER=0x0400 /D "STRICT" /YX /FD /c -# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "$(WXWINDEV)/include" /I "$(WXWINDEV)/lib/mswd" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "__WINDOWS__" /D "__WXMSW__" /D DEBUG=1 /D "__WXDEBUG__" /D "__WIN95__" /D "__WIN32__" /D WINVER=0x0400 /D "STRICT" /FD /c -# SUBTRACT CPP /YX +# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "$(WXWIN)/include" /I "$(WXWIN)/lib/mswd" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "__WINDOWS__" /D "__WXMSW__" /D DEBUG=1 /D "__WXDEBUG__" /D "__WIN95__" /D "__WIN32__" /D WINVER=0x0400 /D "STRICT" /FD /c # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32 # ADD BASE RSC /l 0x809 /d "_DEBUG" @@ -187,7 +186,7 @@ LINK32=link.exe # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /MD /W3 /GX /O1 /Ob2 /I "$(WXWINDEV)\include" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "__WINDOWS__" /D "__WXMSW__" /D "__WIN95__" /D "__WIN32__" /D WINVER=0x0400 /D "STRICT" /YX /FD /c -# ADD CPP /nologo /MD /W3 /GX /O1 /Ob2 /I "$(WXWINDEV)/include" /I "$(WXWINDEV)/lib/mswd" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "__WINDOWS__" /D "__WXMSW__" /D "__WIN95__" /D "__WIN32__" /D WINVER=0x0400 /D "STRICT" /FD /c +# ADD CPP /nologo /MD /W3 /GX /O1 /Ob2 /I "$(WXWIN)/include" /I "$(WXWIN)/lib/mswd" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "__WINDOWS__" /D "__WXMSW__" /D "__WIN95__" /D "__WIN32__" /D WINVER=0x0400 /D "STRICT" /FD /c # SUBTRACT CPP /YX # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32 @@ -222,6 +221,10 @@ SOURCE=.\appsettings.h # End Source File # Begin Source File +SOURCE=.\configbrowser.h +# End Source File +# Begin Source File + SOURCE=.\configitem.h # End Source File # Begin Source File @@ -283,6 +286,10 @@ SOURCE=.\appsettings.cpp # End Source File # Begin Source File +SOURCE=.\configbrowser.cpp +# End Source File +# Begin Source File + SOURCE=.\configitem.cpp # End Source File # Begin Source File @@ -366,12 +373,12 @@ SOURCE=.\wxconfigtool.rc !ELSEIF "$(CFG)" == "wxconfigtool - Win32 DebugDev" # ADD BASE RSC /l 0x809 -# ADD RSC /l 0x809 /i "$(WXWINDEV)\include" +# ADD RSC /l 0x809 /i "$(WXWIN)\include" !ELSEIF "$(CFG)" == "wxconfigtool - Win32 ReleaseDev" # ADD BASE RSC /l 0x809 -# ADD RSC /l 0x809 /i "$(WXWINDEV)\include" +# ADD RSC /l 0x809 /i "$(WXWIN)\include" !ENDIF diff --git a/utils/configtool/src/wxconfigtool.h b/utils/configtool/src/wxconfigtool.h index a88f72962a..5fe71a22b1 100644 --- a/utils/configtool/src/wxconfigtool.h +++ b/utils/configtool/src/wxconfigtool.h @@ -99,12 +99,6 @@ protected: /// The application directory. wxString m_appDir; - /// Global print data, to remember settings during the session. - wxPrintData m_printData; - - /// Global page setup data. - wxPageSetupDialogData m_pageSetupData; - /// Notebook window. wxNotebook* m_notebookWindow; diff --git a/utils/configtool/src/wxconfigtool.pjd b/utils/configtool/src/wxconfigtool.pjd index d647bb5e4b..a4db7112c0 100644 --- a/utils/configtool/src/wxconfigtool.pjd +++ b/utils/configtool/src/wxconfigtool.pjd @@ -12,7 +12,7 @@ - 70 + 84 TRUE FALSE @@ -23,32 +23,32 @@ - + Projects - 12159224 + 11951464 root-document project 1 0 0 - + Dialogs - 11828056 + 11896088 html-document dialogsfolder 1 - 12159224 + 11951464 1 - + Configuration Items Selector - 11862496 + 12032512 dialog-document dialog 0 - 11828056 + 11896088 0 5/5/2003 wbDialogProxy @@ -63,6 +63,11 @@ Configuration Items Selector TRUE FALSE + + + + + FALSE TRUE TRUE TRUE @@ -77,23 +82,20 @@ FALSE FALSE FALSE - FALSE - - - + FALSE TRUE 400 300 - + wxBoxSizer V - 11850736 + 12025320 dialog-control-document sizer 0 - 11862496 + 12032512 0 wbBoxSizerProxy Vertical @@ -107,14 +109,14 @@ TRUE FALSE FALSE - + wxBoxSizer V - 11852136 + 12019224 dialog-control-document sizer 0 - 11850736 + 12025320 0 wbBoxSizerProxy Vertical @@ -128,14 +130,14 @@ TRUE FALSE FALSE - + wxStaticText - 12204504 + 11923216 dialog-control-document dialogcontrol 0 - 11852136 + 12019224 0 wbStaticTextProxy wxID_STATIC @@ -145,6 +147,9 @@ Please edit the list of configuration items by selecting from the list below. FALSE + + + FALSE FALSE FALSE FALSE @@ -157,9 +162,6 @@ list below. FALSE FALSE FALSE - FALSE - - -1 -1 -1 @@ -177,14 +179,14 @@ list below. - + wxStaticText - 12145024 + 12190256 dialog-control-document dialogcontrol 0 - 11852136 + 12019224 0 wbStaticTextProxy wxID_STATIC @@ -193,6 +195,9 @@ list below. &Available items: FALSE + + + FALSE FALSE FALSE FALSE @@ -205,9 +210,6 @@ list below. FALSE FALSE FALSE - FALSE - - -1 -1 -1 @@ -225,14 +227,14 @@ list below. - + wxListBox - 11927768 + 17232752 dialog-control-document dialogcontrol 0 - 11852136 + 12019224 0 wbListBoxProxy ID_AVAILABLE_CONFIG_ITEMS @@ -243,6 +245,13 @@ list below. FALSE + + + + + FALSE + + TRUE FALSE FALSE @@ -258,11 +267,6 @@ list below. FALSE FALSE FALSE - FALSE - - - - -1 -1 -1 @@ -280,14 +284,14 @@ list below. - + wxStaticText - 12500416 + 12462728 dialog-control-document dialogcontrol 0 - 11852136 + 12019224 0 wbStaticTextProxy wxID_STATIC @@ -296,6 +300,9 @@ list below. &List of configuration items: FALSE + + + FALSE FALSE FALSE FALSE @@ -308,9 +315,6 @@ list below. FALSE FALSE FALSE - FALSE - - -1 -1 -1 @@ -328,14 +332,14 @@ list below. - + wxBoxSizer H - 12186088 + 12615304 dialog-control-document sizer 0 - 11852136 + 12019224 0 wbBoxSizerProxy Horizontal @@ -349,14 +353,14 @@ list below. FALSE FALSE FALSE - + wxListBox - 11931968 + 12079704 dialog-control-document dialogcontrol 0 - 12186088 + 12615304 0 wbListBoxProxy ID_CONFIG_ITEMS @@ -367,6 +371,13 @@ list below. FALSE + + + + + FALSE + + TRUE FALSE FALSE @@ -382,11 +393,6 @@ list below. FALSE FALSE FALSE - FALSE - - - - -1 -1 -1 @@ -404,14 +410,14 @@ list below. - + wxBoxSizer V - 11826456 + 12152016 dialog-control-document sizer 0 - 12186088 + 12615304 0 wbBoxSizerProxy Vertical @@ -425,14 +431,14 @@ list below. TRUE FALSE FALSE - + wxButton - 12525760 + 16977320 dialog-control-document dialogcontrol 0 - 11826456 + 12152016 0 wbButtonProxy ID_CONFIG_ADD @@ -442,19 +448,19 @@ list below. TRUE TRUE A&dd + FALSE + + + + + FALSE FALSE FALSE FALSE FALSE FALSE - FALSE FALSE FALSE - FALSE - - - - -1 -1 -1 @@ -472,14 +478,14 @@ list below. - + wxButton - 11928032 + 12016592 dialog-control-document dialogcontrol 0 - 11826456 + 12152016 0 wbButtonProxy ID_CONFIG_REMOVE @@ -489,19 +495,19 @@ list below. TRUE TRUE &Remove + FALSE + + + + + FALSE FALSE FALSE FALSE FALSE FALSE - FALSE FALSE FALSE - FALSE - - - - -1 -1 -1 @@ -521,14 +527,14 @@ list below. - + wxBoxSizer H - 12203904 + 12566552 dialog-control-document sizer 0 - 11852136 + 12019224 0 wbBoxSizerProxy Horizontal @@ -542,14 +548,14 @@ list below. FALSE FALSE FALSE - + Spacer - 12122248 + 16346128 dialog-control-document dialogcontrol 0 - 12203904 + 12566552 0 wbSpacerProxy 5 @@ -565,14 +571,14 @@ list below. FALSE FALSE - + wxButton - 12178424 + 17062792 dialog-control-document dialogcontrol 0 - 12203904 + 12566552 0 wbButtonProxy wxID_OK @@ -582,19 +588,19 @@ list below. TRUE FALSE &OK + TRUE + + + + + FALSE FALSE FALSE FALSE FALSE FALSE - TRUE FALSE FALSE - FALSE - - - - -1 -1 -1 @@ -612,14 +618,14 @@ list below. - + wxButton - 12564104 + 17213304 dialog-control-document dialogcontrol 0 - 12203904 + 12566552 0 wbButtonProxy wxID_CANCEL @@ -629,19 +635,19 @@ list below. FALSE FALSE &Cancel + FALSE + + + + + FALSE FALSE FALSE FALSE FALSE FALSE - FALSE FALSE FALSE - FALSE - - - - -1 -1 -1 @@ -663,14 +669,14 @@ list below. - + Edit Custom Property - 12169224 + 17136512 dialog-document dialog 0 - 11828056 + 11896088 0 9/5/2003 wbDialogProxy @@ -685,6 +691,11 @@ list below. Edit Custom Property TRUE FALSE + + + + + FALSE TRUE TRUE TRUE @@ -699,23 +710,20 @@ list below. FALSE FALSE FALSE - FALSE - - - + FALSE TRUE 400 300 - + wxBoxSizer V - 11968400 + 12124208 dialog-control-document sizer 0 - 12169224 + 17136512 0 wbBoxSizerProxy Vertical @@ -729,14 +737,14 @@ list below. TRUE FALSE FALSE - + wxBoxSizer V - 12146544 + 12443504 dialog-control-document sizer 0 - 11968400 + 12124208 0 wbBoxSizerProxy Vertical @@ -750,14 +758,14 @@ list below. TRUE FALSE FALSE - + wxStaticText - 12172672 + 17158656 dialog-control-document dialogcontrol 0 - 12146544 + 12443504 0 wbStaticTextProxy wxID_STATIC @@ -766,6 +774,9 @@ list below. &Enter name, type and description for your custom property. FALSE + + + FALSE FALSE FALSE FALSE @@ -778,9 +789,6 @@ list below. FALSE FALSE FALSE - FALSE - - -1 -1 -1 @@ -798,14 +806,14 @@ list below. - + wxStaticText - 11868200 + 12576400 dialog-control-document dialogcontrol 0 - 12146544 + 12443504 0 wbStaticTextProxy wxID_STATIC @@ -814,6 +822,9 @@ list below. &Name: FALSE + + + FALSE FALSE FALSE FALSE @@ -826,9 +837,6 @@ list below. FALSE FALSE FALSE - FALSE - - -1 -1 -1 @@ -846,14 +854,14 @@ list below. - + wxTextCtrl - 12076352 + 12507072 dialog-control-document dialogcontrol 0 - 12146544 + 12443504 0 wbTextCtrlProxy ID_CUSTOMPROPERTYNAME @@ -863,6 +871,13 @@ list below. FALSE FALSE + + + + + FALSE + + FALSE FALSE FALSE @@ -886,11 +901,6 @@ list below. FALSE FALSE FALSE - FALSE - - - - -1 -1 -1 @@ -908,14 +918,14 @@ list below. - + wxBoxSizer H - 11874040 + 12170800 dialog-control-document sizer 0 - 12146544 + 12443504 0 wbBoxSizerProxy Horizontal @@ -929,14 +939,14 @@ list below. FALSE FALSE FALSE - + wxBoxSizer V - 12550760 + 12524008 dialog-control-document sizer 0 - 11874040 + 12170800 0 wbBoxSizerProxy Vertical @@ -950,14 +960,14 @@ list below. FALSE FALSE FALSE - + wxStaticText - 12557832 + 12479952 dialog-control-document dialogcontrol 0 - 12550760 + 12524008 0 wbStaticTextProxy wxID_STATIC @@ -966,6 +976,9 @@ list below. &Data type: FALSE + + + FALSE FALSE FALSE FALSE @@ -978,9 +991,6 @@ list below. FALSE FALSE FALSE - FALSE - - -1 -1 -1 @@ -998,14 +1008,14 @@ list below. - + wxChoice - 12250576 + 12279720 dialog-control-document dialogcontrol 0 - 12550760 + 12524008 0 wbChoiceProxy ID_CUSTOMPROPERTYTYPE @@ -1016,13 +1026,15 @@ list below. FALSE string|bool|double|long string - FALSE - FALSE - FALSE - - + + + FALSE + + + FALSE + FALSE -1 -1 -1 @@ -1041,14 +1053,14 @@ list below. - + wxBoxSizer V - 14991368 + 12289128 dialog-control-document sizer 0 - 11874040 + 12170800 0 wbBoxSizerProxy Vertical @@ -1062,14 +1074,14 @@ list below. FALSE FALSE FALSE - + wxStaticText - 14995360 + 12293896 dialog-control-document dialogcontrol 0 - 14991368 + 12289128 0 wbStaticTextProxy wxID_STATIC @@ -1078,6 +1090,9 @@ list below. &Editor type: FALSE + + + FALSE FALSE FALSE FALSE @@ -1090,9 +1105,6 @@ list below. FALSE FALSE FALSE - FALSE - - -1 -1 -1 @@ -1110,14 +1122,14 @@ list below. - + wxChoice - 15007864 + 16086624 dialog-control-document dialogcontrol 0 - 14991368 + 12289128 0 wbChoiceProxy ID_CUSTOMPROPERTYEDITORTYPE @@ -1128,13 +1140,15 @@ list below. FALSE string|choice|bool|float|integer|configitems string - FALSE - FALSE - FALSE - - + + + FALSE + + + FALSE + FALSE -1 -1 -1 @@ -1154,14 +1168,14 @@ list below. - + wxStaticBoxSizer H - 15017272 + 16096824 dialog-control-document sizer 0 - 12146544 + 12443504 0 wbStaticBoxSizerProxy Choices @@ -1177,14 +1191,14 @@ list below. TRUE FALSE FALSE - + wxListBox - 15021688 + 16101544 dialog-control-document dialogcontrol 0 - 15017272 + 16096824 0 wbListBoxProxy ID_PROPERTY_CHOICES @@ -1195,6 +1209,13 @@ list below. TRUE + + + + + FALSE + + TRUE FALSE FALSE @@ -1210,11 +1231,6 @@ list below. FALSE FALSE FALSE - FALSE - - - - -1 -1 -1 @@ -1232,14 +1248,14 @@ list below. - + wxBoxSizer V - 15035584 + 16115832 dialog-control-document sizer 0 - 15017272 + 16096824 0 wbBoxSizerProxy Vertical @@ -1253,14 +1269,14 @@ list below. FALSE FALSE FALSE - + wxButton - 15039816 + 16121088 dialog-control-document dialogcontrol 0 - 15035584 + 16115832 0 wbButtonProxy ID_PROPERTY_CHOICE_ADD @@ -1270,19 +1286,19 @@ list below. TRUE TRUE &Add... + FALSE + + + + + FALSE FALSE FALSE FALSE FALSE FALSE - FALSE FALSE FALSE - FALSE - - - - -1 -1 -1 @@ -1300,14 +1316,14 @@ list below. - + wxButton - 15051864 + 16136440 dialog-control-document dialogcontrol 0 - 15035584 + 16115832 0 wbButtonProxy ID_PROPERTY_CHOICE_REMOVE @@ -1317,19 +1333,19 @@ list below. TRUE TRUE &Remove + FALSE + + + + + FALSE FALSE FALSE FALSE FALSE FALSE - FALSE FALSE FALSE - FALSE - - - - -1 -1 -1 @@ -1349,14 +1365,14 @@ list below. - + wxStaticText - 12076984 + 16147664 dialog-control-document dialogcontrol 0 - 12146544 + 12443504 0 wbStaticTextProxy wxID_STATIC @@ -1365,6 +1381,9 @@ list below. &Description: FALSE + + + FALSE FALSE FALSE FALSE @@ -1377,9 +1396,6 @@ list below. FALSE FALSE FALSE - FALSE - - -1 -1 -1 @@ -1397,14 +1413,14 @@ list below. - + wxTextCtrl - 15073600 + 16158632 dialog-control-document dialogcontrol 0 - 12146544 + 12443504 0 wbTextCtrlProxy ID_CUSTOMPROPERTYDESCRIPTION @@ -1414,6 +1430,13 @@ list below. FALSE FALSE + + + + + FALSE + + TRUE FALSE FALSE @@ -1437,11 +1460,6 @@ list below. FALSE FALSE FALSE - FALSE - - - - -1 -1 -1 @@ -1459,14 +1477,14 @@ list below. - + wxBoxSizer H - 15089864 + 16175024 dialog-control-document sizer 0 - 12146544 + 12443504 0 wbBoxSizerProxy Horizontal @@ -1480,14 +1498,14 @@ list below. TRUE FALSE FALSE - + Spacer - 15094056 + 16179192 dialog-control-document dialogcontrol 0 - 15089864 + 16175024 0 wbSpacerProxy 5 @@ -1503,14 +1521,14 @@ list below. FALSE FALSE - + wxButton - 15098024 + 16184072 dialog-control-document dialogcontrol 0 - 15089864 + 16175024 0 wbButtonProxy wxID_OK @@ -1520,19 +1538,19 @@ list below. FALSE FALSE &OK + FALSE + + + + + FALSE FALSE FALSE FALSE FALSE FALSE - FALSE FALSE FALSE - FALSE - - - - -1 -1 -1 @@ -1550,14 +1568,14 @@ list below. - + wxButton - 15109944 + 16195176 dialog-control-document dialogcontrol 0 - 15089864 + 16175024 0 wbButtonProxy wxID_CANCEL @@ -1567,19 +1585,19 @@ list below. FALSE FALSE &Cancel + FALSE + + + + + FALSE FALSE FALSE FALSE FALSE FALSE - FALSE FALSE FALSE - FALSE - - - - -1 -1 -1 @@ -1597,14 +1615,14 @@ list below. - + wxButton - 15121152 + 16210496 dialog-control-document dialogcontrol 0 - 15089864 + 16175024 0 wbButtonProxy wxID_HELP @@ -1614,19 +1632,19 @@ list below. FALSE FALSE &Help + FALSE + + + + + FALSE FALSE FALSE FALSE FALSE FALSE - FALSE FALSE FALSE - FALSE - - - - -1 -1 -1 @@ -1648,14 +1666,14 @@ list below. - + Settings Dialog - 12575712 + 16221720 dialog-document dialog 0 - 11828056 + 11896088 0 9/5/2003 wbDialogProxy @@ -1670,6 +1688,11 @@ list below. Settings Dialog TRUE FALSE + + + + + FALSE TRUE FALSE TRUE @@ -1684,34 +1707,31 @@ list below. FALSE FALSE FALSE - FALSE - - - + FALSE TRUE 400 300 - + wxBoxSizer V - 15140008 + 16229808 dialog-control-document sizer 0 - 12575712 + 16221720 0 wbBoxSizerProxy Vertical FALSE FALSE - + wxNotebook - 15144888 + 16234792 dialog-control-document dialogcontrol 0 - 15140008 + 16229808 0 wbNotebookProxy ID_NOTEBOOK @@ -1721,6 +1741,13 @@ list below. FALSE FALSE TRUE + + + + + FALSE + + TRUE FALSE FALSE @@ -1736,11 +1763,6 @@ list below. FALSE FALSE FALSE - FALSE - - - - -1 -1 200 @@ -1755,14 +1777,14 @@ list below. TRUE FALSE FALSE - + wxPanel - 15161304 + 16251520 dialog-control-document dialogcontrol 0 - 15144888 + 16234792 0 wbPanelProxy ID_GENERAL_SETTINGS_DIALOG @@ -1770,6 +1792,11 @@ list below. ctGeneralSettingsDialog General + + + + + FALSE FALSE FALSE FALSE @@ -1779,11 +1806,7 @@ list below. FALSE FALSE FALSE - FALSE - - - - + TRUE TRUE -1 -1 @@ -1801,14 +1824,14 @@ list below. FALSE - + wxBoxSizer V - 15174776 + 16264024 dialog-control-document sizer 0 - 15161304 + 16251520 0 wbBoxSizerProxy Vertical @@ -1822,14 +1845,14 @@ list below. TRUE FALSE FALSE - + wxStaticBoxSizer V - 15180448 + 16269760 dialog-control-document sizer 0 - 15174776 + 16264024 0 wbStaticBoxSizerProxy General settings @@ -1845,14 +1868,14 @@ list below. TRUE FALSE FALSE - + wxCheckBox - 15186752 + 16276856 dialog-control-document dialogcontrol 0 - 15180448 + 16269760 0 wbCheckBoxProxy ID_LOAD_LAST_DOCUMENT @@ -1863,13 +1886,15 @@ list below. FALSE &Load last document FALSE - FALSE - FALSE - FALSE - - Check to load the last document on startup + + + + + FALSE + FALSE + FALSE -1 -1 -1 @@ -1885,14 +1910,14 @@ list below. FALSE FALSE - + wxCheckBox - 15197184 + 16291264 dialog-control-document dialogcontrol 0 - 15180448 + 16269760 0 wbCheckBoxProxy ID_SHOW_TOOLTIPS @@ -1903,13 +1928,15 @@ list below. FALSE &Show tooltips FALSE - FALSE - FALSE - FALSE - - Check to show tooltips + + + + + FALSE + FALSE + FALSE -1 -1 -1 @@ -1925,22 +1952,25 @@ list below. FALSE FALSE - + wxStaticText - 12200472 + 16301768 dialog-control-document dialogcontrol 0 - 15180448 + 16269760 0 wbStaticTextProxy wxID_STATIC - 10002 + 5105 wxStaticText &Default file kind to save when using the Go command: FALSE + + + FALSE FALSE FALSE FALSE @@ -1953,9 +1983,6 @@ list below. FALSE FALSE FALSE - FALSE - - -1 -1 -1 @@ -1971,14 +1998,14 @@ list below. FALSE TRUE - + wxChoice - 11983984 + 16313632 dialog-control-document dialogcontrol 0 - 15180448 + 16269760 0 wbChoiceProxy ID_DEFAULT_FILE_KIND @@ -1989,13 +2016,15 @@ list below. FALSE Setup file|Configure script Setup file - FALSE - FALSE - FALSE - - Select the default kind of file to save using Go + + + FALSE + + + FALSE + FALSE -1 -1 200 @@ -2014,14 +2043,14 @@ list below. - + wxPanel - 15162256 + 16251096 dialog-control-document dialogcontrol 0 - 15144888 + 16234792 0 wbPanelProxy ID_LOCATION_SETTINGS_DIALOG @@ -2029,6 +2058,11 @@ list below. ctLocationSettingsDialog Locations + + + + + FALSE FALSE FALSE FALSE @@ -2038,11 +2072,7 @@ list below. FALSE FALSE FALSE - FALSE - - - - + TRUE TRUE -1 -1 @@ -2060,14 +2090,14 @@ list below. FALSE - + wxBoxSizer V - 15215296 + 16333208 dialog-control-document sizer 0 - 15162256 + 16251096 0 wbBoxSizerProxy Vertical @@ -2081,14 +2111,14 @@ list below. TRUE FALSE FALSE - + wxStaticBoxSizer V - 15220872 + 16337568 dialog-control-document sizer 0 - 15215296 + 16333208 0 wbStaticBoxSizerProxy Locations @@ -2104,14 +2134,14 @@ list below. TRUE FALSE FALSE - + wxStaticText - 15227216 + 16349088 dialog-control-document dialogcontrol 0 - 15220872 + 16337568 0 wbStaticTextProxy wxID_STATIC @@ -2120,6 +2150,9 @@ list below. &wxWindows hierarchy: FALSE + + + FALSE FALSE FALSE FALSE @@ -2132,9 +2165,6 @@ list below. FALSE FALSE FALSE - FALSE - - -1 -1 -1 @@ -2150,14 +2180,14 @@ list below. FALSE TRUE - + wxBoxSizer H - 15239928 + 16360624 dialog-control-document sizer 0 - 15220872 + 16337568 0 wbBoxSizerProxy Horizontal @@ -2171,14 +2201,14 @@ list below. FALSE FALSE FALSE - + wxTextCtrl - 15244496 + 16366808 dialog-control-document dialogcontrol 0 - 15239928 + 16360624 0 wbTextCtrlProxy ID_WXWIN_HIERARCHY @@ -2188,6 +2218,13 @@ list below. FALSE TRUE + Enter the root path of the wxWindows hierarchy + + + + FALSE + + FALSE FALSE FALSE @@ -2211,11 +2248,6 @@ list below. FALSE FALSE FALSE - FALSE - - - Enter the root path of the wxWindows hierarchy - -1 -1 200 @@ -2231,14 +2263,14 @@ list below. FALSE FALSE - + wxButton - 15262920 + 16392264 dialog-control-document dialogcontrol 0 - 15239928 + 16360624 0 wbButtonProxy ID_CHOOSE_WXWIN_HIERARCHY @@ -2248,20 +2280,20 @@ list below. TRUE TRUE &Choose... + FALSE + Click to choose the root path of the wxWindows hierarchy + + + + + FALSE FALSE FALSE FALSE FALSE FALSE - FALSE FALSE FALSE - FALSE - - - Click to choose the root path of the wxWindows hierarchy - - -1 -1 -1 @@ -2278,14 +2310,14 @@ list below. FALSE - + wxBoxSizer H - 15273336 + 16561976 dialog-control-document sizer 0 - 15220872 + 16337568 0 wbBoxSizerProxy Horizontal @@ -2299,14 +2331,14 @@ list below. FALSE FALSE FALSE - + Spacer - 15277448 + 16566032 dialog-control-document dialogcontrol 0 - 15273336 + 16561976 0 wbSpacerProxy 60 @@ -2322,14 +2354,14 @@ list below. FALSE FALSE - + wxCheckBox - 15281560 + 16570576 dialog-control-document dialogcontrol 0 - 15273336 + 16561976 0 wbCheckBoxProxy ID_USE_WXWIN @@ -2340,13 +2372,15 @@ list below. FALSE &Use WXWIN environment variable FALSE - FALSE - FALSE - FALSE - - Check to use the value of WXWIN instead + + + + + FALSE + FALSE + FALSE -1 -1 -1 @@ -2367,14 +2401,14 @@ list below. - + wxBoxSizer H - 15187192 + 12479616 dialog-control-document sizer 0 - 15140008 + 16229808 0 wbBoxSizerProxy Horizontal @@ -2388,14 +2422,14 @@ list below. TRUE FALSE FALSE - + Spacer - 15145120 + 16581360 dialog-control-document dialogcontrol 0 - 15187192 + 12479616 0 wbSpacerProxy 5 @@ -2411,14 +2445,14 @@ list below. FALSE FALSE - + wxButton - 15294368 + 16585576 dialog-control-document dialogcontrol 0 - 15187192 + 12479616 0 wbButtonProxy wxID_OK @@ -2428,19 +2462,19 @@ list below. TRUE FALSE &OK + TRUE + + + + + FALSE FALSE FALSE FALSE FALSE FALSE - TRUE FALSE FALSE - FALSE - - - - -1 -1 -1 @@ -2456,14 +2490,14 @@ list below. FALSE FALSE - + wxButton - 15304600 + 16595504 dialog-control-document dialogcontrol 0 - 15187192 + 12479616 0 wbButtonProxy wxID_CANCEL @@ -2473,19 +2507,19 @@ list below. TRUE FALSE &Cancel + FALSE + + + + + FALSE FALSE FALSE FALSE FALSE FALSE - FALSE FALSE FALSE - FALSE - - - - -1 -1 -1 @@ -2503,14 +2537,14 @@ list below. - + wxButton - 15315760 + 16605712 dialog-control-document dialogcontrol 0 - 15187192 + 12479616 0 wbButtonProxy wxID_HELP @@ -2520,19 +2554,19 @@ list below. TRUE FALSE &Help + FALSE + + + + + FALSE FALSE FALSE FALSE FALSE FALSE - FALSE FALSE FALSE - FALSE - - - - -1 -1 -1 @@ -2550,34 +2584,34 @@ list below. - + wxContextHelpButton - 15327200 + 16616304 dialog-control-document dialogcontrol 0 - 15187192 + 12479616 0 wbContextHelpButtonProxy wxID_CONTEXT_HELP + + + + + FALSE 5112 wxContextHelpButton FALSE FALSE __WXGTK__,__WXMAC__ + FALSE TRUE FALSE FALSE - FALSE FALSE FALSE - FALSE - - - - -1 -1 20 @@ -2598,15 +2632,588 @@ list below. + + Configuration Browser + 17171592 + dialog-document + + dialog + 0 + 11896088 + 0 + 1/7/2003 + wbDialogProxy + 2000 + ID_DIALOG + 2000 + ctConfigurationBrowserWindow + wxPanel + configbrowser.cpp + configbrowser.h + + Configuration Browser + FALSE + FALSE + + + + + FALSE + TRUE + TRUE + TRUE + FALSE + FALSE + FALSE + FALSE + FALSE + FALSE + FALSE + FALSE + FALSE + TRUE + TRUE + FALSE + FALSE + 400 + 300 + + wxBoxSizer V + 12543800 + dialog-control-document + + sizer + 0 + 17171592 + 0 + wbBoxSizerProxy + Vertical + + wxSplitterWindow + 12560080 + dialog-control-document + + dialogcontrol + 0 + 12543800 + 0 + wbSplitterWindowProxy + ID_CONFIGBROWSER_SPLITTERWINDOW + 2001 + wxSplitterWindow + + FALSE + FALSE + Vertical + 200 + + + + + FALSE + TRUE + FALSE + TRUE + FALSE + FALSE + FALSE + TRUE + FALSE + FALSE + FALSE + FALSE + FALSE + FALSE + TRUE + FALSE + -1 + -1 + 400 + 400 + Expand + Centre + 1 + 5 + FALSE + FALSE + FALSE + FALSE + FALSE + FALSE + + wxTreeCtrl + 17075704 + dialog-control-document + + dialogcontrol + 0 + 12560080 + 0 + wbTreeCtrlProxy + ID_CONFIGURATION_BROWSER_TREECTRL + 2002 + wxTreeCtrl + + TRUE + FALSE + + + + + FALSE + + + FALSE + FALSE + FALSE + FALSE + FALSE + FALSE + FALSE + FALSE + FALSE + FALSE + TRUE + FALSE + FALSE + TRUE + FALSE + FALSE + FALSE + FALSE + FALSE + FALSE + FALSE + FALSE + -1 + -1 + 100 + 100 + Centre + Centre + 0 + 5 + TRUE + TRUE + TRUE + TRUE + FALSE + FALSE + + + wxPanel + 16978072 + dialog-control-document + + dialogcontrol + 0 + 12560080 + 0 + wbPanelProxy + ID_PANEL + 2003 + ctConfigurationBrowserControlPanel + + + + + + FALSE + TRUE + FALSE + FALSE + FALSE + FALSE + FALSE + FALSE + FALSE + FALSE + TRUE + FALSE + -1 + -1 + 100 + 80 + Centre + Centre + 0 + 5 + TRUE + TRUE + TRUE + TRUE + FALSE + FALSE + + wxBoxSizer V + 16934456 + dialog-control-document + + sizer + 0 + 16978072 + 0 + wbBoxSizerProxy + Vertical + Centre + Centre + 1 + 5 + TRUE + TRUE + TRUE + TRUE + FALSE + FALSE + + wxStaticText + 16981344 + dialog-control-document + + dialogcontrol + 0 + 16934456 + 0 + wbStaticTextProxy + wxID_STATIC + 5105 + wxStaticText + + Browse, add and remove configurations + FALSE + + + FALSE + FALSE + FALSE + FALSE + FALSE + FALSE + FALSE + FALSE + FALSE + FALSE + FALSE + FALSE + FALSE + -1 + -1 + -1 + -1 + Centre + Centre + 0 + 5 + TRUE + TRUE + TRUE + TRUE + FALSE + TRUE + + + Spacer + 12421336 + dialog-control-document + + dialogcontrol + 0 + 16934456 + 0 + wbSpacerProxy + 5 + 5 + Centre + Centre + 0 + 5 + TRUE + TRUE + TRUE + TRUE + FALSE + FALSE + + + wxButton + 16641440 + dialog-control-document + + dialogcontrol + 0 + 16934456 + 0 + wbButtonProxy + ID_ADD_CONFIGURATION + 2004 + wxButton + + TRUE + TRUE + &Add... + FALSE + + + + + FALSE + FALSE + FALSE + FALSE + FALSE + FALSE + FALSE + FALSE + -1 + -1 + -1 + -1 + Centre + Centre + 0 + 5 + TRUE + TRUE + TRUE + TRUE + FALSE + FALSE + + + wxButton + 16934624 + dialog-control-document + + dialogcontrol + 0 + 16934456 + 0 + wbButtonProxy + ID_REMOVE_CONFIGURATION + 2005 + wxButton + + TRUE + TRUE + &Remove... + FALSE + + + + + FALSE + FALSE + FALSE + FALSE + FALSE + FALSE + FALSE + FALSE + -1 + -1 + -1 + -1 + Centre + Centre + 0 + 5 + TRUE + TRUE + TRUE + TRUE + FALSE + FALSE + + + wxButton + 12173064 + dialog-control-document + + dialogcontrol + 0 + 16934456 + 0 + wbButtonProxy + ID_RENAME_CONFIGURATION + 2006 + wxButton + + TRUE + TRUE + &Rename... + FALSE + + + + + FALSE + FALSE + FALSE + FALSE + FALSE + FALSE + FALSE + FALSE + -1 + -1 + -1 + -1 + Centre + Centre + 0 + 5 + TRUE + TRUE + TRUE + TRUE + FALSE + FALSE + + + Spacer + 16748024 + dialog-control-document + + dialogcontrol + 0 + 16934456 + 0 + wbSpacerProxy + 5 + 5 + Centre + Centre + 0 + 5 + TRUE + TRUE + TRUE + TRUE + FALSE + FALSE + + + wxStaticText + 16545936 + dialog-control-document + + dialogcontrol + 0 + 16934456 + 0 + wbStaticTextProxy + ID_CONFIGURATION_NAME + 2007 + wxStaticText + + Configuration: + FALSE + + + FALSE + FALSE + FALSE + FALSE + FALSE + FALSE + FALSE + FALSE + FALSE + FALSE + FALSE + FALSE + FALSE + -1 + -1 + -1 + -1 + Left + Centre + 0 + 5 + TRUE + TRUE + TRUE + FALSE + FALSE + TRUE + + + wxTextCtrl + 16673488 + dialog-control-document + + dialogcontrol + 0 + 16934456 + 0 + wbTextCtrlProxy + ID_CONFIGURATION_DESCRIPTION + 2008 + wxTextCtrl + + FALSE + FALSE + + + + + + FALSE + + + TRUE + FALSE + FALSE + FALSE + FALSE + TRUE + FALSE + FALSE + FALSE + FALSE + FALSE + FALSE + FALSE + FALSE + FALSE + FALSE + FALSE + FALSE + FALSE + FALSE + FALSE + FALSE + FALSE + -1 + -1 + -1 + -1 + Expand + Centre + 1 + 5 + TRUE + TRUE + TRUE + TRUE + FALSE + FALSE + + + + + + - + Images - 11874480 + 12033152 html-document bitmapsfolder 1 - 12159224 + 11951464 1 diff --git a/utils/configtool/src/wxconfigtool.rc b/utils/configtool/src/wxconfigtool.rc index a3547d47ef..292d0903ba 100644 --- a/utils/configtool/src/wxconfigtool.rc +++ b/utils/configtool/src/wxconfigtool.rc @@ -2,8 +2,10 @@ aaaa ICON "bitmaps/wxconfigtool.ico" wxconfigtool ICON "bitmaps/wxconfigtool.ico" +#define wxUSE_NO_MANIFEST 0 + #include "wx/msw/wx.rc" /* Use if compiling with earlier versions of wxWindows */ -1 24 "wxconfigtool.exe.manifest" +/* 1 24 "wxconfigtool.exe.manifest" */