diff --git a/Interfaces/debugger.h b/Interfaces/debugger.h index 880b41b627..8c100371d1 100644 --- a/Interfaces/debugger.h +++ b/Interfaces/debugger.h @@ -371,13 +371,18 @@ class IDebugger bool m_isSSHDebugging = false; wxString m_debuggeeProjectName; wxString m_sshAccount; + + //! Command to execute right after connect to the remote target + wxString m_debuggerPostRemoteConnectCommands; public: IDebugger() : m_observer(NULL) , m_env(NULL) , m_isRemoteDebugging(false) - , m_isRemoteExtended(false){}; + , m_isRemoteExtended(false) + {} + virtual ~IDebugger(){}; void SetProjectName(const wxString& project) { m_debuggeeProjectName = project; } void SetName(const wxString& name) { m_name = name; } @@ -395,9 +400,14 @@ class IDebugger DebuggerInformation GetDebuggerInformation() { return m_info; } void SetIsRemoteDebugging(bool isRemoteDebugging) { this->m_isRemoteDebugging = isRemoteDebugging; } - bool GetIsRemoteDebugging() const { return m_isRemoteDebugging; } void SetIsRemoteExtended(bool isRemoteExtended) { this->m_isRemoteExtended = isRemoteExtended; } + void SetPostRemoteConnectCommands(const wxString& commands) { this->m_debuggerPostRemoteConnectCommands = commands; } + + + bool GetIsRemoteDebugging() const { return m_isRemoteDebugging; } bool GetIsRemoteExtended() const { return m_isRemoteExtended; } + const wxString& GetPostRemoteConnectCommands() const { return this->m_debuggerPostRemoteConnectCommands; } + void SetIsSSHDebugging(bool isSSHDebugging) { this->m_isSSHDebugging = isSSHDebugging; } bool IsSSHDebugging() const { return m_isSSHDebugging; } void SetSshAccount(const wxString& sshAccount) { this->m_sshAccount = sshAccount; } diff --git a/LiteEditor/manager.cpp b/LiteEditor/manager.cpp index 623cc829b2..5f266afae1 100644 --- a/LiteEditor/manager.cpp +++ b/LiteEditor/manager.cpp @@ -2071,22 +2071,19 @@ void Manager::DbgStart(long attachPid) DebugMessage(_("Debug session started successfully!\n")); if (dbgr->GetIsRemoteDebugging()) { - // debugging remote target - wxString comm; - wxString port = bldConf->GetDbgHostPort(); wxString host = bldConf->GetDbgHostName(); + wxString port = bldConf->GetDbgHostPort(); - comm << host; - - host = host.Trim().Trim(false); - port = port.Trim().Trim(false); + // Trim whitespaces + host = host.Trim(false).Trim(); + port = port.Trim(false).Trim(); - if (port.IsEmpty() == false) { - comm << wxT(":") << port; + if (!port.IsEmpty()) { + host << wxT(":") << port; } - dbgr->Run(args, comm); + dbgr->Run(args, host); } else if (attachPid == wxNOT_FOUND) { @@ -2502,19 +2499,31 @@ void Manager::UpdateAsciiViewer(const wxString& expression, const wxString& tip) void Manager::UpdateRemoteTargetConnected(const wxString& line) { IDebugger* dbgr = DebuggerMgr::Get().GetActiveDebugger(); - if (dbgr && dbgr->IsRunning() && IsWorkspaceOpen()) { - // we currently do not support this feature when debugging using 'Quick debug' - wxString errMsg; - ProjectPtr proj = clCxxWorkspaceST::Get()->FindProjectByName(GetActiveProjectName(), errMsg); - BuildConfigPtr bldConf = clCxxWorkspaceST::Get()->GetProjBuildConf(proj->GetName(), wxEmptyString); - if (bldConf) { - wxArrayString dbg_cmds = - wxStringTokenize(bldConf->GetDebuggerPostRemoteConnectCmds(), wxT("\n"), wxTOKEN_STRTOK); - for (size_t i = 0; i < dbg_cmds.GetCount(); i++) { - dbgr->ExecuteCmd(dbg_cmds.Item(i)); + + if (dbgr && dbgr->IsRunning()) { + wxString commands; + // An old behavior for legacy workspace + if (IsWorkspaceOpen()) { + // we currently do not support this feature when debugging using 'Quick debug' + wxString errMsg; + ProjectPtr proj = clCxxWorkspaceST::Get()->FindProjectByName(GetActiveProjectName(), errMsg); + BuildConfigPtr bldConf = clCxxWorkspaceST::Get()->GetProjBuildConf(proj->GetName(), wxEmptyString); + if (bldConf) { + commands = bldConf->GetDebuggerPostRemoteConnectCmds(); } + + // Filesystem workspace and so on + } else if (!dbgr->GetPostRemoteConnectCommands().empty()) { + commands = dbgr->GetPostRemoteConnectCommands(); + } + + // - Execute commands + wxArrayString dbg_cmds = wxStringTokenize(commands, wxT("\n"), wxTOKEN_STRTOK); + for (size_t i = 0; i < dbg_cmds.GetCount(); i++) { + dbgr->ExecuteCmd(dbg_cmds.Item(i)); } } + // log the line UpdateAddLine(line); } diff --git a/Plugin/FileSystemWorkspace/FSConfigPage.cpp b/Plugin/FileSystemWorkspace/FSConfigPage.cpp index eed2e923bd..44fbc78c2b 100644 --- a/Plugin/FileSystemWorkspace/FSConfigPage.cpp +++ b/Plugin/FileSystemWorkspace/FSConfigPage.cpp @@ -32,6 +32,7 @@ FSConfigPage::FSConfigPage(wxWindow* parent, clFileSystemWorkspaceConfig::Ptr_t lexer->Apply(m_stcCCFlags); lexer->Apply(m_stcEnv); lexer->Apply(m_stcCommands); + lexer->Apply(m_stcRemoteCommands); } m_dvListCtrlTargets->SetSortFunction([](clRowEntry* a, clRowEntry* b) { @@ -79,9 +80,16 @@ FSConfigPage::FSConfigPage(wxWindow* parent, clFileSystemWorkspaceConfig::Ptr_t m_textCtrlExcludeFiles->ChangeValue(config->GetExcludeFilesPattern()); m_textCtrlExcludePaths->ChangeValue(config->GetExecludePaths()); m_textCtrlWD->ChangeValue(config->GetWorkingDirectory()); + m_textCtrlDebugger->ChangeValue(config->GetDebuggerPath()); m_stcCommands->SetText(config->GetDebuggerCommands()); + m_checkRemoteEnabled->SetValue(config->GetDebuggerRemoteEnabled()); + m_checkRemoteExtended->SetValue(config->GetDebuggerRemoteExtended()); + m_textRemoteTargetHost->SetValue(config->GetDebuggerRemoteHost()); + m_textRemoteTargetPort->SetValue(config->GetDebuggerRemotePort()); + m_stcRemoteCommands->SetText(config->GetDebuggerRemoteCommands()); + if (!m_enableRemotePage) { m_checkBoxEnableRemote->Disable(); m_checkBoxRemoteBuild->Disable(); @@ -156,7 +164,7 @@ void FSConfigPage::Save() last_executables.swap(small_arr); } - m_config->SetExecutable(m_comboBoxExecutable->GetStringSelection()); + m_config->SetExecutable(m_comboBoxExecutable->GetValue()); m_config->SetLastExecutables(last_executables); m_config->SetEnvironment(m_stcEnv->GetText()); m_config->SetArgs(m_textCtrlArgs->GetValue()); @@ -169,8 +177,15 @@ void FSConfigPage::Save() m_config->SetExcludeFilesPattern(m_textCtrlExcludeFiles->GetValue()); m_config->SetExcludePaths(m_textCtrlExcludePaths->GetValue()); m_config->SetWorkingDirectory(m_textCtrlWD->GetValue()); + m_config->SetDebuggerPath(m_textCtrlDebugger->GetValue()); m_config->SetDebuggerCommands(m_stcCommands->GetText()); + + m_config->SetDebuggerRemoteEnabled(m_checkRemoteEnabled->IsChecked()); + m_config->SetDebuggerRemoteExtended(m_checkRemoteExtended->IsChecked()); + m_config->SetDebuggerRemoteHost(m_textRemoteTargetHost->GetValue()); + m_config->SetDebuggerRemotePort(m_textRemoteTargetPort->GetValue()); + m_config->SetDebuggerRemoteCommands(m_stcRemoteCommands->GetText()); } void FSConfigPage::OnTargetActivated(wxDataViewEvent& event) diff --git a/Plugin/FileSystemWorkspace/clFileSystemWorkspace.cpp b/Plugin/FileSystemWorkspace/clFileSystemWorkspace.cpp index f570fb9de9..3a11a4a972 100644 --- a/Plugin/FileSystemWorkspace/clFileSystemWorkspace.cpp +++ b/Plugin/FileSystemWorkspace/clFileSystemWorkspace.cpp @@ -940,10 +940,15 @@ void clFileSystemWorkspace::OnDebug(clDebugEvent& event) dinfo.breakAtWinMain = false; dinfo.consoleCommand = EditorConfigST::Get()->GetOptions()->GetProgramConsoleCommand(); dbgr->SetDebuggerInformation(dinfo); - dbgr->SetIsRemoteDebugging(false); - // Setup the debug session + // Setup remote debugging + if (GetConfig()->GetDebuggerRemoteEnabled()) { + dbgr->SetIsRemoteDebugging(GetConfig()->GetDebuggerRemoteEnabled()); + dbgr->SetIsRemoteExtended(GetConfig()->GetDebuggerRemoteExtended()); + dbgr->SetPostRemoteConnectCommands(GetConfig()->GetDebuggerRemoteCommands()); + } + // Setup the debug session wxString exe, args, wd; GetExecutable(exe, args, wd); @@ -955,6 +960,7 @@ void clFileSystemWorkspace::OnDebug(clDebugEvent& event) session_info.exeName = exe; session_info.cwd = wd; session_info.init_file_content = GetConfig()->GetDebuggerCommands(); + clGetManager()->GetBreakpoints(bpList); session_info.bpList = bpList; @@ -999,8 +1005,29 @@ void clFileSystemWorkspace::OnDebug(clDebugEvent& event) clDebugEvent eventStarted(wxEVT_DEBUG_STARTED); eventStarted.SetClientData(&session_info); EventNotifier::Get()->ProcessEvent(eventStarted); - // Now run the debuggee - dbgr->Run(args, ""); + + if (dbgr->GetIsRemoteDebugging()) { + // debugging remote target + wxString host = GetConfig()->GetDebuggerRemoteHost(); + wxString port = GetConfig()->GetDebuggerRemotePort(); + + // Trim whitespaces + host = host.Trim(false).Trim(); + port = port.Trim(false).Trim(); + + // Add port + if (!port.IsEmpty()) { + host << wxT(":") << port; + } + + // Now run the debuggee (remote) + dbgr->Run(args, host); + + } else { + // Now run the debuggee (local) + dbgr->Run(args, ""); + + } } void clFileSystemWorkspace::GetExecutable(wxString& exe, wxString& args, wxString& wd) diff --git a/Plugin/FileSystemWorkspace/clFileSystemWorkspaceConfig.cpp b/Plugin/FileSystemWorkspace/clFileSystemWorkspaceConfig.cpp index 278fa7d7ac..bad4a96a43 100644 --- a/Plugin/FileSystemWorkspace/clFileSystemWorkspaceConfig.cpp +++ b/Plugin/FileSystemWorkspace/clFileSystemWorkspaceConfig.cpp @@ -75,6 +75,13 @@ std::pair clFileSystemWorkspaceConfig::ToJSON() const local.addProperty("workingDirectory", m_workingDirectory); local.addProperty("debuggerPath", m_debuggerPath); local.addProperty("debuggerCommands", m_debuggerCommands); + + local.addProperty("debuggerRemoteEnabled", m_debuggerRemoteEnabled); + local.addProperty("debuggerRemoteExtended", m_debuggerRemoteExtended); + local.addProperty("debuggerRemoteHost", m_debuggerRemoteHost); + local.addProperty("debuggerRemotePort", m_debuggerRemotePort); + local.addProperty("debuggerRemoteCommands", m_debuggerRemoteCommands); + local.addProperty("last_executables", m_lastExecutables); return { shared, local }; } @@ -115,8 +122,15 @@ void clFileSystemWorkspaceConfig::FromLocalJSON(const JSONItem& json) m_remoteFolder = json["remoteFolder"].toString(); m_remoteAccount = json["remoteAccount"].toString(); m_workingDirectory = json["workingDirectory"].toString(); - m_debuggerPath = json["debuggerPath"].toString(); - m_debuggerCommands = json["debuggerCommands"].toString(); + + m_debuggerPath = json["debuggerPath"].toString(); + m_debuggerCommands = json["debuggerCommands"].toString(); + + m_debuggerRemoteEnabled = json["debuggerRemoteEnabled"].toBool(); + m_debuggerRemoteExtended = json["debuggerRemoteExtended"].toBool(true); + m_debuggerRemoteHost = json["debuggerRemoteHost"].toString(); + m_debuggerRemotePort = json["debuggerRemotePort"].toString(); + m_debuggerRemoteCommands = json["debuggerRemoteCommands"].toString(); } wxString clFileSystemWorkspaceConfig::GetCompileFlagsAsString() const diff --git a/Plugin/FileSystemWorkspace/clFileSystemWorkspaceConfig.hpp b/Plugin/FileSystemWorkspace/clFileSystemWorkspaceConfig.hpp index 29ace68ad9..318c7337c4 100644 --- a/Plugin/FileSystemWorkspace/clFileSystemWorkspaceConfig.hpp +++ b/Plugin/FileSystemWorkspace/clFileSystemWorkspaceConfig.hpp @@ -39,6 +39,13 @@ class WXDLLIMPEXP_SDK clFileSystemWorkspaceConfig wxString m_excludePaths; wxString m_debuggerPath; wxString m_debuggerCommands; + + bool m_debuggerRemoteEnabled = false; + bool m_debuggerRemoteExtended = true; + wxString m_debuggerRemoteCommands; + wxString m_debuggerRemoteHost = "localhost"; + wxString m_debuggerRemotePort = "2345"; + wxArrayString m_lastExecutables; public: @@ -110,10 +117,25 @@ class WXDLLIMPEXP_SDK clFileSystemWorkspaceConfig wxArrayString ExpandUserCompletionFlags(const wxString& workingDirectory, clBacktickCache::ptr_t backticks, bool withPrefix = false) const; wxArrayString GetCompilerOptions(clBacktickCache::ptr_t backticks) const; - void SetDebuggerCommands(const wxString& debuggerCommands) { this->m_debuggerCommands = debuggerCommands; } + void SetDebuggerPath(const wxString& debuggerPath) { this->m_debuggerPath = debuggerPath; } - const wxString& GetDebuggerCommands() const { return m_debuggerCommands; } + void SetDebuggerCommands(const wxString& debuggerCommands) { this->m_debuggerCommands = debuggerCommands; } + + void SetDebuggerRemoteEnabled(bool enabled) { this->m_debuggerRemoteEnabled = enabled; } + void SetDebuggerRemoteExtended(bool extended) { this->m_debuggerRemoteExtended = extended; } + void SetDebuggerRemoteHost(const wxString& host) { this->m_debuggerRemoteHost = host; } + void SetDebuggerRemotePort(const wxString& port) { this->m_debuggerRemotePort = port; } + void SetDebuggerRemoteCommands(const wxString& debuggerRemoteCommands) { this->m_debuggerRemoteCommands = debuggerRemoteCommands; } + const wxString& GetDebuggerPath() const { return m_debuggerPath; } + const wxString& GetDebuggerCommands() const { return m_debuggerCommands; } + + bool GetDebuggerRemoteEnabled() const { return m_debuggerRemoteEnabled; } + bool GetDebuggerRemoteExtended() const { return m_debuggerRemoteExtended; } + const wxString& GetDebuggerRemoteHost() const { return m_debuggerRemoteHost; } + const wxString& GetDebuggerRemotePort() const { return m_debuggerRemotePort; } + const wxString& GetDebuggerRemoteCommands() const { return m_debuggerRemoteCommands; } + void SetLastExecutables(const wxArrayString& lastExecutables); const wxArrayString& GetLastExecutables() const; }; diff --git a/Plugin/FileSystemWorkspace/clFileSystemWorkspaceDlgBase.cpp b/Plugin/FileSystemWorkspace/clFileSystemWorkspaceDlgBase.cpp index a8fc1aefad..365b3c209f 100644 --- a/Plugin/FileSystemWorkspace/clFileSystemWorkspaceDlgBase.cpp +++ b/Plugin/FileSystemWorkspace/clFileSystemWorkspaceDlgBase.cpp @@ -6,16 +6,16 @@ #include "clFileSystemWorkspaceDlgBase.h" + // Declare the bitmap loading function extern void wxCB09InitBitmapResources(); -namespace -{ + +namespace { // return the wxBORDER_SIMPLE that matches the current application theme -wxBorder get_border_simple_theme_aware_bit() -{ +wxBorder get_border_simple_theme_aware_bit() { #if wxVERSION_NUMBER >= 3300 && defined(__WXMSW__) - return wxSystemSettings::GetAppearance().IsDark() ? wxBORDER_SIMPLE : wxBORDER_DEFAULT; + return wxSystemSettings::GetAppearance().IsDark() ? wxBORDER_SIMPLE : wxBORDER_STATIC; #else return wxBORDER_DEFAULT; #endif @@ -23,73 +23,73 @@ wxBorder get_border_simple_theme_aware_bit() bool bBitmapLoaded = false; } // namespace -clFileSystemWorkspaceDlgBase::clFileSystemWorkspaceDlgBase(wxWindow* parent, wxWindowID id, const wxString& title, - const wxPoint& pos, const wxSize& size, long style) + +clFileSystemWorkspaceDlgBase::clFileSystemWorkspaceDlgBase(wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size, long style) : wxDialog(parent, id, title, pos, size, style) { - if (!bBitmapLoaded) { + if ( !bBitmapLoaded ) { // We need to initialise the default bitmap handler wxXmlResource::Get()->AddHandler(new wxBitmapXmlHandler); wxCB09InitBitmapResources(); bBitmapLoaded = true; } - + wxBoxSizer* boxSizer2 = new wxBoxSizer(wxVERTICAL); this->SetSizer(boxSizer2); - + wxBoxSizer* boxSizer97 = new wxBoxSizer(wxHORIZONTAL); - - boxSizer2->Add(boxSizer97, 1, wxALL | wxEXPAND, WXC_FROM_DIP(5)); - - m_notebook = new wxChoicebook(this, wxID_ANY, wxDefaultPosition, wxDLG_UNIT(this, wxSize(-1, -1)), wxBK_DEFAULT); + + boxSizer2->Add(boxSizer97, 1, wxALL|wxEXPAND, WXC_FROM_DIP(5)); + + m_notebook = new wxChoicebook(this, wxID_ANY, wxDefaultPosition, wxDLG_UNIT(this, wxSize(-1,-1)), wxBK_DEFAULT); m_notebook->SetName(wxT("m_notebook")); - - boxSizer97->Add(m_notebook, 1, wxALL | wxEXPAND, WXC_FROM_DIP(5)); - + + boxSizer97->Add(m_notebook, 1, wxALL|wxEXPAND, WXC_FROM_DIP(5)); + wxBoxSizer* boxSizer99 = new wxBoxSizer(wxVERTICAL); - - boxSizer97->Add(boxSizer99, 0, wxLEFT | wxRIGHT | wxBOTTOM | wxEXPAND, WXC_FROM_DIP(5)); - - m_buttonNew = new wxButton(this, wxID_NEW, _("New"), wxDefaultPosition, wxDLG_UNIT(this, wxSize(-1, -1)), 0); - - boxSizer99->Add(m_buttonNew, 0, wxALL | wxEXPAND, WXC_FROM_DIP(5)); - - m_buttonDelete = - new wxButton(this, wxID_DELETE, _("Delete"), wxDefaultPosition, wxDLG_UNIT(this, wxSize(-1, -1)), 0); - + + boxSizer97->Add(boxSizer99, 0, wxLEFT|wxRIGHT|wxBOTTOM|wxEXPAND, WXC_FROM_DIP(5)); + + m_buttonNew = new wxButton(this, wxID_NEW, _("New"), wxDefaultPosition, wxDLG_UNIT(this, wxSize(-1,-1)), 0); + + boxSizer99->Add(m_buttonNew, 0, wxALL|wxEXPAND, WXC_FROM_DIP(5)); + + m_buttonDelete = new wxButton(this, wxID_DELETE, _("Delete"), wxDefaultPosition, wxDLG_UNIT(this, wxSize(-1,-1)), 0); + boxSizer99->Add(m_buttonDelete, 0, wxALL, WXC_FROM_DIP(5)); - + m_stdBtnSizer4 = new wxStdDialogButtonSizer(); - - boxSizer2->Add(m_stdBtnSizer4, 0, wxALL | wxALIGN_CENTER_HORIZONTAL, WXC_FROM_DIP(5)); - + + boxSizer2->Add(m_stdBtnSizer4, 0, wxALL|wxALIGN_CENTER_HORIZONTAL, WXC_FROM_DIP(5)); + m_buttonOK = new wxButton(this, wxID_OK, wxT(""), wxDefaultPosition, wxDLG_UNIT(this, wxSize(-1, -1)), 0); m_buttonOK->SetDefault(); m_stdBtnSizer4->AddButton(m_buttonOK); - + m_button12 = new wxButton(this, wxID_CANCEL, wxT(""), wxDefaultPosition, wxDLG_UNIT(this, wxSize(-1, -1)), 0); m_stdBtnSizer4->AddButton(m_button12); m_stdBtnSizer4->Realize(); - -#if wxVERSION_NUMBER >= 2900 - if (!wxPersistenceManager::Get().Find(m_notebook)) { + + + #if wxVERSION_NUMBER >= 2900 + if(!wxPersistenceManager::Get().Find(m_notebook)){ wxPersistenceManager::Get().RegisterAndRestore(m_notebook); } else { wxPersistenceManager::Get().Restore(m_notebook); } -#endif - + #endif + SetName(wxT("clFileSystemWorkspaceDlgBase")); - SetSize(wxDLG_UNIT(this, wxSize(-1, -1))); + SetSize(wxDLG_UNIT(this, wxSize(-1,-1))); if (GetSizer()) { - GetSizer()->Fit(this); + GetSizer()->Fit(this); } - if (GetParent()) { + if(GetParent()) { CentreOnParent(wxBOTH); } else { CentreOnScreen(wxBOTH); } - if (!wxPersistenceManager::Get().Find(this)) { + if(!wxPersistenceManager::Get().Find(this)) { wxPersistenceManager::Get().RegisterAndRestore(this); } else { wxPersistenceManager::Get().Restore(this); @@ -99,6 +99,7 @@ clFileSystemWorkspaceDlgBase::clFileSystemWorkspaceDlgBase(wxWindow* parent, wxW m_buttonDelete->Bind(wxEVT_COMMAND_BUTTON_CLICKED, &clFileSystemWorkspaceDlgBase::OnDeleteConfig, this); m_buttonDelete->Bind(wxEVT_UPDATE_UI, &clFileSystemWorkspaceDlgBase::OnDeleteConfigUI, this); m_buttonOK->Bind(wxEVT_COMMAND_BUTTON_CLICKED, &clFileSystemWorkspaceDlgBase::OnOK, this); + } clFileSystemWorkspaceDlgBase::~clFileSystemWorkspaceDlgBase() @@ -107,72 +108,70 @@ clFileSystemWorkspaceDlgBase::~clFileSystemWorkspaceDlgBase() m_buttonDelete->Unbind(wxEVT_COMMAND_BUTTON_CLICKED, &clFileSystemWorkspaceDlgBase::OnDeleteConfig, this); m_buttonDelete->Unbind(wxEVT_UPDATE_UI, &clFileSystemWorkspaceDlgBase::OnDeleteConfigUI, this); m_buttonOK->Unbind(wxEVT_COMMAND_BUTTON_CLICKED, &clFileSystemWorkspaceDlgBase::OnOK, this); + } -BuildTargetDlgBase::BuildTargetDlgBase(wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos, - const wxSize& size, long style) +BuildTargetDlgBase::BuildTargetDlgBase(wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size, long style) : wxDialog(parent, id, title, pos, size, style) { - if (!bBitmapLoaded) { + if ( !bBitmapLoaded ) { // We need to initialise the default bitmap handler wxXmlResource::Get()->AddHandler(new wxBitmapXmlHandler); wxCB09InitBitmapResources(); bBitmapLoaded = true; } - + wxBoxSizer* boxSizer48 = new wxBoxSizer(wxVERTICAL); this->SetSizer(boxSizer48); - + wxFlexGridSizer* flexGridSizer56 = new wxFlexGridSizer(0, 2, 0, 0); - flexGridSizer56->SetFlexibleDirection(wxBOTH); - flexGridSizer56->SetNonFlexibleGrowMode(wxFLEX_GROWMODE_SPECIFIED); + flexGridSizer56->SetFlexibleDirection( wxBOTH ); + flexGridSizer56->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED ); flexGridSizer56->AddGrowableCol(1); flexGridSizer56->AddGrowableRow(1); - - boxSizer48->Add(flexGridSizer56, 1, wxALL | wxEXPAND, WXC_FROM_DIP(5)); - - m_staticText58 = - new wxStaticText(this, wxID_ANY, _("Name:"), wxDefaultPosition, wxDLG_UNIT(this, wxSize(-1, -1)), 0); - - flexGridSizer56->Add(m_staticText58, 0, wxALL | wxALIGN_RIGHT | wxALIGN_CENTER_VERTICAL, WXC_FROM_DIP(5)); - - m_textCtrlaName = new wxTextCtrl(this, wxID_ANY, wxT(""), wxDefaultPosition, wxDLG_UNIT(this, wxSize(200, -1)), 0); + + boxSizer48->Add(flexGridSizer56, 1, wxALL|wxEXPAND, WXC_FROM_DIP(5)); + + m_staticText58 = new wxStaticText(this, wxID_ANY, _("Name:"), wxDefaultPosition, wxDLG_UNIT(this, wxSize(-1,-1)), 0); + + flexGridSizer56->Add(m_staticText58, 0, wxALL|wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL, WXC_FROM_DIP(5)); + + m_textCtrlaName = new wxTextCtrl(this, wxID_ANY, wxT(""), wxDefaultPosition, wxDLG_UNIT(this, wxSize(200,-1)), 0); m_textCtrlaName->SetFocus(); -#if wxVERSION_NUMBER >= 3000 + #if wxVERSION_NUMBER >= 3000 m_textCtrlaName->SetHint(wxT("")); -#endif - - flexGridSizer56->Add(m_textCtrlaName, 0, wxALL | wxEXPAND, WXC_FROM_DIP(5)); - - m_staticText62 = - new wxStaticText(this, wxID_ANY, _("Command:"), wxDefaultPosition, wxDLG_UNIT(this, wxSize(-1, -1)), 0); - - flexGridSizer56->Add(m_staticText62, 0, wxALL | wxALIGN_RIGHT | wxALIGN_TOP, WXC_FROM_DIP(5)); - - m_textCtrlValue = new clThemedSTC(this, wxID_ANY, wxDefaultPosition, wxDLG_UNIT(this, wxSize(-1, -1)), 0); + #endif + + flexGridSizer56->Add(m_textCtrlaName, 0, wxALL|wxEXPAND, WXC_FROM_DIP(5)); + + m_staticText62 = new wxStaticText(this, wxID_ANY, _("Command:"), wxDefaultPosition, wxDLG_UNIT(this, wxSize(-1,-1)), 0); + + flexGridSizer56->Add(m_staticText62, 0, wxALL|wxALIGN_RIGHT|wxALIGN_TOP, WXC_FROM_DIP(5)); + + m_textCtrlValue = new clThemedSTC(this, wxID_ANY, wxDefaultPosition, wxDLG_UNIT(this, wxSize(-1,-1)), 0); // Configure the fold margin - m_textCtrlValue->SetMarginType(4, wxSTC_MARGIN_SYMBOL); - m_textCtrlValue->SetMarginMask(4, wxSTC_MASK_FOLDERS); + m_textCtrlValue->SetMarginType (4, wxSTC_MARGIN_SYMBOL); + m_textCtrlValue->SetMarginMask (4, wxSTC_MASK_FOLDERS); m_textCtrlValue->SetMarginSensitive(4, true); - m_textCtrlValue->SetMarginWidth(4, 0); - + m_textCtrlValue->SetMarginWidth (4, 0); + // Configure the tracker margin m_textCtrlValue->SetMarginWidth(1, 0); - + // Configure the symbol margin - m_textCtrlValue->SetMarginType(2, wxSTC_MARGIN_SYMBOL); - m_textCtrlValue->SetMarginMask(2, ~(wxSTC_MASK_FOLDERS)); + m_textCtrlValue->SetMarginType (2, wxSTC_MARGIN_SYMBOL); + m_textCtrlValue->SetMarginMask (2, ~(wxSTC_MASK_FOLDERS)); m_textCtrlValue->SetMarginWidth(2, 0); m_textCtrlValue->SetMarginSensitive(2, true); - + // Configure the line numbers margin m_textCtrlValue->SetMarginType(0, wxSTC_MARGIN_NUMBER); - m_textCtrlValue->SetMarginWidth(0, 0); - + m_textCtrlValue->SetMarginWidth(0,0); + // Configure the line symbol margin m_textCtrlValue->SetMarginType(3, wxSTC_MARGIN_FORE); m_textCtrlValue->SetMarginMask(3, 0); - m_textCtrlValue->SetMarginWidth(3, 0); + m_textCtrlValue->SetMarginWidth(3,0); // Select the lexer m_textCtrlValue->SetLexer(wxSTC_LEX_NULL); // Set default font / styles @@ -184,146 +183,142 @@ BuildTargetDlgBase::BuildTargetDlgBase(wxWindow* parent, wxWindowID id, const wx m_textCtrlValue->SetKeyWords(2, wxT("")); m_textCtrlValue->SetKeyWords(3, wxT("")); m_textCtrlValue->SetKeyWords(4, wxT("")); - - flexGridSizer56->Add(m_textCtrlValue, 1, wxALL | wxEXPAND, WXC_FROM_DIP(5)); - + + flexGridSizer56->Add(m_textCtrlValue, 1, wxALL|wxEXPAND, WXC_FROM_DIP(5)); + m_stdBtnSizer50 = new wxStdDialogButtonSizer(); - - boxSizer48->Add(m_stdBtnSizer50, 0, wxALL | wxALIGN_CENTER_HORIZONTAL, WXC_FROM_DIP(5)); - + + boxSizer48->Add(m_stdBtnSizer50, 0, wxALL|wxALIGN_CENTER_HORIZONTAL, WXC_FROM_DIP(5)); + m_button52 = new wxButton(this, wxID_CANCEL, wxT(""), wxDefaultPosition, wxDLG_UNIT(this, wxSize(-1, -1)), 0); m_stdBtnSizer50->AddButton(m_button52); - + m_button54 = new wxButton(this, wxID_OK, wxT(""), wxDefaultPosition, wxDLG_UNIT(this, wxSize(-1, -1)), 0); m_button54->SetDefault(); m_stdBtnSizer50->AddButton(m_button54); m_stdBtnSizer50->Realize(); - + SetName(wxT("BuildTargetDlgBase")); - SetSize(wxDLG_UNIT(this, wxSize(-1, -1))); + SetSize(wxDLG_UNIT(this, wxSize(-1,-1))); if (GetSizer()) { - GetSizer()->Fit(this); + GetSizer()->Fit(this); } - if (GetParent()) { + if(GetParent()) { CentreOnParent(wxBOTH); } else { CentreOnScreen(wxBOTH); } - if (!wxPersistenceManager::Get().Find(this)) { + if(!wxPersistenceManager::Get().Find(this)) { wxPersistenceManager::Get().RegisterAndRestore(this); } else { wxPersistenceManager::Get().Restore(this); } // Connect events m_button54->Bind(wxEVT_UPDATE_UI, &BuildTargetDlgBase::OnOK_UI, this); + } -BuildTargetDlgBase::~BuildTargetDlgBase() { m_button54->Unbind(wxEVT_UPDATE_UI, &BuildTargetDlgBase::OnOK_UI, this); } +BuildTargetDlgBase::~BuildTargetDlgBase() +{ + m_button54->Unbind(wxEVT_UPDATE_UI, &BuildTargetDlgBase::OnOK_UI, this); + +} FSConfigPageBase::FSConfigPageBase(wxWindow* parent, wxWindowID id, const wxPoint& pos, const wxSize& size, long style) : wxPanel(parent, id, pos, size, style) { - if (!bBitmapLoaded) { + if ( !bBitmapLoaded ) { // We need to initialise the default bitmap handler wxXmlResource::Get()->AddHandler(new wxBitmapXmlHandler); wxCB09InitBitmapResources(); bBitmapLoaded = true; } - + wxBoxSizer* boxSizer76 = new wxBoxSizer(wxVERTICAL); this->SetSizer(boxSizer76); - - m_notebook = new wxNotebook(this, wxID_ANY, wxDefaultPosition, wxDLG_UNIT(this, wxSize(-1, -1)), wxBK_DEFAULT); + + m_notebook = new wxNotebook(this, wxID_ANY, wxDefaultPosition, wxDLG_UNIT(this, wxSize(-1,-1)), wxBK_DEFAULT); m_notebook->SetName(wxT("m_notebook")); - - boxSizer76->Add(m_notebook, 1, wxALL | wxEXPAND, WXC_FROM_DIP(5)); - - m_panelGeneral = - new wxPanel(m_notebook, wxID_ANY, wxDefaultPosition, wxDLG_UNIT(m_notebook, wxSize(-1, -1)), wxTAB_TRAVERSAL); + + boxSizer76->Add(m_notebook, 1, wxALL|wxEXPAND, WXC_FROM_DIP(5)); + + m_panelGeneral = new wxPanel(m_notebook, wxID_ANY, wxDefaultPosition, wxDLG_UNIT(m_notebook, wxSize(-1,-1)), wxTAB_TRAVERSAL); m_notebook->AddPage(m_panelGeneral, _("General"), true); - + wxFlexGridSizer* flexGridSizer33 = new wxFlexGridSizer(0, 2, 0, 0); - flexGridSizer33->SetFlexibleDirection(wxBOTH); - flexGridSizer33->SetNonFlexibleGrowMode(wxFLEX_GROWMODE_SPECIFIED); + flexGridSizer33->SetFlexibleDirection( wxBOTH ); + flexGridSizer33->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED ); flexGridSizer33->AddGrowableCol(1); flexGridSizer33->AddGrowableRow(2); m_panelGeneral->SetSizer(flexGridSizer33); - - m_staticText109 = new wxStaticText(m_panelGeneral, wxID_ANY, _("Program:"), wxDefaultPosition, - wxDLG_UNIT(m_panelGeneral, wxSize(-1, -1)), 0); - - flexGridSizer33->Add(m_staticText109, 0, wxALL | wxALIGN_RIGHT | wxALIGN_CENTER_VERTICAL, WXC_FROM_DIP(5)); - + + m_staticText109 = new wxStaticText(m_panelGeneral, wxID_ANY, _("Program:"), wxDefaultPosition, wxDLG_UNIT(m_panelGeneral, wxSize(-1,-1)), 0); + + flexGridSizer33->Add(m_staticText109, 0, wxALL|wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL, WXC_FROM_DIP(5)); + wxBoxSizer* boxSizer238 = new wxBoxSizer(wxHORIZONTAL); - + flexGridSizer33->Add(boxSizer238, 1, wxEXPAND, WXC_FROM_DIP(5)); - + wxArrayString m_comboBoxExecutableArr; - m_comboBoxExecutable = new clThemedComboBox(m_panelGeneral, wxID_ANY, wxT(""), wxDefaultPosition, - wxDLG_UNIT(m_panelGeneral, wxSize(-1, -1)), m_comboBoxExecutableArr, 0); -#if wxVERSION_NUMBER >= 3000 + m_comboBoxExecutable = new clThemedComboBox(m_panelGeneral, wxID_ANY, wxT(""), wxDefaultPosition, wxDLG_UNIT(m_panelGeneral, wxSize(-1,-1)), m_comboBoxExecutableArr, 0); + #if wxVERSION_NUMBER >= 3000 m_comboBoxExecutable->SetHint(wxT("")); -#endif - - boxSizer238->Add(m_comboBoxExecutable, 1, wxALL | wxEXPAND, WXC_FROM_DIP(5)); - - m_button241 = new wxButton(m_panelGeneral, wxID_ANY, _("Browse"), wxDefaultPosition, - wxDLG_UNIT(m_panelGeneral, wxSize(-1, -1)), 0); - - boxSizer238->Add(m_button241, 0, wxALL | wxALIGN_CENTER_VERTICAL, WXC_FROM_DIP(5)); - - m_staticText191 = new wxStaticText(m_panelGeneral, wxID_ANY, _("Working directory:"), wxDefaultPosition, - wxDLG_UNIT(m_panelGeneral, wxSize(-1, -1)), 0); - + #endif + + boxSizer238->Add(m_comboBoxExecutable, 1, wxALL|wxEXPAND, WXC_FROM_DIP(5)); + + m_button241 = new wxButton(m_panelGeneral, wxID_ANY, _("Browse"), wxDefaultPosition, wxDLG_UNIT(m_panelGeneral, wxSize(-1,-1)), 0); + + boxSizer238->Add(m_button241, 0, wxALL|wxALIGN_CENTER_VERTICAL, WXC_FROM_DIP(5)); + + m_staticText191 = new wxStaticText(m_panelGeneral, wxID_ANY, _("Working directory:"), wxDefaultPosition, wxDLG_UNIT(m_panelGeneral, wxSize(-1,-1)), 0); + flexGridSizer33->Add(m_staticText191, 0, wxALL, WXC_FROM_DIP(5)); - + wxBoxSizer* boxSizer239 = new wxBoxSizer(wxHORIZONTAL); - + flexGridSizer33->Add(boxSizer239, 1, wxEXPAND, WXC_FROM_DIP(5)); - - m_textCtrlWD = new clThemedTextCtrl(m_panelGeneral, wxID_ANY, wxT(""), wxDefaultPosition, - wxDLG_UNIT(m_panelGeneral, wxSize(-1, -1)), 0); -#if wxVERSION_NUMBER >= 3000 + + m_textCtrlWD = new clThemedTextCtrl(m_panelGeneral, wxID_ANY, wxT(""), wxDefaultPosition, wxDLG_UNIT(m_panelGeneral, wxSize(-1,-1)), 0); + #if wxVERSION_NUMBER >= 3000 m_textCtrlWD->SetHint(wxT("")); -#endif - + #endif + boxSizer239->Add(m_textCtrlWD, 1, wxALL, WXC_FROM_DIP(5)); - - m_button243 = new wxButton(m_panelGeneral, wxID_ANY, _("Browse"), wxDefaultPosition, - wxDLG_UNIT(m_panelGeneral, wxSize(-1, -1)), 0); - - boxSizer239->Add(m_button243, 0, wxALL | wxALIGN_CENTER_VERTICAL, WXC_FROM_DIP(5)); - - m_staticText113 = new wxStaticText(m_panelGeneral, wxID_ANY, _("Arguments:"), wxDefaultPosition, - wxDLG_UNIT(m_panelGeneral, wxSize(-1, -1)), 0); - - flexGridSizer33->Add(m_staticText113, 0, wxALL | wxALIGN_RIGHT | wxALIGN_TOP, WXC_FROM_DIP(5)); - - m_textCtrlArgs = new clThemedSTC(m_panelGeneral, wxID_ANY, wxDefaultPosition, - wxDLG_UNIT(m_panelGeneral, wxSize(-1, -1)), get_border_simple_theme_aware_bit()); + + m_button243 = new wxButton(m_panelGeneral, wxID_ANY, _("Browse"), wxDefaultPosition, wxDLG_UNIT(m_panelGeneral, wxSize(-1,-1)), 0); + + boxSizer239->Add(m_button243, 0, wxALL|wxALIGN_CENTER_VERTICAL, WXC_FROM_DIP(5)); + + m_staticText113 = new wxStaticText(m_panelGeneral, wxID_ANY, _("Arguments:"), wxDefaultPosition, wxDLG_UNIT(m_panelGeneral, wxSize(-1,-1)), 0); + + flexGridSizer33->Add(m_staticText113, 0, wxALL|wxALIGN_RIGHT|wxALIGN_TOP, WXC_FROM_DIP(5)); + + m_textCtrlArgs = new clThemedSTC(m_panelGeneral, wxID_ANY, wxDefaultPosition, wxDLG_UNIT(m_panelGeneral, wxSize(-1,-1)), get_border_simple_theme_aware_bit()); // Configure the fold margin - m_textCtrlArgs->SetMarginType(4, wxSTC_MARGIN_SYMBOL); - m_textCtrlArgs->SetMarginMask(4, wxSTC_MASK_FOLDERS); + m_textCtrlArgs->SetMarginType (4, wxSTC_MARGIN_SYMBOL); + m_textCtrlArgs->SetMarginMask (4, wxSTC_MASK_FOLDERS); m_textCtrlArgs->SetMarginSensitive(4, true); - m_textCtrlArgs->SetMarginWidth(4, 0); - + m_textCtrlArgs->SetMarginWidth (4, 0); + // Configure the tracker margin m_textCtrlArgs->SetMarginWidth(1, 0); - + // Configure the symbol margin - m_textCtrlArgs->SetMarginType(2, wxSTC_MARGIN_SYMBOL); - m_textCtrlArgs->SetMarginMask(2, ~(wxSTC_MASK_FOLDERS)); + m_textCtrlArgs->SetMarginType (2, wxSTC_MARGIN_SYMBOL); + m_textCtrlArgs->SetMarginMask (2, ~(wxSTC_MASK_FOLDERS)); m_textCtrlArgs->SetMarginWidth(2, 0); m_textCtrlArgs->SetMarginSensitive(2, true); - + // Configure the line numbers margin m_textCtrlArgs->SetMarginType(0, wxSTC_MARGIN_NUMBER); - m_textCtrlArgs->SetMarginWidth(0, 0); - + m_textCtrlArgs->SetMarginWidth(0,0); + // Configure the line symbol margin m_textCtrlArgs->SetMarginType(3, wxSTC_MARGIN_FORE); m_textCtrlArgs->SetMarginMask(3, 0); - m_textCtrlArgs->SetMarginWidth(3, 0); + m_textCtrlArgs->SetMarginWidth(3,0); // Select the lexer m_textCtrlArgs->SetLexer(wxSTC_LEX_NULL); // Set default font / styles @@ -336,201 +331,175 @@ FSConfigPageBase::FSConfigPageBase(wxWindow* parent, wxWindowID id, const wxPoin m_textCtrlArgs->SetKeyWords(2, wxT("")); m_textCtrlArgs->SetKeyWords(3, wxT("")); m_textCtrlArgs->SetKeyWords(4, wxT("")); - - flexGridSizer33->Add(m_textCtrlArgs, 1, wxALL | wxEXPAND, WXC_FROM_DIP(5)); - - m_staticText35 = new wxStaticText(m_panelGeneral, wxID_ANY, _("File extensions:"), wxDefaultPosition, - wxDLG_UNIT(m_panelGeneral, wxSize(-1, -1)), 0); + + flexGridSizer33->Add(m_textCtrlArgs, 1, wxALL|wxEXPAND, WXC_FROM_DIP(5)); + + m_staticText35 = new wxStaticText(m_panelGeneral, wxID_ANY, _("File extensions:"), wxDefaultPosition, wxDLG_UNIT(m_panelGeneral, wxSize(-1,-1)), 0); m_staticText35->SetToolTip(_("Set the file extensions to be parsed in this\nworkspace")); - - flexGridSizer33->Add(m_staticText35, 0, wxALL | wxALIGN_RIGHT | wxALIGN_CENTER_VERTICAL, WXC_FROM_DIP(5)); - - m_textCtrlFileExt = new clThemedTextCtrl(m_panelGeneral, wxID_ANY, wxT(""), wxDefaultPosition, - wxDLG_UNIT(m_panelGeneral, wxSize(-1, -1)), 0); + + flexGridSizer33->Add(m_staticText35, 0, wxALL|wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL, WXC_FROM_DIP(5)); + + m_textCtrlFileExt = new clThemedTextCtrl(m_panelGeneral, wxID_ANY, wxT(""), wxDefaultPosition, wxDLG_UNIT(m_panelGeneral, wxSize(-1,-1)), 0); m_textCtrlFileExt->SetToolTip(_("Set the file extensions to be parsed in this\nworkspace")); -#if wxVERSION_NUMBER >= 3000 + #if wxVERSION_NUMBER >= 3000 m_textCtrlFileExt->SetHint(wxT("")); -#endif - - flexGridSizer33->Add(m_textCtrlFileExt, 0, wxALL | wxEXPAND, WXC_FROM_DIP(5)); - - m_staticText187 = new wxStaticText(m_panelGeneral, wxID_ANY, _("Exclude files:"), wxDefaultPosition, - wxDLG_UNIT(m_panelGeneral, wxSize(-1, -1)), 0); - - flexGridSizer33->Add(m_staticText187, 0, wxALL | wxALIGN_RIGHT | wxALIGN_CENTER_VERTICAL, WXC_FROM_DIP(5)); - - m_textCtrlExcludeFiles = new clThemedTextCtrl(m_panelGeneral, wxID_ANY, wxT(""), wxDefaultPosition, - wxDLG_UNIT(m_panelGeneral, wxSize(-1, -1)), 0); + #endif + + flexGridSizer33->Add(m_textCtrlFileExt, 0, wxALL|wxEXPAND, WXC_FROM_DIP(5)); + + m_staticText187 = new wxStaticText(m_panelGeneral, wxID_ANY, _("Exclude files:"), wxDefaultPosition, wxDLG_UNIT(m_panelGeneral, wxSize(-1,-1)), 0); + + flexGridSizer33->Add(m_staticText187, 0, wxALL|wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL, WXC_FROM_DIP(5)); + + m_textCtrlExcludeFiles = new clThemedTextCtrl(m_panelGeneral, wxID_ANY, wxT(""), wxDefaultPosition, wxDLG_UNIT(m_panelGeneral, wxSize(-1,-1)), 0); m_textCtrlExcludeFiles->SetToolTip(_("Files matching this pattern will not be\ndisplayed in the tree view")); -#if wxVERSION_NUMBER >= 3000 + #if wxVERSION_NUMBER >= 3000 m_textCtrlExcludeFiles->SetHint(wxT("")); -#endif - - flexGridSizer33->Add(m_textCtrlExcludeFiles, 0, wxALL | wxEXPAND, WXC_FROM_DIP(5)); - - m_staticText207 = new wxStaticText(m_panelGeneral, wxID_ANY, _("Exclude paths:"), wxDefaultPosition, - wxDLG_UNIT(m_panelGeneral, wxSize(-1, -1)), 0); - - flexGridSizer33->Add(m_staticText207, 0, wxALL | wxALIGN_RIGHT | wxALIGN_CENTER_VERTICAL, WXC_FROM_DIP(5)); - + #endif + + flexGridSizer33->Add(m_textCtrlExcludeFiles, 0, wxALL|wxEXPAND, WXC_FROM_DIP(5)); + + m_staticText207 = new wxStaticText(m_panelGeneral, wxID_ANY, _("Exclude paths:"), wxDefaultPosition, wxDLG_UNIT(m_panelGeneral, wxSize(-1,-1)), 0); + + flexGridSizer33->Add(m_staticText207, 0, wxALL|wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL, WXC_FROM_DIP(5)); + wxBoxSizer* boxSizer209 = new wxBoxSizer(wxHORIZONTAL); - + flexGridSizer33->Add(boxSizer209, 1, wxEXPAND, WXC_FROM_DIP(5)); - - m_textCtrlExcludePaths = new clThemedTextCtrl(m_panelGeneral, wxID_ANY, wxT(""), wxDefaultPosition, - wxDLG_UNIT(m_panelGeneral, wxSize(-1, -1)), 0); - m_textCtrlExcludePaths->SetToolTip( - _("Add here list of paths to be ignored.\nThe path is expected to be relative to the root folder of the " - "workspace\nIgnored paths will still be visible in the tree, but they will not be\nused in workspace " - "operations (find in files, code completion etc)")); -#if wxVERSION_NUMBER >= 3000 + + m_textCtrlExcludePaths = new clThemedTextCtrl(m_panelGeneral, wxID_ANY, wxT(""), wxDefaultPosition, wxDLG_UNIT(m_panelGeneral, wxSize(-1,-1)), 0); + m_textCtrlExcludePaths->SetToolTip(_("Add here list of paths to be ignored.\nThe path is expected to be relative to the root folder of the workspace\nIgnored paths will still be visible in the tree, but they will not be\nused in workspace operations (find in files, code completion etc)")); + #if wxVERSION_NUMBER >= 3000 m_textCtrlExcludePaths->SetHint(wxT("")); -#endif - + #endif + boxSizer209->Add(m_textCtrlExcludePaths, 1, wxALL, WXC_FROM_DIP(5)); - - m_button213 = new wxButton(m_panelGeneral, wxID_ANY, _("Edit"), wxDefaultPosition, - wxDLG_UNIT(m_panelGeneral, wxSize(-1, -1)), 0); - - boxSizer209->Add(m_button213, 0, wxALL | wxEXPAND, WXC_FROM_DIP(5)); - - m_panelBuild = - new wxPanel(m_notebook, wxID_ANY, wxDefaultPosition, wxDLG_UNIT(m_notebook, wxSize(-1, -1)), wxTAB_TRAVERSAL); + + m_button213 = new wxButton(m_panelGeneral, wxID_ANY, _("Edit"), wxDefaultPosition, wxDLG_UNIT(m_panelGeneral, wxSize(-1,-1)), 0); + + boxSizer209->Add(m_button213, 0, wxALL|wxEXPAND, WXC_FROM_DIP(5)); + + m_panelBuild = new wxPanel(m_notebook, wxID_ANY, wxDefaultPosition, wxDLG_UNIT(m_notebook, wxSize(-1,-1)), wxTAB_TRAVERSAL); m_notebook->AddPage(m_panelBuild, _("Build"), false); - + wxBoxSizer* boxSizer30 = new wxBoxSizer(wxVERTICAL); m_panelBuild->SetSizer(boxSizer30); - + wxFlexGridSizer* flexGridSizer270 = new wxFlexGridSizer(0, 2, 0, 0); - flexGridSizer270->SetFlexibleDirection(wxBOTH); - flexGridSizer270->SetNonFlexibleGrowMode(wxFLEX_GROWMODE_SPECIFIED); + flexGridSizer270->SetFlexibleDirection( wxBOTH ); + flexGridSizer270->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED ); flexGridSizer270->AddGrowableCol(1); - - boxSizer30->Add(flexGridSizer270, 0, wxALL | wxEXPAND, WXC_FROM_DIP(5)); - - m_staticText125 = new wxStaticText(m_panelBuild, wxID_ANY, _("Tool chain:"), wxDefaultPosition, - wxDLG_UNIT(m_panelBuild, wxSize(-1, -1)), 0); + + boxSizer30->Add(flexGridSizer270, 0, wxALL|wxEXPAND, WXC_FROM_DIP(5)); + + m_staticText125 = new wxStaticText(m_panelBuild, wxID_ANY, _("Tool chain:"), wxDefaultPosition, wxDLG_UNIT(m_panelBuild, wxSize(-1,-1)), 0); m_staticText125->SetToolTip(_("Select the toolchain to use")); - - flexGridSizer270->Add(m_staticText125, 0, wxALL | wxALIGN_RIGHT | wxALIGN_CENTER_VERTICAL, WXC_FROM_DIP(5)); - + + flexGridSizer270->Add(m_staticText125, 0, wxALL|wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL, WXC_FROM_DIP(5)); + wxArrayString m_choiceCompilerArr; - m_choiceCompiler = new clThemedChoice(m_panelBuild, wxID_ANY, wxDefaultPosition, - wxDLG_UNIT(m_panelBuild, wxSize(-1, -1)), m_choiceCompilerArr, 0); + m_choiceCompiler = new clThemedChoice(m_panelBuild, wxID_ANY, wxDefaultPosition, wxDLG_UNIT(m_panelBuild, wxSize(-1,-1)), m_choiceCompilerArr, 0); m_choiceCompiler->SetToolTip(_("Select the toolchain to use")); - - flexGridSizer270->Add(m_choiceCompiler, 0, wxALL | wxEXPAND, WXC_FROM_DIP(5)); - + + flexGridSizer270->Add(m_choiceCompiler, 0, wxALL|wxEXPAND, WXC_FROM_DIP(5)); + wxBoxSizer* boxSizer38 = new wxBoxSizer(wxHORIZONTAL); - + boxSizer30->Add(boxSizer38, 1, wxEXPAND, WXC_FROM_DIP(5)); - - m_dvListCtrlTargets = new clThemedListCtrl(m_panelBuild, wxID_ANY, wxDefaultPosition, - wxDLG_UNIT(m_panelBuild, wxSize(-1, -1)), wxDV_ROW_LINES | wxDV_SINGLE); - - boxSizer38->Add(m_dvListCtrlTargets, 1, wxALL | wxEXPAND, WXC_FROM_DIP(5)); - - m_dvListCtrlTargets->AppendTextColumn(_("Target Name"), wxDATAVIEW_CELL_INERT, WXC_FROM_DIP(-2), wxALIGN_LEFT, - wxDATAVIEW_COL_RESIZABLE); - m_dvListCtrlTargets->AppendTextColumn(_("Command"), wxDATAVIEW_CELL_INERT, WXC_FROM_DIP(-2), wxALIGN_LEFT, - wxDATAVIEW_COL_RESIZABLE); + + m_dvListCtrlTargets = new clThemedListCtrl(m_panelBuild, wxID_ANY, wxDefaultPosition, wxDLG_UNIT(m_panelBuild, wxSize(-1,-1)), wxDV_ROW_LINES|wxDV_SINGLE); + + boxSizer38->Add(m_dvListCtrlTargets, 1, wxALL|wxEXPAND, WXC_FROM_DIP(5)); + + m_dvListCtrlTargets->AppendTextColumn(_("Target Name"), wxDATAVIEW_CELL_INERT, WXC_FROM_DIP(-2), wxALIGN_LEFT, wxDATAVIEW_COL_RESIZABLE); + m_dvListCtrlTargets->AppendTextColumn(_("Command"), wxDATAVIEW_CELL_INERT, WXC_FROM_DIP(-2), wxALIGN_LEFT, wxDATAVIEW_COL_RESIZABLE); wxBoxSizer* boxSizer40 = new wxBoxSizer(wxVERTICAL); - - boxSizer38->Add(boxSizer40, 0, wxALL | wxEXPAND, WXC_FROM_DIP(5)); - - m_buttonNew = - new wxButton(m_panelBuild, wxID_NEW, _("New"), wxDefaultPosition, wxDLG_UNIT(m_panelBuild, wxSize(-1, -1)), 0); + + boxSizer38->Add(boxSizer40, 0, wxALL|wxEXPAND, WXC_FROM_DIP(5)); + + m_buttonNew = new wxButton(m_panelBuild, wxID_NEW, _("New"), wxDefaultPosition, wxDLG_UNIT(m_panelBuild, wxSize(-1,-1)), 0); m_buttonNew->SetDefault(); - - boxSizer40->Add(m_buttonNew, 0, wxALL | wxEXPAND, WXC_FROM_DIP(5)); - - m_buttonEdit = new wxButton(m_panelBuild, wxID_EDIT, _("Edit"), wxDefaultPosition, - wxDLG_UNIT(m_panelBuild, wxSize(-1, -1)), 0); - - boxSizer40->Add(m_buttonEdit, 0, wxALL | wxEXPAND, WXC_FROM_DIP(5)); - - m_buttonDelete = new wxButton(m_panelBuild, wxID_DELETE, _("Delete"), wxDefaultPosition, - wxDLG_UNIT(m_panelBuild, wxSize(-1, -1)), 0); - - boxSizer40->Add(m_buttonDelete, 0, wxALL | wxEXPAND, WXC_FROM_DIP(5)); - - Debugger = - new wxPanel(m_notebook, wxID_ANY, wxDefaultPosition, wxDLG_UNIT(m_notebook, wxSize(-1, -1)), wxTAB_TRAVERSAL); + + boxSizer40->Add(m_buttonNew, 0, wxALL|wxEXPAND, WXC_FROM_DIP(5)); + + m_buttonEdit = new wxButton(m_panelBuild, wxID_EDIT, _("Edit"), wxDefaultPosition, wxDLG_UNIT(m_panelBuild, wxSize(-1,-1)), 0); + + boxSizer40->Add(m_buttonEdit, 0, wxALL|wxEXPAND, WXC_FROM_DIP(5)); + + m_buttonDelete = new wxButton(m_panelBuild, wxID_DELETE, _("Delete"), wxDefaultPosition, wxDLG_UNIT(m_panelBuild, wxSize(-1,-1)), 0); + + boxSizer40->Add(m_buttonDelete, 0, wxALL|wxEXPAND, WXC_FROM_DIP(5)); + + Debugger = new wxPanel(m_notebook, wxID_ANY, wxDefaultPosition, wxDLG_UNIT(m_notebook, wxSize(-1,-1)), wxTAB_TRAVERSAL); m_notebook->AddPage(Debugger, _("Debug"), false); - + wxBoxSizer* boxSizer263 = new wxBoxSizer(wxVERTICAL); Debugger->SetSizer(boxSizer263); - + wxFlexGridSizer* flexGridSizer271 = new wxFlexGridSizer(0, 3, 0, 0); - flexGridSizer271->SetFlexibleDirection(wxBOTH); - flexGridSizer271->SetNonFlexibleGrowMode(wxFLEX_GROWMODE_SPECIFIED); + flexGridSizer271->SetFlexibleDirection( wxBOTH ); + flexGridSizer271->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED ); flexGridSizer271->AddGrowableCol(1); - - boxSizer263->Add(flexGridSizer271, 0, wxALL | wxEXPAND, WXC_FROM_DIP(5)); - - m_staticText179 = new wxStaticText(Debugger, wxID_ANY, _("Debugger:"), wxDefaultPosition, - wxDLG_UNIT(Debugger, wxSize(-1, -1)), 0); - - flexGridSizer271->Add(m_staticText179, 0, wxALL | wxALIGN_RIGHT | wxALIGN_CENTER_VERTICAL, WXC_FROM_DIP(5)); - + + boxSizer263->Add(flexGridSizer271, 0, wxALL|wxEXPAND, WXC_FROM_DIP(5)); + + m_staticText179 = new wxStaticText(Debugger, wxID_ANY, _("Debugger:"), wxDefaultPosition, wxDLG_UNIT(Debugger, wxSize(-1,-1)), 0); + + flexGridSizer271->Add(m_staticText179, 0, wxALL|wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL, WXC_FROM_DIP(5)); + wxArrayString m_choiceDebuggersArr; - m_choiceDebuggers = new clThemedChoice(Debugger, wxID_ANY, wxDefaultPosition, wxDLG_UNIT(Debugger, wxSize(-1, -1)), - m_choiceDebuggersArr, 0); - - flexGridSizer271->Add(m_choiceDebuggers, 0, wxALL | wxEXPAND, WXC_FROM_DIP(5)); - + m_choiceDebuggers = new clThemedChoice(Debugger, wxID_ANY, wxDefaultPosition, wxDLG_UNIT(Debugger, wxSize(-1,-1)), m_choiceDebuggersArr, 0); + + flexGridSizer271->Add(m_choiceDebuggers, 0, wxALL|wxEXPAND, WXC_FROM_DIP(5)); + flexGridSizer271->Add(0, 0, 1, wxALL, WXC_FROM_DIP(5)); - - m_staticText256 = new wxStaticText(Debugger, wxID_ANY, _("Debugger path:"), wxDefaultPosition, - wxDLG_UNIT(Debugger, wxSize(-1, -1)), 0); + + m_staticText256 = new wxStaticText(Debugger, wxID_ANY, _("Debugger path:"), wxDefaultPosition, wxDLG_UNIT(Debugger, wxSize(-1,-1)), 0); m_staticText256->SetToolTip(_("Path to debugger executable\nLeave empty to use the defaults")); - - flexGridSizer271->Add(m_staticText256, 0, wxALL | wxALIGN_CENTER_VERTICAL, WXC_FROM_DIP(5)); - - m_textCtrlDebugger = - new wxTextCtrl(Debugger, wxID_ANY, wxT(""), wxDefaultPosition, wxDLG_UNIT(Debugger, wxSize(-1, -1)), 0); + + flexGridSizer271->Add(m_staticText256, 0, wxALL|wxALIGN_CENTER_VERTICAL, WXC_FROM_DIP(5)); + + m_textCtrlDebugger = new wxTextCtrl(Debugger, wxID_ANY, wxT(""), wxDefaultPosition, wxDLG_UNIT(Debugger, wxSize(-1,-1)), 0); m_textCtrlDebugger->SetFocus(); -#if wxVERSION_NUMBER >= 3000 + #if wxVERSION_NUMBER >= 3000 m_textCtrlDebugger->SetHint(wxT("")); -#endif - - flexGridSizer271->Add(m_textCtrlDebugger, 1, wxALL | wxEXPAND | wxALIGN_CENTER_VERTICAL, WXC_FROM_DIP(5)); - - m_button262 = - new wxButton(Debugger, wxID_ANY, _("Browse"), wxDefaultPosition, wxDLG_UNIT(Debugger, wxSize(-1, -1)), 0); - - flexGridSizer271->Add(m_button262, 0, wxALL | wxALIGN_CENTER_VERTICAL, WXC_FROM_DIP(5)); - - m_staticText265 = new wxStaticText(Debugger, wxID_ANY, _("Startup commands:"), wxDefaultPosition, - wxDLG_UNIT(Debugger, wxSize(-1, -1)), 0); + #endif + + flexGridSizer271->Add(m_textCtrlDebugger, 1, wxALL|wxEXPAND|wxALIGN_CENTER_VERTICAL, WXC_FROM_DIP(5)); + + m_button262 = new wxButton(Debugger, wxID_ANY, _("Browse"), wxDefaultPosition, wxDLG_UNIT(Debugger, wxSize(-1,-1)), 0); + + flexGridSizer271->Add(m_button262, 0, wxALL|wxALIGN_CENTER_VERTICAL, WXC_FROM_DIP(5)); + + m_staticText265 = new wxStaticText(Debugger, wxID_ANY, _("Startup commands:"), wxDefaultPosition, wxDLG_UNIT(Debugger, wxSize(-1,-1)), 0); m_staticText265->SetToolTip(_("Append the content here to the startup script, such as ~/.gdbinit")); - + boxSizer263->Add(m_staticText265, 0, wxALL, WXC_FROM_DIP(5)); - - m_stcCommands = new clThemedSTC(Debugger, wxID_ANY, wxDefaultPosition, wxDLG_UNIT(Debugger, wxSize(-1, -1)), 0); + + m_stcCommands = new clThemedSTC(Debugger, wxID_ANY, wxDefaultPosition, wxDLG_UNIT(Debugger, wxSize(-1,-1)), 0); // Configure the fold margin - m_stcCommands->SetMarginType(4, wxSTC_MARGIN_SYMBOL); - m_stcCommands->SetMarginMask(4, wxSTC_MASK_FOLDERS); + m_stcCommands->SetMarginType (4, wxSTC_MARGIN_SYMBOL); + m_stcCommands->SetMarginMask (4, wxSTC_MASK_FOLDERS); m_stcCommands->SetMarginSensitive(4, true); - m_stcCommands->SetMarginWidth(4, 0); - + m_stcCommands->SetMarginWidth (4, 0); + // Configure the tracker margin m_stcCommands->SetMarginWidth(1, 0); - + // Configure the symbol margin - m_stcCommands->SetMarginType(2, wxSTC_MARGIN_SYMBOL); - m_stcCommands->SetMarginMask(2, ~(wxSTC_MASK_FOLDERS)); + m_stcCommands->SetMarginType (2, wxSTC_MARGIN_SYMBOL); + m_stcCommands->SetMarginMask (2, ~(wxSTC_MASK_FOLDERS)); m_stcCommands->SetMarginWidth(2, 0); m_stcCommands->SetMarginSensitive(2, true); - + // Configure the line numbers margin m_stcCommands->SetMarginType(0, wxSTC_MARGIN_NUMBER); - m_stcCommands->SetMarginWidth(0, 0); - + m_stcCommands->SetMarginWidth(0,0); + // Configure the line symbol margin m_stcCommands->SetMarginType(3, wxSTC_MARGIN_FORE); m_stcCommands->SetMarginMask(3, 0); - m_stcCommands->SetMarginWidth(3, 0); + m_stcCommands->SetMarginWidth(3,0); // Select the lexer m_stcCommands->SetLexer(wxSTC_LEX_NULL); // Set default font / styles @@ -543,49 +512,134 @@ FSConfigPageBase::FSConfigPageBase(wxWindow* parent, wxWindowID id, const wxPoin m_stcCommands->SetKeyWords(2, wxT("")); m_stcCommands->SetKeyWords(3, wxT("")); m_stcCommands->SetKeyWords(4, wxT("")); - - boxSizer263->Add(m_stcCommands, 1, wxALL | wxEXPAND, WXC_FROM_DIP(5)); - - m_panelCodeCompletion = - new wxPanel(m_notebook, wxID_ANY, wxDefaultPosition, wxDLG_UNIT(m_notebook, wxSize(-1, -1)), wxTAB_TRAVERSAL); + + boxSizer263->Add(m_stcCommands, 1, wxALL|wxEXPAND, WXC_FROM_DIP(5)); + + wxFlexGridSizer* flexGridRemoteTargetEnable = new wxFlexGridSizer(1, 2, 0, 0); + flexGridRemoteTargetEnable->SetFlexibleDirection( wxBOTH ); + flexGridRemoteTargetEnable->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED ); + flexGridRemoteTargetEnable->AddGrowableCol(1); + flexGridRemoteTargetEnable->AddGrowableRow(0); + + boxSizer263->Add(flexGridRemoteTargetEnable, 0, wxALL|wxEXPAND, WXC_FROM_DIP(5)); + + m_checkRemoteEnabled = new wxCheckBox(Debugger, wxID_ANY, _("Remote target"), wxDefaultPosition, wxDLG_UNIT(Debugger, wxSize(-1,-1)), 0); + m_checkRemoteEnabled->SetValue(false); + + flexGridRemoteTargetEnable->Add(m_checkRemoteEnabled, 0, wxALL, WXC_FROM_DIP(5)); + + m_checkRemoteExtended = new wxCheckBox(Debugger, wxID_ANY, _("Extended protocol"), wxDefaultPosition, wxDLG_UNIT(Debugger, wxSize(-1,-1)), 0); + m_checkRemoteExtended->SetValue(false); + + flexGridRemoteTargetEnable->Add(m_checkRemoteExtended, 0, wxALL, WXC_FROM_DIP(5)); + + wxFlexGridSizer* flexGridRemoteTargetAddress = new wxFlexGridSizer(1, 4, 0, 0); + flexGridRemoteTargetAddress->SetFlexibleDirection( wxBOTH ); + flexGridRemoteTargetAddress->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED ); + flexGridRemoteTargetAddress->AddGrowableCol(1); + + boxSizer263->Add(flexGridRemoteTargetAddress, 0, wxALL|wxEXPAND, WXC_FROM_DIP(5)); + + m_staticText275 = new wxStaticText(Debugger, wxID_ANY, _("Host"), wxDefaultPosition, wxDLG_UNIT(Debugger, wxSize(-1,-1)), 0); + + flexGridRemoteTargetAddress->Add(m_staticText275, 0, wxALL|wxALIGN_CENTER_VERTICAL, WXC_FROM_DIP(5)); + + m_textRemoteTargetHost = new wxTextCtrl(Debugger, wxID_ANY, wxT(""), wxDefaultPosition, wxDLG_UNIT(Debugger, wxSize(-1,-1)), 0); + #if wxVERSION_NUMBER >= 3000 + m_textRemoteTargetHost->SetHint(wxT("")); + #endif + + flexGridRemoteTargetAddress->Add(m_textRemoteTargetHost, 0, wxALL|wxEXPAND|wxALIGN_CENTER_VERTICAL, WXC_FROM_DIP(5)); + + m_staticText278 = new wxStaticText(Debugger, wxID_ANY, _("Port"), wxDefaultPosition, wxDLG_UNIT(Debugger, wxSize(-1,-1)), 0); + + flexGridRemoteTargetAddress->Add(m_staticText278, 0, wxALL|wxALIGN_CENTER_VERTICAL, WXC_FROM_DIP(5)); + + m_textRemoteTargetPort = new wxTextCtrl(Debugger, wxID_ANY, wxT(""), wxDefaultPosition, wxDLG_UNIT(Debugger, wxSize(-1,-1)), 0); + #if wxVERSION_NUMBER >= 3000 + m_textRemoteTargetPort->SetHint(wxT("")); + #endif + + flexGridRemoteTargetAddress->Add(m_textRemoteTargetPort, 0, wxALL|wxALIGN_CENTER_VERTICAL, WXC_FROM_DIP(5)); + + m_staticText284 = new wxStaticText(Debugger, wxID_ANY, _("Post connect commands"), wxDefaultPosition, wxDLG_UNIT(Debugger, wxSize(-1,-1)), 0); + + boxSizer263->Add(m_staticText284, 0, wxALL, WXC_FROM_DIP(5)); + + m_stcRemoteCommands = new clThemedSTC(Debugger, wxID_ANY, wxDefaultPosition, wxDLG_UNIT(Debugger, wxSize(-1,-1)), 0); + // Configure the fold margin + m_stcRemoteCommands->SetMarginType (4, wxSTC_MARGIN_SYMBOL); + m_stcRemoteCommands->SetMarginMask (4, wxSTC_MASK_FOLDERS); + m_stcRemoteCommands->SetMarginSensitive(4, true); + m_stcRemoteCommands->SetMarginWidth (4, 0); + + // Configure the tracker margin + m_stcRemoteCommands->SetMarginWidth(1, 0); + + // Configure the symbol margin + m_stcRemoteCommands->SetMarginType (2, wxSTC_MARGIN_SYMBOL); + m_stcRemoteCommands->SetMarginMask (2, ~(wxSTC_MASK_FOLDERS)); + m_stcRemoteCommands->SetMarginWidth(2, 0); + m_stcRemoteCommands->SetMarginSensitive(2, true); + + // Configure the line numbers margin + m_stcRemoteCommands->SetMarginType(0, wxSTC_MARGIN_NUMBER); + m_stcRemoteCommands->SetMarginWidth(0,0); + + // Configure the line symbol margin + m_stcRemoteCommands->SetMarginType(3, wxSTC_MARGIN_FORE); + m_stcRemoteCommands->SetMarginMask(3, 0); + m_stcRemoteCommands->SetMarginWidth(3,0); + // Select the lexer + m_stcRemoteCommands->SetLexer(wxSTC_LEX_NULL); + // Set default font / styles + m_stcRemoteCommands->StyleClearAll(); + m_stcRemoteCommands->SetWrapMode(0); + m_stcRemoteCommands->SetIndentationGuides(0); + m_stcRemoteCommands->SetEOLMode(2); + m_stcRemoteCommands->SetKeyWords(0, wxT("")); + m_stcRemoteCommands->SetKeyWords(1, wxT("")); + m_stcRemoteCommands->SetKeyWords(2, wxT("")); + m_stcRemoteCommands->SetKeyWords(3, wxT("")); + m_stcRemoteCommands->SetKeyWords(4, wxT("")); + + boxSizer263->Add(m_stcRemoteCommands, 1, wxALL|wxEXPAND, WXC_FROM_DIP(5)); + + m_panelCodeCompletion = new wxPanel(m_notebook, wxID_ANY, wxDefaultPosition, wxDLG_UNIT(m_notebook, wxSize(-1,-1)), wxTAB_TRAVERSAL); m_notebook->AddPage(m_panelCodeCompletion, _("compile_flags.txt"), false); - + wxBoxSizer* boxSizer22 = new wxBoxSizer(wxVERTICAL); m_panelCodeCompletion->SetSizer(boxSizer22); - - m_staticText26 = new wxStaticText(m_panelCodeCompletion, wxID_ANY, _("Place your build flags one-per-line here"), - wxDefaultPosition, wxDLG_UNIT(m_panelCodeCompletion, wxSize(-1, -1)), 0); - m_staticText26->SetToolTip(_("Place your build flags one-per-line here.\nFor " - "example:\n\n-I/home/eran/include\n-I/home/eran/wx/include\n-DSOME=1\n\nThese flags " - "will be used by CodeLite for better\ncode completion")); - + + m_staticText26 = new wxStaticText(m_panelCodeCompletion, wxID_ANY, _("Place your build flags one-per-line here"), wxDefaultPosition, wxDLG_UNIT(m_panelCodeCompletion, wxSize(-1,-1)), 0); + m_staticText26->SetToolTip(_("Place your build flags one-per-line here.\nFor example:\n\n-I/home/eran/include\n-I/home/eran/wx/include\n-DSOME=1\n\nThese flags will be used by CodeLite for better\ncode completion")); + boxSizer22->Add(m_staticText26, 0, wxALL, WXC_FROM_DIP(5)); - - m_stcCCFlags = new clThemedSTC(m_panelCodeCompletion, wxID_ANY, wxDefaultPosition, - wxDLG_UNIT(m_panelCodeCompletion, wxSize(-1, -1)), 0); + + m_stcCCFlags = new clThemedSTC(m_panelCodeCompletion, wxID_ANY, wxDefaultPosition, wxDLG_UNIT(m_panelCodeCompletion, wxSize(-1,-1)), 0); // Configure the fold margin - m_stcCCFlags->SetMarginType(4, wxSTC_MARGIN_SYMBOL); - m_stcCCFlags->SetMarginMask(4, wxSTC_MASK_FOLDERS); + m_stcCCFlags->SetMarginType (4, wxSTC_MARGIN_SYMBOL); + m_stcCCFlags->SetMarginMask (4, wxSTC_MASK_FOLDERS); m_stcCCFlags->SetMarginSensitive(4, true); - m_stcCCFlags->SetMarginWidth(4, 0); - + m_stcCCFlags->SetMarginWidth (4, 0); + // Configure the tracker margin m_stcCCFlags->SetMarginWidth(1, 0); - + // Configure the symbol margin - m_stcCCFlags->SetMarginType(2, wxSTC_MARGIN_SYMBOL); - m_stcCCFlags->SetMarginMask(2, ~(wxSTC_MASK_FOLDERS)); + m_stcCCFlags->SetMarginType (2, wxSTC_MARGIN_SYMBOL); + m_stcCCFlags->SetMarginMask (2, ~(wxSTC_MASK_FOLDERS)); m_stcCCFlags->SetMarginWidth(2, 0); m_stcCCFlags->SetMarginSensitive(2, true); - + // Configure the line numbers margin m_stcCCFlags->SetMarginType(0, wxSTC_MARGIN_NUMBER); - m_stcCCFlags->SetMarginWidth(0, 0); - + m_stcCCFlags->SetMarginWidth(0,0); + // Configure the line symbol margin m_stcCCFlags->SetMarginType(3, wxSTC_MARGIN_FORE); m_stcCCFlags->SetMarginMask(3, 0); - m_stcCCFlags->SetMarginWidth(3, 0); + m_stcCCFlags->SetMarginWidth(3,0); // Select the lexer m_stcCCFlags->SetLexer(wxSTC_LEX_NULL); // Set default font / styles @@ -597,45 +651,43 @@ FSConfigPageBase::FSConfigPageBase(wxWindow* parent, wxWindowID id, const wxPoin m_stcCCFlags->SetKeyWords(2, wxT("")); m_stcCCFlags->SetKeyWords(3, wxT("")); m_stcCCFlags->SetKeyWords(4, wxT("")); - - boxSizer22->Add(m_stcCCFlags, 1, wxALL | wxEXPAND, WXC_FROM_DIP(5)); - - m_panelEnv = - new wxPanel(m_notebook, wxID_ANY, wxDefaultPosition, wxDLG_UNIT(m_notebook, wxSize(-1, -1)), wxTAB_TRAVERSAL); + + boxSizer22->Add(m_stcCCFlags, 1, wxALL|wxEXPAND, WXC_FROM_DIP(5)); + + m_panelEnv = new wxPanel(m_notebook, wxID_ANY, wxDefaultPosition, wxDLG_UNIT(m_notebook, wxSize(-1,-1)), wxTAB_TRAVERSAL); m_notebook->AddPage(m_panelEnv, _("Environment"), false); - + wxBoxSizer* boxSizer117 = new wxBoxSizer(wxVERTICAL); m_panelEnv->SetSizer(boxSizer117); - - m_staticText119 = new wxStaticText(m_panelEnv, wxID_ANY, _("Environment variables:"), wxDefaultPosition, - wxDLG_UNIT(m_panelEnv, wxSize(-1, -1)), 0); - + + m_staticText119 = new wxStaticText(m_panelEnv, wxID_ANY, _("Environment variables:"), wxDefaultPosition, wxDLG_UNIT(m_panelEnv, wxSize(-1,-1)), 0); + boxSizer117->Add(m_staticText119, 0, wxALL, WXC_FROM_DIP(5)); - - m_stcEnv = new clThemedSTC(m_panelEnv, wxID_ANY, wxDefaultPosition, wxDLG_UNIT(m_panelEnv, wxSize(-1, -1)), 0); + + m_stcEnv = new clThemedSTC(m_panelEnv, wxID_ANY, wxDefaultPosition, wxDLG_UNIT(m_panelEnv, wxSize(-1,-1)), 0); // Configure the fold margin - m_stcEnv->SetMarginType(4, wxSTC_MARGIN_SYMBOL); - m_stcEnv->SetMarginMask(4, wxSTC_MASK_FOLDERS); + m_stcEnv->SetMarginType (4, wxSTC_MARGIN_SYMBOL); + m_stcEnv->SetMarginMask (4, wxSTC_MASK_FOLDERS); m_stcEnv->SetMarginSensitive(4, true); - m_stcEnv->SetMarginWidth(4, 0); - + m_stcEnv->SetMarginWidth (4, 0); + // Configure the tracker margin m_stcEnv->SetMarginWidth(1, 0); - + // Configure the symbol margin - m_stcEnv->SetMarginType(2, wxSTC_MARGIN_SYMBOL); - m_stcEnv->SetMarginMask(2, ~(wxSTC_MASK_FOLDERS)); + m_stcEnv->SetMarginType (2, wxSTC_MARGIN_SYMBOL); + m_stcEnv->SetMarginMask (2, ~(wxSTC_MASK_FOLDERS)); m_stcEnv->SetMarginWidth(2, 0); m_stcEnv->SetMarginSensitive(2, true); - + // Configure the line numbers margin m_stcEnv->SetMarginType(0, wxSTC_MARGIN_NUMBER); - m_stcEnv->SetMarginWidth(0, 0); - + m_stcEnv->SetMarginWidth(0,0); + // Configure the line symbol margin m_stcEnv->SetMarginType(3, wxSTC_MARGIN_FORE); m_stcEnv->SetMarginMask(3, 0); - m_stcEnv->SetMarginWidth(3, 0); + m_stcEnv->SetMarginWidth(3,0); // Select the lexer m_stcEnv->SetLexer(wxSTC_LEX_NULL); // Set default font / styles @@ -647,78 +699,70 @@ FSConfigPageBase::FSConfigPageBase(wxWindow* parent, wxWindowID id, const wxPoin m_stcEnv->SetKeyWords(2, wxT("")); m_stcEnv->SetKeyWords(3, wxT("")); m_stcEnv->SetKeyWords(4, wxT("")); - - boxSizer117->Add(m_stcEnv, 1, wxALL | wxEXPAND, WXC_FROM_DIP(5)); - - m_panelRemote = - new wxPanel(m_notebook, wxID_ANY, wxDefaultPosition, wxDLG_UNIT(m_notebook, wxSize(-1, -1)), wxTAB_TRAVERSAL); + + boxSizer117->Add(m_stcEnv, 1, wxALL|wxEXPAND, WXC_FROM_DIP(5)); + + m_panelRemote = new wxPanel(m_notebook, wxID_ANY, wxDefaultPosition, wxDLG_UNIT(m_notebook, wxSize(-1,-1)), wxTAB_TRAVERSAL); m_notebook->AddPage(m_panelRemote, _("Remote"), false); - + wxBoxSizer* boxSizer153 = new wxBoxSizer(wxVERTICAL); m_panelRemote->SetSizer(boxSizer153); - + wxFlexGridSizer* flexGridSizer155 = new wxFlexGridSizer(0, 3, 0, 0); - flexGridSizer155->SetFlexibleDirection(wxBOTH); - flexGridSizer155->SetNonFlexibleGrowMode(wxFLEX_GROWMODE_SPECIFIED); + flexGridSizer155->SetFlexibleDirection( wxBOTH ); + flexGridSizer155->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED ); flexGridSizer155->AddGrowableCol(1); - - boxSizer153->Add(flexGridSizer155, 1, wxALL | wxEXPAND, WXC_FROM_DIP(5)); - + + boxSizer153->Add(flexGridSizer155, 1, wxALL|wxEXPAND, WXC_FROM_DIP(5)); + flexGridSizer155->Add(0, 0, 1, wxALL, WXC_FROM_DIP(5)); - - m_checkBoxEnableRemote = new wxCheckBox(m_panelRemote, wxID_ANY, _("Enable remote development"), wxDefaultPosition, - wxDLG_UNIT(m_panelRemote, wxSize(-1, -1)), 0); + + m_checkBoxEnableRemote = new wxCheckBox(m_panelRemote, wxID_ANY, _("Enable remote development"), wxDefaultPosition, wxDLG_UNIT(m_panelRemote, wxSize(-1,-1)), 0); m_checkBoxEnableRemote->SetValue(false); - + flexGridSizer155->Add(m_checkBoxEnableRemote, 0, wxALL, WXC_FROM_DIP(5)); - + flexGridSizer155->Add(0, 0, 1, wxALL, WXC_FROM_DIP(5)); - - m_staticText161 = new wxStaticText(m_panelRemote, wxID_ANY, _("SSH Account:"), wxDefaultPosition, - wxDLG_UNIT(m_panelRemote, wxSize(-1, -1)), 0); - - flexGridSizer155->Add(m_staticText161, 0, wxALL | wxALIGN_RIGHT | wxALIGN_CENTER_VERTICAL, WXC_FROM_DIP(5)); - + + m_staticText161 = new wxStaticText(m_panelRemote, wxID_ANY, _("SSH Account:"), wxDefaultPosition, wxDLG_UNIT(m_panelRemote, wxSize(-1,-1)), 0); + + flexGridSizer155->Add(m_staticText161, 0, wxALL|wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL, WXC_FROM_DIP(5)); + wxArrayString m_choiceSSHAccountArr; - m_choiceSSHAccount = new wxChoice(m_panelRemote, wxID_ANY, wxDefaultPosition, - wxDLG_UNIT(m_panelRemote, wxSize(-1, -1)), m_choiceSSHAccountArr, 0); - - flexGridSizer155->Add(m_choiceSSHAccount, 0, wxALL | wxEXPAND | wxALIGN_CENTER_VERTICAL, WXC_FROM_DIP(5)); - + m_choiceSSHAccount = new wxChoice(m_panelRemote, wxID_ANY, wxDefaultPosition, wxDLG_UNIT(m_panelRemote, wxSize(-1,-1)), m_choiceSSHAccountArr, 0); + + flexGridSizer155->Add(m_choiceSSHAccount, 0, wxALL|wxEXPAND|wxALIGN_CENTER_VERTICAL, WXC_FROM_DIP(5)); + flexGridSizer155->Add(0, 0, 1, wxALL, WXC_FROM_DIP(5)); - - m_staticText165 = new wxStaticText(m_panelRemote, wxID_ANY, _("Remote folder:"), wxDefaultPosition, - wxDLG_UNIT(m_panelRemote, wxSize(-1, -1)), 0); - - flexGridSizer155->Add(m_staticText165, 0, wxALL | wxALIGN_RIGHT | wxALIGN_CENTER_VERTICAL, WXC_FROM_DIP(5)); - - m_textCtrlRemoteFolder = new wxTextCtrl(m_panelRemote, wxID_ANY, wxT(""), wxDefaultPosition, - wxDLG_UNIT(m_panelRemote, wxSize(-1, -1)), 0); -#if wxVERSION_NUMBER >= 3000 + + m_staticText165 = new wxStaticText(m_panelRemote, wxID_ANY, _("Remote folder:"), wxDefaultPosition, wxDLG_UNIT(m_panelRemote, wxSize(-1,-1)), 0); + + flexGridSizer155->Add(m_staticText165, 0, wxALL|wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL, WXC_FROM_DIP(5)); + + m_textCtrlRemoteFolder = new wxTextCtrl(m_panelRemote, wxID_ANY, wxT(""), wxDefaultPosition, wxDLG_UNIT(m_panelRemote, wxSize(-1,-1)), 0); + #if wxVERSION_NUMBER >= 3000 m_textCtrlRemoteFolder->SetHint(wxT("")); -#endif - - flexGridSizer155->Add(m_textCtrlRemoteFolder, 0, wxALL | wxEXPAND, WXC_FROM_DIP(5)); - - m_button169 = new wxButton(m_panelRemote, wxID_ANY, _("Browse"), wxDefaultPosition, - wxDLG_UNIT(m_panelRemote, wxSize(-1, -1)), 0); + #endif + + flexGridSizer155->Add(m_textCtrlRemoteFolder, 0, wxALL|wxEXPAND, WXC_FROM_DIP(5)); + + m_button169 = new wxButton(m_panelRemote, wxID_ANY, _("Browse"), wxDefaultPosition, wxDLG_UNIT(m_panelRemote, wxSize(-1,-1)), 0); m_button169->SetToolTip(_("Browse for folder")); - - flexGridSizer155->Add(m_button169, 0, wxALL | wxALIGN_CENTER_VERTICAL, WXC_FROM_DIP(5)); - + + flexGridSizer155->Add(m_button169, 0, wxALL|wxALIGN_CENTER_VERTICAL, WXC_FROM_DIP(5)); + flexGridSizer155->Add(0, 0, 1, wxALL, WXC_FROM_DIP(5)); - - m_checkBoxRemoteBuild = new wxCheckBox(m_panelRemote, wxID_ANY, _("Use remote build"), wxDefaultPosition, - wxDLG_UNIT(m_panelRemote, wxSize(-1, -1)), 0); + + m_checkBoxRemoteBuild = new wxCheckBox(m_panelRemote, wxID_ANY, _("Use remote build"), wxDefaultPosition, wxDLG_UNIT(m_panelRemote, wxSize(-1,-1)), 0); m_checkBoxRemoteBuild->SetValue(false); m_checkBoxRemoteBuild->SetToolTip(_("Execute the build commands on the remote machine")); - - flexGridSizer155->Add(m_checkBoxRemoteBuild, 0, wxALL | wxEXPAND, WXC_FROM_DIP(5)); - + + flexGridSizer155->Add(m_checkBoxRemoteBuild, 0, wxALL|wxEXPAND, WXC_FROM_DIP(5)); + SetName(wxT("FSConfigPageBase")); - SetSize(wxDLG_UNIT(this, wxSize(500, -1))); + SetSize(wxDLG_UNIT(this, wxSize(500,-1))); if (GetSizer()) { - GetSizer()->Fit(this); + GetSizer()->Fit(this); } // Connect events m_button241->Bind(wxEVT_COMMAND_BUTTON_CLICKED, &FSConfigPageBase::OnBrowseExec, this); @@ -738,6 +782,7 @@ FSConfigPageBase::FSConfigPageBase(wxWindow* parent, wxWindowID id, const wxPoin m_button169->Bind(wxEVT_UPDATE_UI, &FSConfigPageBase::OnRemoteEnabledUI, this); m_button169->Bind(wxEVT_COMMAND_BUTTON_CLICKED, &FSConfigPageBase::OnSSHBrowse, this); m_checkBoxRemoteBuild->Bind(wxEVT_UPDATE_UI, &FSConfigPageBase::OnRemoteEnabledUI, this); + } FSConfigPageBase::~FSConfigPageBase() @@ -759,77 +804,72 @@ FSConfigPageBase::~FSConfigPageBase() m_button169->Unbind(wxEVT_UPDATE_UI, &FSConfigPageBase::OnRemoteEnabledUI, this); m_button169->Unbind(wxEVT_COMMAND_BUTTON_CLICKED, &FSConfigPageBase::OnSSHBrowse, this); m_checkBoxRemoteBuild->Unbind(wxEVT_UPDATE_UI, &FSConfigPageBase::OnRemoteEnabledUI, this); + } -NewFileSystemWorkspaceDialogBase::NewFileSystemWorkspaceDialogBase(wxWindow* parent, wxWindowID id, - const wxString& title, const wxPoint& pos, - const wxSize& size, long style) +NewFileSystemWorkspaceDialogBase::NewFileSystemWorkspaceDialogBase(wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size, long style) : wxDialog(parent, id, title, pos, size, style) { - if (!bBitmapLoaded) { + if ( !bBitmapLoaded ) { // We need to initialise the default bitmap handler wxXmlResource::Get()->AddHandler(new wxBitmapXmlHandler); wxCB09InitBitmapResources(); bBitmapLoaded = true; } - + wxBoxSizer* boxSizer131 = new wxBoxSizer(wxVERTICAL); this->SetSizer(boxSizer131); - + wxFlexGridSizer* flexGridSizer139 = new wxFlexGridSizer(0, 2, 0, 0); - flexGridSizer139->SetFlexibleDirection(wxBOTH); - flexGridSizer139->SetNonFlexibleGrowMode(wxFLEX_GROWMODE_SPECIFIED); + flexGridSizer139->SetFlexibleDirection( wxBOTH ); + flexGridSizer139->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED ); flexGridSizer139->AddGrowableCol(1); - - boxSizer131->Add(flexGridSizer139, 1, wxALL | wxEXPAND, WXC_FROM_DIP(5)); - - m_staticText141 = - new wxStaticText(this, wxID_ANY, _("Workspace path:"), wxDefaultPosition, wxDLG_UNIT(this, wxSize(-1, -1)), 0); - - flexGridSizer139->Add(m_staticText141, 0, wxALL | wxALIGN_RIGHT | wxALIGN_CENTER_VERTICAL, WXC_FROM_DIP(5)); - - m_dirPickerPath = new wxDirPickerCtrl(this, wxID_ANY, wxEmptyString, _("Select a folder"), wxDefaultPosition, - wxDLG_UNIT(this, wxSize(300, -1)), - wxDIRP_SMALL | wxDIRP_DEFAULT_STYLE | wxDIRP_USE_TEXTCTRL); + + boxSizer131->Add(flexGridSizer139, 1, wxALL|wxEXPAND, WXC_FROM_DIP(5)); + + m_staticText141 = new wxStaticText(this, wxID_ANY, _("Workspace path:"), wxDefaultPosition, wxDLG_UNIT(this, wxSize(-1,-1)), 0); + + flexGridSizer139->Add(m_staticText141, 0, wxALL|wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL, WXC_FROM_DIP(5)); + + m_dirPickerPath = new wxDirPickerCtrl(this, wxID_ANY, wxEmptyString, _("Select a folder"), wxDefaultPosition, wxDLG_UNIT(this, wxSize(300,-1)), wxDIRP_SMALL|wxDIRP_DEFAULT_STYLE|wxDIRP_USE_TEXTCTRL); m_dirPickerPath->SetFocus(); - - flexGridSizer139->Add(m_dirPickerPath, 0, wxALL | wxEXPAND, WXC_FROM_DIP(5)); - - m_staticText145 = - new wxStaticText(this, wxID_ANY, _("Workspace name:"), wxDefaultPosition, wxDLG_UNIT(this, wxSize(-1, -1)), 0); - - flexGridSizer139->Add(m_staticText145, 0, wxALL | wxALIGN_RIGHT | wxALIGN_CENTER_VERTICAL, WXC_FROM_DIP(5)); - - m_textCtrlName = new wxTextCtrl(this, wxID_ANY, wxT(""), wxDefaultPosition, wxDLG_UNIT(this, wxSize(-1, -1)), 0); -#if wxVERSION_NUMBER >= 3000 + + flexGridSizer139->Add(m_dirPickerPath, 0, wxALL|wxEXPAND, WXC_FROM_DIP(5)); + + m_staticText145 = new wxStaticText(this, wxID_ANY, _("Workspace name:"), wxDefaultPosition, wxDLG_UNIT(this, wxSize(-1,-1)), 0); + + flexGridSizer139->Add(m_staticText145, 0, wxALL|wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL, WXC_FROM_DIP(5)); + + m_textCtrlName = new wxTextCtrl(this, wxID_ANY, wxT(""), wxDefaultPosition, wxDLG_UNIT(this, wxSize(-1,-1)), 0); + #if wxVERSION_NUMBER >= 3000 m_textCtrlName->SetHint(wxT("")); -#endif - - flexGridSizer139->Add(m_textCtrlName, 0, wxALL | wxEXPAND, WXC_FROM_DIP(5)); - + #endif + + flexGridSizer139->Add(m_textCtrlName, 0, wxALL|wxEXPAND, WXC_FROM_DIP(5)); + m_stdBtnSizer133 = new wxStdDialogButtonSizer(); - - boxSizer131->Add(m_stdBtnSizer133, 0, wxALL | wxALIGN_CENTER_HORIZONTAL, WXC_FROM_DIP(5)); - + + boxSizer131->Add(m_stdBtnSizer133, 0, wxALL|wxALIGN_CENTER_HORIZONTAL, WXC_FROM_DIP(5)); + m_buttonOK = new wxButton(this, wxID_OK, wxT(""), wxDefaultPosition, wxDLG_UNIT(this, wxSize(-1, -1)), 0); m_buttonOK->SetDefault(); m_stdBtnSizer133->AddButton(m_buttonOK); - + m_button137 = new wxButton(this, wxID_CANCEL, wxT(""), wxDefaultPosition, wxDLG_UNIT(this, wxSize(-1, -1)), 0); m_stdBtnSizer133->AddButton(m_button137); m_stdBtnSizer133->Realize(); - + SetName(wxT("NewFileSystemWorkspaceDialogBase")); - SetSize(wxDLG_UNIT(this, wxSize(-1, -1))); + SetSize(wxDLG_UNIT(this, wxSize(-1,-1))); if (GetSizer()) { - GetSizer()->Fit(this); + GetSizer()->Fit(this); } - if (GetParent()) { + if(GetParent()) { CentreOnParent(wxBOTH); } else { CentreOnScreen(wxBOTH); } - if (!wxPersistenceManager::Get().Find(this)) { + if(!wxPersistenceManager::Get().Find(this)) { wxPersistenceManager::Get().RegisterAndRestore(this); } else { wxPersistenceManager::Get().Restore(this); @@ -837,91 +877,91 @@ NewFileSystemWorkspaceDialogBase::NewFileSystemWorkspaceDialogBase(wxWindow* par // Connect events m_dirPickerPath->Bind(wxEVT_COMMAND_DIRPICKER_CHANGED, &NewFileSystemWorkspaceDialogBase::OnDirSelected, this); m_buttonOK->Bind(wxEVT_UPDATE_UI, &NewFileSystemWorkspaceDialogBase::OnOKUI, this); + } NewFileSystemWorkspaceDialogBase::~NewFileSystemWorkspaceDialogBase() { m_dirPickerPath->Unbind(wxEVT_COMMAND_DIRPICKER_CHANGED, &NewFileSystemWorkspaceDialogBase::OnDirSelected, this); m_buttonOK->Unbind(wxEVT_UPDATE_UI, &NewFileSystemWorkspaceDialogBase::OnOKUI, this); + } -clFSWNewConfigDlgBase::clFSWNewConfigDlgBase(wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos, - const wxSize& size, long style) +clFSWNewConfigDlgBase::clFSWNewConfigDlgBase(wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size, long style) : wxDialog(parent, id, title, pos, size, style) { - if (!bBitmapLoaded) { + if ( !bBitmapLoaded ) { // We need to initialise the default bitmap handler wxXmlResource::Get()->AddHandler(new wxBitmapXmlHandler); wxCB09InitBitmapResources(); bBitmapLoaded = true; } - + wxBoxSizer* boxSizer221 = new wxBoxSizer(wxVERTICAL); this->SetSizer(boxSizer221); - + wxFlexGridSizer* flexGridSizer229 = new wxFlexGridSizer(0, 2, 0, 0); - flexGridSizer229->SetFlexibleDirection(wxBOTH); - flexGridSizer229->SetNonFlexibleGrowMode(wxFLEX_GROWMODE_SPECIFIED); + flexGridSizer229->SetFlexibleDirection( wxBOTH ); + flexGridSizer229->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED ); flexGridSizer229->AddGrowableCol(1); - - boxSizer221->Add(flexGridSizer229, 1, wxALL | wxEXPAND, WXC_FROM_DIP(5)); - - m_staticText231 = - new wxStaticText(this, wxID_ANY, _("Name:"), wxDefaultPosition, wxDLG_UNIT(this, wxSize(-1, -1)), 0); - - flexGridSizer229->Add(m_staticText231, 0, wxALL | wxALIGN_RIGHT | wxALIGN_CENTER_VERTICAL, WXC_FROM_DIP(5)); - - m_textCtrlName = new wxTextCtrl(this, wxID_ANY, wxT(""), wxDefaultPosition, wxDLG_UNIT(this, wxSize(200, -1)), 0); + + boxSizer221->Add(flexGridSizer229, 1, wxALL|wxEXPAND, WXC_FROM_DIP(5)); + + m_staticText231 = new wxStaticText(this, wxID_ANY, _("Name:"), wxDefaultPosition, wxDLG_UNIT(this, wxSize(-1,-1)), 0); + + flexGridSizer229->Add(m_staticText231, 0, wxALL|wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL, WXC_FROM_DIP(5)); + + m_textCtrlName = new wxTextCtrl(this, wxID_ANY, wxT(""), wxDefaultPosition, wxDLG_UNIT(this, wxSize(200,-1)), 0); m_textCtrlName->SetFocus(); -#if wxVERSION_NUMBER >= 3000 + #if wxVERSION_NUMBER >= 3000 m_textCtrlName->SetHint(wxT("")); -#endif - - flexGridSizer229->Add(m_textCtrlName, 0, wxALL | wxEXPAND, WXC_FROM_DIP(5)); - - m_staticText235 = - new wxStaticText(this, wxID_ANY, _("Copy from:"), wxDefaultPosition, wxDLG_UNIT(this, wxSize(-1, -1)), 0); - - flexGridSizer229->Add(m_staticText235, 0, wxALL | wxALIGN_RIGHT | wxALIGN_CENTER_VERTICAL, WXC_FROM_DIP(5)); - + #endif + + flexGridSizer229->Add(m_textCtrlName, 0, wxALL|wxEXPAND, WXC_FROM_DIP(5)); + + m_staticText235 = new wxStaticText(this, wxID_ANY, _("Copy from:"), wxDefaultPosition, wxDLG_UNIT(this, wxSize(-1,-1)), 0); + + flexGridSizer229->Add(m_staticText235, 0, wxALL|wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL, WXC_FROM_DIP(5)); + wxArrayString m_choiceCopyFromArr; - m_choiceCopyFrom = - new wxChoice(this, wxID_ANY, wxDefaultPosition, wxDLG_UNIT(this, wxSize(-1, -1)), m_choiceCopyFromArr, 0); - - flexGridSizer229->Add(m_choiceCopyFrom, 0, wxALL | wxEXPAND, WXC_FROM_DIP(5)); - + m_choiceCopyFrom = new wxChoice(this, wxID_ANY, wxDefaultPosition, wxDLG_UNIT(this, wxSize(-1,-1)), m_choiceCopyFromArr, 0); + + flexGridSizer229->Add(m_choiceCopyFrom, 0, wxALL|wxEXPAND, WXC_FROM_DIP(5)); + m_stdBtnSizer223 = new wxStdDialogButtonSizer(); - - boxSizer221->Add(m_stdBtnSizer223, 0, wxALL | wxALIGN_CENTER_HORIZONTAL, WXC_FROM_DIP(5)); - + + boxSizer221->Add(m_stdBtnSizer223, 0, wxALL|wxALIGN_CENTER_HORIZONTAL, WXC_FROM_DIP(5)); + m_button225 = new wxButton(this, wxID_OK, wxT(""), wxDefaultPosition, wxDLG_UNIT(this, wxSize(-1, -1)), 0); m_button225->SetDefault(); m_stdBtnSizer223->AddButton(m_button225); - + m_button227 = new wxButton(this, wxID_CANCEL, wxT(""), wxDefaultPosition, wxDLG_UNIT(this, wxSize(-1, -1)), 0); m_stdBtnSizer223->AddButton(m_button227); m_stdBtnSizer223->Realize(); - + SetName(wxT("clFSWNewConfigDlgBase")); - SetSize(wxDLG_UNIT(this, wxSize(-1, -1))); + SetSize(wxDLG_UNIT(this, wxSize(-1,-1))); if (GetSizer()) { - GetSizer()->Fit(this); + GetSizer()->Fit(this); } - if (GetParent()) { + if(GetParent()) { CentreOnParent(wxBOTH); } else { CentreOnScreen(wxBOTH); } - if (!wxPersistenceManager::Get().Find(this)) { + if(!wxPersistenceManager::Get().Find(this)) { wxPersistenceManager::Get().RegisterAndRestore(this); } else { wxPersistenceManager::Get().Restore(this); } // Connect events m_button225->Bind(wxEVT_UPDATE_UI, &clFSWNewConfigDlgBase::OnOKUI, this); + } clFSWNewConfigDlgBase::~clFSWNewConfigDlgBase() { m_button225->Unbind(wxEVT_UPDATE_UI, &clFSWNewConfigDlgBase::OnOKUI, this); + } diff --git a/Plugin/FileSystemWorkspace/clFileSystemWorkspaceDlgBase.h b/Plugin/FileSystemWorkspace/clFileSystemWorkspaceDlgBase.h index dfdf28d764..726e07cff9 100644 --- a/Plugin/FileSystemWorkspace/clFileSystemWorkspaceDlgBase.h +++ b/Plugin/FileSystemWorkspace/clFileSystemWorkspaceDlgBase.h @@ -72,13 +72,11 @@ class clFileSystemWorkspaceDlgBase : public wxDialog wxChoicebook* GetNotebook() { return m_notebook; } wxButton* GetButtonNew() { return m_buttonNew; } wxButton* GetButtonDelete() { return m_buttonDelete; } - clFileSystemWorkspaceDlgBase(wxWindow* parent, wxWindowID id = wxID_ANY, - const wxString& title = _("Workspace Settings"), - const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize(-1, -1), - long style = wxDEFAULT_DIALOG_STYLE | wxRESIZE_BORDER); + clFileSystemWorkspaceDlgBase(wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Workspace Settings"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize(-1,-1), long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER); virtual ~clFileSystemWorkspaceDlgBase(); }; + class BuildTargetDlgBase : public wxDialog { protected: @@ -98,12 +96,11 @@ class BuildTargetDlgBase : public wxDialog wxTextCtrl* GetTextCtrlaName() { return m_textCtrlaName; } wxStaticText* GetStaticText62() { return m_staticText62; } clThemedSTC* GetTextCtrlValue() { return m_textCtrlValue; } - BuildTargetDlgBase(wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Build Target"), - const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize(-1, -1), - long style = wxDEFAULT_DIALOG_STYLE | wxRESIZE_BORDER); + BuildTargetDlgBase(wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Build Target"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize(-1,-1), long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER); virtual ~BuildTargetDlgBase(); }; + class FSConfigPageBase : public wxPanel { protected: @@ -139,6 +136,14 @@ class FSConfigPageBase : public wxPanel wxButton* m_button262; wxStaticText* m_staticText265; clThemedSTC* m_stcCommands; + wxCheckBox* m_checkRemoteEnabled; + wxCheckBox* m_checkRemoteExtended; + wxStaticText* m_staticText275; + wxTextCtrl* m_textRemoteTargetHost; + wxStaticText* m_staticText278; + wxTextCtrl* m_textRemoteTargetPort; + wxStaticText* m_staticText284; + clThemedSTC* m_stcRemoteCommands; wxPanel* m_panelCodeCompletion; wxStaticText* m_staticText26; clThemedSTC* m_stcCCFlags; @@ -201,6 +206,14 @@ class FSConfigPageBase : public wxPanel wxButton* GetButton262() { return m_button262; } wxStaticText* GetStaticText265() { return m_staticText265; } clThemedSTC* GetStcCommands() { return m_stcCommands; } + wxCheckBox* GetCheckRemoteEnabled() { return m_checkRemoteEnabled; } + wxCheckBox* GetCheckRemoteExtended() { return m_checkRemoteExtended; } + wxStaticText* GetStaticText275() { return m_staticText275; } + wxTextCtrl* GetTextRemoteTargetHost() { return m_textRemoteTargetHost; } + wxStaticText* GetStaticText278() { return m_staticText278; } + wxTextCtrl* GetTextRemoteTargetPort() { return m_textRemoteTargetPort; } + wxStaticText* GetStaticText284() { return m_staticText284; } + clThemedSTC* GetStcRemoteCommands() { return m_stcRemoteCommands; } wxPanel* GetDebugger() { return Debugger; } wxStaticText* GetStaticText26() { return m_staticText26; } clThemedSTC* GetStcCCFlags() { return m_stcCCFlags; } @@ -217,11 +230,11 @@ class FSConfigPageBase : public wxPanel wxCheckBox* GetCheckBoxRemoteBuild() { return m_checkBoxRemoteBuild; } wxPanel* GetPanelRemote() { return m_panelRemote; } wxNotebook* GetNotebook() { return m_notebook; } - FSConfigPageBase(wxWindow* parent, wxWindowID id = wxID_ANY, const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxSize(500, -1), long style = wxTAB_TRAVERSAL); + FSConfigPageBase(wxWindow* parent, wxWindowID id = wxID_ANY, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize(500,-1), long style = wxTAB_TRAVERSAL); virtual ~FSConfigPageBase(); }; + class NewFileSystemWorkspaceDialogBase : public wxDialog { protected: @@ -242,13 +255,11 @@ class NewFileSystemWorkspaceDialogBase : public wxDialog wxDirPickerCtrl* GetDirPickerPath() { return m_dirPickerPath; } wxStaticText* GetStaticText145() { return m_staticText145; } wxTextCtrl* GetTextCtrlName() { return m_textCtrlName; } - NewFileSystemWorkspaceDialogBase(wxWindow* parent, wxWindowID id = wxID_ANY, - const wxString& title = _("Create workspace"), - const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize(-1, -1), - long style = wxDEFAULT_DIALOG_STYLE | wxRESIZE_BORDER); + NewFileSystemWorkspaceDialogBase(wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Create workspace"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize(-1,-1), long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER); virtual ~NewFileSystemWorkspaceDialogBase(); }; + class clFSWNewConfigDlgBase : public wxDialog { protected: @@ -268,9 +279,7 @@ class clFSWNewConfigDlgBase : public wxDialog wxTextCtrl* GetTextCtrlName() { return m_textCtrlName; } wxStaticText* GetStaticText235() { return m_staticText235; } wxChoice* GetChoiceCopyFrom() { return m_choiceCopyFrom; } - clFSWNewConfigDlgBase(wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("New Configurtion"), - const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize(-1, -1), - long style = wxDEFAULT_DIALOG_STYLE | wxRESIZE_BORDER); + clFSWNewConfigDlgBase(wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("New Configurtion"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize(-1,-1), long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER); virtual ~clFSWNewConfigDlgBase(); }; diff --git a/Plugin/FileSystemWorkspace/clFileSystemWorkspaceDlgBase.wxcp b/Plugin/FileSystemWorkspace/clFileSystemWorkspaceDlgBase.wxcp index b86502b0b0..07af79ddec 100644 --- a/Plugin/FileSystemWorkspace/clFileSystemWorkspaceDlgBase.wxcp +++ b/Plugin/FileSystemWorkspace/clFileSystemWorkspaceDlgBase.wxcp @@ -1,7 +1,7 @@ { "metadata": { "m_generatedFilesDir": ".", - "m_objCounter": 272, + "m_objCounter": 284, "m_includeFiles": [], "m_bitmapFunction": "wxCB09InitBitmapResources", "m_bitmapsFile": "clFileSystemWorkspaceDlgBase_plugin_bitmaps.cpp", @@ -954,10 +954,6 @@ "type": "string", "m_label": "Max Length:", "m_value": "0" - }, { - "type": "bool", - "m_label": "Enable Spell Checking", - "m_value": false }, { "type": "bool", "m_label": "Auto Complete Directories:", @@ -2077,10 +2073,6 @@ "type": "string", "m_label": "Max Length:", "m_value": "0" - }, { - "type": "bool", - "m_label": "Enable Spell Checking", - "m_value": false }, { "type": "bool", "m_label": "Auto Complete Directories:", @@ -2532,10 +2524,6 @@ "type": "string", "m_label": "Max Length:", "m_value": "0" - }, { - "type": "bool", - "m_label": "Enable Spell Checking", - "m_value": false }, { "type": "bool", "m_label": "Auto Complete Directories:", @@ -2698,10 +2686,6 @@ "type": "string", "m_label": "Max Length:", "m_value": "0" - }, { - "type": "bool", - "m_label": "Enable Spell Checking", - "m_value": false }, { "type": "bool", "m_label": "Auto Complete Directories:", @@ -2895,10 +2879,6 @@ "type": "string", "m_label": "Max Length:", "m_value": "0" - }, { - "type": "bool", - "m_label": "Enable Spell Checking", - "m_value": false }, { "type": "bool", "m_label": "Auto Complete Directories:", @@ -4321,10 +4301,6 @@ "type": "string", "m_label": "Max Length:", "m_value": "0" - }, { - "type": "bool", - "m_label": "Enable Spell Checking", - "m_value": false }, { "type": "bool", "m_label": "Auto Complete Directories:", @@ -4625,259 +4601,1029 @@ }], "m_events": [], "m_children": [] - }] - }] - }, { - "m_type": 4441, - "proportion": 0, - "border": 5, - "gbSpan": "1,1", - "gbPosition": "0,0", - "m_styles": ["wxTAB_TRAVERSAL"], - "m_sizerFlags": ["wxALL", "wxLEFT", "wxRIGHT", "wxTOP", "wxBOTTOM"], - "m_properties": [{ - "type": "winid", - "m_label": "ID:", - "m_winid": "wxID_ANY" - }, { - "type": "string", - "m_label": "Size:", - "m_value": "-1,-1" - }, { - "type": "string", - "m_label": "Minimum Size:", - "m_value": "-1,-1" - }, { - "type": "string", - "m_label": "Name:", - "m_value": "m_panelCodeCompletion" - }, { - "type": "multi-string", - "m_label": "Tooltip:", - "m_value": "" - }, { - "type": "colour", - "m_label": "Bg Colour:", - "colour": "" - }, { - "type": "colour", - "m_label": "Fg Colour:", - "colour": "" - }, { - "type": "font", - "m_label": "Font:", - "m_value": "" - }, { - "type": "bool", - "m_label": "Hidden", - "m_value": false - }, { - "type": "bool", - "m_label": "Disabled", - "m_value": false - }, { - "type": "bool", - "m_label": "Focused", - "m_value": false - }, { - "type": "string", - "m_label": "Class Name:", - "m_value": "" - }, { - "type": "string", - "m_label": "Include File:", - "m_value": "" - }, { - "type": "string", - "m_label": "Style:", - "m_value": "" - }, { - "type": "string", - "m_label": "Label:", - "m_value": "compile_flags.txt" - }, { - "type": "bitmapPicker", - "m_label": "Bitmap File:", - "m_path": "" - }, { - "type": "bool", - "m_label": "Selected", - "m_value": false - }, { - "type": "bool", - "m_label": "Null Page", - "m_value": false - }], - "m_events": [], - "m_children": [{ - "m_type": 4401, - "proportion": 1, - "border": 5, - "gbSpan": "1,1", - "gbPosition": "0,0", - "m_styles": [], - "m_sizerFlags": ["wxALL", "wxLEFT", "wxRIGHT", "wxTOP", "wxBOTTOM", "wxEXPAND"], - "m_properties": [{ - "type": "string", - "m_label": "Minimum Size:", - "m_value": "-1,-1" - }, { - "type": "string", - "m_label": "Name:", - "m_value": "boxSizer22" - }, { - "type": "string", - "m_label": "Style:", - "m_value": "" - }, { - "type": "bool", - "m_label": "Keep as a class member", - "m_value": false }, { - "type": "choice", - "m_label": "Orientation:", - "m_selection": 0, - "m_options": ["wxVERTICAL", "wxHORIZONTAL"] - }], - "m_events": [], - "m_children": [{ - "m_type": 4405, + "m_type": 4403, "proportion": 0, "border": 5, "gbSpan": "1,1", "gbPosition": "0,0", "m_styles": [], - "m_sizerFlags": ["wxALL", "wxLEFT", "wxRIGHT", "wxTOP", "wxBOTTOM"], + "m_sizerFlags": ["wxALL", "wxLEFT", "wxRIGHT", "wxTOP", "wxBOTTOM", "wxEXPAND"], "m_properties": [{ - "type": "winid", - "m_label": "ID:", - "m_winid": "wxID_ANY" - }, { - "type": "string", - "m_label": "Size:", - "m_value": "-1,-1" - }, { "type": "string", "m_label": "Minimum Size:", "m_value": "-1,-1" }, { "type": "string", "m_label": "Name:", - "m_value": "m_staticText26" - }, { - "type": "multi-string", - "m_label": "Tooltip:", - "m_value": "Place your build flags one-per-line here.\\nFor example:\\n\\n-I/home/eran/include\\n-I/home/eran/wx/include\\n-DSOME=1\\n\\nThese flags will be used by CodeLite for better\\ncode completion" - }, { - "type": "colour", - "m_label": "Bg Colour:", - "colour": "" - }, { - "type": "colour", - "m_label": "Fg Colour:", - "colour": "" - }, { - "type": "font", - "m_label": "Font:", - "m_value": "" - }, { - "type": "bool", - "m_label": "Hidden", - "m_value": false - }, { - "type": "bool", - "m_label": "Disabled", - "m_value": false - }, { - "type": "bool", - "m_label": "Focused", - "m_value": false - }, { - "type": "string", - "m_label": "Class Name:", - "m_value": "" - }, { - "type": "string", - "m_label": "Include File:", - "m_value": "" + "m_value": "flexGridRemoteTargetEnable" }, { "type": "string", "m_label": "Style:", "m_value": "" }, { - "type": "multi-string", - "m_label": "Label:", - "m_value": "Place your build flags one-per-line here" - }, { - "type": "string", - "m_label": "Wrap:", - "m_value": "-1" - }], - "m_events": [], - "m_children": [] - }, { - "m_type": 4466, - "proportion": 1, - "border": 5, - "gbSpan": "1,1", - "gbPosition": "0,0", - "m_styles": [], - "m_sizerFlags": ["wxALL", "wxLEFT", "wxRIGHT", "wxTOP", "wxBOTTOM", "wxEXPAND"], - "m_properties": [{ - "type": "winid", - "m_label": "ID:", - "m_winid": "wxID_ANY" + "type": "bool", + "m_label": "Keep as a class member", + "m_value": false }, { "type": "string", - "m_label": "Size:", - "m_value": "-1,-1" + "m_label": "# Columns:", + "m_value": "2" }, { "type": "string", - "m_label": "Minimum Size:", - "m_value": "-1,-1" + "m_label": "# Rows:", + "m_value": "1" }, { "type": "string", - "m_label": "Name:", - "m_value": "m_stcCCFlags" - }, { - "type": "multi-string", - "m_label": "Tooltip:", - "m_value": "" - }, { - "type": "bool", - "m_label": "Hidden", - "m_value": false - }, { - "type": "bool", - "m_label": "Disabled", - "m_value": false - }, { - "type": "bool", - "m_label": "Focused", - "m_value": false + "m_label": "Growable columns:", + "m_value": "1" }, { "type": "string", - "m_label": "Class Name:", - "m_value": "clThemedSTC" + "m_label": "Growable rows:", + "m_value": "0" }, { "type": "string", - "m_label": "Include File:", - "m_value": "clThemedSTC.hpp" + "m_label": "Horizontal gap:", + "m_value": "0" }, { "type": "string", - "m_label": "Style:", - "m_value": "" - }, { - "type": "bool", - "m_label": "Fold Margin", - "m_value": false - }, { - "type": "bool", - "m_label": "Line Number Margin", - "m_value": false - }, { - "type": "bool", - "m_label": "Separator Margin", + "m_label": "Vertical gap:", + "m_value": "0" + }], + "m_events": [], + "m_children": [{ + "m_type": 4415, + "proportion": 0, + "border": 5, + "gbSpan": "1,1", + "gbPosition": "0,0", + "m_styles": [], + "m_sizerFlags": ["wxALL", "wxLEFT", "wxRIGHT", "wxTOP", "wxBOTTOM"], + "m_properties": [{ + "type": "winid", + "m_label": "ID:", + "m_winid": "wxID_ANY" + }, { + "type": "string", + "m_label": "Size:", + "m_value": "-1,-1" + }, { + "type": "string", + "m_label": "Minimum Size:", + "m_value": "-1,-1" + }, { + "type": "string", + "m_label": "Name:", + "m_value": "m_checkRemoteEnabled" + }, { + "type": "multi-string", + "m_label": "Tooltip:", + "m_value": "" + }, { + "type": "colour", + "m_label": "Bg Colour:", + "colour": "" + }, { + "type": "colour", + "m_label": "Fg Colour:", + "colour": "" + }, { + "type": "font", + "m_label": "Font:", + "m_value": "" + }, { + "type": "bool", + "m_label": "Hidden", + "m_value": false + }, { + "type": "bool", + "m_label": "Disabled", + "m_value": false + }, { + "type": "bool", + "m_label": "Focused", + "m_value": false + }, { + "type": "string", + "m_label": "Class Name:", + "m_value": "" + }, { + "type": "string", + "m_label": "Include File:", + "m_value": "" + }, { + "type": "string", + "m_label": "Style:", + "m_value": "" + }, { + "type": "string", + "m_label": "Label:", + "m_value": "Remote target" + }, { + "type": "bool", + "m_label": "Value:", + "m_value": false + }], + "m_events": [], + "m_children": [] + }, { + "m_type": 4415, + "proportion": 0, + "border": 5, + "gbSpan": "1,1", + "gbPosition": "0,0", + "m_styles": [], + "m_sizerFlags": ["wxALL", "wxLEFT", "wxRIGHT", "wxTOP", "wxBOTTOM"], + "m_properties": [{ + "type": "winid", + "m_label": "ID:", + "m_winid": "wxID_ANY" + }, { + "type": "string", + "m_label": "Size:", + "m_value": "-1,-1" + }, { + "type": "string", + "m_label": "Minimum Size:", + "m_value": "-1,-1" + }, { + "type": "string", + "m_label": "Name:", + "m_value": "m_checkRemoteExtended" + }, { + "type": "multi-string", + "m_label": "Tooltip:", + "m_value": "" + }, { + "type": "colour", + "m_label": "Bg Colour:", + "colour": "" + }, { + "type": "colour", + "m_label": "Fg Colour:", + "colour": "" + }, { + "type": "font", + "m_label": "Font:", + "m_value": "" + }, { + "type": "bool", + "m_label": "Hidden", + "m_value": false + }, { + "type": "bool", + "m_label": "Disabled", + "m_value": false + }, { + "type": "bool", + "m_label": "Focused", + "m_value": false + }, { + "type": "string", + "m_label": "Class Name:", + "m_value": "" + }, { + "type": "string", + "m_label": "Include File:", + "m_value": "" + }, { + "type": "string", + "m_label": "Style:", + "m_value": "" + }, { + "type": "string", + "m_label": "Label:", + "m_value": "Extended protocol" + }, { + "type": "bool", + "m_label": "Value:", + "m_value": false + }], + "m_events": [], + "m_children": [] + }] + }, { + "m_type": 4403, + "proportion": 0, + "border": 5, + "gbSpan": "1,1", + "gbPosition": "0,0", + "m_styles": [], + "m_sizerFlags": ["wxALL", "wxLEFT", "wxRIGHT", "wxTOP", "wxBOTTOM", "wxEXPAND"], + "m_properties": [{ + "type": "string", + "m_label": "Minimum Size:", + "m_value": "-1,-1" + }, { + "type": "string", + "m_label": "Name:", + "m_value": "flexGridRemoteTargetAddress" + }, { + "type": "string", + "m_label": "Style:", + "m_value": "" + }, { + "type": "bool", + "m_label": "Keep as a class member", + "m_value": false + }, { + "type": "string", + "m_label": "# Columns:", + "m_value": "4" + }, { + "type": "string", + "m_label": "# Rows:", + "m_value": "1" + }, { + "type": "string", + "m_label": "Growable columns:", + "m_value": "1" + }, { + "type": "string", + "m_label": "Growable rows:", + "m_value": "" + }, { + "type": "string", + "m_label": "Horizontal gap:", + "m_value": "0" + }, { + "type": "string", + "m_label": "Vertical gap:", + "m_value": "0" + }], + "m_events": [], + "m_children": [{ + "m_type": 4405, + "proportion": 0, + "border": 5, + "gbSpan": "1,1", + "gbPosition": "0,0", + "m_styles": [], + "m_sizerFlags": ["wxALL", "wxLEFT", "wxRIGHT", "wxTOP", "wxBOTTOM", "wxALIGN_CENTER_VERTICAL"], + "m_properties": [{ + "type": "winid", + "m_label": "ID:", + "m_winid": "wxID_ANY" + }, { + "type": "string", + "m_label": "Size:", + "m_value": "-1,-1" + }, { + "type": "string", + "m_label": "Minimum Size:", + "m_value": "-1,-1" + }, { + "type": "string", + "m_label": "Name:", + "m_value": "m_staticText275" + }, { + "type": "multi-string", + "m_label": "Tooltip:", + "m_value": "" + }, { + "type": "colour", + "m_label": "Bg Colour:", + "colour": "" + }, { + "type": "colour", + "m_label": "Fg Colour:", + "colour": "" + }, { + "type": "font", + "m_label": "Font:", + "m_value": "" + }, { + "type": "bool", + "m_label": "Hidden", + "m_value": false + }, { + "type": "bool", + "m_label": "Disabled", + "m_value": false + }, { + "type": "bool", + "m_label": "Focused", + "m_value": false + }, { + "type": "string", + "m_label": "Class Name:", + "m_value": "" + }, { + "type": "string", + "m_label": "Include File:", + "m_value": "" + }, { + "type": "string", + "m_label": "Style:", + "m_value": "" + }, { + "type": "multi-string", + "m_label": "Label:", + "m_value": "Host" + }, { + "type": "string", + "m_label": "Wrap:", + "m_value": "-1" + }], + "m_events": [], + "m_children": [] + }, { + "m_type": 4406, + "proportion": 0, + "border": 5, + "gbSpan": "1,1", + "gbPosition": "0,0", + "m_styles": [], + "m_sizerFlags": ["wxALL", "wxLEFT", "wxRIGHT", "wxTOP", "wxBOTTOM", "wxEXPAND", "wxALIGN_CENTER_VERTICAL"], + "m_properties": [{ + "type": "winid", + "m_label": "ID:", + "m_winid": "wxID_ANY" + }, { + "type": "string", + "m_label": "Size:", + "m_value": "-1,-1" + }, { + "type": "string", + "m_label": "Minimum Size:", + "m_value": "-1,-1" + }, { + "type": "string", + "m_label": "Name:", + "m_value": "m_textRemoteTargetHost" + }, { + "type": "multi-string", + "m_label": "Tooltip:", + "m_value": "" + }, { + "type": "colour", + "m_label": "Bg Colour:", + "colour": "" + }, { + "type": "colour", + "m_label": "Fg Colour:", + "colour": "" + }, { + "type": "font", + "m_label": "Font:", + "m_value": "" + }, { + "type": "bool", + "m_label": "Hidden", + "m_value": false + }, { + "type": "bool", + "m_label": "Disabled", + "m_value": false + }, { + "type": "bool", + "m_label": "Focused", + "m_value": false + }, { + "type": "string", + "m_label": "Class Name:", + "m_value": "" + }, { + "type": "string", + "m_label": "Include File:", + "m_value": "" + }, { + "type": "string", + "m_label": "Style:", + "m_value": "" + }, { + "type": "string", + "m_label": "Value:", + "m_value": "" + }, { + "type": "string", + "m_label": "Text Hint", + "m_value": "" + }, { + "type": "string", + "m_label": "Max Length:", + "m_value": "0" + }, { + "type": "bool", + "m_label": "Auto Complete Directories:", + "m_value": false + }, { + "type": "bool", + "m_label": "Auto Complete Files:", + "m_value": false + }], + "m_events": [], + "m_children": [] + }, { + "m_type": 4405, + "proportion": 0, + "border": 5, + "gbSpan": "1,1", + "gbPosition": "0,0", + "m_styles": [], + "m_sizerFlags": ["wxALL", "wxLEFT", "wxRIGHT", "wxTOP", "wxBOTTOM", "wxALIGN_CENTER_VERTICAL"], + "m_properties": [{ + "type": "winid", + "m_label": "ID:", + "m_winid": "wxID_ANY" + }, { + "type": "string", + "m_label": "Size:", + "m_value": "-1,-1" + }, { + "type": "string", + "m_label": "Minimum Size:", + "m_value": "-1,-1" + }, { + "type": "string", + "m_label": "Name:", + "m_value": "m_staticText278" + }, { + "type": "multi-string", + "m_label": "Tooltip:", + "m_value": "" + }, { + "type": "colour", + "m_label": "Bg Colour:", + "colour": "" + }, { + "type": "colour", + "m_label": "Fg Colour:", + "colour": "" + }, { + "type": "font", + "m_label": "Font:", + "m_value": "" + }, { + "type": "bool", + "m_label": "Hidden", + "m_value": false + }, { + "type": "bool", + "m_label": "Disabled", + "m_value": false + }, { + "type": "bool", + "m_label": "Focused", + "m_value": false + }, { + "type": "string", + "m_label": "Class Name:", + "m_value": "" + }, { + "type": "string", + "m_label": "Include File:", + "m_value": "" + }, { + "type": "string", + "m_label": "Style:", + "m_value": "" + }, { + "type": "multi-string", + "m_label": "Label:", + "m_value": "Port" + }, { + "type": "string", + "m_label": "Wrap:", + "m_value": "-1" + }], + "m_events": [], + "m_children": [] + }, { + "m_type": 4406, + "proportion": 0, + "border": 5, + "gbSpan": "1,1", + "gbPosition": "0,0", + "m_styles": [], + "m_sizerFlags": ["wxALL", "wxLEFT", "wxRIGHT", "wxTOP", "wxBOTTOM", "wxALIGN_CENTER_VERTICAL"], + "m_properties": [{ + "type": "winid", + "m_label": "ID:", + "m_winid": "wxID_ANY" + }, { + "type": "string", + "m_label": "Size:", + "m_value": "-1,-1" + }, { + "type": "string", + "m_label": "Minimum Size:", + "m_value": "-1,-1" + }, { + "type": "string", + "m_label": "Name:", + "m_value": "m_textRemoteTargetPort" + }, { + "type": "multi-string", + "m_label": "Tooltip:", + "m_value": "" + }, { + "type": "colour", + "m_label": "Bg Colour:", + "colour": "" + }, { + "type": "colour", + "m_label": "Fg Colour:", + "colour": "" + }, { + "type": "font", + "m_label": "Font:", + "m_value": "" + }, { + "type": "bool", + "m_label": "Hidden", + "m_value": false + }, { + "type": "bool", + "m_label": "Disabled", + "m_value": false + }, { + "type": "bool", + "m_label": "Focused", + "m_value": false + }, { + "type": "string", + "m_label": "Class Name:", + "m_value": "" + }, { + "type": "string", + "m_label": "Include File:", + "m_value": "" + }, { + "type": "string", + "m_label": "Style:", + "m_value": "" + }, { + "type": "string", + "m_label": "Value:", + "m_value": "" + }, { + "type": "string", + "m_label": "Text Hint", + "m_value": "" + }, { + "type": "string", + "m_label": "Max Length:", + "m_value": "0" + }, { + "type": "bool", + "m_label": "Auto Complete Directories:", + "m_value": false + }, { + "type": "bool", + "m_label": "Auto Complete Files:", + "m_value": false + }], + "m_events": [], + "m_children": [] + }] + }, { + "m_type": 4405, + "proportion": 0, + "border": 5, + "gbSpan": "1,1", + "gbPosition": "0,0", + "m_styles": [], + "m_sizerFlags": ["wxALL", "wxLEFT", "wxRIGHT", "wxTOP", "wxBOTTOM"], + "m_properties": [{ + "type": "winid", + "m_label": "ID:", + "m_winid": "wxID_ANY" + }, { + "type": "string", + "m_label": "Size:", + "m_value": "-1,-1" + }, { + "type": "string", + "m_label": "Minimum Size:", + "m_value": "-1,-1" + }, { + "type": "string", + "m_label": "Name:", + "m_value": "m_staticText284" + }, { + "type": "multi-string", + "m_label": "Tooltip:", + "m_value": "" + }, { + "type": "colour", + "m_label": "Bg Colour:", + "colour": "" + }, { + "type": "colour", + "m_label": "Fg Colour:", + "colour": "" + }, { + "type": "font", + "m_label": "Font:", + "m_value": "" + }, { + "type": "bool", + "m_label": "Hidden", + "m_value": false + }, { + "type": "bool", + "m_label": "Disabled", + "m_value": false + }, { + "type": "bool", + "m_label": "Focused", + "m_value": false + }, { + "type": "string", + "m_label": "Class Name:", + "m_value": "" + }, { + "type": "string", + "m_label": "Include File:", + "m_value": "" + }, { + "type": "string", + "m_label": "Style:", + "m_value": "" + }, { + "type": "multi-string", + "m_label": "Label:", + "m_value": "Post connect commands" + }, { + "type": "string", + "m_label": "Wrap:", + "m_value": "-1" + }], + "m_events": [], + "m_children": [] + }, { + "m_type": 4466, + "proportion": 1, + "border": 5, + "gbSpan": "1,1", + "gbPosition": "0,0", + "m_styles": [], + "m_sizerFlags": ["wxALL", "wxLEFT", "wxRIGHT", "wxTOP", "wxBOTTOM", "wxEXPAND"], + "m_properties": [{ + "type": "winid", + "m_label": "ID:", + "m_winid": "wxID_ANY" + }, { + "type": "string", + "m_label": "Size:", + "m_value": "-1,-1" + }, { + "type": "string", + "m_label": "Minimum Size:", + "m_value": "-1,-1" + }, { + "type": "string", + "m_label": "Name:", + "m_value": "m_stcRemoteCommands" + }, { + "type": "multi-string", + "m_label": "Tooltip:", + "m_value": "" + }, { + "type": "bool", + "m_label": "Hidden", + "m_value": false + }, { + "type": "bool", + "m_label": "Disabled", + "m_value": false + }, { + "type": "bool", + "m_label": "Focused", + "m_value": false + }, { + "type": "string", + "m_label": "Class Name:", + "m_value": "clThemedSTC" + }, { + "type": "string", + "m_label": "Include File:", + "m_value": "clThemedSTC.hpp" + }, { + "type": "string", + "m_label": "Style:", + "m_value": "" + }, { + "type": "bool", + "m_label": "Fold Margin", + "m_value": false + }, { + "type": "bool", + "m_label": "Line Number Margin", + "m_value": false + }, { + "type": "bool", + "m_label": "Separator Margin", + "m_value": false + }, { + "type": "bool", + "m_label": "Symbol Margin", + "m_value": false + }, { + "type": "choice", + "m_label": "Wrap Text", + "m_selection": 0, + "m_options": ["None", "Word", "Char"] + }, { + "type": "choice", + "m_label": "Indentation Guides", + "m_selection": 0, + "m_options": ["None", "Real", "Look Forward", "Look Both"] + }, { + "type": "choice", + "m_label": "EOL Mode", + "m_selection": 2, + "m_options": ["CRLF", "CR", "LF", "Default"] + }, { + "type": "bool", + "m_label": "Display EOL Markers", + "m_value": false + }, { + "type": "choice", + "m_label": "Lexer", + "m_selection": 58, + "m_options": ["wxSTC_LEX_ABAQUS", "wxSTC_LEX_ADA", "wxSTC_LEX_APDL", "wxSTC_LEX_ASM", "wxSTC_LEX_ASN1", "wxSTC_LEX_ASYMPTOTE", "wxSTC_LEX_AUTOMATIC", "wxSTC_LEX_AVE", "wxSTC_LEX_BAAN", "wxSTC_LEX_BASH", "wxSTC_LEX_BATCH", "wxSTC_LEX_BLITZBASIC", "wxSTC_LEX_BULLANT", "wxSTC_LEX_CAML", "wxSTC_LEX_CLW", "wxSTC_LEX_CLWNOCASE", "wxSTC_LEX_CMAKE", "wxSTC_LEX_COBOL", "wxSTC_LEX_CONF", "wxSTC_LEX_CONTAINER", "wxSTC_LEX_CPP", "wxSTC_LEX_CPPNOCASE", "wxSTC_LEX_CSOUND", "wxSTC_LEX_CSS", "wxSTC_LEX_D", "wxSTC_LEX_DIFF", "wxSTC_LEX_EIFFEL", "wxSTC_LEX_EIFFELKW", "wxSTC_LEX_ERLANG", "wxSTC_LEX_ERRORLIST", "wxSTC_LEX_ESCRIPT", "wxSTC_LEX_F77", "wxSTC_LEX_FLAGSHIP", "wxSTC_LEX_FORTH", "wxSTC_LEX_FORTRAN", "wxSTC_LEX_FREEBASIC", "wxSTC_LEX_GAP", "wxSTC_LEX_GUI4CLI", "wxSTC_LEX_HASKELL", "wxSTC_LEX_HTML", "wxSTC_LEX_INNOSETUP", "wxSTC_LEX_KIX", "wxSTC_LEX_LATEX", "wxSTC_LEX_LISP", "wxSTC_LEX_LOT", "wxSTC_LEX_LOUT", "wxSTC_LEX_LUA", "wxSTC_LEX_MAGIK", "wxSTC_LEX_MAKEFILE", "wxSTC_LEX_MARKDOWN", "wxSTC_LEX_MATLAB", "wxSTC_LEX_METAPOST", "wxSTC_LEX_MMIXAL", "wxSTC_LEX_MSSQL", "wxSTC_LEX_MYSQL", "wxSTC_LEX_NIMROD", "wxSTC_LEX_NNCRONTAB", "wxSTC_LEX_NSIS", "wxSTC_LEX_NULL", "wxSTC_LEX_OCTAVE", "wxSTC_LEX_OPAL", "wxSTC_LEX_PASCAL", "wxSTC_LEX_PERL", "wxSTC_LEX_PHPSCRIPT", "wxSTC_LEX_PLM", "wxSTC_LEX_PO", "wxSTC_LEX_POV", "wxSTC_LEX_POWERBASIC", "wxSTC_LEX_POWERPRO", "wxSTC_LEX_POWERSHELL", "wxSTC_LEX_PROGRESS", "wxSTC_LEX_PROPERTIES", "wxSTC_LEX_PS", "wxSTC_LEX_PUREBASIC", "wxSTC_LEX_PYTHON", "wxSTC_LEX_R", "wxSTC_LEX_REBOL", "wxSTC_LEX_RUBY", "wxSTC_LEX_SCRIPTOL", "wxSTC_LEX_SMALLTALK", "wxSTC_LEX_SML", "wxSTC_LEX_SORCUS", "wxSTC_LEX_SPECMAN", "wxSTC_LEX_SPICE", "wxSTC_LEX_SQL", "wxSTC_LEX_TACL", "wxSTC_LEX_TADS3", "wxSTC_LEX_TAL", "wxSTC_LEX_TCL", "wxSTC_LEX_TEX", "wxSTC_LEX_VB", "wxSTC_LEX_VBSCRIPT", "wxSTC_LEX_VERILOG", "wxSTC_LEX_VHDL", "wxSTC_LEX_XCODE", "wxSTC_LEX_XML", "wxSTC_LEX_YAML"] + }, { + "type": "font", + "m_label": "Font:", + "m_value": "" + }, { + "type": "multi-string", + "m_label": "Keywords Set 1", + "m_value": "" + }, { + "type": "multi-string", + "m_label": "Keywords Set 2", + "m_value": "" + }, { + "type": "multi-string", + "m_label": "Keywords Set 3", + "m_value": "" + }, { + "type": "multi-string", + "m_label": "Keywords Set 4", + "m_value": "" + }, { + "type": "multi-string", + "m_label": "Keywords Set 5", + "m_value": "" + }], + "m_events": [], + "m_children": [] + }] + }] + }, { + "m_type": 4441, + "proportion": 0, + "border": 5, + "gbSpan": "1,1", + "gbPosition": "0,0", + "m_styles": ["wxTAB_TRAVERSAL"], + "m_sizerFlags": ["wxALL", "wxLEFT", "wxRIGHT", "wxTOP", "wxBOTTOM"], + "m_properties": [{ + "type": "winid", + "m_label": "ID:", + "m_winid": "wxID_ANY" + }, { + "type": "string", + "m_label": "Size:", + "m_value": "-1,-1" + }, { + "type": "string", + "m_label": "Minimum Size:", + "m_value": "-1,-1" + }, { + "type": "string", + "m_label": "Name:", + "m_value": "m_panelCodeCompletion" + }, { + "type": "multi-string", + "m_label": "Tooltip:", + "m_value": "" + }, { + "type": "colour", + "m_label": "Bg Colour:", + "colour": "" + }, { + "type": "colour", + "m_label": "Fg Colour:", + "colour": "" + }, { + "type": "font", + "m_label": "Font:", + "m_value": "" + }, { + "type": "bool", + "m_label": "Hidden", + "m_value": false + }, { + "type": "bool", + "m_label": "Disabled", + "m_value": false + }, { + "type": "bool", + "m_label": "Focused", + "m_value": false + }, { + "type": "string", + "m_label": "Class Name:", + "m_value": "" + }, { + "type": "string", + "m_label": "Include File:", + "m_value": "" + }, { + "type": "string", + "m_label": "Style:", + "m_value": "" + }, { + "type": "string", + "m_label": "Label:", + "m_value": "compile_flags.txt" + }, { + "type": "bitmapPicker", + "m_label": "Bitmap File:", + "m_path": "" + }, { + "type": "bool", + "m_label": "Selected", + "m_value": false + }, { + "type": "bool", + "m_label": "Null Page", + "m_value": false + }], + "m_events": [], + "m_children": [{ + "m_type": 4401, + "proportion": 1, + "border": 5, + "gbSpan": "1,1", + "gbPosition": "0,0", + "m_styles": [], + "m_sizerFlags": ["wxALL", "wxLEFT", "wxRIGHT", "wxTOP", "wxBOTTOM", "wxEXPAND"], + "m_properties": [{ + "type": "string", + "m_label": "Minimum Size:", + "m_value": "-1,-1" + }, { + "type": "string", + "m_label": "Name:", + "m_value": "boxSizer22" + }, { + "type": "string", + "m_label": "Style:", + "m_value": "" + }, { + "type": "bool", + "m_label": "Keep as a class member", + "m_value": false + }, { + "type": "choice", + "m_label": "Orientation:", + "m_selection": 0, + "m_options": ["wxVERTICAL", "wxHORIZONTAL"] + }], + "m_events": [], + "m_children": [{ + "m_type": 4405, + "proportion": 0, + "border": 5, + "gbSpan": "1,1", + "gbPosition": "0,0", + "m_styles": [], + "m_sizerFlags": ["wxALL", "wxLEFT", "wxRIGHT", "wxTOP", "wxBOTTOM"], + "m_properties": [{ + "type": "winid", + "m_label": "ID:", + "m_winid": "wxID_ANY" + }, { + "type": "string", + "m_label": "Size:", + "m_value": "-1,-1" + }, { + "type": "string", + "m_label": "Minimum Size:", + "m_value": "-1,-1" + }, { + "type": "string", + "m_label": "Name:", + "m_value": "m_staticText26" + }, { + "type": "multi-string", + "m_label": "Tooltip:", + "m_value": "Place your build flags one-per-line here.\\nFor example:\\n\\n-I/home/eran/include\\n-I/home/eran/wx/include\\n-DSOME=1\\n\\nThese flags will be used by CodeLite for better\\ncode completion" + }, { + "type": "colour", + "m_label": "Bg Colour:", + "colour": "" + }, { + "type": "colour", + "m_label": "Fg Colour:", + "colour": "" + }, { + "type": "font", + "m_label": "Font:", + "m_value": "" + }, { + "type": "bool", + "m_label": "Hidden", + "m_value": false + }, { + "type": "bool", + "m_label": "Disabled", + "m_value": false + }, { + "type": "bool", + "m_label": "Focused", + "m_value": false + }, { + "type": "string", + "m_label": "Class Name:", + "m_value": "" + }, { + "type": "string", + "m_label": "Include File:", + "m_value": "" + }, { + "type": "string", + "m_label": "Style:", + "m_value": "" + }, { + "type": "multi-string", + "m_label": "Label:", + "m_value": "Place your build flags one-per-line here" + }, { + "type": "string", + "m_label": "Wrap:", + "m_value": "-1" + }], + "m_events": [], + "m_children": [] + }, { + "m_type": 4466, + "proportion": 1, + "border": 5, + "gbSpan": "1,1", + "gbPosition": "0,0", + "m_styles": [], + "m_sizerFlags": ["wxALL", "wxLEFT", "wxRIGHT", "wxTOP", "wxBOTTOM", "wxEXPAND"], + "m_properties": [{ + "type": "winid", + "m_label": "ID:", + "m_winid": "wxID_ANY" + }, { + "type": "string", + "m_label": "Size:", + "m_value": "-1,-1" + }, { + "type": "string", + "m_label": "Minimum Size:", + "m_value": "-1,-1" + }, { + "type": "string", + "m_label": "Name:", + "m_value": "m_stcCCFlags" + }, { + "type": "multi-string", + "m_label": "Tooltip:", + "m_value": "" + }, { + "type": "bool", + "m_label": "Hidden", + "m_value": false + }, { + "type": "bool", + "m_label": "Disabled", + "m_value": false + }, { + "type": "bool", + "m_label": "Focused", + "m_value": false + }, { + "type": "string", + "m_label": "Class Name:", + "m_value": "clThemedSTC" + }, { + "type": "string", + "m_label": "Include File:", + "m_value": "clThemedSTC.hpp" + }, { + "type": "string", + "m_label": "Style:", + "m_value": "" + }, { + "type": "bool", + "m_label": "Fold Margin", + "m_value": false + }, { + "type": "bool", + "m_label": "Line Number Margin", + "m_value": false + }, { + "type": "bool", + "m_label": "Separator Margin", "m_value": false }, { "type": "bool", @@ -5859,10 +6605,6 @@ "type": "string", "m_label": "Max Length:", "m_value": "0" - }, { - "type": "bool", - "m_label": "Enable Spell Checking", - "m_value": false }, { "type": "bool", "m_label": "Auto Complete Directories:", @@ -6585,10 +7327,6 @@ "type": "string", "m_label": "Max Length:", "m_value": "0" - }, { - "type": "bool", - "m_label": "Enable Spell Checking", - "m_value": false }, { "type": "bool", "m_label": "Auto Complete Directories:", @@ -7075,10 +7813,6 @@ "type": "string", "m_label": "Max Length:", "m_value": "0" - }, { - "type": "bool", - "m_label": "Enable Spell Checking", - "m_value": false }, { "type": "bool", "m_label": "Auto Complete Directories:", diff --git a/Plugin/FileSystemWorkspace/clFileSystemWorkspaceDlgBase_plugin_bitmaps.cpp b/Plugin/FileSystemWorkspace/clFileSystemWorkspaceDlgBase_plugin_bitmaps.cpp index 06d9dbd0d6..a27a84b024 100644 --- a/Plugin/FileSystemWorkspace/clFileSystemWorkspaceDlgBase_plugin_bitmaps.cpp +++ b/Plugin/FileSystemWorkspace/clFileSystemWorkspaceDlgBase_plugin_bitmaps.cpp @@ -1,49 +1,49 @@ -// -// This file was automatically generated by wxrc, do not edit by hand. -// - -#include - -#ifdef __BORLANDC__ - #pragma hdrstop -#endif - -#include -#include -#include -#include - -#if wxCHECK_VERSION(2,8,5) && wxABI_VERSION >= 20805 - #define XRC_ADD_FILE(name, data, size, mime) \ - wxMemoryFSHandler::AddFileWithMimeType(name, data, size, mime) -#else - #define XRC_ADD_FILE(name, data, size, mime) \ - wxMemoryFSHandler::AddFile(name, data, size) -#endif - -static size_t xml_res_size_0 = 137; -static unsigned char xml_res_file_0[] = { -60,63,120,109,108,32,118,101,114,115,105,111,110,61,34,49,46,48,34,32,101, -110,99,111,100,105,110,103,61,34,85,84,70,45,56,34,63,62,10,60,114,101, -115,111,117,114,99,101,32,120,109,108,110,115,61,34,104,116,116,112,58, -47,47,119,119,119,46,119,120,119,105,100,103,101,116,115,46,111,114,103, -47,119,120,120,114,99,34,62,10,32,32,60,33,45,45,32,72,97,110,100,108,101, -114,32,71,101,110,101,114,97,116,105,111,110,32,105,115,32,79,78,32,45, -45,62,10,60,47,114,101,115,111,117,114,99,101,62,10}; - -void wxCB09InitBitmapResources() -{ - - // Check for memory FS. If not present, load the handler: - { - wxMemoryFSHandler::AddFile(wxT("XRC_resource/dummy_file"), wxT("dummy one")); - wxFileSystem fsys; - wxFSFile *f = fsys.OpenFile(wxT("memory:XRC_resource/dummy_file")); - wxMemoryFSHandler::RemoveFile(wxT("XRC_resource/dummy_file")); - if (f) delete f; - else wxFileSystem::AddHandler(new wxMemoryFSHandlerBase); - } - - XRC_ADD_FILE(wxT("XRC_resource/clFileSystemWorkspaceDlgBase_plugin_bitmaps.cpp$C__msys64_home_eran_devl_codelite_Plugin_FileSystemWorkspace_clFileSystemWorkspaceDlgBase_plugin_bitmaps.xrc"), xml_res_file_0, xml_res_size_0, wxT("text/xml")); - wxXmlResource::Get()->Load(wxT("memory:XRC_resource/clFileSystemWorkspaceDlgBase_plugin_bitmaps.cpp$C__msys64_home_eran_devl_codelite_Plugin_FileSystemWorkspace_clFileSystemWorkspaceDlgBase_plugin_bitmaps.xrc")); -} +// +// This file was automatically generated by wxrc, do not edit by hand. +// + +#include + +#ifdef __BORLANDC__ + #pragma hdrstop +#endif + +#include +#include +#include +#include + +#if wxCHECK_VERSION(2,8,5) && wxABI_VERSION >= 20805 + #define XRC_ADD_FILE(name, data, size, mime) \ + wxMemoryFSHandler::AddFileWithMimeType(name, data, size, mime) +#else + #define XRC_ADD_FILE(name, data, size, mime) \ + wxMemoryFSHandler::AddFile(name, data, size) +#endif + +static size_t xml_res_size_0 = 137; +static unsigned char xml_res_file_0[] = { +60,63,120,109,108,32,118,101,114,115,105,111,110,61,34,49,46,48,34,32,101, +110,99,111,100,105,110,103,61,34,85,84,70,45,56,34,63,62,10,60,114,101, +115,111,117,114,99,101,32,120,109,108,110,115,61,34,104,116,116,112,58, +47,47,119,119,119,46,119,120,119,105,100,103,101,116,115,46,111,114,103, +47,119,120,120,114,99,34,62,10,32,32,60,33,45,45,32,72,97,110,100,108,101, +114,32,71,101,110,101,114,97,116,105,111,110,32,105,115,32,79,78,32,45, +45,62,10,60,47,114,101,115,111,117,114,99,101,62,10}; + +void wxCB09InitBitmapResources() +{ + + // Check for memory FS. If not present, load the handler: + { + wxMemoryFSHandler::AddFile(wxT("XRC_resource/dummy_file"), wxT("dummy one")); + wxFileSystem fsys; + wxFSFile *f = fsys.OpenFile(wxT("memory:XRC_resource/dummy_file")); + wxMemoryFSHandler::RemoveFile(wxT("XRC_resource/dummy_file")); + if (f) delete f; + else wxFileSystem::AddHandler(new wxMemoryFSHandlerBase); + } + + XRC_ADD_FILE(wxT("XRC_resource/clFileSystemWorkspaceDlgBase_plugin_bitmaps.cpp$_system_projects_codelite_Plugin_FileSystemWorkspace_clFileSystemWorkspaceDlgBase_plugin_bitmaps.xrc"), xml_res_file_0, xml_res_size_0, wxT("text/xml")); + wxXmlResource::Get()->Load(wxT("memory:XRC_resource/clFileSystemWorkspaceDlgBase_plugin_bitmaps.cpp$_system_projects_codelite_Plugin_FileSystemWorkspace_clFileSystemWorkspaceDlgBase_plugin_bitmaps.xrc")); +}