From c88cc6ce8915a208112d786102094a113154f731 Mon Sep 17 00:00:00 2001 From: rlbxku1r <32811754+rlbxku1r@users.noreply.github.com> Date: Fri, 21 Jan 2022 14:00:10 +0900 Subject: [PATCH] clKeyboardManager revamping * Use `clKeyboardShortcut` class as a replacement of wxString. * Remove the concept of menu and global accelerators. * Delete `accelerators.conf.default`, migrate them into C++ source. * Update translation files. --- CodeFormatter/codeformatter.cpp | 41 +- CodeLiteDiff/codelitediff.cpp | 32 +- Copyright/copyright.cpp | 82 +- DatabaseExplorer/databaseexplorer.cpp | 33 +- ExternalTools/externaltools.cpp | 43 +- InnoSetup/codelite64_mingw.iss | 1 - InnoSetup/codelite64_php_mingw.iss | 1 - InnoSetup/codelite_mingw.iss | 1 - InnoSetup/codelite_php.iss | 1 - LiteEditor/CMakeLists.txt | 2 - LiteEditor/CodeLiteIDE.project | 1 - LiteEditor/acceltabledlg.cpp | 55 +- LiteEditor/acceltabledlg.h | 5 +- LiteEditor/frame.cpp | 659 +-- LiteEditor/frame.h | 1 + Plugin/clKeyboardBindingConfig.cpp | 35 +- Plugin/clKeyboardBindingConfig.h | 7 +- Plugin/clKeyboardManager.cpp | 265 +- Plugin/clKeyboardManager.h | 146 +- Plugin/newkeyshortcutdlg.cpp | 77 +- Plugin/newkeyshortcutdlg.h | 22 +- Runtime/config/accelerators.conf.default | 187 - SnipWiz/editsnippetsdlg.cpp | 44 +- Subversion2/subversion2.cpp | 239 +- UnitTestCPP/unittestpp.cpp | 67 +- abbreviation/abbreviation.cpp | 47 +- cmake/Modules/OSXInstall.cmake | 4 - cppchecker/cppchecker.cpp | 37 +- cscope/cscope.cpp | 112 +- translations/codelite.pot | 4187 ++++++++++--------- translations/ja_JP/LC_MESSAGES/codelite.mo | Bin 608455 -> 616472 bytes translations/ja_JP/LC_MESSAGES/codelite.po | 4251 +++++++++++--------- wxcrafter/wxcrafter_plugin.cpp | 91 +- 33 files changed, 5995 insertions(+), 4781 deletions(-) delete mode 100644 Runtime/config/accelerators.conf.default diff --git a/CodeFormatter/codeformatter.cpp b/CodeFormatter/codeformatter.cpp index 5238dadb77..e0a52de5cc 100644 --- a/CodeFormatter/codeformatter.cpp +++ b/CodeFormatter/codeformatter.cpp @@ -23,11 +23,13 @@ ////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////// #include "codeformatter.h" + #include "JSON.h" #include "asyncprocess.h" #include "clEditorConfig.h" #include "clEditorStateLocker.h" #include "clFilesCollector.h" +#include "clKeyboardManager.h" #include "clSTCLineKeeper.h" #include "clWorkspaceManager.h" #include "codeformatterdlg.h" @@ -42,14 +44,14 @@ #include "precompiled_header.h" #include "procutils.h" #include "workspace.h" -#include "wx/ffile.h" -#include "wx/log.h" -#include "wx/menu.h" + #include #include #include //wxInitialize/wxUnInitialize #include #include +#include +#include #include #include #include @@ -76,7 +78,7 @@ extern "C" char* STDCALL AStyleMain(const char* pSourceIn, const char* pOptions, void STDCALL ASErrorHandler(int errorNumber, const char* errorMessage) { wxString errStr; - errStr << _U(errorMessage) << wxT(" (error ") << errorNumber << wxT(")"); + errStr << _U(errorMessage) << " (error " << errorNumber << ")"; CL_DEBUG(errStr.c_str()); } @@ -103,10 +105,10 @@ CL_PLUGIN_API IPlugin* CreatePlugin(IManager* manager) CL_PLUGIN_API PluginInfo* GetPluginInfo() { static PluginInfo info; - info.SetAuthor(wxT("Eran Ifrah")); - info.SetName(wxT("Source Code Formatter")); + info.SetAuthor("Eran Ifrah"); + info.SetName("Source Code Formatter"); info.SetDescription(_("Source Code Formatter (Supports C/C++/Obj-C/JavaScript/PHP files)")); - info.SetVersion(wxT("v2.0")); + info.SetVersion("v2.0"); return &info; } @@ -127,6 +129,10 @@ CodeFormatter::CodeFormatter(IManager* manager) EventNotifier::Get()->Bind(wxEVT_PHP_SETTINGS_CHANGED, &CodeFormatter::OnPhpSettingsChanged, this); EventNotifier::Get()->Bind(wxEVT_CONTEXT_MENU_FOLDER, &CodeFormatter::OnContextMenu, this); + clKeyboardManager::Get()->AddAccelerator( + _("Source Code Formatter"), + { { "format_source", _("Format Current Source"), "Ctrl-I" }, { "formatter_options", _("Options...") } }); + m_optionsPhp.Load(); if(!m_mgr->GetConfigTool()->ReadObject("FormatterOptions", &m_options)) { m_options.AutodetectSettings(); @@ -178,8 +184,9 @@ void CodeFormatter::OnFormat(wxCommandEvent& e) } // get the editor that requires formatting - if(!editor) + if(!editor) { return; + } int selStart = wxNOT_FOUND, selEnd = wxNOT_FOUND; if(editor->GetSelectionStart() != wxNOT_FOUND && editor->GetSelectionStart() < editor->GetSelectionEnd()) { @@ -568,7 +575,7 @@ void CodeFormatter::DoFormatWithAstyle(wxString& content, const bool& appendEOL) bool useTabs = m_mgr->GetEditorSettings()->GetIndentUsesTabs(); int tabWidth = m_mgr->GetEditorSettings()->GetTabWidth(); int indentWidth = m_mgr->GetEditorSettings()->GetIndentWidth(); - options << (useTabs && tabWidth == indentWidth ? wxT(" -t") : wxT(" -s")) << indentWidth; + options << (useTabs && tabWidth == indentWidth ? " -t" : " -s") << indentWidth; char* textOut = AStyleMain(_C(content), _C(options), ASErrorHandler, ASMemoryAlloc); content.clear(); @@ -663,8 +670,8 @@ void CodeFormatter::OnFormatOptions(wxCommandEvent& e) wxUnusedVar(e); wxString cppSampleFile, phpSampleFile, cppSample, phpSample; - cppSampleFile << m_mgr->GetStartupDirectory() << wxT("/astyle.sample"); - phpSampleFile << m_mgr->GetStartupDirectory() << wxT("/php.sample"); + cppSampleFile << m_mgr->GetStartupDirectory() << "/astyle.sample"; + phpSampleFile << m_mgr->GetStartupDirectory() << "/php.sample"; ReadFileWithConversion(cppSampleFile, cppSample); ReadFileWithConversion(phpSampleFile, phpSample); @@ -739,11 +746,11 @@ void CodeFormatter::OnFormatString(clSourceFormatEvent& e) int CodeFormatter::DoGetGlobalEOL() const { OptionsConfigPtr options = m_mgr->GetEditorSettings(); - if(options->GetEolMode() == wxT("Unix (LF)")) { + if(options->GetEolMode() == "Unix (LF)") { return 2; - } else if(options->GetEolMode() == wxT("Mac (CR)")) { + } else if(options->GetEolMode() == "Mac (CR)") { return 1; - } else if(options->GetEolMode() == wxT("Windows (CRLF)")) { + } else if(options->GetEolMode() == "Windows (CRLF)") { return 0; } else { // set the EOL by the hosting OS @@ -760,12 +767,12 @@ wxString CodeFormatter::DoGetGlobalEOLString() const { switch(DoGetGlobalEOL()) { case 0: - return wxT("\r\n"); + return "\r\n"; case 1: - return wxT("\r"); + return "\r"; case 2: default: - return wxT("\n"); + return "\n"; } } diff --git a/CodeLiteDiff/codelitediff.cpp b/CodeLiteDiff/codelitediff.cpp index 70976c4430..815d40c85a 100644 --- a/CodeLiteDiff/codelitediff.cpp +++ b/CodeLiteDiff/codelitediff.cpp @@ -23,35 +23,39 @@ ////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////// +#include "codelitediff.h" + +#include "DiffFoldersFrame.h" #include "DiffSideBySidePanel.h" #include "NewFileComparison.h" #include "clDiffFrame.h" #include "clKeyboardManager.h" -#include "codelitediff.h" #include "event_notifier.h" #include "file_logger.h" #include "macros.h" -#include "wx/menu.h" + #include +#include #include -#include "DiffFoldersFrame.h" static CodeLiteDiff* thePlugin = NULL; // Define the plugin entry point CL_PLUGIN_API IPlugin* CreatePlugin(IManager* manager) { - if(thePlugin == 0) { thePlugin = new CodeLiteDiff(manager); } + if(thePlugin == 0) { + thePlugin = new CodeLiteDiff(manager); + } return thePlugin; } CL_PLUGIN_API PluginInfo* GetPluginInfo() { static PluginInfo info; - info.SetAuthor(wxT("Eran Ifrah")); - info.SetName(wxT("Diff Plugin")); + info.SetAuthor("Eran Ifrah"); + info.SetName("Diff Plugin"); info.SetDescription(_("CodeLite Diff Plugin")); - info.SetVersion(wxT("v1.0")); + info.SetVersion("v1.0"); return &info; } @@ -61,16 +65,16 @@ CodeLiteDiff::CodeLiteDiff(IManager* manager) : IPlugin(manager) { m_longName = _("CodeLite Diff Plugin"); - m_shortName = wxT("Diff Plugin"); + m_shortName = "Diff Plugin"; Bind(wxEVT_MENU, &CodeLiteDiff::OnDiff, this, XRCID("diff_compare_with")); EventNotifier::Get()->Bind(wxEVT_CONTEXT_MENU_TAB_LABEL, &CodeLiteDiff::OnTabContextMenu, this); - clKeyboardManager::Get()->AddGlobalAccelerator("diff_new_comparison", "Ctrl-Shift-C", - "Plugins::Diff Tool::New File Comparison"); - clKeyboardManager::Get()->AddGlobalAccelerator("diff_new_folder", "Ctrl-Alt-F", - "Plugins::Diff Tool::New Folder Comparison"); wxTheApp->Bind(wxEVT_MENU, &CodeLiteDiff::OnNewDiff, this, XRCID("diff_new_comparison")); wxTheApp->Bind(wxEVT_MENU, &CodeLiteDiff::OnNewDiffFolder, this, XRCID("diff_new_folder")); + + clKeyboardManager::Get()->AddAccelerator(_("Diff Tool"), + { { "diff_new_comparison", _("New File Comparison"), "Ctrl-Shift-C" }, + { "diff_new_folder", _("New Folder Comparison"), "Ctrl-Alt-F" } }); } CodeLiteDiff::~CodeLiteDiff() {} @@ -180,7 +184,9 @@ wxFileName CodeLiteDiff::SaveEditorToTmpfile(IEditor* editor) const tpath << wxFileName::GetPathSeparator() << "CLdiff" << wxFileName::GetPathSeparator(); wxFileName::Mkdir(tpath, wxS_DIR_DEFAULT, wxPATH_MKDIR_FULL); wxFileName tmpFile(wxFileName::CreateTempFileName(tpath + editor->GetFileName().GetName())); - if(!tmpFile.IsOk()) { return wxFileName(); } + if(!tmpFile.IsOk()) { + return wxFileName(); + } tmpFile.SetExt(editor->GetFileName().GetExt()); wxFFile fp(tmpFile.GetFullPath(), "w+b"); diff --git a/Copyright/copyright.cpp b/Copyright/copyright.cpp index 9d3997e24a..be3831ccce 100644 --- a/Copyright/copyright.cpp +++ b/Copyright/copyright.cpp @@ -23,14 +23,20 @@ ////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////// #include "copyright.h" + +#include "clKeyboardManager.h" #include "copyrights_options_dlg.h" #include "copyrights_proj_sel_dlg.h" +#include "copyrightsconfigdata.h" #include "cpptoken.h" #include "cppwordscanner.h" +#include "event_notifier.h" +#include "file_logger.h" #include "globals.h" #include "progress_dialog.h" #include "project.h" #include "workspace.h" + #include #include #include @@ -42,11 +48,6 @@ #include #include -#include "copyrightsconfigdata.h" -#include "event_notifier.h" -#include "file_logger.h" -#include "globals.h" - static Copyright* thePlugin = NULL; // Internal events used by this plugin @@ -57,18 +58,20 @@ const wxEventType CR_insert_prj_copyrights = wxNewEventType(); // Define the plugin entry point CL_PLUGIN_API IPlugin* CreatePlugin(IManager* manager) { - if(thePlugin == 0) { thePlugin = new Copyright(manager); } + if(thePlugin == 0) { + thePlugin = new Copyright(manager); + } return thePlugin; } CL_PLUGIN_API PluginInfo* GetPluginInfo() { static PluginInfo info; - info.SetAuthor(wxT("Eran Ifrah")); - info.SetName(wxT("Copyright")); + info.SetAuthor("Eran Ifrah"); + info.SetName("Copyright"); info.SetDescription( _("Copyright Plugin - a small plugin that allows you to place copyright block on top of your source files")); - info.SetVersion(wxT("v1.0")); + info.SetVersion("v1.0"); return &info; } @@ -80,7 +83,7 @@ Copyright::Copyright(IManager* manager) , m_workspaceSepItem(NULL) { m_longName = _("Copyright Plugin - Place copyright block on top of your source files"); - m_shortName = wxT("Copyright"); + m_shortName = "Copyright"; // connect events wxTheApp->Bind(wxEVT_MENU, &Copyright::OnOptions, this, XRCID("CR_copyrights_options")); @@ -88,6 +91,11 @@ Copyright::Copyright(IManager* manager) wxTheApp->Bind(wxEVT_MENU, &Copyright::OnBatchInsertCopyrights, this, XRCID("CR_batch_insert_copyrights")); wxTheApp->Bind(wxEVT_MENU, &Copyright::OnProjectInsertCopyrights, this, XRCID("CR_insert_prj_copyrights")); EventNotifier::Get()->Bind(wxEVT_CONTEXT_MENU_EDITOR, &Copyright::OnEditorContextMenu, this); + + clKeyboardManager::Get()->AddAccelerator(_("Copyright"), + { { "copyrights_options", _("Insert Copyright Block") }, + { "insert_copyrights", _("Batch Insert of Copyright Block") }, + { "batch_insert_copyrights", _("Settings...") } }); } Copyright::~Copyright() {} @@ -129,7 +137,7 @@ void Copyright::OnInsertCopyrights(wxCommandEvent& e) // read configuration CopyrightsConfigData data; - m_mgr->GetConfigTool()->ReadObject(wxT("CopyrightsConfig"), &data); + m_mgr->GetConfigTool()->ReadObject("CopyrightsConfig", &data); // make sure that the template file exists if(!wxFileName::FileExists(data.GetTemplateFilename())) { @@ -198,14 +206,18 @@ void Copyright::OnBatchInsertCopyrights(wxCommandEvent& e) return; } - if(!m_mgr->SaveAll()) return; + if(!m_mgr->SaveAll()) { + return; + } // read configuration CopyrightsConfigData data; - m_mgr->GetConfigTool()->ReadObject(wxT("CopyrightsConfig"), &data); + m_mgr->GetConfigTool()->ReadObject("CopyrightsConfig", &data); wxString content; - if(!Validate(content)) { return; } + if(!Validate(content)) { + return; + } CopyrightsProjectSelDlg dlg(m_mgr->GetTheApp()->GetTopWindow(), m_mgr->GetWorkspace()); if(dlg.ShowModal() == wxID_OK) { @@ -218,14 +230,16 @@ void Copyright::OnBatchInsertCopyrights(wxCommandEvent& e) // loop over the project and collect list of files to work with for(size_t i = 0; i < projects.size(); i++) { ProjectPtr p = m_mgr->GetWorkspace()->GetProject(projects.Item(i)); - if(p) { p->GetFilesAsVectorOfFileName(files); } + if(p) { + p->GetFilesAsVectorOfFileName(files); + } } wxString mask(data.GetFileMasking()); - mask.Replace(wxT("*."), wxEmptyString); + mask.Replace("*.", wxEmptyString); mask = mask.Trim().Trim(false); - wxArrayString exts = ::wxStringTokenize(mask, wxT(";")); + wxArrayString exts = ::wxStringTokenize(mask, ";"); // filter out non-matching files (according to masking) for(size_t i = 0; i < files.size(); i++) { @@ -235,7 +249,9 @@ void Copyright::OnBatchInsertCopyrights(wxCommandEvent& e) } } - if(filtered_files.empty() == false) { MassUpdate(filtered_files, content); } + if(filtered_files.empty() == false) { + MassUpdate(filtered_files, content); + } } } @@ -247,14 +263,18 @@ void Copyright::OnProjectInsertCopyrights(wxCommandEvent& e) return; } - if(!m_mgr->SaveAll()) return; + if(!m_mgr->SaveAll()) { + return; + } // read configuration CopyrightsConfigData data; - m_mgr->GetConfigTool()->ReadObject(wxT("CopyrightsConfig"), &data); + m_mgr->GetConfigTool()->ReadObject("CopyrightsConfig", &data); wxString content; - if(!Validate(content)) { return; } + if(!Validate(content)) { + return; + } // get the project to work on TreeItemInfo info = m_mgr->GetSelectedTreeItemInfo(TreeFileView); @@ -265,16 +285,18 @@ void Copyright::OnProjectInsertCopyrights(wxCommandEvent& e) std::vector filtered_files; // loop over the project and collect list of files to work with ProjectPtr p = m_mgr->GetWorkspace()->GetProject(project_name); - if(!p) { return; } + if(!p) { + return; + } p->GetFilesAsVectorOfFileName(files); // filter non matched files wxString mask(data.GetFileMasking()); - mask.Replace(wxT("*."), wxEmptyString); + mask.Replace("*.", wxEmptyString); mask = mask.Trim().Trim(false); - wxArrayString exts = wxStringTokenize(mask, wxT(";")); + wxArrayString exts = wxStringTokenize(mask, ";"); // filter out non-matching files (according to masking) for(size_t i = 0; i < files.size(); i++) { @@ -285,7 +307,9 @@ void Copyright::OnProjectInsertCopyrights(wxCommandEvent& e) } // update files - if(filtered_files.empty() == false) { MassUpdate(filtered_files, content); } + if(filtered_files.empty() == false) { + MassUpdate(filtered_files, content); + } } void Copyright::MassUpdate(const std::vector& filtered_files, const wxString& content) @@ -298,10 +322,10 @@ void Copyright::MassUpdate(const std::vector& filtered_files, const } clProgressDlg* prgDlg = NULL; - prgDlg = new clProgressDlg(NULL, _("Processing file ..."), wxT(""), (int)filtered_files.size()); + prgDlg = new clProgressDlg(NULL, _("Processing file ..."), "", (int)filtered_files.size()); CopyrightsConfigData data; - m_mgr->GetConfigTool()->ReadObject(wxT("CopyrightsConfig"), &data); + m_mgr->GetConfigTool()->ReadObject("CopyrightsConfig", &data); // now loop over the files and add copyrights block for(size_t i = 0; i < filtered_files.size(); i++) { @@ -343,7 +367,7 @@ void Copyright::MassUpdate(const std::vector& filtered_files, const bool Copyright::Validate(wxString& content) { CopyrightsConfigData data; - m_mgr->GetConfigTool()->ReadObject(wxT("CopyrightsConfig"), &data); + m_mgr->GetConfigTool()->ReadObject("CopyrightsConfig", &data); // make sure that the template file exists if(!wxFileName::FileExists(data.GetTemplateFilename())) { @@ -372,7 +396,7 @@ bool Copyright::Validate(wxString& content) return false; } } - content.Replace(wxT("`"), wxT("'")); + content.Replace("`", "'"); return true; } diff --git a/DatabaseExplorer/databaseexplorer.cpp b/DatabaseExplorer/databaseexplorer.cpp index e70c80608c..ba860b3ab2 100644 --- a/DatabaseExplorer/databaseexplorer.cpp +++ b/DatabaseExplorer/databaseexplorer.cpp @@ -23,17 +23,19 @@ ////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////// +#include "databaseexplorer.h" + #include "ErdPanel.h" #include "SqlCommandPanel.h" #include "clKeyboardManager.h" -#include "databaseexplorer.h" #include "detachedpanesinfo.h" #include "dockablepane.h" #include "event_notifier.h" #include "globals.h" #include "imanager.h" -#include "wx/wxsf/AutoLayout.h" + #include +#include #include //#ifdef DBL_USE_MYSQL @@ -93,8 +95,8 @@ CL_PLUGIN_API IPlugin* CreatePlugin(IManager* manager) CL_PLUGIN_API PluginInfo* GetPluginInfo() { static PluginInfo info; - info.SetAuthor(wxT("Peter Janků, Michal Bližňák, Tomas Bata University in Zlin, Czech Republic (www.fai.utb.cz)")); - info.SetName(_("DatabaseExplorer")); + info.SetAuthor("Peter Janků, Michal Bližňák, Tomas Bata University in Zlin, Czech Republic (www.fai.utb.cz)"); + info.SetName("DatabaseExplorer"); info.SetDescription(_("DatabaseExplorer for CodeLite")); info.SetVersion(DBE_VERSION); return &info; @@ -131,19 +133,20 @@ DatabaseExplorer::DatabaseExplorer(IManager* manager) wxSFAutoLayout layout; wxSFLayoutHorizontalTree* pHTreeAlg = - wxDynamicCast(layout.GetAlgorithm(wxT("Horizontal Tree")), wxSFLayoutHorizontalTree); - if(pHTreeAlg) + wxDynamicCast(layout.GetAlgorithm("Horizontal Tree"), wxSFLayoutHorizontalTree); + if(pHTreeAlg) { pHTreeAlg->SetHSpace(200); + } - wxSFLayoutVerticalTree* pVTreeAlg = - wxDynamicCast(layout.GetAlgorithm(wxT("Vertical Tree")), wxSFLayoutVerticalTree); - if(pVTreeAlg) + wxSFLayoutVerticalTree* pVTreeAlg = wxDynamicCast(layout.GetAlgorithm("Vertical Tree"), wxSFLayoutVerticalTree); + if(pVTreeAlg) { pVTreeAlg->SetVSpace(75); + } m_longName = _("DatabaseExplorer for CodeLite"); - m_shortName = wxT("DatabaseExplorer"); + m_shortName = "DatabaseExplorer"; - clKeyboardManager::Get()->AddGlobalAccelerator("wxEVT_EXECUTE_SQL", "Ctrl-J", _("Execute SQL")); + clKeyboardManager::Get()->AddAccelerator("wxEVT_EXECUTE_SQL", _("Database Explorer"), _("Execute SQL"), "Ctrl-J"); wxTheApp->Bind(wxEVT_MENU, &DatabaseExplorer::OnExecuteSQL, this, XRCID("wxEVT_EXECUTE_SQL")); } @@ -198,7 +201,7 @@ bool DatabaseExplorer::IsDbViewDetached() wxASSERT(configTool); DetachedPanesInfo dpi; - configTool->ReadObject(wxT("DetachedPanesList"), &dpi); + configTool->ReadObject("DetachedPanesList", &dpi); const wxArrayString& detachedPanes = dpi.GetPanes(); return detachedPanes.Index(_("DbExplorer")) != wxNOT_FOUND; @@ -208,7 +211,7 @@ void DatabaseExplorer::OnAbout(wxCommandEvent& e) { wxString version = wxString::Format(DBE_VERSION); wxString desc = _("Cross platform database explorer\n\n"); - desc << wxbuildinfo(long_f) << wxT("\n\n"); + desc << wxbuildinfo(long_f) << "\n\n"; wxAboutDialogInfo info; info.SetName(_("DatabaseExplorer")); @@ -216,8 +219,8 @@ void DatabaseExplorer::OnAbout(wxCommandEvent& e) info.SetDescription(desc); info.SetCopyright(_("2011 - 2015 (C) Tomas Bata University, Zlin, Czech Republic")); info.SetWebSite(_("http://www.fai.utb.cz")); - info.AddDeveloper(wxT("Peter Janků")); - info.AddDeveloper(wxT("Michal Bližňák")); + info.AddDeveloper("Peter Janků"); + info.AddDeveloper("Michal Bližňák"); wxAboutBox(info); } diff --git a/ExternalTools/externaltools.cpp b/ExternalTools/externaltools.cpp index 449f1ce8d6..ecd377b3cb 100644 --- a/ExternalTools/externaltools.cpp +++ b/ExternalTools/externaltools.cpp @@ -22,6 +22,8 @@ // ////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////// +#include "externaltools.h" + #include "ExternalToolsManager.h" #include "ExternalToolsProcessManager.h" #include "async_executable_cmd.h" @@ -33,13 +35,13 @@ #include "environmentconfig.h" #include "event_notifier.h" #include "externaltooldlg.h" -#include "externaltools.h" #include "file_logger.h" #include "globals.h" #include "macromanager.h" #include "plugin_version.h" #include "processreaderthread.h" #include "workspace.h" + #include #include #include @@ -52,10 +54,7 @@ static ExternalToolsPlugin* thePlugin = NULL; struct DecSort { - bool operator()(const ToolInfo& t1, const ToolInfo& t2) - { - return t1.GetName().CmpNoCase(t2.GetName()) < 0; - } + bool operator()(const ToolInfo& t1, const ToolInfo& t2) { return t1.GetName().CmpNoCase(t2.GetName()) < 0; } }; // Define the plugin entry point @@ -70,17 +69,14 @@ CL_PLUGIN_API IPlugin* CreatePlugin(IManager* manager) CL_PLUGIN_API PluginInfo* GetPluginInfo() { static PluginInfo info; - info.SetAuthor(wxT("Eran Ifrah")); - info.SetName(wxT("ExternalTools")); + info.SetAuthor("Eran Ifrah"); + info.SetName("ExternalTools"); info.SetDescription(_("A plugin that allows user to launch external tools from within CodeLite")); - info.SetVersion(wxT("v1.0")); + info.SetVersion("v1.0"); return &info; } -CL_PLUGIN_API int GetPluginInterfaceVersion() -{ - return PLUGIN_INTERFACE_VERSION; -} +CL_PLUGIN_API int GetPluginInterfaceVersion() { return PLUGIN_INTERFACE_VERSION; } ExternalToolsPlugin::ExternalToolsPlugin(IManager* manager) : IPlugin(manager) @@ -89,35 +85,36 @@ ExternalToolsPlugin::ExternalToolsPlugin(IManager* manager) { ToolsTaskManager::Instance(); // Ensure that we allocate the process manager m_longName = _("A plugin that allows user to launch external tools from within CodeLite"); - m_shortName = wxT("ExternalTools"); + m_shortName = "ExternalTools"; topWin = m_mgr->GetTheApp(); topWin->Bind(wxEVT_MENU, &ExternalToolsPlugin::OnSettings, this, XRCID("external_tools_settings")); topWin->Bind(wxEVT_MENU, &ExternalToolsPlugin::OnShowRunningTools, this, XRCID("external_tools_monitor")); for(int i = 0; i < MAX_TOOLS; i++) { - wxString winid = wxString::Format(wxT("external_tool_%d"), i); + wxString winid = wxString::Format("external_tool_%d", i); topWin->Connect(wxXmlResource::GetXRCID(winid.c_str()), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler(ExternalToolsPlugin::OnLaunchExternalTool), NULL, this); } // Register keyboard shortcuts for(int i = 0; i < MAX_TOOLS; i++) { - clKeyboardManager::Get()->AddGlobalAccelerator( - wxString::Format("external_tool_%d", i), wxString::Format("Ctrl-Shift-%d", i), - wxString::Format("Plugins::External Tools::External Tool %d", i)); + clKeyboardShortcut accel; + if(i <= 9) { + accel.FromString(wxString::Format("Ctrl-Shift-%d", i)); + } + clKeyboardManager::Get()->AddAccelerator(wxString::Format("external_tool_%d", i), _("External Tools"), + wxString::Format(_("External Tool %d"), i), accel); } // Bind the "OnFileSave" event EventNotifier::Get()->Bind(wxEVT_FILE_SAVED, &ExternalToolsPlugin::OnFileSave, this); // Load the tools from the configuraton file - m_mgr->GetConfigTool()->ReadObject(wxT("ExternalTools"), &m_externalTools); + m_mgr->GetConfigTool()->ReadObject("ExternalTools", &m_externalTools); } -ExternalToolsPlugin::~ExternalToolsPlugin() -{ -} +ExternalToolsPlugin::~ExternalToolsPlugin() {} void ExternalToolsPlugin::CreateToolBar(clToolBar* toolbar) { @@ -148,7 +145,7 @@ void ExternalToolsPlugin::UnPlug() topWin->Unbind(wxEVT_MENU, &ExternalToolsPlugin::OnShowRunningTools, this, XRCID("external_tools_monitor")); for(int i = 0; i < MAX_TOOLS; ++i) { - wxString winid = wxString::Format(wxT("external_tool_%d"), i); + wxString winid = wxString::Format("external_tool_%d", i); topWin->Disconnect(wxXmlResource::GetXRCID(winid.c_str()), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler(ExternalToolsPlugin::OnLaunchExternalTool), NULL, this); } @@ -166,7 +163,7 @@ void ExternalToolsPlugin::OnSettings(wxCommandEvent& e) m_externalTools.SetTools(dlg.GetTools()); // and the file system as well - m_mgr->GetConfigTool()->WriteObject(wxT("ExternalTools"), &m_externalTools); + m_mgr->GetConfigTool()->WriteObject("ExternalTools", &m_externalTools); CallAfter(&ExternalToolsPlugin::OnRecreateTB); } } diff --git a/InnoSetup/codelite64_mingw.iss b/InnoSetup/codelite64_mingw.iss index 8f7248cff7..9d3b44ac1e 100644 --- a/InnoSetup/codelite64_mingw.iss +++ b/InnoSetup/codelite64_mingw.iss @@ -81,7 +81,6 @@ Source: "{#CODELITE_ROOT}\Runtime\config\codelite.xml.default"; DestDir: "{app}\ Source: "{#CODELITE_ROOT}\Runtime\codelite-remote"; DestDir: "{app}"; Source: "{#CODELITE_ROOT}\Runtime\rust-gdb.bat"; DestDir: "{app}"; Source: "{#CODELITE_ROOT}\Runtime\config\plugins.xml.default"; DestDir: "{app}\config"; -Source: "{#CODELITE_ROOT}\Runtime\config\accelerators.conf.default"; DestDir: "{app}\config"; Source: "{#CODELITE_ROOT}\Runtime\config\debuggers.xml.default"; DestDir: "{app}\config"; Source: "{#CODELITE_ROOT}\Runtime\config\build_settings.xml.default.win"; DestDir: "{app}\config"; DestName: "build_settings.xml.default"; Source: "{#CODELITE_ROOT}\Runtime\rc\*"; DestDir: "{app}\rc"; Flags: ignoreversion ; diff --git a/InnoSetup/codelite64_php_mingw.iss b/InnoSetup/codelite64_php_mingw.iss index c03d6db048..db1f89d9a7 100644 --- a/InnoSetup/codelite64_php_mingw.iss +++ b/InnoSetup/codelite64_php_mingw.iss @@ -70,7 +70,6 @@ Source: "{#CODELITE_ROOT}\InnoSetup\license.txt"; DestDir: "{app}"; Flags: ignor Source: "{#CODELITE_ROOT}\Runtime\wx-config.exe"; DestDir: "{app}"; Source: "{#CODELITE_ROOT}\Runtime\config\codelite.xml.default"; DestDir: "{app}\config"; Source: "{#CODELITE_ROOT}\Runtime\config\plugins.xml.default"; DestDir: "{app}\config"; -Source: "{#CODELITE_ROOT}\Runtime\config\accelerators.conf.default"; DestDir: "{app}\config"; Source: "{#CODELITE_ROOT}\Runtime\config\debuggers.xml.default"; DestDir: "{app}\config"; Source: "{#CODELITE_ROOT}\Runtime\config\build_settings.xml.default.win"; DestDir: "{app}\config"; DestName: "build_settings.xml.default"; Source: "{#CODELITE_ROOT}\Runtime\rc\*"; DestDir: "{app}\rc"; Flags: ignoreversion ; diff --git a/InnoSetup/codelite_mingw.iss b/InnoSetup/codelite_mingw.iss index eefdd09459..d8c6836ee5 100644 --- a/InnoSetup/codelite_mingw.iss +++ b/InnoSetup/codelite_mingw.iss @@ -81,7 +81,6 @@ Source: "{#CODELITE_ROOT}\LICENSE"; DestDir: "{app}"; Flags: ignoreversion; Source: "{#CODELITE_ROOT}\Runtime\codelite-remote"; DestDir: "{app}"; Source: "{#CODELITE_ROOT}\Runtime\config\codelite.xml.default"; DestDir: "{app}\config"; Source: "{#CODELITE_ROOT}\Runtime\config\plugins.xml.default"; DestDir: "{app}\config"; -Source: "{#CODELITE_ROOT}\Runtime\config\accelerators.conf.default"; DestDir: "{app}\config"; Source: "{#CODELITE_ROOT}\Runtime\config\debuggers.xml.default"; DestDir: "{app}\config"; Source: "{#CODELITE_ROOT}\Runtime\config\build_settings.xml.default.win"; DestDir: "{app}\config"; DestName: "build_settings.xml.default"; Source: "{#CODELITE_ROOT}\Runtime\rc\*"; DestDir: "{app}\rc"; Flags: ignoreversion ; diff --git a/InnoSetup/codelite_php.iss b/InnoSetup/codelite_php.iss index 2728925ade..a659e67ea4 100644 --- a/InnoSetup/codelite_php.iss +++ b/InnoSetup/codelite_php.iss @@ -44,7 +44,6 @@ Source: "..\InnoSetup\license.txt"; DestDir: "{app}"; Flags: ignoreversion ; Com Source: "..\sdk\wxconfig\wx-config.exe"; DestDir: "{app}"; Components: Editor Source: "..\Runtime\config\codelite.xml.default"; DestDir: "{app}\config"; Components: Editor; Source: "..\Runtime\config\plugins.xml.default"; DestDir: "{app}\config"; Components: Editor; -Source: "..\Runtime\config\accelerators.conf.default"; DestDir: "{app}\config"; Components: Editor; Source: "..\Runtime\config\debuggers.xml.default"; DestDir: "{app}\config"; Components: Editor; Source: "..\Runtime\config\build_settings.xml.default.win"; DestDir: "{app}\config"; DestName: "build_settings.xml.default"; Components: Editor Source: "..\Runtime\rc\*"; DestDir: "{app}\rc"; Flags: ignoreversion ; Components: Editor diff --git a/LiteEditor/CMakeLists.txt b/LiteEditor/CMakeLists.txt index aab88d73ef..bce001cafa 100644 --- a/LiteEditor/CMakeLists.txt +++ b/LiteEditor/CMakeLists.txt @@ -113,8 +113,6 @@ if(NOT APPLE) endif() ## Copy default configuration files - install(FILES ${CL_SRC_ROOT}/Runtime/config/accelerators.conf.default DESTINATION - ${CL_PREFIX}/share/codelite/config) install(FILES ${CL_SRC_ROOT}/Runtime/config/build_settings.xml.default DESTINATION ${CL_PREFIX}/share/codelite/config) install(FILES ${CL_SRC_ROOT}/Runtime/config/debuggers.xml.gtk DESTINATION diff --git a/LiteEditor/CodeLiteIDE.project b/LiteEditor/CodeLiteIDE.project index 0fc854fe32..3455884f26 100644 --- a/LiteEditor/CodeLiteIDE.project +++ b/LiteEditor/CodeLiteIDE.project @@ -560,7 +560,6 @@ - diff --git a/LiteEditor/acceltabledlg.cpp b/LiteEditor/acceltabledlg.cpp index 2b7f5dd903..11fc788293 100644 --- a/LiteEditor/acceltabledlg.cpp +++ b/LiteEditor/acceltabledlg.cpp @@ -23,12 +23,14 @@ ////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////// #include "acceltabledlg.h" + #include "fileutils.h" #include "globals.h" #include "manager.h" #include "newkeyshortcutdlg.h" #include "pluginmanager.h" #include "windowattrmanager.h" + #include #include #include @@ -67,8 +69,9 @@ void AccelTableDlg::PopulateTable(const wxString& filter) filteredMap = m_accelMap; } else { for(MenuItemDataMap_t::iterator iter = m_accelMap.begin(); iter != m_accelMap.end(); ++iter) { - if(!IsMatchesFilter(filter, iter->second)) + if(!IsMatchesFilter(filter, iter->second)) { continue; + } filteredMap.insert(std::make_pair(iter->first, iter->second)); } } @@ -78,19 +81,13 @@ void AccelTableDlg::PopulateTable(const wxString& filter) } // Add core entries - std::vector> V; + std::vector> V; for(MenuItemDataMap_t::const_iterator iter = filteredMap.begin(); iter != filteredMap.end(); ++iter) { const MenuItemData& mid = iter->second; - wxString desc; - wxArrayString parts = wxStringTokenize(mid.parentMenu, ":", wxTOKEN_STRTOK); - - if(parts.empty()) { - desc << "Global Accelerator | "; - } else { - for(const wxString& word : parts) { - desc << word << " | "; - } + wxString desc = mid.parentMenu; + if(!desc.IsEmpty()) { + desc << " | "; } desc << mid.action; V.push_back(std::make_tuple(desc, mid.accel, new AccelItemData(mid))); @@ -98,16 +95,16 @@ void AccelTableDlg::PopulateTable(const wxString& filter) // Sort the items in the list, based on the description std::sort(V.begin(), V.end()); - std::for_each(V.begin(), V.end(), [&](const std::tuple& entry) { + for(const std::tuple& entry : V) { const wxString& desc = std::get<0>(entry); - const wxString& shortcut = std::get<1>(entry); + const clKeyboardShortcut& shortcut = std::get<1>(entry); AccelItemData* itemData = std::get<2>(entry); wxVector cols; - cols.push_back(shortcut); + cols.push_back(shortcut.ToString()); cols.push_back(desc); m_dvListCtrl->AppendItem(cols, (wxUIntPtr)itemData); - }); + } } void AccelTableDlg::OnButtonOk(wxCommandEvent& e) @@ -140,8 +137,9 @@ void AccelTableDlg::DoItemActivated() CHECK_ITEM_RET(sel); AccelItemData* itemData = DoGetItemData(sel); - if(!itemData) + if(!itemData) { return; + } // build the selected entry MenuItemData mid = itemData->m_menuItemData; @@ -153,7 +151,7 @@ void AccelTableDlg::DoItemActivated() return; } if(wxMessageBox(wxString::Format(_("'%s' is already assigned to: '%s'\nWould you like to replace it?"), - mid.accel, who.action), + mid.accel.ToString(), who.action), _("CodeLite"), wxYES_NO | wxCENTER | wxICON_QUESTION, this) != wxYES) { return; } @@ -165,7 +163,7 @@ void AccelTableDlg::DoItemActivated() if(cd) { cd->m_menuItemData.accel.Clear(); int row = m_dvListCtrl->ItemToRow(oldItem); - m_dvListCtrl->SetValue(wxString(), row, 2); + m_dvListCtrl->SetValue(wxString(), row, 0); } } @@ -180,9 +178,10 @@ void AccelTableDlg::DoItemActivated() // Update the UI int row = m_dvListCtrl->ItemToRow(sel); - if(row == wxNOT_FOUND) + if(row == wxNOT_FOUND) { return; - m_dvListCtrl->SetValue(mid.accel, row, 0); + } + m_dvListCtrl->SetValue(mid.accel.ToString(), row, 0); // and update the map MenuItemDataMap_t::iterator iter = m_accelMap.find(itemData->m_menuItemData.resourceID); @@ -212,20 +211,22 @@ bool AccelTableDlg::IsMatchesFilter(const wxString& filter, const MenuItemData& { wxString lcFilter = filter.Lower(); lcFilter.Trim().Trim(false); - if(lcFilter.IsEmpty()) + if(lcFilter.IsEmpty()) { return true; + } wxString parentMenu = item.parentMenu; wxString haystack; - haystack << parentMenu << " " << item.accel << " " << item.action; + haystack << parentMenu << " " << item.accel.ToString() << " " << item.action; return FileUtils::FuzzyMatch(filter, haystack); } -bool AccelTableDlg::HasAccelerator(const wxString& accel, MenuItemData& who) +bool AccelTableDlg::HasAccelerator(const clKeyboardShortcut& accel, MenuItemData& who) { - if(accel.IsEmpty()) + if(!accel.IsOk()) { return false; + } for(MenuItemDataMap_t::iterator iter = m_accelMap.begin(); iter != m_accelMap.end(); ++iter) { if(iter->second.accel == accel) { who = iter->second; @@ -244,12 +245,14 @@ wxDataViewItem AccelTableDlg::FindAccel(const MenuItemData& mid) { for(size_t i = 0; i < m_dvListCtrl->GetItemCount(); ++i) { wxDataViewItem item = m_dvListCtrl->RowToItem(i); - if(!item.IsOk()) + if(!item.IsOk()) { continue; + } AccelItemData* cd = DoGetItemData(item); - if(cd && cd->m_menuItemData.accel == mid.accel) + if(cd && cd->m_menuItemData.accel == mid.accel) { return item; + } } return wxDataViewItem(); } diff --git a/LiteEditor/acceltabledlg.h b/LiteEditor/acceltabledlg.h index 36e21bb616..2ffe3212c6 100644 --- a/LiteEditor/acceltabledlg.h +++ b/LiteEditor/acceltabledlg.h @@ -26,9 +26,10 @@ #define __acceltabledlg__ #include "AccelTableBaseDlg.h" +#include "clKeyboardManager.h" + #include #include -#include "clKeyboardManager.h" struct AccelItemData : public wxClientData { MenuItemData m_menuItemData; @@ -55,7 +56,7 @@ class AccelTableDlg : public AccelTableBaseDlg void DoItemActivated(); bool IsMatchesFilter(const wxString& filter, const MenuItemData& item); - bool HasAccelerator(const wxString& accel, MenuItemData& who); + bool HasAccelerator(const clKeyboardShortcut& accel, MenuItemData& who); AccelItemData* DoGetItemData(const wxDataViewItem& item); wxDataViewItem FindAccel(const MenuItemData& mid); diff --git a/LiteEditor/frame.cpp b/LiteEditor/frame.cpp index f6d51987d7..eeec4553eb 100644 --- a/LiteEditor/frame.cpp +++ b/LiteEditor/frame.cpp @@ -23,18 +23,31 @@ ////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////// +#include "frame.h" + #include "ColoursAndFontsManager.h" +#include "CompilersDetectorManager.h" #include "CompilersFoundDlg.h" #include "DebuggerToolBar.h" #include "GCCMetadata.hpp" +#include "Notebook.h" #include "ServiceProviderManager.h" #include "SwitchToWorkspaceDlg.h" #include "WelcomePage.h" +#include "acceltabledlg.h" +#include "advanced_settings.h" #include "app.h" +#include "async_executable_cmd.h" #include "autoversion.h" +#include "batchbuilddlg.h" #include "bitmap_loader.h" #include "bookmark_manager.h" +#include "breakpointdlg.h" #include "build_custom_targets_menu_manager.h" +#include "build_settings_config.h" +#include "builder.h" +#include "buildmanager.h" +#include "buildtabsettingsdata.h" #include "clAboutDialog.h" #include "clBootstrapWizard.h" #include "clCustomiseToolBarDlg.h" @@ -57,57 +70,11 @@ #include "cl_standard_paths.h" #include "cl_unredo.h" #include "code_completion_manager.h" +#include "configuration_manager_dlg.h" #include "console_frame.h" #include "context_cpp.h" -#include "event_notifier.h" -#include "file_logger.h" -#include "fileutils.h" -#include "findusagetab.h" -#include "localstable.h" -#include "manage_perspective_dlg.h" -#include "open_resource_dialog.h" // New open resource -#include "precompiled_header.h" -#include "quickfindbar.h" -#include "renamesymboldlg.h" -#include "save_perspective_as_dlg.h" -#include "tags_parser_search_path_dlg.h" -#include "wxCodeCompletionBoxManager.h" -#include "wxCustomControls.hpp" -#include "wxCustomStatusBar.h" - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#ifdef __WXGTK20__ -// We need this ugly hack to workaround a gtk2-wxGTK name-clash -// See http://trac.wxwidgets.org/ticket/10883 -#define GSocket GlibGSocket -#include -#undef GSocket -#endif -#include "Notebook.h" -#include "acceltabledlg.h" -#include "advanced_settings.h" -#include "async_executable_cmd.h" -#include "batchbuilddlg.h" -#include "breakpointdlg.h" -#include "build_settings_config.h" -#include "builder.h" -#include "buildmanager.h" -#include "buildtabsettingsdata.h" -#include "cl_defs.h" -#include "configuration_manager_dlg.h" #include "cpp_symbol_tree.h" +#include "cpptoken.h" #include "debugcoredump.h" #include "debuggerconfigtool.h" #include "debuggermanager.h" @@ -120,31 +87,41 @@ #include "drawingutils.h" #include "editor_config.h" #include "environmentconfig.h" +#include "event_notifier.h" #include "exelocator.h" +#include "file_logger.h" #include "filedroptarget.h" #include "fileexplorer.h" +#include "fileutils.h" #include "fileview.h" #include "findresultstab.h" -#include "frame.h" +#include "findusagetab.h" #include "generalinfo.h" #include "globals.h" #include "imanager.h" #include "jobqueue.h" #include "language.h" +#include "localstable.h" #include "macros.h" +#include "manage_perspective_dlg.h" #include "manager.h" #include "menumanager.h" #include "navigationmanager.h" #include "newworkspacedlg.h" +#include "open_resource_dialog.h" // New open resource #include "openwindowspanel.h" #include "options_dlg2.h" #include "plugin.h" #include "pluginmanager.h" #include "pluginmgrdlg.h" +#include "precompiled_header.h" #include "project.h" #include "quickdebugdlg.h" +#include "quickfindbar.h" #include "refactorindexbuildjob.h" +#include "renamesymboldlg.h" #include "replaceinfilespanel.h" +#include "save_perspective_as_dlg.h" #include "search_thread.h" #include "sessionmanager.h" #include "singleinstancethreadjob.h" @@ -153,11 +130,25 @@ #include "tabgroupdlg.h" #include "tabgroupmanager.h" #include "tabgroupspane.h" +#include "tags_parser_search_path_dlg.h" #include "webupdatethread.h" #include "workspace_pane.h" #include "workspacetab.h" +#include "wxCodeCompletionBoxManager.h" +#include "wxCustomControls.hpp" +#include "wxCustomStatusBar.h" +#include +#include +#include +#include +#include #include +#include +#include +#include +#include +#include ////////////////////////////////////////////////// @@ -746,7 +737,7 @@ clMainFrame::clMainFrame(wxWindow* pParent, wxWindowID id, const wxString& title // Pass the docking manager to the plugin-manager PluginManager::Get()->SetDockingManager(&m_mgr); - long value = EditorConfigST::Get()->GetInteger(wxT("highlight_word"), 0); + long value = EditorConfigST::Get()->GetInteger("highlight_word", 0); m_highlightWord = (bool)value; // Initialize the frame helper @@ -826,19 +817,7 @@ clMainFrame::clMainFrame(wxWindow* pParent, wxWindowID id, const wxString& title CodeCompletionManager::Get(); // Register keyboard shortcuts - clKeyboardManager::Get()->AddGlobalAccelerator("selection_to_multi_caret", "Ctrl-Shift-L", - _("Edit::Split selection into multiple carets")); - clKeyboardManager::Get()->AddGlobalAccelerator("incremental_replace", "", - _("Search::Toggle the Quick-Replace Bar")); - clKeyboardManager::Get()->AddGlobalAccelerator("copy_file_relative_path_to_workspace", "Ctrl-Alt-Shift-C", - "Edit::Copy Path Relative to Clipboard"); - clKeyboardManager::Get()->AddGlobalAccelerator("copy_file_name", "", "Edit::Copy Path to Clipboard"); - clKeyboardManager::Get()->AddGlobalAccelerator("copy_file_path", "", "Edit::Copy Full Path to Clipboard"); - clKeyboardManager::Get()->AddGlobalAccelerator("copy_file_name_only", "", "Edit::Copy File Name to Clipboard"); - clKeyboardManager::Get()->AddGlobalAccelerator("open_shell_from_filepath", "Ctrl-Shift-T", - "Search::Open Shell From File Path"); - clKeyboardManager::Get()->AddGlobalAccelerator("open_file_explorer", "Ctrl-Alt-Shift-T", - "Search::Open Containing Folder"); + AddKeyboardAccelerators(); #ifdef __WXGTK__ // Try to detect if this is a Wayland session; we have some Wayland-workaround code m_isWaylandSession = clIsWaylandSession(); @@ -935,17 +914,12 @@ void clMainFrame::Initialize(bool loadLastSession) wxString title(_("CodeLite ")); title << CODELITE_VERSION_STRING; - clKeyboardManager::Get()->AddGlobalAccelerator("wxEVT_BOOK_NAV_NEXT", "Ctrl-Shift-TAB", _("Switch to Next Tab")); - clKeyboardManager::Get()->AddGlobalAccelerator("wxEVT_BOOK_NAV_PREV", "Ctrl-TAB", _("Switch to Previous Tab")); - clKeyboardManager::Get()->AddGlobalAccelerator("wxEVT_BOOK_MOVE_TAB_LEFT", "Ctrl-Shift-PGUP", _("Move Tab Left")); - clKeyboardManager::Get()->AddGlobalAccelerator("wxEVT_BOOK_MOVE_TAB_RIGHT", "Ctrl-Shift-PGDN", _("Move Tab Right")); - // initialize the environment variable configuration manager EnvironmentConfig::Instance()->Load(); EditorConfig* cfg = EditorConfigST::Get(); GeneralInfo inf; - cfg->ReadObject(wxT("GeneralInfo"), &inf); + cfg->ReadObject("GeneralInfo", &inf); m_theFrame = new clMainFrame(NULL, wxID_ANY, title, inf.GetFramePosition(), inf.GetFrameSize(), wxDEFAULT_FRAME_STYLE | wxNO_FULL_REPAINT_ON_RESIZE); @@ -972,6 +946,184 @@ void clMainFrame::Initialize(bool loadLastSession) ManagerST::Get()->GetPerspectiveManager().SavePerspectiveIfNotExists(NORMAL_LAYOUT); } +void clMainFrame::AddKeyboardAccelerators() +{ + clKeyboardManager* mgr = clKeyboardManager::Get(); + mgr->AddAccelerator(_("Build"), + { { "configuration_manager", _("Configuration Manager...") }, + { "batch_build", _("Batch Build...") }, + { "execute_no_debug", _("Run"), "Ctrl-F5" }, + { "stop_executed_program", _("Stop") }, + { "build_active_project", _("Build Project"), "F7" }, + { "build_workspace", _("Build Workspace"), "Ctrl-Shift-B" }, + { "rebuild_workspace", _("Rebuild Workspace") }, + { "clean_workspace", _("Clean Workspace") }, + { "compile_active_file", _("Compile Current File"), "Ctrl-F7" }, + { "compile_active_file_project", _("Compile Current File's Project"), "Ctrl-Shift-F7" }, + { "clean_active_project", _("Clean Project") }, + { "stop_active_project_build", _("Stop Build") }, + { "rebuild_active_project", _("Rebuild Project") }, + { "build_n_run_active_project", _("Build and Run Project"), "Ctrl-F9" }, + { "next_build_error", _("Next Build Error"), "F4" } }); + mgr->AddAccelerator(_("C++"), { { "swap_files", _("Swap Header/Implementation file"), "F12" }, + { "find_decl", _("Goto Declaration") }, + { "find_impl", _("Goto Implementation") }, + { "open_include_file", _("Open Include File") }, + { "add_include_file", _("Add Include File"), "Ctrl-Shift-I" } }); + mgr->AddAccelerator(_("C++ | Code Generation / Refactoring"), + { { "setters_getters", _("Generate Setters/Getters...") }, + { "move_impl", _("Move Function Implementation to...") }, + { "add_impl", _("Add Function Implementation...") }, + { "add_multi_impl", _("Implement all Un-implemented Functions...") } }); + mgr->AddAccelerator(_("Debugger"), { { "start_debugger", _("Start/Continue Debugger"), "F5" }, + { "restart_debugger", _("Restart Debugger"), "Ctrl-Shift-F5" }, + { "attach_debugger", _("Attach to process...") }, + { "pause_debugger", _("Pause debugger") }, + { "stop_debugger", _("Stop debugger"), "Shift-F5" }, + { "dbg_stepin", _("Step Into"), "F11" }, + { "dbg_stepout", _("Step Out"), "Shift-F11" }, + { "dbg_stepi", _("Step Into Instruction") }, + { "dbg_next", _("Next"), "F10" }, + { "dbg_nexti", _("Next Instruction"), "Ctrl-F10" }, + { "show_cursor", _("Show Cursor") }, + { "dbg_run_to_cursor", _("Run to Caret Line") }, + { "dbg_jump_cursor", _("Jump to Caret Line") }, + { "insert_breakpoint", _("Toggle Breakpoint"), "F9" }, + { "disable_all_breakpoints", _("Disable All Breakpoints") }, + { "enable_all_breakpoints", _("Enable All Breakpoints") }, + { "delete_all_breakpoints", _("Delete All Breakpoints") }, + { "quick_debug", _("Quick Debug...") } }); + mgr->AddAccelerator(_("Edit"), { { "wxID_UNDO", _("Undo"), "Ctrl-Z" }, + { "wxID_REDO", _("Redo"), "Ctrl-Y" }, + { "wxID_CUT", _("Cut"), "Ctrl-X" }, + { "wxID_COPY", _("Copy"), "Ctrl-C" }, + { "wxID_PASTE", _("Paste"), "Ctrl-V" }, + { "wxID_DUPLICATE", _("Duplicate Selection / Line"), "Ctrl-D" }, + { "delete_line_end", _("Delete to Line End") }, + { "delete_line_start", _("Delete to Line Start") }, + { "delete_line", _("Delete Line"), "Ctrl-L" }, + { "copy_line", _("Copy Line") }, + { "cut_line", _("Cut Line") }, + { "selection_to_multi_caret", _("Split selection into lines"), "Ctrl-Shift-L" }, + { "to_lower", _("Make Lowercase"), "Ctrl-U" }, + { "to_upper", _("Make Uppercase"), "Ctrl-Shift-U" }, + { "insert_doxy_comment", _("Insert Comment Block"), "Ctrl-Shift-D" }, + { "comment_line", _("Comment Line"), "Ctrl-/" }, + { "comment_selection", _("Comment Selection"), "Ctrl-Shift-/" }, + { "transpose_lines", _("Transpose Lines"), "Ctrl-T" }, + { "move_line_up", _("Move Line Up"), "Ctrl-Shift-UP" }, + { "move_line_down", _("Move Line Down"), "Ctrl-Shift-DOWN" }, + { "convert_indent_to_tabs", _("Convert Indentation to Tabs") }, + { "convert_indent_to_spaces", _("Convert Indentation to Spaces") }, + { "center_line_roll", _("Center Line in Editor") }, + { "wxID_SELECTALL", _("Select All"), "Ctrl-A" }, + { "match_brace", _("Match Brace"), "Ctrl-]" }, + { "select_to_brace", _("Select to Brace"), "Ctrl-Shift-E" }, + { "complete_word", _("Code Complete"), "Ctrl-SPACE" }, + { "simple_word_completion", _("Complete Word"), "Ctrl-ENTER" }, + { "function_call_tip", _("Display Function Calltip"), "Ctrl-Shift-SPACE" }, + { "convert_eol_win", _("Convert to Windows Format") }, + { "convert_eol_unix", _("Convert to Unix Format") }, + { "trim_trailing", _("Trim Trailing Spaces") }, + { "copy_file_relative_path_to_workspace", _("Copy Path Relative to Workspace"), + "Ctrl-Alt-Shift-C" }, + { "copy_file_name", _("Copy Path to Clipboard") }, + { "copy_file_path", _("Copy Full Path to Clipboard") }, + { "copy_file_name_only", _("Copy File Name to Clipboard") } }); + mgr->AddAccelerator(_("File"), { { "new_file", _("New File"), "Ctrl-N" }, + { "open_file", _("Open File..."), "Ctrl-O" }, + { "refresh_file", _("Reload File"), "Ctrl-R" }, + { "save_file", _("Save File"), "Ctrl-S" }, + { "duplicate_tab", _("Duplicate Tab") }, + { "save_file_as", _("Save As..."), "Ctrl-Shift-S" }, + { "save_all", _("Save all files") }, + { "close_file", _("Close"), "Ctrl-W" }, + { "wxID_CLOSE_ALL", _("Close All") }, + { "wxID_PRINT", _("Print..."), "Ctrl-P" }, + { "wxID_EXIT", _("Exit"), "Alt-X" } }); + mgr->AddAccelerator(_("Help"), { { "wxID_ABOUT", _("About...") } }); + mgr->AddAccelerator(_("Plugins"), { { "manage_plugins", _("Manage Plugins...") } }); + mgr->AddAccelerator(_("Search"), + { { "grep_current_file", _("Grep Selection in the Current File"), "Ctrl-Shift-G" }, + { "grep_current_workspace", _("Grep Selection in the Workspace") }, + { "web_search_selection", _("Search for Selection with default browser"), "Ctrl-Shift-W" }, + { "ID_GOTO_ANYTHING", _("Goto Anything"), "Ctrl-Shift-P" }, + { "find_previous", _("Find Previous"), "Shift-F3" }, + { "find_resource", _("Find Resource..."), "Ctrl-Shift-R" }, + { "find_symbol", _("Quick Outline..."), "Ctrl-Shift-O" }, + { "goto_definition", _("Find Symbol"), "Alt-G" } }); + mgr->AddAccelerator(_("Search | Bookmarks"), + { { "toggle_bookmark", _("Toggle Bookmark"), "Ctrl-B" }, + { "next_bookmark", _("Next Bookmark"), "F2" }, + { "previous_bookmark", _("Previous Bookmark"), "Shift-F2" }, + { "removeall_bookmarks", _("Remove All Bookmarks") }, + { "removeall_current_bookmarks", _("Remove All Currently-Active Bookmarks") }, + { "open_shell_from_filepath", _("Open Shell From File Path"), "Ctrl-Shift-T" }, + { "open_file_explorer", _("Open Containing Folder"), "Ctrl-Alt-Shift-T" } }); + mgr->AddAccelerator(_("Search | Find In Files"), + { { "find_in_files", _("Find In Files..."), "Ctrl-Shift-F" }, + { "next_fif_match", _("Go to Next 'Find In File' Match"), "F8" }, + { "previous_fif_match", _("Go to Previous 'Find In File' Match"), "Ctrl-F8" } }); + mgr->AddAccelerator(_("Search | Find and Replace"), + { { "id_find", _("Find..."), "Ctrl-F" }, + { "ID_QUICK_ADD_NEXT", _("Quick Add Next"), "Ctrl-K" }, + { "ID_QUICK_FIND_ALL", _("Quick Find All"), "Ctrl-Shift-K" }, + { "id_replace", _("Replace..."), "Ctrl-H" }, + { "find_next", _("Find Next"), "F3" }, + { "find_next_at_caret", _("Find Word At Caret") }, + { "find_previous_at_caret", _("Find Word At Caret Backward") } }); + mgr->AddAccelerator(_("Search | Go To"), { { "id_backward", _("Go To Previous Location"), "Ctrl-," }, + { "id_forward", _("Go To Forward Location"), "Ctrl-." }, + { "goto_linenumber", _("Go To Line..."), "Ctrl-G" } }); + mgr->AddAccelerator(_("Settings"), { { "wxID_PREFERENCES", _("Preferences"), "Alt-O" }, + { "syntax_highlight", _("Colours and Fonts...") }, + { "configure_accelerators", _("Keyboard shortcuts...") }, + { "add_envvar", _("Environment Variables..."), "Ctrl-Shift-V" }, + { "advance_settings", _("Build Settings...") }, + { "debuger_settings", _("GDB Settings...") }, + { "tags_options", _("Code Completion...") } }); + mgr->AddAccelerator(_("Tab"), { { "wxEVT_BOOK_NAV_NEXT", _("Switch to Next Tab"), "Ctrl-Shift-TAB" }, + { "wxEVT_BOOK_NAV_PREV", _("Switch to Previous Tab"), "Ctrl-TAB" }, + { "wxEVT_BOOK_MOVE_TAB_LEFT", _("Move Tab Left"), "Ctrl-Shift-PGUP" }, + { "wxEVT_BOOK_MOVE_TAB_RIGHT", _("Move Tab Right"), "Ctrl-Shift-PGDN" } }); + mgr->AddAccelerator(_("View"), { { "word_wrap", _("Word Wrap") }, + { "toggle_fold", _("Toggle Current Fold"), "Alt-RIGHT" }, + { "fold_all", _("Toggle All Folds") }, + { "fold_topmost_in_selection", _("Toggle All Topmost Folds in Selection") }, + { "fold_all_in_selection", _("Toggle Every Fold in Selection") }, + { "display_eol", _("Display EOL") }, + { "next_tab", _("Next tab"), "Ctrl-Alt-RIGHT" }, + { "prev_tab", _("Previous tab"), "Ctrl-Alt-LEFT" }, + { "full_screen", _("Full Screen..."), "Alt-M" }, + { "output_pane", _("Output Pane"), "Ctrl-`" }, + { "workspace_pane", _("Workspace Pane"), "Ctrl-Alt-W" }, + { "debugger_pane", _("Debugger Pane"), "Ctrl-Alt-D" }, + { "show_nav_toolbar", _("Navigation Bar"), "Ctrl-Alt-N" }, + { "toggle_panes", _("Toggle All Panes"), "Ctrl-M" }, + { "distraction_free_mode", _("Toggle Minimal View"), "Ctrl-F11" }, + { "show_menu_bar", _("Show Menu Bar"), "Alt-`" }, + { "hide_status_bar", _("Show Status Bar") }, + { "hide_tool_bar", _("Show Tool Bar"), "F1" } }); + mgr->AddAccelerator(_("View | Show Whitespace"), + { { "whitepsace_invisible", _("Invisible"), "Alt-F1" }, + { "whitepsace_always", _("Show Always"), "Alt-F2" }, + { "whitespace_visiable_after_indent", _("Visible After First Indent"), "Alt-F3" }, + { "whitespace_indent_only", _("Indentation Only") } }); + mgr->AddAccelerator(_("View | Zoom"), { { "wxID_ZOOM_IN", _("Zoom In") }, + { "wxID_ZOOM_OUT", _("Zoom Out") }, + { "wxID_ZOOM_FIT", _("Reset Zoom"), "Ctrl-0" } }); + mgr->AddAccelerator(_("Workspace"), { { "new_workspace", _("New Workspace...") }, + { "switch_to_workspace", _("Open Workspace...") }, + { "close_workspace", _("Close Workspace") }, + { "reload_workspace", _("Reload Workspace") }, + { "local_workspace_settings", _("Workspace Settings...") }, + { "local_workspace_prefs", _("Workspace Editor Preferences...") }, + { "import_from_msvs", _("Import other IDEs solution/workspace files...") }, + { "project_properties", _("Open Active Project Settings..."), "Alt-F7" }, + { "new_project", _("Create New Project") }, + { "add_project", _("Add an Existing Project") } }); +} + clMainFrame* clMainFrame::Get() { return m_theFrame; } static int GetBestXButtonSize(wxWindow* win) { @@ -1020,7 +1172,7 @@ void clMainFrame::CreateGUIControls() m_mgr.GetArtProvider()->SetColor(wxAUI_DOCKART_BACKGROUND_COLOUR, DrawingUtils::GetPanelBgColour()); // initialize debugger configuration tool - DebuggerConfigTool::Get()->Load(wxT("config/debuggers.xml"), wxT("5.4")); + DebuggerConfigTool::Get()->Load("config/debuggers.xml", "5.4"); clCxxWorkspaceST::Get()->SetStartupDir(ManagerST::Get()->GetStartupDirectory()); m_mgr.GetArtProvider()->SetMetric(wxAUI_DOCKART_PANE_BORDER_SIZE, 0); @@ -1088,13 +1240,13 @@ void clMainFrame::CreateGUIControls() // add menu bar #if !wxUSE_NATIVE_MENUBAR // replace the menu bar with our customer menu bar - wxMenuBar* mb = wxXmlResource::Get()->LoadMenuBar(wxT("main_menu")); + wxMenuBar* mb = wxXmlResource::Get()->LoadMenuBar("main_menu"); m_menuBar = new clThemedMenuBar(this, 0, nullptr, nullptr); GetSizer()->Add(m_menuBar, 0, wxEXPAND); m_menuBar->FromMenuBar(mb); SetMenuBar(nullptr); #else - m_menuBar = wxXmlResource::Get()->LoadMenuBar(wxT("main_menu")); + m_menuBar = wxXmlResource::Get()->LoadMenuBar("main_menu"); #ifdef __WXOSX__ wxMenu* view = NULL; wxMenuItem* item = m_menuBar->FindItem(XRCID("show_tabs_tab"), &view); @@ -1135,7 +1287,7 @@ void clMainFrame::CreateGUIControls() // I'm not localising the captions of these Views atm. That's because wxAui uses name+caption to ID a pane // It also serialises the caption. That means that changing locale will break the layout stored in codelite.layout - // If it's decided to do this in the future, change only the 'Caption(wxT("Output View"))' bits below + // If it's decided to do this in the future, change only the 'Caption("Output View")' bits below // However I'm creating unused strings here, so that the translations remain in the catalogue const wxString unusedOV(_("Output View")); const wxString unusedWV(_("Workspace View")); @@ -1143,7 +1295,7 @@ void clMainFrame::CreateGUIControls() _("wxCrafter")); // One that would otherwise be untranslated; OT here, but it's a convenient place to put it // Add the explorer pane - m_workspacePane = new WorkspacePane(m_mainPanel, wxT("Workspace View"), &m_mgr); + m_workspacePane = new WorkspacePane(m_mainPanel, "Workspace View", &m_mgr); m_mgr.AddPane(m_workspacePane, wxAuiPaneInfo() .CaptionVisible(true) .Name(m_workspacePane->GetCaption()) @@ -1153,10 +1305,10 @@ void clMainFrame::CreateGUIControls() .Layer(1) .Position(0) .CloseButton(true)); - RegisterDockWindow(XRCID("workspace_pane"), wxT("Workspace View")); + RegisterDockWindow(XRCID("workspace_pane"), "Workspace View"); // add the debugger locals tree, make it hidden by default - m_debuggerPane = new DebuggerPane(m_mainPanel, wxT("Debugger"), &m_mgr); + m_debuggerPane = new DebuggerPane(m_mainPanel, "Debugger", &m_mgr); m_mgr.AddPane(m_debuggerPane, wxAuiPaneInfo() .CaptionVisible(true) .Name(m_debuggerPane->GetCaption()) @@ -1166,7 +1318,7 @@ void clMainFrame::CreateGUIControls() .Position(1) .CloseButton(true) .Hide()); - RegisterDockWindow(XRCID("debugger_pane"), wxT("Debugger")); + RegisterDockWindow(XRCID("debugger_pane"), "Debugger"); // Wrap the mainbook with a wxPanel // We do this so we can place the find bar under the main book @@ -1200,25 +1352,25 @@ void clMainFrame::CreateGUIControls() m_mainBook->SetFindBar(findbar); m_mainBook->SetEditorBar(navbar); - m_mgr.AddPane(container, wxAuiPaneInfo().Name(wxT("Editor")).CenterPane().PaneBorder(false)); + m_mgr.AddPane(container, wxAuiPaneInfo().Name("Editor").CenterPane().PaneBorder(false)); CreateRecentlyOpenedFilesMenu(); - m_outputPane = new OutputPane(m_mainPanel, wxT("Output View")); + m_outputPane = new OutputPane(m_mainPanel, "Output View"); wxAuiPaneInfo paneInfo; m_mgr.AddPane(m_outputPane, paneInfo.CaptionVisible(true) - .Name(wxT("Output View")) - .Caption(wxT("Output View")) + .Name("Output View") + .Caption("Output View") .Bottom() .Layer(1) .Position(0) .Show(false) .BestSize(wxSize(wxNOT_FOUND, 400))); - RegisterDockWindow(XRCID("output_pane"), wxT("Output View")); + RegisterDockWindow(XRCID("output_pane"), "Output View"); - long show_nav = EditorConfigST::Get()->GetInteger(wxT("ShowNavBar"), 0); + long show_nav = EditorConfigST::Get()->GetInteger("ShowNavBar", 0); m_mainBook->ShowNavBar(show_nav ? true : false); - if(!BuildSettingsConfigST::Get()->Load(wxT("2.1"))) { + if(!BuildSettingsConfigST::Get()->Load("2.1")) { CL_ERROR("Could not locate build configuration! CodeLite installation is broken this might cause unwanted " "behavior!"); } @@ -1265,9 +1417,9 @@ void clMainFrame::CreateGUIControls() Bind(wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler(clMainFrame::OnChangeActiveBookmarkType), this, XRCID("BookmarkTypes[start]"), XRCID("BookmarkTypes[end]")); - GetWorkspacePane()->GetNotebook()->SetMenu(wxXmlResource::Get()->LoadMenu(wxT("workspace_view_rmenu"))); - GetDebuggerPane()->GetNotebook()->SetMenu(wxXmlResource::Get()->LoadMenu(wxT("debugger_view_rmenu"))); - GetOutputPane()->GetNotebook()->SetMenu(wxXmlResource::Get()->LoadMenu(wxT("outputview_view_rmenu"))); + GetWorkspacePane()->GetNotebook()->SetMenu(wxXmlResource::Get()->LoadMenu("workspace_view_rmenu")); + GetDebuggerPane()->GetNotebook()->SetMenu(wxXmlResource::Get()->LoadMenu("debugger_view_rmenu")); + GetOutputPane()->GetNotebook()->SetMenu(wxXmlResource::Get()->LoadMenu("outputview_view_rmenu")); DoSysColoursChanged(); m_mgr.Update(); @@ -1278,7 +1430,7 @@ void clMainFrame::CreateGUIControls() // try to locate the build tools long fix(1); - fix = EditorConfigST::Get()->GetInteger(wxT("FixBuildToolOnStartup"), fix); + fix = EditorConfigST::Get()->GetInteger("FixBuildToolOnStartup", fix); if(fix) { UpdateBuildTools(); } @@ -1374,36 +1526,36 @@ void clMainFrame::CreateToolBar(int toolSize) m_toolbar->SetMiniToolBar(false); // We want main toolbar m_toolbar->EnableCustomisation(true); auto images = m_toolbar->GetBitmapsCreateIfNeeded(); - m_toolbar->AddTool(XRCID("new_file"), _("New"), images->Add(wxT("file_new"), toolSize), _("New File")); - m_toolbar->AddTool(XRCID("open_file"), _("Open"), images->Add(wxT("file_open"), toolSize), _("Open File")); - m_toolbar->AddTool(XRCID("refresh_file"), _("Reload"), images->Add(wxT("file_reload"), toolSize), _("Reload File")); - m_toolbar->AddTool(XRCID("save_file"), _("Save"), images->Add(wxT("file_save"), toolSize), _("Save")); - m_toolbar->AddTool(XRCID("save_all"), _("Save All"), images->Add(wxT("file_save_all"), toolSize), _("Save All")); - m_toolbar->AddTool(XRCID("close_file"), _("Close"), images->Add(wxT("file_close"), toolSize), _("Close File")); + m_toolbar->AddTool(XRCID("new_file"), _("New"), images->Add("file_new", toolSize), _("New File")); + m_toolbar->AddTool(XRCID("open_file"), _("Open"), images->Add("file_open", toolSize), _("Open File")); + m_toolbar->AddTool(XRCID("refresh_file"), _("Reload"), images->Add("file_reload", toolSize), _("Reload File")); + m_toolbar->AddTool(XRCID("save_file"), _("Save"), images->Add("file_save", toolSize), _("Save")); + m_toolbar->AddTool(XRCID("save_all"), _("Save All"), images->Add("file_save_all", toolSize), _("Save All")); + m_toolbar->AddTool(XRCID("close_file"), _("Close"), images->Add("file_close", toolSize), _("Close File")); m_toolbar->AddSpacer(); - m_toolbar->AddTool(wxID_CUT, _("Cut"), images->Add(wxT("cut"), toolSize), _("Cut")); - m_toolbar->AddTool(wxID_COPY, _("Copy"), images->Add(wxT("copy"), toolSize), _("Copy")); - m_toolbar->AddTool(wxID_PASTE, _("Paste"), images->Add(wxT("paste"), toolSize), _("Paste")); - m_toolbar->AddTool(wxID_UNDO, _("Undo"), images->Add(wxT("undo"), toolSize), _("Undo"), wxITEM_DROPDOWN); - m_toolbar->AddTool(wxID_REDO, _("Redo"), images->Add(wxT("redo"), toolSize), _("Redo"), wxITEM_DROPDOWN); + m_toolbar->AddTool(wxID_CUT, _("Cut"), images->Add("cut", toolSize), _("Cut")); + m_toolbar->AddTool(wxID_COPY, _("Copy"), images->Add("copy", toolSize), _("Copy")); + m_toolbar->AddTool(wxID_PASTE, _("Paste"), images->Add("paste", toolSize), _("Paste")); + m_toolbar->AddTool(wxID_UNDO, _("Undo"), images->Add("undo", toolSize), _("Undo"), wxITEM_DROPDOWN); + m_toolbar->AddTool(wxID_REDO, _("Redo"), images->Add("redo", toolSize), _("Redo"), wxITEM_DROPDOWN); m_toolbar->AddSpacer(); - m_toolbar->AddTool(XRCID("id_backward"), _("Backward"), images->Add(wxT("back"), toolSize), _("Backward")); - m_toolbar->AddTool(XRCID("id_forward"), _("Forward"), images->Add(wxT("forward"), toolSize), _("Forward")); + m_toolbar->AddTool(XRCID("id_backward"), _("Backward"), images->Add("back", toolSize), _("Backward")); + m_toolbar->AddTool(XRCID("id_forward"), _("Forward"), images->Add("forward", toolSize), _("Forward")); m_toolbar->AddSpacer(); //---------------------------------------------- // create the search toolbar //---------------------------------------------- - m_toolbar->AddTool(XRCID("toggle_bookmark"), _("Toggle Bookmark"), images->Add(wxT("bookmark"), toolSize), + m_toolbar->AddTool(XRCID("toggle_bookmark"), _("Toggle Bookmark"), images->Add("bookmark", toolSize), _("Toggle Bookmark"), wxITEM_DROPDOWN); m_toolbar->SetDropdownMenu(XRCID("toggle_bookmark"), BookmarkManager::Get().CreateBookmarksSubmenu(NULL)); - m_toolbar->AddTool(XRCID("id_find"), _("Find"), images->Add(wxT("find"), toolSize), _("Find")); - m_toolbar->AddTool(XRCID("id_replace"), _("Replace"), images->Add(wxT("find_and_replace"), toolSize), _("Replace")); - m_toolbar->AddTool(XRCID("find_in_files"), _("Find In Files"), images->Add(wxT("find_in_files"), toolSize), + m_toolbar->AddTool(XRCID("id_find"), _("Find"), images->Add("find", toolSize), _("Find")); + m_toolbar->AddTool(XRCID("id_replace"), _("Replace"), images->Add("find_and_replace", toolSize), _("Replace")); + m_toolbar->AddTool(XRCID("find_in_files"), _("Find In Files"), images->Add("find_in_files", toolSize), _("Find In Files")); - m_toolbar->AddTool(XRCID("find_resource"), _("Find Resource In Workspace"), - images->Add(wxT("open_resource"), toolSize), _("Find Resource In Workspace")); - m_toolbar->AddTool(XRCID("highlight_word"), _("Highlight Word"), images->Add(wxT("mark_word"), toolSize), + m_toolbar->AddTool(XRCID("find_resource"), _("Find Resource In Workspace"), images->Add("open_resource", toolSize), + _("Find Resource In Workspace")); + m_toolbar->AddTool(XRCID("highlight_word"), _("Highlight Word"), images->Add("mark_word", toolSize), _("Highlight Matching Words"), wxITEM_CHECK); m_toolbar->ToggleTool(XRCID("highlight_word"), m_highlightWord); m_toolbar->AddSpacer(); @@ -1411,24 +1563,24 @@ void clMainFrame::CreateToolBar(int toolSize) //---------------------------------------------- // create the build toolbar //---------------------------------------------- - m_toolbar->AddTool(XRCID("build_active_project"), _("Build Active Project"), images->Add(wxT("build"), toolSize), + m_toolbar->AddTool(XRCID("build_active_project"), _("Build Active Project"), images->Add("build", toolSize), _("Build Active Project"), wxITEM_DROPDOWN); - m_toolbar->AddTool(XRCID("stop_active_project_build"), _("Stop Current Build"), images->Add(wxT("stop"), toolSize), + m_toolbar->AddTool(XRCID("stop_active_project_build"), _("Stop Current Build"), images->Add("stop", toolSize), _("Stop Current Build")); - m_toolbar->AddTool(XRCID("clean_active_project"), _("Clean Active Project"), images->Add(wxT("clean"), toolSize), + m_toolbar->AddTool(XRCID("clean_active_project"), _("Clean Active Project"), images->Add("clean", toolSize), _("Clean Active Project")); m_toolbar->AddSeparator(); - m_toolbar->AddTool(XRCID("execute_no_debug"), _("Run Active Project"), images->Add(wxT("execute"), toolSize), + m_toolbar->AddTool(XRCID("execute_no_debug"), _("Run Active Project"), images->Add("execute", toolSize), _("Run Active Project")); - m_toolbar->AddTool(XRCID("stop_executed_program"), _("Stop Running Program"), - images->Add(wxT("execute_stop"), toolSize), _("Stop Running Program")); + m_toolbar->AddTool(XRCID("stop_executed_program"), _("Stop Running Program"), images->Add("execute_stop", toolSize), + _("Stop Running Program")); m_toolbar->AddSpacer(); //---------------------------------------------- // create the debugger toolbar //---------------------------------------------- m_toolbar->AddTool(XRCID("start_debugger"), _("Start or Continue debugger"), - images->Add(wxT("start-debugger"), toolSize), _("Start or Continue debugger")); + images->Add("start-debugger", toolSize), _("Start or Continue debugger")); m_toolbar->AddSpacer(); m_toolbarsSizer->Insert(0, m_toolbar, 0, wxEXPAND); m_toolbar->Realize(); @@ -1493,7 +1645,7 @@ void clMainFrame::Bootstrap() // Load the session manager wxString sessConfFile; - sessConfFile << clStandardPaths::Get().GetUserDataDir() << wxT("/config/sessions.xml"); + sessConfFile << clStandardPaths::Get().GetUserDataDir() << "/config/sessions.xml"; SessionManager::Get().Load(sessConfFile); EventNotifier::Get()->PostCommandEvent(wxEVT_INIT_DONE, NULL); @@ -1537,10 +1689,11 @@ bool clMainFrame::IsEditorEvent(wxEvent& event) #ifdef __WXGTK__ MainBook* mainBook = GetMainBook(); if(!mainBook || !mainBook->GetActiveEditor(true)) { - if(event.GetId() == XRCID("id_find")) + if(event.GetId() == XRCID("id_find")) { return true; - else + } else { return false; + } } switch(event.GetId()) { @@ -1705,8 +1858,9 @@ void clMainFrame::OnClose(wxCloseEvent& event) // Stop any debugging session if any IDebugger* debugger = DebuggerMgr::Get().GetActiveDebugger(); - if(debugger && debugger->IsRunning()) + if(debugger && debugger->IsRunning()) { ManagerST::Get()->DbgStop(); + } // In case we got some data in the clipboard, flush it so it will be available // after our process exits @@ -1718,7 +1872,7 @@ void clMainFrame::LoadSession(const wxString& sessionName) SessionEntry session; if(SessionManager::Get().GetSession(sessionName, session)) { wxString wspFile = session.GetWorkspaceName(); - if(wspFile.IsEmpty() == false && wspFile != wxT("Default")) { + if(wspFile.IsEmpty() == false && wspFile != "Default") { // Load the workspace only if it exists wxFileName fnWorkspace(wspFile); @@ -1766,7 +1920,7 @@ void clMainFrame::OnSaveAs(wxCommandEvent& WXUNUSED(event)) void clMainFrame::OnFileLoadTabGroup(wxCommandEvent& WXUNUSED(event)) { wxArrayString previousgroups; - EditorConfigST::Get()->GetRecentItems(previousgroups, wxT("RecentTabgroups")); + EditorConfigST::Get()->GetRecentItems(previousgroups, "RecentTabgroups"); // Check the previous items still exist for(int n = (int)previousgroups.GetCount() - 1; n >= 0; --n) { @@ -1774,7 +1928,7 @@ void clMainFrame::OnFileLoadTabGroup(wxCommandEvent& WXUNUSED(event)) previousgroups.RemoveAt(n); } } - EditorConfigST::Get()->SetRecentItems(previousgroups, wxT("RecentTabgroups")); // In case any were deleted + EditorConfigST::Get()->SetRecentItems(previousgroups, "RecentTabgroups"); // In case any were deleted wxString path = ManagerST::Get()->IsWorkspaceOpen() ? clCxxWorkspaceST::Get()->GetWorkspaceFileName().GetPath() : wxGetHomeDir(); @@ -1790,7 +1944,7 @@ void clMainFrame::OnFileLoadTabGroup(wxCommandEvent& WXUNUSED(event)) } wxString filepath = dlg.GetListBox()->GetStringSelection(); - wxString sessionFilepath = filepath.BeforeLast(wxT('.')); + wxString sessionFilepath = filepath.BeforeLast('.'); clWindowUpdateLocker locker(this); TabGroupEntry session; @@ -1807,7 +1961,7 @@ void clMainFrame::OnFileLoadTabGroup(wxCommandEvent& WXUNUSED(event)) previousgroups.RemoveAt(index); } previousgroups.Insert(filepath, 0); - EditorConfigST::Get()->SetRecentItems(previousgroups, wxT("RecentTabgroups")); + EditorConfigST::Get()->SetRecentItems(previousgroups, "RecentTabgroups"); } } @@ -1877,8 +2031,9 @@ void clMainFrame::OnSwitchWorkspace(wxCommandEvent& event) wspFile = event.GetString(); } - if(wspFile.IsEmpty()) + if(wspFile.IsEmpty()) { return; + } // Check if a workspace is opened and close it if needed if(clWorkspaceManager::Get().IsWorkspaceOpened()) { @@ -1938,7 +2093,7 @@ void clMainFrame::OnFileNew(wxCommandEvent& event) void clMainFrame::OnFileOpen(wxCommandEvent& WXUNUSED(event)) { - const wxString ALL(wxT("All Files (*)|*")); + const wxString ALL("All Files (*)|*"); // Open a file using the current editor's path clEditor* editor = GetMainBook()->GetActiveEditor(); @@ -1984,7 +2139,7 @@ void clMainFrame::OnFileSaveAll(wxCommandEvent& event) void clMainFrame::OnFileSaveTabGroup(wxCommandEvent& WXUNUSED(event)) { wxArrayString previousgroups; - EditorConfigST::Get()->GetRecentItems(previousgroups, wxT("RecentTabgroups")); + EditorConfigST::Get()->GetRecentItems(previousgroups, "RecentTabgroups"); SaveTabGroupDlg dlg(this, previousgroups); @@ -2021,7 +2176,7 @@ void clMainFrame::OnFileSaveTabGroup(wxCommandEvent& WXUNUSED(event)) if(path.Right(1) != wxFileName::GetPathSeparator()) { path << wxFileName::GetPathSeparator(); } - wxString filepath(path + sessionName + wxT(".tabgroup")); + wxString filepath(path + sessionName + ".tabgroup"); if(wxFileName::FileExists(filepath)) { if(wxMessageBox(_("There is already a file with this name. Do you want to overwrite it?"), _("Are you sure?"), wxICON_EXCLAMATION | wxOK | wxCANCEL, this) != wxOK) { @@ -2044,7 +2199,7 @@ void clMainFrame::OnFileSaveTabGroup(wxCommandEvent& WXUNUSED(event)) previousgroups.RemoveAt(index); } previousgroups.Insert(filepath, 0); - EditorConfigST::Get()->SetRecentItems(previousgroups, wxT("RecentTabgroups")); + EditorConfigST::Get()->SetRecentItems(previousgroups, "RecentTabgroups"); GetStatusBar()->SetMessage(_("Tab group saved")); } @@ -2092,8 +2247,9 @@ void clMainFrame::OnProjectNewWorkspace(wxCommandEvent& event) } } - if(selection.IsEmpty()) + if(selection.IsEmpty()) { return; + } if(selection == clCxxWorkspaceST::Get()->GetWorkspaceType()) { wxUnusedVar(event); NewWorkspaceDlg dlg(this); @@ -2124,7 +2280,8 @@ void clMainFrame::OnProjectAddProject(wxCommandEvent& event) wxUnusedVar(event); // Prompt user for project path - const wxString ALL(wxT("CodeLite Projects (*.project)|*.project|") wxT("All Files (*)|*")); + const wxString ALL("CodeLite Projects (*.project)|*.project|" + "All Files (*)|*"); wxFileDialog* dlg = new wxFileDialog(this, _("Open Project"), wxEmptyString, wxEmptyString, ALL, wxFD_OPEN | wxFD_FILE_MUST_EXIST, wxDefaultPosition); if(dlg->ShowModal() == wxID_OK) { @@ -2229,23 +2386,27 @@ void clMainFrame::ToggleToolBars(bool std) wxAuiPaneInfoArray& allPanes = m_mgr.GetAllPanes(); for(size_t i = 0; i < allPanes.GetCount(); ++i) { wxAuiPaneInfo& pane = allPanes.Item(i); - if(!pane.IsOk() || !pane.IsToolbar()) + if(!pane.IsOk() || !pane.IsToolbar()) { continue; + } if(std) { // collect core toolbars - if(m_coreToolbars.count(pane.name)) + if(m_coreToolbars.count(pane.name)) { toolbars.insert(pane.name); + } } else { // collect plugins toolbars - if(m_coreToolbars.count(pane.name) == 0) + if(m_coreToolbars.count(pane.name) == 0) { toolbars.insert(pane.name); + } } } } - if(toolbars.empty()) + if(toolbars.empty()) { return; + } // determine that state based on the first toolbar bool currentStateVisible = m_mgr.GetPane((*toolbars.begin())).IsShown(); @@ -2404,7 +2565,7 @@ void clMainFrame::OnBuildProject(wxCommandEvent& event) QueueCommand info(projectName, conf, false, QueueCommand::kBuild); if(bldConf && bldConf->IsCustomBuild()) { info.SetKind(QueueCommand::kCustomBuild); - info.SetCustomBuildTarget(wxT("Build")); + info.SetCustomBuildTarget("Build"); } ManagerST::Get()->PushQueueCommand(info); ManagerST::Get()->ProcessCommandQueue(); @@ -2456,7 +2617,7 @@ void clMainFrame::OnBuildAndRunProject(wxCommandEvent& event) if(bldConf && bldConf->IsCustomBuild()) { info.SetKind(QueueCommand::kCustomBuild); - info.SetCustomBuildTarget(wxT("Build")); + info.SetCustomBuildTarget("Build"); } ManagerST::Get()->PushQueueCommand(info); @@ -2518,8 +2679,9 @@ void clMainFrame::OnStopBuild(wxCommandEvent& event) void clMainFrame::OnStopExecutedProgram(wxCommandEvent& event) { clExecuteEvent evtExecute(wxEVT_CMD_STOP_EXECUTED_PROGRAM); - if(EventNotifier::Get()->ProcessEvent(evtExecute)) + if(EventNotifier::Get()->ProcessEvent(evtExecute)) { return; + } wxUnusedVar(event); Manager* mgr = ManagerST::Get(); @@ -2619,8 +2781,8 @@ void clMainFrame::OnTimer(wxTimerEvent& event) // wxWindowUpdateLocker locker(this); //#endif - clLogMessage(wxString::Format(wxT("Install path: %s"), ManagerST::Get()->GetInstallDir().c_str())); - clLogMessage(wxString::Format(wxT("Startup Path: %s"), ManagerST::Get()->GetStartupDirectory().c_str())); + clLogMessage(wxString::Format("Install path: %s", ManagerST::Get()->GetInstallDir().c_str())); + clLogMessage(wxString::Format("Startup Path: %s", ManagerST::Get()->GetStartupDirectory().c_str())); clLogMessage("Using " + wxStyledTextCtrl::GetLibraryVersionInfo().ToString()); if(::clIsCygwinEnvironment()) { clLogMessage("Running under Cygwin environment"); @@ -2685,8 +2847,9 @@ void clMainFrame::UpdateParserSearchPathsFromDefaultCompiler() // Try to locate the paths automatically CompilerPtr pCompiler = BuildSettingsConfigST::Get()->GetDefaultCompiler(wxEmptyString); - if(!pCompiler) + if(!pCompiler) { return; + } wxArrayString paths; paths = pCompiler->GetDefaultIncludePaths(); @@ -2846,12 +3009,12 @@ void clMainFrame::CreateWelcomePage() { GetMainBook()->RegisterWelcomePage(nullp void clMainFrame::OnImportMSVS(wxCommandEvent& e) { wxUnusedVar(e); - const wxString ALL(wxT("All Solution File (*.dsw;*.sln;*.dev;*.bpr;*.cbp;*.workspace)|") - wxT("*.dsw;*.sln;*.dev;*.bpr;*.cbp;*.workspace|") - wxT("MS Visual Studio Solution File (*.dsw;*.sln)|*.dsw;*.sln|") - wxT("Bloodshed Dev-C++ Solution File (*.dev)|*.dev|") - wxT("Borland C++ Builder Solution File (*.bpr)|*.bpr|") - wxT("Code::Blocks Solution File (*.cbp;*.workspace)|*.cbp;*.workspace")); + const wxString ALL("All Solution File (*.dsw;*.sln;*.dev;*.bpr;*.cbp;*.workspace)|" + "*.dsw;*.sln;*.dev;*.bpr;*.cbp;*.workspace|" + "MS Visual Studio Solution File (*.dsw;*.sln)|*.dsw;*.sln|" + "Bloodshed Dev-C++ Solution File (*.dev)|*.dev|" + "Borland C++ Builder Solution File (*.bpr)|*.bpr|" + "Code::Blocks Solution File (*.cbp;*.workspace)|*.cbp;*.workspace"); wxFileDialog dlg(this, _("Open IDE Solution/Workspace File"), wxEmptyString, wxEmptyString, ALL, wxFD_OPEN | wxFD_FILE_MUST_EXIST, wxDefaultPosition); @@ -2911,8 +3074,9 @@ void clMainFrame::OnDebug(wxCommandEvent& e) dbgEvent.SetDebuggerName(buildConfig->GetDebuggerType()); } } - if(EventNotifier::Get()->ProcessEvent(dbgEvent)) + if(EventNotifier::Get()->ProcessEvent(dbgEvent)) { return; + } } Manager* mgr = ManagerST::Get(); @@ -2962,8 +3126,9 @@ void clMainFrame::OnDebugUI(wxUpdateUIEvent& e) void clMainFrame::OnDebugRestart(wxCommandEvent& e) { clDebugEvent event(wxEVT_DBG_UI_RESTART); - if(EventNotifier::Get()->ProcessEvent(event)) + if(EventNotifier::Get()->ProcessEvent(event)) { return; + } IDebugger* dbgr = DebuggerMgr::Get().GetActiveDebugger(); if(dbgr && dbgr->IsRunning() && ManagerST::Get()->DbgCanInteract()) { @@ -3110,14 +3275,14 @@ void clMainFrame::OnIdle(wxIdleEvent& e) void clMainFrame::OnLinkClicked(wxHtmlLinkEvent& e) { wxString action = e.GetLinkInfo().GetHref(); - if(!action.StartsWith(wxT("action:"), &action)) { + if(!action.StartsWith("action:", &action)) { wxLaunchDefaultBrowser(e.GetLinkInfo().GetHref()); return; } - wxString command = action.BeforeFirst(wxT(':')); - wxString filename = action.AfterFirst(wxT(':')); - if(command != wxT("switch-workspace") && command != wxT("open-file") && command != wxT("create-workspace") && - command != wxT("import-msvs-solution") && command != wxT("open-workspace")) { + wxString command = action.BeforeFirst(':'); + wxString filename = action.AfterFirst(':'); + if(command != "switch-workspace" && command != "open-file" && command != "create-workspace" && + command != "import-msvs-solution" && command != "open-workspace") { e.Skip(); return; } @@ -3127,8 +3292,8 @@ void clMainFrame::OnLinkClicked(wxHtmlLinkEvent& e) StartPageData* data = new StartPageData; data->action = command; data->file_path = filename; - if(wxFileName(filename).GetExt() == wxT("workspace")) { - data->action = wxT("switch-workspace"); + if(wxFileName(filename).GetExt() == "workspace") { + data->action = "switch-workspace"; } event.SetClientData(data); wxPostEvent(this, event); @@ -3137,20 +3302,20 @@ void clMainFrame::OnLinkClicked(wxHtmlLinkEvent& e) void clMainFrame::OnStartPageEvent(wxCommandEvent& e) { StartPageData* data = (StartPageData*)e.GetClientData(); - if(data->action == wxT("switch-workspace")) { + if(data->action == "switch-workspace") { clWindowUpdateLocker locker(this); ManagerST::Get()->OpenWorkspace(data->file_path); - } else if(data->action == wxT("open-file")) { + } else if(data->action == "open-file") { clMainFrame::Get()->GetMainBook()->OpenFile(data->file_path, wxEmptyString); - } else if(data->action == wxT("create-workspace")) { + } else if(data->action == "create-workspace") { OnProjectNewWorkspace(e); - } else if(data->action == wxT("import-msvs-solution")) { + } else if(data->action == "import-msvs-solution") { OnImportMSVS(e); - } else if(data->action == wxT("open-workspace")) { + } else if(data->action == "open-workspace") { OnSwitchWorkspace(e); } wxDELETE(data); @@ -3189,10 +3354,6 @@ void clMainFrame::CompleteInitialization() } } - // Register C++ keyboard shortcuts - clKeyboardManager::Get()->AddGlobalAccelerator("swap_files", "F12", "C++::Swap Header/Implementation file"); - clKeyboardManager::Get()->AddGlobalAccelerator("open_include_file", "", "Open Include File"); - // Load the plugins PluginManager::Get()->Load(); @@ -3504,11 +3665,11 @@ void clMainFrame::OnCopyFileName(wxCommandEvent& event) if(wxTheClipboard->Open()) { wxTheClipboard->UsePrimarySelection(false); if(!wxTheClipboard->SetData(new wxTextDataObject(fileName))) { - // wxPrintf(wxT("Failed to insert data %s to clipboard"), textToCopy.GetData()); + // wxPrintf("Failed to insert data %s to clipboard", textToCopy.GetData()); } wxTheClipboard->Close(); } else { - wxPrintf(wxT("Failed to open the clipboard")); + wxPrintf("Failed to open the clipboard"); } #endif } @@ -3523,11 +3684,11 @@ void clMainFrame::OnCopyFilePath(wxCommandEvent& event) if(wxTheClipboard->Open()) { wxTheClipboard->UsePrimarySelection(false); if(!wxTheClipboard->SetData(new wxTextDataObject(fileName))) { - // wxPrintf(wxT("Failed to insert data %s to clipboard"), textToCopy.GetData()); + // wxPrintf("Failed to insert data %s to clipboard", textToCopy.GetData()); } wxTheClipboard->Close(); } else { - wxPrintf(wxT("Failed to open the clipboard")); + wxPrintf("Failed to open the clipboard"); } #endif } @@ -3541,11 +3702,11 @@ void clMainFrame::OnCopyFilePathOnly(wxCommandEvent& event) if(wxTheClipboard->Open()) { wxTheClipboard->UsePrimarySelection(false); if(!wxTheClipboard->SetData(new wxTextDataObject(fileName))) { - // wxPrintf(wxT("Failed to insert data %s to clipboard"), textToCopy.GetData()); + // wxPrintf("Failed to insert data %s to clipboard", textToCopy.GetData()); } wxTheClipboard->Close(); } else { - wxPrintf(wxT("Failed to open the clipboard")); + wxPrintf("Failed to open the clipboard"); } #endif } @@ -3591,18 +3752,18 @@ void clMainFrame::OnUpdateBuildRefactorIndexBar(wxCommandEvent& e) { wxUnusedVar void clMainFrame::OnHighlightWord(wxCommandEvent& event) { - long highlightWord = EditorConfigST::Get()->GetInteger(wxT("highlight_word"), 1); + long highlightWord = EditorConfigST::Get()->GetInteger("highlight_word", 1); // Notify all open editors that word hight is checked wxCommandEvent evtEnable(wxCMD_EVENT_ENABLE_WORD_HIGHLIGHT); if(!highlightWord) { GetMainBook()->HighlightWord(true); - EditorConfigST::Get()->SetInteger(wxT("highlight_word"), 1); + EditorConfigST::Get()->SetInteger("highlight_word", 1); evtEnable.SetInt(1); } else { GetMainBook()->HighlightWord(false); - EditorConfigST::Get()->SetInteger(wxT("highlight_word"), 0); + EditorConfigST::Get()->SetInteger("highlight_word", 0); evtEnable.SetInt(0); } @@ -3628,7 +3789,7 @@ void clMainFrame::OnSingleInstanceOpenFiles(clCommandEvent& e) wxFileName fn(files.Item(i)); // if file is workspace, load it - if(fn.GetExt() == wxT("workspace")) { + if(fn.GetExt() == "workspace") { wxCommandEvent workspaceEvent; workspaceEvent.SetString(files.Item(i)); OnSwitchWorkspace(workspaceEvent); @@ -3717,7 +3878,7 @@ void clMainFrame::OnNewDetachedPane(wxCommandEvent& e) // keep list of all detached panes wxArrayString panes = m_DPmenuMgr->GetDeatchedPanesList(); DetachedPanesInfo dpi(panes); - EditorConfigST::Get()->WriteObject(wxT("DetachedPanesList"), &dpi); + EditorConfigST::Get()->WriteObject("DetachedPanesList", &dpi); } } @@ -3733,7 +3894,7 @@ void clMainFrame::OnDestroyDetachedPane(wxCommandEvent& e) // keep list of all detached panes wxArrayString panes = m_DPmenuMgr->GetDeatchedPanesList(); DetachedPanesInfo dpi(panes); - EditorConfigST::Get()->WriteObject(wxT("DetachedPanesList"), &dpi); + EditorConfigST::Get()->WriteObject("DetachedPanesList", &dpi); pane->Destroy(); m_mgr.Update(); @@ -3785,8 +3946,9 @@ void clMainFrame::OnReloadWorkspace(wxCommandEvent& event) // let the plugins close any custom workspace clCommandEvent e(wxEVT_CMD_RELOAD_WORKSPACE, GetId()); e.SetEventObject(this); - if(EventNotifier::Get()->ProcessEvent(e)) + if(EventNotifier::Get()->ProcessEvent(e)) { return; // this event was handled by a plugin + } IDebugger* dbgr = DebuggerMgr::Get().GetActiveDebugger(); if(dbgr && dbgr->IsRunning()) { @@ -3818,7 +3980,7 @@ void clMainFrame::RebuildProject(const wxString& projectName) QueueCommand buildInfo(projectName, conf, false, QueueCommand::kClean); if(bldConf && bldConf->IsCustomBuild()) { buildInfo.SetKind(QueueCommand::kCustomBuild); - buildInfo.SetCustomBuildTarget(wxT("Clean")); + buildInfo.SetCustomBuildTarget("Clean"); } ManagerST::Get()->PushQueueCommand(buildInfo); @@ -3827,7 +3989,7 @@ void clMainFrame::RebuildProject(const wxString& projectName) if(bldConf && bldConf->IsCustomBuild()) { buildInfo.SetKind(QueueCommand::kCustomBuild); - buildInfo.SetCustomBuildTarget(wxT("Build")); + buildInfo.SetCustomBuildTarget("Build"); } ManagerST::Get()->PushQueueCommand(buildInfo); @@ -3873,7 +4035,7 @@ void clMainFrame::SetFrameTitle(clEditor* editor) { wxString title; if(editor && editor->GetModify()) { - title << wxT("*"); + title << "*"; } wxString pattern = clConfig::Get().Read(kConfigFrameTitlePattern, wxString("$workspace $fullpath")); @@ -3997,8 +4159,9 @@ void clMainFrame::OnOpenShellFromFilePath(wxCommandEvent& e) filepath = editor->GetFileName().GetPath(); } - if(filepath.IsEmpty()) + if(filepath.IsEmpty()) { return; + } DirSaver ds; wxSetWorkingDirectory(filepath); @@ -4061,8 +4224,9 @@ void clMainFrame::OnStartQuickDebug(clDebugEvent& e) // notify plugins that we're about to start debugging clDebugEvent eventStarting(wxEVT_DEBUG_STARTING); eventStarting.SetClientData(&startup_info); - if(EventNotifier::Get()->ProcessEvent(eventStarting)) + if(EventNotifier::Get()->ProcessEvent(eventStarting)) { return; + } clDebuggerBreakpoint::Vec_t bpList; ManagerST::Get()->GetBreakpointsMgr()->GetBreakpoints(bpList); @@ -4127,7 +4291,7 @@ void clMainFrame::OnDebugCoreDump(wxCommandEvent& e) if(dbgr && !dbgr->IsRunning()) { wxString debuggingcommand; - debuggingcommand << wxT("-c ") << dlg->GetCore() << wxT(" ") << dlg->GetExe(); + debuggingcommand << "-c " << dlg->GetCore() << " " << dlg->GetExe(); wxString wd = dlg->GetWorkingDirectory(); // update the debugger information @@ -4189,7 +4353,7 @@ void clMainFrame::OnDebugCoreDump(wxCommandEvent& e) } // Make sure that the debugger pane is visible, and select the stack trace tab - wxAuiPaneInfo& info = GetDockingManager().GetPane(wxT("Debugger")); + wxAuiPaneInfo& info = GetDockingManager().GetPane("Debugger"); if(info.IsOk() && !info.IsShown()) { ManagerST::Get()->ShowDebuggerPane(); } @@ -4315,18 +4479,22 @@ void clMainFrame::OnRetagWorkspace(wxCommandEvent& event) bool fullRetag = !(event.GetId() == XRCID("retag_workspace")); wxCommandEvent e(fullRetag ? wxEVT_CMD_RETAG_WORKSPACE_FULL : wxEVT_CMD_RETAG_WORKSPACE, GetId()); e.SetEventObject(this); - if(EventNotifier::Get()->ProcessEvent(e)) + if(EventNotifier::Get()->ProcessEvent(e)) { return; + } TagsManager::RetagType type = TagsManager::Retag_Quick_No_Scan; - if(event.GetId() == XRCID("retag_workspace")) + if(event.GetId() == XRCID("retag_workspace")) { type = TagsManager::Retag_Quick; + } - else if(event.GetId() == XRCID("full_retag_workspace")) + else if(event.GetId() == XRCID("full_retag_workspace")) { type = TagsManager::Retag_Full; + } - else if(event.GetId() == XRCID("retag_workspace_no_includes")) + else if(event.GetId() == XRCID("retag_workspace_no_includes")) { type = TagsManager::Retag_Quick_No_Scan; + } ManagerST::Get()->RetagWorkspace(type); } @@ -4394,8 +4562,9 @@ bool clMainFrame::ReloadExternallyModifiedProjectFiles() } } - if(!project_modified && !workspace_modified) + if(!project_modified && !workspace_modified) { return false; + } // Make sure we don't have the mouse captured in any editor or we might get a crash somewhere wxStandardID res = @@ -4469,26 +4638,26 @@ bool clMainFrame::SaveLayoutAndSession() SetFrameFlag(IsMaximized(), CL_MAXIMIZE_FRAME); SetFrameFlag(IsFullScreen(), CL_FULLSCREEN); - EditorConfigST::Get()->WriteObject(wxT("GeneralInfo"), &m_frameGeneralInfo); - EditorConfigST::Get()->SetInteger(wxT("ShowNavBar"), m_mainBook->IsNavBarEnabled() ? 1 : 0); + EditorConfigST::Get()->WriteObject("GeneralInfo", &m_frameGeneralInfo); + EditorConfigST::Get()->SetInteger("ShowNavBar", m_mainBook->IsNavBarEnabled() ? 1 : 0); GetWorkspacePane()->SaveWorkspaceViewTabOrder(); GetOutputPane()->SaveTabOrder(); // keep list of all detached panes wxArrayString panes = m_DPmenuMgr->GetDeatchedPanesList(); DetachedPanesInfo dpi(panes); - EditorConfigST::Get()->WriteObject(wxT("DetachedPanesList"), &dpi); + EditorConfigST::Get()->WriteObject("DetachedPanesList", &dpi); // Update the current perspective as the "NORMAL" one ManagerST::Get()->GetPerspectiveManager().SavePerspective(NORMAL_LAYOUT); // save the notebooks styles - EditorConfigST::Get()->SetInteger(wxT("MainBook"), GetMainBook()->GetBookStyle()); + EditorConfigST::Get()->SetInteger("MainBook", GetMainBook()->GetBookStyle()); EditorConfigST::Get()->Save(); return true; } -void clMainFrame::SaveGeneralSettings() { EditorConfigST::Get()->WriteObject(wxT("GeneralInfo"), &m_frameGeneralInfo); } +void clMainFrame::SaveGeneralSettings() { EditorConfigST::Get()->WriteObject("GeneralInfo", &m_frameGeneralInfo); } void clMainFrame::OnNextFiFMatch(wxCommandEvent& e) { @@ -4512,8 +4681,9 @@ void clMainFrame::OnFindResourceXXX(wxCommandEvent& e) // Let the plugins a chance before we handle this event wxCommandEvent eventOpenResource(wxEVT_CMD_OPEN_RESOURCE, GetId()); eventOpenResource.SetEventObject(this); - if(EventNotifier::Get()->ProcessEvent(eventOpenResource)) + if(EventNotifier::Get()->ProcessEvent(eventOpenResource)) { return; + } wxString initialText; clEditor* editor = GetMainBook()->GetActiveEditor(); @@ -4591,7 +4761,7 @@ void clMainFrame::StartTimer() { m_timer->Start(1000, true); } void clMainFrame::OnLoadPerspective(wxCommandEvent& e) { wxString file; - file << clStandardPaths::Get().GetUserDataDir() << wxT("/config/codelite.layout"); + file << clStandardPaths::Get().GetUserDataDir() << "/config/codelite.layout"; wxFileName oldLayoutFile(file); if(oldLayoutFile.FileExists(file)) { @@ -4629,7 +4799,7 @@ void clMainFrame::SelectBestEnvSet() BuildConfigPtr buildConf = clCxxWorkspaceST::Get()->GetProjBuildConf(activeProj, wxEmptyString); if(buildConf) { if(buildConf->GetEnvVarSet() != USE_WORKSPACE_ENV_VAR_SET && - buildConf->GetEnvVarSet() != wxT("") /* backward support */) { + buildConf->GetEnvVarSet() != "" /* backward support */) { projectSetName = buildConf->GetEnvVarSet(); } @@ -4641,7 +4811,7 @@ void clMainFrame::SelectBestEnvSet() workspaceSetName = clCxxWorkspaceST::Get()->GetLocalWorkspace()->GetActiveEnvironmentSet(); } - wxString globalActiveSet = wxT("Default"); + wxString globalActiveSet = "Default"; wxString activeSetName; EvnVarList vars = EnvironmentConfig::Instance()->GetSettings(); @@ -4662,15 +4832,15 @@ void clMainFrame::SelectBestEnvSet() // Select the debugger PreDefined Types settings /////////////////////////////////////////////////// DebuggerSettingsPreDefMap preDefTypeMap; - DebuggerConfigTool::Get()->ReadObject(wxT("DebuggerCommands"), &preDefTypeMap); + DebuggerConfigTool::Get()->ReadObject("DebuggerCommands", &preDefTypeMap); - wxString dbgSetName = wxT("Default"); + wxString dbgSetName = "Default"; if(!projectDbgSetName.IsEmpty() && preDefTypeMap.IsSetExist(projectDbgSetName)) { dbgSetName = projectDbgSetName; } preDefTypeMap.SetActive(dbgSetName); - DebuggerConfigTool::Get()->WriteObject(wxT("DebuggerCommands"), &preDefTypeMap); + DebuggerConfigTool::Get()->WriteObject("DebuggerCommands", &preDefTypeMap); } void clMainFrame::OnUpdateNumberOfBuildProcesses(wxCommandEvent& e) @@ -4683,7 +4853,7 @@ void clMainFrame::OnUpdateNumberOfBuildProcesses(wxCommandEvent& e) bs->SetToolJobs(jobs); BuildSettingsConfigST::Get()->SetBuildSystem(bs); - clLogMessage(wxT("Info: setting number of concurrent builder jobs to ") + jobs); + clLogMessage("Info: setting number of concurrent builder jobs to " + jobs); } } @@ -4718,7 +4888,7 @@ void clMainFrame::OnRestoreDefaultLayout(wxCommandEvent& e) clWindowUpdateLocker locker(this); #endif - clLogMessage(wxT("Restoring layout")); + clLogMessage("Restoring layout"); // Close all docking panes wxAuiPaneInfoArray& panes = m_mgr.GetAllPanes(); @@ -4806,13 +4976,15 @@ void clMainFrame::OnGrepWord(wxCommandEvent& e) { CHECK_SHUTDOWN(); clEditor* editor = GetMainBook()->GetActiveEditor(); - if(!editor || editor->GetSelectedText().IsEmpty()) + if(!editor || editor->GetSelectedText().IsEmpty()) { return; + } // Prepare the search data bool singleFileSearch(true); - if(e.GetId() == XRCID("grep_current_workspace")) + if(e.GetId() == XRCID("grep_current_workspace")) { singleFileSearch = false; + } SearchData data; data.SetFindString(editor->GetSelectedText()); @@ -4911,19 +5083,19 @@ void clMainFrame::OnPchCacheStarted(wxCommandEvent& e) { e.Skip(); } void clMainFrame::DoEnableWorkspaceViewFlag(bool enable, int flag) { long flags = View_Show_Default; - flags = EditorConfigST::Get()->GetInteger(wxT("view_workspace_view"), flags); + flags = EditorConfigST::Get()->GetInteger("view_workspace_view", flags); if(enable) { flags |= flag; } else { flags &= ~flag; } - EditorConfigST::Get()->SetInteger(wxT("view_workspace_view"), flags); + EditorConfigST::Get()->SetInteger("view_workspace_view", flags); } bool clMainFrame::IsWorkspaceViewFlagEnabled(int flag) { long flags = View_Show_Default; - flags = EditorConfigST::Get()->GetInteger(wxT("view_workspace_view"), flags); + flags = EditorConfigST::Get()->GetInteger("view_workspace_view", flags); return (flags & flag); } @@ -4988,8 +5160,9 @@ void clMainFrame::OnFileSaveUI(wxUpdateUIEvent& event) { event.Enable(true); } void clMainFrame::OnActivateEditor(wxCommandEvent& e) { clEditor* editor = dynamic_cast(e.GetEventObject()); - if(editor) + if(editor) { editor->SetActive(); + } } void clMainFrame::OnActiveEditorChanged(wxCommandEvent& e) @@ -5107,32 +5280,41 @@ void clMainFrame::OnShowDebuggerWindow(wxCommandEvent& e) conf.ReadItem(&item); bool show = e.IsChecked(); - if(e.GetId() == XRCID("debugger_win_locals")) + if(e.GetId() == XRCID("debugger_win_locals")) { item.ShowDebuggerWindow(DebuggerPaneConfig::Locals, show); + } - if(e.GetId() == XRCID("debugger_win_watches")) + if(e.GetId() == XRCID("debugger_win_watches")) { item.ShowDebuggerWindow(DebuggerPaneConfig::Watches, show); + } - if(e.GetId() == XRCID("debugger_win_output")) + if(e.GetId() == XRCID("debugger_win_output")) { item.ShowDebuggerWindow(DebuggerPaneConfig::Output, show); + } - if(e.GetId() == XRCID("debugger_win_threads")) + if(e.GetId() == XRCID("debugger_win_threads")) { item.ShowDebuggerWindow(DebuggerPaneConfig::Threads, show); + } - if(e.GetId() == XRCID("debugger_win_callstack")) + if(e.GetId() == XRCID("debugger_win_callstack")) { item.ShowDebuggerWindow(DebuggerPaneConfig::Callstack, show); + } - if(e.GetId() == XRCID("debugger_win_memory")) + if(e.GetId() == XRCID("debugger_win_memory")) { item.ShowDebuggerWindow(DebuggerPaneConfig::Memory, show); + } - if(e.GetId() == XRCID("debugger_win_breakpoints")) + if(e.GetId() == XRCID("debugger_win_breakpoints")) { item.ShowDebuggerWindow(DebuggerPaneConfig::Breakpoints, show); + } - if(e.GetId() == XRCID("debugger_win_asciiview")) + if(e.GetId() == XRCID("debugger_win_asciiview")) { item.ShowDebuggerWindow(DebuggerPaneConfig::AsciiViewer, show); + } - if(e.GetId() == XRCID("debugger_win_disassemble")) + if(e.GetId() == XRCID("debugger_win_disassemble")) { item.ShowDebuggerWindow(DebuggerPaneConfig::Disassemble, show); + } conf.WriteItem(&item); // Reload the perspective @@ -5148,29 +5330,37 @@ void clMainFrame::OnShowDebuggerWindowUI(wxUpdateUIEvent& e) DebuggerPaneConfig::eDebuggerWindows winid = DebuggerPaneConfig::None; - if(e.GetId() == XRCID("debugger_win_locals")) + if(e.GetId() == XRCID("debugger_win_locals")) { winid = DebuggerPaneConfig::Locals; + } - if(e.GetId() == XRCID("debugger_win_watches")) + if(e.GetId() == XRCID("debugger_win_watches")) { winid = DebuggerPaneConfig::Watches; + } - if(e.GetId() == XRCID("debugger_win_output")) + if(e.GetId() == XRCID("debugger_win_output")) { winid = DebuggerPaneConfig::Output; + } - if(e.GetId() == XRCID("debugger_win_threads")) + if(e.GetId() == XRCID("debugger_win_threads")) { winid = DebuggerPaneConfig::Threads; + } - if(e.GetId() == XRCID("debugger_win_callstack")) + if(e.GetId() == XRCID("debugger_win_callstack")) { winid = DebuggerPaneConfig::Callstack; + } - if(e.GetId() == XRCID("debugger_win_memory")) + if(e.GetId() == XRCID("debugger_win_memory")) { winid = DebuggerPaneConfig::Memory; + } - if(e.GetId() == XRCID("debugger_win_breakpoints")) + if(e.GetId() == XRCID("debugger_win_breakpoints")) { winid = DebuggerPaneConfig::Breakpoints; + } - if(e.GetId() == XRCID("debugger_win_asciiview")) + if(e.GetId() == XRCID("debugger_win_asciiview")) { winid = DebuggerPaneConfig::AsciiViewer; + } if(winid != DebuggerPaneConfig::None) { e.Check(item.IsDebuggerWindowShown(winid)); @@ -5337,8 +5527,9 @@ void clMainFrame::OnWorkspaceLoaded(clWorkspaceEvent& e) void clMainFrame::OnFileOpenFolder(wxCommandEvent& event) { wxString path = ::wxDirSelector(_("Select Folder")); - if(path.IsEmpty()) + if(path.IsEmpty()) { return; + } GetWorkspacePane()->GetFileExplorer()->OpenFolder(path); GetWorkspacePane()->SelectTab(GetWorkspacePane()->GetFileExplorer()->GetCaption()); } @@ -5654,8 +5845,9 @@ void clMainFrame::OnWordComplete(wxCommandEvent& event) wxStyledTextCtrl* stc = editor->GetCtrl(); int curPos = stc->GetCurrentPos(); int start = stc->WordStartPosition(stc->GetCurrentPos(), true); - if(curPos < start) + if(curPos < start) { return; + } clCodeCompletionEvent ccEvent(wxEVT_CC_WORD_COMPLETE); ccEvent.SetTriggerKind(LSP::CompletionItem::kTriggerUser); @@ -5664,8 +5856,9 @@ void clMainFrame::OnWordComplete(wxCommandEvent& event) ServiceProviderManager::Get().ProcessEvent(ccEvent); const wxCodeCompletionBoxEntry::Vec_t& entries = ccEvent.GetEntries(); - if(entries.empty()) + if(entries.empty()) { return; + } wxCodeCompletionBoxManager::Get().ShowCompletionBox( editor->GetCtrl(), entries, @@ -5743,8 +5936,9 @@ void clMainFrame::OnFindWordAtCaret(wxCommandEvent& event) ctrl->SetCurrentPos(start); } } - if(selection.IsEmpty()) + if(selection.IsEmpty()) { return; + } OnFindSelection(event); } @@ -5767,8 +5961,9 @@ void clMainFrame::OnFindWordAtCaretPrev(wxCommandEvent& event) ctrl->SetCurrentPos(start); } } - if(selection.IsEmpty()) + if(selection.IsEmpty()) { return; + } OnFindSelectionPrev(event); } diff --git a/LiteEditor/frame.h b/LiteEditor/frame.h index 685442a025..4df6e92537 100644 --- a/LiteEditor/frame.h +++ b/LiteEditor/frame.h @@ -343,6 +343,7 @@ class clMainFrame : public wxFrame clMainFrame(wxWindow* pParent, wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size, long style = wxMINIMIZE_BOX | wxMAXIMIZE_BOX | wxCLOSE_BOX | wxCAPTION | wxSYSTEM_MENU | wxRESIZE_BORDER | wxCLIP_CHILDREN); + void AddKeyboardAccelerators(); wxString CreateWorkspaceTable(); wxString CreateFilesTable(); void StartTimer(); diff --git a/Plugin/clKeyboardBindingConfig.cpp b/Plugin/clKeyboardBindingConfig.cpp index c55f8f00b6..8f12b95107 100644 --- a/Plugin/clKeyboardBindingConfig.cpp +++ b/Plugin/clKeyboardBindingConfig.cpp @@ -13,8 +13,9 @@ clKeyboardBindingConfig& clKeyboardBindingConfig::Load() { wxFileName fn(clStandardPaths::Get().GetUserDataDir(), "keybindings.conf"); fn.AppendDir("config"); - if(!fn.Exists()) + if(!fn.Exists()) { return *this; + } m_bindings.clear(); JSON root(fn); @@ -25,21 +26,11 @@ clKeyboardBindingConfig& clKeyboardBindingConfig::Load() for(int i = 0; i < arrSize; ++i) { JSONItem item = menus.arrayItem(i); MenuItemData binding; - binding.action = item.namedObject("description").toString(); - binding.accel = item.namedObject("accelerator").toString(); - binding.parentMenu = item.namedObject("parentMenu").toString(); binding.resourceID = item.namedObject("resourceID").toString(); - if(binding.resourceID == "text_word_complete") { - // This entry was moved from Word Completion plugin to CodeLite Edit menu entry - binding.resourceID = "simple_word_completion"; - binding.parentMenu = "Edit"; - binding.action = "Complete Word"; - } else if(binding.resourceID == "complete_word") { - // The "action" was changed - binding.action = "Code Complete"; - } else if(binding.resourceID == "word_complete") { - binding.resourceID = "complete_word"; - } + binding.parentMenu = item.namedObject("parentMenu").toString(); + binding.action = item.namedObject("description").toString(); + binding.accel.FromString(item.namedObject("accelerator").toString()); + MigrateOldResourceID(binding.resourceID); m_bindings.insert(std::make_pair(binding.resourceID, binding)); } } @@ -54,10 +45,10 @@ clKeyboardBindingConfig& clKeyboardBindingConfig::Save() mainObj.append(menuArr); for(MenuItemDataMap_t::iterator iter = m_bindings.begin(); iter != m_bindings.end(); ++iter) { JSONItem binding = JSONItem::createObject(); - binding.addProperty("description", iter->second.action); - binding.addProperty("accelerator", iter->second.accel); binding.addProperty("resourceID", iter->second.resourceID); binding.addProperty("parentMenu", iter->second.parentMenu); + binding.addProperty("description", iter->second.action); + binding.addProperty("accelerator", iter->second.accel.ToString()); menuArr.arrayAppend(binding); } wxFileName fn(clStandardPaths::Get().GetUserDataDir(), "keybindings.conf"); @@ -65,3 +56,13 @@ clKeyboardBindingConfig& clKeyboardBindingConfig::Save() root.save(fn); return *this; } + +void clKeyboardBindingConfig::MigrateOldResourceID(wxString& resourceID) const +{ + if(resourceID == "text_word_complete") { + // This entry was moved from Word Completion plugin to CodeLite Edit menu entry + resourceID = "simple_word_completion"; + } else if(resourceID == "word_complete") { + resourceID = "complete_word"; + } +} diff --git a/Plugin/clKeyboardBindingConfig.h b/Plugin/clKeyboardBindingConfig.h index debb4d08c8..63d98909e1 100644 --- a/Plugin/clKeyboardBindingConfig.h +++ b/Plugin/clKeyboardBindingConfig.h @@ -43,6 +43,8 @@ class WXDLLIMPEXP_SDK clKeyboardBindingConfig clKeyboardBindingConfig& Load(); clKeyboardBindingConfig& Save(); + void MigrateOldResourceID(wxString& resourceID) const; + bool Exists() const { wxFileName fn(clStandardPaths::Get().GetUserDataDir(), "keybindings.conf"); @@ -50,10 +52,9 @@ class WXDLLIMPEXP_SDK clKeyboardBindingConfig return fn.Exists(); } - clKeyboardBindingConfig& SetBindings(const MenuItemDataMap_t& menus, const MenuItemDataMap_t& globals) + clKeyboardBindingConfig& SetBindings(const MenuItemDataMap_t& accels) { - this->m_bindings = menus; - this->m_bindings.insert(globals.begin(), globals.end()); + this->m_bindings = accels; return *this; } const MenuItemDataMap_t& GetBindings() const { return m_bindings; } diff --git a/Plugin/clKeyboardManager.cpp b/Plugin/clKeyboardManager.cpp index f079e12976..21181475eb 100644 --- a/Plugin/clKeyboardManager.cpp +++ b/Plugin/clKeyboardManager.cpp @@ -89,15 +89,15 @@ clKeyboardManager::clKeyboardManager() // Alt-Shift // Alt // Shift - std::for_each(m_keyCodes.begin(), m_keyCodes.end(), [&](const wxString& keyCode) { - m_allShorcuts.insert("Ctrl-Alt-Shift-" + keyCode); - m_allShorcuts.insert("Ctrl-Alt-" + keyCode); - m_allShorcuts.insert("Ctrl-Shift-" + keyCode); - m_allShorcuts.insert("Ctrl-" + keyCode); - m_allShorcuts.insert("Alt-Shift-" + keyCode); - m_allShorcuts.insert("Alt-" + keyCode); - m_allShorcuts.insert("Shift-" + keyCode); - }); + for(const wxString& keyCode : m_keyCodes) { + m_allShortcuts.insert("Ctrl-Alt-Shift-" + keyCode); + m_allShortcuts.insert("Ctrl-Alt-" + keyCode); + m_allShortcuts.insert("Ctrl-Shift-" + keyCode); + m_allShortcuts.insert("Ctrl-" + keyCode); + m_allShortcuts.insert("Alt-Shift-" + keyCode); + m_allShortcuts.insert("Alt-" + keyCode); + m_allShortcuts.insert("Shift-" + keyCode); + } } clKeyboardManager::~clKeyboardManager() @@ -156,7 +156,7 @@ void clKeyboardManager::DoUpdateMenu(wxMenu* menu, MenuItemDataIntMap_t& accels, wxString itemText = item->GetItemLabel(); // remove the old shortcut itemText = itemText.BeforeFirst('\t'); - itemText << "\t" << where->second.accel; + itemText << "\t" << where->second.accel.ToString(); // Replace the item text (mnemonics + accel + label) item->SetItemLabel(itemText); @@ -197,7 +197,7 @@ void clKeyboardManager::DoUpdateFrame(wxFrame* frame, MenuItemDataIntMap_t& acce clDEBUG() << "clKeyboardManager: appending global entries" << clEndl; for(MenuItemDataIntMap_t::iterator iter = accels.begin(); iter != accels.end(); ++iter) { wxString dummyText; - dummyText << iter->second.action << "\t" << iter->second.accel; + dummyText << iter->second.action << "\t" << iter->second.accel.ToString(); wxAcceleratorEntry* entry = wxAcceleratorEntry::Create(dummyText); if(entry) { entry->Set(entry->GetFlags(), entry->GetKeyCode(), wxXmlResource::GetXRCID(iter->second.resourceID)); @@ -219,12 +219,12 @@ void clKeyboardManager::DoUpdateFrame(wxFrame* frame, MenuItemDataIntMap_t& acce void clKeyboardManager::Save() { clKeyboardBindingConfig config; - config.SetBindings(m_menuTable, m_globalTable).Save(); + config.SetBindings(m_accelTable).Save(); } void clKeyboardManager::Initialize() { - m_menuTable.clear(); + m_accelTable.clear(); CL_DEBUG("Keyboard manager: Initializing keyboard manager"); // Load old format clKeyboardBindingConfig config; @@ -233,89 +233,50 @@ void clKeyboardManager::Initialize() // Decide which file we want to load, take the user settings file first wxFileName fnOldSettings(clStandardPaths::Get().GetUserDataDir(), "accelerators.conf"); fnOldSettings.AppendDir("config"); - - wxFileName fnDefaultOldSettings(clStandardPaths::Get().GetDataDir(), "accelerators.conf.default"); - fnDefaultOldSettings.AppendDir("config"); - wxFileName fnFileToLoad; - bool canDeleteOldSettings(false); if(fnOldSettings.Exists()) { - fnFileToLoad = fnOldSettings; - canDeleteOldSettings = true; - } else { - fnFileToLoad = fnDefaultOldSettings; - } - - if(fnFileToLoad.Exists()) { - CL_DEBUG("Keyboard manager: Importing settings from '%s'", fnFileToLoad.GetFullPath()); - + CL_DEBUG("Keyboard manager: Importing settings from '%s'", fnOldSettings.GetFullPath()); // Apply the old settings to the menus - wxString content; - if(!FileUtils::ReadFileContent(fnFileToLoad, content)) - return; - wxArrayString lines = ::wxStringTokenize(content, "\r\n", wxTOKEN_STRTOK); - for(size_t i = 0; i < lines.GetCount(); ++i) { - wxArrayString parts = ::wxStringTokenize(lines.Item(i), "|", wxTOKEN_RET_EMPTY); - if(parts.GetCount() < 3) - continue; - MenuItemData binding; - binding.resourceID = parts.Item(0); - binding.parentMenu = parts.Item(1); - binding.action = parts.Item(2); - if(parts.GetCount() == 4) { - binding.accel = parts.Item(3); - } - m_menuTable.insert(std::make_pair(binding.resourceID, binding)); - } + m_accelTable = DoLoadAccelerators(fnOldSettings); - if(canDeleteOldSettings) { - wxLogNull noLog; - clRemoveFile(fnFileToLoad.GetFullPath()); - } + wxLogNull noLog; + clRemoveFile(fnOldSettings.GetFullPath()); } } else { config.Load(); - m_menuTable = config.GetBindings(); + m_accelTable = config.GetBindings(); } // Load the default settings and add any new entries - MenuItemDataMap_t defaultEntries = DoLoadDefaultAccelerators(); - std::for_each(defaultEntries.begin(), defaultEntries.end(), [&](const MenuItemDataMap_t::value_type& vt) { - if(m_menuTable.count(vt.first) == 0) { - m_menuTable.insert(vt); + for(const MenuItemDataMap_t::value_type& vt : m_defaultAccelTable) { + MenuItemDataMap_t::iterator iter = m_accelTable.find(vt.first); + if(iter == m_accelTable.end()) { + // Add new entry + MenuItemData mid = vt.second; + if(Exists(mid.accel)) { + // This shortcut is already in use, disable it + mid.accel.Clear(); + } + m_accelTable.emplace(mid.resourceID, mid); + } else { + // Update the description to reflect localization changes + iter->second.parentMenu = vt.second.parentMenu; + iter->second.action = vt.second.action; } - }); + } // Store the correct configuration - config.SetBindings(m_menuTable, m_globalTable).Save(); + config.SetBindings(m_accelTable).Save(); // And apply the changes Update(); } -void clKeyboardManager::GetAllAccelerators(MenuItemDataMap_t& accels) const -{ - accels.clear(); - accels.insert(m_menuTable.begin(), m_menuTable.end()); - accels.insert(m_globalTable.begin(), m_globalTable.end()); -} +void clKeyboardManager::GetAllAccelerators(MenuItemDataMap_t& accels) const { accels = m_accelTable; } void clKeyboardManager::SetAccelerators(const MenuItemDataMap_t& accels) { - // separate the globals from the menu accelerators - // The process is done by checking each item's parentMenu - // If the parentMenu is empty -> global accelerator - MenuItemDataMap_t globals, menus; - MenuItemDataMap_t::const_iterator iter = accels.begin(); - for(; iter != accels.end(); ++iter) { - if(iter->second.parentMenu.IsEmpty()) { - globals.insert(std::make_pair(iter->first, iter->second)); - } else { - menus.insert(std::make_pair(iter->first, iter->second)); - } - } + m_accelTable = accels; - m_menuTable.swap(menus); - m_globalTable.swap(globals); Update(); Save(); } @@ -324,14 +285,8 @@ void clKeyboardManager::Update(wxFrame* frame) { // Since we keep the accelerators with their original resource ID in the form of string // we need to convert the map into a different integer with integer as the resource ID - - // Note that we place the items from the m_menuTable first and then we add the globals - // this is because menu entries takes precedence over global accelerators - MenuItemDataMap_t accels = m_menuTable; - accels.insert(m_globalTable.begin(), m_globalTable.end()); - MenuItemDataIntMap_t intAccels; - DoConvertToIntMap(accels, intAccels); + DoConvertToIntMap(m_accelTable, intAccels); if(!frame) { // update all frames @@ -352,16 +307,14 @@ int clKeyboardManager::PopupNewKeyboardShortcutDlg(wxWindow* parent, MenuItemDat return wxID_CANCEL; } -bool clKeyboardManager::Exists(const wxString& accel) const +bool clKeyboardManager::Exists(const clKeyboardShortcut& accel) const { - if(accel.IsEmpty()) + if(!accel.IsOk()) { return false; + } - MenuItemDataMap_t accels; - GetAllAccelerators(accels); - - MenuItemDataMap_t::const_iterator iter = accels.begin(); - for(; iter != accels.end(); ++iter) { + MenuItemDataMap_t::const_iterator iter = m_accelTable.begin(); + for(; iter != m_accelTable.end(); ++iter) { if(iter->second.accel == accel) { return true; } @@ -369,14 +322,23 @@ bool clKeyboardManager::Exists(const wxString& accel) const return false; } -void clKeyboardManager::AddGlobalAccelerator(const wxString& resourceID, const wxString& keyboardShortcut, - const wxString& description) +void clKeyboardManager::AddAccelerator(const wxString& resourceID, const wxString& parentMenu, const wxString& action, + const clKeyboardShortcut& accel) { + wxASSERT_MSG(m_defaultAccelTable.count(resourceID) == 0, "An accelerator with this resourceID already exists"); MenuItemData mid; - mid.action = description; - mid.accel = keyboardShortcut; mid.resourceID = resourceID; - m_globalTable.insert(std::make_pair(mid.resourceID, mid)); + mid.parentMenu = parentMenu; + mid.action = action; + mid.accel = accel; + m_defaultAccelTable.emplace(mid.resourceID, mid); +} + +void clKeyboardManager::AddAccelerator(const wxString& parentMenu, const std::vector& table) +{ + for(const AddAccelData& data : table) { + AddAccelerator(data.m_resourceID, parentMenu, data.m_action, data.m_accel); + } } void clKeyboardManager::RestoreDefaults() @@ -416,48 +378,42 @@ void clKeyboardManager::DoConvertToIntMap(const MenuItemDataMap_t& strMap, MenuI } } -wxArrayString clKeyboardManager::GetAllUnasignedKeyboardShortcuts() const +clKeyboardShortcut::Vec_t clKeyboardManager::GetAllUnassignedKeyboardShortcuts() const { - MenuItemDataMap_t accels; - GetAllAccelerators(accels); - - wxStringSet_t usedShortcuts; - std::for_each(accels.begin(), accels.end(), [&](const std::pair& p) { - if(!p.second.accel.IsEmpty()) { + clKeyboardShortcut::Set_t usedShortcuts; + for(const std::pair& p : m_accelTable) { + if(p.second.accel.IsOk()) { usedShortcuts.insert(p.second.accel); } - }); + } // Remove all duplicate entries - wxArrayString allUnasigned; - std::set_difference(m_allShorcuts.begin(), m_allShorcuts.end(), usedShortcuts.begin(), usedShortcuts.end(), - std::back_inserter(allUnasigned)); - allUnasigned.Sort(); - return allUnasigned; + clKeyboardShortcut::Vec_t allUnassigned; + std::set_difference(m_allShortcuts.begin(), m_allShortcuts.end(), usedShortcuts.begin(), usedShortcuts.end(), + std::back_inserter(allUnassigned)); + return allUnassigned; } -MenuItemDataMap_t clKeyboardManager::DoLoadDefaultAccelerators() +MenuItemDataMap_t clKeyboardManager::DoLoadAccelerators(const wxFileName& filename) const { MenuItemDataMap_t entries; - wxFileName fnDefaultOldSettings(clStandardPaths::Get().GetDataDir(), "accelerators.conf.default"); - fnDefaultOldSettings.AppendDir("config"); - - if(fnDefaultOldSettings.Exists()) { + if(filename.Exists()) { wxString content; - if(!FileUtils::ReadFileContent(fnDefaultOldSettings, content)) { + if(!FileUtils::ReadFileContent(filename, content)) { return entries; } wxArrayString lines = ::wxStringTokenize(content, "\r\n", wxTOKEN_STRTOK); for(size_t i = 0; i < lines.GetCount(); ++i) { wxArrayString parts = ::wxStringTokenize(lines.Item(i), "|", wxTOKEN_RET_EMPTY); - if(parts.GetCount() < 3) + if(parts.GetCount() < 3) { continue; + } MenuItemData binding; binding.resourceID = parts.Item(0); binding.parentMenu = parts.Item(1); binding.action = parts.Item(2); if(parts.GetCount() == 4) { - binding.accel = parts.Item(3); + binding.accel.FromString(parts.Item(3)); } entries.insert(std::make_pair(binding.resourceID, binding)); } @@ -465,6 +421,28 @@ MenuItemDataMap_t clKeyboardManager::DoLoadDefaultAccelerators() return entries; } +bool clKeyboardShortcut::operator==(const clKeyboardShortcut& rhs) const +{ + return this->GetCtrl() == rhs.GetCtrl() && this->GetAlt() == rhs.GetAlt() && this->GetShift() == rhs.GetShift() && + this->GetKeyCode() == rhs.GetKeyCode(); +} + +bool clKeyboardShortcut::operator<(const clKeyboardShortcut& rhs) const +{ + if(this->GetShift() != rhs.GetShift()) { + return this->GetShift() < rhs.GetShift(); + } + if(this->GetAlt() != rhs.GetAlt()) { + return this->GetAlt() < rhs.GetAlt(); + } + if(this->GetCtrl() != rhs.GetCtrl()) { + return this->GetCtrl() < rhs.GetCtrl(); + } + return this->GetKeyCode() < rhs.GetKeyCode(); +} + +bool clKeyboardShortcut::IsOk() const { return !m_keyCode.IsEmpty(); } + void clKeyboardShortcut::Clear() { m_ctrl = false; @@ -473,21 +451,60 @@ void clKeyboardShortcut::Clear() m_keyCode.Clear(); } +wxArrayString clKeyboardShortcut::Tokenize(const wxString& accelString) const +{ + /** + * For example, "Ctrl-Alt-1" will be tokenized into: + * [0] Ctrl + * [1] - + * [2] Alt + * [3] - + * [4] 1 + * + * Note that we also need the delimiter itself (in this case, '-') + * to properly interpret accelerators like "Ctrl--" or just "-", + * so we can't use wxStringTokenizer here + */ + wxString token; + wxArrayString tokens; + for(const wxUniChar& ch : accelString) { + if(ch == '-' || ch == '+') { + if(!token.IsEmpty()) { + tokens.Add(token); + token.Clear(); + } + tokens.Add(ch); + } else { + token << ch; + } + } + if(!token.IsEmpty()) { + tokens.Add(token); + } + return tokens; +} + void clKeyboardShortcut::FromString(const wxString& accelString) { Clear(); - wxArrayString tokens = ::wxStringTokenize(accelString, "-+", wxTOKEN_STRTOK); + if(accelString.IsEmpty()) { + return; + } + + wxArrayString tokens = Tokenize(accelString); for(size_t i = 0; i < tokens.GetCount(); ++i) { wxString token = tokens.Item(i); - token.MakeLower(); - if(token == "shift") { - m_shift = true; - } else if(token == "alt") { - m_alt = true; - } else if(token == "ctrl") { + if(token.IsSameAs("ctrl", false)) { m_ctrl = true; + ++i; + } else if(token.IsSameAs("alt", false)) { + m_alt = true; + ++i; + } else if(token.IsSameAs("shift", false)) { + m_shift = true; + ++i; } else { - m_keyCode = tokens.Item(i); + m_keyCode = token.MakeUpper(); } } } @@ -495,7 +512,7 @@ void clKeyboardShortcut::FromString(const wxString& accelString) wxString clKeyboardShortcut::ToString() const { // An accelerator must contain a key code - if(m_keyCode.IsEmpty()) { + if(!IsOk()) { return ""; } diff --git a/Plugin/clKeyboardManager.h b/Plugin/clKeyboardManager.h index 18f7eb96bf..cd9ac1f26b 100644 --- a/Plugin/clKeyboardManager.h +++ b/Plugin/clKeyboardManager.h @@ -33,47 +33,63 @@ #include #include +#include #include #include #include #include #include -struct WXDLLIMPEXP_SDK MenuItemData { - wxString resourceID; - wxString accel; - wxString action; - wxString parentMenu; // For display purposes +class WXDLLIMPEXP_SDK clKeyboardShortcut +{ + bool m_ctrl = false; + bool m_alt = false; + bool m_shift = false; + wxString m_keyCode; - struct ClearParentMenu { - void operator()(std::pair& iter) { iter.second.parentMenu.Clear(); } - }; + /** + * @brief tokenize the accelerator string + */ + wxArrayString Tokenize(const wxString& accelString) const; - struct PrependPrefix { - wxString m_prefix; - PrependPrefix(const wxString& prefix) - : m_prefix(prefix) - { - } - void operator()(std::pair& iter) { iter.second.action.Prepend(m_prefix); } - }; -}; +public: + clKeyboardShortcut() {} + clKeyboardShortcut(bool ctrl, bool alt, bool shift, const wxString& keyCode) + : m_ctrl(ctrl) + , m_alt(alt) + , m_shift(shift) + , m_keyCode(keyCode) + { + } + clKeyboardShortcut(const char* accelString) { FromString(wxString(accelString)); } + clKeyboardShortcut(const wxString& accelString) { FromString(accelString); } -typedef std::unordered_map MenuItemDataMap_t; -typedef std::unordered_map MenuItemDataIntMap_t; + /** + * @brief please use the FromString() instead + */ + clKeyboardShortcut& operator=(const char* accelString) = delete; + clKeyboardShortcut& operator=(const wxString& accelString) = delete; -struct WXDLLIMPEXP_SDK clKeyboardShortcut { - bool m_ctrl; - bool m_alt; - bool m_shift; - wxString m_keyCode; + bool GetCtrl() const { return IsOk() && m_ctrl; } + bool GetAlt() const { return IsOk() && m_alt; } + bool GetShift() const { return IsOk() && m_shift; } + const wxString& GetKeyCode() const { return m_keyCode; } - clKeyboardShortcut() - : m_ctrl(false) - , m_alt(false) - , m_shift(false) - { - } + /** + * @brief equality operators + */ + bool operator==(const clKeyboardShortcut& rhs) const; + bool operator!=(const clKeyboardShortcut& rhs) const { return !(*this == rhs); } + + /** + * @brief 'less than' operator (may be used in STL containers) + */ + bool operator<(const clKeyboardShortcut& rhs) const; + + /** + * @brief returns true if this shortcut is valid, false otherwise + */ + bool IsOk() const; /** * @brief clear this accelerator @@ -90,18 +106,57 @@ struct WXDLLIMPEXP_SDK clKeyboardShortcut { */ wxString ToString() const; - typedef std::vector Vec_t; + using Vec_t = std::vector; + using Set_t = std::set; +}; + +struct WXDLLIMPEXP_SDK MenuItemData { + wxString resourceID; + wxString parentMenu; // For display purposes + wxString action; + clKeyboardShortcut accel; + + struct ClearParentMenu { + void operator()(std::pair& iter) { iter.second.parentMenu.Clear(); } + }; + + struct PrependPrefix { + wxString m_prefix; + PrependPrefix(const wxString& prefix) + : m_prefix(prefix) + { + } + void operator()(std::pair& iter) { iter.second.action.Prepend(m_prefix); } + }; }; +typedef std::unordered_map MenuItemDataMap_t; +typedef std::unordered_map MenuItemDataIntMap_t; + wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_SDK, wxEVT_KEYBOARD_ACCEL_INIT_DONE, clCommandEvent); class WXDLLIMPEXP_SDK clKeyboardManager : public wxEvtHandler { private: typedef std::list FrameList_t; - MenuItemDataMap_t m_menuTable; - MenuItemDataMap_t m_globalTable; + MenuItemDataMap_t m_accelTable; // a set of accelerators configured by user + MenuItemDataMap_t m_defaultAccelTable; // a set of default accelerators wxStringSet_t m_keyCodes; - wxStringSet_t m_allShorcuts; + clKeyboardShortcut::Set_t m_allShortcuts; + + /** + * @brief an internal struct used by the 2nd AddAccelerator() overload + */ + struct AddAccelData { + AddAccelData(const wxString& resourceID, const wxString& action, const clKeyboardShortcut& accel = {}) + : m_resourceID(resourceID) + , m_action(action) + , m_accel(accel) + { + } + wxString m_resourceID; + wxString m_action; + clKeyboardShortcut m_accel; + }; protected: /** @@ -111,7 +166,7 @@ class WXDLLIMPEXP_SDK clKeyboardManager : public wxEvtHandler void DoUpdateMenu(wxMenu* menu, MenuItemDataIntMap_t& accels, std::vector& table); void DoUpdateFrame(wxFrame* frame, MenuItemDataIntMap_t& accels); void DoConvertToIntMap(const MenuItemDataMap_t& strMap, MenuItemDataIntMap_t& intMap); - MenuItemDataMap_t DoLoadDefaultAccelerators(); + MenuItemDataMap_t DoLoadAccelerators(const wxFileName& filename) const; clKeyboardManager(); virtual ~clKeyboardManager(); @@ -126,7 +181,7 @@ class WXDLLIMPEXP_SDK clKeyboardManager : public wxEvtHandler /** * @brief return an array of all unassigned keyboard shortcuts */ - wxArrayString GetAllUnasignedKeyboardShortcuts() const; + clKeyboardShortcut::Vec_t GetAllUnassignedKeyboardShortcuts() const; /** * @brief show a 'Add keyboard shortcut' dialog @@ -136,7 +191,7 @@ class WXDLLIMPEXP_SDK clKeyboardManager : public wxEvtHandler /** * @brief return true if the accelerator is already assigned */ - bool Exists(const wxString& accel) const; + bool Exists(const clKeyboardShortcut& accel) const; /** * @brief save the bindings to disk @@ -150,11 +205,20 @@ class WXDLLIMPEXP_SDK clKeyboardManager : public wxEvtHandler /** * @brief add keyboard shortcut by specifying the action ID + the shortcut combination - * For example: AddAccelerator("wxID_COPY", "Ctrl-Shift-C", "Copy the current selection"); - * @return true if the action succeeded, false otherwise + * For example: AddAccelerator("wxID_COPY", _("Edit"), _("Copy the current selection"), "Ctrl-Shift-C"); + */ + void AddAccelerator(const wxString& resourceID, const wxString& parentMenu, const wxString& action, + const clKeyboardShortcut& accel = {}); + + /** + * @brief a convenience overload for AddAccelerator() method + * For example: + * AddAccelerator(_("File"), { { "wxID_OPEN", _("Open"), "Ctrl-O" }, { "wxID_CLOSE", _("Close"), "Ctrl-W" } }); + * is equivalent to: + * AddAccelerator("wxID_OPEN", _("File"), _("Open"), "Ctrl-O"); + * AddAccelerator("wxID_CLOSE", _("File"), _("Close"), "Ctrl-W"); */ - void AddGlobalAccelerator(const wxString& resourceID, const wxString& keyboardShortcut, - const wxString& description); + void AddAccelerator(const wxString& parentMenu, const std::vector& table); /** * @brief replace all acceleratos with 'accels' diff --git a/Plugin/newkeyshortcutdlg.cpp b/Plugin/newkeyshortcutdlg.cpp index 57881fffe5..e3b0166c11 100644 --- a/Plugin/newkeyshortcutdlg.cpp +++ b/Plugin/newkeyshortcutdlg.cpp @@ -28,8 +28,6 @@ #include "globals.h" #include "windowattrmanager.h" -#include - static const struct wxKeyName { wxKeyCode code; const char* name; @@ -114,15 +112,14 @@ NewKeyShortcutDlg::NewKeyShortcutDlg(wxWindow* parent, const MenuItemData& mid) Initialise(mid.accel); } -void NewKeyShortcutDlg::Initialise(const wxString& accel) +void NewKeyShortcutDlg::Initialise(const clKeyboardShortcut& accel) { - NewKeyShortcutDlg::KeyboardShortcut ks = FromString(accel); m_staticTextAction->SetLabel(m_mid.action); - m_textCtrl1->ChangeValue(ks.key); + m_textCtrl1->ChangeValue(accel.GetKeyCode()); - m_checkBoxAlt->SetValue(ks.modifiers & kAlt); - m_checkBoxCtrl->SetValue(ks.modifiers & kCtrl); - m_checkBoxShift->SetValue(ks.modifiers & kShift); + m_checkBoxAlt->SetValue(accel.GetAlt()); + m_checkBoxCtrl->SetValue(accel.GetCtrl()); + m_checkBoxShift->SetValue(accel.GetShift()); } void NewKeyShortcutDlg::OnKeyDown(wxKeyEvent& event) @@ -134,7 +131,7 @@ void NewKeyShortcutDlg::OnKeyDown(wxKeyEvent& event) m_textCtrl1->ChangeValue(text); } -wxString NewKeyShortcutDlg::ToString(wxKeyEvent& e) +wxString NewKeyShortcutDlg::ToString(wxKeyEvent& e) const { wxString text; @@ -148,13 +145,13 @@ wxString NewKeyShortcutDlg::ToString(wxKeyEvent& e) const int code = e.GetKeyCode(); - if(code >= WXK_F1 && code <= WXK_F12) + if(code >= WXK_F1 && code <= WXK_F12) { text << _("F") << code - WXK_F1 + 1; - else if(code >= WXK_NUMPAD0 && code <= WXK_NUMPAD9) + } else if(code >= WXK_NUMPAD0 && code <= WXK_NUMPAD9) { text << code - WXK_NUMPAD0; - else if(code >= WXK_SPECIAL1 && code <= WXK_SPECIAL20) + } else if(code >= WXK_SPECIAL1 && code <= WXK_SPECIAL20) { text << _("SPECIAL") << code - WXK_SPECIAL1 + 1; - else { // check the named keys + } else { // check the named keys size_t n; for(n = 0; n < WXSIZEOF(wxKeyNames); n++) { const wxKeyName& kn = wxKeyNames[n]; @@ -177,44 +174,10 @@ wxString NewKeyShortcutDlg::ToString(wxKeyEvent& e) return text; } -NewKeyShortcutDlg::KeyboardShortcut NewKeyShortcutDlg::FromString(const wxString& accelString) -{ - wxString tmp_accel = accelString; - tmp_accel.MakeLower(); - - NewKeyShortcutDlg::KeyboardShortcut ks; - wxArrayString tokens = ::wxStringTokenize(accelString, "-+", wxTOKEN_STRTOK); - - for(size_t i = 0; i < tokens.GetCount(); ++i) { - wxString token = tokens.Item(i); - token.MakeLower(); - if(token == "shift") { - ks.modifiers |= kShift; - } else if(token == "alt") { - ks.modifiers |= kAlt; - } else if(token == "ctrl") { - ks.modifiers |= kCtrl; - } else { - ks.key = tokens.Item(i); - } - } - return ks; -} - -wxString NewKeyShortcutDlg::GetAccel() const +clKeyboardShortcut NewKeyShortcutDlg::GetAccel() const { - wxString accel; - if(m_checkBoxCtrl->IsChecked()) - accel << "Ctrl-"; - if(m_checkBoxAlt->IsChecked()) - accel << "Alt-"; - if(m_checkBoxShift->IsChecked()) - accel << "Shift-"; - accel << m_textCtrl1->GetValue(); - if(accel.EndsWith("-")) { - accel.RemoveLast(); - } - return accel; + return { m_checkBoxCtrl->IsChecked(), m_checkBoxAlt->IsChecked(), m_checkBoxShift->IsChecked(), + m_textCtrl1->GetValue() }; } void NewKeyShortcutDlg::OnClear(wxCommandEvent& event) @@ -235,9 +198,21 @@ void NewKeyShortcutDlg::OnClearUI(wxUpdateUIEvent& event) NewKeyShortcutDlg::~NewKeyShortcutDlg() {} +wxArrayString NewKeyShortcutDlg::GetSuggestions() const +{ + clKeyboardShortcut::Vec_t unassignedShortcuts = clKeyboardManager::Get()->GetAllUnassignedKeyboardShortcuts(); + + wxArrayString suggestions; + suggestions.Alloc(unassignedShortcuts.size()); + for(const clKeyboardShortcut& shortcut : unassignedShortcuts) { + suggestions.Add(shortcut.ToString()); + } + return suggestions; +} + void NewKeyShortcutDlg::OnSuggest(wxCommandEvent& event) { - clSingleChoiceDialog dlg(this, clKeyboardManager::Get()->GetAllUnasignedKeyboardShortcuts(), 0); + clSingleChoiceDialog dlg(this, GetSuggestions(), 0); ::clSetDialogSizeAndPosition(&dlg, 1.2); // give it a reasonable size dlg.SetLabel(_("Select a Keyboard Shortcut")); if(dlg.ShowModal() == wxID_OK) { diff --git a/Plugin/newkeyshortcutdlg.h b/Plugin/newkeyshortcutdlg.h index 670591daef..9cdb2ca554 100644 --- a/Plugin/newkeyshortcutdlg.h +++ b/Plugin/newkeyshortcutdlg.h @@ -31,33 +31,21 @@ class WXDLLIMPEXP_SDK NewKeyShortcutDlg : public NewKeyShortcutBaseDlg { MenuItemData m_mid; - // On OSX, kCtrl => CMD and kRawCtrl => Actual Ctrl key - enum { kAlt = (1 << 0), kCtrl = (1 << 1), kShift = (1 << 2) }; - - struct KeyboardShortcut { - size_t modifiers; - wxString key; - - KeyboardShortcut() - : modifiers(0) - { - } - }; protected: virtual void OnSuggest(wxCommandEvent& event); virtual void OnClear(wxCommandEvent& event); virtual void OnClearUI(wxUpdateUIEvent& event); - void OnKeyDown(wxKeyEvent& event); - wxString ToString(wxKeyEvent& e); - NewKeyShortcutDlg::KeyboardShortcut FromString(const wxString& accelString); + virtual void OnKeyDown(wxKeyEvent& event); + wxString ToString(wxKeyEvent& e) const; + wxArrayString GetSuggestions() const; - void Initialise(const wxString& accel); + void Initialise(const clKeyboardShortcut& accel); public: NewKeyShortcutDlg(wxWindow* parent, const MenuItemData& mid); virtual ~NewKeyShortcutDlg(); - wxString GetAccel() const; + clKeyboardShortcut GetAccel() const; }; #endif // __newkeyshortcutdlg__ diff --git a/Runtime/config/accelerators.conf.default b/Runtime/config/accelerators.conf.default deleted file mode 100644 index becb0d7931..0000000000 --- a/Runtime/config/accelerators.conf.default +++ /dev/null @@ -1,187 +0,0 @@ -new_file|File|New File|Ctrl-N -open_file|File|Open File...|Ctrl-O -refresh_file|File|Reload File|Ctrl-R -save_file|File|Save File|Ctrl-S -duplicate_tab|File|Duplicate Tab| -save_file_as|File|Save As...|Ctrl-Shift-S -save_all|File|Save all files| -close_file|File|Close|Ctrl-W -wxID_CLOSE_ALL|File|Close All| -wxID_PRINT|File|Print...|Ctrl-P -load_last_session|File|Load last session on restart| -exit_app|File|Exit|Alt-X -wxID_UNDO|Edit|Undo|Ctrl-Z -wxID_REDO|Edit|Redo|Ctrl-Y -wxID_CUT|Edit|Cut|Ctrl-X -wxID_COPY|Edit|Copy|Ctrl-C -wxID_PASTE|Edit|Paste|Ctrl-V -wxID_DUPLICATE|Edit|Duplicate Selection / Line|Ctrl-D -delete_line_end|Edit|Delete to Line End| -delete_line_start|Edit|Delete to Line Start| -delete_line|Edit|Delete Line|Ctrl-L -copy_line|Edit|Copy Line| -cut_line|Edit|Cut Line| -to_lower|Edit|Make Lowercase|Ctrl-U -to_upper|Edit|Make Uppercase|Ctrl-Shift-U -insert_doxy_comment|Edit|Insert Comment Block|Ctrl-Shift-D -comment_line|Edit|Comment Line|Ctrl-/ -comment_selection|Edit|Comment Selection|Ctrl-Shift-/ -transpose_lines|Edit|Transpose Lines|Ctrl-T -move_line_up|Edit|Move Line Up|Ctrl-Shift-UP -move_line_down|Edit|Move Line Down|Ctrl-Shift-DOWN -convert_indent_to_tabs|Edit|Convert Indentation to Tabs| -convert_indent_to_spaces|Edit|Convert Indentation to Spaces| -center_line_roll|Edit|Center Line in Editor| -wxID_SELECTALL|Edit|Select All|Ctrl-A -match_brace|Edit|Match Brace|Ctrl-] -select_to_brace|Edit|Select to Brace|Ctrl-Shift-E -complete_word|Edit|Code Complete|Ctrl-SPACE -simple_word_completion|Edit|Complete Word|Ctrl-ENTER -function_call_tip|Edit|Display Function Calltip|Ctrl-Shift-SPACE -convert_eol_win|Edit|Convert to Windows Format| -convert_eol_unix|Edit|Convert to Unix Format| -trim_trailing|Edit|Trim Trailing Spaces| -selection_to_multi_caret|Edit|selection_to_multi_caret|Ctrl-Shift-L -word_wrap|View|Word Wrap| -toggle_fold|View|Toggle Current Fold|Alt-RIGHT -fold_all|View|Toggle All Folds| -fold_topmost_in_selection|View|Toggle All Topmost Folds in Selection| -fold_all_in_selection|View|Toggle Every Fold in Selection| -display_eol|View|Display EOL| -wxID_ZOOM_IN|View::Zoom|Zoom In| -wxID_ZOOM_OUT|View::Zoom|Zoom Out| -wxID_ZOOM_FIT|View::Zoom|Reset Zoom|Ctrl-0 -whitepsace_invisible|View::Show Whitespace|Invisible|Alt-F1 -whitepsace_always|View::Show Whitespace|Show Always|Alt-F2 -whitespace_visiable_after_indent|View::Show Whitespace|Visible After First Indent|Alt-F3 -next_tab|View|Next tab|Ctrl-Alt-RIGHT -prev_tab|View|Previous tab|Ctrl-Alt-LEFT -full_screen|View|Full Screen...|Alt-M -view_welcome_page|View|Show Welcome Page| -view_welcome_page_at_startup|View|Load Welcome Page at Startup| -output_pane|View|Output Pane|Ctrl-` -workspace_pane|View|Workspace Pane|Ctrl-Alt-W -debugger_pane|View|Debugger Pane|Ctrl-Alt-D -show_nav_toolbar|View|Navigation Bar|Ctrl-Alt-N -show_std_toolbar|View::Toolbars|Standard ToolBar| -show_search_toolbar|View::Toolbars|Search ToolBar| -show_build_toolbar|View::Toolbars|Build ToolBar| -show_debug_toolbar|View::Toolbars|Debug ToolBar| -toggle_panes|View|Toggle All Panes|Ctrl-M -distraction_free_mode|View|Toggle Minimal View|Ctrl-F11 -show_menu_bar|View|Show Menu Bar|Alt-` -find_in_files|Search::Find In Files|Find In Files...|Ctrl-Shift-F -id_find|Search::Find and Replace|Find...|Ctrl-F -ID_QUICK_ADD_NEXT|Search::Find and Replace|Quick Add Next|Ctrl-K -ID_QUICK_FIND_ALL|Search::Find and Replace|Quick Find All|Ctrl-Shift-K -id_replace|Search::Find and Replace|Replace...|Ctrl-H -find_next|Search::Find and Replace|Find Next|F3 -find_next_at_caret|Search::Find and Replace|Find Word At Caret| -find_previous_at_caret|Search::Find and Replace|Find Word At Caret Backward| -grep_current_file|Search|Grep Selection in the Current File|Ctrl-Shift-G -grep_current_workspace|Search|Grep Selection in the Workspace| -web_search_selection|Search|Search for Selection with default browser|Ctrl-Shift-W -next_fif_match|Search::Find In Files|Go to Next 'Find In File' Match|F8 -previous_fif_match|Search::Find In Files|Go to Previous 'Find In File' Match|Ctrl-F8 -ID_GOTO_ANYTHING|Search|Goto Anything|Ctrl-Shift-P -find_previous|Search|Find Previous|Shift-F3 -find_resource|Search|Find Resource...|Ctrl-Shift-R -find_symbol|Search|Quick Outline...|Ctrl-Shift-O -goto_definition|Search|Find Symbol|Alt-G -goto_previous_definition|Search::Go To|Go To Previous Location|Ctrl-P -id_backward|Search::Go To|Navigate Backward|Ctrl-, -id_forward|Search::Go To|Navigate Forward|Ctrl-. -goto_linenumber|Search::Go To|Go To Line...|Ctrl-G -toggle_bookmark|Search::Bookmarks|Toggle Bookmark|Ctrl-B -next_bookmark|Search::Bookmarks|Next Bookmark|F2 -previous_bookmark|Search::Bookmarks|Previous Bookmark|Shift-F2 -removeall_bookmarks|Search::Bookmarks|Remove All Bookmarks| -removeall_current_bookmarks|Search::Bookmarks|Remove All Currently-Active Bookmarks| -new_workspace|Workspace|New Workspace...| -switch_to_workspace|Workspace|Open Workspace...| -close_workspace|Workspace|Close Workspace| -reload_workspace|Workspace|Reload Workspace| -local_workspace_settings|Workspace|Workspace Settings...| -local_workspace_prefs|Workspace|Workspace Editor Preferences...| -import_from_msvs|Workspace|Import MS Visual Studio Solution File...| -project_properties|Workspace|Open Active Project Settings...|Alt-F7 -new_project|Workspace|Create New Project| -add_project|Workspace|Add an Existing Project| -configuration_manager|Build|Configuration Manager...| -batch_build|Build|Batch Build...| -execute_no_debug|Build|Run|Ctrl-F5 -stop_executed_program|Build|Stop| -build_active_project|Build|Build Project|F7 -build_workspace|Build|Build Workspace|Ctrl-Shift-B -rebuild_workspace|Build|Rebuild Workspace| -clean_workspace|Build|Clean Workspace| -compile_active_file|Build|Compile Current File|Ctrl-F7 -compile_active_file_project|Build|Compile Current File's Project|Ctrl-Shift-F7 -clean_active_project|Build|Clean Project| -stop_active_project_build|Build|Stop Build| -rebuild_active_project|Build|Rebuild Project| -build_n_run_active_project|Build|Build and Run Project|Ctrl-F9 -next_build_error|Build|Next Build Error|F4 -start_debugger|Debugger|Start/Continue Debugger|F5 -restart_debugger|Debugger|Restart Debugger|Ctrl-Shift-F5 -attach_debugger|Debugger|Attach to process...| -pause_debugger|Debugger|Pause debugger| -stop_debugger|Debugger|Stop debugger|Shift-F5 -dbg_stepin|Debugger|Step Into|F11 -dbg_stepout|Debugger|Step Out|Shift-F11 -dbg_stepi|Debugger|Step Into Instruction| -dbg_next|Debugger|Next|F10 -dbg_nexti|Debugger|Next Instruction|Ctrl-F10 -show_cursor|Debugger|Show Cursor| -dbg_run_to_cursor|Debugger|Run to Caret Line| -dbg_jump_cursor|Debugger|Jump to Caret Line| -insert_breakpoint|Debugger|Toggle Breakpoint|F9 -disable_all_breakpoints|Debugger|Disable All Breakpoints| -enable_all_breakpoints|Debugger|Enable All Breakpoints| -delete_all_breakpoints|Debugger|Delete All Breakpoints| -quick_debug|Debugger|Quick Debug...| -manage_plugins|Plugins|Manage Plugins...| -format_source|Plugins::Source Code Formatter|Format Current Source|Ctrl-I -formatter_options|Plugins::Source Code Formatter|Options...| -svn_options|Plugins::Subversion|Options...| -copyrights_options|Plugins::Copyright|Insert Copyright Block| -insert_copyrights|Plugins::Copyright|Batch Insert of Copyright Block| -batch_insert_copyrights|Plugins::Copyright|Settings...| -cppcheck_editor_item|Plugins::CppCheck|Check current file| -cppcheck_project_item|Plugins::CppCheck|Check current file's project| -cppcheck_workspace_item|Plugins::CppCheck|Check workspace| -options|Settings|Global Editor Preferences...|Alt-O -syntax_highlight|Settings|Syntax Highlight & Fonts...| -configure_accelerators|Settings|Configure accelerators...| -add_envvar|Settings|Environment Variables...|Ctrl-Shift-V -advance_settings|Settings|Build Settings...| -debuger_settings|Settings|Debugger Settings...| -tags_options|Settings|Tags Options...| -about|Help|About...| -swap_files|C++|Swap Header/Implementation file|F12 -find_decl|C++|Goto Declaration| -find_impl|C++|Goto Implementation| -go_to_function_start|C++::Search|Goto Begining of Current Function| -go_to_next_function|C++::Search|Goto Begining of Next Function| -find_references|C++::Search|Find References...| -sync_signatures|C++::Code Generation / Refactoring|Synchronize Signatures...| -setters_getters|C++::Code Generation / Refactoring|Generate Setters/Getters...| -move_impl|C++::Code Generation / Refactoring|Move Function Implementation to...| -add_impl|C++::Code Generation / Refactoring|Add Function Implementation...| -rename_local_variable|C++::Code Generation / Refactoring|Rename Local Variable...| -add_multi_impl|C++::Code Generation / Refactoring|Implement all Un-implemented Functions...| -add_virtual_impl|C++::Code Generation / Refactoring|Implement inherited virtual Functions...| -add_pure_virtual_impl|C++::Code Generation / Refactoring|Implement inherited pure virtual Functions...| -add_include_file|C++|Add Include File|Ctrl-Shift-I -insert_breakpoint|C++|Toggle Breakpoint|F9 -toggle_bookmark|C++|Toggle Bookmark|Ctrl-B -retag_file|C++|Re-Tag File| -select_next|Search|Select Next Occurrence|Ctrl-F3 -select_previous|Search|Select Previous Occurrence|Ctrl-Shift-F3 -hide_status_bar|View|Show Status Bar| -hide_tool_bar|View|Show Tool Bar|F1 -show_menu_bar|View|Show Menu Bar| -unittestpp_new_simple_test|Plugins::UnitTest++|Create new test...| -unittestpp_new_class_test|Plugins::UnitTest++|Create tests for class...| -mark_project_as_ut|Plugins::UnitTest++|Mark this project as UnitTest++ project| -run_unit_tests|Plugins::UnitTest++|Run Project as UnitTest++ and report| diff --git a/SnipWiz/editsnippetsdlg.cpp b/SnipWiz/editsnippetsdlg.cpp index 308f724132..6b4c893c0f 100644 --- a/SnipWiz/editsnippetsdlg.cpp +++ b/SnipWiz/editsnippetsdlg.cpp @@ -24,10 +24,12 @@ ////////////////////////////////////////////////////////////////////////////// #include "editsnippetsdlg.h" -#include "snipwiz.h" -#include + #include "AboutHtml.h" #include "clKeyboardManager.h" +#include "snipwiz.h" + +#include EditSnippetsDlg::EditSnippetsDlg(wxWindow* parent, SnipWiz* plugin, IManager* manager) : EditSnippetsBaseDlg(parent) @@ -62,12 +64,12 @@ void EditSnippetsDlg::DoItemSelected(const wxString& text) return; } - m_textCtrlAccelerator->SetValue(wxT("")); + m_textCtrlAccelerator->SetValue(""); MenuItemDataMap_t::iterator iter = accelMap.begin(); for(; iter != accelMap.end(); ++iter) { MenuItemData mid = iter->second; - if(mid.action == text) { - m_textCtrlAccelerator->SetValue(mid.accel); + if(mid.parentMenu == _("SnipWiz") && mid.action == text) { + m_textCtrlAccelerator->SetValue(mid.accel.ToString()); } } } @@ -86,10 +88,7 @@ void EditSnippetsDlg::OnAddSnippet(wxCommandEvent& event) void EditSnippetsDlg::OnAddSnippetUI(wxUpdateUIEvent& event) { - if(m_textCtrlMenuEntry->GetValue().IsEmpty() || m_textCtrlSnippet->GetValue().IsEmpty()) - event.Enable(false); - else - event.Enable(true); + event.Enable(!m_textCtrlMenuEntry->GetValue().IsEmpty() && !m_textCtrlSnippet->GetValue().IsEmpty()); } void EditSnippetsDlg::OnChangeSnippet(wxCommandEvent& event) @@ -105,7 +104,9 @@ void EditSnippetsDlg::OnChangeSnippet(wxCommandEvent& event) } // if menu entry has changed, delete old entry in list - if(curListKey.Cmp(m_textCtrlMenuEntry->GetValue()) != 0) GetStringDb()->DeleteSnippetKey(curListKey); + if(curListKey.Cmp(m_textCtrlMenuEntry->GetValue()) != 0) { + GetStringDb()->DeleteSnippetKey(curListKey); + } GetStringDb()->SetSnippetString(m_textCtrlMenuEntry->GetValue(), m_textCtrlSnippet->GetValue()); m_listBox1->SetString(index, m_textCtrlMenuEntry->GetValue()); @@ -114,10 +115,7 @@ void EditSnippetsDlg::OnChangeSnippet(wxCommandEvent& event) void EditSnippetsDlg::OnChangeSnippetUI(wxUpdateUIEvent& event) { - if(m_textCtrlMenuEntry->GetValue().IsEmpty() || m_textCtrlSnippet->GetValue().IsEmpty()) - event.Enable(false); - else - event.Enable(true); + event.Enable(!m_textCtrlMenuEntry->GetValue().IsEmpty() && !m_textCtrlSnippet->GetValue().IsEmpty()); } void EditSnippetsDlg::OnRemoveSnippet(wxCommandEvent& event) @@ -128,16 +126,15 @@ void EditSnippetsDlg::OnRemoveSnippet(wxCommandEvent& event) GetStringDb()->DeleteSnippetKey(key); m_listBox1->Delete(index); - if(m_listBox1->GetCount()) SelectItem(0); + if(m_listBox1->GetCount()) { + SelectItem(0); + } m_modified = true; } void EditSnippetsDlg::OnRemoveSnippetUI(wxUpdateUIEvent& event) { - if(m_listBox1->GetSelection() != wxNOT_FOUND) - event.Enable(true); - else - event.Enable(false); + event.Enable(m_listBox1->GetSelection() != wxNOT_FOUND); } void EditSnippetsDlg::Initialize() @@ -176,18 +173,19 @@ void EditSnippetsDlg::OnButtonKeyShortcut(wxCommandEvent& e) MenuItemData mid; mid.resourceID << id; + mid.parentMenu = _("SnipWiz"); mid.action = m_textCtrlMenuEntry->GetValue(); - + if(clKeyboardManager::Get()->PopupNewKeyboardShortcutDlg(this, mid) == wxID_OK) { - if(clKeyboardManager::Get()->Exists(mid.accel) && mid.accel.IsEmpty() == false) { + if(clKeyboardManager::Get()->Exists(mid.accel)) { wxMessageBox(_("That accelerator already exists"), _("CodeLite"), wxOK | wxCENTRE, this); return; } - clKeyboardManager::Get()->AddGlobalAccelerator(mid.resourceID, mid.accel, mid.action); + clKeyboardManager::Get()->AddAccelerator(mid.resourceID, mid.parentMenu, mid.action, mid.accel); clKeyboardManager::Get()->Update(); - m_textCtrlAccelerator->ChangeValue(mid.accel); + m_textCtrlAccelerator->ChangeValue(mid.accel.ToString()); } } } diff --git a/Subversion2/subversion2.cpp b/Subversion2/subversion2.cpp index d7318ce4e3..3823781c32 100644 --- a/Subversion2/subversion2.cpp +++ b/Subversion2/subversion2.cpp @@ -23,11 +23,14 @@ ////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////// +#include "subversion2.h" + #include "SvnCommitDialog.h" #include "SvnLogDialog.h" #include "SvnShowFileChangesHandler.h" #include "SvnShowRecentChangesDlg.h" #include "clGotoAnythingManager.h" +#include "clKeyboardManager.h" #include "cl_standard_paths.h" #include "detachedpanesinfo.h" #include "dockablepane.h" @@ -35,7 +38,6 @@ #include "fileutils.h" #include "globals.h" #include "procutils.h" -#include "subversion2.h" #include "subversion_password_db.h" #include "subversion_strings.h" #include "subversion_view.h" @@ -47,6 +49,7 @@ #include "svn_sync_dialog.h" #include "svnstatushandler.h" #include "svnxml.h" + #include #include #include @@ -74,21 +77,21 @@ static void ConvertToWindowsEOL(wxString& str) newBuffer.Alloc(str.Len()); for(size_t i = 0; i < str.Len(); i++) { - wxChar nextChar = wxT('\0'); + wxChar nextChar = '\0'; wxChar ch = str.GetChar(i); if((i + 1) < str.Len()) { nextChar = str.GetChar(i + 1); } - if(ch == wxT('\r') && nextChar == wxT('\n')) { - newBuffer << wxT("\r\n"); + if(ch == '\r' && nextChar == '\n') { + newBuffer << "\r\n"; i++; - } else if(ch == wxT('\n')) { - newBuffer << wxT("\r\n"); + } else if(ch == '\n') { + newBuffer << "\r\n"; - } else if(ch == wxT('\r') && nextChar != wxT('\n')) { - newBuffer << wxT("\r\n"); + } else if(ch == '\r' && nextChar != '\n') { + newBuffer << "\r\n"; } else { newBuffer.Append(ch); @@ -104,18 +107,18 @@ static void ConvertToUnixEOL(wxString& str) newBuffer.Alloc(str.Len()); for(size_t i = 0; i < str.Len(); i++) { - wxChar nextChar = wxT('\0'); + wxChar nextChar = '\0'; wxChar ch = str.GetChar(i); if((i + 1) < str.Len()) { nextChar = str.GetChar(i + 1); } - if(ch == wxT('\r') && nextChar == wxT('\n')) { - newBuffer << wxT("\n"); + if(ch == '\r' && nextChar == '\n') { + newBuffer << "\n"; i++; - } else if(ch == wxT('\r') && nextChar != wxT('\n')) { - newBuffer << wxT("\n"); + } else if(ch == '\r' && nextChar != '\n') { + newBuffer << "\n"; } else { newBuffer.Append(ch); @@ -136,10 +139,10 @@ CL_PLUGIN_API IPlugin* CreatePlugin(IManager* manager) CL_PLUGIN_API PluginInfo* GetPluginInfo() { static PluginInfo info; - info.SetAuthor(wxT("Eran Ifrah")); - info.SetName(wxT("Subversion")); + info.SetAuthor("Eran Ifrah"); + info.SetName("Subversion"); info.SetDescription(_("Subversion plugin for codelite2.0 based on the svn command line tool")); - info.SetVersion(wxT("v2.0")); + info.SetVersion("v2.0"); return &info; } @@ -157,7 +160,7 @@ Subversion2::Subversion2(IManager* manager) , m_clientVersion(1700) // 1.7.0 (1*1000 + 7*100 + 0) { m_longName = _("Subversion plugin for codelite2.0 based on the svn command line tool"); - m_shortName = wxT("Subversion2"); + m_shortName = "Subversion2"; DoInitialize(); @@ -209,6 +212,9 @@ Subversion2::Subversion2(IManager* manager) EventNotifier::Get()->Bind(wxEVT_FILE_DELETED, &Subversion2::OnFileDeleted, this); EventNotifier::Get()->Bind(wxEVT_FOLDER_DELETED, &Subversion2::OnFolderDeleted, this); EventNotifier::Get()->Bind(wxEVT_GOTO_ANYTHING_SHOWING, &Subversion2::OnGotoAnythingShowing, this); + + clKeyboardManager::Get()->AddAccelerator("svn_options", _("Subversion"), _("Options...")); + // Register common SVN actins into the "Goto Anything" manager // clGotoAnythingManager::Get().Add(clGotoEntry("Svn > Commit", "", XRCID("svn_commit"))); // clGotoAnythingManager::Get().Add(clGotoEntry("Svn > Update", "", XRCID("svn_update"))); @@ -246,7 +252,7 @@ void Subversion2::HookPopupMenu(wxMenu* menu, MenuType type) if(type == MenuTypeFileView_Project) { if(!menu->FindItem(XRCID("SUBVERSION_PROJECT_POPUP"))) { m_projectSepItem = menu->PrependSeparator(); - menu->Prepend(XRCID("SUBVERSION_PROJECT_POPUP"), wxT("Subversion"), CreateProjectPopMenu()); + menu->Prepend(XRCID("SUBVERSION_PROJECT_POPUP"), "Subversion", CreateProjectPopMenu()); } } } @@ -389,7 +395,7 @@ void Subversion2::EnsureVisible() void Subversion2::DoInitialize() { - m_svnBitmap = GetManager()->GetStdIcons()->LoadBitmap(wxT("subversion")); + m_svnBitmap = GetManager()->GetStdIcons()->LoadBitmap("subversion"); // create tab (possibly detached) Notebook* book = m_mgr->GetOutputPaneNotebook(); @@ -413,10 +419,10 @@ void Subversion2::DoInitialize() wxString command; wxArrayString output; - command << GetSvnExeName() << wxT(" --help "); + command << GetSvnExeName() << " --help "; #ifndef __WXMSW__ - command << wxT("> /dev/null 2>&1"); + command << "> /dev/null 2>&1"; #endif ProcUtils::ExecuteCommand(command, output); @@ -429,13 +435,13 @@ void Subversion2::DoInitialize() SvnSettingsData Subversion2::GetSettings() { SvnSettingsData ssd; - GetManager()->GetConfigTool()->ReadObject(wxT("SvnSettingsData"), &ssd); + GetManager()->GetConfigTool()->ReadObject("SvnSettingsData", &ssd); return ssd; } void Subversion2::SetSettings(SvnSettingsData& ssd) { - GetManager()->GetConfigTool()->WriteObject(wxT("SvnSettingsData"), &ssd); + GetManager()->GetConfigTool()->WriteObject("SvnSettingsData", &ssd); } void Subversion2::OnSettings(wxCommandEvent& event) @@ -454,11 +460,11 @@ void Subversion2::DoSetSSH() // on Windows, SVN demands that the ssh client will not contain any // backward slashes - sshClient.Replace(wxT("\\"), wxT("/")); + sshClient.Replace("\\", "/"); if(sshClient.IsEmpty() == false) { - wxString env_value(sshClient + wxT(" ") + sshClientArgs); - wxSetEnv(wxT("SVN_SSH"), env_value.c_str()); + wxString env_value(sshClient + " " + sshClientArgs); + wxSetEnv("SVN_SSH", env_value.c_str()); } } @@ -476,13 +482,13 @@ void Subversion2::OnFolderAdd(wxCommandEvent& event) wxFileName workingDirectory(m_selectedFolder, ""); if(m_selectedFile.IsOk()) { - command << GetSvnExeName() << loginString << wxT(" add ") << m_selectedFile.GetFullName(); + command << GetSvnExeName() << loginString << " add " << m_selectedFile.GetFullName(); } else { wxString folderName = workingDirectory.GetDirs().Last(); ::WrapWithQuotes(folderName); workingDirectory.RemoveLastDir(); - command << GetSvnExeName() << loginString << wxT(" add ") << folderName; + command << GetSvnExeName() << loginString << " add " << folderName; } GetConsole()->Execute(command, workingDirectory.GetPath(), new SvnStatusHandler(this, event.GetId(), this)); } @@ -515,10 +521,10 @@ void Subversion2::OnDeleteFolder(wxCommandEvent& event) ::WrapWithQuotes(folderName); workingDirectory.RemoveLastDir(); - command << GetSvnExeName() << loginString << wxT(" delete --force ") << folderName; + command << GetSvnExeName() << loginString << " delete --force " << folderName; } else { - command << GetSvnExeName() << loginString << wxT(" delete --force ") << m_selectedFile.GetFullName(); + command << GetSvnExeName() << loginString << " delete --force " << m_selectedFile.GetFullName(); } GetConsole()->Execute(command, workingDirectory.GetPath(), new SvnDefaultCommandHandler(this, event.GetId(), this)); } @@ -551,7 +557,7 @@ void Subversion2::OnUpdate(wxCommandEvent& event) return; } // svn update . - command << GetSvnExeName() << loginString << wxT(" update ") << m_selectedFile.GetFullName() << " "; + command << GetSvnExeName() << loginString << " update " << m_selectedFile.GetFullName() << " "; AddCommandLineOption(command, kOpt_ForceInteractive); command << "."; @@ -561,11 +567,12 @@ void Subversion2::OnUpdate(wxCommandEvent& event) void Subversion2::OnFileExplorerDiff(wxCommandEvent& event) { - wxString diffAgainst(wxT("BASE")); + wxString diffAgainst("BASE"); diffAgainst = clGetTextFromUser(_("Svn Diff"), _("Insert base revision to diff against:"), "BASE", wxNOT_FOUND, GetManager()->GetTheApp()->GetTopWindow()); - if(diffAgainst.empty()) + if(diffAgainst.empty()) { return; + } wxString command; wxString loginString; @@ -581,7 +588,7 @@ void Subversion2::OnFileExplorerDiff(wxCommandEvent& event) } wxFileName workingDirectory(m_selectedFolder, ""); - command << wxT("diff -r") << diffAgainst; + command << "diff -r" << diffAgainst; if(m_selectedFile.IsOk()) { command << " " << m_selectedFile.GetFullName(); } else { @@ -612,7 +619,7 @@ wxString Subversion2::DoGetFileExplorerFilesAsString() wxString s; wxArrayString files = DoGetFileExplorerFiles(); for(size_t i = 0; i < files.GetCount(); i++) { - s << wxT(" \"") << files.Item(i) << wxT("\" "); + s << " \"" << files.Item(i) << "\" "; } return s; } @@ -629,10 +636,10 @@ wxString Subversion2::DoGetFileExplorerItemFullPath() wxString filename(item.m_fileName.GetFullPath()); filename.Trim().Trim(false); - if(filename.EndsWith(wxT("\\"))) { + if(filename.EndsWith("\\")) { filename.RemoveLast(); - } else if(filename.EndsWith(wxT("/"))) { + } else if(filename.EndsWith("/")) { filename.RemoveLast(); } return filename; @@ -655,7 +662,7 @@ wxString Subversion2::GetUserConfigDir() wxMkdir(configDir); } - configDir << wxFileName::GetPathSeparator() << wxT("subversion"); + configDir << wxFileName::GetPathSeparator() << "subversion"; return configDir; } @@ -663,14 +670,14 @@ void Subversion2::RecreateLocalSvnConfigFile() { wxString configFile; wxString configDir = GetUserConfigDir(); - configFile << configDir << wxFileName::GetPathSeparator() << wxT("config"); + configFile << configDir << wxFileName::GetPathSeparator() << "config"; // Convert any whitespace to space wxString ignorePatterns(GetSettings().GetIgnoreFilePattern()); - ignorePatterns.Replace(wxT("\r\n"), wxT(" ")); - ignorePatterns.Replace(wxT("\n"), wxT(" ")); - ignorePatterns.Replace(wxT("\t"), wxT(" ")); - ignorePatterns.Replace(wxT("\v"), wxT(" ")); + ignorePatterns.Replace("\r\n", " "); + ignorePatterns.Replace("\n", " "); + ignorePatterns.Replace("\t", " "); + ignorePatterns.Replace("\v", " "); wxString diffTool = GetSettings().GetExternalDiffViewer(); if(!(GetSettings().GetFlags() & SvnUseExternalDiff)) { @@ -686,8 +693,8 @@ void Subversion2::RecreateLocalSvnConfigFile() void Subversion2::DoGetSvnVersion() { wxString command; - command << GetSvnExeName() << wxT(" --version "); - m_simpleCommand.Execute(command, wxT(""), new SvnVersionHandler(this, wxNOT_FOUND, NULL), this); + command << GetSvnExeName() << " --version "; + m_simpleCommand.Execute(command, "", new SvnVersionHandler(this, wxNOT_FOUND, NULL), this); } void Subversion2::Patch(bool dryRun, const wxString& workingDirectory, wxEvtHandler* owner, int id) @@ -716,7 +723,7 @@ void Subversion2::Patch(bool dryRun, const wxString& workingDirectory, wxEvtHand // Write the content to a new file wxFFile fileTemp; - wxString tmpFile = wxFileName::CreateTempFileName(wxT("clsvn"), &fileTemp); + wxString tmpFile = wxFileName::CreateTempFileName("clsvn", &fileTemp); if(fileTemp.IsOpened()) { if(fileTemp.Write(fileContent)) { fileTemp.Close(); @@ -731,10 +738,11 @@ void Subversion2::Patch(bool dryRun, const wxString& workingDirectory, wxEvtHand // execute the command wxString command; - command << wxT("patch -l -p0 "); - if(dryRun) - command << wxT(" --dry-run "); - command << wxT(" -i \"") << patchFile << wxT("\""); + command << "patch -l -p0 "; + if(dryRun) { + command << " --dry-run "; + } + command << " -i \"" << patchFile << "\""; SvnCommandHandler* handler(NULL); if(dryRun) { @@ -778,7 +786,7 @@ bool Subversion2::LoginIfNeeded(wxCommandEvent& event, const wxString& workingDi } if(db.GetLogin(repoUrl, user, password)) { - loginString << wxT(" --username ") << user << wxT(" --password \"") << password << wxT("\" "); + loginString << " --username " << user << " --password \"" << password << "\" "; return true; } @@ -787,8 +795,7 @@ bool Subversion2::LoginIfNeeded(wxCommandEvent& event, const wxString& workingDi if(loginFailed) { SvnLoginDialog dlg(GetManager()->GetTheApp()->GetTopWindow()); if(dlg.ShowModal() == wxID_OK) { - loginString << wxT(" --username ") << dlg.GetUsername() << wxT(" --password \"") << dlg.GetPassword() - << wxT("\" "); + loginString << " --username " << dlg.GetUsername() << " --password \"" << dlg.GetPassword() << "\" "; // Store the user name and password db.SetLogin(repoUrl, dlg.GetUsername(), dlg.GetPassword()); return true; @@ -802,13 +809,13 @@ bool Subversion2::LoginIfNeeded(wxCommandEvent& event, const wxString& workingDi void Subversion2::IgnoreFiles(const wxArrayString& files, bool pattern) { SvnSettingsData ssd = GetSettings(); - wxArrayString ignorePatternArr = wxStringTokenize(ssd.GetIgnoreFilePattern(), wxT(" \r\n\t\v"), wxTOKEN_STRTOK); + wxArrayString ignorePatternArr = wxStringTokenize(ssd.GetIgnoreFilePattern(), " \r\n\t\v", wxTOKEN_STRTOK); for(size_t i = 0; i < files.GetCount(); i++) { wxString entry; wxFileName fn(files.Item(i)); if(pattern) { - entry << wxT("*.") << fn.GetExt(); + entry << "*." << fn.GetExt(); } else { entry << fn.GetFullName(); } @@ -820,7 +827,7 @@ void Subversion2::IgnoreFiles(const wxArrayString& files, bool pattern) wxString ignorePatternStr; for(size_t i = 0; i < ignorePatternArr.GetCount(); i++) { - ignorePatternStr << ignorePatternArr.Item(i) << wxT(" "); + ignorePatternStr << ignorePatternArr.Item(i) << " "; } ignorePatternStr.RemoveLast(); ssd.SetIgnoreFilePattern(ignorePatternStr); @@ -853,7 +860,7 @@ void Subversion2::EditSettings() bool Subversion2::IsSubversionViewDetached() { DetachedPanesInfo dpi; - m_mgr->GetConfigTool()->ReadObject(wxT("DetachedPanesList"), &dpi); + m_mgr->GetConfigTool()->ReadObject("DetachedPanesList", &dpi); wxArrayString detachedPanes = dpi.GetPanes(); return detachedPanes.Index(svnCONSOLE_TEXT) != wxNOT_FOUND; } @@ -871,8 +878,9 @@ void Subversion2::Blame(wxCommandEvent& event, const wxArrayString& files) wxString command; wxString loginString; - if(files.GetCount() == 0) + if(files.GetCount() == 0) { return; + } /*bool nonInteractive = unused var commented out*/ GetNonInteractiveMode(event); @@ -880,30 +888,33 @@ void Subversion2::Blame(wxCommandEvent& event, const wxArrayString& files) return; } - if(files.GetCount() != 1) + if(files.GetCount() != 1) { return; + } GetConsole()->EnsureVisible(); - command << GetSvnExeName() << wxT(" blame ") << loginString; + command << GetSvnExeName() << " blame " << loginString; for(size_t i = 0; i < files.GetCount(); i++) { - command << wxT("\"") << files.Item(i) << wxT("\" "); + command << "\"" << files.Item(i) << "\" "; } - GetConsole()->AppendText(command + wxT("\n")); + GetConsole()->AppendText(command + "\n"); m_blameCommand.Execute(command, GetSvnView()->GetRootDir(), new SvnBlameHandler(this, event.GetId(), this, files.Item(0)), this); } void Subversion2::OnGetCompileLine(clBuildEvent& event) { - if(!(GetSettings().GetFlags() & SvnExposeRevisionMacro)) + if(!(GetSettings().GetFlags() & SvnExposeRevisionMacro)) { return; + } wxString macroName(GetSettings().GetRevisionMacroName()); macroName.Trim().Trim(false); - if(macroName.IsEmpty()) + if(macroName.IsEmpty()) { return; + } wxString workingDirectory = m_subversionView->GetRootDir(); workingDirectory.Trim().Trim(false); @@ -912,9 +923,9 @@ void Subversion2::OnGetCompileLine(clBuildEvent& event) DoGetSvnInfoSync(svnInfo, workingDirectory); wxString content = event.GetCommand(); - content << wxT(" -D"); - content << macroName << wxT("=\\\""); - content << svnInfo.m_revision << wxT("\\\" "); + content << " -D"; + content << macroName << "=\\\""; + content << svnInfo.m_revision << "\\\" "; event.SetCommand(content); event.Skip(); } @@ -924,11 +935,12 @@ void Subversion2::DoGetSvnInfoSync(SvnInfo& svnInfo, const wxString& workingDire wxString svnInfoCommand; wxString xmlStr; - svnInfoCommand << GetSvnExeName() << wxT(" info --xml "); - if(workingDirectory.Find(wxT(" "))) - svnInfoCommand << wxT("\"") << workingDirectory << wxT("\""); - else + svnInfoCommand << GetSvnExeName() << " info --xml "; + if(workingDirectory.Find(" ")) { + svnInfoCommand << "\"" << workingDirectory << "\""; + } else { svnInfoCommand << workingDirectory; + } #ifndef __WXMSW__ // Hide stderr @@ -976,13 +988,13 @@ void Subversion2::DoSwitchURL(const wxString& workingDirectory, const wxString& if(LoginIfNeeded(event, workingDirectory, loginString) == false) { return; } - wxString targetUrl = wxGetTextFromUser(_("Enter new URL:"), wxT("Svn Switch..."), sourceUrl); + wxString targetUrl = wxGetTextFromUser(_("Enter new URL:"), _("Svn Switch..."), sourceUrl); if(targetUrl.IsEmpty()) { return; } wxString command; - command << GetSvnExeName() << wxT(" switch ") << targetUrl << loginString; + command << GetSvnExeName() << " switch " << targetUrl << loginString; GetConsole()->Execute(command, workingDirectory, new SvnDefaultCommandHandler(this, wxNOT_FOUND, NULL)); } @@ -992,7 +1004,7 @@ void Subversion2::ChangeLog(const wxString& path, const wxString& fullpath, wxCo DoGetSvnInfoSync(info, path); SvnLogDialog dlg(GetManager()->GetTheApp()->GetTopWindow()); - dlg.GetTo()->SetValue(wxT("BASE")); + dlg.GetTo()->SetValue("BASE"); dlg.GetCompact()->SetValue(true); dlg.GetFrom()->SetFocus(); if(dlg.ShowModal() == wxID_OK) { @@ -1002,8 +1014,8 @@ void Subversion2::ChangeLog(const wxString& path, const wxString& fullpath, wxCo return; } - command << GetSvnExeName() << loginString << wxT(" log -r") << dlg.GetFrom()->GetValue() << wxT(":") - << dlg.GetTo()->GetValue() << wxT(" \"") << fullpath << wxT("\""); + command << GetSvnExeName() << loginString << " log -r" << dlg.GetFrom()->GetValue() << ":" + << dlg.GetTo()->GetValue() << " \"" << fullpath << "\""; GetConsole()->Execute( command, path, new SvnLogHandler(this, info.m_sourceUrl, dlg.GetCompact()->IsChecked(), event.GetId(), this), false); @@ -1026,8 +1038,9 @@ void Subversion2::DoLockFile(const wxString& workingDirectory, const wxArrayStri wxString command; wxString loginString; - if(fullpaths.empty()) + if(fullpaths.empty()) { return; + } if(LoginIfNeeded(event, workingDirectory, loginString) == false) { return; @@ -1035,13 +1048,13 @@ void Subversion2::DoLockFile(const wxString& workingDirectory, const wxArrayStri command << GetSvnExeName() << loginString; if(lock) { - command << wxT(" lock "); + command << " lock "; } else { - command << wxT(" unlock "); + command << " unlock "; } for(size_t i = 0; i < fullpaths.size(); i++) - command << wxT("\"") << fullpaths.Item(i) << wxT("\" "); + command << "\"" << fullpaths.Item(i) << "\" "; GetConsole()->Execute(command, workingDirectory, new SvnDefaultCommandHandler(this, event.GetId(), this)); } @@ -1069,15 +1082,17 @@ void Subversion2::OnFileExplorerRenameItem(wxCommandEvent& event) wxString folderName = workingDirectory.GetDirs().Last(); workingDirectory.RemoveLastDir(); wxString newname = ::clGetTextFromUser(_("Svn Rename"), _("New name:"), folderName, folderName.length()); - if(newname.IsEmpty() || newname == folderName) + if(newname.IsEmpty() || newname == folderName) { return; + } ::WrapWithQuotes(newname); DoRename(workingDirectory.GetPath(), folderName, newname, event); } else { wxString newname = ::clGetTextFromUser(_("Svn Rename"), _("New name:"), m_selectedFile.GetFullName(), m_selectedFile.GetName().length()); - if(newname.IsEmpty() || newname == m_selectedFile.GetFullName()) + if(newname.IsEmpty() || newname == m_selectedFile.GetFullName()) { return; + } ::WrapWithQuotes(newname); DoRename(workingDirectory.GetPath(), m_selectedFile.GetFullName(), newname, event); } @@ -1093,10 +1108,11 @@ void Subversion2::DoRename(const wxString& workingDirectory, const wxString& old return; } - if(oldname.IsEmpty() || newname.IsEmpty() || workingDirectory.IsEmpty()) + if(oldname.IsEmpty() || newname.IsEmpty() || workingDirectory.IsEmpty()) { return; + } - command << GetSvnExeName() << loginString << wxT(" rename --force ") << oldname << wxT(" ") << newname; + command << GetSvnExeName() << loginString << " rename --force " << oldname << " " << newname; GetConsole()->Execute(command, workingDirectory, new SvnDefaultCommandHandler(this, event.GetId(), this)); } @@ -1115,13 +1131,14 @@ void Subversion2::DoCommit(const wxArrayString& files, const wxString& workingDi DoGetSvnInfoSync(svnInfo, workingDirectory); } - command << GetSvnExeName() << loginString << wxT(" commit "); + command << GetSvnExeName() << loginString << " commit "; SvnCommitDialog dlg(EventNotifier::Get()->TopFrame(), files, svnInfo.m_sourceUrl, this, workingDirectory); if(dlg.ShowModal() == wxID_OK) { wxArrayString actualFiles = dlg.GetPaths(); - if(actualFiles.IsEmpty()) + if(actualFiles.IsEmpty()) { return; + } // Store the commit message into a temporary file wxFileName tmpFile(clStandardPaths::Get().GetTempDir(), ".svn-commit"); @@ -1133,7 +1150,7 @@ void Subversion2::DoCommit(const wxArrayString& files, const wxString& workingDi wxString filepath = tmpFile.GetFullPath(); ::WrapWithQuotes(filepath); - command << wxT(" --file ") << filepath << " "; + command << " --file " << filepath << " "; // Add the changed files for(size_t i = 0; i < actualFiles.GetCount(); ++i) { @@ -1182,15 +1199,15 @@ wxArrayString Subversion2::DoGetSvnStatusQuiet(const wxString& wd) wxString command; wxString output; - command << GetSvnExeName() << wxT(" status -q "); - command << wxT("\"") << wd << wxT("\""); + command << GetSvnExeName() << " status -q "; + command << "\"" << wd << "\""; wxArrayString lines; ProcUtils::ExecuteCommand(command, lines); for(size_t i = 0; i < lines.GetCount(); i++) { - output << wxT("\r\n") << lines.Item(i); + output << "\r\n" << lines.Item(i); } wxArrayString modFiles, conflictedFiles, unversionedFiles, newFiles, deletedFiles, lockedFiles, ignoredFiles; @@ -1232,8 +1249,8 @@ std::vector Subversion2::GetLocalAddsDels(const wxString& wd) { wxString command; - command << GetSvnExeName() << wxT(" status -q "); - command << wxT("\"") << wd << wxT("\""); + command << GetSvnExeName() << " status -q "; + command << "\"" << wd << "\""; std::vector aryFiles; wxArrayString lines; @@ -1260,8 +1277,8 @@ std::vector Subversion2::GetFilesMarkedBinary(const wxString& wd) { wxString command; - command << GetSvnExeName() << wxT(" propget svn:mime-type -R "); - command << wxT("\"") << wd << wxT("\""); + command << GetSvnExeName() << " propget svn:mime-type -R "; + command << "\"" << wd << "\""; std::vector aryFiles; wxArrayString lines; @@ -1284,17 +1301,17 @@ std::vector Subversion2::RemoveExcludeExts(const std::vector { std::vector aryOutFiles; - wxStringTokenizer tok(excludeExtensions, wxT(" ;")); + wxStringTokenizer tok(excludeExtensions, " ;"); std::set specMap; while(tok.HasMoreTokens()) { wxString v = tok.GetNextToken(); - if(v == wxT("*.*")) { + if(v == "*.*") { // Just ignore the request to not add any files continue; } - v = v.AfterLast(wxT('*')); - v = v.AfterLast(wxT('.')).MakeLower(); + v = v.AfterLast('*'); + v = v.AfterLast('.').MakeLower(); specMap.insert(v); } @@ -1367,8 +1384,8 @@ void Subversion2::OnSync(wxCommandEvent& event) NormalizeDir(workDir); wxString command; - command << GetSvnExeName() << wxT(" list -R "); - command << wxT("\"") << workDir << wxT("\""); + command << GetSvnExeName() << " list -R "; + command << "\"" << workDir << "\""; // Calls FinishSyncProcess() // Get password/authentication, if required @@ -1384,7 +1401,7 @@ void Subversion2::FinishSyncProcess(ProjectPtr& proj, const wxString& workDir, b // Note that svn list always uses '/' as path delimiter std::vector aryRepoList; { - wxArrayString repoListOutput = wxStringTokenize(output, wxT("\r\n")); + wxArrayString repoListOutput = wxStringTokenize(output, "\r\n"); wxFileName fn; for(size_t i1 = 0; i1 < repoListOutput.GetCount(); i1++) { if(repoListOutput.Item(i1).Last() != '/') { @@ -1492,8 +1509,9 @@ void Subversion2::DoGetSvnClientVersion() #endif wxString versionOutput = ProcUtils::SafeExecuteCommand(svnVersionCommand); - if(versionOutput.IsEmpty()) + if(versionOutput.IsEmpty()) { return; + } versionOutput = versionOutput.BeforeFirst('\n'); if(reSvnClient.IsValid() && reSvnClient.Matches(versionOutput)) { @@ -1570,8 +1588,8 @@ void Subversion2::DoFilesDeleted(const wxArrayString& files, bool isFolder) size_t fileCount = files.GetCount(); for(size_t i = 0; i < files.GetCount(); i++) { if(i < 10) { - msg << files.Item(i) << wxT("\n"); - filesString << wxT("\"") << files.Item(i) << wxT("\" "); + msg << files.Item(i) << "\n"; + filesString << "\"" << files.Item(i) << "\" "; --fileCount; } else { break; @@ -1586,12 +1604,12 @@ void Subversion2::DoFilesDeleted(const wxArrayString& files, bool isFolder) } } - if(wxMessageBox(msg, wxT("Subversion"), wxYES_NO | wxCANCEL | wxCENTER | wxNO_DEFAULT, + if(wxMessageBox(msg, "Subversion", wxYES_NO | wxCANCEL | wxCENTER | wxNO_DEFAULT, GetManager()->GetTheApp()->GetTopWindow()) == wxYES) { wxString command; RecreateLocalSvnConfigFile(); - command << GetSvnExeName() << wxT(" delete --force ") << filesString; + command << GetSvnExeName() << " delete --force " << filesString; GetConsole()->Execute(command, m_subversionView->GetRootDir(), new SvnDefaultCommandHandler(this, wxNOT_FOUND, this)); } @@ -1619,14 +1637,16 @@ void Subversion2::OnShowFileChanges(wxCommandEvent& event) void Subversion2::ShowRecentChanges(const wxString& file) { - if(!wxFileName::FileExists(file)) + if(!wxFileName::FileExists(file)) { return; + } wxString filename(file); ::WrapWithQuotes(filename); long numberOfChanges = wxGetNumberFromUser(_("How many recent changes you want to view?"), "", _("Svn show recent changes"), 1, 1, 100); - if(numberOfChanges == wxNOT_FOUND) + if(numberOfChanges == wxNOT_FOUND) { return; // cancel + } // Build the command wxString command; @@ -1637,8 +1657,9 @@ void Subversion2::ShowRecentChanges(const wxString& file) void Subversion2::ShowRecentChangesDialog(const SvnShowDiffChunk::List_t& changes) { - if(changes.empty()) + if(changes.empty()) { return; + } SvnShowRecentChangesDlg dlg(EventNotifier::Get()->TopFrame(), changes); dlg.ShowModal(); } diff --git a/UnitTestCPP/unittestpp.cpp b/UnitTestCPP/unittestpp.cpp index 2810e62226..f9bb4da8ae 100644 --- a/UnitTestCPP/unittestpp.cpp +++ b/UnitTestCPP/unittestpp.cpp @@ -22,8 +22,11 @@ // ////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////// +#include "unittestpp.h" + #include "asyncprocess.h" #include "bitmap_loader.h" +#include "clKeyboardManager.h" #include "codelite_events.h" #include "ctags_manager.h" #include "dirsaver.h" @@ -38,9 +41,9 @@ #include "testclassdlg.h" #include "unittestcppoutputparser.h" #include "unittestdata.h" -#include "unittestpp.h" #include "unittestspage.h" #include "workspace.h" + #include #include #include @@ -51,6 +54,7 @@ #ifdef __WXMSW__ #include "evnvarlist.h" + #include #endif @@ -68,10 +72,10 @@ CL_PLUGIN_API IPlugin* CreatePlugin(IManager* manager) CL_PLUGIN_API PluginInfo* GetPluginInfo() { static PluginInfo info; - info.SetAuthor(wxT("Eran Ifrah")); - info.SetName(wxT("UnitTestPP")); + info.SetAuthor("Eran Ifrah"); + info.SetName("UnitTestPP"); info.SetDescription(_("A Unit test plugin based on the UnitTest++ framework")); - info.SetVersion(wxT("v1.0")); + info.SetVersion("v1.0"); return &info; } @@ -98,11 +102,17 @@ UnitTestPP::UnitTestPP(IManager* manager) m_tabHelper->SetOutputTabBmp(images->Add("ok")); m_longName = _("A Unit test plugin based on the UnitTest++ framework"); - m_shortName = wxT("UnitTestPP"); + m_shortName = "UnitTestPP"; m_topWindow = m_mgr->GetTheApp(); Bind(wxEVT_ASYNC_PROCESS_OUTPUT, &UnitTestPP::OnProcessRead, this); Bind(wxEVT_ASYNC_PROCESS_TERMINATED, &UnitTestPP::OnProcessTerminated, this); + + clKeyboardManager::Get()->AddAccelerator(_("UnitTest++"), + { { "unittestpp_new_simple_test", _("Create new test...") }, + { "unittestpp_new_class_test", _("Create tests for class...") }, + { "mark_project_as_ut", _("Mark this project as UnitTest++ project") }, + { "run_unit_tests", _("Run Project as UnitTest++ and report") } }); } UnitTestPP::~UnitTestPP() {} @@ -211,7 +221,7 @@ void UnitTestPP::OnNewClassTest(wxCommandEvent& e) if(editor) { int line = editor->GetCurrentLine(); TagEntryPtr tag = m_mgr->GetTagsManager()->FunctionFromFileLine(editor->GetFileName(), line + 1); - if(tag && tag->GetScope().IsEmpty() == false && tag->GetScope() != wxT("")) { + if(tag && tag->GetScope().IsEmpty() == false && tag->GetScope() != "") { clsName = tag->GetScope(); } } @@ -245,7 +255,7 @@ void UnitTestPP::OnNewClassTest(wxCommandEvent& e) prefix << name; wxString testName; - testName << wxT("Test") << prefix; + testName << "Test" << prefix; if(!fixture.IsEmpty()) { DoCreateFixtureTest(testName, fixture, projectName, fn.GetFullPath()); @@ -302,9 +312,9 @@ void UnitTestPP::DoCreateFixtureTest(const wxString& name, const wxString& fixtu { wxString text; - text << wxT("\nTEST_FIXTURE(") << fixture << wxT(", ") << name << wxT(")\n"); - text << wxT("{\n"); - text << wxT("}\n"); + text << "\nTEST_FIXTURE(" << fixture << ", " << name << ")\n"; + text << "{\n"; + text << "}\n"; IEditor* editor = DoAddTestFile(filename, projectName); if(editor) { @@ -326,9 +336,9 @@ void UnitTestPP::DoCreateSimpleTest(const wxString& name, const wxString& projec IEditor* editor = DoAddTestFile(filename, projectName); wxString text; - text << wxT("\nTEST(") << name << wxT(")\n"); - text << wxT("{\n"); - text << wxT("}\n"); + text << "\nTEST(" << name << ")\n"; + text << "{\n"; + text << "}\n"; if(editor) { editor->AppendText(text); @@ -338,8 +348,9 @@ void UnitTestPP::DoCreateSimpleTest(const wxString& name, const wxString& projec void UnitTestPP::OnRunUnitTests(wxCommandEvent& e) { ProjectPtr p = m_mgr->GetSelectedProject(); - if(!p) + if(!p) { return; + } DoRunProject(p); } @@ -351,7 +362,7 @@ void UnitTestPP::OnRunUnitTestsUI(wxUpdateUIEvent& e) } else { e.Enable(clCxxWorkspaceST::Get()->IsOpen() && clCxxWorkspaceST::Get()->GetActiveProject() && - clCxxWorkspaceST::Get()->GetActiveProject()->GetProjectInternalType() == wxT("UnitTest++")); + clCxxWorkspaceST::Get()->GetActiveProject()->GetProjectInternalType() == "UnitTest++"); } } @@ -375,7 +386,7 @@ bool UnitTestPP::IsUnitTestProject(ProjectPtr p) if(!p) { return false; } - return p->GetProjectInternalType() == wxT("UnitTest++"); + return p->GetProjectInternalType() == "UnitTest++"; } IEditor* UnitTestPP::DoAddTestFile(const wxString& filename, const wxString& projectName) @@ -384,7 +395,7 @@ IEditor* UnitTestPP::DoAddTestFile(const wxString& filename, const wxString& pro wxFileName fn(filename); if(wxFileName::FileExists(filename) == false) { // the file does not exist! - wxFFile file(filename, wxT("wb")); + wxFFile file(filename, "wb"); if(!file.IsOpened()) { wxMessageBox(wxString::Format(_("Could not create target file '%s'"), filename.c_str()), _("CodeLite"), wxICON_WARNING | wxOK); @@ -392,7 +403,7 @@ IEditor* UnitTestPP::DoAddTestFile(const wxString& filename, const wxString& pro } // since this is a new file, it will most probably will need the include file - file.Write(wxT("#include \n")); + file.Write("#include \n"); file.Close(); } @@ -422,8 +433,8 @@ IEditor* UnitTestPP::DoAddTestFile(const wxString& filename, const wxString& pro // add it to the project wxArrayString paths; paths.Add(filename); - m_mgr->CreateVirtualDirectory(proj->GetName(), wxT("tests")); - m_mgr->AddFilesToVirtualFolder(proj->GetName() + wxT(":tests"), paths); + m_mgr->CreateVirtualDirectory(proj->GetName(), "tests"); + m_mgr->AddFilesToVirtualFolder(proj->GetName() + ":tests", paths); // open the file m_mgr->OpenFile(fn.GetFullPath()); @@ -454,7 +465,7 @@ wxFileName UnitTestPP::FindBestSourceFile(ProjectPtr proj, const wxFileName& fil // create a path name of the file which will be located // under the selected project path (we dont create it here) wxFileName fn(proj->GetFileName()); - fn.SetFullName(wxT("unit_tests.cpp")); + fn.SetFullName("unit_tests.cpp"); return fn; } else if(filename.IsAbsolute() == false) { // relative path was given, set the path to the project path @@ -473,7 +484,7 @@ void UnitTestPP::OnMarkProjectAsUT(wxCommandEvent& e) return; } - p->SetProjectInternalType(wxT("UnitTest++")); + p->SetProjectInternalType("UnitTest++"); p->Save(); } @@ -483,7 +494,7 @@ void UnitTestPP::OnProcessTerminated(clProcessEvent& e) { wxDELETE(m_proc); - wxArrayString arr = wxStringTokenize(m_output, wxT("\r\n")); + wxArrayString arr = wxStringTokenize(m_output, "\r\n"); UnitTestCppOutputParser parser(arr); // parse the results @@ -503,11 +514,11 @@ void UnitTestPP::OnProcessTerminated(clProcessEvent& e) double err_percent = (errCount / totalTests) * 100; double pass_percent = ((totalTests - errCount) / totalTests) * 100; - msg << err_percent << wxT("%"); + msg << err_percent << "%"; m_outputPage->UpdateFailedBar((size_t)summary.errorCount, msg); msg.clear(); - msg << pass_percent << wxT("%"); + msg << pass_percent << "%"; m_outputPage->UpdatePassedBar((size_t)(summary.totalTests - summary.errorCount), msg); SelectUTPage(); @@ -528,10 +539,12 @@ void UnitTestPP::OnRunProject(clExecuteEvent& e) { e.Skip(); // Sanity - if(!clCxxWorkspaceST::Get()->IsOpen()) + if(!clCxxWorkspaceST::Get()->IsOpen()) { return; - if(e.GetTargetName().IsEmpty()) + } + if(e.GetTargetName().IsEmpty()) { return; + } ProjectPtr pProj = clCxxWorkspaceST::Get()->GetProject(e.GetTargetName()); CHECK_PTR_RET(pProj); diff --git a/abbreviation/abbreviation.cpp b/abbreviation/abbreviation.cpp index 840c0dff48..941f05bc21 100644 --- a/abbreviation/abbreviation.cpp +++ b/abbreviation/abbreviation.cpp @@ -24,6 +24,7 @@ ////////////////////////////////////////////////////////////////////////////// #include "abbreviation.h" + #include "abbreviationentry.h" #include "abbreviationssettingsdlg.h" #include "clKeyboardManager.h" @@ -33,6 +34,7 @@ #include "macromanager.h" #include "wxCodeCompletionBoxEntry.hpp" #include "wxCodeCompletionBoxManager.h" + #include #include #include @@ -57,10 +59,10 @@ CL_PLUGIN_API IPlugin* CreatePlugin(IManager* manager) CL_PLUGIN_API PluginInfo* GetPluginInfo() { static PluginInfo info; - info.SetAuthor(wxT("Eran Ifrah")); - info.SetName(wxT("Abbreviation")); + info.SetAuthor("Eran Ifrah"); + info.SetName("Abbreviation"); info.SetDescription(_("Abbreviation plugin")); - info.SetVersion(wxT("v1.1")); + info.SetVersion("v1.1"); return &info; } @@ -79,7 +81,7 @@ AbbreviationPlugin::AbbreviationPlugin(IManager* manager) , m_config("abbreviations.conf") { m_longName = _("Abbreviation plugin"); - m_shortName = wxT("Abbreviation"); + m_shortName = "Abbreviation"; m_topWindow = m_mgr->GetTheApp(); EventNotifier::Get()->Bind(wxEVT_CCBOX_SELECTION_MADE, &AbbreviationPlugin::OnAbbrevSelected, this); @@ -139,7 +141,7 @@ void AbbreviationPlugin::GetAbbreviations(wxCodeCompletionBoxEntry::Vec_t& V, co if(!m_config.ReadItem(&jsonData)) { // merge the data from the old configuration AbbreviationEntry data; - m_mgr->GetConfigTool()->ReadObject(wxT("AbbreviationsData"), &data); + m_mgr->GetConfigTool()->ReadObject("AbbreviationsData", &data); jsonData.SetAutoInsert(data.GetAutoInsert()); jsonData.SetEntries(data.GetEntries()); @@ -185,7 +187,7 @@ void AbbreviationPlugin::InitDefaults() if(!m_config.ReadItem(&jsonData)) { // merge the data from the old configuration AbbreviationEntry data; - m_mgr->GetConfigTool()->ReadObject(wxT("AbbreviationsData"), &data); + m_mgr->GetConfigTool()->ReadObject("AbbreviationsData", &data); jsonData.SetAutoInsert(data.GetAutoInsert()); jsonData.SetEntries(data.GetEntries()); @@ -196,25 +198,26 @@ void AbbreviationPlugin::InitDefaults() if(jsonData.GetEntries().empty()) { // fill some default abbreviations wxStringMap_t entries; - entries["main"] = wxT("int main(int argc, char **argv) {\n |\n}\n"); - entries["while"] = wxT("while(|) {\n \n}\n"); - entries["dowhile"] = wxT("do {\n \n} while( | );\n"); - entries["for_size"] = wxT("for(size_t |=0; |<; ++|) {\n}\n"); - entries["for_int"] = wxT("for(int |=0; |<; ++|) {\n}\n"); - entries["for_php"] = wxT("for($|=0; $|<; ++$|) {\n}\n"); + entries["main"] = "int main(int argc, char **argv) {\n |\n}\n"; + entries["while"] = "while(|) {\n \n}\n"; + entries["dowhile"] = "do {\n \n} while( | );\n"; + entries["for_size"] = "for(size_t |=0; |<; ++|) {\n}\n"; + entries["for_int"] = "for(int |=0; |<; ++|) {\n}\n"; + entries["for_php"] = "for($|=0; $|<; ++$|) {\n}\n"; jsonData.SetEntries(entries); m_config.WriteItem(&jsonData); } - clKeyboardManager::Get()->AddGlobalAccelerator("abbrev_insert", "Ctrl-Alt-SPACE", - _("Plugins::Abbreviations::Show abbreviations completion box")); + clKeyboardManager::Get()->AddAccelerator("abbrev_insert", _("Abbreviations"), + _("Show abbreviations completion box"), "Ctrl-Alt-SPACE"); } bool AbbreviationPlugin::InsertExpansion(const wxString& abbreviation) { // get the active editor IEditor* editor = m_mgr->GetActiveEditor(); - if(!editor || abbreviation.IsEmpty()) + if(!editor || abbreviation.IsEmpty()) { return false; + } // search for abbreviation that matches str // prepate list of abbreviations @@ -222,7 +225,7 @@ bool AbbreviationPlugin::InsertExpansion(const wxString& abbreviation) if(!m_config.ReadItem(&jsonData)) { // merge the data from the old configuration AbbreviationEntry data; - m_mgr->GetConfigTool()->ReadObject(wxT("AbbreviationsData"), &data); + m_mgr->GetConfigTool()->ReadObject("AbbreviationsData", &data); jsonData.SetAutoInsert(data.GetAutoInsert()); jsonData.SetEntries(data.GetEntries()); @@ -249,7 +252,7 @@ bool AbbreviationPlugin::InsertExpansion(const wxString& abbreviation) // format the text to insert bool appendEol(false); - if(text.EndsWith(wxT("\r")) || text.EndsWith(wxT("\n"))) { + if(text.EndsWith("\r") || text.EndsWith("\n")) { appendEol = true; } @@ -267,13 +270,13 @@ bool AbbreviationPlugin::InsertExpansion(const wxString& abbreviation) wxString eol; switch(editor->GetEOL()) { case 1: - eol = wxT("\r"); + eol = "\r"; break; case 0: - eol = wxT("\r\n"); + eol = "\r\n"; break; case 2: - eol = wxT("\n"); + eol = "\n"; break; } text << eol; @@ -287,14 +290,14 @@ bool AbbreviationPlugin::InsertExpansion(const wxString& abbreviation) // locate the caret(s) std::vector carets; - int where = text.Find(wxT("|")); + int where = text.Find("|"); while(where != wxNOT_FOUND) { carets.push_back(where); where = text.find('|', where + 1); } // remove the pipe (|) character - text.Replace(wxT("|"), wxT(" ")); + text.Replace("|", " "); if(selEnd - selStart >= 0) { editor->SelectText(selStart, selEnd - selStart); diff --git a/cmake/Modules/OSXInstall.cmake b/cmake/Modules/OSXInstall.cmake index 4dce603aaa..d55104ef53 100644 --- a/cmake/Modules/OSXInstall.cmake +++ b/cmake/Modules/OSXInstall.cmake @@ -265,10 +265,6 @@ macro(OSX_MAKE_BUNDLE_DIRECTORY) PATTERN ".svn" EXCLUDE PATTERN ".git" EXCLUDE ) - - install(FILES ${CL_SRC_ROOT}/Runtime/config/accelerators.conf.default - DESTINATION - ${CMAKE_BINARY_DIR}/codelite.app/Contents/SharedSupport/config) install(FILES ${CL_SRC_ROOT}/Runtime/config/codelite.layout.default DESTINATION diff --git a/cppchecker/cppchecker.cpp b/cppchecker/cppchecker.cpp index 9141648c11..21da8957ad 100644 --- a/cppchecker/cppchecker.cpp +++ b/cppchecker/cppchecker.cpp @@ -23,10 +23,11 @@ ////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////// +#include "cppchecker.h" + #include "Notebook.h" #include "clKeyboardManager.h" #include "cl_process.h" -#include "cppchecker.h" #include "cppcheckreportpage.h" #include "cppchecksettingsdlg.h" #include "event_notifier.h" @@ -40,6 +41,7 @@ #include "procutils.h" #include "project.h" #include "workspace.h" + #include #include #include @@ -68,10 +70,10 @@ CL_PLUGIN_API IPlugin* CreatePlugin(IManager* manager) CL_PLUGIN_API PluginInfo* GetPluginInfo() { static PluginInfo info; - info.SetAuthor(wxT("Eran Ifrah & Jérémie (jfouche)")); - info.SetName(wxT("CppChecker")); + info.SetAuthor("Eran Ifrah & Jérémie (jfouche)"); + info.SetName("CppChecker"); info.SetDescription(_("CppChecker integration for CodeLite IDE")); - info.SetVersion(wxT("v1.0")); + info.SetVersion("v1.0"); return &info; } @@ -95,7 +97,7 @@ CppCheckPlugin::CppCheckPlugin(IManager* manager) Bind(wxEVT_ASYNC_PROCESS_TERMINATED, &CppCheckPlugin::OnCppCheckTerminated, this); m_longName = _("CppCheck integration for CodeLite IDE"); - m_shortName = wxT("CppCheck"); + m_shortName = "CppCheck"; // Load settings m_mgr->GetConfigTool()->ReadObject("CppCheck", &m_settings); @@ -124,6 +126,12 @@ CppCheckPlugin::CppCheckPlugin(IManager* manager) EventNotifier::Get()->Bind(wxEVT_WORKSPACE_CLOSED, &CppCheckPlugin::OnWorkspaceClosed, this); EventNotifier::Get()->Bind(wxEVT_CONTEXT_MENU_EDITOR, &CppCheckPlugin::OnEditorContextMenu, this); + + clKeyboardManager::Get()->AddAccelerator(_("CppCheck"), + { { "cppcheck_editor_item", _("Check current file") }, + { "cppcheck_project_item", _("Check current file's project") }, + { "cppcheck_workspace_item", _("Check workspace") } }); + m_view = new CppCheckReportPage(m_mgr->GetOutputPaneNotebook(), m_mgr, this); auto book = m_mgr->GetOutputPaneNotebook(); @@ -435,7 +443,7 @@ void CppCheckPlugin::DoSettingsItem(ProjectPtr project /*= NULL*/) CppCheckSettingsDialog dlg(m_mgr->GetTheApp()->GetTopWindow(), &m_settings, m_mgr->GetConfigTool(), defaultpath, project.Get() != NULL); if(dlg.ShowModal() == wxID_OK) { - m_mgr->GetConfigTool()->WriteObject(wxT("CppCheck"), &m_settings); + m_mgr->GetConfigTool()->WriteObject("CppCheck", &m_settings); if(project) { // Also save any project-specific settings: definitions and undefines wxString definitions = wxJoin(m_settings.GetDefinitions(), ','); @@ -502,7 +510,7 @@ void CppCheckPlugin::SetTabVisible(bool clearContent) // Make sure that the Output pane is visible wxAuiManager* aui = m_mgr->GetDockingManager(); if(aui) { - wxAuiPaneInfo& info = aui->GetPane(wxT("Output View")); + wxAuiPaneInfo& info = aui->GetPane("Output View"); if(info.IsOk() && !info.IsShown()) { info.Show(); aui->Update(); @@ -511,9 +519,9 @@ void CppCheckPlugin::SetTabVisible(bool clearContent) // Set the focus to the CppCheck tab Notebook* book = m_mgr->GetOutputPaneNotebook(); - if(book->GetPageText((size_t)book->GetSelection()) != wxT("CppCheck")) { + if(book->GetPageText((size_t)book->GetSelection()) != "CppCheck") { for(size_t i = 0; i < book->GetPageCount(); i++) { - if(book->GetPageText(i) == wxT("CppCheck")) { + if(book->GetPageText(i) == "CppCheck") { book->SetSelection(i); break; } @@ -593,8 +601,9 @@ wxString CppCheckPlugin::DoGetCommand(ProjectPtr proj) ::WrapWithQuotes(path); wxString fileList = DoGenerateFileList(); - if(fileList.IsEmpty()) - return wxT(""); + if(fileList.IsEmpty()) { + return ""; + } // build the command cmd << path << " "; @@ -616,7 +625,7 @@ wxString CppCheckPlugin::DoGetCommand(ProjectPtr proj) } } - cmd << wxT(" --file-list="); + cmd << " --file-list="; ::WrapWithQuotes(fileList); cmd << fileList << " "; clDEBUG() << "cppcheck command:" << cmd << endl; @@ -629,7 +638,7 @@ wxString CppCheckPlugin::DoGenerateFileList() wxFileName fnFileList(clCxxWorkspaceST::Get()->GetPrivateFolder(), "cppcheck.list"); // create temporary file and save the file there - wxFFile file(fnFileList.GetFullPath(), wxT("w+b")); + wxFFile file(fnFileList.GetFullPath(), "w+b"); if(!file.IsOpened()) { wxMessageBox(_("Failed to open temporary file ") + fnFileList.GetFullPath(), _("Warning"), wxOK | wxCENTER | wxICON_WARNING); @@ -638,7 +647,7 @@ wxString CppCheckPlugin::DoGenerateFileList() wxString content; for(size_t i = 0; i < m_filelist.GetCount(); i++) { - content << m_filelist.Item(i) << wxT("\n"); + content << m_filelist.Item(i) << "\n"; } file.Write(content); diff --git a/cscope/cscope.cpp b/cscope/cscope.cpp index a0ab773506..a8de55ae18 100644 --- a/cscope/cscope.cpp +++ b/cscope/cscope.cpp @@ -22,11 +22,12 @@ // ////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////// +#include "cscope.h" + #include "CScopeSettingsDlg.h" #include "bitmap_loader.h" #include "clFileSystemWorkspace.hpp" #include "clKeyboardManager.h" -#include "cscope.h" #include "cscopedbbuilderthread.h" #include "cscopestatusmessage.h" #include "cscopetab.h" @@ -35,12 +36,13 @@ #include "event_notifier.h" #include "exelocator.h" #include "file_logger.h" +#include "fileutils.h" #include "procutils.h" #include "workspace.h" -#include "wx/ffile.h" -#include + #include #include +#include #include #include #include @@ -65,10 +67,10 @@ CL_PLUGIN_API IPlugin* CreatePlugin(IManager* manager) CL_PLUGIN_API PluginInfo* GetPluginInfo() { static PluginInfo info; - info.SetAuthor(wxT("Eran Ifrah, patched by Stefan Roesch")); - info.SetName(CSCOPE_NAME); + info.SetAuthor("Eran Ifrah, patched by Stefan Roesch"); + info.SetName("CScope"); info.SetDescription(_("CScope Integration for CodeLite")); - info.SetVersion(wxT("v1.1")); + info.SetVersion("v1.1"); return &info; } @@ -96,17 +98,14 @@ Cscope::Cscope(IManager* manager) CScopeThreadST::Get()->Start(); // Register keyboard shortcuts for CScope - clKeyboardManager::Get()->AddGlobalAccelerator("cscope_find_user_symbol", "Alt-)", "Plugins::CScope::Find"); - clKeyboardManager::Get()->AddGlobalAccelerator("cscope_find_symbol", "Alt-0", - "Plugins::CScope::Find selected text"); - clKeyboardManager::Get()->AddGlobalAccelerator("cscope_find_global_definition", "Alt-1", - "Plugins::CScope::Find this global definition"); - clKeyboardManager::Get()->AddGlobalAccelerator("cscope_functions_calling_this_function", "Alt-2", - "Plugins::CScope::Find functions called by this function"); - clKeyboardManager::Get()->AddGlobalAccelerator("cscope_functions_called_by_this_function", "Alt-3", - "Plugins::CScope::Find functions calling this function"); - clKeyboardManager::Get()->AddGlobalAccelerator("cscope_create_db", "Alt-4", - "Plugins::CScope::Create CScope database"); + clKeyboardManager::Get()->AddAccelerator( + _("CScope"), + { { "cscope_find_user_symbol", _("Find"), "Alt-)" }, + { "cscope_find_symbol", _("Find selected text"), "Alt-0" }, + { "cscope_find_global_definition", _("Find this global definition"), "Alt-1" }, + { "cscope_functions_calling_this_function", _("Find functions called by this function"), "Alt-2" }, + { "cscope_functions_called_by_this_function", _("Find functions calling this function"), "Alt-3" }, + { "cscope_create_db", _("Create CScope database"), "Alt-4" } }); EventNotifier::Get()->Bind(wxEVT_CONTEXT_MENU_EDITOR, &Cscope::OnEditorContentMenu, this); } @@ -306,7 +305,7 @@ wxString Cscope::DoCreateListFile(bool force) { // get the scope CScopeConfData settings; - m_mgr->GetConfigTool()->ReadObject(wxT("CscopeSettings"), &settings); + m_mgr->GetConfigTool()->ReadObject("CscopeSettings", &settings); wxArrayString tmpfiles; wxString privateFolder = GetWorkingDirectory(); @@ -320,7 +319,7 @@ wxString Cscope::DoCreateListFile(bool force) files.reserve(all_files.size()); for(wxFileName fn : all_files) { wxString ext = fn.GetExt(); - if(ext == wxT("exe") || ext == wxT("") || ext == wxT("xpm") || ext == wxT("png")) { + if(ext == "exe" || ext == "" || ext == "xpm" || ext == "png") { continue; } fn.MakeRelativeTo(privateFolder); @@ -351,7 +350,7 @@ wxString Cscope::DoCreateListFile(bool force) for(const wxString& filepath : tmpfiles) { wxFileName fn(filepath); wxString ext = fn.GetExt(); - if(ext == wxT("exe") || ext == wxT("") || ext == wxT("xpm") || ext == wxT("png")) { + if(ext == "exe" || ext == "" || ext == "xpm" || ext == "png") { continue; } fn.MakeRelativeTo(privateFolder); @@ -364,7 +363,7 @@ wxString Cscope::DoCreateListFile(bool force) wxString content; for(size_t i = 0; i < files.size(); i++) { wxFileName fn(files.at(i)); - content << fn.GetFullPath(wxPATH_UNIX) << wxT("\n"); + content << fn.GetFullPath(wxPATH_UNIX) << "\n"; } FileUtils::WriteFileContent(list_file, content, wxConvUTF8); } @@ -378,7 +377,7 @@ void Cscope::DoCscopeCommand(const wxString& command, const wxString& findWhat, wxString where; if(!ExeLocator::Locate(GetCscopeExeName(), where)) { wxString msg; - msg << _("I can't find 'cscope' anywhere. Please check if it's installed.") << wxT('\n') + msg << _("I can't find 'cscope' anywhere. Please check if it's installed.") << '\n' << _("Or tell me where it can be found, from the menu: 'Plugins | CScope | Settings'"); wxMessageBox(msg, _("CScope not found"), wxOK | wxCENTER | wxICON_WARNING); return; @@ -390,7 +389,7 @@ void Cscope::DoCscopeCommand(const wxString& command, const wxString& findWhat, // make sure that the Output pane is visible wxAuiManager* aui = m_mgr->GetDockingManager(); if(aui) { - wxAuiPaneInfo& info = aui->GetPane(wxT("Output View")); + wxAuiPaneInfo& info = aui->GetPane("Output View"); if(info.IsOk() && !info.IsShown()) { info.Show(); aui->Update(); @@ -438,8 +437,8 @@ void Cscope::OnFindGlobalDefinition(wxCommandEvent& e) // Do the actual search wxString command; wxString endMsg; - command << GetCscopeExeName() << wxT(" -d -L -1 ") << word << wxT(" -i ") << list_file; - endMsg << _("cscope results for: find global definition of '") << word << wxT("'"); + command << GetCscopeExeName() << " -d -L -1 " << word << " -i " << list_file; + endMsg << _("cscope results for: find global definition of '") << word << "'"; DoCscopeCommand(command, word, endMsg); } @@ -454,19 +453,19 @@ void Cscope::OnFindFunctionsCalledByThisFunction(wxCommandEvent& e) wxString list_file = DoCreateListFile(false); // get the rebuild option - wxString rebuildOption = wxT(""); + wxString rebuildOption = ""; CScopeConfData settings; - m_mgr->GetConfigTool()->ReadObject(wxT("CscopeSettings"), &settings); + m_mgr->GetConfigTool()->ReadObject("CscopeSettings", &settings); if(!settings.GetRebuildOption()) { - rebuildOption = wxT(" -d"); + rebuildOption = " -d"; } // Do the actual search wxString command; wxString endMsg; - command << GetCscopeExeName() << rebuildOption << wxT(" -L -2 ") << word << wxT(" -i ") << list_file; - endMsg << _("cscope results for: functions called by '") << word << wxT("'"); + command << GetCscopeExeName() << rebuildOption << " -L -2 " << word << " -i " << list_file; + endMsg << _("cscope results for: functions called by '") << word << "'"; DoCscopeCommand(command, word, endMsg); } @@ -481,19 +480,19 @@ void Cscope::OnFindFunctionsCallingThisFunction(wxCommandEvent& e) wxString list_file = DoCreateListFile(false); // get the rebuild option - wxString rebuildOption = wxT(""); + wxString rebuildOption = ""; CScopeConfData settings; - m_mgr->GetConfigTool()->ReadObject(wxT("CscopeSettings"), &settings); + m_mgr->GetConfigTool()->ReadObject("CscopeSettings", &settings); if(!settings.GetRebuildOption()) { - rebuildOption = wxT(" -d"); + rebuildOption = " -d"; } // Do the actual search wxString command; wxString endMsg; - command << GetCscopeExeName() << rebuildOption << wxT(" -L -3 ") << word << wxT(" -i ") << list_file; - endMsg << _("cscope results for: functions calling '") << word << wxT("'"); + command << GetCscopeExeName() << rebuildOption << " -L -3 " << word << " -i " << list_file; + endMsg << _("cscope results for: functions calling '") << word << "'"; DoCscopeCommand(command, word, endMsg); } @@ -506,13 +505,13 @@ void Cscope::OnFindFilesIncludingThisFname(wxCommandEvent& e) // or it'll be the 'h'of filename.h // Cscope can cope with just a filename word = m_mgr->GetActiveEditor()->GetWordAtCaret(); - if(word == wxT("h")) { + if(word == "h") { long pos = m_mgr->GetActiveEditor()->GetCurrentPosition(); long start = m_mgr->GetActiveEditor()->WordStartPos(pos - 2, true); wxString name = m_mgr->GetActiveEditor()->GetTextRange(start, pos - 2); // Append the .h Cscope would be happy with just foo, // but would also return #include foobar.h which isn't what's been requested - word = name + wxT(".h"); + word = name + ".h"; } if(word.IsEmpty()) { return; @@ -523,19 +522,19 @@ void Cscope::OnFindFilesIncludingThisFname(wxCommandEvent& e) wxString list_file = DoCreateListFile(false); // get the rebuild option - wxString rebuildOption = wxT(""); + wxString rebuildOption = ""; CScopeConfData settings; - m_mgr->GetConfigTool()->ReadObject(wxT("CscopeSettings"), &settings); + m_mgr->GetConfigTool()->ReadObject("CscopeSettings", &settings); if(!settings.GetRebuildOption()) { - rebuildOption = wxT(" -d"); + rebuildOption = " -d"; } // Do the actual search wxString command; wxString endMsg; - command << GetCscopeExeName() << rebuildOption << wxT(" -L -8 ") << word << wxT(" -i ") << list_file; - endMsg << _("cscope results for: files that #include '") << word << wxT("'"); + command << GetCscopeExeName() << rebuildOption << " -L -8 " << word << " -i " << list_file; + endMsg << _("cscope results for: files that #include '") << word << "'"; DoCscopeCommand(command, word, endMsg); } @@ -556,12 +555,12 @@ void Cscope::OnCreateDB(wxCommandEvent& e) command << GetCscopeExeName(); - m_mgr->GetConfigTool()->ReadObject(wxT("CscopeSettings"), &settings); + m_mgr->GetConfigTool()->ReadObject("CscopeSettings", &settings); if(settings.GetBuildRevertedIndexOption()) { - command << wxT(" -q"); + command << " -q"; endMsg << _("Recreated inverted CScope DB"); } else { - command << wxT(" -b"); + command << " -b"; endMsg << _("Recreated CScope DB"); } @@ -569,7 +568,7 @@ void Cscope::OnCreateDB(wxCommandEvent& e) // since the process is always running from the workspace // directory, there is no need to specify the full path of the list file - command << wxT(" -L -i cscope_file.list"); + command << " -L -i cscope_file.list"; DoCscopeCommand(command, wxEmptyString, endMsg); } @@ -578,20 +577,20 @@ void Cscope::OnDoSettings(wxCommandEvent& e) // atm the only setting to set is the cscope filepath // First find the current value, if any CScopeConfData settings; - m_mgr->GetConfigTool()->ReadObject(wxT("CscopeSettings"), &settings); + m_mgr->GetConfigTool()->ReadObject("CscopeSettings", &settings); wxString filepath = settings.GetCscopeExe(); CScopeSettingsDlg dlg(EventNotifier::Get()->TopFrame()); if(dlg.ShowModal() == wxID_OK) { settings.SetCscopeExe(dlg.GetPath()); - m_mgr->GetConfigTool()->WriteObject(wxT("CscopeSettings"), &settings); + m_mgr->GetConfigTool()->WriteObject("CscopeSettings", &settings); } } wxString Cscope::GetCscopeExeName() { CScopeConfData settings; - m_mgr->GetConfigTool()->ReadObject(wxT("CscopeSettings"), &settings); + m_mgr->GetConfigTool()->ReadObject("CscopeSettings", &settings); return settings.GetCscopeExe(); } @@ -631,8 +630,9 @@ void Cscope::OnWorkspaceOpenUI(wxUpdateUIEvent& e) void Cscope::OnFindUserInsertedSymbol(wxCommandEvent& WXUNUSED(e)) { wxString word = GetSearchPattern(); - if(word.IsEmpty()) + if(word.IsEmpty()) { return; + } DoFindSymbol(word); } @@ -650,7 +650,7 @@ wxString Cscope::GetSearchPattern() const } if(pattern.IsEmpty()) { - pattern = wxGetTextFromUser(_("Enter the symbol to search for:"), _("cscope: find symbol"), wxT(""), + pattern = wxGetTextFromUser(_("Enter the symbol to search for:"), _("cscope: find symbol"), "", m_mgr->GetTheApp()->GetTopWindow()); } @@ -663,19 +663,19 @@ void Cscope::DoFindSymbol(const wxString& word) wxString list_file = DoCreateListFile(false); // get the rebuild option - wxString rebuildOption = wxT(""); + wxString rebuildOption = ""; CScopeConfData settings; - m_mgr->GetConfigTool()->ReadObject(wxT("CscopeSettings"), &settings); + m_mgr->GetConfigTool()->ReadObject("CscopeSettings", &settings); if(!settings.GetRebuildOption()) { - rebuildOption = wxT(" -d"); + rebuildOption = " -d"; } // Do the actual search wxString command; wxString endMsg; - command << GetCscopeExeName() << rebuildOption << wxT(" -L -0 ") << word << wxT(" -i ") << list_file; - endMsg << wxT("cscope results for: find C symbol '") << word << wxT("'"); + command << GetCscopeExeName() << rebuildOption << " -L -0 " << word << " -i " << list_file; + endMsg << "cscope results for: find C symbol '" << word << "'"; DoCscopeCommand(command, word, endMsg); } diff --git a/translations/codelite.pot b/translations/codelite.pot index c28fcc572a..287f29d42b 100644 --- a/translations/codelite.pot +++ b/translations/codelite.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: CodeLite\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2022-01-07 17:14+0900\n" +"POT-Creation-Date: 2022-01-21 00:49+0900\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -40,16 +40,17 @@ msgstr "" #: AutoSave/autosave.cpp:48 CMakePlugin/CMakePlugin.cpp:295 #: CallGraph/callgraph.cpp:156 CallGraph/uisettings.h:99 -#: CodeDesigner/codedesigner.cpp:138 Copyright/copyright.cpp:111 -#: Docker/clDockerWorkspaceView.cpp:82 Docker/clDockerWorkspaceView.cpp:116 +#: CodeDesigner/codedesigner.cpp:138 Copyright/copyright.cpp:98 +#: Copyright/copyright.cpp:119 Docker/clDockerWorkspaceView.cpp:82 +#: Docker/clDockerWorkspaceView.cpp:116 #: EditorConfigPlugin/editorconfigplugin.cpp:56 HelpPlugin/helpplugin.cpp:54 #: LiteEditor/fileview.cpp:2561 Plugin/clFileSystemWorkspaceView.cpp:123 #: QmakePlugin/qmakeplugin.cpp:121 SFTP/sftp.cpp:175 #: SmartCompletion/smartcompletion.cpp:57 SnipWiz/snipwiz.cpp:164 #: SpellChecker/spellcheck.cpp:186 SpellChecker/spellcheck.cpp:244 #: Tweaks/tweaks.cpp:109 WebTools/webtools.cpp:123 -#: abbreviation/abbreviation.cpp:104 codelite_vim/codelite_vim.cpp:55 -#: wxcrafter/gui.cpp:141 wxcrafter/wxcrafter_plugin.cpp:415 +#: abbreviation/abbreviation.cpp:106 codelite_vim/codelite_vim.cpp:55 +#: wxcrafter/gui.cpp:141 wxcrafter/wxcrafter_plugin.cpp:414 #: wxformbuilder/wxformbuilder.cpp:101 msgid "Settings..." msgstr "" @@ -115,7 +116,7 @@ msgstr "" #: CMakePlugin/CMakePlugin.cpp:616 Docker/UI.cpp:205 #: LiteEditor/editorsettingsdockingwindowsbase.cpp:299 #: LiteEditor/fileview.cpp:2472 LiteEditor/fileview.cpp:2512 -#: LiteEditor/project_settings_base_dlg.cpp:178 +#: LiteEditor/frame.cpp:952 LiteEditor/project_settings_base_dlg.cpp:178 #: Plugin/clFileSystemWorkspaceDlgBase.cpp:426 Plugin/clStrings.h:5 #: Plugin/editor_config.cpp:448 Plugin/editor_config.cpp:486 #: QmakePlugin/qmakeplugin.cpp:552 Remoty/RemotyWorkspaceView.cpp:92 @@ -177,7 +178,7 @@ msgid "Select Topic:" msgstr "" #: CMakePlugin/CMakePluginUi.cpp:139 LiteEditor/editorframe.cpp:66 -#: LiteEditor/frame.cpp:1380 Runtime/rc/menu.xrc:802 +#: LiteEditor/frame.cpp:1531 Runtime/rc/menu.xrc:802 #: wxcrafter/wxcrafter.cpp:1018 msgid "Reload" msgstr "" @@ -208,10 +209,11 @@ msgstr "" msgid "Show call graph for selected/active project" msgstr "" -#: CallGraph/callgraph.cpp:158 DatabaseExplorer/databaseexplorer.cpp:160 -#: Runtime/templates/projects/executable-wxcrafter-frame/wxcrafter.cpp:42 +#: CallGraph/callgraph.cpp:158 DatabaseExplorer/databaseexplorer.cpp:163 +#: LiteEditor/frame.cpp:1044 +#: Runtime/templates/projects/executable-wxcrafter-frame/wxcrafter.cpp:44 #: codelite-cli/codelite-client/wxcrafter.cpp:115 -#: codelite_terminal/wxcrafter.cpp:72 wxcrafter/wxcrafter_plugin.cpp:413 +#: codelite_terminal/wxcrafter.cpp:72 wxcrafter/wxcrafter_plugin.cpp:412 msgid "About..." msgstr "" @@ -239,7 +241,7 @@ msgstr "" msgid "2012 - 2015 (C) Tomas Bata University, Zlin, Czech Republic" msgstr "" -#: CallGraph/callgraph.cpp:225 DatabaseExplorer/databaseexplorer.cpp:218 +#: CallGraph/callgraph.cpp:225 DatabaseExplorer/databaseexplorer.cpp:221 msgid "http://www.fai.utb.cz" msgstr "" @@ -396,7 +398,7 @@ msgstr "" msgid "Edge threshold (0 - 100) [%]:" msgstr "" -#: CallGraph/uisettings.cpp:120 LanguageServer/UI.cpp:188 +#: CallGraph/uisettings.cpp:120 LanguageServer/UI.cpp:180 #: LiteEditor/implementparentvirtualfunctionsbase.cpp:89 #: codelitephp/php-plugin/new_class.cpp:119 msgid "Options:" @@ -447,7 +449,7 @@ msgstr "" #: cppchecker/cppchecksettingsdlgbase.cpp:337 #: cppchecker/cppchecksettingsdlgbase.cpp:490 #: sdk/wxflatnotebook/src/wxFlatNotebook/fnb_customize_dlg.cpp:42 -#: wxcrafter/gui.cpp:929 wxcrafter/gui.cpp:1032 wxcrafter/wxcrafter.cpp:1349 +#: wxcrafter/gui.cpp:836 wxcrafter/gui.cpp:937 wxcrafter/wxcrafter.cpp:1349 #: wxcrafter/wxcrafter.cpp:1512 wxcrafter/wxcrafter.cpp:1737 msgid "&Cancel" msgstr "" @@ -494,11 +496,11 @@ msgstr "" #: CodeDesigner/codedesigneritemdlg.cpp:41 #: CodeDesigner/codedesigneritemdlg.cpp:48 #: CodeDesigner/codedesigneritemdlg.cpp:55 CodeLite/clprogressdlgbase.h:65 -#: Copyright/copyright.cpp:138 Copyright/copyright.cpp:146 -#: Copyright/copyright.cpp:152 Copyright/copyright.cpp:163 -#: Copyright/copyright.cpp:197 Copyright/copyright.cpp:246 -#: Copyright/copyright.cpp:296 Copyright/copyright.cpp:352 -#: Copyright/copyright.cpp:359 Copyright/copyright.cpp:370 +#: Copyright/copyright.cpp:146 Copyright/copyright.cpp:154 +#: Copyright/copyright.cpp:160 Copyright/copyright.cpp:171 +#: Copyright/copyright.cpp:205 Copyright/copyright.cpp:262 +#: Copyright/copyright.cpp:320 Copyright/copyright.cpp:376 +#: Copyright/copyright.cpp:383 Copyright/copyright.cpp:394 #: DatabaseExplorer/ClassGenerateDialog.cpp:128 #: DatabaseExplorer/ClassGenerateDialog.cpp:133 #: ExternalTools/externaltooldlg.cpp:72 Gizmos/gizmos.cpp:311 @@ -509,17 +511,17 @@ msgstr "" #: Gizmos/newwxprojectdlg.cpp:88 LanguageServer/LanguageServerPage.cpp:115 #: LiteEditor/CompilerMainPage.cpp:220 LiteEditor/CompilerMainPage.cpp:242 #: LiteEditor/CompilerMainPage.cpp:252 LiteEditor/CompilerMainPage.cpp:867 -#: LiteEditor/acceltabledlg.cpp:157 LiteEditor/cl_editor.cpp:316 +#: LiteEditor/acceltabledlg.cpp:155 LiteEditor/cl_editor.cpp:316 #: LiteEditor/cl_editor.cpp:321 LiteEditor/cl_editor.cpp:2447 #: LiteEditor/cl_editor.cpp:2480 LiteEditor/configuration_manager_dlg.cpp:168 -#: LiteEditor/context_cpp.cpp:1635 +#: LiteEditor/context_cpp.cpp:1654 #: LiteEditor/debugger_predefined_types_page.cpp:85 #: LiteEditor/edit_workspace_conf_dlg.cpp:124 LiteEditor/fileview.cpp:969 #: LiteEditor/fileview.cpp:1806 LiteEditor/findresultstab.cpp:118 -#: LiteEditor/frame.cpp:2011 LiteEditor/manager.cpp:1151 +#: LiteEditor/frame.cpp:2165 LiteEditor/manager.cpp:1151 #: LiteEditor/manager.cpp:1932 LiteEditor/manager.cpp:1993 -#: LiteEditor/manager.cpp:2480 LiteEditor/manager.cpp:2504 -#: LiteEditor/manager.cpp:2536 LiteEditor/movefuncimpldlg.cpp:77 +#: LiteEditor/manager.cpp:2481 LiteEditor/manager.cpp:2505 +#: LiteEditor/manager.cpp:2537 LiteEditor/movefuncimpldlg.cpp:77 #: LiteEditor/new_configuration_dlg.cpp:132 #: LiteEditor/ps_custom_build_page.cpp:90 LiteEditor/reconcileproject.cpp:132 #: LiteEditor/reconcileproject.cpp:786 LiteEditor/renamesymboldlg.cpp:91 @@ -533,10 +535,10 @@ msgstr "" #: Plugin/workspace.cpp:249 Plugin/workspace.cpp:480 #: QmakePlugin/qmakeplugin.cpp:386 QmakePlugin/qmakeplugin.cpp:442 #: QmakePlugin/qmakeplugin.cpp:454 QmakePlugin/qmakesettingsdlg.cpp:119 -#: SnipWiz/editsnippetsdlg.cpp:184 SnipWiz/swGlobals.h:50 +#: SnipWiz/editsnippetsdlg.cpp:182 SnipWiz/swGlobals.h:50 #: UnitTestCPP/testclassdlg.cpp:113 UnitTestCPP/testclassdlg.cpp:138 -#: UnitTestCPP/unittestpp.cpp:200 UnitTestCPP/unittestpp.cpp:268 -#: UnitTestCPP/unittestpp.cpp:322 UnitTestCPP/unittestpp.cpp:389 +#: UnitTestCPP/unittestpp.cpp:210 UnitTestCPP/unittestpp.cpp:278 +#: UnitTestCPP/unittestpp.cpp:332 UnitTestCPP/unittestpp.cpp:400 #: WebTools/NodeDebugger.cpp:268 abbreviation/abbreviationssettingsdlg.cpp:95 #: codelitephp/php-plugin/php_workspace_view.cpp:524 #: wxcrafter/import_from_wxFB.cpp:35 wxcrafter/import_from_wxFB.cpp:53 @@ -623,8 +625,8 @@ msgid "C" msgstr "" #: CodeDesigner/codedesigneritembasedlg.cpp:47 -#: CodeFormatter/codeformatterdlgbase.cpp:150 Plugin/workspace.cpp:58 -#: wxcrafter/gui.cpp:431 +#: CodeFormatter/codeformatterdlgbase.cpp:150 LiteEditor/frame.cpp:968 +#: Plugin/workspace.cpp:58 wxcrafter/gui.cpp:371 msgid "C++" msgstr "" @@ -655,7 +657,7 @@ msgstr "" #: Copyright/copyrights_options_base_dlg.cpp:60 DatabaseExplorer/GUI.cpp:1087 #: ExternalTools/NewToolBase.cpp:79 ExternalTools/NewToolBase.cpp:98 #: Gizmos/newclassbasedlg.cpp:139 Gizmos/newclassbasedlg.cpp:160 -#: LanguageServer/UI.cpp:358 LanguageServer/UI.cpp:382 +#: LanguageServer/UI.cpp:350 LanguageServer/UI.cpp:374 #: LiteEditor/importfilesdialog_new.cpp:48 #: LiteEditor/newworkspacebasedlg.cpp:66 #: LiteEditor/project_settings_base_dlg.cpp:560 @@ -674,7 +676,7 @@ msgstr "" #: Subversion2/subversion2_ui.cpp:526 UnitTestCPP/testclassbasedlg.cpp:56 #: codelitephp/php-plugin/new_class.cpp:97 #: codelitephp/php-plugin/new_class.cpp:114 -#: codelitephp/php-plugin/php_ui.cpp:90 wxcrafter/wxcrafter_gui.cpp:1481 +#: codelitephp/php-plugin/php_ui.cpp:90 wxcrafter/wxcrafter_gui.cpp:1482 #: wxformbuilder/formbuildsettingsbasedlg.cpp:60 #: wxformbuilder/wxfbitembasedlg.cpp:80 msgid "..." @@ -684,7 +686,7 @@ msgstr "" #: DatabaseExplorer/GUI.cpp:984 DatabaseExplorer/GUI.cpp:1227 #: DatabaseExplorer/GUI.cpp:1478 LiteEditor/tags_options_base_dlg.cpp:165 #: Plugin/VirtualDirectorySelectorBase.cpp:55 -#: Runtime/templates/projects/executable-wxcrafter-dialog/wxcrafter.cpp:33 +#: Runtime/templates/projects/executable-wxcrafter-dialog/wxcrafter.cpp:39 #: Subversion2/subversion2_ui.cpp:874 #: codelitephp/php-plugin/XDebugManager.cpp:736 msgid "OK" @@ -699,10 +701,10 @@ msgstr "" #: LiteEditor/options_base_dlg2.cpp:48 LiteEditor/tags_options_base_dlg.cpp:170 #: MacBundler/macbundler.cpp:142 Plugin/EnvironmentVariablesDlgBase.cpp:125 #: Plugin/VirtualDirectorySelectorBase.cpp:61 Plugin/globals.h:447 -#: Runtime/templates/projects/executable-wxcrafter-dialog/wxcrafter.cpp:37 +#: Runtime/templates/projects/executable-wxcrafter-dialog/wxcrafter.cpp:45 #: SpellChecker/wxcrafter.cpp:244 Subversion2/subversion2_ui.cpp:256 #: Subversion2/subversion2_ui.cpp:338 Subversion2/subversion2_ui.cpp:879 -#: Subversion2/wxcrafter.cpp:210 codelite_terminal/wxcrafter.cpp:170 +#: Subversion2/wxcrafter.cpp:210 codelite_terminal/wxcrafter.cpp:162 #: codelitephp/php-plugin/php_ui.cpp:227 git/gitui.cpp:360 #: wxcrafter/wxcrafter.cpp:150 wxcrafter/wxcrafter.cpp:747 #: wxformbuilder/formbuildsettingsbasedlg.cpp:88 @@ -753,13 +755,13 @@ msgstr "" #: Subversion2/subversion2_ui.cpp:973 Subversion2/subversion2_ui.cpp:1060 #: Subversion2/wxcrafter.cpp:205 Subversion2/wxcrafter.cpp:315 #: Tweaks/wxcrafter.cpp:117 UnitTestCPP/newunittestbasedlg.cpp:94 -#: codelite_terminal/wxcrafter.cpp:174 codelitephp/php-plugin/new_class.cpp:158 +#: codelite_terminal/wxcrafter.cpp:166 codelitephp/php-plugin/new_class.cpp:158 #: codelitephp/php-plugin/php_ui.cpp:222 codelitephp/php-plugin/php_ui.cpp:554 #: codelitephp/php-plugin/php_ui.cpp:933 #: cppchecker/cppchecksettingsdlgbase.cpp:332 #: cppchecker/cppchecksettingsdlgbase.cpp:485 git/gitui.cpp:355 #: sdk/wxflatnotebook/src/wxFlatNotebook/fnb_customize_dlg.cpp:39 -#: wxcrafter/gui.cpp:924 wxcrafter/gui.cpp:1027 wxcrafter/wxcrafter.cpp:145 +#: wxcrafter/gui.cpp:831 wxcrafter/gui.cpp:932 wxcrafter/wxcrafter.cpp:145 #: wxcrafter/wxcrafter.cpp:1251 wxcrafter/wxcrafter.cpp:1344 #: wxcrafter/wxcrafter.cpp:1507 wxcrafter/wxcrafter.cpp:1731 #: wxformbuilder/formbuildsettingsbasedlg.cpp:84 @@ -900,76 +902,77 @@ msgstr "" msgid "%s lines\n" msgstr "" -#: CodeFormatter/codeformatter.cpp:108 +#: CodeFormatter/codeformatter.cpp:110 msgid "Source Code Formatter (Supports C/C++/Obj-C/JavaScript/PHP files)" msgstr "" -#: CodeFormatter/codeformatter.cpp:118 CodeFormatter/codeformatter.cpp:119 -#: CodeFormatter/codeformatter.cpp:165 CodeFormatter/codeformatter.cpp:500 -#: CodeFormatter/codeformatter.cpp:689 CodeFormatter/codeformatter.cpp:700 -#: CodeFormatter/codeformatter.cpp:846 CodeFormatter/codeformatter.cpp:850 -#: CodeFormatter/codeformatterdlg.cpp:479 +#: CodeFormatter/codeformatter.cpp:120 CodeFormatter/codeformatter.cpp:121 +#: CodeFormatter/codeformatter.cpp:133 CodeFormatter/codeformatter.cpp:171 +#: CodeFormatter/codeformatter.cpp:507 CodeFormatter/codeformatter.cpp:696 +#: CodeFormatter/codeformatter.cpp:707 CodeFormatter/codeformatter.cpp:853 +#: CodeFormatter/codeformatter.cpp:857 CodeFormatter/codeformatterdlg.cpp:479 msgid "Source Code Formatter" msgstr "" -#: CodeFormatter/codeformatter.cpp:145 -msgid "Format Source" +#: CodeFormatter/codeformatter.cpp:134 CodeFormatter/codeformatter.cpp:165 +msgid "Format Current Source" msgstr "" -#: CodeFormatter/codeformatter.cpp:145 -msgid "Format Source Code" +#: CodeFormatter/codeformatter.cpp:134 CodeFormatter/codeformatter.cpp:169 +#: PHPLint/phplint.cpp:68 PHPRefactoring/phprefactoring.cpp:62 +#: Subversion2/subversion2.cpp:216 +msgid "Options..." msgstr "" -#: CodeFormatter/codeformatter.cpp:146 -msgid "Format Options" +#: CodeFormatter/codeformatter.cpp:151 +msgid "Format Source" msgstr "" -#: CodeFormatter/codeformatter.cpp:147 -msgid "Source Code Formatter Options..." +#: CodeFormatter/codeformatter.cpp:151 +msgid "Format Source Code" msgstr "" -#: CodeFormatter/codeformatter.cpp:159 -msgid "Format Current Source" +#: CodeFormatter/codeformatter.cpp:152 +msgid "Format Options" msgstr "" -#: CodeFormatter/codeformatter.cpp:163 PHPLint/phplint.cpp:68 -#: PHPRefactoring/phprefactoring.cpp:62 -msgid "Options..." +#: CodeFormatter/codeformatter.cpp:153 +msgid "Source Code Formatter Options..." msgstr "" -#: CodeFormatter/codeformatter.cpp:311 +#: CodeFormatter/codeformatter.cpp:318 msgid "Formatting: " msgstr "" -#: CodeFormatter/codeformatter.cpp:342 PHPRefactoring/phprefactoring.cpp:279 +#: CodeFormatter/codeformatter.cpp:349 PHPRefactoring/phprefactoring.cpp:279 #: cppchecker/cppcheckreportpage.cpp:182 cscope/cscopedbbuilderthread.cpp:60 msgid "Done" msgstr "" -#: CodeFormatter/codeformatter.cpp:500 CodeFormatter/codeformatterdlg.cpp:479 +#: CodeFormatter/codeformatter.cpp:507 CodeFormatter/codeformatterdlg.cpp:479 #: LiteEditor/replaceinfilespanel.cpp:181 msgid "Failed to save file:\n" msgstr "" -#: CodeFormatter/codeformatter.cpp:787 +#: CodeFormatter/codeformatter.cpp:794 msgid "Code Formatter: scanning for files..." msgstr "" -#: CodeFormatter/codeformatter.cpp:837 +#: CodeFormatter/codeformatter.cpp:844 msgid "Project contains no supported files" msgstr "" -#: CodeFormatter/codeformatter.cpp:845 +#: CodeFormatter/codeformatter.cpp:852 msgid "" " files\n" "Continue?" msgstr "" -#: CodeFormatter/codeformatter.cpp:845 +#: CodeFormatter/codeformatter.cpp:852 msgid "You are about to beautify " msgstr "" -#: CodeFormatter/codeformatter.cpp:850 +#: CodeFormatter/codeformatter.cpp:857 msgid "Formatting files..." msgstr "" @@ -2128,36 +2131,36 @@ msgstr "" msgid "Select file:" msgstr "" -#: CodeLiteDiff/NewFileComparison.cpp:40 CodeLiteDiff/codelitediff.cpp:125 -#: CodeLiteDiff/codelitediff.cpp:134 LiteEditor/mainbook.cpp:493 +#: CodeLiteDiff/NewFileComparison.cpp:40 CodeLiteDiff/codelitediff.cpp:129 +#: CodeLiteDiff/codelitediff.cpp:138 LiteEditor/mainbook.cpp:493 msgid "Untitled" msgstr "" -#: CodeLiteDiff/codelitediff.cpp:53 CodeLiteDiff/codelitediff.cpp:63 +#: CodeLiteDiff/codelitediff.cpp:57 CodeLiteDiff/codelitediff.cpp:67 msgid "CodeLite Diff Plugin" msgstr "" -#: CodeLiteDiff/codelitediff.cpp:83 -msgid "New File Comparison" +#: CodeLiteDiff/codelitediff.cpp:75 CodeLiteDiff/codelitediff.cpp:89 +msgid "Diff Tool" msgstr "" -#: CodeLiteDiff/codelitediff.cpp:83 -msgid "Start new diff" +#: CodeLiteDiff/codelitediff.cpp:76 CodeLiteDiff/codelitediff.cpp:87 +msgid "New File Comparison" msgstr "" -#: CodeLiteDiff/codelitediff.cpp:84 +#: CodeLiteDiff/codelitediff.cpp:77 CodeLiteDiff/codelitediff.cpp:88 msgid "New Folder Comparison" msgstr "" -#: CodeLiteDiff/codelitediff.cpp:84 -msgid "Start new folders diff" +#: CodeLiteDiff/codelitediff.cpp:87 +msgid "Start new diff" msgstr "" -#: CodeLiteDiff/codelitediff.cpp:85 -msgid "Diff Tool" +#: CodeLiteDiff/codelitediff.cpp:88 +msgid "Start new folders diff" msgstr "" -#: CodeLiteDiff/codelitediff.cpp:111 +#: CodeLiteDiff/codelitediff.cpp:115 msgid "Compare with..." msgstr "" @@ -2188,76 +2191,81 @@ msgstr "" msgid "Compiling" msgstr "" -#: Copyright/copyright.cpp:70 +#: Copyright/copyright.cpp:73 msgid "" "Copyright Plugin - a small plugin that allows you to place copyright block " "on top of your source files" msgstr "" -#: Copyright/copyright.cpp:82 +#: Copyright/copyright.cpp:85 msgid "Copyright Plugin - Place copyright block on top of your source files" msgstr "" -#: Copyright/copyright.cpp:102 +#: Copyright/copyright.cpp:95 +msgid "Copyright" +msgstr "" + +#: Copyright/copyright.cpp:96 Copyright/copyright.cpp:110 msgid "Insert Copyright Block" msgstr "" -#: Copyright/copyright.cpp:106 Copyright/copyright.cpp:107 +#: Copyright/copyright.cpp:97 Copyright/copyright.cpp:114 +#: Copyright/copyright.cpp:115 msgid "Batch Insert of Copyright Block" msgstr "" -#: Copyright/copyright.cpp:114 +#: Copyright/copyright.cpp:122 msgid "Copyrights" msgstr "" -#: Copyright/copyright.cpp:137 Copyright/copyright.cpp:351 +#: Copyright/copyright.cpp:145 Copyright/copyright.cpp:375 #, c-format msgid "Template file name '%s', does not exist!" msgstr "" -#: Copyright/copyright.cpp:145 Copyright/copyright.cpp:358 +#: Copyright/copyright.cpp:153 Copyright/copyright.cpp:382 #, c-format msgid "Failed to read template file '%s'" msgstr "" -#: Copyright/copyright.cpp:152 SnipWiz/swGlobals.h:49 +#: Copyright/copyright.cpp:160 SnipWiz/swGlobals.h:49 msgid "There is no active editor\n" msgstr "" -#: Copyright/copyright.cpp:163 +#: Copyright/copyright.cpp:171 msgid "Template file contains text which is not comment, continue anyway?" msgstr "" -#: Copyright/copyright.cpp:179 +#: Copyright/copyright.cpp:187 msgid "File contains ignore string, skipping it" msgstr "" -#: Copyright/copyright.cpp:197 Copyright/copyright.cpp:246 +#: Copyright/copyright.cpp:205 Copyright/copyright.cpp:262 msgid "Batch insert requires a workspace to be opened" msgstr "" -#: Copyright/copyright.cpp:295 +#: Copyright/copyright.cpp:319 #, c-format msgid "You are about to modify %u files. Continue?" msgstr "" -#: Copyright/copyright.cpp:301 +#: Copyright/copyright.cpp:325 msgid "Processing file ..." msgstr "" -#: Copyright/copyright.cpp:322 +#: Copyright/copyright.cpp:346 msgid "File contains ignore string, skipping it: " msgstr "" -#: Copyright/copyright.cpp:329 +#: Copyright/copyright.cpp:353 msgid "Inserting comment to file: " msgstr "" -#: Copyright/copyright.cpp:370 +#: Copyright/copyright.cpp:394 msgid "Template file contains text which is not comment, continue anyways?" msgstr "" -#: Copyright/copyright.cpp:382 +#: Copyright/copyright.cpp:406 msgid "Insert Copyrights Block" msgstr "" @@ -2366,9 +2374,9 @@ msgstr "" #: DatabaseExplorer/DbSettingDialog.cpp:84 #: DatabaseExplorer/DbSettingDialog.cpp:156 #: DatabaseExplorer/DbSettingDialog.cpp:383 -#: DatabaseExplorer/DbViewerPanel.cpp:567 -#: DatabaseExplorer/DbViewerPanel.cpp:618 -#: DatabaseExplorer/DbViewerPanel.cpp:792 +#: DatabaseExplorer/DbViewerPanel.cpp:571 +#: DatabaseExplorer/DbViewerPanel.cpp:622 +#: DatabaseExplorer/DbViewerPanel.cpp:796 #: DatabaseExplorer/ErdCommitWizard.cpp:350 #: DatabaseExplorer/ErdCommitWizard.cpp:462 #: DatabaseExplorer/SqlCommandPanel.cpp:259 @@ -2385,10 +2393,10 @@ msgstr "" #: DatabaseExplorer/DbSettingDialog.cpp:384 #: DatabaseExplorer/DbSettingDialog.cpp:388 #: DatabaseExplorer/DbSettingDialog.cpp:393 -#: DatabaseExplorer/DbViewerPanel.cpp:568 -#: DatabaseExplorer/DbViewerPanel.cpp:571 -#: DatabaseExplorer/DbViewerPanel.cpp:622 -#: DatabaseExplorer/DbViewerPanel.cpp:629 +#: DatabaseExplorer/DbViewerPanel.cpp:572 +#: DatabaseExplorer/DbViewerPanel.cpp:575 +#: DatabaseExplorer/DbViewerPanel.cpp:626 +#: DatabaseExplorer/DbViewerPanel.cpp:633 #: DatabaseExplorer/ErdCommitWizard.cpp:466 #: DatabaseExplorer/ErdCommitWizard.cpp:473 DatabaseExplorer/ErdPanel.cpp:464 #: DatabaseExplorer/SqlCommandPanel.cpp:151 @@ -2400,9 +2408,9 @@ msgstr "" #: DatabaseExplorer/DbSettingDialog.cpp:88 #: DatabaseExplorer/DbSettingDialog.cpp:161 #: DatabaseExplorer/DbSettingDialog.cpp:388 -#: DatabaseExplorer/DbViewerPanel.cpp:571 -#: DatabaseExplorer/DbViewerPanel.cpp:629 -#: DatabaseExplorer/DbViewerPanel.cpp:795 +#: DatabaseExplorer/DbViewerPanel.cpp:575 +#: DatabaseExplorer/DbViewerPanel.cpp:633 +#: DatabaseExplorer/DbViewerPanel.cpp:799 #: DatabaseExplorer/ErdCommitWizard.cpp:473 #: DatabaseExplorer/SqlCommandPanel.cpp:265 msgid "Unknown error." @@ -2420,71 +2428,70 @@ msgstr "" msgid "SQLite connection is not supported." msgstr "" -#: DatabaseExplorer/DbViewerPanel.cpp:66 +#: DatabaseExplorer/DbViewerPanel.cpp:70 msgid "Open connection" msgstr "" -#: DatabaseExplorer/DbViewerPanel.cpp:67 +#: DatabaseExplorer/DbViewerPanel.cpp:71 msgid "Close selected connection" msgstr "" -#: DatabaseExplorer/DbViewerPanel.cpp:68 Subversion2/subversion_view.cpp:253 +#: DatabaseExplorer/DbViewerPanel.cpp:72 Subversion2/subversion_view.cpp:253 msgid "Refresh View" msgstr "" -#: DatabaseExplorer/DbViewerPanel.cpp:181 +#: DatabaseExplorer/DbViewerPanel.cpp:185 #: DatabaseExplorer/ErdCommitWizard.cpp:123 msgid "Databases" msgstr "" -#: DatabaseExplorer/DbViewerPanel.cpp:189 +#: DatabaseExplorer/DbViewerPanel.cpp:193 #: DatabaseExplorer/ErdCommitWizard.cpp:130 #, c-format msgid "Databases (%s)" msgstr "" -#: DatabaseExplorer/DbViewerPanel.cpp:201 +#: DatabaseExplorer/DbViewerPanel.cpp:205 msgid "Tables" msgstr "" -#: DatabaseExplorer/DbViewerPanel.cpp:229 +#: DatabaseExplorer/DbViewerPanel.cpp:233 msgid "Views" msgstr "" -#: DatabaseExplorer/DbViewerPanel.cpp:277 DatabaseExplorer/GUI.cpp:868 +#: DatabaseExplorer/DbViewerPanel.cpp:281 DatabaseExplorer/GUI.cpp:868 #: LiteEditor/batchbuildbasedlg.cpp:97 LiteEditor/edit_configuration.cpp:100 #: LiteEditor/editorframe.cpp:65 LiteEditor/findinfiles_dlg.cpp:176 -#: LiteEditor/frame.cpp:1383 LiteEditor/quickfindbar.cpp:118 -#: Plugin/DiffFoldersFrame.cpp:31 Plugin/clPluginsFindBar.cpp:106 -#: Plugin/clTreeCtrlPanel.cpp:121 Runtime/rc/menu.xrc:761 -#: Runtime/rc/menu.xrc:772 Runtime/rc/menu.xrc:780 +#: LiteEditor/frame.cpp:1040 LiteEditor/frame.cpp:1534 +#: LiteEditor/quickfindbar.cpp:118 Plugin/DiffFoldersFrame.cpp:31 +#: Plugin/clPluginsFindBar.cpp:106 Plugin/clTreeCtrlPanel.cpp:121 +#: Runtime/rc/menu.xrc:761 Runtime/rc/menu.xrc:772 Runtime/rc/menu.xrc:780 #: SnipWiz/editsnippetsbasedlg.cpp:134 Subversion2/subversion_view.cpp:506 -#: git/gitui.cpp:610 git/gitui.cpp:736 wxcrafter/gui.cpp:645 -#: wxcrafter/main.cpp:208 +#: git/gitui.cpp:610 git/gitui.cpp:736 wxcrafter/main.cpp:206 msgid "Close" msgstr "" -#: DatabaseExplorer/DbViewerPanel.cpp:277 +#: DatabaseExplorer/DbViewerPanel.cpp:281 msgid "Close connection?" msgstr "" -#: DatabaseExplorer/DbViewerPanel.cpp:329 +#: DatabaseExplorer/DbViewerPanel.cpp:333 msgid "Add database" msgstr "" -#: DatabaseExplorer/DbViewerPanel.cpp:329 +#: DatabaseExplorer/DbViewerPanel.cpp:333 msgid "Database name" msgstr "" -#: DatabaseExplorer/DbViewerPanel.cpp:339 +#: DatabaseExplorer/DbViewerPanel.cpp:343 msgid "Database created successfully" msgstr "" -#: DatabaseExplorer/DbViewerPanel.cpp:344 +#: DatabaseExplorer/DbViewerPanel.cpp:348 msgid "Can't create new db in this database engine!" msgstr "" -#: DatabaseExplorer/DbViewerPanel.cpp:344 Gizmos/newwxprojectdlg.cpp:103 +#: DatabaseExplorer/DbViewerPanel.cpp:348 Gizmos/newwxprojectdlg.cpp:103 #: LiteEditor/advanced_settings.cpp:89 LiteEditor/cl_editor.cpp:1684 #: LiteEditor/fileview.cpp:916 LiteEditor/fileview.cpp:927 #: LiteEditor/manager.cpp:304 LiteEditor/manager.cpp:321 @@ -2495,162 +2502,162 @@ msgstr "" msgid "Error" msgstr "" -#: DatabaseExplorer/DbViewerPanel.cpp:358 +#: DatabaseExplorer/DbViewerPanel.cpp:362 #, c-format msgid "Remove database '%s'?" msgstr "" -#: DatabaseExplorer/DbViewerPanel.cpp:359 -#: DatabaseExplorer/DbViewerPanel.cpp:715 +#: DatabaseExplorer/DbViewerPanel.cpp:363 +#: DatabaseExplorer/DbViewerPanel.cpp:719 msgid "Drop database" msgstr "" -#: DatabaseExplorer/DbViewerPanel.cpp:365 +#: DatabaseExplorer/DbViewerPanel.cpp:369 msgid "Database dropped successfully" msgstr "" -#: DatabaseExplorer/DbViewerPanel.cpp:401 +#: DatabaseExplorer/DbViewerPanel.cpp:405 #, c-format msgid "Remove table '%s'?" msgstr "" -#: DatabaseExplorer/DbViewerPanel.cpp:402 -#: DatabaseExplorer/DbViewerPanel.cpp:741 +#: DatabaseExplorer/DbViewerPanel.cpp:406 +#: DatabaseExplorer/DbViewerPanel.cpp:745 msgid "Drop table" msgstr "" -#: DatabaseExplorer/DbViewerPanel.cpp:408 +#: DatabaseExplorer/DbViewerPanel.cpp:412 msgid "Table dropped successfully" msgstr "" -#: DatabaseExplorer/DbViewerPanel.cpp:418 +#: DatabaseExplorer/DbViewerPanel.cpp:422 #, c-format msgid "Remove view '%s'?" msgstr "" -#: DatabaseExplorer/DbViewerPanel.cpp:419 -#: DatabaseExplorer/DbViewerPanel.cpp:758 +#: DatabaseExplorer/DbViewerPanel.cpp:423 +#: DatabaseExplorer/DbViewerPanel.cpp:762 msgid "Drop view" msgstr "" -#: DatabaseExplorer/DbViewerPanel.cpp:425 +#: DatabaseExplorer/DbViewerPanel.cpp:429 msgid "View dropped successfully" msgstr "" -#: DatabaseExplorer/DbViewerPanel.cpp:484 +#: DatabaseExplorer/DbViewerPanel.cpp:488 msgid "Import database from SQL file ..." msgstr "" -#: DatabaseExplorer/DbViewerPanel.cpp:498 +#: DatabaseExplorer/DbViewerPanel.cpp:502 msgid "Dump data into file ..." msgstr "" -#: DatabaseExplorer/DbViewerPanel.cpp:503 +#: DatabaseExplorer/DbViewerPanel.cpp:507 msgid "Data was saved to " msgstr "" -#: DatabaseExplorer/DbViewerPanel.cpp:512 +#: DatabaseExplorer/DbViewerPanel.cpp:516 msgid "Export database..." msgstr "" -#: DatabaseExplorer/DbViewerPanel.cpp:558 +#: DatabaseExplorer/DbViewerPanel.cpp:562 #, c-format msgid "The database has been exported to '%s'." msgstr "" -#: DatabaseExplorer/DbViewerPanel.cpp:559 +#: DatabaseExplorer/DbViewerPanel.cpp:563 msgid "wxDbExplorer" msgstr "" -#: DatabaseExplorer/DbViewerPanel.cpp:607 +#: DatabaseExplorer/DbViewerPanel.cpp:611 #: DatabaseExplorer/ErdCommitWizard.cpp:451 msgid "Successful!" msgstr "" -#: DatabaseExplorer/DbViewerPanel.cpp:620 +#: DatabaseExplorer/DbViewerPanel.cpp:624 #: DatabaseExplorer/ErdCommitWizard.cpp:464 msgid "Fail!" msgstr "" -#: DatabaseExplorer/DbViewerPanel.cpp:703 +#: DatabaseExplorer/DbViewerPanel.cpp:707 msgid "Close Connection" msgstr "" -#: DatabaseExplorer/DbViewerPanel.cpp:705 +#: DatabaseExplorer/DbViewerPanel.cpp:709 msgid "Refresh Connection" msgstr "" -#: DatabaseExplorer/DbViewerPanel.cpp:711 -#: DatabaseExplorer/DbViewerPanel.cpp:737 -#: DatabaseExplorer/DbViewerPanel.cpp:755 +#: DatabaseExplorer/DbViewerPanel.cpp:715 +#: DatabaseExplorer/DbViewerPanel.cpp:741 +#: DatabaseExplorer/DbViewerPanel.cpp:759 msgid "Open SQL panel" msgstr "" -#: DatabaseExplorer/DbViewerPanel.cpp:712 +#: DatabaseExplorer/DbViewerPanel.cpp:716 msgid "Open SQL command panel for the database" msgstr "" -#: DatabaseExplorer/DbViewerPanel.cpp:716 +#: DatabaseExplorer/DbViewerPanel.cpp:720 msgid "Run SQL command for deleting Database" msgstr "" -#: DatabaseExplorer/DbViewerPanel.cpp:719 +#: DatabaseExplorer/DbViewerPanel.cpp:723 msgid "Create classes from DB" msgstr "" -#: DatabaseExplorer/DbViewerPanel.cpp:720 +#: DatabaseExplorer/DbViewerPanel.cpp:724 msgid "Create C++ classes for the database" msgstr "" -#: DatabaseExplorer/DbViewerPanel.cpp:723 +#: DatabaseExplorer/DbViewerPanel.cpp:727 msgid "Import database from file" msgstr "" -#: DatabaseExplorer/DbViewerPanel.cpp:724 +#: DatabaseExplorer/DbViewerPanel.cpp:728 msgid "Run SQL commands stored in *.sql file" msgstr "" -#: DatabaseExplorer/DbViewerPanel.cpp:725 +#: DatabaseExplorer/DbViewerPanel.cpp:729 msgid "Export database to file" msgstr "" -#: DatabaseExplorer/DbViewerPanel.cpp:726 +#: DatabaseExplorer/DbViewerPanel.cpp:730 msgid "Export database CREATE SQL statements into *.sql file" msgstr "" -#: DatabaseExplorer/DbViewerPanel.cpp:729 +#: DatabaseExplorer/DbViewerPanel.cpp:733 msgid "Dump data to file" msgstr "" -#: DatabaseExplorer/DbViewerPanel.cpp:730 +#: DatabaseExplorer/DbViewerPanel.cpp:734 msgid "Dump data from database into .sql file" msgstr "" -#: DatabaseExplorer/DbViewerPanel.cpp:738 +#: DatabaseExplorer/DbViewerPanel.cpp:742 msgid "Open SQL command panel for the table" msgstr "" -#: DatabaseExplorer/DbViewerPanel.cpp:741 +#: DatabaseExplorer/DbViewerPanel.cpp:745 msgid "Run SQL command to delete the table" msgstr "" -#: DatabaseExplorer/DbViewerPanel.cpp:743 +#: DatabaseExplorer/DbViewerPanel.cpp:747 msgid "Create classes from Table" msgstr "" -#: DatabaseExplorer/DbViewerPanel.cpp:744 +#: DatabaseExplorer/DbViewerPanel.cpp:748 msgid "Create C++ classes for the table" msgstr "" -#: DatabaseExplorer/DbViewerPanel.cpp:749 +#: DatabaseExplorer/DbViewerPanel.cpp:753 msgid "Copy Column Name" msgstr "" -#: DatabaseExplorer/DbViewerPanel.cpp:755 +#: DatabaseExplorer/DbViewerPanel.cpp:759 msgid "Open SQL command panel for the view" msgstr "" -#: DatabaseExplorer/DbViewerPanel.cpp:758 +#: DatabaseExplorer/DbViewerPanel.cpp:762 msgid "Run SQL command to delete the view" msgstr "" @@ -2694,7 +2701,7 @@ msgstr "" #: DatabaseExplorer/ErdCommitWizard.cpp:175 #: DatabaseExplorer/ErdCommitWizard.cpp:181 -#: DatabaseExplorer/ErdCommitWizard.cpp:399 LiteEditor/context_cpp.cpp:2189 +#: DatabaseExplorer/ErdCommitWizard.cpp:399 LiteEditor/context_cpp.cpp:2208 #: LiteEditor/syntaxhighlightdlg.cpp:643 msgid "Select file" msgstr "" @@ -2782,7 +2789,7 @@ msgstr "" msgid "Restore" msgstr "" -#: DatabaseExplorer/ErdPanel.cpp:176 LiteEditor/frame.cpp:1379 +#: DatabaseExplorer/ErdPanel.cpp:176 LiteEditor/frame.cpp:1530 #: MemCheck/memcheckui.cpp:362 Plugin/clRemoteDirCtrl.cpp:193 #: Plugin/clTreeCtrlPanel.cpp:152 #: codelitephp/php-plugin/php_workspace_view.cpp:295 @@ -2794,9 +2801,9 @@ msgid "Open diagram" msgstr "" #: DatabaseExplorer/ErdPanel.cpp:178 LiteEditor/editorframe.cpp:64 -#: LiteEditor/frame.cpp:1381 Plugin/DiffSideBySidePanel.cpp:95 +#: LiteEditor/frame.cpp:1532 Plugin/DiffSideBySidePanel.cpp:95 #: Runtime/rc/menu.xrc:775 Runtime/rc/menu.xrc:805 -#: wxcrafter/allocator_mgr.cpp:1044 wxcrafter/main.cpp:209 +#: wxcrafter/allocator_mgr.cpp:1044 wxcrafter/main.cpp:207 msgid "Save" msgstr "" @@ -2833,9 +2840,9 @@ msgid "Print preview" msgstr "" #: DatabaseExplorer/ErdPanel.cpp:188 DatabaseExplorer/FrameCanvas.cpp:173 -#: LiteEditor/BuildTab.cpp:292 LiteEditor/frame.cpp:1386 -#: LiteEditor/project_settings_base_dlg.cpp:313 Runtime/rc/menu.xrc:877 -#: Runtime/rc/menu.xrc:922 Runtime/rc/menu.xrc:1085 +#: LiteEditor/BuildTab.cpp:286 LiteEditor/frame.cpp:999 +#: LiteEditor/frame.cpp:1537 LiteEditor/project_settings_base_dlg.cpp:313 +#: Runtime/rc/menu.xrc:877 Runtime/rc/menu.xrc:922 Runtime/rc/menu.xrc:1085 #: wxcrafter/allocator_mgr.cpp:1092 msgid "Copy" msgstr "" @@ -2845,8 +2852,8 @@ msgid "Copy item" msgstr "" #: DatabaseExplorer/ErdPanel.cpp:190 DatabaseExplorer/FrameCanvas.cpp:174 -#: LiteEditor/frame.cpp:1385 Runtime/rc/menu.xrc:890 Runtime/rc/menu.xrc:919 -#: wxcrafter/allocator_mgr.cpp:1093 +#: LiteEditor/frame.cpp:998 LiteEditor/frame.cpp:1536 Runtime/rc/menu.xrc:890 +#: Runtime/rc/menu.xrc:919 wxcrafter/allocator_mgr.cpp:1093 msgid "Cut" msgstr "" @@ -2855,8 +2862,9 @@ msgid "Cut item" msgstr "" #: DatabaseExplorer/ErdPanel.cpp:192 DatabaseExplorer/FrameCanvas.cpp:175 -#: LiteEditor/frame.cpp:1387 Runtime/rc/menu.xrc:880 Runtime/rc/menu.xrc:925 -#: wxcrafter/allocator_mgr.cpp:731 wxcrafter/allocator_mgr.cpp:1094 +#: LiteEditor/frame.cpp:1000 LiteEditor/frame.cpp:1538 Runtime/rc/menu.xrc:880 +#: Runtime/rc/menu.xrc:925 wxcrafter/allocator_mgr.cpp:731 +#: wxcrafter/allocator_mgr.cpp:1094 msgid "Paste" msgstr "" @@ -2865,14 +2873,16 @@ msgid "Paste item" msgstr "" #: DatabaseExplorer/ErdPanel.cpp:195 LiteEditor/editorframe.cpp:69 -#: LiteEditor/frame.cpp:1388 LiteEditor/wxcrafter.cpp:393 -#: Runtime/rc/menu.xrc:883 Runtime/rc/menu.xrc:912 wxcrafter/main.cpp:211 +#: LiteEditor/frame.cpp:996 LiteEditor/frame.cpp:1539 +#: LiteEditor/wxcrafter.cpp:393 Runtime/rc/menu.xrc:883 Runtime/rc/menu.xrc:912 +#: wxcrafter/main.cpp:209 msgid "Undo" msgstr "" #: DatabaseExplorer/ErdPanel.cpp:197 LiteEditor/editorframe.cpp:70 -#: LiteEditor/frame.cpp:1389 LiteEditor/wxcrafter.cpp:396 -#: Runtime/rc/menu.xrc:886 Runtime/rc/menu.xrc:915 wxcrafter/main.cpp:212 +#: LiteEditor/frame.cpp:997 LiteEditor/frame.cpp:1540 +#: LiteEditor/wxcrafter.cpp:396 Runtime/rc/menu.xrc:886 Runtime/rc/menu.xrc:915 +#: wxcrafter/main.cpp:210 msgid "Redo" msgstr "" @@ -2892,8 +2902,8 @@ msgstr "" msgid "Database table" msgstr "" -#: DatabaseExplorer/ErdPanel.cpp:216 LiteEditor/wxcrafter.cpp:609 -#: codelitephp/php-plugin/php_ui.cpp:822 +#: DatabaseExplorer/ErdPanel.cpp:216 LiteEditor/frame.cpp:1089 +#: LiteEditor/wxcrafter.cpp:609 codelitephp/php-plugin/php_ui.cpp:822 msgid "View" msgstr "" @@ -2947,8 +2957,7 @@ msgid "The SQL script has been saved to '%s'." msgstr "" #: DatabaseExplorer/ErdPanel.cpp:340 DatabaseExplorer/ErdPanel.cpp:478 -#: DatabaseExplorer/databaseexplorer.cpp:97 -#: DatabaseExplorer/databaseexplorer.cpp:214 +#: DatabaseExplorer/databaseexplorer.cpp:217 msgid "DatabaseExplorer" msgstr "" @@ -3106,7 +3115,7 @@ msgstr "" #: SnipWiz/templateclassbasedlg.cpp:191 WebTools/WebToolsBase.cpp:365 #: abbreviation/abbreviationssettingsbase.cpp:86 #: codelitephp/php-plugin/new_class.cpp:56 codelitephp/php-plugin/php_ui.cpp:96 -#: codelitephp/php-plugin/php_ui.cpp:193 wxcrafter/wxgui_defs.h:120 +#: codelitephp/php-plugin/php_ui.cpp:193 wxcrafter/wxgui_defs.h:126 msgid "Name:" msgstr "" @@ -3231,7 +3240,7 @@ msgstr "" msgid "Table name:" msgstr "" -#: DatabaseExplorer/GUI.cpp:1305 wxcrafter/wxgui_defs.h:134 +#: DatabaseExplorer/GUI.cpp:1305 wxcrafter/wxgui_defs.h:140 msgid "Columns:" msgstr "" @@ -3394,8 +3403,8 @@ msgid "Load SQL Script" msgstr "" #: DatabaseExplorer/SqlCommandPanel.cpp:101 -#: DatabaseExplorer/databaseexplorer.cpp:146 -#: DatabaseExplorer/databaseexplorer.cpp:162 +#: DatabaseExplorer/databaseexplorer.cpp:149 +#: DatabaseExplorer/databaseexplorer.cpp:165 msgid "Execute SQL" msgstr "" @@ -3459,32 +3468,33 @@ msgstr "" msgid "column" msgstr "" -#: DatabaseExplorer/databaseexplorer.cpp:98 -#: DatabaseExplorer/databaseexplorer.cpp:143 +#: DatabaseExplorer/databaseexplorer.cpp:100 +#: DatabaseExplorer/databaseexplorer.cpp:146 msgid "DatabaseExplorer for CodeLite" msgstr "" -#: DatabaseExplorer/databaseexplorer.cpp:118 -#: DatabaseExplorer/databaseexplorer.cpp:126 +#: DatabaseExplorer/databaseexplorer.cpp:120 #: DatabaseExplorer/databaseexplorer.cpp:128 -#: DatabaseExplorer/databaseexplorer.cpp:204 -#: DatabaseExplorer/databaseexplorer.cpp:245 -#: DatabaseExplorer/databaseexplorer.cpp:252 -#: DatabaseExplorer/databaseexplorer.cpp:254 +#: DatabaseExplorer/databaseexplorer.cpp:130 +#: DatabaseExplorer/databaseexplorer.cpp:207 +#: DatabaseExplorer/databaseexplorer.cpp:248 +#: DatabaseExplorer/databaseexplorer.cpp:255 +#: DatabaseExplorer/databaseexplorer.cpp:257 msgid "DbExplorer" msgstr "" -#: DatabaseExplorer/databaseexplorer.cpp:164 +#: DatabaseExplorer/databaseexplorer.cpp:149 +#: DatabaseExplorer/databaseexplorer.cpp:167 msgid "Database Explorer" msgstr "" -#: DatabaseExplorer/databaseexplorer.cpp:210 +#: DatabaseExplorer/databaseexplorer.cpp:213 msgid "" "Cross platform database explorer\n" "\n" msgstr "" -#: DatabaseExplorer/databaseexplorer.cpp:217 +#: DatabaseExplorer/databaseexplorer.cpp:220 msgid "2011 - 2015 (C) Tomas Bata University, Zlin, Czech Republic" msgstr "" @@ -3500,102 +3510,102 @@ msgstr "" msgid "Export ERD to image..." msgstr "" -#: Debugger/dbgcmd.cpp:263 +#: Debugger/dbgcmd.cpp:272 #, c-format msgid "" "Internal breakpoint was hit (id=%d), Applying user breakpoints and continuing" msgstr "" -#: Debugger/dbgcmd.cpp:332 +#: Debugger/dbgcmd.cpp:341 msgid "Program exited normally." msgstr "" -#: Debugger/dbgcmd.cpp:376 +#: Debugger/dbgcmd.cpp:385 #, c-format msgid "ERROR: failed to place breakpoint: \"%s\"" msgstr "" -#: Debugger/dbgcmd.cpp:391 +#: Debugger/dbgcmd.cpp:400 msgid "Found the breakpoint ID!" msgstr "" -#: Debugger/dbgcmd.cpp:413 +#: Debugger/dbgcmd.cpp:422 #, c-format msgid "Successfully set breakpoint %ld at: " msgstr "" -#: Debugger/dbgcmd.cpp:416 +#: Debugger/dbgcmd.cpp:425 #, c-format msgid "Successfully set conditional breakpoint %ld at: " msgstr "" -#: Debugger/dbgcmd.cpp:419 +#: Debugger/dbgcmd.cpp:428 #, c-format msgid "Successfully set temporary breakpoint %ld at: " msgstr "" -#: Debugger/dbgcmd.cpp:424 +#: Debugger/dbgcmd.cpp:433 #, c-format msgid "Successfully set watchpoint %ld watching: " msgstr "" -#: Debugger/dbgcmd.cpp:427 +#: Debugger/dbgcmd.cpp:436 #, c-format msgid "Successfully set read watchpoint %ld watching: " msgstr "" -#: Debugger/dbgcmd.cpp:430 +#: Debugger/dbgcmd.cpp:439 #, c-format msgid "Successfully set read/write watchpoint %ld watching: " msgstr "" -#: Debugger/dbgcmd.cpp:438 +#: Debugger/dbgcmd.cpp:447 msgid "address " msgstr "" -#: Debugger/dbgcmd.cpp:563 +#: Debugger/dbgcmd.cpp:572 msgid "Successfully connected to debugger server" msgstr "" -#: Debugger/dbgcmd.cpp:566 +#: Debugger/dbgcmd.cpp:575 msgid "Applying breakpoints..." msgstr "" -#: Debugger/dbgcmd.cpp:571 +#: Debugger/dbgcmd.cpp:580 msgid "Applying breakpoints... done" msgstr "" -#: Debugger/dbgcmd.cpp:672 +#: Debugger/dbgcmd.cpp:681 #, c-format msgid "Breakpoint %i condition cleared" msgstr "" -#: Debugger/dbgcmd.cpp:674 +#: Debugger/dbgcmd.cpp:683 #, c-format msgid "Condition %s set for breakpoint %i" msgstr "" -#: Debugger/debuggergdb.cpp:271 +#: Debugger/debuggergdb.cpp:272 msgid "Debugging over SSH, using account: " msgstr "" -#: Debugger/debuggergdb.cpp:272 +#: Debugger/debuggergdb.cpp:273 msgid "Current working dir: " msgstr "" -#: Debugger/debuggergdb.cpp:273 +#: Debugger/debuggergdb.cpp:274 msgid "Launching gdb from : " msgstr "" -#: Debugger/debuggergdb.cpp:274 +#: Debugger/debuggergdb.cpp:275 msgid "Starting debugger : " msgstr "" -#: Debugger/debuggergdb.cpp:659 Debugger/debuggergdb.cpp:705 +#: Debugger/debuggergdb.cpp:658 Debugger/debuggergdb.cpp:704 msgid "Can't interrupt debuggee process: I don't know its PID!" msgstr "" -#: Debugger/debuggergdb.cpp:834 +#: Debugger/debuggergdb.cpp:833 msgid "Failed to start debugger: permission denied" msgstr "" @@ -3619,7 +3629,7 @@ msgid "Remove unused images" msgstr "" #: Docker/DockerOutputPane.cpp:87 Docker/UI.cpp:413 -#: wxcrafter/wxcrafter_gui.cpp:187 +#: wxcrafter/wxcrafter_gui.cpp:188 msgid "Containers" msgstr "" @@ -3636,7 +3646,7 @@ msgid "Restart" msgstr "" #: Docker/DockerOutputPane.cpp:257 ExternalTools/external_tools.cpp:150 -#: LiteEditor/shelltab.cpp:77 +#: LiteEditor/frame.cpp:956 LiteEditor/shelltab.cpp:77 msgid "Stop" msgstr "" @@ -3677,7 +3687,7 @@ msgid "" "'-t my_container .'" msgstr "" -#: Docker/UI.cpp:259 +#: Docker/UI.cpp:259 LiteEditor/frame.cpp:955 msgid "Run" msgstr "" @@ -3710,7 +3720,7 @@ msgid "Image" msgstr "" #: Docker/UI.cpp:434 ExternalTools/external_tools.cpp:144 -#: LanguageServer/UI.cpp:204 LiteEditor/project_settings_base_dlg.cpp:1173 +#: LanguageServer/UI.cpp:196 LiteEditor/project_settings_base_dlg.cpp:1173 #: Plugin/clFileSystemWorkspaceDlgBase.cpp:442 msgid "Command" msgstr "" @@ -3803,13 +3813,14 @@ msgid "Docker for CodeLite" msgstr "" #: Docker/docker.cpp:66 HelpPlugin/HelpPluginUI.h:99 -#: LLDBDebugger/LLDBPlugin.cpp:278 LanguageServer/languageserver.cpp:90 -#: MemCheck/memcheckui.cpp:257 Plugin/clFileSystemWorkspaceView.cpp:23 +#: LLDBDebugger/LLDBPlugin.cpp:278 LanguageServer/languageserver.cpp:91 +#: LiteEditor/frame.cpp:1078 MemCheck/memcheckui.cpp:257 +#: Plugin/clFileSystemWorkspaceView.cpp:23 #: Plugin/clFileSystemWorkspaceView.cpp:123 #: WordCompletion/wordcompletion.cpp:69 ZoomNavigator/zoomnavigator.cpp:130 -#: codelite_terminal/wxcrafter.h:92 cppchecker/cppchecker.cpp:149 -#: cppchecker/cppchecker.cpp:226 cppchecker/cppchecker.cpp:242 -#: cppchecker/cppchecker.cpp:256 cppchecker/cppchecker.cpp:270 +#: codelite_terminal/wxcrafter.h:95 cppchecker/cppchecker.cpp:157 +#: cppchecker/cppchecker.cpp:234 cppchecker/cppchecker.cpp:250 +#: cppchecker/cppchecker.cpp:264 cppchecker/cppchecker.cpp:278 #: git/gitui.cpp:1423 msgid "Settings" msgstr "" @@ -3906,7 +3917,7 @@ msgstr "" msgid "Path to the executable to run" msgstr "" -#: ExternalTools/NewToolBase.cpp:83 LanguageServer/UI.cpp:340 +#: ExternalTools/NewToolBase.cpp:83 LanguageServer/UI.cpp:332 #: LiteEditor/quickdebugbase.cpp:140 LiteEditor/quickdebugbase.cpp:313 #: Plugin/clFileSystemWorkspaceDlgBase.cpp:278 WebTools/WebToolsBase.cpp:242 #: codelitephp/php-plugin/php_ui.cpp:705 @@ -3926,7 +3937,7 @@ msgid "Toolbar icon (24x24):" msgstr "" #: ExternalTools/NewToolBase.cpp:126 ExternalTools/NewToolBase.cpp:143 -#: LanguageServer/UI.cpp:359 Plugin/SwitchToWorkspaceBase.cpp:58 +#: LanguageServer/UI.cpp:351 Plugin/SwitchToWorkspaceBase.cpp:58 #: Plugin/sftp_ui.cpp:363 Remoty/RemotyUI.cpp:89 Remoty/RemotyUI.cpp:198 msgid "Browse..." msgstr "" @@ -3936,7 +3947,7 @@ msgid "Toolbar icon (16x16):" msgstr "" #: ExternalTools/NewToolBase.cpp:147 codelitephp/php-plugin/new_class.cpp:29 -#: wxcrafter/gui.cpp:1095 +#: wxcrafter/gui.cpp:990 msgid "General:" msgstr "" @@ -3971,7 +3982,7 @@ msgid "External Tool" msgstr "" #: ExternalTools/external_tools.cpp:39 LLDBDebugger/LLDBLocalsView.cpp:54 -#: LLDBDebugger/UI.cpp:574 LanguageServer/UI.cpp:156 +#: LLDBDebugger/UI.cpp:574 LanguageServer/UI.cpp:148 #: LiteEditor/CompilerMainPage.cpp:77 LiteEditor/CompilersFoundDlgBase.cpp:39 #: LiteEditor/attachdbgprocbasedlg.cpp:72 LiteEditor/localstable.cpp:54 #: Plugin/clFileSystemWorkspace.cpp:820 Plugin/clSelectSymbolDialogBase.cpp:40 @@ -3979,7 +3990,7 @@ msgstr "" #: Subversion2/subversion2_ui.cpp:76 codelitephp/php-plugin/localsview.cpp:33 #: codelitephp/php-plugin/php_ui.cpp:286 wxcrafter/aui_pane_info.cpp:51 #: wxcrafter/aui_pane_info.cpp:174 wxcrafter/info_bar_button_wrapper.cpp:16 -#: wxcrafter/properties_list_view.cpp:286 +#: wxcrafter/properties_list_view.cpp:316 #: wxcrafter/ribbon_tool_separator.cpp:15 #: wxcrafter/wx_collapsible_pane_pane_wrapper.cpp:12 #: wxcrafter/wxcrafter.cpp:1126 @@ -4022,7 +4033,8 @@ msgstr "" msgid "Stop All" msgstr "" -#: ExternalTools/external_tools.h:61 ExternalTools/externaltools.cpp:272 +#: ExternalTools/external_tools.h:61 ExternalTools/externaltools.cpp:106 +#: ExternalTools/externaltools.cpp:269 msgid "External Tools" msgstr "" @@ -4035,15 +4047,20 @@ msgstr "" msgid "Are you sure you want to delete this tool?" msgstr "" -#: ExternalTools/externaltools.cpp:75 ExternalTools/externaltools.cpp:91 +#: ExternalTools/externaltools.cpp:74 ExternalTools/externaltools.cpp:87 msgid "A plugin that allows user to launch external tools from within CodeLite" msgstr "" -#: ExternalTools/externaltools.cpp:127 ExternalTools/externaltools.cpp:254 +#: ExternalTools/externaltools.cpp:107 +#, c-format +msgid "External Tool %d" +msgstr "" + +#: ExternalTools/externaltools.cpp:124 ExternalTools/externaltools.cpp:251 msgid "Configure external tools..." msgstr "" -#: ExternalTools/externaltools.cpp:128 ExternalTools/externaltools.cpp:257 +#: ExternalTools/externaltools.cpp:125 ExternalTools/externaltools.cpp:254 msgid "Show Running Tools..." msgstr "" @@ -4150,7 +4167,7 @@ msgid "New Plugin Wizard" msgstr "" #: Gizmos/newclassbasedlg.cpp:36 UnitTestCPP/testclassbasedlg.cpp:42 -#: wxcrafter/wxgui_defs.h:121 +#: wxcrafter/wxgui_defs.h:127 msgid "Class Name:" msgstr "" @@ -4158,7 +4175,7 @@ msgstr "" msgid "The class name" msgstr "" -#: Gizmos/newclassbasedlg.cpp:49 Plugin/newkeyshortcutdlg.cpp:90 +#: Gizmos/newclassbasedlg.cpp:49 Plugin/newkeyshortcutdlg.cpp:91 msgid "*" msgstr "" @@ -4214,10 +4231,10 @@ msgstr "" #: Gizmos/newclassbasedlg.cpp:171 LLDBDebugger/UI.cpp:37 #: LLDBDebugger/UI.cpp:580 LiteEditor/ThreadListPanelBase.cpp:43 -#: LiteEditor/breakpointslistctrl.h:55 LiteEditor/listctrlpanelbase.cpp:37 -#: LiteEditor/symbols_dialog.cpp:44 LiteEditor/wxcrafter.cpp:374 -#: MemCheck/memcheckui.cpp:290 -#: Runtime/templates/projects/executable-wxcrafter-frame/wxcrafter.cpp:34 +#: LiteEditor/breakpointslistctrl.h:55 LiteEditor/frame.cpp:1033 +#: LiteEditor/listctrlpanelbase.cpp:37 LiteEditor/symbols_dialog.cpp:44 +#: LiteEditor/wxcrafter.cpp:374 MemCheck/memcheckui.cpp:290 +#: Runtime/templates/projects/executable-wxcrafter-frame/wxcrafter.cpp:36 #: UnitTestCPP/unittestreport.cpp:100 WebTools/WebToolsBase.cpp:537 #: WebTools/WebToolsBase.cpp:560 codelite-cli/codelite-client/wxcrafter.cpp:107 #: codelite_terminal/wxcrafter.cpp:54 codelitephp/php-plugin/php_ui.cpp:290 @@ -4243,7 +4260,7 @@ msgid "Use #pragma once" msgstr "" #: Gizmos/newclassbasedlg.cpp:205 LLDBDebugger/UI.cpp:446 -#: LiteEditor/compiler_pages.cpp:670 wxcrafter/wxcrafter_gui.cpp:952 +#: LiteEditor/compiler_pages.cpp:670 wxcrafter/wxcrafter_gui.cpp:953 msgid "Advanced" msgstr "" @@ -4585,7 +4602,7 @@ msgstr "" msgid "Local Variables" msgstr "" -#: LLDBDebugger/LLDBLocalsView.cpp:76 LiteEditor/frame.cpp:1378 +#: LLDBDebugger/LLDBLocalsView.cpp:76 LiteEditor/frame.cpp:1529 #: LiteEditor/simpletablebase.cpp:59 Plugin/clFileSystemWorkspaceDlgBase.cpp:41 #: Plugin/clFileSystemWorkspaceDlgBase.cpp:449 Runtime/rc/menu.xrc:975 msgid "New" @@ -4601,7 +4618,7 @@ msgstr "" #: Plugin/clTreeCtrlPanel.cpp:105 Plugin/clTreeCtrlPanel.cpp:157 #: QmakePlugin/qmakesettingsdlg.cpp:102 Runtime/rc/menu.xrc:893 #: Runtime/rc/menu.xrc:928 Runtime/rc/menu.xrc:1096 Runtime/rc/menu.xrc:1138 -#: SFTP/UI.cpp:245 Subversion2/subversion2.cpp:274 +#: SFTP/UI.cpp:245 Subversion2/subversion2.cpp:280 #: Subversion2/subversion_view.cpp:461 #: abbreviation/abbreviationssettingsbase.cpp:47 #: codelitephp/php-plugin/PHPDebugPane.cpp:33 @@ -4649,8 +4666,9 @@ msgstr "" #: LLDBDebugger/LLDBLocalsView.cpp:459 LiteEditor/AddOptionsDialogBase.h:49 #: LiteEditor/CompilerMainPage.cpp:623 #: LiteEditor/editoroptionsgeneralguidespanelbase.cpp:157 -#: LiteEditor/free_text_dialog.h:57 LiteEditor/options_dlg2.cpp:105 -#: LiteEditor/wxcrafter.cpp:388 Plugin/clFileSystemWorkspaceDlgBase.cpp:419 +#: LiteEditor/frame.cpp:996 LiteEditor/free_text_dialog.h:57 +#: LiteEditor/options_dlg2.cpp:105 LiteEditor/wxcrafter.cpp:388 +#: Plugin/clFileSystemWorkspaceDlgBase.cpp:419 #: Plugin/clFileSystemWorkspaceDlgBase.cpp:454 Runtime/rc/menu.xrc:1092 msgid "Edit" msgstr "" @@ -4659,11 +4677,12 @@ msgstr "" msgid "New value:" msgstr "" -#: LLDBDebugger/LLDBOutputView.cpp:59 LiteEditor/breakpointdlg.cpp:212 +#: LLDBDebugger/LLDBOutputView.cpp:59 LiteEditor/breakpointdlg.cpp:213 msgid "Delete Breakpoint" msgstr "" -#: LLDBDebugger/LLDBOutputView.cpp:60 Runtime/rc/menu.xrc:907 +#: LLDBDebugger/LLDBOutputView.cpp:60 LiteEditor/frame.cpp:994 +#: Runtime/rc/menu.xrc:907 msgid "Delete All Breakpoints" msgstr "" @@ -4679,17 +4698,17 @@ msgstr "" msgid "LLDB Settings..." msgstr "" -#: LLDBDebugger/LLDBPlugin.cpp:304 LiteEditor/cl_editor.cpp:4161 -#: Runtime/rc/menu.xrc:623 +#: LLDBDebugger/LLDBPlugin.cpp:304 LiteEditor/cl_editor.cpp:4163 +#: LiteEditor/frame.cpp:990 Runtime/rc/menu.xrc:623 msgid "Jump to Caret Line" msgstr "" -#: LLDBDebugger/LLDBPlugin.cpp:307 LiteEditor/cl_editor.cpp:4160 -#: Runtime/rc/menu.xrc:626 +#: LLDBDebugger/LLDBPlugin.cpp:307 LiteEditor/cl_editor.cpp:4162 +#: LiteEditor/frame.cpp:989 Runtime/rc/menu.xrc:626 msgid "Run to Caret Line" msgstr "" -#: LLDBDebugger/LLDBPlugin.cpp:324 LiteEditor/cl_editor.cpp:4152 +#: LLDBDebugger/LLDBPlugin.cpp:324 LiteEditor/cl_editor.cpp:4154 #: LiteEditor/new_quick_watch_dlg.cpp:273 msgid "Add Watch" msgstr "" @@ -4982,19 +5001,19 @@ msgstr "" msgid "Folder Mapping" msgstr "" -#: LanguageServer/LSPOutlineViewDlg.cpp:40 Outline/outline_tab.cpp:71 +#: LanguageServer/LSPOutlineViewDlg.cpp:41 Outline/outline_tab.cpp:75 msgid "Language Server is still not ready... " msgstr "" -#: LanguageServer/LSPOutlineViewDlg.cpp:41 Outline/outline_tab.cpp:72 +#: LanguageServer/LSPOutlineViewDlg.cpp:42 Outline/outline_tab.cpp:76 msgid "(hit ESCAPE key to dismiss)" msgstr "" -#: LanguageServer/LanguageServerCluster.cpp:614 +#: LanguageServer/LanguageServerCluster.cpp:627 msgid "Restarting Language Servers..." msgstr "" -#: LanguageServer/LanguageServerCluster.cpp:616 LiteEditor/cl_editor.cpp:3441 +#: LanguageServer/LanguageServerCluster.cpp:629 LiteEditor/cl_editor.cpp:3441 #: Plugin/CompileCommandsGenerator.cpp:52 cscope/cscopetab.cpp:63 #: cscope/cscopetab.cpp:144 msgid "Ready" @@ -5037,54 +5056,54 @@ msgstr "" msgid "Add new Language Server" msgstr "" -#: LanguageServer/UI.cpp:150 LiteEditor/breakpointslistctrl.h:55 +#: LanguageServer/UI.cpp:142 LiteEditor/breakpointslistctrl.h:55 #: WordCompletion/UI.cpp:38 msgid "Enabled" msgstr "" -#: LanguageServer/UI.cpp:157 +#: LanguageServer/UI.cpp:149 msgid "Give this language server a unique name" msgstr "" -#: LanguageServer/UI.cpp:176 +#: LanguageServer/UI.cpp:168 msgid "Remote Server" msgstr "" -#: LanguageServer/UI.cpp:189 +#: LanguageServer/UI.cpp:181 msgid "The language server executable" msgstr "" -#: LanguageServer/UI.cpp:250 LiteEditor/project_settings_dlg.cpp:108 +#: LanguageServer/UI.cpp:242 LiteEditor/project_settings_dlg.cpp:108 #: LiteEditor/workspacesettingsbase.cpp:35 #: Plugin/clFileSystemWorkspaceDlgBase.cpp:597 msgid "Environment" msgstr "" -#: LanguageServer/UI.cpp:296 +#: LanguageServer/UI.cpp:288 msgid "Initialization Options" msgstr "" -#: LanguageServer/UI.cpp:342 +#: LanguageServer/UI.cpp:334 msgid "Set the language server working directory" msgstr "" -#: LanguageServer/UI.cpp:364 +#: LanguageServer/UI.cpp:356 msgid "Languages:" msgstr "" -#: LanguageServer/UI.cpp:365 +#: LanguageServer/UI.cpp:357 msgid "List of supported languages by this Language Server" msgstr "" -#: LanguageServer/UI.cpp:383 +#: LanguageServer/UI.cpp:375 msgid "Show List of Languages" msgstr "" -#: LanguageServer/UI.cpp:387 +#: LanguageServer/UI.cpp:379 msgid "Connection string:" msgstr "" -#: LanguageServer/UI.cpp:389 +#: LanguageServer/UI.cpp:381 msgid "" "Set the connection string here.\n" "If the server connects using 'stdio', choose the 'stdio' entry\n" @@ -5092,11 +5111,11 @@ msgid "" "tcp://127.0.0.1:12345" msgstr "" -#: LanguageServer/UI.cpp:395 +#: LanguageServer/UI.cpp:387 msgid "stdio" msgstr "" -#: LanguageServer/UI.cpp:399 +#: LanguageServer/UI.cpp:391 msgid "" "If the language server is using TCP\n" "Type the connection string in the format of:\n" @@ -5104,11 +5123,11 @@ msgid "" "tcp://host:port" msgstr "" -#: LanguageServer/UI.cpp:408 +#: LanguageServer/UI.cpp:400 msgid "Priority:" msgstr "" -#: LanguageServer/UI.cpp:410 +#: LanguageServer/UI.cpp:402 msgid "" "Multiple Plugins / Servers can compete for providing code completion\n" "for a given language. Set here the server priority.\n" @@ -5119,44 +5138,44 @@ msgid "" "a value that is higher than 75" msgstr "" -#: LanguageServer/UI.cpp:424 +#: LanguageServer/UI.cpp:416 msgid "Display diagnostics" msgstr "" -#: LanguageServer/UI.h:81 +#: LanguageServer/UI.h:82 msgid "Language Server Settings" msgstr "" -#: LanguageServer/UI.h:163 +#: LanguageServer/UI.h:164 msgid "New Language Server" msgstr "" -#: LanguageServer/UI.h:187 +#: LanguageServer/UI.h:188 msgid "Outline View" msgstr "" -#: LanguageServer/languageserver.cpp:36 LanguageServer/languageserver.cpp:46 +#: LanguageServer/languageserver.cpp:37 LanguageServer/languageserver.cpp:47 msgid "Support for Language Server Protocol (LSP)" msgstr "" -#: LanguageServer/languageserver.cpp:53 LanguageServer/languageserver.cpp:54 -#: LanguageServer/languageserver.cpp:92 +#: LanguageServer/languageserver.cpp:54 LanguageServer/languageserver.cpp:55 +#: LanguageServer/languageserver.cpp:93 msgid "Language Server" msgstr "" -#: LanguageServer/languageserver.cpp:91 +#: LanguageServer/languageserver.cpp:92 msgid "Restart Language Servers" msgstr "" -#: LanguageServer/languageserver.cpp:210 +#: LanguageServer/languageserver.cpp:211 msgid "Find references" msgstr "" -#: LanguageServer/languageserver.cpp:214 +#: LanguageServer/languageserver.cpp:215 msgid "Rename symbol" msgstr "" -#: LanguageServer/languageserver.cpp:216 +#: LanguageServer/languageserver.cpp:217 msgid "Find symbol" msgstr "" @@ -5166,7 +5185,7 @@ msgid "" "description" msgstr "" -#: LiteEditor/AccelTableBaseDlg.cpp:51 wxcrafter/menu_item_wrapper.cpp:34 +#: LiteEditor/AccelTableBaseDlg.cpp:51 wxcrafter/menu_item_wrapper.cpp:35 msgid "Keyboard Shortcut" msgstr "" @@ -5196,55 +5215,55 @@ msgid "" "configuration?" msgstr "" -#: LiteEditor/BuildTab.cpp:295 +#: LiteEditor/BuildTab.cpp:289 msgid "Copy all" msgstr "" -#: LiteEditor/BuildTab.cpp:361 +#: LiteEditor/BuildTab.cpp:355 msgid "A file with the same name already exists, continue?" msgstr "" -#: LiteEditor/BuildTab.cpp:409 +#: LiteEditor/BuildTab.cpp:403 msgid "total time" msgstr "" -#: LiteEditor/BuildTab.cpp:410 +#: LiteEditor/BuildTab.cpp:404 msgid "seconds" msgstr "" -#: LiteEditor/BuildTab.cpp:416 +#: LiteEditor/BuildTab.cpp:410 msgid "(Build cancelled by the user)\n" msgstr "" -#: LiteEditor/BuildTab.cpp:424 +#: LiteEditor/BuildTab.cpp:418 msgid "==== build ended with " msgstr "" -#: LiteEditor/BuildTab.cpp:425 +#: LiteEditor/BuildTab.cpp:419 msgid "errors" msgstr "" -#: LiteEditor/BuildTab.cpp:427 +#: LiteEditor/BuildTab.cpp:421 msgid "=== build ended with " msgstr "" -#: LiteEditor/BuildTab.cpp:428 +#: LiteEditor/BuildTab.cpp:422 msgid "warnings" msgstr "" -#: LiteEditor/BuildTab.cpp:430 +#: LiteEditor/BuildTab.cpp:424 msgid "=== build completed " msgstr "" -#: LiteEditor/BuildTab.cpp:431 +#: LiteEditor/BuildTab.cpp:425 msgid "successfully" msgstr "" -#: LiteEditor/BuildTab.cpp:433 +#: LiteEditor/BuildTab.cpp:427 msgid " errors, " msgstr "" -#: LiteEditor/BuildTab.cpp:433 +#: LiteEditor/BuildTab.cpp:427 msgid " warnings)" msgstr "" @@ -5275,7 +5294,8 @@ msgid "Switch" msgstr "" #: LiteEditor/CompilerMainPage.cpp:84 LiteEditor/CompilerMainPage.cpp:90 -#: Runtime/templates/projects/executable-wxcrafter-frame/wxcrafter.cpp:40 +#: LiteEditor/frame.cpp:1044 +#: Runtime/templates/projects/executable-wxcrafter-frame/wxcrafter.cpp:42 #: codelite-cli/codelite-client/wxcrafter.cpp:113 #: codelite_terminal/wxcrafter.cpp:70 codelitephp/php-plugin/php.cpp:507 msgid "Help" @@ -5537,7 +5557,7 @@ msgstr "" msgid "Click to open a web browser in CodeLite's documentation page" msgstr "" -#: LiteEditor/acceltabledlg.cpp:155 +#: LiteEditor/acceltabledlg.cpp:153 #, c-format msgid "" "'%s' is already assigned to: '%s'\n" @@ -5574,9 +5594,9 @@ msgstr "" #: LiteEditor/advanced_settings.cpp:106 LiteEditor/edit_configuration.cpp:179 #: LiteEditor/fileview.cpp:853 LiteEditor/fileview.cpp:894 -#: LiteEditor/fileview.cpp:1117 LiteEditor/frame.cpp:2366 -#: LiteEditor/mainbook.cpp:287 LiteEditor/manager.cpp:2788 -#: LiteEditor/manager.cpp:2839 LiteEditor/manager.cpp:2877 +#: LiteEditor/fileview.cpp:1117 LiteEditor/frame.cpp:2526 +#: LiteEditor/mainbook.cpp:287 LiteEditor/manager.cpp:2789 +#: LiteEditor/manager.cpp:2840 LiteEditor/manager.cpp:2878 #: LiteEditor/syntaxhighlightdlg.cpp:686 Plugin/EnvironmentVariablesDlg.cpp:122 #: Plugin/clTreeCtrlPanel.cpp:598 Subversion2/subversion_view.cpp:716 #: Subversion2/subversion_view.cpp:1306 Subversion2/svn_checkout_dialog.cpp:84 @@ -5607,7 +5627,7 @@ msgstr "" msgid "Set a name to the compiler" msgstr "" -#: LiteEditor/app.cpp:1059 LiteEditor/fileexplorer.cpp:82 +#: LiteEditor/app.cpp:1061 LiteEditor/fileexplorer.cpp:82 #: LiteEditor/workspace_pane.cpp:169 LiteEditor/workspace_pane.cpp:360 #: LiteEditor/workspace_pane.cpp:384 LiteEditor/workspace_pane.cpp:385 msgid "Explorer" @@ -5617,7 +5637,7 @@ msgstr "" msgid "Debugger to use:" msgstr "" -#: LiteEditor/attachdbgprocbasedlg.cpp:47 wxcrafter/wxgui_defs.h:190 +#: LiteEditor/attachdbgprocbasedlg.cpp:47 wxcrafter/wxgui_defs.h:196 msgid "Filter:" msgstr "" @@ -5657,12 +5677,12 @@ msgstr "" #: LiteEditor/batchbuildbasedlg.cpp:79 Plugin/addincludefiledlg.cpp:62 #: Plugin/addincludefiledlg.cpp:63 wxcrafter/allocator_mgr.cpp:1031 -#: wxcrafter/wxguicraft_main_view.cpp:218 +#: wxcrafter/wxguicraft_main_view.cpp:217 msgid "Move Up" msgstr "" #: LiteEditor/batchbuildbasedlg.cpp:82 wxcrafter/allocator_mgr.cpp:1032 -#: wxcrafter/wxguicraft_main_view.cpp:219 +#: wxcrafter/wxguicraft_main_view.cpp:218 msgid "Move Down" msgstr "" @@ -5670,7 +5690,7 @@ msgstr "" msgid "Batch Build" msgstr "" -#: LiteEditor/breakpointdlg.cpp:93 LiteEditor/cl_editor.cpp:3966 +#: LiteEditor/breakpointdlg.cpp:93 LiteEditor/cl_editor.cpp:3968 msgid "Breakpoint successfully deleted" msgstr "" @@ -5682,25 +5702,25 @@ msgstr "" msgid "Pending Breakpoints reapplied" msgstr "" -#: LiteEditor/breakpointdlg.cpp:172 +#: LiteEditor/breakpointdlg.cpp:173 msgid "Temp. " msgstr "" -#: LiteEditor/breakpointdlg.cpp:174 LiteEditor/breakpointdlgbase.cpp:133 +#: LiteEditor/breakpointdlg.cpp:175 LiteEditor/breakpointdlgbase.cpp:133 #: LiteEditor/breakpointpropertiesdlg.cpp:237 msgid "Breakpoint" msgstr "" -#: LiteEditor/breakpointdlg.cpp:174 LiteEditor/breakpointdlgbase.cpp:248 +#: LiteEditor/breakpointdlg.cpp:175 LiteEditor/breakpointdlgbase.cpp:248 #: LiteEditor/breakpointpropertiesdlg.cpp:110 msgid "Watchpoint" msgstr "" -#: LiteEditor/breakpointdlg.cpp:179 +#: LiteEditor/breakpointdlg.cpp:180 msgid "disabled" msgstr "" -#: LiteEditor/breakpointdlg.cpp:211 +#: LiteEditor/breakpointdlg.cpp:212 msgid "Edit Breakpoint..." msgstr "" @@ -6009,7 +6029,7 @@ msgstr "" msgid "Watchpoint successfully added" msgstr "" -#: LiteEditor/breakpointsmgr.cpp:140 LiteEditor/cl_editor.cpp:3938 +#: LiteEditor/breakpointsmgr.cpp:140 LiteEditor/cl_editor.cpp:3940 msgid "Breakpoint successfully added" msgstr "" @@ -6292,7 +6312,7 @@ msgstr "" msgid "Remove Bookmark" msgstr "" -#: LiteEditor/cl_editor.cpp:3845 +#: LiteEditor/cl_editor.cpp:3845 LiteEditor/frame.cpp:1059 msgid "Remove All Bookmarks" msgstr "" @@ -6344,53 +6364,53 @@ msgstr "" msgid "Enter the condition statement" msgstr "" -#: LiteEditor/cl_editor.cpp:3933 +#: LiteEditor/cl_editor.cpp:3935 msgid "Failed to insert breakpoint" msgstr "" -#: LiteEditor/cl_editor.cpp:3940 +#: LiteEditor/cl_editor.cpp:3942 msgid "Temporary " msgstr "" -#: LiteEditor/cl_editor.cpp:3942 +#: LiteEditor/cl_editor.cpp:3944 msgid "Disabled " msgstr "" -#: LiteEditor/cl_editor.cpp:3944 +#: LiteEditor/cl_editor.cpp:3946 msgid "Conditional " msgstr "" -#: LiteEditor/cl_editor.cpp:3971 +#: LiteEditor/cl_editor.cpp:3973 msgid "No breakpoint found on this line" msgstr "" -#: LiteEditor/cl_editor.cpp:3974 +#: LiteEditor/cl_editor.cpp:3976 msgid "Breakpoint deletion failed" msgstr "" -#: LiteEditor/cl_editor.cpp:3977 +#: LiteEditor/cl_editor.cpp:3979 msgid "Breakpoint not deleted" msgstr "" -#: LiteEditor/cl_editor.cpp:4149 +#: LiteEditor/cl_editor.cpp:4151 msgid "More Watches" msgstr "" -#: LiteEditor/cl_editor.cpp:5114 +#: LiteEditor/cl_editor.cpp:5116 msgid "Watch" msgstr "" -#: LiteEditor/cl_editor.cpp:5114 +#: LiteEditor/cl_editor.cpp:5116 msgid "as" msgstr "" -#: LiteEditor/cl_editor.cpp:5917 LiteEditor/cl_editor.cpp:5958 +#: LiteEditor/cl_editor.cpp:5919 LiteEditor/cl_editor.cpp:5960 #: Plugin/clPluginsFindBar.cpp:676 Plugin/clPluginsFindBar.cpp:900 #: Plugin/clPluginsFindBar.cpp:1039 msgid " matches" msgstr "" -#: LiteEditor/cl_editor.cpp:5917 LiteEditor/cl_editor.cpp:5958 +#: LiteEditor/cl_editor.cpp:5919 LiteEditor/cl_editor.cpp:5960 #: Plugin/clPluginsFindBar.cpp:676 msgid "Found and selected " msgstr "" @@ -6399,7 +6419,8 @@ msgstr "" msgid "Ask me for each file" msgstr "" -#: LiteEditor/close_all_dlg.cpp:70 Runtime/rc/menu.xrc:87 +#: LiteEditor/close_all_dlg.cpp:70 LiteEditor/frame.cpp:1039 +#: Runtime/rc/menu.xrc:87 msgid "Save all files" msgstr "" @@ -6411,8 +6432,8 @@ msgstr "" msgid "Some of the files are modified, what action should CodeLite take?" msgstr "" -#: LiteEditor/close_all_dlg.h:67 Runtime/rc/menu.xrc:108 -#: Runtime/rc/menu.xrc:764 Runtime/rc/menu.xrc:783 +#: LiteEditor/close_all_dlg.h:67 LiteEditor/frame.cpp:1041 +#: Runtime/rc/menu.xrc:108 Runtime/rc/menu.xrc:764 Runtime/rc/menu.xrc:783 msgid "Close All" msgstr "" @@ -6572,7 +6593,7 @@ msgstr "" #: LiteEditor/reconcileprojectbase.cpp:349 #: LiteEditor/reconcileprojectbase.cpp:380 SnipWiz/editsnippetsbasedlg.cpp:98 #: SnipWiz/templateclassbasedlg.cpp:205 SpellChecker/spellcheck.cpp:225 -#: SpellChecker/wxcrafter.cpp:236 Subversion2/subversion2.cpp:298 +#: SpellChecker/wxcrafter.cpp:236 Subversion2/subversion2.cpp:304 #: cppchecker/cppchecksettingsdlgbase.cpp:132 #: cppchecker/cppchecksettingsdlgbase.cpp:170 #: cppchecker/cppchecksettingsdlgbase.cpp:221 @@ -6755,103 +6776,103 @@ msgstr "" msgid "New Configuration" msgstr "" -#: LiteEditor/context_cpp.cpp:581 +#: LiteEditor/context_cpp.cpp:582 msgid "Open Include File \"" msgstr "" -#: LiteEditor/context_cpp.cpp:597 +#: LiteEditor/context_cpp.cpp:598 msgid "Add Forward Declaration for \"" msgstr "" -#: LiteEditor/context_cpp.cpp:601 +#: LiteEditor/context_cpp.cpp:602 msgid "Add Include File for \"" msgstr "" -#: LiteEditor/context_cpp.cpp:821 +#: LiteEditor/context_cpp.cpp:822 msgid "Multiple candidates found. Select a file to open:" msgstr "" -#: LiteEditor/context_cpp.cpp:822 +#: LiteEditor/context_cpp.cpp:823 msgid "Swap Header/Source Implementation" msgstr "" -#: LiteEditor/context_cpp.cpp:844 +#: LiteEditor/context_cpp.cpp:845 msgid "No matched file was found, would you like to create one?" msgstr "" -#: LiteEditor/context_cpp.cpp:845 +#: LiteEditor/context_cpp.cpp:846 msgid "Create" msgstr "" -#: LiteEditor/context_cpp.cpp:845 +#: LiteEditor/context_cpp.cpp:846 msgid "Don't Create" msgstr "" -#: LiteEditor/context_cpp.cpp:846 LiteEditor/fileview.cpp:903 +#: LiteEditor/context_cpp.cpp:847 LiteEditor/fileview.cpp:903 #: Plugin/compile_request.cpp:93 Plugin/globals.h:448 Plugin/globals.h:465 #: codelitephp/php-plugin/php_workspace_view.cpp:817 #: codelitephp/php-plugin/php_workspace_view.cpp:835 msgid "Remember my answer and don't ask me again" msgstr "" -#: LiteEditor/context_cpp.cpp:1193 +#: LiteEditor/context_cpp.cpp:1194 msgid "Seems like you have all the getters/setters you need..." msgstr "" -#: LiteEditor/context_cpp.cpp:1193 LiteEditor/frame.cpp:4085 -#: LiteEditor/frame.cpp:4169 +#: LiteEditor/context_cpp.cpp:1194 LiteEditor/frame.cpp:4244 +#: LiteEditor/frame.cpp:4328 msgid "codelite" msgstr "" -#: LiteEditor/context_cpp.cpp:1593 +#: LiteEditor/context_cpp.cpp:1603 msgid "Could not locate implementation file!" msgstr "" -#: LiteEditor/context_cpp.cpp:1607 +#: LiteEditor/context_cpp.cpp:1617 msgid "Could not read file: " msgstr "" -#: LiteEditor/context_cpp.cpp:1625 +#: LiteEditor/context_cpp.cpp:1644 msgid "No prototypes were found" msgstr "" -#: LiteEditor/context_cpp.cpp:1634 +#: LiteEditor/context_cpp.cpp:1653 msgid "'Add Functions Implementation' can only work inside valid scope, got (" msgstr "" -#: LiteEditor/context_cpp.cpp:1661 +#: LiteEditor/context_cpp.cpp:1680 msgid "No un-implemented functions found" msgstr "" -#: LiteEditor/context_cpp.cpp:2027 +#: LiteEditor/context_cpp.cpp:2046 msgid "Symbol renamed" msgstr "" -#: LiteEditor/context_cpp.cpp:2039 +#: LiteEditor/context_cpp.cpp:2058 msgid "Please save the file before retagging it" msgstr "" -#: LiteEditor/context_cpp.cpp:2189 +#: LiteEditor/context_cpp.cpp:2208 msgid "Select file to open:" msgstr "" -#: LiteEditor/context_cpp.cpp:2202 +#: LiteEditor/context_cpp.cpp:2221 msgid "Create File" msgstr "" -#: LiteEditor/context_cpp.cpp:2202 +#: LiteEditor/context_cpp.cpp:2221 msgid "New File Name:" msgstr "" -#: LiteEditor/context_cpp.cpp:2550 +#: LiteEditor/context_cpp.cpp:2569 LiteEditor/frame.cpp:1054 msgid "Find Symbol" msgstr "" -#: LiteEditor/context_cpp.cpp:2551 +#: LiteEditor/context_cpp.cpp:2570 msgid "Go to Declaration" msgstr "" -#: LiteEditor/context_cpp.cpp:2552 +#: LiteEditor/context_cpp.cpp:2571 msgid "Go to Implementation" msgstr "" @@ -6897,7 +6918,7 @@ msgstr "" #: LiteEditor/debugcoredumpbase.cpp:109 #: LiteEditor/editorsettingsdockingwindowsbase.cpp:396 -#: LiteEditor/frame.cpp:2936 Plugin/clFileSystemWorkspaceDlgBase.cpp:466 +#: LiteEditor/frame.cpp:3099 Plugin/clFileSystemWorkspaceDlgBase.cpp:466 #: Plugin/clStrings.h:7 Plugin/editor_config.cpp:459 #: Plugin/editor_config.cpp:496 codelitephp/php-plugin/php_ui.cpp:852 msgid "Debug" @@ -7044,9 +7065,9 @@ msgid "Use default Hex Display" msgstr "" #: LiteEditor/debuggersettingsbasedlg.cpp:438 -#: wxcrafter/AuiToolBarTopLevel.cpp:22 wxcrafter/std_button_wrapper.cpp:31 -#: wxcrafter/tool_bar_item_wrapper.cpp:41 wxcrafter/toolbar_base_wrapper.cpp:37 -#: wxcrafter/toolbar_base_wrapper.cpp:183 wxcrafter/wxc_widget.cpp:141 +#: wxcrafter/AuiToolBarTopLevel.cpp:24 wxcrafter/std_button_wrapper.cpp:31 +#: wxcrafter/tool_bar_item_wrapper.cpp:41 wxcrafter/toolbar_base_wrapper.cpp:39 +#: wxcrafter/toolbar_base_wrapper.cpp:216 wxcrafter/wxc_widget.cpp:140 msgid "Tooltip" msgstr "" @@ -7171,7 +7192,7 @@ msgstr "" msgid "Current function:" msgstr "" -#: LiteEditor/debuggersettingsbasedlg.cpp:859 wxcrafter/gui.cpp:643 +#: LiteEditor/debuggersettingsbasedlg.cpp:859 msgid "Register" msgstr "" @@ -7234,7 +7255,7 @@ msgstr "" #: LiteEditor/edit_configuration.cpp:143 LiteEditor/edit_configuration.cpp:163 #: LiteEditor/edit_workspace_conf_dlg.cpp:136 Plugin/clRemoteDirCtrl.cpp:262 -#: Plugin/clTreeCtrlPanel.cpp:153 Subversion2/subversion2.cpp:301 +#: Plugin/clTreeCtrlPanel.cpp:153 Subversion2/subversion2.cpp:307 #: Subversion2/subversion_view.cpp:462 #: codelitephp/php-plugin/php_workspace_view.cpp:296 #: codelitephp/php-plugin/php_workspace_view.cpp:327 @@ -7333,10 +7354,10 @@ msgstr "" msgid "Auto adjust the horizontal toolbar to fit to the page content" msgstr "" -#: LiteEditor/editorframe.cpp:67 LiteEditor/frame.cpp:1401 +#: LiteEditor/editorframe.cpp:67 LiteEditor/frame.cpp:1552 #: LiteEditor/quickfindbarbase.cpp:50 Plugin/DiffSideBySidePanel.cpp:97 -#: Plugin/quickfindbarbase.cpp:50 wxcrafter/gui.cpp:147 wxcrafter/main.cpp:214 -#: wxcrafter/main.cpp:815 wxcrafter/main.cpp:837 +#: Plugin/quickfindbarbase.cpp:50 cscope/cscope.cpp:103 wxcrafter/gui.cpp:147 +#: wxcrafter/main.cpp:212 wxcrafter/main.cpp:798 wxcrafter/main.cpp:820 msgid "Find" msgstr "" @@ -7390,8 +7411,8 @@ msgid "Whitespaces" msgstr "" #: LiteEditor/editoroptionsgeneralguidespanelbase.cpp:73 -#: LiteEditor/editorsettingslocal.cpp:80 Plugin/clBoostrapWizardBase.cpp:251 -#: Runtime/rc/menu.xrc:287 +#: LiteEditor/editorsettingslocal.cpp:80 LiteEditor/frame.cpp:1108 +#: Plugin/clBoostrapWizardBase.cpp:251 Runtime/rc/menu.xrc:287 msgid "Invisible" msgstr "" @@ -7426,7 +7447,7 @@ msgid "Unix (LF)" msgstr "" #: LiteEditor/editoroptionsgeneralguidespanelbase.cpp:88 -#: wxcrafter/styled_text_ctrl_wrapper.cpp:201 wxcrafter/wxgui_defs.h:219 +#: wxcrafter/styled_text_ctrl_wrapper.cpp:201 wxcrafter/wxgui_defs.h:225 msgid "EOL Mode" msgstr "" @@ -7607,7 +7628,7 @@ msgid "Columns per tab character in document:" msgstr "" #: LiteEditor/editoroptionsgeneralrightmarginpanelbase.cpp:45 -#: wxcrafter/wxgui_defs.h:125 +#: wxcrafter/wxgui_defs.h:131 msgid "Disabled" msgstr "" @@ -7921,6 +7942,7 @@ msgid "" msgstr "" #: LiteEditor/editorsettingsdockingwindowsbase.cpp:234 +#: LiteEditor/frame.cpp:1101 msgid "Navigation Bar" msgstr "" @@ -7981,9 +8003,9 @@ msgid "" msgstr "" #: LiteEditor/editorsettingsdockingwindowsbase.cpp:308 -#: Plugin/clRemoteFinderHelper.cpp:104 Plugin/clStrings.h:4 -#: Plugin/editor_config.cpp:451 Plugin/editor_config.cpp:488 -#: SFTP/SFTPStatusPage.cpp:195 SFTP/UI.cpp:82 +#: LiteEditor/frame.cpp:1046 Plugin/clRemoteFinderHelper.cpp:104 +#: Plugin/clStrings.h:4 Plugin/editor_config.cpp:451 +#: Plugin/editor_config.cpp:488 SFTP/SFTPStatusPage.cpp:195 SFTP/UI.cpp:82 msgid "Search" msgstr "" @@ -8005,7 +8027,7 @@ msgid "" msgstr "" #: LiteEditor/editorsettingsdockingwindowsbase.cpp:316 -#: LiteEditor/frame.cpp:1402 LiteEditor/project_settings_base_dlg.cpp:389 +#: LiteEditor/frame.cpp:1553 LiteEditor/project_settings_base_dlg.cpp:389 #: LiteEditor/quickfindbarbase.cpp:74 Plugin/clStrings.h:8 #: Plugin/editor_config.cpp:453 Plugin/editor_config.cpp:490 #: Plugin/quickfindbarbase.cpp:74 @@ -8029,21 +8051,24 @@ msgstr "" #: LiteEditor/editorsettingsdockingwindowsbase.cpp:364 #: Plugin/editor_config.cpp:467 Plugin/editor_config.cpp:504 -#: cppchecker/cppchecker.cpp:131 cppchecker/cppchecker.cpp:132 -#: cppchecker/cppchecker.cpp:151 cppchecker/cppchecker.cpp:159 -#: cppchecker/cppchecker.cpp:165 cppchecker/cppchecker.cpp:171 -#: cppchecker/cppchecker.cpp:663 cppchecker/cppchecksettingsdlg.cpp:183 +#: cppchecker/cppchecker.cpp:130 cppchecker/cppchecker.cpp:139 +#: cppchecker/cppchecker.cpp:140 cppchecker/cppchecker.cpp:159 +#: cppchecker/cppchecker.cpp:167 cppchecker/cppchecker.cpp:173 +#: cppchecker/cppchecker.cpp:179 cppchecker/cppchecker.cpp:672 +#: cppchecker/cppchecksettingsdlg.cpp:183 #: cppchecker/cppchecksettingsdlg.cpp:203 msgid "CppCheck" msgstr "" #: LiteEditor/editorsettingsdockingwindowsbase.cpp:371 #: Plugin/editor_config.cpp:469 Plugin/editor_config.cpp:506 +#: Subversion2/subversion2.cpp:216 msgid "Subversion" msgstr "" #: LiteEditor/editorsettingsdockingwindowsbase.cpp:380 -#: Plugin/editor_config.cpp:471 cscope/cscope.cpp:54 cscope/cscope.cpp:688 +#: Plugin/editor_config.cpp:471 cscope/cscope.cpp:56 cscope/cscope.cpp:102 +#: cscope/cscope.cpp:688 msgid "CScope" msgstr "" @@ -8542,7 +8567,7 @@ msgstr "" msgid "Remember my answer and apply it all files" msgstr "" -#: LiteEditor/fileview.cpp:860 LiteEditor/frame.cpp:2028 +#: LiteEditor/fileview.cpp:860 LiteEditor/frame.cpp:2182 msgid "Are you sure?" msgstr "" @@ -8554,8 +8579,8 @@ msgstr "" msgid "Do you also want to delete the file '" msgstr "" -#: LiteEditor/fileview.cpp:902 LiteEditor/frame.cpp:3668 -#: LiteEditor/frame.cpp:4715 LiteEditor/pluginmgrdlg.cpp:127 +#: LiteEditor/fileview.cpp:902 LiteEditor/frame.cpp:3824 +#: LiteEditor/frame.cpp:4880 LiteEditor/pluginmgrdlg.cpp:127 #: Plugin/compile_request.cpp:92 Plugin/globals.h:447 Plugin/globals.h:465 #: codelitephp/php-plugin/php_workspace_view.cpp:816 #: codelitephp/php-plugin/php_workspace_view.cpp:834 @@ -8563,8 +8588,8 @@ msgstr "" msgid "No" msgstr "" -#: LiteEditor/fileview.cpp:902 LiteEditor/frame.cpp:3321 -#: LiteEditor/frame.cpp:4715 LiteEditor/pluginmgrdlg.cpp:127 +#: LiteEditor/fileview.cpp:902 LiteEditor/frame.cpp:3477 +#: LiteEditor/frame.cpp:4880 LiteEditor/pluginmgrdlg.cpp:127 #: Plugin/compile_request.cpp:92 Plugin/globals.h:446 Plugin/globals.h:464 #: codelitephp/php-plugin/php_workspace_view.cpp:816 #: codelitephp/php-plugin/php_workspace_view.cpp:834 @@ -8703,7 +8728,7 @@ msgstr "" msgid "Clean project" msgstr "" -#: LiteEditor/fileview.cpp:2483 +#: LiteEditor/fileview.cpp:2483 LiteEditor/frame.cpp:964 msgid "Stop Build" msgstr "" @@ -8716,9 +8741,10 @@ msgid "Build Order..." msgstr "" #: LiteEditor/fileview.cpp:2524 LiteEditor/fileview.cpp:2525 -#: Plugin/clEditorBar.cpp:234 Plugin/clTreeCtrlPanel.cpp:116 -#: Plugin/clTreeCtrlPanel.cpp:160 Runtime/rc/menu.xrc:833 -#: Runtime/rc/menu.xrc:1052 codelitephp/php-plugin/php_workspace_view.cpp:300 +#: LiteEditor/frame.cpp:1062 Plugin/clEditorBar.cpp:234 +#: Plugin/clTreeCtrlPanel.cpp:116 Plugin/clTreeCtrlPanel.cpp:160 +#: Runtime/rc/menu.xrc:833 Runtime/rc/menu.xrc:1052 +#: codelitephp/php-plugin/php_workspace_view.cpp:300 #: codelitephp/php-plugin/php_workspace_view.cpp:329 #: codelitephp/php-plugin/php_workspace_view.cpp:358 #: codelitephp/php-plugin/php_workspace_view.cpp:395 @@ -8800,8 +8826,8 @@ msgstr "" msgid "New Folder Name" msgstr "" -#: LiteEditor/fileview.cpp:2896 LiteEditor/frame.cpp:2129 -#: codelitephp/php-plugin/php_workspace_view.cpp:1437 wxcrafter/main.cpp:207 +#: LiteEditor/fileview.cpp:2896 LiteEditor/frame.cpp:2285 +#: codelitephp/php-plugin/php_workspace_view.cpp:1437 wxcrafter/main.cpp:205 msgid "Open Project" msgstr "" @@ -8994,8 +9020,8 @@ msgstr "" msgid "Remove the selected path" msgstr "" -#: LiteEditor/findinfiles_dlg.h:243 LiteEditor/frame.cpp:1403 -#: LiteEditor/frame.cpp:1404 Runtime/rc/menu.xrc:420 +#: LiteEditor/findinfiles_dlg.h:243 LiteEditor/frame.cpp:1554 +#: LiteEditor/frame.cpp:1555 Runtime/rc/menu.xrc:420 msgid "Find In Files" msgstr "" @@ -9040,13 +9066,13 @@ msgid " ; Match whole word: " msgstr "" #: LiteEditor/findresultstab.cpp:186 LiteEditor/findresultstab.cpp:187 -#: LiteEditor/findresultstab.cpp:188 Subversion2/subversion2.cpp:1343 -#: Subversion2/subversion2.cpp:1432 +#: LiteEditor/findresultstab.cpp:188 Subversion2/subversion2.cpp:1360 +#: Subversion2/subversion2.cpp:1449 msgid "false" msgstr "" #: LiteEditor/findresultstab.cpp:186 LiteEditor/findresultstab.cpp:187 -#: LiteEditor/findresultstab.cpp:188 Subversion2/subversion2.cpp:1430 +#: LiteEditor/findresultstab.cpp:188 Subversion2/subversion2.cpp:1447 msgid "true" msgstr "" @@ -9070,403 +9096,989 @@ msgstr "" msgid "Search result is no longer valid" msgstr "" -#: LiteEditor/findresultstab.cpp:510 Subversion2/SvnCommitDialog.cpp:313 +#: LiteEditor/findresultstab.cpp:511 Subversion2/SvnCommitDialog.cpp:313 msgid "Clear History" msgstr "" -#: LiteEditor/findusagetab.cpp:239 LiteEditor/findusagetab.cpp:291 +#: LiteEditor/findusagetab.cpp:242 LiteEditor/findusagetab.cpp:294 msgid "Failed to open file: " msgstr "" -#: LiteEditor/findusagetab.cpp:282 Remoty/RemotyWorkspace.cpp:532 +#: LiteEditor/findusagetab.cpp:285 Remoty/RemotyWorkspace.cpp:532 msgid "Failed to download file: " msgstr "" -#: LiteEditor/frame.cpp:831 -msgid "Edit::Split selection into multiple carets" +#: LiteEditor/frame.cpp:914 +msgid "CodeLite " msgstr "" -#: LiteEditor/frame.cpp:833 -msgid "Search::Toggle the Quick-Replace Bar" +#: LiteEditor/frame.cpp:953 +msgid "Configuration Manager..." msgstr "" -#: LiteEditor/frame.cpp:936 -msgid "CodeLite " +#: LiteEditor/frame.cpp:954 Runtime/rc/menu.xrc:577 +msgid "Batch Build..." msgstr "" -#: LiteEditor/frame.cpp:939 -msgid "Switch to Next Tab" +#: LiteEditor/frame.cpp:957 Runtime/rc/menu.xrc:1059 +msgid "Build Project" msgstr "" -#: LiteEditor/frame.cpp:940 -msgid "Switch to Previous Tab" +#: LiteEditor/frame.cpp:958 Runtime/rc/menu.xrc:567 Runtime/rc/menu.xrc:986 +msgid "Build Workspace" msgstr "" -#: LiteEditor/frame.cpp:941 -msgid "Move Tab Left" +#: LiteEditor/frame.cpp:959 Runtime/rc/menu.xrc:573 +msgid "Rebuild Workspace" msgstr "" -#: LiteEditor/frame.cpp:942 -msgid "Move Tab Right" +#: LiteEditor/frame.cpp:960 Runtime/rc/menu.xrc:570 Runtime/rc/menu.xrc:989 +msgid "Clean Workspace" msgstr "" -#: LiteEditor/frame.cpp:1060 Runtime/rc/menu.xrc:382 -msgid "Show Menu Bar" +#: LiteEditor/frame.cpp:961 +msgid "Compile Current File" msgstr "" -#: LiteEditor/frame.cpp:1066 Runtime/rc/menu.xrc:378 -msgid "Show Tool Bar" +#: LiteEditor/frame.cpp:962 +msgid "Compile Current File's Project" msgstr "" -#: LiteEditor/frame.cpp:1078 -msgid "Show Output View " +#: LiteEditor/frame.cpp:963 +msgid "Clean Project" msgstr "" -#: LiteEditor/frame.cpp:1141 -msgid "Output View" +#: LiteEditor/frame.cpp:965 +msgid "Rebuild Project" msgstr "" -#: LiteEditor/frame.cpp:1142 -msgid "Workspace View" +#: LiteEditor/frame.cpp:966 +msgid "Build and Run Project" msgstr "" -#: LiteEditor/frame.cpp:1144 wxcrafter/gui.h:168 wxcrafter/main.cpp:185 -#: wxcrafter/main.cpp:707 wxcrafter/wxcrafter_plugin.cpp:188 -#: wxcrafter/wxcrafter_plugin.cpp:189 wxcrafter/wxcrafter_plugin.cpp:416 -#: wxcrafter/wxcrafter_plugin.cpp:447 wxcrafter/wxcrafter_plugin.cpp:570 -#: wxcrafter/wxcrafter_plugin.cpp:692 wxcrafter/wxcrafter_plugin.cpp:745 -#: wxcrafter/wxcrafter_plugin.cpp:758 wxcrafter/wxcrafter_plugin.cpp:772 -#: wxcrafter/wxcrafter_plugin.cpp:991 wxcrafter/wxcrafter_plugin.cpp:1199 -#: wxcrafter/wxcrafter_plugin.cpp:1360 wxcrafter/wxcrafter_plugin.cpp:1368 -#: wxcrafter/wxcrafter_plugin.cpp:1370 wxcrafter/wxguicraft_main_view.cpp:1883 -#: wxcrafter/wxguicraft_main_view.cpp:1963 -msgid "wxCrafter" +#: LiteEditor/frame.cpp:967 +msgid "Next Build Error" msgstr "" -#: LiteEditor/frame.cpp:1378 Plugin/clTreeCtrlPanel.cpp:102 -#: Plugin/clTreeCtrlPanel.cpp:434 codelitephp/php-plugin/php_ui.h:134 -#: codelitephp/php-plugin/php_workspace_view.cpp:644 -msgid "New File" +#: LiteEditor/frame.cpp:968 +msgid "Swap Header/Implementation file" msgstr "" -#: LiteEditor/frame.cpp:1379 LiteEditor/frame.cpp:1958 -#: Subversion2/subversion_view.cpp:448 git/GitConsole.cpp:399 -msgid "Open File" +#: LiteEditor/frame.cpp:969 +msgid "Goto Declaration" msgstr "" -#: LiteEditor/frame.cpp:1380 LiteEditor/frame.cpp:1824 -msgid "Reload File" +#: LiteEditor/frame.cpp:970 +msgid "Goto Implementation" msgstr "" -#: LiteEditor/frame.cpp:1382 -msgid "Save All" +#: LiteEditor/frame.cpp:971 +msgid "Open Include File" msgstr "" -#: LiteEditor/frame.cpp:1383 -msgid "Close File" +#: LiteEditor/frame.cpp:972 +msgid "Add Include File" msgstr "" -#: LiteEditor/frame.cpp:1391 -msgid "Backward" +#: LiteEditor/frame.cpp:973 +msgid "C++ | Code Generation / Refactoring" msgstr "" -#: LiteEditor/frame.cpp:1392 -msgid "Forward" +#: LiteEditor/frame.cpp:974 Runtime/rc/menu.xrc:855 +msgid "Generate Setters/Getters..." msgstr "" -#: LiteEditor/frame.cpp:1398 LiteEditor/frame.cpp:1399 Runtime/rc/menu.xrc:901 -msgid "Toggle Bookmark" +#: LiteEditor/frame.cpp:975 Runtime/rc/menu.xrc:866 +msgid "Move Function Implementation to..." msgstr "" -#: LiteEditor/frame.cpp:1405 LiteEditor/frame.cpp:1406 -msgid "Find Resource In Workspace" +#: LiteEditor/frame.cpp:976 Runtime/rc/menu.xrc:869 +msgid "Add Function Implementation..." msgstr "" -#: LiteEditor/frame.cpp:1407 -msgid "Highlight Word" +#: LiteEditor/frame.cpp:977 Runtime/rc/menu.xrc:872 +msgid "Implement all Un-implemented Functions..." msgstr "" -#: LiteEditor/frame.cpp:1408 -msgid "Highlight Matching Words" +#: LiteEditor/frame.cpp:978 LiteEditor/project_settings_base_dlg.cpp:246 +#: LiteEditor/project_settings_dlg.cpp:109 +msgid "Debugger" msgstr "" -#: LiteEditor/frame.cpp:1415 LiteEditor/frame.cpp:1416 -#: LiteEditor/workspacetab.cpp:153 LiteEditor/workspacetab.cpp:154 -#: LiteEditor/workspacetab.cpp:580 Plugin/clFileSystemWorkspaceView.cpp:29 -msgid "Build Active Project" +#: LiteEditor/frame.cpp:978 +msgid "Start/Continue Debugger" msgstr "" -#: LiteEditor/frame.cpp:1417 LiteEditor/frame.cpp:1418 -#: LiteEditor/workspacetab.cpp:567 Plugin/clFileSystemWorkspaceView.cpp:30 -msgid "Stop Current Build" +#: LiteEditor/frame.cpp:979 +msgid "Restart Debugger" msgstr "" -#: LiteEditor/frame.cpp:1419 LiteEditor/frame.cpp:1420 -msgid "Clean Active Project" +#: LiteEditor/frame.cpp:980 +msgid "Attach to process..." msgstr "" -#: LiteEditor/frame.cpp:1422 LiteEditor/frame.cpp:1423 -#: LiteEditor/workspacetab.cpp:155 LiteEditor/workspacetab.cpp:156 -msgid "Run Active Project" +#: LiteEditor/frame.cpp:981 Plugin/DebuggerToolBar.cpp:41 +msgid "Pause debugger" msgstr "" -#: LiteEditor/frame.cpp:1424 LiteEditor/frame.cpp:1425 -msgid "Stop Running Program" +#: LiteEditor/frame.cpp:982 Plugin/DebuggerToolBar.cpp:40 +msgid "Stop debugger" msgstr "" -#: LiteEditor/frame.cpp:1431 LiteEditor/frame.cpp:1432 -msgid "Start or Continue debugger" +#: LiteEditor/frame.cpp:983 Plugin/DebuggerToolBar.cpp:46 +msgid "Step Into" msgstr "" -#: LiteEditor/frame.cpp:1447 -msgid "Applying your choices and restarting CodeLite" +#: LiteEditor/frame.cpp:984 Plugin/DebuggerToolBar.cpp:48 +msgid "Step Out" msgstr "" -#: LiteEditor/frame.cpp:1449 -msgid "Applying your choices, this may take a few seconds" +#: LiteEditor/frame.cpp:985 +msgid "Step Into Instruction" msgstr "" -#: LiteEditor/frame.cpp:1651 -msgid "Eran Ifrah (Project admin)" +#: LiteEditor/frame.cpp:986 Plugin/DebuggerToolBar.cpp:47 git/gitui.cpp:451 +#: git/gitui.cpp:1399 +msgid "Next" msgstr "" -#: LiteEditor/frame.cpp:1652 Plugin/clAboutDialog.cpp:35 -msgid "David G. Hart" +#: LiteEditor/frame.cpp:987 Runtime/rc/menu.xrc:616 +msgid "Next Instruction" msgstr "" -#: LiteEditor/frame.cpp:1653 Plugin/clAboutDialog.cpp:38 -msgid "Frank Lichtner" +#: LiteEditor/frame.cpp:988 +msgid "Show Cursor" msgstr "" -#: LiteEditor/frame.cpp:1654 Plugin/clAboutDialog.cpp:39 -msgid "Jacek Kucharski" +#: LiteEditor/frame.cpp:991 Runtime/rc/menu.xrc:904 +msgid "Toggle Breakpoint" msgstr "" -#: LiteEditor/frame.cpp:1655 Plugin/clAboutDialog.cpp:40 -msgid "Marrianne Gagnon" +#: LiteEditor/frame.cpp:992 +msgid "Disable All Breakpoints" msgstr "" -#: LiteEditor/frame.cpp:1656 Plugin/clAboutDialog.cpp:41 -msgid "Scott Dolim" +#: LiteEditor/frame.cpp:993 +msgid "Enable All Breakpoints" msgstr "" -#: LiteEditor/frame.cpp:1659 -msgid "CodeLite Home" +#: LiteEditor/frame.cpp:995 +msgid "Quick Debug..." msgstr "" -#: LiteEditor/frame.cpp:1668 Plugin/clAboutDialogBase.cpp:100 -msgid "CodeLite IDE" +#: LiteEditor/frame.cpp:1001 +msgid "Duplicate Selection / Line" msgstr "" -#: LiteEditor/frame.cpp:1669 -msgid "A free, open source, C/C++/PHP and JavaScript IDE" +#: LiteEditor/frame.cpp:1002 +msgid "Delete to Line End" msgstr "" -#: LiteEditor/frame.cpp:1823 -msgid "" -"' is modified\n" -"Continue with reload?" +#: LiteEditor/frame.cpp:1003 +msgid "Delete to Line Start" msgstr "" -#: LiteEditor/frame.cpp:1823 -msgid "File '" +#: LiteEditor/frame.cpp:1004 +msgid "Delete Line" msgstr "" -#: LiteEditor/frame.cpp:2011 -msgid "Please enter a name for the tab group" +#: LiteEditor/frame.cpp:1005 Runtime/rc/menu.xrc:174 +msgid "Copy Line" msgstr "" -#: LiteEditor/frame.cpp:2027 -msgid "There is already a file with this name. Do you want to overwrite it?" +#: LiteEditor/frame.cpp:1006 Runtime/rc/menu.xrc:177 +msgid "Cut Line" msgstr "" -#: LiteEditor/frame.cpp:2049 -msgid "Tab group saved" +#: LiteEditor/frame.cpp:1007 Runtime/rc/menu.xrc:156 +msgid "Split selection into lines" msgstr "" -#: LiteEditor/frame.cpp:2090 -msgid "Select the workspace type:" +#: LiteEditor/frame.cpp:1008 +msgid "Make Lowercase" msgstr "" -#: LiteEditor/frame.cpp:2366 -msgid "Build ended with errors. Continue?" +#: LiteEditor/frame.cpp:1009 +msgid "Make Uppercase" msgstr "" -#: LiteEditor/frame.cpp:2394 -msgid "Build starting..." +#: LiteEditor/frame.cpp:1010 Runtime/rc/menu.xrc:201 +msgid "Insert Comment Block" msgstr "" -#: LiteEditor/frame.cpp:2586 -msgid "" -"Would you like to build the active project\n" -"before executing it?" +#: LiteEditor/frame.cpp:1011 Runtime/rc/menu.xrc:198 +msgid "Comment Line" msgstr "" -#: LiteEditor/frame.cpp:2587 -msgid "Build and Execute" +#: LiteEditor/frame.cpp:1012 Runtime/rc/menu.xrc:195 +msgid "Comment Selection" msgstr "" -#: LiteEditor/frame.cpp:2587 -msgid "Execute" +#: LiteEditor/frame.cpp:1013 +msgid "Transpose Lines" msgstr "" -#: LiteEditor/frame.cpp:2661 -msgid "A workspace reparse is needed" +#: LiteEditor/frame.cpp:1014 Runtime/rc/menu.xrc:183 +msgid "Move Line Up" msgstr "" -#: LiteEditor/frame.cpp:2857 -msgid "Open IDE Solution/Workspace File" +#: LiteEditor/frame.cpp:1015 Runtime/rc/menu.xrc:186 +msgid "Move Line Down" msgstr "" -#: LiteEditor/frame.cpp:2870 -msgid "Choose compiler" +#: LiteEditor/frame.cpp:1016 Runtime/rc/menu.xrc:221 +msgid "Convert Indentation to Tabs" msgstr "" -#: LiteEditor/frame.cpp:2870 -msgid "Select the compiler to use:" +#: LiteEditor/frame.cpp:1017 Runtime/rc/menu.xrc:224 +msgid "Convert Indentation to Spaces" msgstr "" -#: LiteEditor/frame.cpp:2927 -msgid "Attempting to debug workspace with no active project? Ignoring." +#: LiteEditor/frame.cpp:1018 Runtime/rc/menu.xrc:189 +msgid "Center Line in Editor" msgstr "" -#: LiteEditor/frame.cpp:2935 -msgid "Would you like to build the project before debugging it?" +#: LiteEditor/frame.cpp:1019 Runtime/rc/menu.xrc:897 Runtime/rc/menu.xrc:932 +msgid "Select All" msgstr "" -#: LiteEditor/frame.cpp:2936 -msgid "Build and Debug" +#: LiteEditor/frame.cpp:1020 +msgid "Match Brace" msgstr "" -#: LiteEditor/frame.cpp:3320 -msgid "" -"CodeLite now offers a better editor colour theme support, would you like to " -"fix this now?" +#: LiteEditor/frame.cpp:1021 +msgid "Select to Brace" msgstr "" -#: LiteEditor/frame.cpp:3661 -msgid "You already have the latest version of CodeLite" +#: LiteEditor/frame.cpp:1022 +msgid "Code Complete" msgstr "" -#: LiteEditor/frame.cpp:3666 -msgid "A new version of CodeLite is available for download" +#: LiteEditor/frame.cpp:1023 +msgid "Complete Word" msgstr "" -#: LiteEditor/frame.cpp:3668 -msgid "Download" +#: LiteEditor/frame.cpp:1024 +msgid "Display Function Calltip" msgstr "" -#: LiteEditor/frame.cpp:4085 LiteEditor/frame.cpp:4169 -msgid "Could not start TTY console for debugger!" +#: LiteEditor/frame.cpp:1025 Plugin/clStatusBar.cpp:508 Runtime/rc/menu.xrc:214 +msgid "Convert to Windows Format" msgstr "" -#: LiteEditor/frame.cpp:4407 -msgid "" -"Workspace or project settings have been modified outside of CodeLite\n" -"Would you like to reload the workspace?" +#: LiteEditor/frame.cpp:1026 Runtime/rc/menu.xrc:217 +msgid "Convert to Unix Format" msgstr "" -#: LiteEditor/frame.cpp:4409 -msgid "Not now" +#: LiteEditor/frame.cpp:1027 +msgid "Trim Trailing Spaces" msgstr "" -#: LiteEditor/frame.cpp:4409 codelitephp/php-plugin/php_workspace_view.cpp:319 -msgid "Reload workspace" +#: LiteEditor/frame.cpp:1028 Runtime/rc/menu.xrc:821 +msgid "Copy Path Relative to Workspace" msgstr "" -#: LiteEditor/frame.cpp:4714 -msgid "A CodeLite restart is needed. Would you like to restart it now?" +#: LiteEditor/frame.cpp:1030 Runtime/rc/menu.xrc:817 +msgid "Copy Path to Clipboard" msgstr "" -#: LiteEditor/frame.cpp:4938 LiteEditor/frame.cpp:4956 -msgid "Perspective" +#: LiteEditor/frame.cpp:1031 Runtime/rc/menu.xrc:814 +msgid "Copy Full Path to Clipboard" msgstr "" -#: LiteEditor/frame.cpp:4952 Runtime/rc/menu.xrc:704 -msgid "Manage Perspectives..." +#: LiteEditor/frame.cpp:1032 Runtime/rc/menu.xrc:811 +msgid "Copy File Name to Clipboard" msgstr "" -#: LiteEditor/frame.cpp:4953 Runtime/rc/menu.xrc:707 -msgid "Save Current Layout As..." +#: LiteEditor/frame.cpp:1033 LiteEditor/frame.cpp:1529 +#: Plugin/clTreeCtrlPanel.cpp:102 Plugin/clTreeCtrlPanel.cpp:434 +#: codelitephp/php-plugin/php_ui.h:134 +#: codelitephp/php-plugin/php_workspace_view.cpp:644 +msgid "New File" msgstr "" -#: LiteEditor/frame.cpp:4954 Runtime/rc/menu.xrc:710 -msgid "Reset..." +#: LiteEditor/frame.cpp:1034 +msgid "Open File..." msgstr "" -#: LiteEditor/frame.cpp:5022 -msgid "Project Only - Build" +#: LiteEditor/frame.cpp:1035 LiteEditor/frame.cpp:1531 +#: LiteEditor/frame.cpp:1977 +msgid "Reload File" msgstr "" -#: LiteEditor/frame.cpp:5023 -msgid "Project Only - Clean" +#: LiteEditor/frame.cpp:1036 +msgid "Save File" msgstr "" -#: LiteEditor/frame.cpp:5336 LiteEditor/tabgroupbasedlgs.cpp:163 -#: LiteEditor/workspace_pane.cpp:129 LiteEditor/workspace_pane.cpp:156 -#: LiteEditor/workspace_pane.cpp:362 LiteEditor/workspace_pane.cpp:380 -#: LiteEditor/workspace_pane.cpp:381 -msgid "Workspace" +#: LiteEditor/frame.cpp:1037 +msgid "Duplicate Tab" msgstr "" -#: LiteEditor/frame.cpp:5344 Plugin/DiffUI.h:61 -msgid "Select Folder" +#: LiteEditor/frame.cpp:1038 +msgid "Save As..." msgstr "" -#: LiteEditor/frame.cpp:5908 -msgid "Select Project" +#: LiteEditor/frame.cpp:1042 Runtime/rc/menu.xrc:101 +msgid "Print..." msgstr "" -#: LiteEditor/implementparentvirtualfunctionsbase.cpp:32 -msgid "Implement inherited virtual functions" +#: LiteEditor/frame.cpp:1043 +msgid "Exit" msgstr "" -#: LiteEditor/implementparentvirtualfunctionsbase.cpp:33 -msgid "" -"Select from the list below the functions that you want to override in your " -"class" +#: LiteEditor/frame.cpp:1045 +msgid "Manage Plugins..." msgstr "" -#: LiteEditor/implementparentvirtualfunctionsbase.cpp:45 -#: wxcrafter/wxgui_defs.h:166 -msgid "File:" +#: LiteEditor/frame.cpp:1045 LiteEditor/plugindlgbase.cpp:51 +msgid "Plugins" msgstr "" -#: LiteEditor/implementparentvirtualfunctionsbase.cpp:51 -msgid "Generate the functions in this filename" +#: LiteEditor/frame.cpp:1047 Runtime/rc/menu.xrc:465 +msgid "Grep Selection in the Current File" msgstr "" -#: LiteEditor/implementparentvirtualfunctionsbase.cpp:69 -msgid "Visibility" +#: LiteEditor/frame.cpp:1048 Runtime/rc/menu.xrc:468 +msgid "Grep Selection in the Workspace" msgstr "" -#: LiteEditor/implementparentvirtualfunctionsbase.cpp:71 -msgid "Virtual" +#: LiteEditor/frame.cpp:1049 Runtime/rc/menu.xrc:471 +msgid "Search for Selection with default browser" msgstr "" -#: LiteEditor/implementparentvirtualfunctionsbase.cpp:73 -msgid "Override" +#: LiteEditor/frame.cpp:1050 Plugin/GotoAnythingBaseUI.h:54 +#: Runtime/rc/menu.xrc:485 +msgid "Goto Anything" msgstr "" -#: LiteEditor/implementparentvirtualfunctionsbase.cpp:75 -msgid "Document" +#: LiteEditor/frame.cpp:1051 +msgid "Find Previous" msgstr "" -#: LiteEditor/implementparentvirtualfunctionsbase.cpp:81 -#: LiteEditor/wxcrafter.cpp:123 -msgid "Check all" +#: LiteEditor/frame.cpp:1052 +msgid "Find Resource..." msgstr "" -#: LiteEditor/implementparentvirtualfunctionsbase.cpp:85 -#: LiteEditor/wxcrafter.cpp:128 -msgid "Uncheck all" +#: LiteEditor/frame.cpp:1053 +msgid "Quick Outline..." msgstr "" -#: LiteEditor/implementparentvirtualfunctionsbase.cpp:93 -msgid "Format text after insertion" +#: LiteEditor/frame.cpp:1055 +msgid "Search | Bookmarks" msgstr "" -#: LiteEditor/implementparentvirtualfunctionsbase.h:72 +#: LiteEditor/frame.cpp:1056 LiteEditor/frame.cpp:1549 +#: LiteEditor/frame.cpp:1550 Runtime/rc/menu.xrc:901 +msgid "Toggle Bookmark" +msgstr "" + +#: LiteEditor/frame.cpp:1057 Plugin/bookmark_manager.cpp:82 +msgid "Next Bookmark" +msgstr "" + +#: LiteEditor/frame.cpp:1058 Plugin/bookmark_manager.cpp:83 +msgid "Previous Bookmark" +msgstr "" + +#: LiteEditor/frame.cpp:1060 Plugin/bookmark_manager.cpp:106 +msgid "Remove All Currently-Active Bookmarks" +msgstr "" + +#: LiteEditor/frame.cpp:1061 +msgid "Open Shell From File Path" +msgstr "" + +#: LiteEditor/frame.cpp:1063 +msgid "Search | Find In Files" +msgstr "" + +#: LiteEditor/frame.cpp:1064 +msgid "Find In Files..." +msgstr "" + +#: LiteEditor/frame.cpp:1065 Runtime/rc/menu.xrc:425 +msgid "Go to Next 'Find In File' Match" +msgstr "" + +#: LiteEditor/frame.cpp:1066 Runtime/rc/menu.xrc:428 +msgid "Go to Previous 'Find In File' Match" +msgstr "" + +#: LiteEditor/frame.cpp:1067 +msgid "Search | Find and Replace" +msgstr "" + +#: LiteEditor/frame.cpp:1068 +msgid "Find..." +msgstr "" + +#: LiteEditor/frame.cpp:1069 Runtime/rc/menu.xrc:412 +msgid "Quick Add Next" +msgstr "" + +#: LiteEditor/frame.cpp:1070 Runtime/rc/menu.xrc:415 +msgid "Quick Find All" +msgstr "" + +#: LiteEditor/frame.cpp:1071 +msgid "Replace..." +msgstr "" + +#: LiteEditor/frame.cpp:1072 +msgid "Find Next" +msgstr "" + +#: LiteEditor/frame.cpp:1073 Runtime/rc/menu.xrc:405 +msgid "Find Word At Caret" +msgstr "" + +#: LiteEditor/frame.cpp:1074 Runtime/rc/menu.xrc:408 +msgid "Find Word At Caret Backward" +msgstr "" + +#: LiteEditor/frame.cpp:1075 +msgid "Go To Previous Location" +msgstr "" + +#: LiteEditor/frame.cpp:1075 +msgid "Search | Go To" +msgstr "" + +#: LiteEditor/frame.cpp:1076 +msgid "Go To Forward Location" +msgstr "" + +#: LiteEditor/frame.cpp:1077 +msgid "Go To Line..." +msgstr "" + +#: LiteEditor/frame.cpp:1078 LiteEditor/options_base_dlg2.h:58 +#: Plugin/DiffSideBySidePanel.cpp:108 +msgid "Preferences" +msgstr "" + +#: LiteEditor/frame.cpp:1079 +msgid "Colours and Fonts..." +msgstr "" + +#: LiteEditor/frame.cpp:1080 +msgid "Keyboard shortcuts..." +msgstr "" + +#: LiteEditor/frame.cpp:1081 +msgid "Environment Variables..." +msgstr "" + +#: LiteEditor/frame.cpp:1082 +msgid "Build Settings..." +msgstr "" + +#: LiteEditor/frame.cpp:1083 +msgid "GDB Settings..." +msgstr "" + +#: LiteEditor/frame.cpp:1084 +msgid "Code Completion..." +msgstr "" + +#: LiteEditor/frame.cpp:1085 +msgid "Switch to Next Tab" +msgstr "" + +#: LiteEditor/frame.cpp:1085 +msgid "Tab" +msgstr "" + +#: LiteEditor/frame.cpp:1086 +msgid "Switch to Previous Tab" +msgstr "" + +#: LiteEditor/frame.cpp:1087 +msgid "Move Tab Left" +msgstr "" + +#: LiteEditor/frame.cpp:1088 +msgid "Move Tab Right" +msgstr "" + +#: LiteEditor/frame.cpp:1089 LiteEditor/outputtabwindow.cpp:204 +#: LiteEditor/shelltab.cpp:216 +msgid "Word Wrap" +msgstr "" + +#: LiteEditor/frame.cpp:1090 +msgid "Toggle Current Fold" +msgstr "" + +#: LiteEditor/frame.cpp:1091 +msgid "Toggle All Folds" +msgstr "" + +#: LiteEditor/frame.cpp:1092 +msgid "Toggle All Topmost Folds in Selection" +msgstr "" + +#: LiteEditor/frame.cpp:1093 +msgid "Toggle Every Fold in Selection" +msgstr "" + +#: LiteEditor/frame.cpp:1094 Plugin/clStatusBar.cpp:501 +msgid "Display EOL" +msgstr "" + +#: LiteEditor/frame.cpp:1095 Runtime/rc/menu.xrc:305 +msgid "Next tab" +msgstr "" + +#: LiteEditor/frame.cpp:1096 Runtime/rc/menu.xrc:308 +msgid "Previous tab" +msgstr "" + +#: LiteEditor/frame.cpp:1097 Runtime/rc/menu.xrc:312 +msgid "Full Screen..." +msgstr "" + +#: LiteEditor/frame.cpp:1098 +msgid "Output Pane" +msgstr "" + +#: LiteEditor/frame.cpp:1099 +msgid "Workspace Pane" +msgstr "" + +#: LiteEditor/frame.cpp:1100 +msgid "Debugger Pane" +msgstr "" + +#: LiteEditor/frame.cpp:1102 +msgid "Toggle All Panes" +msgstr "" + +#: LiteEditor/frame.cpp:1103 Runtime/rc/menu.xrc:369 +msgid "Toggle Minimal View" +msgstr "" + +#: LiteEditor/frame.cpp:1104 LiteEditor/frame.cpp:1211 Runtime/rc/menu.xrc:382 +msgid "Show Menu Bar" +msgstr "" + +#: LiteEditor/frame.cpp:1105 Runtime/rc/menu.xrc:374 +msgid "Show Status Bar" +msgstr "" + +#: LiteEditor/frame.cpp:1106 LiteEditor/frame.cpp:1217 Runtime/rc/menu.xrc:378 +msgid "Show Tool Bar" +msgstr "" + +#: LiteEditor/frame.cpp:1107 +msgid "View | Show Whitespace" +msgstr "" + +#: LiteEditor/frame.cpp:1109 Runtime/rc/menu.xrc:291 +msgid "Show Always" +msgstr "" + +#: LiteEditor/frame.cpp:1110 Runtime/rc/menu.xrc:295 +msgid "Visible After First Indent" +msgstr "" + +#: LiteEditor/frame.cpp:1111 Runtime/rc/menu.xrc:299 +msgid "Indentation Only" +msgstr "" + +#: LiteEditor/frame.cpp:1112 +msgid "View | Zoom" +msgstr "" + +#: LiteEditor/frame.cpp:1112 Runtime/rc/menu.xrc:275 +msgid "Zoom In" +msgstr "" + +#: LiteEditor/frame.cpp:1113 Runtime/rc/menu.xrc:278 +msgid "Zoom Out" +msgstr "" + +#: LiteEditor/frame.cpp:1114 Runtime/rc/menu.xrc:281 +msgid "Reset Zoom" +msgstr "" + +#: LiteEditor/frame.cpp:1115 +msgid "New Workspace..." +msgstr "" + +#: LiteEditor/frame.cpp:1115 LiteEditor/frame.cpp:5521 +#: LiteEditor/tabgroupbasedlgs.cpp:163 LiteEditor/workspace_pane.cpp:129 +#: LiteEditor/workspace_pane.cpp:156 LiteEditor/workspace_pane.cpp:362 +#: LiteEditor/workspace_pane.cpp:380 LiteEditor/workspace_pane.cpp:381 +msgid "Workspace" +msgstr "" + +#: LiteEditor/frame.cpp:1116 +msgid "Open Workspace..." +msgstr "" + +#: LiteEditor/frame.cpp:1117 Runtime/rc/menu.xrc:111 Runtime/rc/menu.xrc:1005 +#: WebTools/NodeJSWorkspaceView.cpp:75 +msgid "Close Workspace" +msgstr "" + +#: LiteEditor/frame.cpp:1118 Runtime/rc/menu.xrc:1008 +#: codelitephp/PHPParser/php_workspace.cpp:488 +msgid "Reload Workspace" +msgstr "" + +#: LiteEditor/frame.cpp:1119 Runtime/rc/menu.xrc:1016 +msgid "Workspace Settings..." +msgstr "" + +#: LiteEditor/frame.cpp:1120 Runtime/rc/menu.xrc:1012 +msgid "Workspace Editor Preferences..." +msgstr "" + +#: LiteEditor/frame.cpp:1121 +msgid "Import other IDEs solution/workspace files..." +msgstr "" + +#: LiteEditor/frame.cpp:1122 +msgid "Open Active Project Settings..." +msgstr "" + +#: LiteEditor/frame.cpp:1123 +msgid "Create New Project" +msgstr "" + +#: LiteEditor/frame.cpp:1124 Runtime/rc/menu.xrc:997 +msgid "Add an Existing Project" +msgstr "" + +#: LiteEditor/frame.cpp:1229 +msgid "Show Output View " +msgstr "" + +#: LiteEditor/frame.cpp:1292 +msgid "Output View" +msgstr "" + +#: LiteEditor/frame.cpp:1293 +msgid "Workspace View" +msgstr "" + +#: LiteEditor/frame.cpp:1295 wxcrafter/gui.h:167 wxcrafter/main.cpp:714 +#: wxcrafter/wxcrafter_plugin.cpp:187 wxcrafter/wxcrafter_plugin.cpp:188 +#: wxcrafter/wxcrafter_plugin.cpp:270 wxcrafter/wxcrafter_plugin.cpp:415 +#: wxcrafter/wxcrafter_plugin.cpp:446 wxcrafter/wxcrafter_plugin.cpp:569 +#: wxcrafter/wxcrafter_plugin.cpp:697 wxcrafter/wxcrafter_plugin.cpp:750 +#: wxcrafter/wxcrafter_plugin.cpp:763 wxcrafter/wxcrafter_plugin.cpp:777 +#: wxcrafter/wxcrafter_plugin.cpp:1001 wxcrafter/wxcrafter_plugin.cpp:1209 +#: wxcrafter/wxcrafter_plugin.cpp:1371 wxcrafter/wxcrafter_plugin.cpp:1379 +#: wxcrafter/wxcrafter_plugin.cpp:1381 wxcrafter/wxguicraft_main_view.cpp:1891 +#: wxcrafter/wxguicraft_main_view.cpp:1971 +msgid "wxCrafter" +msgstr "" + +#: LiteEditor/frame.cpp:1530 LiteEditor/frame.cpp:2112 +#: Subversion2/subversion_view.cpp:448 git/GitConsole.cpp:399 +msgid "Open File" +msgstr "" + +#: LiteEditor/frame.cpp:1533 +msgid "Save All" +msgstr "" + +#: LiteEditor/frame.cpp:1534 +msgid "Close File" +msgstr "" + +#: LiteEditor/frame.cpp:1542 +msgid "Backward" +msgstr "" + +#: LiteEditor/frame.cpp:1543 +msgid "Forward" +msgstr "" + +#: LiteEditor/frame.cpp:1556 LiteEditor/frame.cpp:1557 +msgid "Find Resource In Workspace" +msgstr "" + +#: LiteEditor/frame.cpp:1558 +msgid "Highlight Word" +msgstr "" + +#: LiteEditor/frame.cpp:1559 +msgid "Highlight Matching Words" +msgstr "" + +#: LiteEditor/frame.cpp:1566 LiteEditor/frame.cpp:1567 +#: LiteEditor/workspacetab.cpp:153 LiteEditor/workspacetab.cpp:154 +#: LiteEditor/workspacetab.cpp:580 Plugin/clFileSystemWorkspaceView.cpp:29 +msgid "Build Active Project" +msgstr "" + +#: LiteEditor/frame.cpp:1568 LiteEditor/frame.cpp:1569 +#: LiteEditor/workspacetab.cpp:567 Plugin/clFileSystemWorkspaceView.cpp:30 +msgid "Stop Current Build" +msgstr "" + +#: LiteEditor/frame.cpp:1570 LiteEditor/frame.cpp:1571 +msgid "Clean Active Project" +msgstr "" + +#: LiteEditor/frame.cpp:1573 LiteEditor/frame.cpp:1574 +#: LiteEditor/workspacetab.cpp:155 LiteEditor/workspacetab.cpp:156 +msgid "Run Active Project" +msgstr "" + +#: LiteEditor/frame.cpp:1575 LiteEditor/frame.cpp:1576 +msgid "Stop Running Program" +msgstr "" + +#: LiteEditor/frame.cpp:1582 LiteEditor/frame.cpp:1583 +msgid "Start or Continue debugger" +msgstr "" + +#: LiteEditor/frame.cpp:1598 +msgid "Applying your choices and restarting CodeLite" +msgstr "" + +#: LiteEditor/frame.cpp:1600 +msgid "Applying your choices, this may take a few seconds" +msgstr "" + +#: LiteEditor/frame.cpp:1803 +msgid "Eran Ifrah (Project admin)" +msgstr "" + +#: LiteEditor/frame.cpp:1804 Plugin/clAboutDialog.cpp:35 +msgid "David G. Hart" +msgstr "" + +#: LiteEditor/frame.cpp:1805 Plugin/clAboutDialog.cpp:38 +msgid "Frank Lichtner" +msgstr "" + +#: LiteEditor/frame.cpp:1806 Plugin/clAboutDialog.cpp:39 +msgid "Jacek Kucharski" +msgstr "" + +#: LiteEditor/frame.cpp:1807 Plugin/clAboutDialog.cpp:40 +msgid "Marrianne Gagnon" +msgstr "" + +#: LiteEditor/frame.cpp:1808 Plugin/clAboutDialog.cpp:41 +msgid "Scott Dolim" +msgstr "" + +#: LiteEditor/frame.cpp:1811 +msgid "CodeLite Home" +msgstr "" + +#: LiteEditor/frame.cpp:1820 Plugin/clAboutDialogBase.cpp:100 +msgid "CodeLite IDE" +msgstr "" + +#: LiteEditor/frame.cpp:1821 +msgid "A free, open source, C/C++/PHP and JavaScript IDE" +msgstr "" + +#: LiteEditor/frame.cpp:1976 +msgid "" +"' is modified\n" +"Continue with reload?" +msgstr "" + +#: LiteEditor/frame.cpp:1976 +msgid "File '" +msgstr "" + +#: LiteEditor/frame.cpp:2165 +msgid "Please enter a name for the tab group" +msgstr "" + +#: LiteEditor/frame.cpp:2181 +msgid "There is already a file with this name. Do you want to overwrite it?" +msgstr "" + +#: LiteEditor/frame.cpp:2203 +msgid "Tab group saved" +msgstr "" + +#: LiteEditor/frame.cpp:2244 +msgid "Select the workspace type:" +msgstr "" + +#: LiteEditor/frame.cpp:2526 +msgid "Build ended with errors. Continue?" +msgstr "" + +#: LiteEditor/frame.cpp:2554 +msgid "Build starting..." +msgstr "" + +#: LiteEditor/frame.cpp:2747 +msgid "" +"Would you like to build the active project\n" +"before executing it?" +msgstr "" + +#: LiteEditor/frame.cpp:2748 +msgid "Build and Execute" +msgstr "" + +#: LiteEditor/frame.cpp:2748 +msgid "Execute" +msgstr "" + +#: LiteEditor/frame.cpp:2822 +msgid "A workspace reparse is needed" +msgstr "" + +#: LiteEditor/frame.cpp:3019 +msgid "Open IDE Solution/Workspace File" +msgstr "" + +#: LiteEditor/frame.cpp:3032 +msgid "Choose compiler" +msgstr "" + +#: LiteEditor/frame.cpp:3032 +msgid "Select the compiler to use:" +msgstr "" + +#: LiteEditor/frame.cpp:3090 +msgid "Attempting to debug workspace with no active project? Ignoring." +msgstr "" + +#: LiteEditor/frame.cpp:3098 +msgid "Would you like to build the project before debugging it?" +msgstr "" + +#: LiteEditor/frame.cpp:3099 +msgid "Build and Debug" +msgstr "" + +#: LiteEditor/frame.cpp:3476 +msgid "" +"CodeLite now offers a better editor colour theme support, would you like to " +"fix this now?" +msgstr "" + +#: LiteEditor/frame.cpp:3817 +msgid "You already have the latest version of CodeLite" +msgstr "" + +#: LiteEditor/frame.cpp:3822 +msgid "A new version of CodeLite is available for download" +msgstr "" + +#: LiteEditor/frame.cpp:3824 +msgid "Download" +msgstr "" + +#: LiteEditor/frame.cpp:4244 LiteEditor/frame.cpp:4328 +msgid "Could not start TTY console for debugger!" +msgstr "" + +#: LiteEditor/frame.cpp:4571 +msgid "" +"Workspace or project settings have been modified outside of CodeLite\n" +"Would you like to reload the workspace?" +msgstr "" + +#: LiteEditor/frame.cpp:4573 +msgid "Not now" +msgstr "" + +#: LiteEditor/frame.cpp:4573 codelitephp/php-plugin/php_workspace_view.cpp:319 +msgid "Reload workspace" +msgstr "" + +#: LiteEditor/frame.cpp:4879 +msgid "A CodeLite restart is needed. Would you like to restart it now?" +msgstr "" + +#: LiteEditor/frame.cpp:5105 LiteEditor/frame.cpp:5123 +msgid "Perspective" +msgstr "" + +#: LiteEditor/frame.cpp:5119 Runtime/rc/menu.xrc:704 +msgid "Manage Perspectives..." +msgstr "" + +#: LiteEditor/frame.cpp:5120 Runtime/rc/menu.xrc:707 +msgid "Save Current Layout As..." +msgstr "" + +#: LiteEditor/frame.cpp:5121 Runtime/rc/menu.xrc:710 +msgid "Reset..." +msgstr "" + +#: LiteEditor/frame.cpp:5190 +msgid "Project Only - Build" +msgstr "" + +#: LiteEditor/frame.cpp:5191 +msgid "Project Only - Clean" +msgstr "" + +#: LiteEditor/frame.cpp:5529 Plugin/DiffUI.h:61 +msgid "Select Folder" +msgstr "" + +#: LiteEditor/frame.cpp:6098 +msgid "Select Project" +msgstr "" + +#: LiteEditor/implementparentvirtualfunctionsbase.cpp:32 +msgid "Implement inherited virtual functions" +msgstr "" + +#: LiteEditor/implementparentvirtualfunctionsbase.cpp:33 +msgid "" +"Select from the list below the functions that you want to override in your " +"class" +msgstr "" + +#: LiteEditor/implementparentvirtualfunctionsbase.cpp:45 +#: wxcrafter/wxgui_defs.h:172 +msgid "File:" +msgstr "" + +#: LiteEditor/implementparentvirtualfunctionsbase.cpp:51 +msgid "Generate the functions in this filename" +msgstr "" + +#: LiteEditor/implementparentvirtualfunctionsbase.cpp:69 +msgid "Visibility" +msgstr "" + +#: LiteEditor/implementparentvirtualfunctionsbase.cpp:71 +msgid "Virtual" +msgstr "" + +#: LiteEditor/implementparentvirtualfunctionsbase.cpp:73 +msgid "Override" +msgstr "" + +#: LiteEditor/implementparentvirtualfunctionsbase.cpp:75 +msgid "Document" +msgstr "" + +#: LiteEditor/implementparentvirtualfunctionsbase.cpp:81 +#: LiteEditor/wxcrafter.cpp:123 +msgid "Check all" +msgstr "" + +#: LiteEditor/implementparentvirtualfunctionsbase.cpp:85 +#: LiteEditor/wxcrafter.cpp:128 +msgid "Uncheck all" +msgstr "" + +#: LiteEditor/implementparentvirtualfunctionsbase.cpp:93 +msgid "Format text after insertion" +msgstr "" + +#: LiteEditor/implementparentvirtualfunctionsbase.h:72 msgid "Implement Parent Virtual Functions" msgstr "" @@ -9591,7 +10203,7 @@ msgid "Overwrite it?" msgstr "" #: LiteEditor/manager.cpp:594 MacBundler/macbundler.cpp:400 -#: cppchecker/cppchecker.cpp:492 cppchecker/cppchecker.cpp:634 +#: cppchecker/cppchecker.cpp:500 cppchecker/cppchecker.cpp:643 msgid "Warning" msgstr "" @@ -9674,67 +10286,67 @@ msgstr "" msgid "Could not launch terminal for debugger" msgstr "" -#: LiteEditor/manager.cpp:2158 LiteEditor/manager.cpp:2169 +#: LiteEditor/manager.cpp:2159 LiteEditor/manager.cpp:2170 msgid "Failed to initialize debugger: " msgstr "" -#: LiteEditor/manager.cpp:2202 +#: LiteEditor/manager.cpp:2203 msgid "Debug session started successfully!\n" msgstr "" -#: LiteEditor/manager.cpp:2475 LiteEditor/manager.cpp:2478 +#: LiteEditor/manager.cpp:2476 LiteEditor/manager.cpp:2479 msgid "Program Received signal " msgstr "" -#: LiteEditor/manager.cpp:2479 +#: LiteEditor/manager.cpp:2480 msgid "Stack trace is available in the 'Call Stack' tab\n" msgstr "" -#: LiteEditor/manager.cpp:2504 +#: LiteEditor/manager.cpp:2505 msgid "" "Assertion failed!\n" "Stack trace is available in the 'Call Stack' tab\n" msgstr "" -#: LiteEditor/manager.cpp:2535 +#: LiteEditor/manager.cpp:2536 #, c-format msgid "" "Debugger exited with the following error string:\n" "%s" msgstr "" -#: LiteEditor/manager.cpp:2554 +#: LiteEditor/manager.cpp:2555 msgid "Continuing...\n" msgstr "" -#: LiteEditor/manager.cpp:2788 LiteEditor/manager.cpp:2839 -#: LiteEditor/manager.cpp:2877 +#: LiteEditor/manager.cpp:2789 LiteEditor/manager.cpp:2840 +#: LiteEditor/manager.cpp:2878 msgid "This would terminate the current debug session, continue?" msgstr "" -#: LiteEditor/manager.cpp:2802 +#: LiteEditor/manager.cpp:2803 msgid "Compile Single File" msgstr "" -#: LiteEditor/manager.cpp:2802 +#: LiteEditor/manager.cpp:2803 msgid "Preprocess File" msgstr "" -#: LiteEditor/manager.cpp:3427 +#: LiteEditor/manager.cpp:3428 msgid "" "Build cancelled. The following compilers referred by the workspace could not " "be found:\n" msgstr "" -#: LiteEditor/manager.cpp:3429 +#: LiteEditor/manager.cpp:3430 msgid "Please fix your project settings by selecting a valid compiler" msgstr "" -#: LiteEditor/manager.cpp:3430 +#: LiteEditor/manager.cpp:3431 msgid "Build Aborted" msgstr "" -#: LiteEditor/manager.cpp:3458 +#: LiteEditor/manager.cpp:3459 msgid "" "Compilers updated successfully!\n" "You can now build your workspace" @@ -9884,10 +10496,6 @@ msgstr "" msgid "Sort" msgstr "" -#: LiteEditor/options_base_dlg2.h:58 Plugin/DiffSideBySidePanel.cpp:108 -msgid "Preferences" -msgstr "" - #: LiteEditor/options_dlg2.cpp:104 msgid "Guides" msgstr "" @@ -9936,10 +10544,6 @@ msgstr "" msgid "Scroll on Output" msgstr "" -#: LiteEditor/outputtabwindow.cpp:204 LiteEditor/shelltab.cpp:216 -msgid "Word Wrap" -msgstr "" - #: LiteEditor/outputtabwindow.cpp:206 LiteEditor/shelltab.cpp:218 #: LiteEditor/tabgroupbasedlgs.cpp:142 msgid "Clear All" @@ -9953,10 +10557,6 @@ msgstr "" msgid "Repeat" msgstr "" -#: LiteEditor/plugindlgbase.cpp:51 -msgid "Plugins" -msgstr "" - #: LiteEditor/plugindlgbase.cpp:74 msgid "Uncheck All" msgstr "" @@ -10110,11 +10710,6 @@ msgstr "" msgid "Debugging" msgstr "" -#: LiteEditor/project_settings_base_dlg.cpp:246 -#: LiteEditor/project_settings_dlg.cpp:109 -msgid "Debugger" -msgstr "" - #: LiteEditor/project_settings_base_dlg.cpp:247 msgid "Select the debugger type to use for this project" msgstr "" @@ -10694,8 +11289,8 @@ msgstr "" msgid "Select working directory" msgstr "" -#: LiteEditor/quickfindbar.cpp:124 LiteEditor/quickfindbarbase.cpp:169 -#: Plugin/clPluginsFindBar.cpp:112 Plugin/quickfindbarbase.cpp:171 +#: LiteEditor/quickfindbar.cpp:124 LiteEditor/quickfindbarbase.cpp:158 +#: Plugin/clPluginsFindBar.cpp:112 Plugin/quickfindbarbase.cpp:158 msgid "Case Sensitive" msgstr "" @@ -10762,39 +11357,39 @@ msgstr "" msgid "Replace All" msgstr "" -#: LiteEditor/quickfindbarbase.cpp:172 Plugin/quickfindbarbase.cpp:174 +#: LiteEditor/quickfindbarbase.cpp:161 Plugin/quickfindbarbase.cpp:161 msgid "Use case sensitive match" msgstr "" -#: LiteEditor/quickfindbarbase.cpp:176 Plugin/quickfindbarbase.cpp:178 +#: LiteEditor/quickfindbarbase.cpp:165 Plugin/quickfindbarbase.cpp:165 msgid "Regular Expression" msgstr "" -#: LiteEditor/quickfindbarbase.cpp:179 Plugin/quickfindbarbase.cpp:181 +#: LiteEditor/quickfindbarbase.cpp:168 Plugin/quickfindbarbase.cpp:168 msgid "Use regular expression" msgstr "" -#: LiteEditor/quickfindbarbase.cpp:183 Plugin/quickfindbarbase.cpp:185 +#: LiteEditor/quickfindbarbase.cpp:172 Plugin/quickfindbarbase.cpp:172 msgid "Match a whole word" msgstr "" -#: LiteEditor/quickfindbarbase.cpp:186 Plugin/quickfindbarbase.cpp:188 +#: LiteEditor/quickfindbarbase.cpp:175 Plugin/quickfindbarbase.cpp:175 msgid "Match a whole word only" msgstr "" -#: LiteEditor/quickfindbarbase.cpp:190 Plugin/quickfindbarbase.cpp:192 +#: LiteEditor/quickfindbarbase.cpp:179 Plugin/quickfindbarbase.cpp:179 msgid "Use wildcard syntax" msgstr "" -#: LiteEditor/quickfindbarbase.cpp:193 Plugin/quickfindbarbase.cpp:195 +#: LiteEditor/quickfindbarbase.cpp:182 Plugin/quickfindbarbase.cpp:182 msgid "Use wildcard syntax (* and ?)" msgstr "" -#: LiteEditor/quickfindbarbase.cpp:197 Plugin/quickfindbarbase.cpp:199 +#: LiteEditor/quickfindbarbase.cpp:186 Plugin/quickfindbarbase.cpp:186 msgid "Enable multiple selections" msgstr "" -#: LiteEditor/quickfindbarbase.cpp:200 Plugin/quickfindbarbase.cpp:202 +#: LiteEditor/quickfindbarbase.cpp:189 Plugin/quickfindbarbase.cpp:189 msgid "Select each match without de-selectiing the previous match" msgstr "" @@ -10973,7 +11568,7 @@ msgstr "" msgid "Select the virtual folder in which to place the matching files" msgstr "" -#: LiteEditor/reconcileprojectbase.cpp:494 wxcrafter/wxcrafter_gui.cpp:1554 +#: LiteEditor/reconcileprojectbase.cpp:494 wxcrafter/wxcrafter_gui.cpp:1555 msgid "Browse for virtual folder" msgstr "" @@ -11111,7 +11706,7 @@ msgstr "" msgid "Symbol" msgstr "" -#: LiteEditor/symbols_dialog.cpp:43 wxcrafter/properties_list_view.cpp:385 +#: LiteEditor/symbols_dialog.cpp:43 wxcrafter/properties_list_view.cpp:415 msgid "Kind" msgstr "" @@ -11218,7 +11813,7 @@ msgstr "" msgid "Associate this lexer with files which have these extensions" msgstr "" -#: LiteEditor/syntaxhighlightbasedlg.cpp:316 wxcrafter/gui.cpp:676 +#: LiteEditor/syntaxhighlightbasedlg.cpp:316 wxcrafter/gui.cpp:605 msgid "Styles" msgstr "" @@ -11239,7 +11834,7 @@ msgid "Select the foreground colour for the selected style" msgstr "" #: LiteEditor/syntaxhighlightbasedlg.cpp:366 -#: codelite_terminal/wxcrafter.cpp:146 +#: codelite_terminal/wxcrafter.cpp:138 msgid "Background Colour:" msgstr "" @@ -11369,7 +11964,7 @@ msgid "Theme : '" msgstr "" #: LiteEditor/syntaxhighlightdlg.cpp:793 git/gitFileDiffDlg.cpp:60 -#: wxcrafter/wxguicraft_main_view.cpp:1012 +#: wxcrafter/wxguicraft_main_view.cpp:1011 msgid "Save as" msgstr "" @@ -12020,10 +12615,10 @@ msgid "Please wait, working..." msgstr "" #: MemCheck/memcheckoutputview.cpp:29 MemCheck/memcheckui.cpp:289 -#: MemCheck/memcheckui.cpp:425 wxcrafter/collapsible_pane_wrapper.cpp:20 -#: wxcrafter/command_link_button_wrapper.cpp:29 +#: MemCheck/memcheckui.cpp:425 wxcrafter/collapsible_pane_wrapper.cpp:21 +#: wxcrafter/command_link_button_wrapper.cpp:30 #: wxcrafter/radio_box_wrapper.cpp:16 wxcrafter/radio_button_wrapper.cpp:14 -#: wxcrafter/static_box_sizer_wrapper.cpp:19 +#: wxcrafter/static_box_sizer_wrapper.cpp:20 msgid "Label" msgstr "" @@ -12533,14 +13128,6 @@ msgstr "" msgid "Continue" msgstr "" -#: Plugin/DebuggerToolBar.cpp:40 -msgid "Stop debugger" -msgstr "" - -#: Plugin/DebuggerToolBar.cpp:41 -msgid "Pause debugger" -msgstr "" - #: Plugin/DebuggerToolBar.cpp:42 Plugin/DebuggerToolBar.cpp:43 msgid "Restart debugger" msgstr "" @@ -12553,18 +13140,6 @@ msgstr "" msgid "Step In" msgstr "" -#: Plugin/DebuggerToolBar.cpp:46 -msgid "Step Into" -msgstr "" - -#: Plugin/DebuggerToolBar.cpp:47 git/gitui.cpp:451 git/gitui.cpp:1399 -msgid "Next" -msgstr "" - -#: Plugin/DebuggerToolBar.cpp:48 -msgid "Step Out" -msgstr "" - #: Plugin/DebuggerToolBar.cpp:50 Plugin/DebuggerToolBar.cpp:51 msgid "Toggle Rewind Commands" msgstr "" @@ -12785,19 +13360,15 @@ msgstr "" msgid "Shortcut" msgstr "" -#: Plugin/GotoAnythingBaseUI.h:54 Runtime/rc/menu.xrc:485 -msgid "Goto Anything" -msgstr "" - #: Plugin/LSPNetworkSTDIO.cpp:107 msgid "LSP: could not locate SSH account " msgstr "" -#: Plugin/LanguageServerProtocol.cpp:918 +#: Plugin/LanguageServerProtocol.cpp:911 msgid "Method: `" msgstr "" -#: Plugin/LanguageServerProtocol.cpp:918 +#: Plugin/LanguageServerProtocol.cpp:911 msgid "` is not supported" msgstr "" @@ -12867,7 +13438,7 @@ msgid "Build System:" msgstr "" #: Plugin/NewProjectDialogBase.h:89 Runtime/rc/menu.xrc:977 -#: wxcrafter/main.cpp:206 +#: wxcrafter/main.cpp:204 msgid "New Project" msgstr "" @@ -12964,22 +13535,10 @@ msgstr "" msgid "Program exited with return code: " msgstr "" -#: Plugin/bookmark_manager.cpp:82 -msgid "Next Bookmark" -msgstr "" - -#: Plugin/bookmark_manager.cpp:83 -msgid "Previous Bookmark" -msgstr "" - #: Plugin/bookmark_manager.cpp:101 msgid "Change Active Bookmark Type..." msgstr "" -#: Plugin/bookmark_manager.cpp:106 -msgid "Remove All Currently-Active Bookmarks" -msgstr "" - #: Plugin/bookmark_manager.cpp:109 msgid "More..." msgstr "" @@ -13514,7 +14073,7 @@ msgid "New file name" msgstr "" #: Plugin/clRemoteDirCtrl.cpp:392 QmakePlugin/qmakesettingsdlg.cpp:130 -#: Subversion2/subversion2.cpp:1071 Subversion2/subversion2.cpp:1077 +#: Subversion2/subversion2.cpp:1084 Subversion2/subversion2.cpp:1091 #: Subversion2/subversion_view.cpp:1254 msgid "New name:" msgstr "" @@ -13595,10 +14154,6 @@ msgstr "" msgid "Use Spaces" msgstr "" -#: Plugin/clStatusBar.cpp:501 -msgid "Display EOL" -msgstr "" - #: Plugin/clStatusBar.cpp:504 msgid "Use Linux Format (LF)" msgstr "" @@ -13607,10 +14162,6 @@ msgstr "" msgid "Use Windows Format (CRLF)" msgstr "" -#: Plugin/clStatusBar.cpp:508 Runtime/rc/menu.xrc:214 -msgid "Convert to Windows Format" -msgstr "" - #: Plugin/clStatusBar.cpp:509 msgid "Convert to Linux Format" msgstr "" @@ -13641,7 +14192,7 @@ msgstr "" msgid " entries" msgstr "" -#: Plugin/clTerminalViewCtrl.cpp:64 UnitTestCPP/unittestreport.cpp:104 +#: Plugin/clTerminalViewCtrl.cpp:65 UnitTestCPP/unittestreport.cpp:104 #: wxcrafter/wxcrafter.h:132 msgid "Message" msgstr "" @@ -14021,7 +14572,7 @@ msgstr "" msgid "Address or pointer to watch" msgstr "" -#: Plugin/memoryviewbase.cpp:50 wxcrafter/wxgui_defs.h:163 +#: Plugin/memoryviewbase.cpp:50 wxcrafter/wxgui_defs.h:169 msgid "Size:" msgstr "" @@ -14037,7 +14588,7 @@ msgstr "" msgid "Number of columns to use per row" msgstr "" -#: Plugin/memoryviewbase.cpp:113 wxcrafter/gui.cpp:1334 +#: Plugin/memoryviewbase.cpp:113 msgid "Evaluate" msgstr "" @@ -14045,7 +14596,7 @@ msgstr "" msgid "Evaluate the expression in the \"Address\" field" msgstr "" -#: Plugin/memoryviewbase.cpp:119 Subversion2/subversion2.cpp:268 +#: Plugin/memoryviewbase.cpp:119 Subversion2/subversion2.cpp:274 #: Subversion2/subversion_view.cpp:450 Subversion2/subversion_view.cpp:481 msgid "Update" msgstr "" @@ -14078,204 +14629,204 @@ msgstr "" msgid "Save Project As Template" msgstr "" -#: Plugin/newkeyshortcutdlg.cpp:36 Plugin/newkeyshortcutdlg.cpp:88 +#: Plugin/newkeyshortcutdlg.cpp:37 Plugin/newkeyshortcutdlg.cpp:89 msgid "DEL" msgstr "" -#: Plugin/newkeyshortcutdlg.cpp:37 +#: Plugin/newkeyshortcutdlg.cpp:38 msgid "DELETE" msgstr "" -#: Plugin/newkeyshortcutdlg.cpp:38 +#: Plugin/newkeyshortcutdlg.cpp:39 msgid "BACK" msgstr "" -#: Plugin/newkeyshortcutdlg.cpp:39 Plugin/newkeyshortcutdlg.cpp:87 +#: Plugin/newkeyshortcutdlg.cpp:40 Plugin/newkeyshortcutdlg.cpp:88 msgid "INS" msgstr "" -#: Plugin/newkeyshortcutdlg.cpp:40 Plugin/newkeyshortcutdlg.cpp:75 +#: Plugin/newkeyshortcutdlg.cpp:41 Plugin/newkeyshortcutdlg.cpp:76 msgid "ENTER" msgstr "" -#: Plugin/newkeyshortcutdlg.cpp:41 +#: Plugin/newkeyshortcutdlg.cpp:42 msgid "RETURN" msgstr "" -#: Plugin/newkeyshortcutdlg.cpp:42 Plugin/newkeyshortcutdlg.cpp:82 +#: Plugin/newkeyshortcutdlg.cpp:43 Plugin/newkeyshortcutdlg.cpp:83 msgid "PGUP" msgstr "" -#: Plugin/newkeyshortcutdlg.cpp:43 Plugin/newkeyshortcutdlg.cpp:84 +#: Plugin/newkeyshortcutdlg.cpp:44 Plugin/newkeyshortcutdlg.cpp:85 msgid "PGDN" msgstr "" -#: Plugin/newkeyshortcutdlg.cpp:44 Plugin/newkeyshortcutdlg.cpp:77 +#: Plugin/newkeyshortcutdlg.cpp:45 Plugin/newkeyshortcutdlg.cpp:78 msgid "LEFT" msgstr "" -#: Plugin/newkeyshortcutdlg.cpp:45 Plugin/newkeyshortcutdlg.cpp:79 +#: Plugin/newkeyshortcutdlg.cpp:46 Plugin/newkeyshortcutdlg.cpp:80 msgid "RIGHT" msgstr "" -#: Plugin/newkeyshortcutdlg.cpp:46 Plugin/newkeyshortcutdlg.cpp:78 +#: Plugin/newkeyshortcutdlg.cpp:47 Plugin/newkeyshortcutdlg.cpp:79 msgid "UP" msgstr "" -#: Plugin/newkeyshortcutdlg.cpp:47 Plugin/newkeyshortcutdlg.cpp:80 +#: Plugin/newkeyshortcutdlg.cpp:48 Plugin/newkeyshortcutdlg.cpp:81 msgid "DOWN" msgstr "" -#: Plugin/newkeyshortcutdlg.cpp:48 Plugin/newkeyshortcutdlg.cpp:76 +#: Plugin/newkeyshortcutdlg.cpp:49 Plugin/newkeyshortcutdlg.cpp:77 msgid "HOME" msgstr "" -#: Plugin/newkeyshortcutdlg.cpp:49 Plugin/newkeyshortcutdlg.cpp:85 +#: Plugin/newkeyshortcutdlg.cpp:50 Plugin/newkeyshortcutdlg.cpp:86 msgid "END" msgstr "" -#: Plugin/newkeyshortcutdlg.cpp:50 Plugin/newkeyshortcutdlg.cpp:73 +#: Plugin/newkeyshortcutdlg.cpp:51 Plugin/newkeyshortcutdlg.cpp:74 msgid "SPACE" msgstr "" -#: Plugin/newkeyshortcutdlg.cpp:51 Plugin/newkeyshortcutdlg.cpp:74 +#: Plugin/newkeyshortcutdlg.cpp:52 Plugin/newkeyshortcutdlg.cpp:75 msgid "TAB" msgstr "" -#: Plugin/newkeyshortcutdlg.cpp:52 +#: Plugin/newkeyshortcutdlg.cpp:53 msgid "ESC" msgstr "" -#: Plugin/newkeyshortcutdlg.cpp:53 +#: Plugin/newkeyshortcutdlg.cpp:54 msgid "ESCAPE" msgstr "" -#: Plugin/newkeyshortcutdlg.cpp:54 +#: Plugin/newkeyshortcutdlg.cpp:55 msgid "CANCEL" msgstr "" -#: Plugin/newkeyshortcutdlg.cpp:55 +#: Plugin/newkeyshortcutdlg.cpp:56 msgid "CLEAR" msgstr "" -#: Plugin/newkeyshortcutdlg.cpp:56 +#: Plugin/newkeyshortcutdlg.cpp:57 msgid "MENU" msgstr "" -#: Plugin/newkeyshortcutdlg.cpp:57 +#: Plugin/newkeyshortcutdlg.cpp:58 msgid "PAUSE" msgstr "" -#: Plugin/newkeyshortcutdlg.cpp:58 +#: Plugin/newkeyshortcutdlg.cpp:59 msgid "CAPITAL" msgstr "" -#: Plugin/newkeyshortcutdlg.cpp:59 +#: Plugin/newkeyshortcutdlg.cpp:60 msgid "SELECT" msgstr "" -#: Plugin/newkeyshortcutdlg.cpp:60 +#: Plugin/newkeyshortcutdlg.cpp:61 msgid "PRINT" msgstr "" -#: Plugin/newkeyshortcutdlg.cpp:61 +#: Plugin/newkeyshortcutdlg.cpp:62 msgid "EXECUTE" msgstr "" -#: Plugin/newkeyshortcutdlg.cpp:62 +#: Plugin/newkeyshortcutdlg.cpp:63 msgid "SNAPSHOT" msgstr "" -#: Plugin/newkeyshortcutdlg.cpp:63 +#: Plugin/newkeyshortcutdlg.cpp:64 msgid "HELP" msgstr "" -#: Plugin/newkeyshortcutdlg.cpp:64 +#: Plugin/newkeyshortcutdlg.cpp:65 msgid "ADD" msgstr "" -#: Plugin/newkeyshortcutdlg.cpp:65 +#: Plugin/newkeyshortcutdlg.cpp:66 msgid "SEPARATOR" msgstr "" -#: Plugin/newkeyshortcutdlg.cpp:66 +#: Plugin/newkeyshortcutdlg.cpp:67 msgid "SUBTRACT" msgstr "" -#: Plugin/newkeyshortcutdlg.cpp:67 +#: Plugin/newkeyshortcutdlg.cpp:68 msgid "DECIMAL" msgstr "" -#: Plugin/newkeyshortcutdlg.cpp:68 +#: Plugin/newkeyshortcutdlg.cpp:69 msgid "DIVIDE" msgstr "" -#: Plugin/newkeyshortcutdlg.cpp:69 +#: Plugin/newkeyshortcutdlg.cpp:70 msgid "NUM_LOCK" msgstr "" -#: Plugin/newkeyshortcutdlg.cpp:70 +#: Plugin/newkeyshortcutdlg.cpp:71 msgid "SCROLL_LOCK" msgstr "" -#: Plugin/newkeyshortcutdlg.cpp:71 +#: Plugin/newkeyshortcutdlg.cpp:72 msgid "PAGEUP" msgstr "" -#: Plugin/newkeyshortcutdlg.cpp:72 +#: Plugin/newkeyshortcutdlg.cpp:73 msgid "PAGEDOWN" msgstr "" -#: Plugin/newkeyshortcutdlg.cpp:81 +#: Plugin/newkeyshortcutdlg.cpp:82 msgid "PRIOR" msgstr "" -#: Plugin/newkeyshortcutdlg.cpp:83 +#: Plugin/newkeyshortcutdlg.cpp:84 msgid "NEXT" msgstr "" -#: Plugin/newkeyshortcutdlg.cpp:86 +#: Plugin/newkeyshortcutdlg.cpp:87 #: sdk/databaselayer/src/dblayer/PostgresDatabaseLayer.cpp:277 msgid "BEGIN" msgstr "" -#: Plugin/newkeyshortcutdlg.cpp:89 +#: Plugin/newkeyshortcutdlg.cpp:90 msgid "=" msgstr "" -#: Plugin/newkeyshortcutdlg.cpp:91 wxcrafter/wxcrafter_gui.cpp:1475 +#: Plugin/newkeyshortcutdlg.cpp:92 wxcrafter/wxcrafter_gui.cpp:1476 msgid "+" msgstr "" -#: Plugin/newkeyshortcutdlg.cpp:92 +#: Plugin/newkeyshortcutdlg.cpp:93 msgid "KP_SEPARATOR" msgstr "" -#: Plugin/newkeyshortcutdlg.cpp:93 +#: Plugin/newkeyshortcutdlg.cpp:94 msgid "-" msgstr "" -#: Plugin/newkeyshortcutdlg.cpp:94 +#: Plugin/newkeyshortcutdlg.cpp:95 msgid "." msgstr "" -#: Plugin/newkeyshortcutdlg.cpp:95 +#: Plugin/newkeyshortcutdlg.cpp:96 msgid "/" msgstr "" -#: Plugin/newkeyshortcutdlg.cpp:96 +#: Plugin/newkeyshortcutdlg.cpp:97 msgid "WINDOWS_LEFT" msgstr "" -#: Plugin/newkeyshortcutdlg.cpp:97 +#: Plugin/newkeyshortcutdlg.cpp:98 msgid "WINDOWS_RIGHT" msgstr "" -#: Plugin/newkeyshortcutdlg.cpp:98 +#: Plugin/newkeyshortcutdlg.cpp:99 msgid "WINDOWS_MENU" msgstr "" -#: Plugin/newkeyshortcutdlg.cpp:99 +#: Plugin/newkeyshortcutdlg.cpp:100 msgid "COMMAND" msgstr "" @@ -14287,15 +14838,15 @@ msgstr "" msgid "SPECIAL" msgstr "" -#: Plugin/newkeyshortcutdlg.cpp:240 +#: Plugin/newkeyshortcutdlg.cpp:219 msgid "Select a Keyboard Shortcut" msgstr "" -#: Plugin/open_resource_dialog.cpp:87 codelitephp/php-plugin/php_ui.h:157 +#: Plugin/open_resource_dialog.cpp:92 codelitephp/php-plugin/php_ui.h:157 msgid "Open resource..." msgstr "" -#: Plugin/openresourcedialogbase.cpp:30 +#: Plugin/openresourcedialogbase.cpp:31 msgid "" "Type resource name to open.\n" "You may use a space delimited list of words to narrow down the list of " @@ -14320,7 +14871,7 @@ msgstr "" msgid "Show &symbols" msgstr "" -#: Plugin/openresourcedialogbase.h:68 +#: Plugin/openresourcedialogbase.h:69 msgid "Open Resource" msgstr "" @@ -14529,7 +15080,7 @@ msgstr "" #: Plugin/wxcrafter_plugin.cpp:616 wxcrafter/data_view_list_ctrl_column.cpp:36 #: wxcrafter/grid_column_wrapper.cpp:15 #: wxcrafter/list_ctrl_column_wrapper.cpp:15 -#: wxcrafter/tree_list_ctrl_column_wrapper.cpp:23 +#: wxcrafter/tree_list_ctrl_column_wrapper.cpp:24 msgid "My Column" msgstr "" @@ -14864,15 +15415,6 @@ msgstr "" msgid "Page Setup..." msgstr "" -#: Runtime/rc/menu.xrc:101 -msgid "Print..." -msgstr "" - -#: Runtime/rc/menu.xrc:111 Runtime/rc/menu.xrc:1005 -#: WebTools/NodeJSWorkspaceView.cpp:75 -msgid "Close Workspace" -msgstr "" - #: Runtime/rc/menu.xrc:115 msgid "Recent &Files" msgstr "" @@ -14914,10 +15456,6 @@ msgstr "" msgid "Select &All" msgstr "" -#: Runtime/rc/menu.xrc:156 -msgid "Split selection into lines" -msgstr "" - #: Runtime/rc/menu.xrc:162 msgid "&Delete Line" msgstr "" @@ -14934,46 +15472,14 @@ msgstr "" msgid "Delete to Line &Start" msgstr "" -#: Runtime/rc/menu.xrc:174 -msgid "Copy Line" -msgstr "" - -#: Runtime/rc/menu.xrc:177 -msgid "Cut Line" -msgstr "" - #: Runtime/rc/menu.xrc:180 msgid "&Transpose Lines" msgstr "" -#: Runtime/rc/menu.xrc:183 -msgid "Move Line Up" -msgstr "" - -#: Runtime/rc/menu.xrc:186 -msgid "Move Line Down" -msgstr "" - -#: Runtime/rc/menu.xrc:189 -msgid "Center Line in Editor" -msgstr "" - #: Runtime/rc/menu.xrc:193 msgid "Comment" msgstr "" -#: Runtime/rc/menu.xrc:195 -msgid "Comment Selection" -msgstr "" - -#: Runtime/rc/menu.xrc:198 -msgid "Comment Line" -msgstr "" - -#: Runtime/rc/menu.xrc:201 -msgid "Insert Comment Block" -msgstr "" - #: Runtime/rc/menu.xrc:205 msgid "Text Conversion" msgstr "" @@ -14986,18 +15492,6 @@ msgstr "" msgid "Make &Lowercase" msgstr "" -#: Runtime/rc/menu.xrc:217 -msgid "Convert to Unix Format" -msgstr "" - -#: Runtime/rc/menu.xrc:221 -msgid "Convert Indentation to Tabs" -msgstr "" - -#: Runtime/rc/menu.xrc:224 -msgid "Convert Indentation to Spaces" -msgstr "" - #: Runtime/rc/menu.xrc:229 msgid "Trim T&railing Spaces" msgstr "" @@ -15050,46 +15544,10 @@ msgstr "" msgid "&Display EOL" msgstr "" -#: Runtime/rc/menu.xrc:275 -msgid "Zoom In" -msgstr "" - -#: Runtime/rc/menu.xrc:278 -msgid "Zoom Out" -msgstr "" - -#: Runtime/rc/menu.xrc:281 -msgid "Reset Zoom" -msgstr "" - #: Runtime/rc/menu.xrc:285 msgid "Show Whitespace" msgstr "" -#: Runtime/rc/menu.xrc:291 -msgid "Show Always" -msgstr "" - -#: Runtime/rc/menu.xrc:295 -msgid "Visible After First Indent" -msgstr "" - -#: Runtime/rc/menu.xrc:299 -msgid "Indentation Only" -msgstr "" - -#: Runtime/rc/menu.xrc:305 -msgid "Next tab" -msgstr "" - -#: Runtime/rc/menu.xrc:308 -msgid "Previous tab" -msgstr "" - -#: Runtime/rc/menu.xrc:312 -msgid "Full Screen..." -msgstr "" - #: Runtime/rc/menu.xrc:316 msgid "&Output Pane" msgstr "" @@ -15110,14 +15568,6 @@ msgstr "" msgid "&Toggle All Panes" msgstr "" -#: Runtime/rc/menu.xrc:369 -msgid "Toggle Minimal View" -msgstr "" - -#: Runtime/rc/menu.xrc:374 -msgid "Show Status Bar" -msgstr "" - #: Runtime/rc/menu.xrc:387 wxcrafter/gui.cpp:145 msgid "&Search" msgstr "" @@ -15142,34 +15592,10 @@ msgstr "" msgid "Find &Previous" msgstr "" -#: Runtime/rc/menu.xrc:405 -msgid "Find Word At Caret" -msgstr "" - -#: Runtime/rc/menu.xrc:408 -msgid "Find Word At Caret Backward" -msgstr "" - -#: Runtime/rc/menu.xrc:412 -msgid "Quick Add Next" -msgstr "" - -#: Runtime/rc/menu.xrc:415 -msgid "Quick Find All" -msgstr "" - #: Runtime/rc/menu.xrc:422 msgid "&Find In Files..." msgstr "" -#: Runtime/rc/menu.xrc:425 -msgid "Go to Next 'Find In File' Match" -msgstr "" - -#: Runtime/rc/menu.xrc:428 -msgid "Go to Previous 'Find In File' Match" -msgstr "" - #: Runtime/rc/menu.xrc:433 msgid "Go To" msgstr "" @@ -15206,18 +15632,6 @@ msgstr "" msgid "Remove &All Bookmarks" msgstr "" -#: Runtime/rc/menu.xrc:465 -msgid "Grep Selection in the Current File" -msgstr "" - -#: Runtime/rc/menu.xrc:468 -msgid "Grep Selection in the Workspace" -msgstr "" - -#: Runtime/rc/menu.xrc:471 -msgid "Search for Selection with default browser" -msgstr "" - #: Runtime/rc/menu.xrc:475 msgid "Find &Resource..." msgstr "" @@ -15314,22 +15728,6 @@ msgstr "" msgid "Build and Run Pro&ject" msgstr "" -#: Runtime/rc/menu.xrc:567 Runtime/rc/menu.xrc:986 -msgid "Build Workspace" -msgstr "" - -#: Runtime/rc/menu.xrc:570 Runtime/rc/menu.xrc:989 -msgid "Clean Workspace" -msgstr "" - -#: Runtime/rc/menu.xrc:573 -msgid "Rebuild Workspace" -msgstr "" - -#: Runtime/rc/menu.xrc:577 -msgid "Batch Build..." -msgstr "" - #: Runtime/rc/menu.xrc:581 msgid "Ne&xt Build Error" msgstr "" @@ -15374,10 +15772,6 @@ msgstr "" msgid "Ne&xt" msgstr "" -#: Runtime/rc/menu.xrc:616 -msgid "Next Instruction" -msgstr "" - #: Runtime/rc/menu.xrc:619 msgid "Step &Out" msgstr "" @@ -15494,22 +15888,6 @@ msgstr "" msgid "Copy File Name" msgstr "" -#: Runtime/rc/menu.xrc:811 -msgid "Copy File Name to Clipboard" -msgstr "" - -#: Runtime/rc/menu.xrc:814 -msgid "Copy Full Path to Clipboard" -msgstr "" - -#: Runtime/rc/menu.xrc:817 -msgid "Copy Path to Clipboard" -msgstr "" - -#: Runtime/rc/menu.xrc:821 -msgid "Copy Path Relative to Workspace" -msgstr "" - #: Runtime/rc/menu.xrc:826 msgid "Detach Editor" msgstr "" @@ -15534,10 +15912,6 @@ msgstr "" msgid "Insert Doxygen Comment\tCtrl-Shift-D" msgstr "" -#: Runtime/rc/menu.xrc:855 -msgid "Generate Setters/Getters..." -msgstr "" - #: Runtime/rc/menu.xrc:859 msgid "Comment Selection\tCtrl-Shift-/" msgstr "" @@ -15546,26 +15920,6 @@ msgstr "" msgid "Toggle Line Comment\tCtrl-/" msgstr "" -#: Runtime/rc/menu.xrc:866 -msgid "Move Function Implementation to..." -msgstr "" - -#: Runtime/rc/menu.xrc:869 -msgid "Add Function Implementation..." -msgstr "" - -#: Runtime/rc/menu.xrc:872 -msgid "Implement all Un-implemented Functions..." -msgstr "" - -#: Runtime/rc/menu.xrc:897 Runtime/rc/menu.xrc:932 -msgid "Select All" -msgstr "" - -#: Runtime/rc/menu.xrc:904 -msgid "Toggle Breakpoint" -msgstr "" - #: Runtime/rc/menu.xrc:940 msgid "Create new workspace..." msgstr "" @@ -15590,26 +15944,10 @@ msgstr "" msgid "ReBuild Workspace" msgstr "" -#: Runtime/rc/menu.xrc:997 -msgid "Add an Existing Project" -msgstr "" - #: Runtime/rc/menu.xrc:1001 msgid "Parse Workspace - Incremental" msgstr "" -#: Runtime/rc/menu.xrc:1008 codelitephp/PHPParser/php_workspace.cpp:488 -msgid "Reload Workspace" -msgstr "" - -#: Runtime/rc/menu.xrc:1012 -msgid "Workspace Editor Preferences..." -msgstr "" - -#: Runtime/rc/menu.xrc:1016 -msgid "Workspace Settings..." -msgstr "" - #: Runtime/rc/menu.xrc:1022 Runtime/rc/menu.xrc:1037 msgid "Detach" msgstr "" @@ -15630,10 +15968,6 @@ msgstr "" msgid "Compile" msgstr "" -#: Runtime/rc/menu.xrc:1059 -msgid "Build Project" -msgstr "" - #: Runtime/rc/menu.xrc:1062 msgid "Preprocess" msgstr "" @@ -15710,40 +16044,40 @@ msgstr "" msgid "Open File Explorer here" msgstr "" -#: Runtime/templates/projects/executable-wxcrafter-dialog/wxcrafter.h:22 +#: Runtime/templates/projects/executable-wxcrafter-dialog/wxcrafter.hpp:50 #: wxcrafter/dialog_wrapper.cpp:27 msgid "My Dialog" msgstr "" -#: Runtime/templates/projects/executable-wxcrafter-frame/MainFrame.cpp:23 +#: Runtime/templates/projects/executable-wxcrafter-frame/MainFrame.cpp:17 #: codelite-cli/codelite-client/MainFrame.cpp:35 msgid "My MainFrame" msgstr "" -#: Runtime/templates/projects/executable-wxcrafter-frame/MainFrame.cpp:24 +#: Runtime/templates/projects/executable-wxcrafter-frame/MainFrame.cpp:18 #: codelite-cli/codelite-client/MainFrame.cpp:36 -#: codelite_terminal/MainFrame.cpp:45 +#: codelite_terminal/MainFrame.cpp:49 msgid "GPL v2 or later" msgstr "" -#: Runtime/templates/projects/executable-wxcrafter-frame/MainFrame.cpp:25 +#: Runtime/templates/projects/executable-wxcrafter-frame/MainFrame.cpp:19 #: codelite-cli/codelite-client/MainFrame.cpp:37 msgid "Short description goes here" msgstr "" -#: Runtime/templates/projects/executable-wxcrafter-frame/wxcrafter.cpp:36 +#: Runtime/templates/projects/executable-wxcrafter-frame/wxcrafter.cpp:38 #: codelite-cli/codelite-client/wxcrafter.cpp:109 #: codelite_terminal/wxcrafter.cpp:66 msgid "Exit\tAlt-X" msgstr "" -#: Runtime/templates/projects/executable-wxcrafter-frame/wxcrafter.cpp:36 +#: Runtime/templates/projects/executable-wxcrafter-frame/wxcrafter.cpp:38 #: codelite-cli/codelite-client/wxcrafter.cpp:109 #: codelite_terminal/wxcrafter.cpp:66 msgid "Quit" msgstr "" -#: Runtime/templates/projects/executable-wxcrafter-frame/wxcrafter.h:29 +#: Runtime/templates/projects/executable-wxcrafter-frame/wxcrafter.hpp:58 #: codelite-cli/codelite-client/wxcrafter.h:75 wxcrafter/frame_wrapper.cpp:29 msgid "My Frame" msgstr "" @@ -16007,11 +16341,16 @@ msgstr "" msgid "Edit Snippets" msgstr "" -#: SnipWiz/editsnippetsdlg.cpp:78 SnipWiz/editsnippetsdlg.cpp:103 +#: SnipWiz/editsnippetsdlg.cpp:71 SnipWiz/editsnippetsdlg.cpp:176 +#: SnipWiz/snipwiz.cpp:169 +msgid "SnipWiz" +msgstr "" + +#: SnipWiz/editsnippetsdlg.cpp:80 SnipWiz/editsnippetsdlg.cpp:102 msgid "Menu entry is not unique!" msgstr "" -#: SnipWiz/editsnippetsdlg.cpp:184 +#: SnipWiz/editsnippetsdlg.cpp:182 msgid "That accelerator already exists" msgstr "" @@ -16027,10 +16366,6 @@ msgstr "" msgid "Template class..." msgstr "" -#: SnipWiz/snipwiz.cpp:169 -msgid "SnipWiz" -msgstr "" - #: SnipWiz/snipwiz.cpp:193 msgid "New Class from Template..." msgstr "" @@ -16312,127 +16647,131 @@ msgstr "" msgid "Insert Last Message" msgstr "" -#: Subversion2/subversion2.cpp:141 Subversion2/subversion2.cpp:159 +#: Subversion2/subversion2.cpp:144 Subversion2/subversion2.cpp:162 msgid "Subversion plugin for codelite2.0 based on the svn command line tool" msgstr "" -#: Subversion2/subversion2.cpp:228 +#: Subversion2/subversion2.cpp:234 msgid "Subversion Options" msgstr "" -#: Subversion2/subversion2.cpp:230 +#: Subversion2/subversion2.cpp:236 msgid "Subversion2" msgstr "" -#: Subversion2/subversion2.cpp:238 +#: Subversion2/subversion2.cpp:244 msgid "Sync Project Files..." msgstr "" -#: Subversion2/subversion2.cpp:262 +#: Subversion2/subversion2.cpp:268 msgid "Watch this folder" msgstr "" -#: Subversion2/subversion2.cpp:271 Subversion2/subversion_view.cpp:451 +#: Subversion2/subversion2.cpp:277 Subversion2/subversion_view.cpp:451 #: Subversion2/subversion_view.cpp:482 git/GitConsole.cpp:200 git/git.cpp:2379 #: git/gitui.cpp:480 git/gitui.cpp:823 git/gitui.cpp:879 msgid "Commit" msgstr "" -#: Subversion2/subversion2.cpp:278 +#: Subversion2/subversion2.cpp:284 msgid "Revert changes" msgstr "" -#: Subversion2/subversion2.cpp:284 +#: Subversion2/subversion2.cpp:290 msgid "Lock file" msgstr "" -#: Subversion2/subversion2.cpp:287 +#: Subversion2/subversion2.cpp:293 msgid "UnLock file" msgstr "" -#: Subversion2/subversion2.cpp:292 +#: Subversion2/subversion2.cpp:298 msgid "Show Recent Changes" msgstr "" -#: Subversion2/subversion2.cpp:306 Subversion2/subversion2.cpp:1454 +#: Subversion2/subversion2.cpp:312 Subversion2/subversion2.cpp:1471 msgid "Revert to revision" msgstr "" -#: Subversion2/subversion2.cpp:311 +#: Subversion2/subversion2.cpp:317 msgid "Create Diff" msgstr "" -#: Subversion2/subversion2.cpp:313 Subversion2/subversion_view.cpp:500 +#: Subversion2/subversion2.cpp:319 Subversion2/subversion_view.cpp:500 msgid "Change Log..." msgstr "" -#: Subversion2/subversion2.cpp:529 Subversion2/subversion_view.cpp:620 +#: Subversion2/subversion2.cpp:535 Subversion2/subversion_view.cpp:620 msgid "" "You are about to revert all your changes\n" "Are you sure?" msgstr "" -#: Subversion2/subversion2.cpp:565 +#: Subversion2/subversion2.cpp:571 msgid "Insert base revision to diff against:" msgstr "" -#: Subversion2/subversion2.cpp:565 +#: Subversion2/subversion2.cpp:571 msgid "Svn Diff" msgstr "" -#: Subversion2/subversion2.cpp:979 +#: Subversion2/subversion2.cpp:991 msgid "Enter new URL:" msgstr "" -#: Subversion2/subversion2.cpp:1071 Subversion2/subversion2.cpp:1077 +#: Subversion2/subversion2.cpp:991 +msgid "Svn Switch..." +msgstr "" + +#: Subversion2/subversion2.cpp:1084 Subversion2/subversion2.cpp:1091 msgid "Svn Rename" msgstr "" -#: Subversion2/subversion2.cpp:1129 +#: Subversion2/subversion2.cpp:1146 msgid "Fail to write commit message to a temporary file!" msgstr "" -#: Subversion2/subversion2.cpp:1274 +#: Subversion2/subversion2.cpp:1291 msgid " - application/octet-stream" msgstr "" -#: Subversion2/subversion2.cpp:1454 +#: Subversion2/subversion2.cpp:1471 msgid "Set the revision number:" msgstr "" -#: Subversion2/subversion2.cpp:1462 +#: Subversion2/subversion2.cpp:1479 msgid "Invalid revision number" msgstr "" -#: Subversion2/subversion2.cpp:1565 +#: Subversion2/subversion2.cpp:1583 msgid "" "Would you like to remove the following folders from SVN?\n" "\n" msgstr "" -#: Subversion2/subversion2.cpp:1567 +#: Subversion2/subversion2.cpp:1585 msgid "" "Would you like to remove the following files from SVN?\n" "\n" msgstr "" -#: Subversion2/subversion2.cpp:1583 +#: Subversion2/subversion2.cpp:1601 msgid " more folders" msgstr "" -#: Subversion2/subversion2.cpp:1583 Subversion2/subversion2.cpp:1585 +#: Subversion2/subversion2.cpp:1601 Subversion2/subversion2.cpp:1603 msgid ".. and " msgstr "" -#: Subversion2/subversion2.cpp:1585 +#: Subversion2/subversion2.cpp:1603 msgid " more files" msgstr "" -#: Subversion2/subversion2.cpp:1626 +#: Subversion2/subversion2.cpp:1645 msgid "How many recent changes you want to view?" msgstr "" -#: Subversion2/subversion2.cpp:1627 +#: Subversion2/subversion2.cpp:1646 msgid "Svn show recent changes" msgstr "" @@ -16539,7 +16878,7 @@ msgstr "" msgid "Root URL:" msgstr "" -#: Subversion2/subversion2_ui.cpp:719 wxcrafter/wxgui_defs.h:174 +#: Subversion2/subversion2_ui.cpp:719 wxcrafter/wxgui_defs.h:180 msgid "URL:" msgstr "" @@ -17136,55 +17475,64 @@ msgstr "" msgid "Select class:" msgstr "" -#: UnitTestCPP/unittestpp.cpp:73 UnitTestCPP/unittestpp.cpp:100 +#: UnitTestCPP/unittestpp.cpp:77 UnitTestCPP/unittestpp.cpp:104 msgid "A Unit test plugin based on the UnitTest++ framework" msgstr "" -#: UnitTestCPP/unittestpp.cpp:96 UnitTestCPP/unittestpp.cpp:97 -#: UnitTestCPP/unittestpp.cpp:143 UnitTestCPP/unittestpp.cpp:556 +#: UnitTestCPP/unittestpp.cpp:100 UnitTestCPP/unittestpp.cpp:101 +#: UnitTestCPP/unittestpp.cpp:111 UnitTestCPP/unittestpp.cpp:153 +#: UnitTestCPP/unittestpp.cpp:569 msgid "UnitTest++" msgstr "" -#: UnitTestCPP/unittestpp.cpp:115 -msgid "Run Unit tests..." +#: UnitTestCPP/unittestpp.cpp:112 +msgid "Create new test..." msgstr "" -#: UnitTestCPP/unittestpp.cpp:116 -msgid "Run project as unit test project..." +#: UnitTestCPP/unittestpp.cpp:113 +msgid "Create tests for class..." msgstr "" -#: UnitTestCPP/unittestpp.cpp:126 UnitTestCPP/unittestpp.cpp:181 -msgid "Create new &test..." +#: UnitTestCPP/unittestpp.cpp:114 UnitTestCPP/unittestpp.cpp:146 +msgid "Mark this project as UnitTest++ project" msgstr "" -#: UnitTestCPP/unittestpp.cpp:130 UnitTestCPP/unittestpp.cpp:185 -msgid "Create tests for &class..." +#: UnitTestCPP/unittestpp.cpp:115 UnitTestCPP/unittestpp.cpp:149 +msgid "Run Project as UnitTest++ and report" msgstr "" -#: UnitTestCPP/unittestpp.cpp:136 -msgid "Mark this project as UnitTest++ project" +#: UnitTestCPP/unittestpp.cpp:125 +msgid "Run Unit tests..." msgstr "" -#: UnitTestCPP/unittestpp.cpp:139 -msgid "Run Project as UnitTest++ and report" +#: UnitTestCPP/unittestpp.cpp:126 +msgid "Run project as unit test project..." +msgstr "" + +#: UnitTestCPP/unittestpp.cpp:136 UnitTestCPP/unittestpp.cpp:191 +msgid "Create new &test..." +msgstr "" + +#: UnitTestCPP/unittestpp.cpp:140 UnitTestCPP/unittestpp.cpp:195 +msgid "Create tests for &class..." msgstr "" -#: UnitTestCPP/unittestpp.cpp:199 UnitTestCPP/unittestpp.cpp:267 +#: UnitTestCPP/unittestpp.cpp:209 UnitTestCPP/unittestpp.cpp:277 msgid "" "There are currently no UnitTest project in your workspace\n" "Would you like to create one now?" msgstr "" -#: UnitTestCPP/unittestpp.cpp:322 +#: UnitTestCPP/unittestpp.cpp:332 msgid "Could not find the target project" msgstr "" -#: UnitTestCPP/unittestpp.cpp:389 +#: UnitTestCPP/unittestpp.cpp:400 #, c-format msgid "Could not create target file '%s'" msgstr "" -#: UnitTestCPP/unittestpp.cpp:494 +#: UnitTestCPP/unittestpp.cpp:505 msgid "Project contains 0 tests. Nothing to be done" msgstr "" @@ -17443,20 +17791,21 @@ msgstr "" msgid "Enable plugin" msgstr "" -#: abbreviation/abbreviation.cpp:62 abbreviation/abbreviation.cpp:81 +#: abbreviation/abbreviation.cpp:64 abbreviation/abbreviation.cpp:83 msgid "Abbreviation plugin" msgstr "" -#: abbreviation/abbreviation.cpp:100 abbreviation/abbreviation.cpp:101 +#: abbreviation/abbreviation.cpp:102 abbreviation/abbreviation.cpp:103 +#: abbreviation/abbreviation.cpp:211 msgid "Show abbreviations completion box" msgstr "" -#: abbreviation/abbreviation.cpp:107 +#: abbreviation/abbreviation.cpp:109 msgid "Abbreviation" msgstr "" -#: abbreviation/abbreviation.cpp:209 -msgid "Plugins::Abbreviations::Show abbreviations completion box" +#: abbreviation/abbreviation.cpp:210 +msgid "Abbreviations" msgstr "" #: abbreviation/abbreviationssettingsbase.cpp:30 @@ -17531,7 +17880,7 @@ msgid "" msgstr "" #: abbreviation/abbreviationssettingsdlg.cpp:232 -#: wxcrafter/wxcrafter_plugin.cpp:569 wxcrafter/wxguicraft_main_view.cpp:2840 +#: wxcrafter/wxcrafter_plugin.cpp:568 wxcrafter/wxguicraft_main_view.cpp:2832 msgid "'" msgstr "" @@ -17579,7 +17928,7 @@ msgstr "" msgid "A makefile generator based on codelite's workspace" msgstr "" -#: codelite_terminal/MainFrame.cpp:46 +#: codelite_terminal/MainFrame.cpp:50 msgid "CodeLite built-in terminal emulator" msgstr "" @@ -17591,15 +17940,15 @@ msgstr "" msgid "Preferences..." msgstr "" -#: codelite_terminal/wxcrafter.cpp:137 +#: codelite_terminal/wxcrafter.cpp:129 msgid "Text Colour:" msgstr "" -#: codelite_terminal/wxcrafter.cpp:157 wxcrafter/wxgui_defs.h:118 +#: codelite_terminal/wxcrafter.cpp:149 wxcrafter/wxgui_defs.h:124 msgid "Font:" msgstr "" -#: codelite_terminal/wxcrafter.h:64 +#: codelite_terminal/wxcrafter.h:67 msgid "codelite-terminal" msgstr "" @@ -17909,7 +18258,8 @@ msgid "Generate Setters / Getters" msgstr "" #: codelitephp/php-plugin/php_editor_context_menu.cpp:102 -#: wxcrafter/wxguicraft_main_view.cpp:2575 +#: wxcrafter/properties_list_view.cpp:69 +#: wxcrafter/wxguicraft_main_view.cpp:2595 msgid "Code Generation" msgstr "" @@ -18540,52 +18890,52 @@ msgstr "" msgid "Do this for all files" msgstr "" -#: cppchecker/cppchecker.cpp:73 +#: cppchecker/cppchecker.cpp:75 msgid "CppChecker integration for CodeLite IDE" msgstr "" -#: cppchecker/cppchecker.cpp:97 +#: cppchecker/cppchecker.cpp:99 msgid "CppCheck integration for CodeLite IDE" msgstr "" -#: cppchecker/cppchecker.cpp:143 +#: cppchecker/cppchecker.cpp:131 cppchecker/cppchecker.cpp:151 msgid "Check current file" msgstr "" -#: cppchecker/cppchecker.cpp:144 +#: cppchecker/cppchecker.cpp:132 cppchecker/cppchecker.cpp:152 msgid "Check current file's project" msgstr "" -#: cppchecker/cppchecker.cpp:145 +#: cppchecker/cppchecker.cpp:133 cppchecker/cppchecker.cpp:153 msgid "Check workspace" msgstr "" -#: cppchecker/cppchecker.cpp:223 cppchecker/cppchecker.cpp:239 -#: cppchecker/cppchecker.cpp:253 cppchecker/cppchecker.cpp:267 +#: cppchecker/cppchecker.cpp:231 cppchecker/cppchecker.cpp:247 +#: cppchecker/cppchecker.cpp:261 cppchecker/cppchecker.cpp:275 msgid "Run CppCheck" msgstr "" -#: cppchecker/cppchecker.cpp:279 cppchecker/cppchecker.cpp:294 -#: cppchecker/cppchecker.cpp:314 cppchecker/cppchecker.cpp:366 +#: cppchecker/cppchecker.cpp:287 cppchecker/cppchecker.cpp:302 +#: cppchecker/cppchecker.cpp:322 cppchecker/cppchecker.cpp:374 msgid "" "CppCheckPlugin: CppCheck is currently busy please wait for it to complete " "the current check" msgstr "" -#: cppchecker/cppchecker.cpp:475 +#: cppchecker/cppchecker.cpp:483 #, c-format msgid "Starting cppcheck: %s\n" msgstr "" -#: cppchecker/cppchecker.cpp:492 +#: cppchecker/cppchecker.cpp:500 msgid "Failed to launch codelite_cppcheck process!" msgstr "" -#: cppchecker/cppchecker.cpp:573 +#: cppchecker/cppchecker.cpp:581 msgid "No files to check" msgstr "" -#: cppchecker/cppchecker.cpp:634 +#: cppchecker/cppchecker.cpp:643 msgid "Failed to open temporary file " msgstr "" @@ -18930,122 +19280,123 @@ msgstr "" msgid "CScope Settings" msgstr "" -#: cscope/cscope.cpp:70 cscope/cscope.cpp:81 +#: cscope/cscope.cpp:72 cscope/cscope.cpp:83 msgid "CScope Integration for CodeLite" msgstr "" -#: cscope/cscope.cpp:126 cscope/cscope.cpp:127 cscope/cscope.cpp:177 -msgid "Find this C symbol" +#: cscope/cscope.cpp:104 cscope/cscope.cpp:176 +msgid "Find selected text" msgstr "" -#: cscope/cscope.cpp:128 cscope/cscope.cpp:129 cscope/cscope.cpp:191 -#: cscope/cscope.cpp:192 -msgid "Find functions calling this function" +#: cscope/cscope.cpp:105 cscope/cscope.cpp:180 +msgid "Find this global definition" msgstr "" -#: cscope/cscope.cpp:130 cscope/cscope.cpp:131 cscope/cscope.cpp:186 +#: cscope/cscope.cpp:106 cscope/cscope.cpp:129 cscope/cscope.cpp:130 +#: cscope/cscope.cpp:185 msgid "Find functions called by this function" msgstr "" -#: cscope/cscope.cpp:172 -msgid "Find ..." +#: cscope/cscope.cpp:107 cscope/cscope.cpp:127 cscope/cscope.cpp:128 +#: cscope/cscope.cpp:190 cscope/cscope.cpp:191 +msgid "Find functions calling this function" msgstr "" -#: cscope/cscope.cpp:177 -msgid "Find selected text" +#: cscope/cscope.cpp:108 cscope/cscope.cpp:201 +msgid "Create CScope database" msgstr "" -#: cscope/cscope.cpp:181 -msgid "Find this global definition" +#: cscope/cscope.cpp:125 cscope/cscope.cpp:126 cscope/cscope.cpp:176 +msgid "Find this C symbol" msgstr "" -#: cscope/cscope.cpp:182 +#: cscope/cscope.cpp:171 +msgid "Find ..." +msgstr "" + +#: cscope/cscope.cpp:181 msgid "Find this C global definition" msgstr "" -#: cscope/cscope.cpp:196 cscope/cscope.cpp:282 +#: cscope/cscope.cpp:195 cscope/cscope.cpp:281 msgid "Find files #&including this filename" msgstr "" -#: cscope/cscope.cpp:197 +#: cscope/cscope.cpp:196 msgid "Find files #including this filename" msgstr "" -#: cscope/cscope.cpp:202 -msgid "Create CScope database" -msgstr "" - -#: cscope/cscope.cpp:203 cscope/cscope.cpp:288 +#: cscope/cscope.cpp:202 cscope/cscope.cpp:287 msgid "Create/Recreate the cscope database" msgstr "" -#: cscope/cscope.cpp:208 +#: cscope/cscope.cpp:207 msgid "CScope settings" msgstr "" -#: cscope/cscope.cpp:208 +#: cscope/cscope.cpp:207 msgid "Configure cscope" msgstr "" -#: cscope/cscope.cpp:266 +#: cscope/cscope.cpp:265 msgid "&Find this C symbol" msgstr "" -#: cscope/cscope.cpp:269 +#: cscope/cscope.cpp:268 msgid "Find this &global definition" msgstr "" -#: cscope/cscope.cpp:274 +#: cscope/cscope.cpp:273 msgid "Find functions &called by this function" msgstr "" -#: cscope/cscope.cpp:278 +#: cscope/cscope.cpp:277 msgid "Fi&nd functions calling this function" msgstr "" -#: cscope/cscope.cpp:287 +#: cscope/cscope.cpp:286 msgid "Create CScope &database" msgstr "" -#: cscope/cscope.cpp:334 +#: cscope/cscope.cpp:333 msgid "Creating file list..." msgstr "" -#: cscope/cscope.cpp:381 +#: cscope/cscope.cpp:380 msgid "I can't find 'cscope' anywhere. Please check if it's installed." msgstr "" -#: cscope/cscope.cpp:382 +#: cscope/cscope.cpp:381 msgid "" "Or tell me where it can be found, from the menu: 'Plugins | CScope | " "Settings'" msgstr "" -#: cscope/cscope.cpp:383 +#: cscope/cscope.cpp:382 msgid "CScope not found" msgstr "" -#: cscope/cscope.cpp:442 +#: cscope/cscope.cpp:441 msgid "cscope results for: find global definition of '" msgstr "" -#: cscope/cscope.cpp:469 +#: cscope/cscope.cpp:468 msgid "cscope results for: functions called by '" msgstr "" -#: cscope/cscope.cpp:496 +#: cscope/cscope.cpp:495 msgid "cscope results for: functions calling '" msgstr "" -#: cscope/cscope.cpp:538 +#: cscope/cscope.cpp:537 msgid "cscope results for: files that #include '" msgstr "" -#: cscope/cscope.cpp:562 +#: cscope/cscope.cpp:561 msgid "Recreated inverted CScope DB" msgstr "" -#: cscope/cscope.cpp:565 +#: cscope/cscope.cpp:564 msgid "Recreated CScope DB" msgstr "" @@ -19077,23 +19428,19 @@ msgstr "" msgid "Line: " msgstr "" -#: ctagsd/lib/ProtocolHandler.cpp:276 +#: ctagsd/lib/ProtocolHandler.cpp:357 msgid "File: `" msgstr "" -#: ctagsd/lib/ProtocolHandler.cpp:276 +#: ctagsd/lib/ProtocolHandler.cpp:357 msgid "` is not opened on the server" msgstr "" -#: ctagsd/lib/ProtocolHandler.cpp:430 -msgid "Updating symbols database..." -msgstr "" - -#: ctagsd/lib/ProtocolHandler.cpp:432 -msgid "Success" +#: ctagsd/lib/ProtocolHandler.cpp:502 +msgid "Initialization completed" msgstr "" -#: ctagsd/lib/ProtocolHandler.cpp:447 +#: ctagsd/lib/ProtocolHandler.cpp:524 msgid "unsupported message: `" msgstr "" @@ -20451,114 +20798,115 @@ msgstr "" #: wxcrafter/ActivityrIndicatorWrapper.cpp:8 #: wxcrafter/bitmap_button_wrapper.cpp:22 wxcrafter/button_wrapper.cpp:32 -#: wxcrafter/command_link_button_wrapper.cpp:26 +#: wxcrafter/command_link_button_wrapper.cpp:27 #: wxcrafter/info_bar_button_wrapper.cpp:23 wxcrafter/std_button_wrapper.cpp:25 msgid "" "Process a wxEVT_COMMAND_BUTTON_CLICKED event, when the button is clicked." msgstr "" #: wxcrafter/ActivityrIndicatorWrapper.cpp:11 -#: wxcrafter/AnimationCtrlWrapper.cpp:15 wxcrafter/AuiToolBarTopLevel.cpp:14 -#: wxcrafter/BitmapComboxWrapper.cpp:12 wxcrafter/RearrangeListWrapper.cpp:7 +#: wxcrafter/AnimationCtrlWrapper.cpp:17 wxcrafter/AuiToolBarTopLevel.cpp:16 +#: wxcrafter/BitmapComboxWrapper.cpp:13 wxcrafter/RearrangeListWrapper.cpp:8 #: wxcrafter/SimpleHtmlListBoxWrapper.cpp:22 #: wxcrafter/TimePickerCtrlWrapper.cpp:10 wxcrafter/aui_manager_wrapper.cpp:28 -#: wxcrafter/aui_notebook_wrapper.cpp:22 wxcrafter/banner_window_wrapper.cpp:21 +#: wxcrafter/aui_notebook_wrapper.cpp:22 wxcrafter/banner_window_wrapper.cpp:22 #: wxcrafter/bitmap_button_wrapper.cpp:26 -#: wxcrafter/bitmaptogglebuttonwrapper.cpp:9 wxcrafter/box_sizer_wrapper.cpp:17 +#: wxcrafter/bitmaptogglebuttonwrapper.cpp:9 wxcrafter/box_sizer_wrapper.cpp:18 #: wxcrafter/button_wrapper.cpp:36 wxcrafter/calendar_ctrl_wrapper.cpp:26 #: wxcrafter/check_box_wrapper.cpp:12 wxcrafter/check_list_box_wrapper.cpp:30 #: wxcrafter/choice_book_wrapper.cpp:14 wxcrafter/choice_wrapper.cpp:13 -#: wxcrafter/collapsible_pane_wrapper.cpp:19 +#: wxcrafter/collapsible_pane_wrapper.cpp:20 #: wxcrafter/colour_picker_wrapper.cpp:18 wxcrafter/combox_wrapper.cpp:13 -#: wxcrafter/command_link_button_wrapper.cpp:21 -#: wxcrafter/data_view_list_ctrl_wrapper.cpp:58 -#: wxcrafter/data_view_tree_ctrl_wrapper.cpp:58 -#: wxcrafter/data_view_tree_list_ctrl_wrapper.cpp:65 +#: wxcrafter/command_link_button_wrapper.cpp:22 +#: wxcrafter/data_view_list_ctrl_wrapper.cpp:59 +#: wxcrafter/data_view_tree_ctrl_wrapper.cpp:60 +#: wxcrafter/data_view_tree_list_ctrl_wrapper.cpp:67 #: wxcrafter/dialog_wrapper.cpp:26 wxcrafter/dir_picker_ctrl_wrapper.cpp:11 #: wxcrafter/file_picker_ctrl_wrapper.cpp:11 -#: wxcrafter/flexgridsizer_wrapper.cpp:11 +#: wxcrafter/flexgridsizer_wrapper.cpp:12 #: wxcrafter/font_picker_ctrl_wrapper.cpp:12 wxcrafter/frame_wrapper.cpp:28 #: wxcrafter/generic_dir_ctrl_wrapper.cpp:12 wxcrafter/gl_canvas_wrapper.cpp:11 -#: wxcrafter/grid_bag_sizer_wrapper.cpp:10 wxcrafter/grid_column_wrapper.cpp:13 -#: wxcrafter/grid_row_wrapper.cpp:12 wxcrafter/grid_sizer_wrapper.cpp:11 +#: wxcrafter/grid_bag_sizer_wrapper.cpp:11 wxcrafter/grid_column_wrapper.cpp:13 +#: wxcrafter/grid_row_wrapper.cpp:12 wxcrafter/grid_sizer_wrapper.cpp:12 #: wxcrafter/grid_wrapper.cpp:25 wxcrafter/html_window_wrapper.cpp:16 #: wxcrafter/hyper_link_ctrl_wrapper.cpp:22 wxcrafter/image_list_wrapper.cpp:16 #: wxcrafter/info_bar_button_wrapper.cpp:13 #: wxcrafter/info_bar_button_wrapper.cpp:14 wxcrafter/info_bar_wrapper.cpp:10 #: wxcrafter/list_book_wrapper.cpp:9 wxcrafter/list_box_wrapper.cpp:27 #: wxcrafter/list_ctrl_column_wrapper.cpp:13 wxcrafter/list_ctrl_wrapper.cpp:9 -#: wxcrafter/media_ctrl_wrapper.cpp:21 wxcrafter/menu_bar_wrapper.cpp:9 -#: wxcrafter/menu_item_wrapper.cpp:28 wxcrafter/menu_item_wrapper.cpp:29 +#: wxcrafter/media_ctrl_wrapper.cpp:22 wxcrafter/menu_bar_wrapper.cpp:9 +#: wxcrafter/menu_item_wrapper.cpp:29 wxcrafter/menu_item_wrapper.cpp:30 #: wxcrafter/menu_wrapper.cpp:21 wxcrafter/notebook_page_wrapper.cpp:24 #: wxcrafter/notebook_wrapper.cpp:9 wxcrafter/panel_wrapper.cpp:11 #: wxcrafter/panel_wrapper_top_level.cpp:12 #: wxcrafter/popup_window_wrapper.cpp:7 #: wxcrafter/property_grid_manager_wrapper.cpp:8 #: wxcrafter/property_grid_wrapper.cpp:40 wxcrafter/radio_box_wrapper.cpp:15 -#: wxcrafter/radio_button_wrapper.cpp:13 wxcrafter/ribbon_bar_wrapper.cpp:35 -#: wxcrafter/ribbon_button_bar_wrapper.cpp:8 -#: wxcrafter/ribbon_gallery_item_wrapper.cpp:12 -#: wxcrafter/ribbon_gallery_wrapper.cpp:8 wxcrafter/ribbon_page_wrapper.cpp:14 -#: wxcrafter/ribbon_panel_wrapper.cpp:19 -#: wxcrafter/ribbon_tool_bar_wrapper.cpp:9 +#: wxcrafter/radio_button_wrapper.cpp:13 wxcrafter/ribbon_bar_wrapper.cpp:37 +#: wxcrafter/ribbon_button_bar_wrapper.cpp:10 +#: wxcrafter/ribbon_gallery_item_wrapper.cpp:13 +#: wxcrafter/ribbon_gallery_wrapper.cpp:10 wxcrafter/ribbon_page_wrapper.cpp:16 +#: wxcrafter/ribbon_panel_wrapper.cpp:21 +#: wxcrafter/ribbon_tool_bar_wrapper.cpp:11 #: wxcrafter/rich_text_ctrl_wrapper.cpp:60 wxcrafter/scroll_bar_wrapper.cpp:32 #: wxcrafter/scrolled_window_wrapper.cpp:14 #: wxcrafter/search_ctrl_wrapper.cpp:18 wxcrafter/simple_book_wrapper.cpp:34 #: wxcrafter/slider_wrapper.cpp:9 wxcrafter/spin_button_wrapper.cpp:20 #: wxcrafter/spin_ctrl_wrapper.cpp:20 wxcrafter/splitter_window_wrapper.cpp:17 #: wxcrafter/static_bitmap_wrapper.cpp:12 -#: wxcrafter/static_box_sizer_wrapper.cpp:17 +#: wxcrafter/static_box_sizer_wrapper.cpp:18 #: wxcrafter/static_line_wrapper.cpp:8 wxcrafter/static_text_wrapper.cpp:15 #: wxcrafter/status_bar_wrapper.cpp:18 #: wxcrafter/styled_text_ctrl_wrapper.cpp:176 -#: wxcrafter/task_bar_icon_wrapper.cpp:20 wxcrafter/text_ctrl_wrapper.cpp:41 +#: wxcrafter/task_bar_icon_wrapper.cpp:22 wxcrafter/text_ctrl_wrapper.cpp:41 #: wxcrafter/timer_wrapper.cpp:16 wxcrafter/toggle_button_wrapper.cpp:12 #: wxcrafter/tool_bar_item_wrapper.cpp:35 wxcrafter/tool_book_wrapper.cpp:10 -#: wxcrafter/toolbar_base_wrapper.cpp:31 wxcrafter/toolbar_base_wrapper.cpp:177 +#: wxcrafter/toolbar_base_wrapper.cpp:33 wxcrafter/toolbar_base_wrapper.cpp:210 #: wxcrafter/tree_book_wrapper.cpp:9 wxcrafter/tree_ctrl_wrapper.cpp:9 -#: wxcrafter/tree_list_ctrl_wrapper.cpp:9 wxcrafter/web_view_wrapper.cpp:33 +#: wxcrafter/tree_list_ctrl_wrapper.cpp:10 wxcrafter/web_view_wrapper.cpp:33 #: wxcrafter/wizard_page_wrapper.cpp:15 wxcrafter/wizard_wrapper.cpp:15 -#: wxcrafter/wxc_widget.cpp:132 +#: wxcrafter/wxc_widget.cpp:131 msgid "Common Settings" msgstr "" -#: wxcrafter/AnimationCtrlWrapper.cpp:17 +#: wxcrafter/AnimationCtrlWrapper.cpp:19 msgid "Load and play animation on creation" msgstr "" -#: wxcrafter/AnimationCtrlWrapper.cpp:18 +#: wxcrafter/AnimationCtrlWrapper.cpp:20 msgid "Select the animation file" msgstr "" -#: wxcrafter/AnimationCtrlWrapper.cpp:21 +#: wxcrafter/AnimationCtrlWrapper.cpp:22 msgid "" "Sets the bitmap to show on the control when it's not playing an animation" msgstr "" -#: wxcrafter/AuiToolBarTopLevel.cpp:16 wxcrafter/allocator_mgr.cpp:504 -#: wxcrafter/toolbar_base_wrapper.cpp:185 wxcrafter/wxcrafter_gui.cpp:754 +#: wxcrafter/AuiToolBarTopLevel.cpp:18 wxcrafter/allocator_mgr.cpp:504 +#: wxcrafter/toolbar_base_wrapper.cpp:218 wxcrafter/wxcrafter_gui.cpp:755 +#: wxcrafter/wxcrafter_gui.cpp:1419 msgid "wxAuiToolBar" msgstr "" -#: wxcrafter/AuiToolBarTopLevel.cpp:18 wxcrafter/AuiToolBarTopLevel.cpp:37 -#: wxcrafter/image_list_wrapper.cpp:18 wxcrafter/top_level_win_wrapper.cpp:78 +#: wxcrafter/AuiToolBarTopLevel.cpp:20 wxcrafter/AuiToolBarTopLevel.cpp:39 +#: wxcrafter/image_list_wrapper.cpp:18 wxcrafter/top_level_win_wrapper.cpp:80 msgid "The generated C++ class name" msgstr "" -#: wxcrafter/AuiToolBarTopLevel.cpp:20 wxcrafter/toolbar_base_wrapper.cpp:34 -#: wxcrafter/toolbar_base_wrapper.cpp:180 +#: wxcrafter/AuiToolBarTopLevel.cpp:22 wxcrafter/toolbar_base_wrapper.cpp:36 +#: wxcrafter/toolbar_base_wrapper.cpp:213 msgid "" "The control size. It is recommended to leave it as -1,-1 and let\n" "the sizers calculate the best size for the window" msgstr "" -#: wxcrafter/AuiToolBarTopLevel.cpp:24 -#: wxcrafter/data_view_tree_list_ctrl_wrapper.cpp:67 -#: wxcrafter/image_list_wrapper.cpp:17 wxcrafter/top_level_win_wrapper.cpp:65 +#: wxcrafter/AuiToolBarTopLevel.cpp:26 +#: wxcrafter/data_view_tree_list_ctrl_wrapper.cpp:69 +#: wxcrafter/image_list_wrapper.cpp:17 wxcrafter/top_level_win_wrapper.cpp:67 msgid "Inherited C++ Class Properties" msgstr "" -#: wxcrafter/AuiToolBarTopLevel.cpp:26 wxcrafter/top_level_win_wrapper.cpp:67 +#: wxcrafter/AuiToolBarTopLevel.cpp:28 wxcrafter/top_level_win_wrapper.cpp:69 msgid "" "Inherited class name\n" "Fill this field to generate a class that inherits from the base class,\n" @@ -20566,48 +20914,48 @@ msgid "" "e.g. for a generated class 'FooDialogBase', you might enter 'FooDialog' here." msgstr "" -#: wxcrafter/AuiToolBarTopLevel.cpp:31 wxcrafter/top_level_win_wrapper.cpp:71 +#: wxcrafter/AuiToolBarTopLevel.cpp:33 wxcrafter/top_level_win_wrapper.cpp:73 msgid "" "The name for the inherited class's files (without any file extension).\n" -"wxCrafter will generate a $(FILE).cpp and $(FILE).h\n" +"wxCrafter will generate a $(FILE).cpp and $(FILE).hpp\n" "e.g. for an inherited class 'FooDialog', you might enter 'foodialog' here." msgstr "" -#: wxcrafter/AuiToolBarTopLevel.cpp:34 wxcrafter/image_list_wrapper.cpp:23 -#: wxcrafter/top_level_win_wrapper.cpp:75 +#: wxcrafter/AuiToolBarTopLevel.cpp:36 wxcrafter/image_list_wrapper.cpp:23 +#: wxcrafter/top_level_win_wrapper.cpp:77 msgid "" "MSW Only\n" "C++ macro decorator - allows exporting this class from a DLL" msgstr "" -#: wxcrafter/AuiToolBarTopLevel.cpp:41 wxcrafter/image_list_wrapper.cpp:21 +#: wxcrafter/AuiToolBarTopLevel.cpp:43 wxcrafter/image_list_wrapper.cpp:21 msgid "codelite's virtual folder for the generated files" msgstr "" -#: wxcrafter/AuiToolBarTopLevel.cpp:43 -#: wxcrafter/command_link_button_wrapper.cpp:22 +#: wxcrafter/AuiToolBarTopLevel.cpp:45 +#: wxcrafter/command_link_button_wrapper.cpp:23 #: wxcrafter/custom_control_wrapper.cpp:12 -#: wxcrafter/data_view_list_ctrl_wrapper.cpp:60 -#: wxcrafter/data_view_tree_ctrl_wrapper.cpp:59 -#: wxcrafter/data_view_tree_list_ctrl_wrapper.cpp:66 -#: wxcrafter/wxc_widget.cpp:158 wxcrafter/wxgui_defs.h:255 +#: wxcrafter/data_view_list_ctrl_wrapper.cpp:61 +#: wxcrafter/data_view_tree_ctrl_wrapper.cpp:61 +#: wxcrafter/data_view_tree_list_ctrl_wrapper.cpp:68 +#: wxcrafter/wxc_widget.cpp:158 wxcrafter/wxgui_defs.h:261 msgid "Control Specific Settings" msgstr "" -#: wxcrafter/AuiToolBarTopLevel.cpp:44 wxcrafter/toolbar_base_wrapper.cpp:40 -#: wxcrafter/toolbar_base_wrapper.cpp:186 +#: wxcrafter/AuiToolBarTopLevel.cpp:46 wxcrafter/toolbar_base_wrapper.cpp:42 +#: wxcrafter/toolbar_base_wrapper.cpp:219 msgid "Sets the default size of each tool bitmap" msgstr "" -#: wxcrafter/AuiToolBarTopLevel.cpp:46 wxcrafter/toolbar_base_wrapper.cpp:188 +#: wxcrafter/AuiToolBarTopLevel.cpp:47 wxcrafter/toolbar_base_wrapper.cpp:221 msgid "Set the values to be used as margins for the toolbar." msgstr "" -#: wxcrafter/BitmapComboxWrapper.cpp:13 wxcrafter/combox_wrapper.cpp:14 +#: wxcrafter/BitmapComboxWrapper.cpp:14 wxcrafter/combox_wrapper.cpp:14 msgid "Combobox drop down choices" msgstr "" -#: wxcrafter/BitmapComboxWrapper.cpp:16 +#: wxcrafter/BitmapComboxWrapper.cpp:17 #: wxcrafter/SimpleHtmlListBoxWrapper.cpp:27 wxcrafter/combox_wrapper.cpp:18 #: wxcrafter/list_box_wrapper.cpp:31 msgid "" @@ -20615,23 +20963,23 @@ msgid "" "to be selected" msgstr "" -#: wxcrafter/BitmapComboxWrapper.cpp:17 wxcrafter/combox_wrapper.cpp:19 +#: wxcrafter/BitmapComboxWrapper.cpp:18 wxcrafter/combox_wrapper.cpp:19 msgid "The combobox initial value" msgstr "" -#: wxcrafter/BitmapComboxWrapper.cpp:20 wxcrafter/combox_wrapper.cpp:22 +#: wxcrafter/BitmapComboxWrapper.cpp:21 wxcrafter/combox_wrapper.cpp:22 msgid "" "Process a wxEVT_COMMAND_COMBOBOX_SELECTED event, when an item on the list is " "selected. Note that calling GetValue returns the new value of selection." msgstr "" -#: wxcrafter/BitmapComboxWrapper.cpp:23 wxcrafter/combox_wrapper.cpp:25 +#: wxcrafter/BitmapComboxWrapper.cpp:24 wxcrafter/combox_wrapper.cpp:25 #: wxcrafter/spin_ctrl_wrapper.cpp:18 msgid "" "Process a wxEVT_COMMAND_TEXT_UPDATED event, when the combobox text changes." msgstr "" -#: wxcrafter/BitmapComboxWrapper.cpp:25 wxcrafter/combox_wrapper.cpp:27 +#: wxcrafter/BitmapComboxWrapper.cpp:26 wxcrafter/combox_wrapper.cpp:27 msgid "" "Process a wxEVT_COMMAND_TEXT_ENTER event, when is pressed in the " "combobox." @@ -20667,27 +21015,27 @@ msgstr "" msgid "Sample Text" msgstr "" -#: wxcrafter/NewFormWizard.cpp:163 wxcrafter/wxcrafter_plugin.cpp:692 +#: wxcrafter/NewFormWizard.cpp:165 wxcrafter/wxcrafter_plugin.cpp:697 msgid "You must create a project before you can add new forms" msgstr "" -#: wxcrafter/NewFormWizard.cpp:172 +#: wxcrafter/NewFormWizard.cpp:174 msgid "Please enter a file name" msgstr "" -#: wxcrafter/NewFormWizard.cpp:178 +#: wxcrafter/NewFormWizard.cpp:180 msgid "Please enter a class name" msgstr "" -#: wxcrafter/NewFormWizard.cpp:185 +#: wxcrafter/NewFormWizard.cpp:187 msgid "Please select a virtual folder for the generated code" msgstr "" -#: wxcrafter/NewFormWizard.cpp:206 +#: wxcrafter/NewFormWizard.cpp:208 msgid "Enter the new wxCrafter file a name (full path):" msgstr "" -#: wxcrafter/NewFormWizard.cpp:321 +#: wxcrafter/NewFormWizard.cpp:330 msgid "Select wxCrafter file" msgstr "" @@ -21108,7 +21456,7 @@ msgid "ToolBar Pane" msgstr "" #: wxcrafter/aui_pane_info.cpp:72 wxcrafter/aui_pane_info.cpp:182 -#: wxcrafter/wxgui_defs.h:269 +#: wxcrafter/wxgui_defs.h:275 msgid "Direction" msgstr "" @@ -21152,19 +21500,19 @@ msgstr "" msgid "Pin Button" msgstr "" -#: wxcrafter/banner_window_wrapper.cpp:23 +#: wxcrafter/banner_window_wrapper.cpp:24 msgid "" "The Title\n" "Title is rendered in bold and should be single line" msgstr "" -#: wxcrafter/banner_window_wrapper.cpp:25 +#: wxcrafter/banner_window_wrapper.cpp:26 msgid "" "Message can have multiple lines but is not wrapped automatically\n" "include explicit line breaks in the string if you want to have multiple lines" msgstr "" -#: wxcrafter/banner_window_wrapper.cpp:30 +#: wxcrafter/banner_window_wrapper.cpp:31 msgid "" "The banner orientation changes how the text in it is displayed and also " "defines where is the bitmap truncated if it's too big to fit\n" @@ -21172,25 +21520,25 @@ msgid "" "taken care of in the usual way, e.g. using sizers" msgstr "" -#: wxcrafter/banner_window_wrapper.cpp:35 +#: wxcrafter/banner_window_wrapper.cpp:36 msgid "" "Select the bitmap file\n" "Important: You can set text and title OR a bitmap, but not both" msgstr "" #: wxcrafter/bitmap_button_wrapper.cpp:27 wxcrafter/bitmap_wrapepr.cpp:21 -#: wxcrafter/command_link_button_wrapper.cpp:34 wxcrafter/ribbon_button.cpp:32 -#: wxcrafter/ribbon_gallery_item_wrapper.cpp:13 +#: wxcrafter/command_link_button_wrapper.cpp:35 wxcrafter/ribbon_button.cpp:34 +#: wxcrafter/ribbon_gallery_item_wrapper.cpp:14 #: wxcrafter/static_bitmap_wrapper.cpp:13 msgid "Select the bitmap file" msgstr "" #: wxcrafter/bitmap_button_wrapper.cpp:28 wxcrafter/button_wrapper.cpp:38 -#: wxcrafter/command_link_button_wrapper.cpp:35 +#: wxcrafter/command_link_button_wrapper.cpp:36 msgid "Make this button the default button" msgstr "" -#: wxcrafter/bitmap_wrapepr.cpp:16 wxcrafter/wxcrafter_gui.cpp:101 +#: wxcrafter/bitmap_wrapepr.cpp:16 wxcrafter/wxcrafter_gui.cpp:102 msgid "wxBitmap" msgstr "" @@ -21215,7 +21563,7 @@ msgstr "" msgid "Handles a toggle button click event." msgstr "" -#: wxcrafter/box_sizer_wrapper.cpp:18 wxcrafter/static_box_sizer_wrapper.cpp:18 +#: wxcrafter/box_sizer_wrapper.cpp:19 wxcrafter/static_box_sizer_wrapper.cpp:19 msgid "Sizer orientation" msgstr "" @@ -21223,7 +21571,7 @@ msgstr "" msgid "My Button" msgstr "" -#: wxcrafter/button_wrapper.cpp:37 wxcrafter/ribbon_button.cpp:31 +#: wxcrafter/button_wrapper.cpp:37 wxcrafter/ribbon_button.cpp:33 #: wxcrafter/toggle_button_wrapper.cpp:13 msgid "The button label" msgstr "" @@ -21322,19 +21670,19 @@ msgid "" "selected." msgstr "" -#: wxcrafter/collapsible_pane_wrapper.cpp:13 +#: wxcrafter/collapsible_pane_wrapper.cpp:14 msgid "The user expanded or collapsed the collapsible pane" msgstr "" -#: wxcrafter/collapsible_pane_wrapper.cpp:14 +#: wxcrafter/collapsible_pane_wrapper.cpp:15 msgid "Process a navigation key event" msgstr "" -#: wxcrafter/collapsible_pane_wrapper.cpp:20 +#: wxcrafter/collapsible_pane_wrapper.cpp:21 msgid "The label" msgstr "" -#: wxcrafter/collapsible_pane_wrapper.cpp:21 +#: wxcrafter/collapsible_pane_wrapper.cpp:22 msgid "Set the state of the collapsible pane" msgstr "" @@ -21354,13 +21702,13 @@ msgstr "" msgid "Sets a hint shown in an empty unfocused text control" msgstr "" -#: wxcrafter/command_link_button_wrapper.cpp:30 +#: wxcrafter/command_link_button_wrapper.cpp:31 msgid "" "First line of text on the button, typically the label of an action that will " "be made when the button is pressed" msgstr "" -#: wxcrafter/command_link_button_wrapper.cpp:33 +#: wxcrafter/command_link_button_wrapper.cpp:34 msgid "" "Second line of text describing the action performed when the button is " "pressed" @@ -21381,7 +21729,7 @@ msgid "" "-2 - size the column automatically to fit all values" msgstr "" -#: wxcrafter/data_view_list_ctrl_column.cpp:40 wxcrafter/wxgui_defs.h:221 +#: wxcrafter/data_view_list_ctrl_column.cpp:40 wxcrafter/wxgui_defs.h:227 msgid "Column Type" msgstr "" @@ -21403,74 +21751,74 @@ msgstr "" msgid "One or more flags of the wxDataViewColumnFlags enumeration" msgstr "" -#: wxcrafter/data_view_list_ctrl_wrapper.cpp:18 -#: wxcrafter/data_view_tree_ctrl_wrapper.cpp:18 -#: wxcrafter/data_view_tree_list_ctrl_wrapper.cpp:22 +#: wxcrafter/data_view_list_ctrl_wrapper.cpp:19 +#: wxcrafter/data_view_tree_ctrl_wrapper.cpp:20 +#: wxcrafter/data_view_tree_list_ctrl_wrapper.cpp:24 msgid "Process a wxEVT_COMMAND_DATAVIEW_SELECTION_CHANGED event" msgstr "" -#: wxcrafter/data_view_list_ctrl_wrapper.cpp:20 -#: wxcrafter/data_view_tree_ctrl_wrapper.cpp:20 -#: wxcrafter/data_view_tree_list_ctrl_wrapper.cpp:24 +#: wxcrafter/data_view_list_ctrl_wrapper.cpp:21 +#: wxcrafter/data_view_tree_ctrl_wrapper.cpp:22 +#: wxcrafter/data_view_tree_list_ctrl_wrapper.cpp:26 msgid "" "Process a wxEVT_COMMAND_DATAVIEW_ITEM_ACTIVATED event.\n" "This event is triggered by double clicking an item or pressing some special " "key (usually \"Enter\") when it is focused" msgstr "" -#: wxcrafter/data_view_list_ctrl_wrapper.cpp:23 -#: wxcrafter/data_view_tree_ctrl_wrapper.cpp:23 -#: wxcrafter/data_view_tree_list_ctrl_wrapper.cpp:27 +#: wxcrafter/data_view_list_ctrl_wrapper.cpp:24 +#: wxcrafter/data_view_tree_ctrl_wrapper.cpp:25 +#: wxcrafter/data_view_tree_list_ctrl_wrapper.cpp:29 msgid "" "Process a wxEVT_COMMAND_DATAVIEW_ITEM_START_EDITING event.\n" "This event can be vetoed in order to prevent editing on an item by item basis" msgstr "" -#: wxcrafter/data_view_list_ctrl_wrapper.cpp:26 -#: wxcrafter/data_view_tree_ctrl_wrapper.cpp:26 -#: wxcrafter/data_view_tree_list_ctrl_wrapper.cpp:30 -msgid "Process a wxEVT_COMMAND_DATAVIEW_ITEM_EDITING_STARTED event" -msgstr "" - -#: wxcrafter/data_view_list_ctrl_wrapper.cpp:28 +#: wxcrafter/data_view_list_ctrl_wrapper.cpp:27 #: wxcrafter/data_view_tree_ctrl_wrapper.cpp:28 #: wxcrafter/data_view_tree_list_ctrl_wrapper.cpp:32 -msgid "Process a wxEVT_COMMAND_DATAVIEW_ITEM_EDITING_DONE event" +msgid "Process a wxEVT_COMMAND_DATAVIEW_ITEM_EDITING_STARTED event" msgstr "" -#: wxcrafter/data_view_list_ctrl_wrapper.cpp:30 +#: wxcrafter/data_view_list_ctrl_wrapper.cpp:29 #: wxcrafter/data_view_tree_ctrl_wrapper.cpp:30 #: wxcrafter/data_view_tree_list_ctrl_wrapper.cpp:34 -msgid "Process a wxEVT_COMMAND_DATAVIEW_ITEM_COLLAPSING event" +msgid "Process a wxEVT_COMMAND_DATAVIEW_ITEM_EDITING_DONE event" msgstr "" -#: wxcrafter/data_view_list_ctrl_wrapper.cpp:32 +#: wxcrafter/data_view_list_ctrl_wrapper.cpp:31 #: wxcrafter/data_view_tree_ctrl_wrapper.cpp:32 #: wxcrafter/data_view_tree_list_ctrl_wrapper.cpp:36 -msgid "Process a wxEVT_COMMAND_DATAVIEW_ITEM_COLLAPSED event" +msgid "Process a wxEVT_COMMAND_DATAVIEW_ITEM_COLLAPSING event" msgstr "" -#: wxcrafter/data_view_list_ctrl_wrapper.cpp:34 +#: wxcrafter/data_view_list_ctrl_wrapper.cpp:33 #: wxcrafter/data_view_tree_ctrl_wrapper.cpp:34 #: wxcrafter/data_view_tree_list_ctrl_wrapper.cpp:38 -msgid "Process a wxEVT_COMMAND_DATAVIEW_ITEM_EXPANDING event" +msgid "Process a wxEVT_COMMAND_DATAVIEW_ITEM_COLLAPSED event" msgstr "" -#: wxcrafter/data_view_list_ctrl_wrapper.cpp:36 +#: wxcrafter/data_view_list_ctrl_wrapper.cpp:35 #: wxcrafter/data_view_tree_ctrl_wrapper.cpp:36 #: wxcrafter/data_view_tree_list_ctrl_wrapper.cpp:40 -msgid "Process a wxEVT_COMMAND_DATAVIEW_ITEM_EXPANDED event" +msgid "Process a wxEVT_COMMAND_DATAVIEW_ITEM_EXPANDING event" msgstr "" -#: wxcrafter/data_view_list_ctrl_wrapper.cpp:38 +#: wxcrafter/data_view_list_ctrl_wrapper.cpp:37 #: wxcrafter/data_view_tree_ctrl_wrapper.cpp:38 #: wxcrafter/data_view_tree_list_ctrl_wrapper.cpp:42 -msgid "Process a wxEVT_COMMAND_DATAVIEW_ITEM_VALUE_CHANGED event" +msgid "Process a wxEVT_COMMAND_DATAVIEW_ITEM_EXPANDED event" msgstr "" -#: wxcrafter/data_view_list_ctrl_wrapper.cpp:40 +#: wxcrafter/data_view_list_ctrl_wrapper.cpp:39 #: wxcrafter/data_view_tree_ctrl_wrapper.cpp:40 #: wxcrafter/data_view_tree_list_ctrl_wrapper.cpp:44 +msgid "Process a wxEVT_COMMAND_DATAVIEW_ITEM_VALUE_CHANGED event" +msgstr "" + +#: wxcrafter/data_view_list_ctrl_wrapper.cpp:41 +#: wxcrafter/data_view_tree_ctrl_wrapper.cpp:42 +#: wxcrafter/data_view_tree_list_ctrl_wrapper.cpp:46 msgid "" "Process a wxEVT_COMMAND_DATAVIEW_ITEM_CONTEXT_MENU event generated when the " "user right clicks inside the control.\n" @@ -21479,63 +21827,63 @@ msgid "" "invalid item." msgstr "" -#: wxcrafter/data_view_list_ctrl_wrapper.cpp:44 -#: wxcrafter/data_view_tree_ctrl_wrapper.cpp:44 -#: wxcrafter/data_view_tree_list_ctrl_wrapper.cpp:48 -msgid "Process a wxEVT_COMMAND_DATAVIEW_COLUMN_HEADER_CLICK event" -msgstr "" - -#: wxcrafter/data_view_list_ctrl_wrapper.cpp:46 +#: wxcrafter/data_view_list_ctrl_wrapper.cpp:45 #: wxcrafter/data_view_tree_ctrl_wrapper.cpp:46 #: wxcrafter/data_view_tree_list_ctrl_wrapper.cpp:50 -msgid "Process a wxEVT_COMMAND_DATAVIEW_COLUMN_HEADER_RIGHT_CLICK event" +msgid "Process a wxEVT_COMMAND_DATAVIEW_COLUMN_HEADER_CLICK event" msgstr "" -#: wxcrafter/data_view_list_ctrl_wrapper.cpp:48 +#: wxcrafter/data_view_list_ctrl_wrapper.cpp:47 #: wxcrafter/data_view_tree_ctrl_wrapper.cpp:48 #: wxcrafter/data_view_tree_list_ctrl_wrapper.cpp:52 -msgid "Process a wxEVT_COMMAND_DATAVIEW_COLUMN_SORTED event" +msgid "Process a wxEVT_COMMAND_DATAVIEW_COLUMN_HEADER_RIGHT_CLICK event" msgstr "" -#: wxcrafter/data_view_list_ctrl_wrapper.cpp:50 +#: wxcrafter/data_view_list_ctrl_wrapper.cpp:49 #: wxcrafter/data_view_tree_ctrl_wrapper.cpp:50 #: wxcrafter/data_view_tree_list_ctrl_wrapper.cpp:54 -msgid "Process a wxEVT_COMMAND_DATAVIEW_COLUMN_REORDERED event" +msgid "Process a wxEVT_COMMAND_DATAVIEW_COLUMN_SORTED event" msgstr "" -#: wxcrafter/data_view_list_ctrl_wrapper.cpp:52 +#: wxcrafter/data_view_list_ctrl_wrapper.cpp:51 #: wxcrafter/data_view_tree_ctrl_wrapper.cpp:52 #: wxcrafter/data_view_tree_list_ctrl_wrapper.cpp:56 -msgid "Process a wxEVT_COMMAND_DATAVIEW_ITEM_BEGIN_DRAG event" +msgid "Process a wxEVT_COMMAND_DATAVIEW_COLUMN_REORDERED event" msgstr "" -#: wxcrafter/data_view_list_ctrl_wrapper.cpp:54 +#: wxcrafter/data_view_list_ctrl_wrapper.cpp:53 #: wxcrafter/data_view_tree_ctrl_wrapper.cpp:54 #: wxcrafter/data_view_tree_list_ctrl_wrapper.cpp:58 -msgid "Process a wxEVT_COMMAND_DATAVIEW_ITEM_DROP_POSSIBLE event" +msgid "Process a wxEVT_COMMAND_DATAVIEW_ITEM_BEGIN_DRAG event" msgstr "" -#: wxcrafter/data_view_list_ctrl_wrapper.cpp:56 +#: wxcrafter/data_view_list_ctrl_wrapper.cpp:55 #: wxcrafter/data_view_tree_ctrl_wrapper.cpp:56 #: wxcrafter/data_view_tree_list_ctrl_wrapper.cpp:60 +msgid "Process a wxEVT_COMMAND_DATAVIEW_ITEM_DROP_POSSIBLE event" +msgstr "" + +#: wxcrafter/data_view_list_ctrl_wrapper.cpp:57 +#: wxcrafter/data_view_tree_ctrl_wrapper.cpp:58 +#: wxcrafter/data_view_tree_list_ctrl_wrapper.cpp:62 msgid "Process a wxEVT_COMMAND_DATAVIEW_ITEM_DROP event" msgstr "" -#: wxcrafter/data_view_tree_list_ctrl_wrapper.cpp:70 +#: wxcrafter/data_view_tree_list_ctrl_wrapper.cpp:72 msgid "The generated model class name\n" msgstr "" -#: wxcrafter/data_view_tree_list_ctrl_wrapper.cpp:70 +#: wxcrafter/data_view_tree_list_ctrl_wrapper.cpp:73 msgid "wxCrafter will generate a TreeListCtrl model like 'Tree-List-Ctrl\n" msgstr "" -#: wxcrafter/data_view_tree_list_ctrl_wrapper.cpp:71 +#: wxcrafter/data_view_tree_list_ctrl_wrapper.cpp:74 msgid "" "** Leave this field empty if you do not want wxCrafter to generate a model " "class for you" msgstr "" -#: wxcrafter/data_view_tree_list_ctrl_wrapper.cpp:81 +#: wxcrafter/data_view_tree_list_ctrl_wrapper.cpp:84 msgid "" "Indicate if a container item merely acts as a headline (or for " "categorisation) or if it also acts a normal item with entries for further " @@ -21612,108 +21960,108 @@ msgid "" "the user's input is valid, e.g. an existing directory path)." msgstr "" -#: wxcrafter/events_database.cpp:108 +#: wxcrafter/events_database.cpp:107 msgid "Process a wxEVT_KEY_DOWN event (any key has been pressed)" msgstr "" -#: wxcrafter/events_database.cpp:112 +#: wxcrafter/events_database.cpp:109 msgid "Process a wxEVT_KEY_UP event (any key has been released)" msgstr "" -#: wxcrafter/events_database.cpp:115 +#: wxcrafter/events_database.cpp:110 msgid "Process a wxEVT_CHAR event" msgstr "" -#: wxcrafter/events_database.cpp:121 +#: wxcrafter/events_database.cpp:116 msgid "" "A right click (or other context menu command depending on platform) has been " "detected" msgstr "" -#: wxcrafter/events_database.cpp:127 +#: wxcrafter/events_database.cpp:121 msgid "" "Process a wxEVT_LEFT_DOWN event. The handler of this event should normally " "call event.Skip() to allow the default processing to take place as otherwise " "the window under mouse wouldn't get the focus." msgstr "" -#: wxcrafter/events_database.cpp:132 +#: wxcrafter/events_database.cpp:125 msgid "Process a wxEVT_LEFT_UP event." msgstr "" -#: wxcrafter/events_database.cpp:136 +#: wxcrafter/events_database.cpp:127 msgid "Process a wxEVT_LEFT_DCLICK event." msgstr "" -#: wxcrafter/events_database.cpp:139 +#: wxcrafter/events_database.cpp:129 msgid "Process a wxEVT_MIDDLE_DOWN event" msgstr "" -#: wxcrafter/events_database.cpp:142 +#: wxcrafter/events_database.cpp:131 msgid "Process a wxEVT_MIDDLE_UP event" msgstr "" -#: wxcrafter/events_database.cpp:145 +#: wxcrafter/events_database.cpp:133 msgid "Process a wxEVT_MIDDLE_DCLICK event." msgstr "" -#: wxcrafter/events_database.cpp:148 +#: wxcrafter/events_database.cpp:135 msgid "Process a wxEVT_RIGHT_DOWN event" msgstr "" -#: wxcrafter/events_database.cpp:150 +#: wxcrafter/events_database.cpp:137 msgid "Process a wxEVT_RIGHT_UP event" msgstr "" -#: wxcrafter/events_database.cpp:154 +#: wxcrafter/events_database.cpp:139 msgid "Process a wxEVT_RIGHT_DCLICK event" msgstr "" -#: wxcrafter/events_database.cpp:156 +#: wxcrafter/events_database.cpp:141 msgid "Process a wxEVT_MOTION event" msgstr "" -#: wxcrafter/events_database.cpp:160 +#: wxcrafter/events_database.cpp:143 msgid "Process a wxEVT_ENTER_WINDOW event" msgstr "" -#: wxcrafter/events_database.cpp:163 +#: wxcrafter/events_database.cpp:145 msgid "Process a wxEVT_LEAVE_WINDOW event." msgstr "" -#: wxcrafter/events_database.cpp:166 +#: wxcrafter/events_database.cpp:147 msgid "Process a wxEVT_MOUSEWHEEL event" msgstr "" -#: wxcrafter/events_database.cpp:178 +#: wxcrafter/events_database.cpp:157 msgid "Process a wxEVT_SET_FOCUS event" msgstr "" -#: wxcrafter/events_database.cpp:181 +#: wxcrafter/events_database.cpp:159 msgid "Process a wxEVT_KILL_FOCUS event" msgstr "" -#: wxcrafter/events_database.cpp:185 +#: wxcrafter/events_database.cpp:162 msgid "Process a wxEVT_PAINT event" msgstr "" -#: wxcrafter/events_database.cpp:189 +#: wxcrafter/events_database.cpp:164 msgid "Process a wxEVT_ERASE_BACKGROUND event." msgstr "" -#: wxcrafter/events_database.cpp:191 +#: wxcrafter/events_database.cpp:165 msgid "Process a wxEVT_SIZE event" msgstr "" -#: wxcrafter/events_database.cpp:194 +#: wxcrafter/events_database.cpp:168 msgid "Process a wxEVT_MOVE event, which is generated when a window is moved." msgstr "" -#: wxcrafter/events_database.cpp:198 +#: wxcrafter/events_database.cpp:170 msgid "Process a wxEVT_UPDATE_UI event" msgstr "" -#: wxcrafter/events_database.cpp:202 +#: wxcrafter/events_database.cpp:173 msgid "Process a wxEVT_IDLE event" msgstr "" @@ -21738,11 +22086,11 @@ msgid "" "wxFLP_FILE_MUST_EXIST was given)." msgstr "" -#: wxcrafter/flexgridsizer_wrapper.cpp:12 wxcrafter/grid_sizer_wrapper.cpp:12 +#: wxcrafter/flexgridsizer_wrapper.cpp:13 wxcrafter/grid_sizer_wrapper.cpp:13 msgid "Number of columns in the grid" msgstr "" -#: wxcrafter/flexgridsizer_wrapper.cpp:13 wxcrafter/grid_sizer_wrapper.cpp:13 +#: wxcrafter/flexgridsizer_wrapper.cpp:14 wxcrafter/grid_sizer_wrapper.cpp:14 msgid "Number of rows in the grid" msgstr "" @@ -21751,18 +22099,18 @@ msgstr "" msgid "Which columns are allowed to grow. Comma separated list" msgstr "" -#: wxcrafter/flexgridsizer_wrapper.cpp:17 -#: wxcrafter/grid_bag_sizer_wrapper.cpp:14 +#: wxcrafter/flexgridsizer_wrapper.cpp:16 +#: wxcrafter/grid_bag_sizer_wrapper.cpp:13 msgid "Which rows are allowed to grow. Comma separated list" msgstr "" -#: wxcrafter/flexgridsizer_wrapper.cpp:18 -#: wxcrafter/grid_bag_sizer_wrapper.cpp:15 wxcrafter/grid_sizer_wrapper.cpp:14 +#: wxcrafter/flexgridsizer_wrapper.cpp:17 +#: wxcrafter/grid_bag_sizer_wrapper.cpp:14 wxcrafter/grid_sizer_wrapper.cpp:15 msgid "The horizontal gap between grid cells" msgstr "" -#: wxcrafter/flexgridsizer_wrapper.cpp:19 -#: wxcrafter/grid_bag_sizer_wrapper.cpp:16 wxcrafter/grid_sizer_wrapper.cpp:15 +#: wxcrafter/flexgridsizer_wrapper.cpp:18 +#: wxcrafter/grid_bag_sizer_wrapper.cpp:15 wxcrafter/grid_sizer_wrapper.cpp:16 msgid "The vertical gap between grid cells" msgstr "" @@ -22187,7 +22535,7 @@ msgid "Batch Generate Code...\tCtrl-Shift-G" msgstr "" #: wxcrafter/gui.cpp:96 -msgid "Back to codelite\tCtrl-Shift-F12" +msgid "Back to CodeLite\tCtrl-Shift-F12" msgstr "" #: wxcrafter/gui.cpp:102 @@ -22274,66 +22622,190 @@ msgstr "" msgid "&Help" msgstr "" -#: wxcrafter/gui.cpp:403 +#: wxcrafter/gui.cpp:343 msgid "Designer" msgstr "" -#: wxcrafter/gui.cpp:444 +#: wxcrafter/gui.cpp:384 msgid "Source" msgstr "" -#: wxcrafter/gui.cpp:511 +#: wxcrafter/gui.cpp:451 msgid "Header" msgstr "" -#: wxcrafter/gui.cpp:578 +#: wxcrafter/gui.cpp:518 msgid "XRC" msgstr "" -#: wxcrafter/gui.cpp:661 +#: wxcrafter/gui.cpp:590 msgid "Properties" msgstr "" -#: wxcrafter/gui.cpp:693 wxcrafter/sizer_flags_list_view.cpp:101 -#: wxcrafter/wxguicraft_main_view.cpp:592 -#: wxcrafter/wxguicraft_main_view.cpp:598 -#: wxcrafter/wxguicraft_main_view.cpp:602 +#: wxcrafter/gui.cpp:622 wxcrafter/sizer_flags_list_view.cpp:101 +#: wxcrafter/wxguicraft_main_view.cpp:593 +#: wxcrafter/wxguicraft_main_view.cpp:599 +#: wxcrafter/wxguicraft_main_view.cpp:603 msgid "Sizer Flags" msgstr "" -#: wxcrafter/gui.cpp:710 +#: wxcrafter/gui.cpp:639 msgid "wxAuiPaneInfo" msgstr "" -#: wxcrafter/gui.cpp:1007 +#: wxcrafter/gui.cpp:878 +msgid "" +msgstr "" + +#: wxcrafter/gui.cpp:879 +msgid "wxSYS_COLOUR_SCROLLBAR" +msgstr "" + +#: wxcrafter/gui.cpp:880 +msgid "wxSYS_COLOUR_DESKTOP" +msgstr "" + +#: wxcrafter/gui.cpp:881 +msgid "wxSYS_COLOUR_ACTIVECAPTION" +msgstr "" + +#: wxcrafter/gui.cpp:882 +msgid "wxSYS_COLOUR_INACTIVECAPTION" +msgstr "" + +#: wxcrafter/gui.cpp:883 +msgid "wxSYS_COLOUR_MENU" +msgstr "" + +#: wxcrafter/gui.cpp:884 +msgid "wxSYS_COLOUR_WINDOW" +msgstr "" + +#: wxcrafter/gui.cpp:885 +msgid "wxSYS_COLOUR_WINDOWFRAME" +msgstr "" + +#: wxcrafter/gui.cpp:886 +msgid "wxSYS_COLOUR_MENUTEXT" +msgstr "" + +#: wxcrafter/gui.cpp:887 +msgid "wxSYS_COLOUR_WINDOWTEXT" +msgstr "" + +#: wxcrafter/gui.cpp:888 +msgid "wxSYS_COLOUR_CAPTIONTEXT" +msgstr "" + +#: wxcrafter/gui.cpp:889 +msgid "wxSYS_COLOUR_ACTIVEBORDER" +msgstr "" + +#: wxcrafter/gui.cpp:890 +msgid "wxSYS_COLOUR_INACTIVEBORDER" +msgstr "" + +#: wxcrafter/gui.cpp:891 +msgid "wxSYS_COLOUR_APPWORKSPACE" +msgstr "" + +#: wxcrafter/gui.cpp:892 +msgid "wxSYS_COLOUR_HIGHLIGHT" +msgstr "" + +#: wxcrafter/gui.cpp:893 +msgid "wxSYS_COLOUR_HIGHLIGHTTEXT" +msgstr "" + +#: wxcrafter/gui.cpp:894 +msgid "wxSYS_COLOUR_BTNFACE" +msgstr "" + +#: wxcrafter/gui.cpp:895 +msgid "wxSYS_COLOUR_BTNSHADOW" +msgstr "" + +#: wxcrafter/gui.cpp:896 +msgid "wxSYS_COLOUR_GRAYTEXT" +msgstr "" + +#: wxcrafter/gui.cpp:897 +msgid "wxSYS_COLOUR_BTNTEXT" +msgstr "" + +#: wxcrafter/gui.cpp:898 +msgid "wxSYS_COLOUR_INACTIVECAPTIONTEXT" +msgstr "" + +#: wxcrafter/gui.cpp:899 +msgid "wxSYS_COLOUR_BTNHIGHLIGHT" +msgstr "" + +#: wxcrafter/gui.cpp:900 +msgid "wxSYS_COLOUR_3DDKSHADOW" +msgstr "" + +#: wxcrafter/gui.cpp:901 +msgid "wxSYS_COLOUR_3DLIGHT" +msgstr "" + +#: wxcrafter/gui.cpp:902 +msgid "wxSYS_COLOUR_INFOTEXT" +msgstr "" + +#: wxcrafter/gui.cpp:903 +msgid "wxSYS_COLOUR_INFOBK" +msgstr "" + +#: wxcrafter/gui.cpp:904 +msgid "wxSYS_COLOUR_LISTBOX" +msgstr "" + +#: wxcrafter/gui.cpp:905 +msgid "wxSYS_COLOUR_HOTLIGHT" +msgstr "" + +#: wxcrafter/gui.cpp:906 +msgid "wxSYS_COLOUR_GRADIENTACTIVECAPTION" +msgstr "" + +#: wxcrafter/gui.cpp:907 +msgid "wxSYS_COLOUR_GRADIENTINACTIVECAPTION" +msgstr "" + +#: wxcrafter/gui.cpp:908 +msgid "wxSYS_COLOUR_MENUHILIGHT" +msgstr "" + +#: wxcrafter/gui.cpp:909 +msgid "wxSYS_COLOUR_MENUBAR" +msgstr "" + +#: wxcrafter/gui.cpp:912 msgid "Select a standard color from the list below" msgstr "" -#: wxcrafter/gui.cpp:1012 +#: wxcrafter/gui.cpp:917 msgid "Custom Colour..." msgstr "" -#: wxcrafter/gui.cpp:1014 +#: wxcrafter/gui.cpp:919 msgid "Select custom color..." msgstr "" -#: wxcrafter/gui.cpp:1099 wxcrafter/gui.cpp:1102 +#: wxcrafter/gui.cpp:994 wxcrafter/gui.cpp:997 msgid "Close button minimizes wxCrafter to the tray" msgstr "" -#: wxcrafter/gui.cpp:1107 +#: wxcrafter/gui.cpp:1002 msgid "Code Generation:" msgstr "" -#: wxcrafter/gui.cpp:1111 -msgid "Keep wxSizers as class members" -msgstr "" - -#: wxcrafter/gui.cpp:1117 +#: wxcrafter/gui.cpp:1006 msgid "Format inherited files" msgstr "" -#: wxcrafter/gui.cpp:1121 +#: wxcrafter/gui.cpp:1010 msgid "" "When e.g. a new eventhandler is added, wxCrafter helpfully adds an empty " "handler to the derived class as well as to the generated base-class. If this " @@ -22341,21 +22813,21 @@ msgid "" "will be formatted each time this is done." msgstr "" -#: wxcrafter/gui.cpp:1128 +#: wxcrafter/gui.cpp:1017 msgid "Duplicating and Pasting:" msgstr "" -#: wxcrafter/gui.cpp:1133 +#: wxcrafter/gui.cpp:1022 msgid "" "What should happen when duplicating or pasting a top-level window,\n" "or pasting some contents from one top-level window to another?" msgstr "" -#: wxcrafter/gui.cpp:1140 +#: wxcrafter/gui.cpp:1029 msgid "Leave unchanged any user-set names of child controls" msgstr "" -#: wxcrafter/gui.cpp:1144 +#: wxcrafter/gui.cpp:1033 msgid "" "You can't have two top-level windows with the same name, but you can have " "FooBase::m_textEntry and BarBase::m_textEntry.\n" @@ -22364,11 +22836,11 @@ msgid "" "you don't need to keep autogenerated names like m_text153." msgstr "" -#: wxcrafter/gui.cpp:1152 +#: wxcrafter/gui.cpp:1041 msgid "Leave unchanged the names of all child controls" msgstr "" -#: wxcrafter/gui.cpp:1156 +#: wxcrafter/gui.cpp:1045 msgid "" "You can't have two top-level windows with the same name, but you can have " "FooBase::m_text123 and BarBase::m_text123.\n" @@ -22376,55 +22848,33 @@ msgid "" "already have Foo code that references them that you want to copy to Bar." msgstr "" -#: wxcrafter/gui.cpp:1162 +#: wxcrafter/gui.cpp:1051 msgid "Copy any event-handlers too" msgstr "" -#: wxcrafter/gui.cpp:1166 +#: wxcrafter/gui.cpp:1055 msgid "" "If the class that you're duplicating has e.g. a wxTextCtrl with a " "wxEVT_COMMAND_TEXT_ENTER event-handler set, if this box is ticked the " "textctrl in duplicate class will also have that event-handler." msgstr "" -#: wxcrafter/gui.cpp:1324 -msgid "" -"wxCrafter may be evaluated for free\n" -"However, a license must be purchased for continued use." -msgstr "" - -#: wxcrafter/gui.cpp:1329 -msgid "Purchase" -msgstr "" - -#: wxcrafter/gui.cpp:1329 -msgid "Purchase wxCrafter" -msgstr "" - -#: wxcrafter/gui.cpp:1334 -msgid "Continue with trial version" -msgstr "" - -#: wxcrafter/gui.h:279 +#: wxcrafter/gui.h:269 msgid "Enter Text" msgstr "" -#: wxcrafter/gui.h:297 +#: wxcrafter/gui.h:287 msgid "Select Color" msgstr "" -#: wxcrafter/gui.h:324 +#: wxcrafter/gui.h:314 msgid "Select Colour..." msgstr "" -#: wxcrafter/gui.h:356 +#: wxcrafter/gui.h:344 msgid "wxCrafter Settings" msgstr "" -#: wxcrafter/gui.h:417 -msgid "This is an unregistered copy of wxCrafter" -msgstr "" - #: wxcrafter/html_window_wrapper.cpp:17 msgid "HTML code to load" msgstr "" @@ -22484,7 +22934,7 @@ msgstr "" msgid "The filenames for the generated files" msgstr "" -#: wxcrafter/image_list_wrapper.cpp:24 +#: wxcrafter/image_list_wrapper.cpp:24 wxcrafter/wxcrafter_gui.cpp:1417 msgid "wxImageList" msgstr "" @@ -22504,7 +22954,7 @@ msgstr "" msgid "Choose a wxSmith project to import" msgstr "" -#: wxcrafter/import_dlg.cpp:43 wxcrafter/wxcrafter_plugin.cpp:402 +#: wxcrafter/import_dlg.cpp:43 wxcrafter/wxcrafter_plugin.cpp:401 msgid "Import a wxFormBuilder project" msgstr "" @@ -22549,8 +22999,8 @@ msgid "Can't import unknown class %s from XRC" msgstr "" #: wxcrafter/info_bar_button_wrapper.cpp:18 -#: wxcrafter/ribbon_panel_wrapper.cpp:20 -#: wxcrafter/static_box_sizer_wrapper.cpp:19 +#: wxcrafter/ribbon_panel_wrapper.cpp:22 +#: wxcrafter/static_box_sizer_wrapper.cpp:20 msgid "My Label" msgstr "" @@ -22578,7 +23028,7 @@ msgid "wxListCtrl Column" msgstr "" #: wxcrafter/list_ctrl_column_wrapper.cpp:15 -#: wxcrafter/tree_list_ctrl_column_wrapper.cpp:23 +#: wxcrafter/tree_list_ctrl_column_wrapper.cpp:24 msgid "Column caption" msgstr "" @@ -22667,39 +23117,39 @@ msgstr "" msgid "An item has been inserted" msgstr "" -#: wxcrafter/main.cpp:204 +#: wxcrafter/main.cpp:202 msgid "Back to CodeLite" msgstr "" -#: wxcrafter/main.cpp:216 wxcrafter/wxguicraft_main_view.cpp:179 +#: wxcrafter/main.cpp:214 wxcrafter/wxguicraft_main_view.cpp:180 msgid "Generate Code" msgstr "" -#: wxcrafter/main.cpp:695 +#: wxcrafter/main.cpp:701 msgid "Create an empty wxCrafter project" msgstr "" -#: wxcrafter/main.cpp:706 wxcrafter/wxcrafter_plugin.cpp:744 +#: wxcrafter/main.cpp:713 wxcrafter/wxcrafter_plugin.cpp:749 msgid "Could not create resource file '" msgstr "" -#: wxcrafter/main.cpp:1021 +#: wxcrafter/main.cpp:997 msgid "Open a wxCrafter file" msgstr "" -#: wxcrafter/media_ctrl_wrapper.cpp:23 +#: wxcrafter/media_ctrl_wrapper.cpp:24 msgid "Select the media control backend, leave empty for the default" msgstr "" -#: wxcrafter/media_ctrl_wrapper.cpp:27 +#: wxcrafter/media_ctrl_wrapper.cpp:28 msgid "Show the player controls" msgstr "" -#: wxcrafter/media_ctrl_wrapper.cpp:30 +#: wxcrafter/media_ctrl_wrapper.cpp:31 msgid "Sent when a media has loaded enough data that it can start playing" msgstr "" -#: wxcrafter/media_ctrl_wrapper.cpp:32 +#: wxcrafter/media_ctrl_wrapper.cpp:33 msgid "" "Sent when a media has switched to the wxMEDIASTATE_STOPPED state. You may be " "able to Veto this event to prevent it from stopping, causing it to continue " @@ -22708,53 +23158,53 @@ msgid "" "catch the EVT_MEDIA_FINISHED and play there instead)." msgstr "" -#: wxcrafter/media_ctrl_wrapper.cpp:37 +#: wxcrafter/media_ctrl_wrapper.cpp:38 msgid "Sent when a media has finished playing in a wxMediaCtrl." msgstr "" -#: wxcrafter/media_ctrl_wrapper.cpp:39 +#: wxcrafter/media_ctrl_wrapper.cpp:40 msgid "Sent when a media has switched its state (from any media state)" msgstr "" -#: wxcrafter/media_ctrl_wrapper.cpp:41 +#: wxcrafter/media_ctrl_wrapper.cpp:42 msgid "Sent when a media has switched to the wxMEDIASTATE_PLAYING state" msgstr "" -#: wxcrafter/media_ctrl_wrapper.cpp:43 +#: wxcrafter/media_ctrl_wrapper.cpp:44 msgid "Sent when a media has switched to the wxMEDIASTATE_PAUSED state" msgstr "" -#: wxcrafter/menu_item_wrapper.cpp:22 +#: wxcrafter/menu_item_wrapper.cpp:23 msgid "Menu item has been clicked" msgstr "" -#: wxcrafter/menu_item_wrapper.cpp:31 wxcrafter/menu_wrapper.cpp:23 +#: wxcrafter/menu_item_wrapper.cpp:32 wxcrafter/menu_wrapper.cpp:23 #: wxcrafter/tool_bar_item_wrapper.cpp:37 #: wxcrafter/tool_bar_item_wrapper.cpp:488 msgid "C++ variable name" msgstr "" -#: wxcrafter/menu_item_wrapper.cpp:32 +#: wxcrafter/menu_item_wrapper.cpp:33 msgid "Menu Item" msgstr "" -#: wxcrafter/menu_item_wrapper.cpp:33 +#: wxcrafter/menu_item_wrapper.cpp:34 msgid "The menu item label" msgstr "" -#: wxcrafter/menu_item_wrapper.cpp:35 +#: wxcrafter/menu_item_wrapper.cpp:36 msgid "Short help string" msgstr "" -#: wxcrafter/menu_item_wrapper.cpp:36 +#: wxcrafter/menu_item_wrapper.cpp:37 msgid "Menu item image" msgstr "" -#: wxcrafter/menu_item_wrapper.cpp:42 +#: wxcrafter/menu_item_wrapper.cpp:43 msgid "The type of menu item: normal, radio, checkable or separator" msgstr "" -#: wxcrafter/menu_item_wrapper.cpp:43 +#: wxcrafter/menu_item_wrapper.cpp:44 msgid "For a checkable menu item, should this be checked" msgstr "" @@ -22804,55 +23254,55 @@ msgstr "" msgid "Expand this node" msgstr "" -#: wxcrafter/properties_list_view.cpp:47 +#: wxcrafter/properties_list_view.cpp:49 msgid "wxCrafter Project Settings" msgstr "" -#: wxcrafter/properties_list_view.cpp:48 wxcrafter/properties_list_view.cpp:253 +#: wxcrafter/properties_list_view.cpp:50 wxcrafter/properties_list_view.cpp:267 msgid "Output Directory" msgstr "" -#: wxcrafter/properties_list_view.cpp:49 +#: wxcrafter/properties_list_view.cpp:51 msgid "The generated files' output directory" msgstr "" -#: wxcrafter/properties_list_view.cpp:51 +#: wxcrafter/properties_list_view.cpp:53 msgid "" "The generated files' name.\n" -"wxCrafter will generate a $(FILE).cpp and $(FILE).h" +"wxCrafter will generate a $(FILE).cpp and $(FILE).hpp" msgstr "" -#: wxcrafter/properties_list_view.cpp:52 wxcrafter/properties_list_view.cpp:256 +#: wxcrafter/properties_list_view.cpp:54 wxcrafter/properties_list_view.cpp:272 msgid "Additional Include Files" msgstr "" -#: wxcrafter/properties_list_view.cpp:53 +#: wxcrafter/properties_list_view.cpp:55 msgid "" "List of additional include files that should be included in the generated " "files\n" -"e.g. my_header.h ; string.h" +"e.g. my_header.hpp ; string.h" msgstr "" -#: wxcrafter/properties_list_view.cpp:55 wxcrafter/properties_list_view.cpp:259 +#: wxcrafter/properties_list_view.cpp:57 wxcrafter/properties_list_view.cpp:277 msgid "Bitmap Files" msgstr "" -#: wxcrafter/properties_list_view.cpp:56 +#: wxcrafter/properties_list_view.cpp:58 msgid "" "Set here the file name for the bitmaps\n" "wxCrafter converts all the bitmaps in the project into C++ code and will " "place them in this file" msgstr "" -#: wxcrafter/properties_list_view.cpp:59 +#: wxcrafter/properties_list_view.cpp:61 msgid "wxWindow ID Generation" msgstr "" -#: wxcrafter/properties_list_view.cpp:61 wxcrafter/properties_list_view.cpp:265 +#: wxcrafter/properties_list_view.cpp:63 wxcrafter/properties_list_view.cpp:287 msgid "Generate Window ID" msgstr "" -#: wxcrafter/properties_list_view.cpp:62 +#: wxcrafter/properties_list_view.cpp:64 msgid "" "Auto generate enum in the base class for the wxWindow IDs which are not a " "stock window ID nor wrapped with the XRCID macro\n" @@ -22860,46 +23310,46 @@ msgid "" "wxWindow IDs" msgstr "" -#: wxcrafter/properties_list_view.cpp:64 wxcrafter/properties_list_view.cpp:268 +#: wxcrafter/properties_list_view.cpp:66 wxcrafter/properties_list_view.cpp:292 msgid "First Window ID" msgstr "" -#: wxcrafter/properties_list_view.cpp:65 +#: wxcrafter/properties_list_view.cpp:67 msgid "" "When 'Generate Window ID' is checked, use this as the first enumerator value" msgstr "" -#: wxcrafter/properties_list_view.cpp:66 wxcrafter/properties_list_view.cpp:271 +#: wxcrafter/properties_list_view.cpp:70 wxcrafter/properties_list_view.cpp:297 msgid "Generate Translatable Strings" msgstr "" -#: wxcrafter/properties_list_view.cpp:67 +#: wxcrafter/properties_list_view.cpp:71 msgid "" "When enabled, all generated strings are wrapped with the \"_\" macro, " "otherwise allow users to directly enter native text string encapsulated by " "wxT() macro" msgstr "" -#: wxcrafter/properties_list_view.cpp:69 wxcrafter/properties_list_view.cpp:274 +#: wxcrafter/properties_list_view.cpp:73 wxcrafter/properties_list_view.cpp:302 msgid "Add wxWidgets Handlers if missing" msgstr "" -#: wxcrafter/properties_list_view.cpp:70 +#: wxcrafter/properties_list_view.cpp:74 msgid "" "When enabled, wxCrafter will add missing handlers (e.g. wxBitmapXmlHandler)" msgstr "" -#: wxcrafter/properties_list_view.cpp:147 -#: wxcrafter/properties_list_view.cpp:148 wxcrafter/sizer_wrapper_base.cpp:17 -#: wxcrafter/toolbar_base_wrapper.cpp:46 wxcrafter/wxc_widget.cpp:151 +#: wxcrafter/properties_list_view.cpp:157 +#: wxcrafter/properties_list_view.cpp:158 wxcrafter/sizer_wrapper_base.cpp:21 +#: wxcrafter/toolbar_base_wrapper.cpp:48 wxcrafter/wxc_widget.cpp:150 msgid "Subclass" msgstr "" -#: wxcrafter/properties_list_view.cpp:289 +#: wxcrafter/properties_list_view.cpp:319 msgid "A control with this name already exists!" msgstr "" -#: wxcrafter/properties_list_view.cpp:386 +#: wxcrafter/properties_list_view.cpp:416 msgid "Construct the Dropdown Menu" msgstr "" @@ -23098,61 +23548,61 @@ msgid "" "clicked." msgstr "" -#: wxcrafter/ribbon_bar_wrapper.cpp:11 +#: wxcrafter/ribbon_bar_wrapper.cpp:13 msgid "" "Triggered after the transition from one page being active to a different " "page being active." msgstr "" -#: wxcrafter/ribbon_bar_wrapper.cpp:13 +#: wxcrafter/ribbon_bar_wrapper.cpp:15 msgid "" "Triggered prior to the transition from one page being active to a different " "page being active, and can veto the change." msgstr "" -#: wxcrafter/ribbon_bar_wrapper.cpp:16 +#: wxcrafter/ribbon_bar_wrapper.cpp:18 msgid "Triggered when the middle mouse button is pressed on a tab." msgstr "" -#: wxcrafter/ribbon_bar_wrapper.cpp:18 +#: wxcrafter/ribbon_bar_wrapper.cpp:20 msgid "Triggered when the middle mouse button is released on a tab." msgstr "" -#: wxcrafter/ribbon_bar_wrapper.cpp:20 +#: wxcrafter/ribbon_bar_wrapper.cpp:22 msgid "Triggered when the right mouse button is pressed on a tab." msgstr "" -#: wxcrafter/ribbon_bar_wrapper.cpp:22 +#: wxcrafter/ribbon_bar_wrapper.cpp:24 msgid "Triggered when the right mouse button is released on a tab." msgstr "" -#: wxcrafter/ribbon_bar_wrapper.cpp:24 +#: wxcrafter/ribbon_bar_wrapper.cpp:26 msgid "Triggered when the left mouse button is double clicked on a tab." msgstr "" -#: wxcrafter/ribbon_bar_wrapper.cpp:44 +#: wxcrafter/ribbon_bar_wrapper.cpp:46 msgid "Select the ribbon bar theme" msgstr "" -#: wxcrafter/ribbon_button.cpp:31 +#: wxcrafter/ribbon_button.cpp:33 msgid "Button" msgstr "" -#: wxcrafter/ribbon_button.cpp:33 +#: wxcrafter/ribbon_button.cpp:35 msgid "Help string" msgstr "" -#: wxcrafter/ribbon_button.cpp:34 +#: wxcrafter/ribbon_button.cpp:36 msgid "The button type" msgstr "" -#: wxcrafter/ribbon_button.cpp:46 +#: wxcrafter/ribbon_button.cpp:48 msgid "" "Triggered when the normal (non-dropdown) region of a button on the button " "bar is clicked." msgstr "" -#: wxcrafter/ribbon_button.cpp:48 +#: wxcrafter/ribbon_button.cpp:50 msgid "" "Triggered when the dropdown region of a button on the button bar is clicked. " "wxRibbonButtonBarEvent::PopupMenu() should be called by the event handler if " @@ -23160,13 +23610,13 @@ msgid "" "be doing)." msgstr "" -#: wxcrafter/ribbon_button.cpp:56 +#: wxcrafter/ribbon_button.cpp:58 msgid "" "Triggered when the normal (non-dropdown) region of a tool on the toolbar is " "clicked." msgstr "" -#: wxcrafter/ribbon_button.cpp:58 +#: wxcrafter/ribbon_button.cpp:60 msgid "" "Triggered when the dropdown region of a tool on the toolbar is clicked. " "wxRibbonToolBarEvent::PopupMenu() should be called by the event handler if " @@ -23174,13 +23624,13 @@ msgid "" "be doing)." msgstr "" -#: wxcrafter/ribbon_gallery_wrapper.cpp:10 +#: wxcrafter/ribbon_gallery_wrapper.cpp:12 msgid "" "Triggered when the user selects an item from the gallery. Note that the ID " "is that of the gallery, not of the item." msgstr "" -#: wxcrafter/ribbon_gallery_wrapper.cpp:13 +#: wxcrafter/ribbon_gallery_wrapper.cpp:15 msgid "" "Similar to EVT_RIBBONGALLERY_SELECTED but triggered every time a gallery " "item is clicked, even if it is already selected. Note that the ID of the " @@ -23188,7 +23638,7 @@ msgid "" "available since wxWidgets 2.9.2." msgstr "" -#: wxcrafter/ribbon_gallery_wrapper.cpp:17 +#: wxcrafter/ribbon_gallery_wrapper.cpp:19 msgid "" "Triggered when the item being hovered over by the user changes. The item in " "the event will be the new item being hovered, or NULL if there is no longer " @@ -23196,40 +23646,40 @@ msgid "" "item." msgstr "" -#: wxcrafter/ribbon_gallery_wrapper.cpp:21 +#: wxcrafter/ribbon_gallery_wrapper.cpp:23 msgid "Triggered when the \"extension\" button of the gallery is pressed" msgstr "" -#: wxcrafter/ribbon_page_wrapper.cpp:15 +#: wxcrafter/ribbon_page_wrapper.cpp:17 msgid "Page Icon" msgstr "" -#: wxcrafter/ribbon_page_wrapper.cpp:16 +#: wxcrafter/ribbon_page_wrapper.cpp:18 msgid "Page Label" msgstr "" -#: wxcrafter/ribbon_page_wrapper.cpp:17 wxcrafter/wxgui_defs.h:194 +#: wxcrafter/ribbon_page_wrapper.cpp:19 wxcrafter/wxgui_defs.h:200 msgid "Selected" msgstr "" -#: wxcrafter/ribbon_panel_wrapper.cpp:20 +#: wxcrafter/ribbon_panel_wrapper.cpp:22 msgid "The Label" msgstr "" -#: wxcrafter/ribbon_panel_wrapper.cpp:22 +#: wxcrafter/ribbon_panel_wrapper.cpp:24 msgid "" "Icon to be used in place of the panel's children when the panel is minimised" msgstr "" -#: wxcrafter/ribbon_panel_wrapper.cpp:25 +#: wxcrafter/ribbon_panel_wrapper.cpp:27 msgid "Triggered when the user activate the panel extension button" msgstr "" -#: wxcrafter/ribbon_tool_bar_wrapper.cpp:14 +#: wxcrafter/ribbon_tool_bar_wrapper.cpp:16 msgid "Set the minimum number of rows to distribute tool groups over" msgstr "" -#: wxcrafter/ribbon_tool_bar_wrapper.cpp:17 +#: wxcrafter/ribbon_tool_bar_wrapper.cpp:19 msgid "" "Set the maximum number of rows to distribute tool groups over. Use -1 as " "default value" @@ -23504,7 +23954,12 @@ msgstr "" msgid "GridBagSizer" msgstr "" -#: wxcrafter/sizer_wrapper_base.cpp:13 wxcrafter/wxc_widget.cpp:146 +#: wxcrafter/sizer_wrapper_base.cpp:9 +msgid "" +"When enabled, this sizer is kept as a class member and become accessible" +msgstr "" + +#: wxcrafter/sizer_wrapper_base.cpp:17 wxcrafter/wxc_widget.cpp:145 msgid "Initial State" msgstr "" @@ -23611,7 +24066,7 @@ msgid "" "(unless the minimum pane size has been set to a value greater than zero)" msgstr "" -#: wxcrafter/static_text_wrapper.cpp:16 wxcrafter/wxgui_defs.h:128 +#: wxcrafter/static_text_wrapper.cpp:16 wxcrafter/wxgui_defs.h:134 msgid "Label:" msgstr "" @@ -23623,16 +24078,16 @@ msgstr "" msgid "Sets the number of fields" msgstr "" -#: wxcrafter/std_button_wrapper.cpp:29 wxcrafter/wxgui_defs.h:232 +#: wxcrafter/std_button_wrapper.cpp:29 wxcrafter/wxgui_defs.h:238 msgid "Button ID" msgstr "" -#: wxcrafter/std_button_wrapper.cpp:30 wxcrafter/toolbar_base_wrapper.cpp:36 -#: wxcrafter/toolbar_base_wrapper.cpp:182 wxcrafter/wxc_widget.cpp:140 +#: wxcrafter/std_button_wrapper.cpp:30 wxcrafter/toolbar_base_wrapper.cpp:38 +#: wxcrafter/toolbar_base_wrapper.cpp:215 wxcrafter/wxc_widget.cpp:139 msgid "C++ member name" msgstr "" -#: wxcrafter/std_button_wrapper.cpp:31 wxcrafter/wxc_widget.cpp:141 +#: wxcrafter/std_button_wrapper.cpp:31 wxcrafter/wxc_widget.cpp:140 msgid "Tooltip text:" msgstr "" @@ -23824,43 +24279,43 @@ msgstr "" msgid "wxWindow" msgstr "" -#: wxcrafter/task_bar_icon_wrapper.cpp:14 +#: wxcrafter/task_bar_icon_wrapper.cpp:16 msgid "Set the wxTaskBarIcon tooltip" msgstr "" -#: wxcrafter/task_bar_icon_wrapper.cpp:22 +#: wxcrafter/task_bar_icon_wrapper.cpp:24 msgid "The iconType is only applicable on wxOSX_Cocoa" msgstr "" -#: wxcrafter/task_bar_icon_wrapper.cpp:23 +#: wxcrafter/task_bar_icon_wrapper.cpp:25 msgid "Set the wxTaskBarIcon icon" msgstr "" -#: wxcrafter/task_bar_icon_wrapper.cpp:25 +#: wxcrafter/task_bar_icon_wrapper.cpp:27 msgid "Process a wxEVT_TASKBAR_MOVE event" msgstr "" -#: wxcrafter/task_bar_icon_wrapper.cpp:26 +#: wxcrafter/task_bar_icon_wrapper.cpp:28 msgid "Process a wxEVT_TASKBAR_LEFT_DOWN event" msgstr "" -#: wxcrafter/task_bar_icon_wrapper.cpp:27 +#: wxcrafter/task_bar_icon_wrapper.cpp:29 msgid "Process a wxEVT_TASKBAR_LEFT_UP event" msgstr "" -#: wxcrafter/task_bar_icon_wrapper.cpp:28 +#: wxcrafter/task_bar_icon_wrapper.cpp:30 msgid "Process a wxEVT_TASKBAR_RIGHT_DOWN event" msgstr "" -#: wxcrafter/task_bar_icon_wrapper.cpp:29 +#: wxcrafter/task_bar_icon_wrapper.cpp:31 msgid "Process a wxEVT_TASKBAR_RIGHT_UP event" msgstr "" -#: wxcrafter/task_bar_icon_wrapper.cpp:30 +#: wxcrafter/task_bar_icon_wrapper.cpp:32 msgid "Process a wxEVT_TASKBAR_LEFT_DCLICK event" msgstr "" -#: wxcrafter/task_bar_icon_wrapper.cpp:31 +#: wxcrafter/task_bar_icon_wrapper.cpp:33 msgid "Process a wxEVT_TASKBAR_RIGHT_DCLICK event" msgstr "" @@ -23906,7 +24361,7 @@ msgid "" "implemented in wxMSW port and does nothing under the other platforms." msgstr "" -#: wxcrafter/timer_wrapper.cpp:17 wxcrafter/wxcrafter_gui.cpp:1049 +#: wxcrafter/timer_wrapper.cpp:17 wxcrafter/wxcrafter_gui.cpp:1050 msgid "wxTimer" msgstr "" @@ -23918,7 +24373,7 @@ msgstr "" msgid "Sets the current interval for the timer (in milliseconds)" msgstr "" -#: wxcrafter/timer_wrapper.cpp:20 wxcrafter/wxgui_defs.h:246 +#: wxcrafter/timer_wrapper.cpp:20 wxcrafter/wxgui_defs.h:252 msgid "Start the timer" msgstr "" @@ -24023,111 +24478,112 @@ msgstr "" msgid "Optionally, specify the label's width" msgstr "" -#: wxcrafter/toolbar_base_wrapper.cpp:39 +#: wxcrafter/toolbar_base_wrapper.cpp:41 msgid "ToolBar" msgstr "" -#: wxcrafter/toolbar_base_wrapper.cpp:42 +#: wxcrafter/toolbar_base_wrapper.cpp:44 msgid "Sets the values to be used as margins for the toolbar." msgstr "" -#: wxcrafter/toolbar_base_wrapper.cpp:43 +#: wxcrafter/toolbar_base_wrapper.cpp:45 msgid "Sets the space between tools." msgstr "" -#: wxcrafter/toolbar_base_wrapper.cpp:44 +#: wxcrafter/toolbar_base_wrapper.cpp:46 msgid "Sets the width of separators." msgstr "" -#: wxcrafter/toolbar_base_wrapper.cpp:48 wxcrafter/wxc_widget.cpp:153 +#: wxcrafter/toolbar_base_wrapper.cpp:50 wxcrafter/wxc_widget.cpp:152 msgid "" "The name of the derived class. Used both for C++ and XRC generated code." msgstr "" -#: wxcrafter/toolbar_base_wrapper.cpp:50 wxcrafter/wxc_widget.cpp:155 +#: wxcrafter/toolbar_base_wrapper.cpp:53 wxcrafter/wxc_widget.cpp:155 msgid "" -"(C++ only) The name of any extra header file to be #included e.g. mydialog.h" +"(C++ only) The name of any extra header file to be #included e.g. mydialog." +"hpp" msgstr "" -#: wxcrafter/toolbar_base_wrapper.cpp:52 wxcrafter/wxc_widget.cpp:157 +#: wxcrafter/toolbar_base_wrapper.cpp:55 wxcrafter/wxc_widget.cpp:157 msgid "" "Override the default class style with the content of this field.\n" "The style should be | separated" msgstr "" -#: wxcrafter/top_level_win_wrapper.cpp:30 +#: wxcrafter/top_level_win_wrapper.cpp:32 msgid "Process a wxEVT_MAXIMIZE event" msgstr "" -#: wxcrafter/top_level_win_wrapper.cpp:32 +#: wxcrafter/top_level_win_wrapper.cpp:34 msgid "Process a wxEVT_MOVE event, which is generated when a window is moved" msgstr "" -#: wxcrafter/top_level_win_wrapper.cpp:34 +#: wxcrafter/top_level_win_wrapper.cpp:36 msgid "" "Process a wxEVT_MOVE_START event, which is generated when the user starts to " "move or size a window. Windows only" msgstr "" -#: wxcrafter/top_level_win_wrapper.cpp:37 +#: wxcrafter/top_level_win_wrapper.cpp:39 msgid "" "Process a wxEVT_MOVE_END event, which is generated when the user stops " "moving or sizing a window. Windows only" msgstr "" -#: wxcrafter/top_level_win_wrapper.cpp:39 +#: wxcrafter/top_level_win_wrapper.cpp:41 msgid "Process a wxEVT_SHOW event" msgstr "" -#: wxcrafter/top_level_win_wrapper.cpp:47 +#: wxcrafter/top_level_win_wrapper.cpp:49 msgid "" "When enabled, the generated code will add support for wxPersistenceManager " "(i.e. the Window will remember its size, position and any child " "wxBookCtrlBase control will remember its selection)" msgstr "" -#: wxcrafter/top_level_win_wrapper.cpp:58 +#: wxcrafter/top_level_win_wrapper.cpp:60 msgid "The title, if any" msgstr "" -#: wxcrafter/top_level_win_wrapper.cpp:60 +#: wxcrafter/top_level_win_wrapper.cpp:62 msgid "CodeLite's virtual folder for the generated files" msgstr "" -#: wxcrafter/top_level_win_wrapper.cpp:62 +#: wxcrafter/top_level_win_wrapper.cpp:64 msgid "" "Centre on parent. This may be in both dimensions (the default); only " "vertically or horizontally; or not at all." msgstr "" -#: wxcrafter/top_level_win_wrapper.cpp:112 +#: wxcrafter/top_level_win_wrapper.cpp:114 msgid "" "You did not set the 'Inherited C++ Class Properties -> File name' property " "for the top level window: '" msgstr "" -#: wxcrafter/top_level_win_wrapper.cpp:115 +#: wxcrafter/top_level_win_wrapper.cpp:117 msgid "" "This means that only base class code will be generated\n" "To fix this, select the toplevel entry from the tree-view and provide an " "Inherited class name and file name" msgstr "" -#: wxcrafter/top_level_win_wrapper.cpp:119 +#: wxcrafter/top_level_win_wrapper.cpp:121 msgid "OK, continue with code generation" msgstr "" -#: wxcrafter/top_level_win_wrapper.cpp:120 wxcrafter/wxcrafter.cpp:272 +#: wxcrafter/top_level_win_wrapper.cpp:122 wxcrafter/wxcrafter.cpp:272 msgid "Don't show this message again" msgstr "" -#: wxcrafter/top_level_win_wrapper.cpp:213 +#: wxcrafter/top_level_win_wrapper.cpp:220 msgid "" "Can not generate code.\n" "Make sure that all toplevel windows have a valid C++ class name" msgstr "" -#: wxcrafter/top_level_win_wrapper.cpp:283 +#: wxcrafter/top_level_win_wrapper.cpp:309 msgid "Base class and inherited class have the same name" msgstr "" @@ -24139,15 +24595,15 @@ msgstr "" msgid "The page node is going to be expanded" msgstr "" -#: wxcrafter/tree_list_ctrl_column_wrapper.cpp:22 +#: wxcrafter/tree_list_ctrl_column_wrapper.cpp:23 msgid "wxTreeListCtrl Column" msgstr "" -#: wxcrafter/tree_list_ctrl_column_wrapper.cpp:25 +#: wxcrafter/tree_list_ctrl_column_wrapper.cpp:26 msgid "Alignment of both the column header and its items" msgstr "" -#: wxcrafter/tree_list_ctrl_column_wrapper.cpp:28 +#: wxcrafter/tree_list_ctrl_column_wrapper.cpp:29 msgid "" "The width of the column in pixels or the special wxCOL_WIDTH_AUTOSIZE(-2) " "value indicating that the column should adjust to its contents. Notice that " @@ -24156,14 +24612,14 @@ msgid "" "it" msgstr "" -#: wxcrafter/tree_list_ctrl_column_wrapper.cpp:33 +#: wxcrafter/tree_list_ctrl_column_wrapper.cpp:34 msgid "" "Column flags, currently can include wxCOL_RESIZABLE to allow the user to " "resize the column and wxCOL_SORTABLE to allow the user to resort the control " "contents by clicking on this column" msgstr "" -#: wxcrafter/tree_list_ctrl_wrapper.cpp:18 +#: wxcrafter/tree_list_ctrl_wrapper.cpp:20 msgid "" "Process wxEVT_TREELIST_SELECTION_CHANGED event and notifies about the " "selection change in the control. In the single selection case the item " @@ -24174,21 +24630,21 @@ msgid "" "wxTreeListCtrl::GetSelections() to retrieve the new selection if necessary." msgstr "" -#: wxcrafter/tree_list_ctrl_wrapper.cpp:25 +#: wxcrafter/tree_list_ctrl_wrapper.cpp:27 msgid "" "Process wxEVT_TREELIST_ITEM_EXPANDING event notifying about the given branch " "being expanded. This event is sent before the expansion occurs and can be " "vetoed to prevent it from happening." msgstr "" -#: wxcrafter/tree_list_ctrl_wrapper.cpp:28 +#: wxcrafter/tree_list_ctrl_wrapper.cpp:31 msgid "" "Process wxEVT_TREELIST_ITEM_EXPANDED event notifying about the expansion of " "the given branch. This event is sent after the expansion occurs and can't be " "vetoed." msgstr "" -#: wxcrafter/tree_list_ctrl_wrapper.cpp:31 +#: wxcrafter/tree_list_ctrl_wrapper.cpp:35 msgid "" "Process wxEVT_TREELIST_ITEM_CHECKED event notifying about the user checking " "or unchecking the item. You can use wxTreeListCtrl::GetCheckedState() to " @@ -24196,19 +24652,19 @@ msgid "" "the previous one." msgstr "" -#: wxcrafter/tree_list_ctrl_wrapper.cpp:35 +#: wxcrafter/tree_list_ctrl_wrapper.cpp:39 msgid "" "Process wxEVT_TREELIST_ITEM_ACTIVATED event notifying about the user double " "clicking the item or activating it from keyboard." msgstr "" -#: wxcrafter/tree_list_ctrl_wrapper.cpp:38 +#: wxcrafter/tree_list_ctrl_wrapper.cpp:42 msgid "" "Process wxEVT_TREELIST_ITEM_CONTEXT_MENU event indicating that the popup " "menu for the given item should be displayed." msgstr "" -#: wxcrafter/tree_list_ctrl_wrapper.cpp:41 +#: wxcrafter/tree_list_ctrl_wrapper.cpp:45 msgid "" "Process wxEVT_TREELIST_COLUMN_SORTED event indicating that the control " "contents has just been resorted using the specified column. The event " @@ -24326,45 +24782,45 @@ msgstr "" msgid "Could not start wxCrafter at: " msgstr "" -#: wxcrafter/wxcTreeView.cpp:29 wxcrafter/wxguicraft_main_view.cpp:418 +#: wxcrafter/wxcTreeView.cpp:31 wxcrafter/wxguicraft_main_view.cpp:418 #: wxcrafter/wxguicraft_main_view.cpp:1156 #: wxcrafter/wxguicraft_main_view.cpp:1177 msgid "wxCrafter Project" msgstr "" -#: wxcrafter/wxc_widget.cpp:135 +#: wxcrafter/wxc_widget.cpp:134 msgid "" "The control's size. It is recommended to leave it as -1,-1 and let\n" "the sizers calculate the best size for the window" msgstr "" -#: wxcrafter/wxc_widget.cpp:138 +#: wxcrafter/wxc_widget.cpp:137 msgid "" "The control's minimum size, to indicate to the sizer layout mechanism that " "this is the minimum required size" msgstr "" -#: wxcrafter/wxc_widget.cpp:142 +#: wxcrafter/wxc_widget.cpp:141 msgid "Set the control's background colour" msgstr "" -#: wxcrafter/wxc_widget.cpp:143 +#: wxcrafter/wxc_widget.cpp:142 msgid "Set the control's foreground colour" msgstr "" -#: wxcrafter/wxc_widget.cpp:144 +#: wxcrafter/wxc_widget.cpp:143 msgid "Set the control's font" msgstr "" -#: wxcrafter/wxc_widget.cpp:147 +#: wxcrafter/wxc_widget.cpp:146 msgid "Sets the control initial state to 'Hidden'" msgstr "" -#: wxcrafter/wxc_widget.cpp:148 +#: wxcrafter/wxc_widget.cpp:147 msgid "Sets the control initial state to 'Disabled'" msgstr "" -#: wxcrafter/wxc_widget.cpp:149 +#: wxcrafter/wxc_widget.cpp:148 msgid "This control should have keyboard focus" msgstr "" @@ -24376,6 +24832,34 @@ msgstr "" msgid "Use pre-defined font" msgstr "" +#: wxcrafter/wxcrafter.cpp:81 +msgid "wxSYS_DEFAULT_GUI_FONT" +msgstr "" + +#: wxcrafter/wxcrafter.cpp:82 +msgid "wxSYS_OEM_FIXED_FONT" +msgstr "" + +#: wxcrafter/wxcrafter.cpp:83 +msgid "wxSYS_ANSI_FIXED_FONT" +msgstr "" + +#: wxcrafter/wxcrafter.cpp:84 +msgid "wxSYS_ANSI_VAR_FONT" +msgstr "" + +#: wxcrafter/wxcrafter.cpp:85 +msgid "wxSYS_SYSTEM_FONT" +msgstr "" + +#: wxcrafter/wxcrafter.cpp:86 +msgid "wxSYS_DEVICE_DEFAULT_FONT" +msgstr "" + +#: wxcrafter/wxcrafter.cpp:87 +msgid "wxSYS_SYSTEM_FIXED_FONT" +msgstr "" + #: wxcrafter/wxcrafter.cpp:98 msgid "Bold" msgstr "" @@ -24427,7 +24911,7 @@ msgstr "" #: wxcrafter/wxcrafter.cpp:443 msgid "" "Place here the include file that this custom control requires\n" -"e.g. #include " +"e.g. #include " msgstr "" #: wxcrafter/wxcrafter.cpp:456 @@ -24592,6 +25076,42 @@ msgid "" "wxArtProvider." msgstr "" +#: wxcrafter/wxcrafter.cpp:1465 +msgid "wxART_TOOLBAR" +msgstr "" + +#: wxcrafter/wxcrafter.cpp:1466 +msgid "wxART_MENU" +msgstr "" + +#: wxcrafter/wxcrafter.cpp:1467 +msgid "wxART_FRAME_ICON" +msgstr "" + +#: wxcrafter/wxcrafter.cpp:1468 +msgid "wxART_CMN_DIALOG" +msgstr "" + +#: wxcrafter/wxcrafter.cpp:1469 +msgid "wxART_HELP_BROWSER" +msgstr "" + +#: wxcrafter/wxcrafter.cpp:1470 +msgid "wxART_MESSAGE_BOX" +msgstr "" + +#: wxcrafter/wxcrafter.cpp:1471 +msgid "wxART_BUTTON" +msgstr "" + +#: wxcrafter/wxcrafter.cpp:1472 +msgid "wxART_LIST" +msgstr "" + +#: wxcrafter/wxcrafter.cpp:1473 +msgid "wxART_OTHER" +msgstr "" + #: wxcrafter/wxcrafter.cpp:1483 msgid "Size Hint:" msgstr "" @@ -24600,6 +25120,26 @@ msgstr "" msgid "Size of the returned bitmap or wxDefaultSize if size doesn't matter" msgstr "" +#: wxcrafter/wxcrafter.cpp:1489 +msgid "wxDefaultSize" +msgstr "" + +#: wxcrafter/wxcrafter.cpp:1490 +msgid "16" +msgstr "" + +#: wxcrafter/wxcrafter.cpp:1491 +msgid "24" +msgstr "" + +#: wxcrafter/wxcrafter.cpp:1492 +msgid "32" +msgstr "" + +#: wxcrafter/wxcrafter.cpp:1493 +msgid "64" +msgstr "" + #: wxcrafter/wxcrafter.cpp:1621 msgid "Control Events" msgstr "" @@ -24689,493 +25229,494 @@ msgstr "" msgid "Set File and Bitmap" msgstr "" -#: wxcrafter/wxcrafter_gui.cpp:40 +#: wxcrafter/wxcrafter_gui.cpp:41 msgid "Forms" msgstr "" -#: wxcrafter/wxcrafter_gui.cpp:53 +#: wxcrafter/wxcrafter_gui.cpp:54 wxcrafter/wxcrafter_gui.cpp:1414 msgid "wxDialog" msgstr "" -#: wxcrafter/wxcrafter_gui.cpp:59 +#: wxcrafter/wxcrafter_gui.cpp:60 wxcrafter/wxcrafter_gui.cpp:1413 msgid "wxFrame" msgstr "" -#: wxcrafter/wxcrafter_gui.cpp:65 wxcrafter/wxcrafter_gui.cpp:200 +#: wxcrafter/wxcrafter_gui.cpp:66 wxcrafter/wxcrafter_gui.cpp:201 +#: wxcrafter/wxcrafter_gui.cpp:1416 msgid "wxPanel" msgstr "" -#: wxcrafter/wxcrafter_gui.cpp:71 +#: wxcrafter/wxcrafter_gui.cpp:72 wxcrafter/wxcrafter_gui.cpp:1415 msgid "wxWizard" msgstr "" -#: wxcrafter/wxcrafter_gui.cpp:88 +#: wxcrafter/wxcrafter_gui.cpp:89 msgid "wxImagList" msgstr "" -#: wxcrafter/wxcrafter_gui.cpp:95 +#: wxcrafter/wxcrafter_gui.cpp:96 wxcrafter/wxcrafter_gui.cpp:1418 msgid "wxPopupWindow" msgstr "" -#: wxcrafter/wxcrafter_gui.cpp:109 +#: wxcrafter/wxcrafter_gui.cpp:110 msgid "Sizers" msgstr "" -#: wxcrafter/wxcrafter_gui.cpp:122 +#: wxcrafter/wxcrafter_gui.cpp:123 msgid "wxBoxSizer" msgstr "" -#: wxcrafter/wxcrafter_gui.cpp:129 +#: wxcrafter/wxcrafter_gui.cpp:130 msgid "wxFlexGridSizer" msgstr "" -#: wxcrafter/wxcrafter_gui.cpp:136 +#: wxcrafter/wxcrafter_gui.cpp:137 msgid "wxStaticBoxSizer" msgstr "" -#: wxcrafter/wxcrafter_gui.cpp:142 +#: wxcrafter/wxcrafter_gui.cpp:143 msgid "wxGridSizer" msgstr "" -#: wxcrafter/wxcrafter_gui.cpp:149 +#: wxcrafter/wxcrafter_gui.cpp:150 msgid "wxGridBagSizer" msgstr "" -#: wxcrafter/wxcrafter_gui.cpp:156 +#: wxcrafter/wxcrafter_gui.cpp:157 msgid "wxStdDialogButtonSizer" msgstr "" -#: wxcrafter/wxcrafter_gui.cpp:162 +#: wxcrafter/wxcrafter_gui.cpp:163 msgid "" "A standard wxButton that can be placed in side a wxStdDialogButtonSizer class" msgstr "" -#: wxcrafter/wxcrafter_gui.cpp:173 +#: wxcrafter/wxcrafter_gui.cpp:174 msgid "Stretchable spacer" msgstr "" -#: wxcrafter/wxcrafter_gui.cpp:179 +#: wxcrafter/wxcrafter_gui.cpp:180 msgid "wxAuiManager" msgstr "" -#: wxcrafter/wxcrafter_gui.cpp:207 +#: wxcrafter/wxcrafter_gui.cpp:208 msgid "wxScrolledWindow" msgstr "" -#: wxcrafter/wxcrafter_gui.cpp:214 +#: wxcrafter/wxcrafter_gui.cpp:215 msgid "wxSplitterWindow" msgstr "" -#: wxcrafter/wxcrafter_gui.cpp:221 +#: wxcrafter/wxcrafter_gui.cpp:222 msgid "Splitter Window Page" msgstr "" -#: wxcrafter/wxcrafter_gui.cpp:228 +#: wxcrafter/wxcrafter_gui.cpp:229 msgid "Notebook Page" msgstr "" -#: wxcrafter/wxcrafter_gui.cpp:235 +#: wxcrafter/wxcrafter_gui.cpp:236 msgid "wxWizardPage" msgstr "" -#: wxcrafter/wxcrafter_gui.cpp:252 +#: wxcrafter/wxcrafter_gui.cpp:253 msgid "wxNotebook" msgstr "" -#: wxcrafter/wxcrafter_gui.cpp:258 +#: wxcrafter/wxcrafter_gui.cpp:259 msgid "wxListbook" msgstr "" -#: wxcrafter/wxcrafter_gui.cpp:265 +#: wxcrafter/wxcrafter_gui.cpp:266 msgid "wxChoicebook" msgstr "" -#: wxcrafter/wxcrafter_gui.cpp:271 +#: wxcrafter/wxcrafter_gui.cpp:272 msgid "wxTreebook" msgstr "" -#: wxcrafter/wxcrafter_gui.cpp:277 +#: wxcrafter/wxcrafter_gui.cpp:278 msgid "wxToolbook" msgstr "" -#: wxcrafter/wxcrafter_gui.cpp:284 +#: wxcrafter/wxcrafter_gui.cpp:285 msgid "wxAuiNotebook" msgstr "" -#: wxcrafter/wxcrafter_gui.cpp:291 +#: wxcrafter/wxcrafter_gui.cpp:292 msgid "wxSimplebook" msgstr "" -#: wxcrafter/wxcrafter_gui.cpp:309 +#: wxcrafter/wxcrafter_gui.cpp:310 msgid "wxCollapsiblePane" msgstr "" -#: wxcrafter/wxcrafter_gui.cpp:316 +#: wxcrafter/wxcrafter_gui.cpp:317 msgid "wxCollapsiblePane Pane" msgstr "" -#: wxcrafter/wxcrafter_gui.cpp:334 +#: wxcrafter/wxcrafter_gui.cpp:335 msgid "wxGLCanvas" msgstr "" -#: wxcrafter/wxcrafter_gui.cpp:342 +#: wxcrafter/wxcrafter_gui.cpp:343 msgid "Controls" msgstr "" -#: wxcrafter/wxcrafter_gui.cpp:359 +#: wxcrafter/wxcrafter_gui.cpp:360 msgid "wxButton" msgstr "" -#: wxcrafter/wxcrafter_gui.cpp:366 +#: wxcrafter/wxcrafter_gui.cpp:367 msgid "wxBitmapButton" msgstr "" -#: wxcrafter/wxcrafter_gui.cpp:372 +#: wxcrafter/wxcrafter_gui.cpp:373 msgid "wxHyperlinkCtrl" msgstr "" -#: wxcrafter/wxcrafter_gui.cpp:379 +#: wxcrafter/wxcrafter_gui.cpp:380 msgid "wxToggleButton" msgstr "" -#: wxcrafter/wxcrafter_gui.cpp:386 +#: wxcrafter/wxcrafter_gui.cpp:387 msgid "wxSpinButton" msgstr "" -#: wxcrafter/wxcrafter_gui.cpp:392 +#: wxcrafter/wxcrafter_gui.cpp:393 msgid "wxSpinCtrl" msgstr "" -#: wxcrafter/wxcrafter_gui.cpp:399 +#: wxcrafter/wxcrafter_gui.cpp:400 msgid "wxBitmapToggleButton" msgstr "" -#: wxcrafter/wxcrafter_gui.cpp:416 +#: wxcrafter/wxcrafter_gui.cpp:417 msgid "wxCheckBox" msgstr "" -#: wxcrafter/wxcrafter_gui.cpp:422 +#: wxcrafter/wxcrafter_gui.cpp:423 msgid "wxRadioBox" msgstr "" -#: wxcrafter/wxcrafter_gui.cpp:429 +#: wxcrafter/wxcrafter_gui.cpp:430 msgid "wxRadioButton" msgstr "" -#: wxcrafter/wxcrafter_gui.cpp:447 +#: wxcrafter/wxcrafter_gui.cpp:448 msgid "wxStaticText" msgstr "" -#: wxcrafter/wxcrafter_gui.cpp:454 +#: wxcrafter/wxcrafter_gui.cpp:455 msgid "wxStaticLine" msgstr "" -#: wxcrafter/wxcrafter_gui.cpp:460 +#: wxcrafter/wxcrafter_gui.cpp:461 msgid "wxTextCtrl" msgstr "" -#: wxcrafter/wxcrafter_gui.cpp:467 +#: wxcrafter/wxcrafter_gui.cpp:468 msgid "wxRichTextCtrl" msgstr "" -#: wxcrafter/wxcrafter_gui.cpp:473 +#: wxcrafter/wxcrafter_gui.cpp:474 msgid "wxStaticBitmap" msgstr "" -#: wxcrafter/wxcrafter_gui.cpp:479 +#: wxcrafter/wxcrafter_gui.cpp:480 msgid "wxHtmlWindow" msgstr "" -#: wxcrafter/wxcrafter_gui.cpp:485 +#: wxcrafter/wxcrafter_gui.cpp:486 msgid "wxStyledTextCtrl" msgstr "" -#: wxcrafter/wxcrafter_gui.cpp:502 +#: wxcrafter/wxcrafter_gui.cpp:503 msgid "wxChoice" msgstr "" -#: wxcrafter/wxcrafter_gui.cpp:508 +#: wxcrafter/wxcrafter_gui.cpp:509 msgid "wxComboBox" msgstr "" -#: wxcrafter/wxcrafter_gui.cpp:515 +#: wxcrafter/wxcrafter_gui.cpp:516 msgid "wxBitmapComboBox" msgstr "" -#: wxcrafter/wxcrafter_gui.cpp:532 +#: wxcrafter/wxcrafter_gui.cpp:533 msgid "wxListBox" msgstr "" -#: wxcrafter/wxcrafter_gui.cpp:539 +#: wxcrafter/wxcrafter_gui.cpp:540 msgid "wxSimpleHtmlListBox" msgstr "" -#: wxcrafter/wxcrafter_gui.cpp:546 +#: wxcrafter/wxcrafter_gui.cpp:547 msgid "wxCheckListBox" msgstr "" -#: wxcrafter/wxcrafter_gui.cpp:553 +#: wxcrafter/wxcrafter_gui.cpp:554 msgid "wxRearrangeList" msgstr "" -#: wxcrafter/wxcrafter_gui.cpp:559 +#: wxcrafter/wxcrafter_gui.cpp:560 msgid "wxListCtrl" msgstr "" -#: wxcrafter/wxcrafter_gui.cpp:565 +#: wxcrafter/wxcrafter_gui.cpp:566 msgid "wxGrid" msgstr "" -#: wxcrafter/wxcrafter_gui.cpp:571 +#: wxcrafter/wxcrafter_gui.cpp:572 msgid "wxTreeCtrl" msgstr "" -#: wxcrafter/wxcrafter_gui.cpp:589 +#: wxcrafter/wxcrafter_gui.cpp:590 msgid "wxActivityIndicator" msgstr "" -#: wxcrafter/wxcrafter_gui.cpp:595 +#: wxcrafter/wxcrafter_gui.cpp:596 msgid "wxSlider" msgstr "" -#: wxcrafter/wxcrafter_gui.cpp:601 +#: wxcrafter/wxcrafter_gui.cpp:602 msgid "wxGauge" msgstr "" -#: wxcrafter/wxcrafter_gui.cpp:607 +#: wxcrafter/wxcrafter_gui.cpp:608 msgid "wxScrollBar" msgstr "" -#: wxcrafter/wxcrafter_gui.cpp:625 +#: wxcrafter/wxcrafter_gui.cpp:626 msgid "wxSearchCtrl" msgstr "" -#: wxcrafter/wxcrafter_gui.cpp:632 +#: wxcrafter/wxcrafter_gui.cpp:633 msgid "wxColourPickerCtrl" msgstr "" -#: wxcrafter/wxcrafter_gui.cpp:639 +#: wxcrafter/wxcrafter_gui.cpp:640 msgid "wxFontPickerCtrl" msgstr "" -#: wxcrafter/wxcrafter_gui.cpp:646 +#: wxcrafter/wxcrafter_gui.cpp:647 msgid "wxFilePickerCtrl" msgstr "" -#: wxcrafter/wxcrafter_gui.cpp:653 +#: wxcrafter/wxcrafter_gui.cpp:654 msgid "wxDirPickerCtrl" msgstr "" -#: wxcrafter/wxcrafter_gui.cpp:660 +#: wxcrafter/wxcrafter_gui.cpp:661 msgid "wxDatePickerCtrl" msgstr "" -#: wxcrafter/wxcrafter_gui.cpp:667 +#: wxcrafter/wxcrafter_gui.cpp:668 msgid "wxTimePickerCtrl" msgstr "" -#: wxcrafter/wxcrafter_gui.cpp:674 +#: wxcrafter/wxcrafter_gui.cpp:675 msgid "wxCalendarCtrl" msgstr "" -#: wxcrafter/wxcrafter_gui.cpp:681 +#: wxcrafter/wxcrafter_gui.cpp:682 msgid "wxGenericDirCtrl" msgstr "" -#: wxcrafter/wxcrafter_gui.cpp:687 +#: wxcrafter/wxcrafter_gui.cpp:688 msgid "Custom Control" msgstr "" -#: wxcrafter/wxcrafter_gui.cpp:695 +#: wxcrafter/wxcrafter_gui.cpp:696 msgid "Menu / ToolBar" msgstr "" -#: wxcrafter/wxcrafter_gui.cpp:712 +#: wxcrafter/wxcrafter_gui.cpp:713 msgid "wxMenuBar" msgstr "" -#: wxcrafter/wxcrafter_gui.cpp:718 +#: wxcrafter/wxcrafter_gui.cpp:719 msgid "wxMenu" msgstr "" -#: wxcrafter/wxcrafter_gui.cpp:724 +#: wxcrafter/wxcrafter_gui.cpp:725 msgid "Sub Menu" msgstr "" -#: wxcrafter/wxcrafter_gui.cpp:730 +#: wxcrafter/wxcrafter_gui.cpp:731 msgid "wxMenuItem" msgstr "" -#: wxcrafter/wxcrafter_gui.cpp:747 +#: wxcrafter/wxcrafter_gui.cpp:748 msgid "wxToolBar" msgstr "" -#: wxcrafter/wxcrafter_gui.cpp:761 +#: wxcrafter/wxcrafter_gui.cpp:762 msgid "Toolbar Item" msgstr "" -#: wxcrafter/wxcrafter_gui.cpp:768 +#: wxcrafter/wxcrafter_gui.cpp:769 msgid "Toolbar Separator" msgstr "" -#: wxcrafter/wxcrafter_gui.cpp:786 +#: wxcrafter/wxcrafter_gui.cpp:787 msgid "wxStatusBar" msgstr "" -#: wxcrafter/wxcrafter_gui.cpp:794 wxcrafter/wxcrafter_gui.cpp:808 +#: wxcrafter/wxcrafter_gui.cpp:795 wxcrafter/wxcrafter_gui.cpp:809 msgid "wxRibbonBar" msgstr "" -#: wxcrafter/wxcrafter_gui.cpp:815 +#: wxcrafter/wxcrafter_gui.cpp:816 msgid "wxRibbonPage" msgstr "" -#: wxcrafter/wxcrafter_gui.cpp:822 +#: wxcrafter/wxcrafter_gui.cpp:823 msgid "wxRibbonPanel" msgstr "" -#: wxcrafter/wxcrafter_gui.cpp:840 +#: wxcrafter/wxcrafter_gui.cpp:841 msgid "wxRibbonButtonBar" msgstr "" -#: wxcrafter/wxcrafter_gui.cpp:847 +#: wxcrafter/wxcrafter_gui.cpp:848 msgid "wxRibbonButton (Normal)" msgstr "" -#: wxcrafter/wxcrafter_gui.cpp:854 +#: wxcrafter/wxcrafter_gui.cpp:855 msgid "wxRibbonButton (Dropdown)" msgstr "" -#: wxcrafter/wxcrafter_gui.cpp:861 +#: wxcrafter/wxcrafter_gui.cpp:862 msgid "wxRibbonButton (Hybrid)" msgstr "" -#: wxcrafter/wxcrafter_gui.cpp:868 +#: wxcrafter/wxcrafter_gui.cpp:869 msgid "wxRibbonButton (Toggle)" msgstr "" -#: wxcrafter/wxcrafter_gui.cpp:886 +#: wxcrafter/wxcrafter_gui.cpp:887 msgid "wxRibbonToolBar" msgstr "" -#: wxcrafter/wxcrafter_gui.cpp:893 +#: wxcrafter/wxcrafter_gui.cpp:894 msgid "wxRibbonTool (Normal)" msgstr "" -#: wxcrafter/wxcrafter_gui.cpp:900 +#: wxcrafter/wxcrafter_gui.cpp:901 msgid "wxRibbonTool (Dropdown)" msgstr "" -#: wxcrafter/wxcrafter_gui.cpp:907 +#: wxcrafter/wxcrafter_gui.cpp:908 msgid "wxRibbonTool (Hybrid)" msgstr "" -#: wxcrafter/wxcrafter_gui.cpp:914 +#: wxcrafter/wxcrafter_gui.cpp:915 msgid "wxRibbonTool (Toggle)" msgstr "" -#: wxcrafter/wxcrafter_gui.cpp:921 +#: wxcrafter/wxcrafter_gui.cpp:922 msgid "wxRibbonTool (Separator)" msgstr "" -#: wxcrafter/wxcrafter_gui.cpp:939 +#: wxcrafter/wxcrafter_gui.cpp:940 msgid "wxRibbonGallery" msgstr "" -#: wxcrafter/wxcrafter_gui.cpp:946 +#: wxcrafter/wxcrafter_gui.cpp:947 msgid "wxRibbonGalleryItem" msgstr "" -#: wxcrafter/wxcrafter_gui.cpp:966 +#: wxcrafter/wxcrafter_gui.cpp:967 msgid "wxDataViewListCtrl" msgstr "" -#: wxcrafter/wxcrafter_gui.cpp:973 +#: wxcrafter/wxcrafter_gui.cpp:974 msgid "wxDataViewTreeCtrl" msgstr "" -#: wxcrafter/wxcrafter_gui.cpp:980 +#: wxcrafter/wxcrafter_gui.cpp:981 msgid "wxDataViewCtrl (with tree-list custom model)" msgstr "" -#: wxcrafter/wxcrafter_gui.cpp:986 +#: wxcrafter/wxcrafter_gui.cpp:987 msgid "Add a column..." msgstr "" -#: wxcrafter/wxcrafter_gui.cpp:1004 +#: wxcrafter/wxcrafter_gui.cpp:1005 msgid "wxPropertyGridManager" msgstr "" -#: wxcrafter/wxcrafter_gui.cpp:1011 +#: wxcrafter/wxcrafter_gui.cpp:1012 msgid "wxTreeListCtrl" msgstr "" -#: wxcrafter/wxcrafter_gui.cpp:1018 +#: wxcrafter/wxcrafter_gui.cpp:1019 msgid "wxPGProperty" msgstr "" -#: wxcrafter/wxcrafter_gui.cpp:1036 +#: wxcrafter/wxcrafter_gui.cpp:1037 msgid "wxBannerWindow" msgstr "" -#: wxcrafter/wxcrafter_gui.cpp:1043 +#: wxcrafter/wxcrafter_gui.cpp:1044 msgid "wxCommandLinkButton" msgstr "" -#: wxcrafter/wxcrafter_gui.cpp:1056 +#: wxcrafter/wxcrafter_gui.cpp:1057 msgid "wxTaskBarIcon" msgstr "" -#: wxcrafter/wxcrafter_gui.cpp:1068 +#: wxcrafter/wxcrafter_gui.cpp:1069 msgid "wxInfoBar" msgstr "" -#: wxcrafter/wxcrafter_gui.cpp:1075 +#: wxcrafter/wxcrafter_gui.cpp:1076 msgid "wxInfoBar Button" msgstr "" -#: wxcrafter/wxcrafter_gui.cpp:1093 +#: wxcrafter/wxcrafter_gui.cpp:1094 msgid "wxWebView" msgstr "" -#: wxcrafter/wxcrafter_gui.cpp:1100 +#: wxcrafter/wxcrafter_gui.cpp:1101 msgid "wxAnimationCtrl" msgstr "" -#: wxcrafter/wxcrafter_gui.cpp:1107 wxcrafter/wxcrafter_gui.cpp:1697 -#: wxcrafter/wxcrafter_gui.cpp:1706 +#: wxcrafter/wxcrafter_gui.cpp:1108 wxcrafter/wxcrafter_gui.cpp:1698 +#: wxcrafter/wxcrafter_gui.cpp:1707 msgid "wxMediaCtrl" msgstr "" -#: wxcrafter/wxcrafter_gui.cpp:1406 +#: wxcrafter/wxcrafter_gui.cpp:1407 msgid "Select the form type:" msgstr "" -#: wxcrafter/wxcrafter_gui.cpp:1421 +#: wxcrafter/wxcrafter_gui.cpp:1422 msgid "Select the form type" msgstr "" -#: wxcrafter/wxcrafter_gui.cpp:1426 +#: wxcrafter/wxcrafter_gui.cpp:1427 msgid "Set the form title (optional):" msgstr "" -#: wxcrafter/wxcrafter_gui.cpp:1459 +#: wxcrafter/wxcrafter_gui.cpp:1460 msgid "Resource file:" msgstr "" -#: wxcrafter/wxcrafter_gui.cpp:1471 +#: wxcrafter/wxcrafter_gui.cpp:1472 msgid "Select the wxcp project in which to put this new form" msgstr "" -#: wxcrafter/wxcrafter_gui.cpp:1477 +#: wxcrafter/wxcrafter_gui.cpp:1478 msgid "Create a new wxcp file" msgstr "" -#: wxcrafter/wxcrafter_gui.cpp:1486 +#: wxcrafter/wxcrafter_gui.cpp:1487 msgid "Base class name:" msgstr "" -#: wxcrafter/wxcrafter_gui.cpp:1494 +#: wxcrafter/wxcrafter_gui.cpp:1495 msgid "" "The base class name e.g. FooBase\n" "wxCrafter will place all the generated UI code into this class.\n" @@ -25183,32 +25724,32 @@ msgid "" "there." msgstr "" -#: wxcrafter/wxcrafter_gui.cpp:1502 +#: wxcrafter/wxcrafter_gui.cpp:1503 msgid "Derived class name:" msgstr "" -#: wxcrafter/wxcrafter_gui.cpp:1510 +#: wxcrafter/wxcrafter_gui.cpp:1511 msgid "" "The name of the class derived from 'Base class name' e.g. 'Foo' where the " "base-class is 'FooBase'." msgstr "" -#: wxcrafter/wxcrafter_gui.cpp:1517 +#: wxcrafter/wxcrafter_gui.cpp:1518 msgid "Subclass file:" msgstr "" -#: wxcrafter/wxcrafter_gui.cpp:1525 +#: wxcrafter/wxcrafter_gui.cpp:1526 msgid "" "The filename in which to store the derived class (no need to add the " "extension).\n" -"e.g. for a class Foo, stored in files foo.cpp and foo.h, write 'foo' here." +"e.g. for a class Foo, stored in files foo.cpp and foo.hpp, write 'foo' here." msgstr "" -#: wxcrafter/wxcrafter_gui.cpp:1533 wxcrafter/wxgui_defs.h:167 +#: wxcrafter/wxcrafter_gui.cpp:1534 wxcrafter/wxgui_defs.h:173 msgid "Virtual Folder:" msgstr "" -#: wxcrafter/wxcrafter_gui.cpp:1544 +#: wxcrafter/wxcrafter_gui.cpp:1545 msgid "Select the virtual folder within the project for the generated files" msgstr "" @@ -25216,693 +25757,693 @@ msgstr "" msgid "Create new wxCrafter Form" msgstr "" -#: wxcrafter/wxcrafter_plugin.cpp:93 wxcrafter/wxcrafter_plugin.cpp:179 +#: wxcrafter/wxcrafter_plugin.cpp:92 wxcrafter/wxcrafter_plugin.cpp:178 msgid "wxWidgets GUI Designer" msgstr "" -#: wxcrafter/wxcrafter_plugin.cpp:272 -msgid "Plugins::wxCrafter::Show the designer" +#: wxcrafter/wxcrafter_plugin.cpp:270 wxcrafter/wxcrafter_plugin.cpp:409 +msgid "Show the designer" msgstr "" -#: wxcrafter/wxcrafter_plugin.cpp:398 +#: wxcrafter/wxcrafter_plugin.cpp:397 msgid "Open wxCrafter project..." msgstr "" -#: wxcrafter/wxcrafter_plugin.cpp:399 +#: wxcrafter/wxcrafter_plugin.cpp:398 msgid "Close wxCrafter project" msgstr "" -#: wxcrafter/wxcrafter_plugin.cpp:400 +#: wxcrafter/wxcrafter_plugin.cpp:399 msgid "Save project" msgstr "" -#: wxcrafter/wxcrafter_plugin.cpp:403 +#: wxcrafter/wxcrafter_plugin.cpp:402 msgid "Import a wxSmith file" msgstr "" -#: wxcrafter/wxcrafter_plugin.cpp:404 +#: wxcrafter/wxcrafter_plugin.cpp:403 msgid "Import from XRC" msgstr "" -#: wxcrafter/wxcrafter_plugin.cpp:406 wxcrafter/wxguicraft_main_view.cpp:2615 +#: wxcrafter/wxcrafter_plugin.cpp:405 wxcrafter/wxguicraft_main_view.cpp:2635 msgid "Define custom control..." msgstr "" -#: wxcrafter/wxcrafter_plugin.cpp:407 +#: wxcrafter/wxcrafter_plugin.cpp:406 msgid "Edit custom controls..." msgstr "" -#: wxcrafter/wxcrafter_plugin.cpp:408 -msgid "Delete custom control..." -msgstr "" - -#: wxcrafter/wxcrafter_plugin.cpp:410 -msgid "Show the designer" +#: wxcrafter/wxcrafter_plugin.cpp:407 +msgid "Delete custom control..." msgstr "" -#: wxcrafter/wxcrafter_plugin.cpp:445 +#: wxcrafter/wxcrafter_plugin.cpp:444 msgid "" "wxCrafter project is modified\n" "Do you want to save your changes?" msgstr "" -#: wxcrafter/wxcrafter_plugin.cpp:567 +#: wxcrafter/wxcrafter_plugin.cpp:566 msgid "'\n" msgstr "" -#: wxcrafter/wxcrafter_plugin.cpp:567 +#: wxcrafter/wxcrafter_plugin.cpp:566 msgid "Could not find target project: '" msgstr "" -#: wxcrafter/wxcrafter_plugin.cpp:568 +#: wxcrafter/wxcrafter_plugin.cpp:567 msgid "Make sure that the virtual folder entry is valid (it must exist)\n" msgstr "" -#: wxcrafter/wxcrafter_plugin.cpp:569 +#: wxcrafter/wxcrafter_plugin.cpp:568 msgid "Virtual Folder provided was: '" msgstr "" -#: wxcrafter/wxcrafter_plugin.cpp:662 +#: wxcrafter/wxcrafter_plugin.cpp:667 msgid "wxCrafter: code generation completed successfully!" msgstr "" -#: wxcrafter/wxcrafter_plugin.cpp:679 +#: wxcrafter/wxcrafter_plugin.cpp:684 msgid "Add wxWidgets UI Form..." msgstr "" -#: wxcrafter/wxcrafter_plugin.cpp:772 +#: wxcrafter/wxcrafter_plugin.cpp:777 msgid "Could not create virtual folder 'wxcrafter'" msgstr "" -#: wxcrafter/wxcrafter_plugin.cpp:989 +#: wxcrafter/wxcrafter_plugin.cpp:999 msgid "'.\n" msgstr "" -#: wxcrafter/wxcrafter_plugin.cpp:989 +#: wxcrafter/wxcrafter_plugin.cpp:999 msgid "Error while reading file content: '" msgstr "" -#: wxcrafter/wxcrafter_plugin.cpp:990 +#: wxcrafter/wxcrafter_plugin.cpp:1000 msgid "Could not read file content" msgstr "" -#: wxcrafter/wxcrafter_plugin.cpp:1082 +#: wxcrafter/wxcrafter_plugin.cpp:1092 msgid "[wxCrafter]" msgstr "" -#: wxcrafter/wxcrafter_plugin.cpp:1199 +#: wxcrafter/wxcrafter_plugin.cpp:1209 msgid "In order for the change to take place, you need to restart codelite" msgstr "" -#: wxcrafter/wxcrafter_plugin.cpp:1263 +#: wxcrafter/wxcrafter_plugin.cpp:1273 msgid "Open with wxCrafter..." msgstr "" -#: wxcrafter/wxcrafter_plugin.cpp:1270 wxcrafter/wxcrafter_plugin.cpp:1276 +#: wxcrafter/wxcrafter_plugin.cpp:1280 wxcrafter/wxcrafter_plugin.cpp:1286 msgid "Import with wxCrafter..." msgstr "" -#: wxcrafter/wxcrafter_plugin.cpp:1317 +#: wxcrafter/wxcrafter_plugin.cpp:1327 msgid "Re-generate code for project" msgstr "" -#: wxcrafter/wxcrafter_plugin.cpp:1346 +#: wxcrafter/wxcrafter_plugin.cpp:1357 msgid "This project does not contain any wxCrafter files" msgstr "" -#: wxcrafter/wxgui_defs.h:115 +#: wxcrafter/wxgui_defs.h:121 msgid "Icon Type:" msgstr "" -#: wxcrafter/wxgui_defs.h:116 +#: wxcrafter/wxgui_defs.h:122 msgid "Bg Colour:" msgstr "" -#: wxcrafter/wxgui_defs.h:117 +#: wxcrafter/wxgui_defs.h:123 msgid "Fg Colour:" msgstr "" -#: wxcrafter/wxgui_defs.h:119 +#: wxcrafter/wxgui_defs.h:125 msgid "ID:" msgstr "" -#: wxcrafter/wxgui_defs.h:122 +#: wxcrafter/wxgui_defs.h:128 msgid "Include File:" msgstr "" -#: wxcrafter/wxgui_defs.h:123 +#: wxcrafter/wxgui_defs.h:129 msgid "Style:" msgstr "" -#: wxcrafter/wxgui_defs.h:124 +#: wxcrafter/wxgui_defs.h:130 msgid "Hidden" msgstr "" -#: wxcrafter/wxgui_defs.h:126 +#: wxcrafter/wxgui_defs.h:132 msgid "Focused" msgstr "" -#: wxcrafter/wxgui_defs.h:127 +#: wxcrafter/wxgui_defs.h:133 msgid "Tooltip:" msgstr "" -#: wxcrafter/wxgui_defs.h:129 +#: wxcrafter/wxgui_defs.h:135 msgid "Centre:" msgstr "" -#: wxcrafter/wxgui_defs.h:130 +#: wxcrafter/wxgui_defs.h:136 msgid "Shortcut:" msgstr "" -#: wxcrafter/wxgui_defs.h:131 +#: wxcrafter/wxgui_defs.h:137 msgid "Default Button" msgstr "" -#: wxcrafter/wxgui_defs.h:132 +#: wxcrafter/wxgui_defs.h:138 msgid "Wrap:" msgstr "" -#: wxcrafter/wxgui_defs.h:133 +#: wxcrafter/wxgui_defs.h:139 msgid "# Columns:" msgstr "" -#: wxcrafter/wxgui_defs.h:135 +#: wxcrafter/wxgui_defs.h:141 msgid "Col Label Vertical Align" msgstr "" -#: wxcrafter/wxgui_defs.h:136 +#: wxcrafter/wxgui_defs.h:142 msgid "Col Label Horizontal Align" msgstr "" -#: wxcrafter/wxgui_defs.h:137 +#: wxcrafter/wxgui_defs.h:143 msgid "Rows:" msgstr "" -#: wxcrafter/wxgui_defs.h:138 +#: wxcrafter/wxgui_defs.h:144 msgid "Row Label Vertical Align" msgstr "" -#: wxcrafter/wxgui_defs.h:139 +#: wxcrafter/wxgui_defs.h:145 msgid "Row Label Horizontal Align" msgstr "" -#: wxcrafter/wxgui_defs.h:140 +#: wxcrafter/wxgui_defs.h:146 msgid "Use Native Header" msgstr "" -#: wxcrafter/wxgui_defs.h:141 +#: wxcrafter/wxgui_defs.h:147 msgid "Use Native Column Labels" msgstr "" -#: wxcrafter/wxgui_defs.h:142 +#: wxcrafter/wxgui_defs.h:148 msgid "# Rows:" msgstr "" -#: wxcrafter/wxgui_defs.h:143 +#: wxcrafter/wxgui_defs.h:149 msgid "Growable columns:" msgstr "" -#: wxcrafter/wxgui_defs.h:144 +#: wxcrafter/wxgui_defs.h:150 msgid "Growable rows:" msgstr "" -#: wxcrafter/wxgui_defs.h:145 +#: wxcrafter/wxgui_defs.h:151 msgid "Horizontal gap:" msgstr "" -#: wxcrafter/wxgui_defs.h:146 +#: wxcrafter/wxgui_defs.h:152 msgid "Vertical gap:" msgstr "" -#: wxcrafter/wxgui_defs.h:147 +#: wxcrafter/wxgui_defs.h:153 msgid "Value:" msgstr "" -#: wxcrafter/wxgui_defs.h:148 +#: wxcrafter/wxgui_defs.h:154 msgid "Max Length:" msgstr "" -#: wxcrafter/wxgui_defs.h:149 +#: wxcrafter/wxgui_defs.h:155 msgid "Auto Complete Directories:" msgstr "" -#: wxcrafter/wxgui_defs.h:150 +#: wxcrafter/wxgui_defs.h:156 msgid "Auto Complete Files:" msgstr "" -#: wxcrafter/wxgui_defs.h:151 +#: wxcrafter/wxgui_defs.h:157 msgid "Orientation:" msgstr "" -#: wxcrafter/wxgui_defs.h:152 +#: wxcrafter/wxgui_defs.h:158 msgid "Minimum Size:" msgstr "" -#: wxcrafter/wxgui_defs.h:153 +#: wxcrafter/wxgui_defs.h:159 msgid "Bitmap File:" msgstr "" -#: wxcrafter/wxgui_defs.h:154 +#: wxcrafter/wxgui_defs.h:160 msgid "Bitmap File (16x16) :" msgstr "" -#: wxcrafter/wxgui_defs.h:155 +#: wxcrafter/wxgui_defs.h:161 msgid "Bitmap File (32x32) :" msgstr "" -#: wxcrafter/wxgui_defs.h:156 +#: wxcrafter/wxgui_defs.h:162 msgid "Bitmap File (64x64) :" msgstr "" -#: wxcrafter/wxgui_defs.h:157 +#: wxcrafter/wxgui_defs.h:163 msgid "Bitmap File (128x128):" msgstr "" -#: wxcrafter/wxgui_defs.h:158 +#: wxcrafter/wxgui_defs.h:164 msgid "Bitmap File (256x256):" msgstr "" -#: wxcrafter/wxgui_defs.h:159 +#: wxcrafter/wxgui_defs.h:165 msgid "Disabled-Bitmap File" msgstr "" -#: wxcrafter/wxgui_defs.h:160 +#: wxcrafter/wxgui_defs.h:166 msgid "Choices:" msgstr "" -#: wxcrafter/wxgui_defs.h:161 +#: wxcrafter/wxgui_defs.h:167 msgid "ComboBox Choices:" msgstr "" -#: wxcrafter/wxgui_defs.h:162 +#: wxcrafter/wxgui_defs.h:168 msgid "Selection:" msgstr "" -#: wxcrafter/wxgui_defs.h:164 wxformbuilder/wxfbitembasedlg.cpp:61 +#: wxcrafter/wxgui_defs.h:170 wxformbuilder/wxfbitembasedlg.cpp:61 msgid "Title:" msgstr "" -#: wxcrafter/wxgui_defs.h:165 +#: wxcrafter/wxgui_defs.h:171 msgid "Enable Window Persistency:" msgstr "" -#: wxcrafter/wxgui_defs.h:168 +#: wxcrafter/wxgui_defs.h:174 msgid "Width:" msgstr "" -#: wxcrafter/wxgui_defs.h:169 +#: wxcrafter/wxgui_defs.h:175 msgid "Height:" msgstr "" -#: wxcrafter/wxgui_defs.h:170 +#: wxcrafter/wxgui_defs.h:176 msgid "Major Dimension:" msgstr "" -#: wxcrafter/wxgui_defs.h:171 +#: wxcrafter/wxgui_defs.h:177 msgid "Min value:" msgstr "" -#: wxcrafter/wxgui_defs.h:172 +#: wxcrafter/wxgui_defs.h:178 msgid "Max value:" msgstr "" -#: wxcrafter/wxgui_defs.h:173 +#: wxcrafter/wxgui_defs.h:179 msgid "Range:" msgstr "" -#: wxcrafter/wxgui_defs.h:175 +#: wxcrafter/wxgui_defs.h:181 msgid "HTML Code:" msgstr "" -#: wxcrafter/wxgui_defs.h:176 +#: wxcrafter/wxgui_defs.h:182 msgid "Fit Content to Columns" msgstr "" -#: wxcrafter/wxgui_defs.h:177 +#: wxcrafter/wxgui_defs.h:183 msgid "Allow Cell Editing" msgstr "" -#: wxcrafter/wxgui_defs.h:178 +#: wxcrafter/wxgui_defs.h:184 msgid "Checked" msgstr "" -#: wxcrafter/wxgui_defs.h:179 +#: wxcrafter/wxgui_defs.h:185 msgid "Show Cancel Button" msgstr "" -#: wxcrafter/wxgui_defs.h:180 +#: wxcrafter/wxgui_defs.h:186 msgid "Show Search Button" msgstr "" -#: wxcrafter/wxgui_defs.h:181 +#: wxcrafter/wxgui_defs.h:187 msgid "Message:" msgstr "" -#: wxcrafter/wxgui_defs.h:182 +#: wxcrafter/wxgui_defs.h:188 msgid "Wildcard:" msgstr "" -#: wxcrafter/wxgui_defs.h:183 +#: wxcrafter/wxgui_defs.h:189 msgid "Thumbsize:" msgstr "" -#: wxcrafter/wxgui_defs.h:184 +#: wxcrafter/wxgui_defs.h:190 msgid "Page Size:" msgstr "" -#: wxcrafter/wxgui_defs.h:185 +#: wxcrafter/wxgui_defs.h:191 msgid "Normal Colour:" msgstr "" -#: wxcrafter/wxgui_defs.h:186 +#: wxcrafter/wxgui_defs.h:192 msgid "Visited Colour:" msgstr "" -#: wxcrafter/wxgui_defs.h:187 +#: wxcrafter/wxgui_defs.h:193 msgid "Hover Colour:" msgstr "" -#: wxcrafter/wxgui_defs.h:188 +#: wxcrafter/wxgui_defs.h:194 msgid "Default Path:" msgstr "" -#: wxcrafter/wxgui_defs.h:189 +#: wxcrafter/wxgui_defs.h:195 msgid "Filter Index:" msgstr "" -#: wxcrafter/wxgui_defs.h:191 +#: wxcrafter/wxgui_defs.h:197 msgid "Show Hidden Files:" msgstr "" -#: wxcrafter/wxgui_defs.h:192 +#: wxcrafter/wxgui_defs.h:198 msgid "Scroll Rate X:" msgstr "" -#: wxcrafter/wxgui_defs.h:193 +#: wxcrafter/wxgui_defs.h:199 msgid "Scroll Rate Y:" msgstr "" -#: wxcrafter/wxgui_defs.h:195 +#: wxcrafter/wxgui_defs.h:201 msgid "Expand Node" msgstr "" -#: wxcrafter/wxgui_defs.h:196 +#: wxcrafter/wxgui_defs.h:202 msgid "Null Page" msgstr "" -#: wxcrafter/wxgui_defs.h:197 +#: wxcrafter/wxgui_defs.h:203 msgid "Split Mode:" msgstr "" -#: wxcrafter/wxgui_defs.h:198 +#: wxcrafter/wxgui_defs.h:204 msgid "Sash Gravity:" msgstr "" -#: wxcrafter/wxgui_defs.h:199 +#: wxcrafter/wxgui_defs.h:205 msgid "Minimum Pane Size:" msgstr "" -#: wxcrafter/wxgui_defs.h:200 +#: wxcrafter/wxgui_defs.h:206 msgid "Sash Position:" msgstr "" -#: wxcrafter/wxgui_defs.h:201 +#: wxcrafter/wxgui_defs.h:207 msgid "Set Splitter Left:" msgstr "" -#: wxcrafter/wxgui_defs.h:202 +#: wxcrafter/wxgui_defs.h:208 msgid "Cell Position:" msgstr "" -#: wxcrafter/wxgui_defs.h:203 +#: wxcrafter/wxgui_defs.h:209 msgid "Cell Span:" msgstr "" -#: wxcrafter/wxgui_defs.h:204 +#: wxcrafter/wxgui_defs.h:210 msgid "Kind:" msgstr "" -#: wxcrafter/wxgui_defs.h:205 +#: wxcrafter/wxgui_defs.h:211 msgid "Help String:" msgstr "" -#: wxcrafter/wxgui_defs.h:206 +#: wxcrafter/wxgui_defs.h:212 msgid "Margins:" msgstr "" -#: wxcrafter/wxgui_defs.h:207 +#: wxcrafter/wxgui_defs.h:213 msgid "Bitmap Size:" msgstr "" -#: wxcrafter/wxgui_defs.h:208 +#: wxcrafter/wxgui_defs.h:214 msgid "Field Count:" msgstr "" -#: wxcrafter/wxgui_defs.h:209 +#: wxcrafter/wxgui_defs.h:215 msgid "Padding:" msgstr "" -#: wxcrafter/wxgui_defs.h:210 +#: wxcrafter/wxgui_defs.h:216 msgid "Separator Size:" msgstr "" -#: wxcrafter/wxgui_defs.h:211 +#: wxcrafter/wxgui_defs.h:217 msgid "Line Number Margin" msgstr "" -#: wxcrafter/wxgui_defs.h:212 +#: wxcrafter/wxgui_defs.h:218 msgid "Symbol Margin" msgstr "" -#: wxcrafter/wxgui_defs.h:213 +#: wxcrafter/wxgui_defs.h:219 msgid "Fold Margin" msgstr "" -#: wxcrafter/wxgui_defs.h:214 +#: wxcrafter/wxgui_defs.h:220 msgid "Separator Margin" msgstr "" -#: wxcrafter/wxgui_defs.h:215 +#: wxcrafter/wxgui_defs.h:221 msgid "Lexer" msgstr "" -#: wxcrafter/wxgui_defs.h:216 +#: wxcrafter/wxgui_defs.h:222 msgid "Wrap Text" msgstr "" -#: wxcrafter/wxgui_defs.h:217 +#: wxcrafter/wxgui_defs.h:223 msgid "Indentation Guides" msgstr "" -#: wxcrafter/wxgui_defs.h:218 +#: wxcrafter/wxgui_defs.h:224 msgid "Display EOL Markers" msgstr "" -#: wxcrafter/wxgui_defs.h:220 +#: wxcrafter/wxgui_defs.h:226 msgid "Class Decorator" msgstr "" -#: wxcrafter/wxgui_defs.h:222 +#: wxcrafter/wxgui_defs.h:228 msgid "Alignment" msgstr "" -#: wxcrafter/wxgui_defs.h:223 +#: wxcrafter/wxgui_defs.h:229 msgid "Generated Model Class Name" msgstr "" -#: wxcrafter/wxgui_defs.h:224 +#: wxcrafter/wxgui_defs.h:230 msgid "Cell Mode" msgstr "" -#: wxcrafter/wxgui_defs.h:225 wxcrafter/wxgui_defs.h:264 +#: wxcrafter/wxgui_defs.h:231 wxcrafter/wxgui_defs.h:270 msgid "Column Flags" msgstr "" -#: wxcrafter/wxgui_defs.h:226 +#: wxcrafter/wxgui_defs.h:232 msgid "Container Item Has Columns" msgstr "" -#: wxcrafter/wxgui_defs.h:227 +#: wxcrafter/wxgui_defs.h:233 msgid "Gradient Start" msgstr "" -#: wxcrafter/wxgui_defs.h:228 +#: wxcrafter/wxgui_defs.h:234 msgid "Gradient End" msgstr "" -#: wxcrafter/wxgui_defs.h:229 +#: wxcrafter/wxgui_defs.h:235 msgid "Note" msgstr "" -#: wxcrafter/wxgui_defs.h:230 +#: wxcrafter/wxgui_defs.h:236 msgid "Collapsed" msgstr "" -#: wxcrafter/wxgui_defs.h:231 +#: wxcrafter/wxgui_defs.h:237 msgid "Icon ID" msgstr "" -#: wxcrafter/wxgui_defs.h:233 +#: wxcrafter/wxgui_defs.h:239 msgid "Sash Size" msgstr "" -#: wxcrafter/wxgui_defs.h:234 +#: wxcrafter/wxgui_defs.h:240 msgid "Pane Border Size" msgstr "" -#: wxcrafter/wxgui_defs.h:235 +#: wxcrafter/wxgui_defs.h:241 msgid "Sash Colour" msgstr "" -#: wxcrafter/wxgui_defs.h:236 +#: wxcrafter/wxgui_defs.h:242 msgid "Caption Colour" msgstr "" -#: wxcrafter/wxgui_defs.h:237 +#: wxcrafter/wxgui_defs.h:243 msgid "Caption Gradient Colour" msgstr "" -#: wxcrafter/wxgui_defs.h:238 +#: wxcrafter/wxgui_defs.h:244 msgid "Inactive Caption Colour" msgstr "" -#: wxcrafter/wxgui_defs.h:239 +#: wxcrafter/wxgui_defs.h:245 msgid "Inactive Caption Gradient Colour" msgstr "" -#: wxcrafter/wxgui_defs.h:240 +#: wxcrafter/wxgui_defs.h:246 msgid "Active Caption Text Colour" msgstr "" -#: wxcrafter/wxgui_defs.h:241 +#: wxcrafter/wxgui_defs.h:247 msgid "Inactive Caption Text Colour" msgstr "" -#: wxcrafter/wxgui_defs.h:242 +#: wxcrafter/wxgui_defs.h:248 msgid "Gradient Type" msgstr "" -#: wxcrafter/wxgui_defs.h:243 +#: wxcrafter/wxgui_defs.h:249 msgid "Bitmap Mask" msgstr "" -#: wxcrafter/wxgui_defs.h:244 +#: wxcrafter/wxgui_defs.h:250 msgid "Base Class Suffix" msgstr "" -#: wxcrafter/wxgui_defs.h:245 +#: wxcrafter/wxgui_defs.h:251 msgid "Interval" msgstr "" -#: wxcrafter/wxgui_defs.h:247 +#: wxcrafter/wxgui_defs.h:253 msgid "One Shot Timer" msgstr "" -#: wxcrafter/wxgui_defs.h:248 +#: wxcrafter/wxgui_defs.h:254 msgid "Output File Name" msgstr "" -#: wxcrafter/wxgui_defs.h:249 +#: wxcrafter/wxgui_defs.h:255 msgid "Inherited Class" msgstr "" -#: wxcrafter/wxgui_defs.h:250 +#: wxcrafter/wxgui_defs.h:256 msgid "Keywords Set 1" msgstr "" -#: wxcrafter/wxgui_defs.h:251 +#: wxcrafter/wxgui_defs.h:257 msgid "Keywords Set 2" msgstr "" -#: wxcrafter/wxgui_defs.h:252 +#: wxcrafter/wxgui_defs.h:258 msgid "Keywords Set 3" msgstr "" -#: wxcrafter/wxgui_defs.h:253 +#: wxcrafter/wxgui_defs.h:259 msgid "Keywords Set 4" msgstr "" -#: wxcrafter/wxgui_defs.h:254 +#: wxcrafter/wxgui_defs.h:260 msgid "Keywords Set 5" msgstr "" -#: wxcrafter/wxgui_defs.h:256 +#: wxcrafter/wxgui_defs.h:262 msgid "Ribbon Theme" msgstr "" -#: wxcrafter/wxgui_defs.h:257 +#: wxcrafter/wxgui_defs.h:263 msgid "Minimum #Rows" msgstr "" -#: wxcrafter/wxgui_defs.h:258 +#: wxcrafter/wxgui_defs.h:264 msgid "Maximum #Rows" msgstr "" -#: wxcrafter/wxgui_defs.h:259 +#: wxcrafter/wxgui_defs.h:265 msgid "Backend" msgstr "" -#: wxcrafter/wxgui_defs.h:260 +#: wxcrafter/wxgui_defs.h:266 msgid "wxMediaCtrl Controls" msgstr "" -#: wxcrafter/wxgui_defs.h:263 +#: wxcrafter/wxgui_defs.h:269 msgid "wxFrame Type" msgstr "" -#: wxcrafter/wxgui_defs.h:265 +#: wxcrafter/wxgui_defs.h:271 msgid "Show Effect" msgstr "" -#: wxcrafter/wxgui_defs.h:266 +#: wxcrafter/wxgui_defs.h:272 msgid "Property Editor Control" msgstr "" -#: wxcrafter/wxgui_defs.h:267 +#: wxcrafter/wxgui_defs.h:273 msgid "Construct the Dropdown Menu:" msgstr "" -#: wxcrafter/wxgui_defs.h:268 +#: wxcrafter/wxgui_defs.h:274 msgid "Text Hint" msgstr "" -#: wxcrafter/wxgui_defs.h:270 +#: wxcrafter/wxgui_defs.h:276 msgid "Load and play" msgstr "" -#: wxcrafter/wxgui_defs.h:271 +#: wxcrafter/wxgui_defs.h:277 msgid "Proportion:" msgstr "" -#: wxcrafter/wxgui_defs.h:272 +#: wxcrafter/wxgui_defs.h:278 msgid "Enable Spell Checking" msgstr "" -#: wxcrafter/wxgui_helpers.cpp:221 +#: wxcrafter/wxgui_defs.h:279 +msgid "Keep as a class member" +msgstr "" + +#: wxcrafter/wxgui_helpers.cpp:223 msgid "Invalid XRC! could not save DesignerPreview.xrc" msgstr "" -#: wxcrafter/wxguicraft_main_view.cpp:181 +#: wxcrafter/wxguicraft_main_view.cpp:182 msgid "Show Preview" msgstr "" -#: wxcrafter/wxguicraft_main_view.cpp:181 +#: wxcrafter/wxguicraft_main_view.cpp:182 msgid "Show Preview..." msgstr "" -#: wxcrafter/wxguicraft_main_view.cpp:182 +#: wxcrafter/wxguicraft_main_view.cpp:183 msgid "Close Preview" msgstr "" -#: wxcrafter/wxguicraft_main_view.cpp:182 +#: wxcrafter/wxguicraft_main_view.cpp:183 msgid "Close Preview..." msgstr "" -#: wxcrafter/wxguicraft_main_view.cpp:185 +#: wxcrafter/wxguicraft_main_view.cpp:186 msgid "Delete Item" msgstr "" -#: wxcrafter/wxguicraft_main_view.cpp:187 +#: wxcrafter/wxguicraft_main_view.cpp:188 msgid "Align Left" msgstr "" @@ -25946,40 +26487,40 @@ msgstr "" msgid "Top Border" msgstr "" -#: wxcrafter/wxguicraft_main_view.cpp:207 +#: wxcrafter/wxguicraft_main_view.cpp:206 msgid "Right Border" msgstr "" -#: wxcrafter/wxguicraft_main_view.cpp:209 +#: wxcrafter/wxguicraft_main_view.cpp:208 msgid "Bottom Border" msgstr "" +#: wxcrafter/wxguicraft_main_view.cpp:212 #: wxcrafter/wxguicraft_main_view.cpp:213 -#: wxcrafter/wxguicraft_main_view.cpp:214 msgid "Set Sizer Proportion to 1" msgstr "" -#: wxcrafter/wxguicraft_main_view.cpp:215 +#: wxcrafter/wxguicraft_main_view.cpp:214 msgid "Expand Item" msgstr "" -#: wxcrafter/wxguicraft_main_view.cpp:220 +#: wxcrafter/wxguicraft_main_view.cpp:219 msgid "Move Left" msgstr "" -#: wxcrafter/wxguicraft_main_view.cpp:221 +#: wxcrafter/wxguicraft_main_view.cpp:220 msgid "Move Left into parent sizer" msgstr "" -#: wxcrafter/wxguicraft_main_view.cpp:222 +#: wxcrafter/wxguicraft_main_view.cpp:221 msgid "Move Right" msgstr "" -#: wxcrafter/wxguicraft_main_view.cpp:223 +#: wxcrafter/wxguicraft_main_view.cpp:222 msgid "Move Right into a sibling sizer" msgstr "" -#: wxcrafter/wxguicraft_main_view.cpp:1012 +#: wxcrafter/wxguicraft_main_view.cpp:1011 msgid "my_gui.wxcp" msgstr "" @@ -26001,109 +26542,105 @@ msgstr "" msgid "Open wxCrafter project" msgstr "" -#: wxcrafter/wxguicraft_main_view.cpp:1863 -#: wxcrafter/wxguicraft_main_view.cpp:1942 +#: wxcrafter/wxguicraft_main_view.cpp:1871 +#: wxcrafter/wxguicraft_main_view.cpp:1950 msgid "Can't paste it here" msgstr "" -#: wxcrafter/wxguicraft_main_view.cpp:1883 -#: wxcrafter/wxguicraft_main_view.cpp:1963 +#: wxcrafter/wxguicraft_main_view.cpp:1891 +#: wxcrafter/wxguicraft_main_view.cpp:1971 msgid "This name is already in use. Try again?" msgstr "" -#: wxcrafter/wxguicraft_main_view.cpp:2016 -#: wxcrafter/wxguicraft_main_view.cpp:2636 +#: wxcrafter/wxguicraft_main_view.cpp:2024 +#: wxcrafter/wxguicraft_main_view.cpp:2656 msgid "Only one wxAui Manager is allowed" msgstr "" -#: wxcrafter/wxguicraft_main_view.cpp:2026 -#: wxcrafter/wxguicraft_main_view.cpp:2662 +#: wxcrafter/wxguicraft_main_view.cpp:2034 +#: wxcrafter/wxguicraft_main_view.cpp:2682 msgid "" "Can't insert this item here\n" "There is already a main sizer" msgstr "" -#: wxcrafter/wxguicraft_main_view.cpp:2031 +#: wxcrafter/wxguicraft_main_view.cpp:2039 msgid "" "Can't insert this item here\n" "This item is managed by wxAUI" msgstr "" -#: wxcrafter/wxguicraft_main_view.cpp:2331 +#: wxcrafter/wxguicraft_main_view.cpp:2348 msgid "" "Current file has been modified\n" "Close anyway?" msgstr "" -#: wxcrafter/wxguicraft_main_view.cpp:2576 +#: wxcrafter/wxguicraft_main_view.cpp:2596 msgid "Generate C++ code" msgstr "" -#: wxcrafter/wxguicraft_main_view.cpp:2578 +#: wxcrafter/wxguicraft_main_view.cpp:2598 msgid "Generate XRC" msgstr "" -#: wxcrafter/wxguicraft_main_view.cpp:2603 +#: wxcrafter/wxguicraft_main_view.cpp:2623 msgid "Choose a control" msgstr "" -#: wxcrafter/wxguicraft_main_view.cpp:2642 +#: wxcrafter/wxguicraft_main_view.cpp:2662 msgid "wxAui Manager can not be placed onto a control with a main sizer" msgstr "" -#: wxcrafter/wxguicraft_main_view.cpp:2650 +#: wxcrafter/wxguicraft_main_view.cpp:2670 msgid "wxRibbonPanel can only have one direct child" msgstr "" -#: wxcrafter/wxguicraft_main_view.cpp:2667 +#: wxcrafter/wxguicraft_main_view.cpp:2687 msgid "A Main Sizer can not be placed into a wxAui managed window" msgstr "" -#: wxcrafter/wxguicraft_main_view.cpp:2678 +#: wxcrafter/wxguicraft_main_view.cpp:2698 msgid "Can't insert this item here" msgstr "" -#: wxcrafter/wxguicraft_main_view.cpp:2743 -msgid "is not available in the free edition of wxCrafter" -msgstr "" - -#: wxcrafter/wxguicraft_main_view.cpp:2840 +#: wxcrafter/wxguicraft_main_view.cpp:2832 msgid "Rename '" msgstr "" -#: wxcrafter/wxguicraft_main_view.cpp:2841 +#: wxcrafter/wxguicraft_main_view.cpp:2833 msgid "Enter the new name:" msgstr "" -#: wxcrafter/wxguicraft_main_view.cpp:3055 +#: wxcrafter/wxguicraft_main_view.cpp:3050 msgid "" "You need to enable at least one of 'Generate C++ code' and 'Generate XRC'" msgstr "" -#: wxcrafter/wxguicraft_main_view.cpp:3066 +#: wxcrafter/wxguicraft_main_view.cpp:3062 msgid "" "Please set the base classes generated files output directory\n" "This can be done by selecting the root item of the tree and edit the " "properties" msgstr "" -#: wxcrafter/wxguicraft_main_view.cpp:3076 +#: wxcrafter/wxguicraft_main_view.cpp:3073 msgid "You must save the project before generating code" msgstr "" -#: wxcrafter/wxguicraft_main_view.cpp:3256 +#: wxcrafter/wxguicraft_main_view.cpp:3251 msgid "Select wxCrafter files:" msgstr "" -#: wxcrafter/wxguicraft_main_view.cpp:3268 +#: wxcrafter/wxguicraft_main_view.cpp:3265 msgid "Please close the current wxCrafter project before batch generating code" msgstr "" -#: wxcrafter/wxguicraft_main_view.cpp:3275 +#: wxcrafter/wxguicraft_main_view.cpp:3272 msgid "Generating Code..." msgstr "" -#: wxcrafter/wxguicraft_main_view.cpp:3297 +#: wxcrafter/wxguicraft_main_view.cpp:3294 msgid "Generated Code For the following projects:\n" msgstr "" diff --git a/translations/ja_JP/LC_MESSAGES/codelite.mo b/translations/ja_JP/LC_MESSAGES/codelite.mo index 77cda521a03376e082fed07fa4187acb5d598761..6d7180357e564ec8413c123de33464c3362b42a4 100644 GIT binary patch delta 132454 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�-Xg~28iO+HTl(1;JJ{S&^ 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
l{?s)HiX8dL{+fF*SQ4`rY| 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 delta 126510 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\n" "Language: ja_JP\n" @@ -40,16 +40,17 @@ msgstr "自動的にソースファイルの変更を保存" #: AutoSave/autosave.cpp:48 CMakePlugin/CMakePlugin.cpp:295 #: CallGraph/callgraph.cpp:156 CallGraph/uisettings.h:99 -#: CodeDesigner/codedesigner.cpp:138 Copyright/copyright.cpp:111 -#: Docker/clDockerWorkspaceView.cpp:82 Docker/clDockerWorkspaceView.cpp:116 +#: CodeDesigner/codedesigner.cpp:138 Copyright/copyright.cpp:98 +#: Copyright/copyright.cpp:119 Docker/clDockerWorkspaceView.cpp:82 +#: Docker/clDockerWorkspaceView.cpp:116 #: EditorConfigPlugin/editorconfigplugin.cpp:56 HelpPlugin/helpplugin.cpp:54 #: LiteEditor/fileview.cpp:2561 Plugin/clFileSystemWorkspaceView.cpp:123 #: QmakePlugin/qmakeplugin.cpp:121 SFTP/sftp.cpp:175 #: SmartCompletion/smartcompletion.cpp:57 SnipWiz/snipwiz.cpp:164 #: SpellChecker/spellcheck.cpp:186 SpellChecker/spellcheck.cpp:244 #: Tweaks/tweaks.cpp:109 WebTools/webtools.cpp:123 -#: abbreviation/abbreviation.cpp:104 codelite_vim/codelite_vim.cpp:55 -#: wxcrafter/gui.cpp:141 wxcrafter/wxcrafter_plugin.cpp:415 +#: abbreviation/abbreviation.cpp:106 codelite_vim/codelite_vim.cpp:55 +#: wxcrafter/gui.cpp:141 wxcrafter/wxcrafter_plugin.cpp:414 #: wxformbuilder/wxformbuilder.cpp:101 msgid "Settings..." msgstr "設定..." @@ -117,7 +118,7 @@ msgstr "実行に失敗しました:\n" #: CMakePlugin/CMakePlugin.cpp:616 Docker/UI.cpp:205 #: LiteEditor/editorsettingsdockingwindowsbase.cpp:299 #: LiteEditor/fileview.cpp:2472 LiteEditor/fileview.cpp:2512 -#: LiteEditor/project_settings_base_dlg.cpp:178 +#: LiteEditor/frame.cpp:952 LiteEditor/project_settings_base_dlg.cpp:178 #: Plugin/clFileSystemWorkspaceDlgBase.cpp:426 Plugin/clStrings.h:5 #: Plugin/editor_config.cpp:448 Plugin/editor_config.cpp:486 #: QmakePlugin/qmakeplugin.cpp:552 Remoty/RemotyWorkspaceView.cpp:92 @@ -182,7 +183,7 @@ msgid "Select Topic:" msgstr "トピックを選択:" #: CMakePlugin/CMakePluginUi.cpp:139 LiteEditor/editorframe.cpp:66 -#: LiteEditor/frame.cpp:1380 Runtime/rc/menu.xrc:802 +#: LiteEditor/frame.cpp:1531 Runtime/rc/menu.xrc:802 #: wxcrafter/wxcrafter.cpp:1018 msgid "Reload" msgstr "再読み込み" @@ -215,10 +216,11 @@ msgstr "呼び出し図を表示" msgid "Show call graph for selected/active project" msgstr "選択中/アクティブなプロジェクトの呼び出し図を表示" -#: CallGraph/callgraph.cpp:158 DatabaseExplorer/databaseexplorer.cpp:160 -#: Runtime/templates/projects/executable-wxcrafter-frame/wxcrafter.cpp:42 +#: CallGraph/callgraph.cpp:158 DatabaseExplorer/databaseexplorer.cpp:163 +#: LiteEditor/frame.cpp:1044 +#: Runtime/templates/projects/executable-wxcrafter-frame/wxcrafter.cpp:44 #: codelite-cli/codelite-client/wxcrafter.cpp:115 -#: codelite_terminal/wxcrafter.cpp:72 wxcrafter/wxcrafter_plugin.cpp:413 +#: codelite_terminal/wxcrafter.cpp:72 wxcrafter/wxcrafter_plugin.cpp:412 msgid "About..." msgstr "情報..." @@ -249,7 +251,7 @@ msgstr "v1.1.1" msgid "2012 - 2015 (C) Tomas Bata University, Zlin, Czech Republic" msgstr "2012 - 2015 (C) Tomas Bata University, Zlin, Czech Republic" -#: CallGraph/callgraph.cpp:225 DatabaseExplorer/databaseexplorer.cpp:218 +#: CallGraph/callgraph.cpp:225 DatabaseExplorer/databaseexplorer.cpp:221 msgid "http://www.fai.utb.cz" msgstr "http://www.fai.utb.cz" @@ -412,7 +414,7 @@ msgstr "ノードの閾値 (0 - 100) [%]:" msgid "Edge threshold (0 - 100) [%]:" msgstr "エッジの閾値 (0 - 100) [%]:" -#: CallGraph/uisettings.cpp:120 LanguageServer/UI.cpp:188 +#: CallGraph/uisettings.cpp:120 LanguageServer/UI.cpp:180 #: LiteEditor/implementparentvirtualfunctionsbase.cpp:89 #: codelitephp/php-plugin/new_class.cpp:119 msgid "Options:" @@ -463,7 +465,7 @@ msgstr "OK (&O)" #: cppchecker/cppchecksettingsdlgbase.cpp:337 #: cppchecker/cppchecksettingsdlgbase.cpp:490 #: sdk/wxflatnotebook/src/wxFlatNotebook/fnb_customize_dlg.cpp:42 -#: wxcrafter/gui.cpp:929 wxcrafter/gui.cpp:1032 wxcrafter/wxcrafter.cpp:1349 +#: wxcrafter/gui.cpp:836 wxcrafter/gui.cpp:937 wxcrafter/wxcrafter.cpp:1349 #: wxcrafter/wxcrafter.cpp:1512 wxcrafter/wxcrafter.cpp:1737 msgid "&Cancel" msgstr "キャンセル (&C)" @@ -510,11 +512,11 @@ msgstr "新しいクラスダイヤグラム..." #: CodeDesigner/codedesigneritemdlg.cpp:41 #: CodeDesigner/codedesigneritemdlg.cpp:48 #: CodeDesigner/codedesigneritemdlg.cpp:55 CodeLite/clprogressdlgbase.h:65 -#: Copyright/copyright.cpp:138 Copyright/copyright.cpp:146 -#: Copyright/copyright.cpp:152 Copyright/copyright.cpp:163 -#: Copyright/copyright.cpp:197 Copyright/copyright.cpp:246 -#: Copyright/copyright.cpp:296 Copyright/copyright.cpp:352 -#: Copyright/copyright.cpp:359 Copyright/copyright.cpp:370 +#: Copyright/copyright.cpp:146 Copyright/copyright.cpp:154 +#: Copyright/copyright.cpp:160 Copyright/copyright.cpp:171 +#: Copyright/copyright.cpp:205 Copyright/copyright.cpp:262 +#: Copyright/copyright.cpp:320 Copyright/copyright.cpp:376 +#: Copyright/copyright.cpp:383 Copyright/copyright.cpp:394 #: DatabaseExplorer/ClassGenerateDialog.cpp:128 #: DatabaseExplorer/ClassGenerateDialog.cpp:133 #: ExternalTools/externaltooldlg.cpp:72 Gizmos/gizmos.cpp:311 @@ -525,17 +527,17 @@ msgstr "新しいクラスダイヤグラム..." #: Gizmos/newwxprojectdlg.cpp:88 LanguageServer/LanguageServerPage.cpp:115 #: LiteEditor/CompilerMainPage.cpp:220 LiteEditor/CompilerMainPage.cpp:242 #: LiteEditor/CompilerMainPage.cpp:252 LiteEditor/CompilerMainPage.cpp:867 -#: LiteEditor/acceltabledlg.cpp:157 LiteEditor/cl_editor.cpp:316 +#: LiteEditor/acceltabledlg.cpp:155 LiteEditor/cl_editor.cpp:316 #: LiteEditor/cl_editor.cpp:321 LiteEditor/cl_editor.cpp:2447 #: LiteEditor/cl_editor.cpp:2480 LiteEditor/configuration_manager_dlg.cpp:168 -#: LiteEditor/context_cpp.cpp:1635 +#: LiteEditor/context_cpp.cpp:1654 #: LiteEditor/debugger_predefined_types_page.cpp:85 #: LiteEditor/edit_workspace_conf_dlg.cpp:124 LiteEditor/fileview.cpp:969 #: LiteEditor/fileview.cpp:1806 LiteEditor/findresultstab.cpp:118 -#: LiteEditor/frame.cpp:2011 LiteEditor/manager.cpp:1151 +#: LiteEditor/frame.cpp:2165 LiteEditor/manager.cpp:1151 #: LiteEditor/manager.cpp:1932 LiteEditor/manager.cpp:1993 -#: LiteEditor/manager.cpp:2480 LiteEditor/manager.cpp:2504 -#: LiteEditor/manager.cpp:2536 LiteEditor/movefuncimpldlg.cpp:77 +#: LiteEditor/manager.cpp:2481 LiteEditor/manager.cpp:2505 +#: LiteEditor/manager.cpp:2537 LiteEditor/movefuncimpldlg.cpp:77 #: LiteEditor/new_configuration_dlg.cpp:132 #: LiteEditor/ps_custom_build_page.cpp:90 LiteEditor/reconcileproject.cpp:132 #: LiteEditor/reconcileproject.cpp:786 LiteEditor/renamesymboldlg.cpp:91 @@ -549,10 +551,10 @@ msgstr "新しいクラスダイヤグラム..." #: Plugin/workspace.cpp:249 Plugin/workspace.cpp:480 #: QmakePlugin/qmakeplugin.cpp:386 QmakePlugin/qmakeplugin.cpp:442 #: QmakePlugin/qmakeplugin.cpp:454 QmakePlugin/qmakesettingsdlg.cpp:119 -#: SnipWiz/editsnippetsdlg.cpp:184 SnipWiz/swGlobals.h:50 +#: SnipWiz/editsnippetsdlg.cpp:182 SnipWiz/swGlobals.h:50 #: UnitTestCPP/testclassdlg.cpp:113 UnitTestCPP/testclassdlg.cpp:138 -#: UnitTestCPP/unittestpp.cpp:200 UnitTestCPP/unittestpp.cpp:268 -#: UnitTestCPP/unittestpp.cpp:322 UnitTestCPP/unittestpp.cpp:389 +#: UnitTestCPP/unittestpp.cpp:210 UnitTestCPP/unittestpp.cpp:278 +#: UnitTestCPP/unittestpp.cpp:332 UnitTestCPP/unittestpp.cpp:400 #: WebTools/NodeDebugger.cpp:268 abbreviation/abbreviationssettingsdlg.cpp:95 #: codelitephp/php-plugin/php_workspace_view.cpp:524 #: wxcrafter/import_from_wxFB.cpp:35 wxcrafter/import_from_wxFB.cpp:53 @@ -576,8 +578,8 @@ msgid "" "Please set CodeDesigner path from Plugins -> CodeDesigner -> Settings..." msgstr "" "コードデザイナーの起動に失敗しました。パスが指定されていません\n" -"コードデザイナーへのパスを [プラグイン] -> [コードデザイナー] -> [設定] から" -"設定してください..." +"コードデザイナーへのパスを [プラグイン] -> [コードデザイナー] -> [設定...] か" +"ら設定してください" #: CodeDesigner/codedesigner.cpp:361 msgid "New Class Diagram" @@ -642,8 +644,8 @@ msgid "C" msgstr "C 言語" #: CodeDesigner/codedesigneritembasedlg.cpp:47 -#: CodeFormatter/codeformatterdlgbase.cpp:150 Plugin/workspace.cpp:58 -#: wxcrafter/gui.cpp:431 +#: CodeFormatter/codeformatterdlgbase.cpp:150 LiteEditor/frame.cpp:968 +#: Plugin/workspace.cpp:58 wxcrafter/gui.cpp:371 msgid "C++" msgstr "C++" @@ -674,7 +676,7 @@ msgstr "プロジェクトツリーのフォルダー:" #: Copyright/copyrights_options_base_dlg.cpp:60 DatabaseExplorer/GUI.cpp:1087 #: ExternalTools/NewToolBase.cpp:79 ExternalTools/NewToolBase.cpp:98 #: Gizmos/newclassbasedlg.cpp:139 Gizmos/newclassbasedlg.cpp:160 -#: LanguageServer/UI.cpp:358 LanguageServer/UI.cpp:382 +#: LanguageServer/UI.cpp:350 LanguageServer/UI.cpp:374 #: LiteEditor/importfilesdialog_new.cpp:48 #: LiteEditor/newworkspacebasedlg.cpp:66 #: LiteEditor/project_settings_base_dlg.cpp:560 @@ -693,7 +695,7 @@ msgstr "プロジェクトツリーのフォルダー:" #: Subversion2/subversion2_ui.cpp:526 UnitTestCPP/testclassbasedlg.cpp:56 #: codelitephp/php-plugin/new_class.cpp:97 #: codelitephp/php-plugin/new_class.cpp:114 -#: codelitephp/php-plugin/php_ui.cpp:90 wxcrafter/wxcrafter_gui.cpp:1481 +#: codelitephp/php-plugin/php_ui.cpp:90 wxcrafter/wxcrafter_gui.cpp:1482 #: wxformbuilder/formbuildsettingsbasedlg.cpp:60 #: wxformbuilder/wxfbitembasedlg.cpp:80 msgid "..." @@ -703,7 +705,7 @@ msgstr "..." #: DatabaseExplorer/GUI.cpp:984 DatabaseExplorer/GUI.cpp:1227 #: DatabaseExplorer/GUI.cpp:1478 LiteEditor/tags_options_base_dlg.cpp:165 #: Plugin/VirtualDirectorySelectorBase.cpp:55 -#: Runtime/templates/projects/executable-wxcrafter-dialog/wxcrafter.cpp:33 +#: Runtime/templates/projects/executable-wxcrafter-dialog/wxcrafter.cpp:39 #: Subversion2/subversion2_ui.cpp:874 #: codelitephp/php-plugin/XDebugManager.cpp:736 msgid "OK" @@ -718,10 +720,10 @@ msgstr "OK" #: LiteEditor/options_base_dlg2.cpp:48 LiteEditor/tags_options_base_dlg.cpp:170 #: MacBundler/macbundler.cpp:142 Plugin/EnvironmentVariablesDlgBase.cpp:125 #: Plugin/VirtualDirectorySelectorBase.cpp:61 Plugin/globals.h:447 -#: Runtime/templates/projects/executable-wxcrafter-dialog/wxcrafter.cpp:37 +#: Runtime/templates/projects/executable-wxcrafter-dialog/wxcrafter.cpp:45 #: SpellChecker/wxcrafter.cpp:244 Subversion2/subversion2_ui.cpp:256 #: Subversion2/subversion2_ui.cpp:338 Subversion2/subversion2_ui.cpp:879 -#: Subversion2/wxcrafter.cpp:210 codelite_terminal/wxcrafter.cpp:170 +#: Subversion2/wxcrafter.cpp:210 codelite_terminal/wxcrafter.cpp:162 #: codelitephp/php-plugin/php_ui.cpp:227 git/gitui.cpp:360 #: wxcrafter/wxcrafter.cpp:150 wxcrafter/wxcrafter.cpp:747 #: wxformbuilder/formbuildsettingsbasedlg.cpp:88 @@ -772,13 +774,13 @@ msgstr "通信ポート:" #: Subversion2/subversion2_ui.cpp:973 Subversion2/subversion2_ui.cpp:1060 #: Subversion2/wxcrafter.cpp:205 Subversion2/wxcrafter.cpp:315 #: Tweaks/wxcrafter.cpp:117 UnitTestCPP/newunittestbasedlg.cpp:94 -#: codelite_terminal/wxcrafter.cpp:174 codelitephp/php-plugin/new_class.cpp:158 +#: codelite_terminal/wxcrafter.cpp:166 codelitephp/php-plugin/new_class.cpp:158 #: codelitephp/php-plugin/php_ui.cpp:222 codelitephp/php-plugin/php_ui.cpp:554 #: codelitephp/php-plugin/php_ui.cpp:933 #: cppchecker/cppchecksettingsdlgbase.cpp:332 #: cppchecker/cppchecksettingsdlgbase.cpp:485 git/gitui.cpp:355 #: sdk/wxflatnotebook/src/wxFlatNotebook/fnb_customize_dlg.cpp:39 -#: wxcrafter/gui.cpp:924 wxcrafter/gui.cpp:1027 wxcrafter/wxcrafter.cpp:145 +#: wxcrafter/gui.cpp:831 wxcrafter/gui.cpp:932 wxcrafter/wxcrafter.cpp:145 #: wxcrafter/wxcrafter.cpp:1251 wxcrafter/wxcrafter.cpp:1344 #: wxcrafter/wxcrafter.cpp:1507 wxcrafter/wxcrafter.cpp:1731 #: wxformbuilder/formbuildsettingsbasedlg.cpp:84 @@ -921,67 +923,68 @@ msgstr "%d 分 %d 秒 " msgid "%s lines\n" msgstr "%s 行\n" -#: CodeFormatter/codeformatter.cpp:108 +#: CodeFormatter/codeformatter.cpp:110 msgid "Source Code Formatter (Supports C/C++/Obj-C/JavaScript/PHP files)" msgstr "" "ソースコードの整形 (C/C++/Obj-C/JavaScript/PHP ファイルをサポートしています)" -#: CodeFormatter/codeformatter.cpp:118 CodeFormatter/codeformatter.cpp:119 -#: CodeFormatter/codeformatter.cpp:165 CodeFormatter/codeformatter.cpp:500 -#: CodeFormatter/codeformatter.cpp:689 CodeFormatter/codeformatter.cpp:700 -#: CodeFormatter/codeformatter.cpp:846 CodeFormatter/codeformatter.cpp:850 -#: CodeFormatter/codeformatterdlg.cpp:479 +#: CodeFormatter/codeformatter.cpp:120 CodeFormatter/codeformatter.cpp:121 +#: CodeFormatter/codeformatter.cpp:133 CodeFormatter/codeformatter.cpp:171 +#: CodeFormatter/codeformatter.cpp:507 CodeFormatter/codeformatter.cpp:696 +#: CodeFormatter/codeformatter.cpp:707 CodeFormatter/codeformatter.cpp:853 +#: CodeFormatter/codeformatter.cpp:857 CodeFormatter/codeformatterdlg.cpp:479 msgid "Source Code Formatter" msgstr "ソースコードの整形" -#: CodeFormatter/codeformatter.cpp:145 +#: CodeFormatter/codeformatter.cpp:134 CodeFormatter/codeformatter.cpp:165 +msgid "Format Current Source" +msgstr "現在のソースを整形" + +#: CodeFormatter/codeformatter.cpp:134 CodeFormatter/codeformatter.cpp:169 +#: PHPLint/phplint.cpp:68 PHPRefactoring/phprefactoring.cpp:62 +#: Subversion2/subversion2.cpp:216 +msgid "Options..." +msgstr "オプション..." + +#: CodeFormatter/codeformatter.cpp:151 msgid "Format Source" msgstr "ソースを整形" -#: CodeFormatter/codeformatter.cpp:145 +#: CodeFormatter/codeformatter.cpp:151 msgid "Format Source Code" msgstr "ソースコードを整形" -#: CodeFormatter/codeformatter.cpp:146 +#: CodeFormatter/codeformatter.cpp:152 msgid "Format Options" msgstr "整形のオプション" -#: CodeFormatter/codeformatter.cpp:147 +#: CodeFormatter/codeformatter.cpp:153 msgid "Source Code Formatter Options..." msgstr "ソースコード整形のオプション..." -#: CodeFormatter/codeformatter.cpp:159 -msgid "Format Current Source" -msgstr "現在のソースを整形" - -#: CodeFormatter/codeformatter.cpp:163 PHPLint/phplint.cpp:68 -#: PHPRefactoring/phprefactoring.cpp:62 -msgid "Options..." -msgstr "オプション..." - -#: CodeFormatter/codeformatter.cpp:311 +#: CodeFormatter/codeformatter.cpp:318 msgid "Formatting: " msgstr "整形しています: " -#: CodeFormatter/codeformatter.cpp:342 PHPRefactoring/phprefactoring.cpp:279 +#: CodeFormatter/codeformatter.cpp:349 PHPRefactoring/phprefactoring.cpp:279 #: cppchecker/cppcheckreportpage.cpp:182 cscope/cscopedbbuilderthread.cpp:60 msgid "Done" msgstr "完了" -#: CodeFormatter/codeformatter.cpp:500 CodeFormatter/codeformatterdlg.cpp:479 +#: CodeFormatter/codeformatter.cpp:507 CodeFormatter/codeformatterdlg.cpp:479 #: LiteEditor/replaceinfilespanel.cpp:181 msgid "Failed to save file:\n" msgstr "ファイルの保存に失敗しました:\n" -#: CodeFormatter/codeformatter.cpp:787 +#: CodeFormatter/codeformatter.cpp:794 msgid "Code Formatter: scanning for files..." msgstr "コードの整形: ファイルをスキャンしています..." -#: CodeFormatter/codeformatter.cpp:837 +#: CodeFormatter/codeformatter.cpp:844 msgid "Project contains no supported files" msgstr "プロジェクトにはサポートされているファイルがありません" -#: CodeFormatter/codeformatter.cpp:845 +#: CodeFormatter/codeformatter.cpp:852 msgid "" " files\n" "Continue?" @@ -989,11 +992,11 @@ msgstr "" " 個のファイルを整形しようとしています\n" "続行しますか？" -#: CodeFormatter/codeformatter.cpp:845 +#: CodeFormatter/codeformatter.cpp:852 msgid "You are about to beautify " msgstr "全部で " -#: CodeFormatter/codeformatter.cpp:850 +#: CodeFormatter/codeformatter.cpp:857 msgid "Formatting files..." msgstr "ファイルを整形しています..." @@ -2174,36 +2177,36 @@ msgstr "比較するファイルを選択" msgid "Select file:" msgstr "ファイルを選択:" -#: CodeLiteDiff/NewFileComparison.cpp:40 CodeLiteDiff/codelitediff.cpp:125 -#: CodeLiteDiff/codelitediff.cpp:134 LiteEditor/mainbook.cpp:493 +#: CodeLiteDiff/NewFileComparison.cpp:40 CodeLiteDiff/codelitediff.cpp:129 +#: CodeLiteDiff/codelitediff.cpp:138 LiteEditor/mainbook.cpp:493 msgid "Untitled" msgstr "無題" -#: CodeLiteDiff/codelitediff.cpp:53 CodeLiteDiff/codelitediff.cpp:63 +#: CodeLiteDiff/codelitediff.cpp:57 CodeLiteDiff/codelitediff.cpp:67 msgid "CodeLite Diff Plugin" msgstr "CodeLite 比較プラグイン" -#: CodeLiteDiff/codelitediff.cpp:83 +#: CodeLiteDiff/codelitediff.cpp:75 CodeLiteDiff/codelitediff.cpp:89 +msgid "Diff Tool" +msgstr "比較ツール" + +#: CodeLiteDiff/codelitediff.cpp:76 CodeLiteDiff/codelitediff.cpp:87 msgid "New File Comparison" msgstr "新しいファイル比較" -#: CodeLiteDiff/codelitediff.cpp:83 -msgid "Start new diff" -msgstr "新しい比較を開始" - -#: CodeLiteDiff/codelitediff.cpp:84 +#: CodeLiteDiff/codelitediff.cpp:77 CodeLiteDiff/codelitediff.cpp:88 msgid "New Folder Comparison" msgstr "新しいフォルダー比較" -#: CodeLiteDiff/codelitediff.cpp:84 +#: CodeLiteDiff/codelitediff.cpp:87 +msgid "Start new diff" +msgstr "新しい比較を開始" + +#: CodeLiteDiff/codelitediff.cpp:88 msgid "Start new folders diff" msgstr "新しいフォルダーの比較を開始" -#: CodeLiteDiff/codelitediff.cpp:85 -msgid "Diff Tool" -msgstr "比較ツール" - -#: CodeLiteDiff/codelitediff.cpp:111 +#: CodeLiteDiff/codelitediff.cpp:115 msgid "Compare with..." msgstr "比較対象を選択..." @@ -2234,7 +2237,7 @@ msgstr "ビルドキュー" msgid "Compiling" msgstr "コンパイルしています" -#: Copyright/copyright.cpp:70 +#: Copyright/copyright.cpp:73 msgid "" "Copyright Plugin - a small plugin that allows you to place copyright block " "on top of your source files" @@ -2242,76 +2245,81 @@ msgstr "" "著作権ブロックプラグイン - ソースファイルの先頭に著作権文のブロックを追記す" "る、小さなプラグインです" -#: Copyright/copyright.cpp:82 +#: Copyright/copyright.cpp:85 msgid "Copyright Plugin - Place copyright block on top of your source files" msgstr "" "著作権ブロックプラグイン - ソースファイルの先頭に著作権文のブロックを追記しま" "す" -#: Copyright/copyright.cpp:102 +#: Copyright/copyright.cpp:95 +msgid "Copyright" +msgstr "著作権ブロック" + +#: Copyright/copyright.cpp:96 Copyright/copyright.cpp:110 msgid "Insert Copyright Block" msgstr "著作権ブロックを挿入" -#: Copyright/copyright.cpp:106 Copyright/copyright.cpp:107 +#: Copyright/copyright.cpp:97 Copyright/copyright.cpp:114 +#: Copyright/copyright.cpp:115 msgid "Batch Insert of Copyright Block" msgstr "著作権ブロックを一括挿入" -#: Copyright/copyright.cpp:114 +#: Copyright/copyright.cpp:122 msgid "Copyrights" msgstr "著作権ブロック" -#: Copyright/copyright.cpp:137 Copyright/copyright.cpp:351 +#: Copyright/copyright.cpp:145 Copyright/copyright.cpp:375 #, c-format msgid "Template file name '%s', does not exist!" msgstr "'%s' という名前のテンプレートファイルが存在しません！" -#: Copyright/copyright.cpp:145 Copyright/copyright.cpp:358 +#: Copyright/copyright.cpp:153 Copyright/copyright.cpp:382 #, c-format msgid "Failed to read template file '%s'" msgstr "テンプレートファイル '%s' の読み取りに失敗しました" -#: Copyright/copyright.cpp:152 SnipWiz/swGlobals.h:49 +#: Copyright/copyright.cpp:160 SnipWiz/swGlobals.h:49 msgid "There is no active editor\n" msgstr "使用中のエディターがありません\n" -#: Copyright/copyright.cpp:163 +#: Copyright/copyright.cpp:171 msgid "Template file contains text which is not comment, continue anyway?" msgstr "" "テンプレートファイルのテキストに、コメント以外の文字列が含まれています。それ" "でも続けますか？" -#: Copyright/copyright.cpp:179 +#: Copyright/copyright.cpp:187 msgid "File contains ignore string, skipping it" msgstr "無視する条件となる文字列が含まれているため、ファイルをスキップします" -#: Copyright/copyright.cpp:197 Copyright/copyright.cpp:246 +#: Copyright/copyright.cpp:205 Copyright/copyright.cpp:262 msgid "Batch insert requires a workspace to be opened" msgstr "一括挿入するには、ワークスペースを開いてください" -#: Copyright/copyright.cpp:295 +#: Copyright/copyright.cpp:319 #, c-format msgid "You are about to modify %u files. Continue?" msgstr "%u 個のファイルを変更しようとしています。続行しますか？" -#: Copyright/copyright.cpp:301 +#: Copyright/copyright.cpp:325 msgid "Processing file ..." msgstr "ファイルを処理しています..." -#: Copyright/copyright.cpp:322 +#: Copyright/copyright.cpp:346 msgid "File contains ignore string, skipping it: " msgstr "無視する条件となる文字列が含まれているため、ファイルをスキップします: " -#: Copyright/copyright.cpp:329 +#: Copyright/copyright.cpp:353 msgid "Inserting comment to file: " msgstr "ファイルにコメントを挿入しています: " -#: Copyright/copyright.cpp:370 +#: Copyright/copyright.cpp:394 msgid "Template file contains text which is not comment, continue anyways?" msgstr "" "テンプレートファイルのテキストに、コメント以外の文字列が含まれています。それ" "でも続けますか？" -#: Copyright/copyright.cpp:382 +#: Copyright/copyright.cpp:406 msgid "Insert Copyrights Block" msgstr "著作権ブロックを挿入" @@ -2422,9 +2430,9 @@ msgstr "ファイル名" #: DatabaseExplorer/DbSettingDialog.cpp:84 #: DatabaseExplorer/DbSettingDialog.cpp:156 #: DatabaseExplorer/DbSettingDialog.cpp:383 -#: DatabaseExplorer/DbViewerPanel.cpp:567 -#: DatabaseExplorer/DbViewerPanel.cpp:618 -#: DatabaseExplorer/DbViewerPanel.cpp:792 +#: DatabaseExplorer/DbViewerPanel.cpp:571 +#: DatabaseExplorer/DbViewerPanel.cpp:622 +#: DatabaseExplorer/DbViewerPanel.cpp:796 #: DatabaseExplorer/ErdCommitWizard.cpp:350 #: DatabaseExplorer/ErdCommitWizard.cpp:462 #: DatabaseExplorer/SqlCommandPanel.cpp:259 @@ -2441,10 +2449,10 @@ msgstr "エラー (%d): %s" #: DatabaseExplorer/DbSettingDialog.cpp:384 #: DatabaseExplorer/DbSettingDialog.cpp:388 #: DatabaseExplorer/DbSettingDialog.cpp:393 -#: DatabaseExplorer/DbViewerPanel.cpp:568 -#: DatabaseExplorer/DbViewerPanel.cpp:571 -#: DatabaseExplorer/DbViewerPanel.cpp:622 -#: DatabaseExplorer/DbViewerPanel.cpp:629 +#: DatabaseExplorer/DbViewerPanel.cpp:572 +#: DatabaseExplorer/DbViewerPanel.cpp:575 +#: DatabaseExplorer/DbViewerPanel.cpp:626 +#: DatabaseExplorer/DbViewerPanel.cpp:633 #: DatabaseExplorer/ErdCommitWizard.cpp:466 #: DatabaseExplorer/ErdCommitWizard.cpp:473 DatabaseExplorer/ErdPanel.cpp:464 #: DatabaseExplorer/SqlCommandPanel.cpp:151 @@ -2456,9 +2464,9 @@ msgstr "DB エラー" #: DatabaseExplorer/DbSettingDialog.cpp:88 #: DatabaseExplorer/DbSettingDialog.cpp:161 #: DatabaseExplorer/DbSettingDialog.cpp:388 -#: DatabaseExplorer/DbViewerPanel.cpp:571 -#: DatabaseExplorer/DbViewerPanel.cpp:629 -#: DatabaseExplorer/DbViewerPanel.cpp:795 +#: DatabaseExplorer/DbViewerPanel.cpp:575 +#: DatabaseExplorer/DbViewerPanel.cpp:633 +#: DatabaseExplorer/DbViewerPanel.cpp:799 #: DatabaseExplorer/ErdCommitWizard.cpp:473 #: DatabaseExplorer/SqlCommandPanel.cpp:265 msgid "Unknown error." @@ -2476,71 +2484,70 @@ msgstr "PostgreSQL 接続はサポートされていません。" msgid "SQLite connection is not supported." msgstr "SQLite 接続はサポートされていません。" -#: DatabaseExplorer/DbViewerPanel.cpp:66 +#: DatabaseExplorer/DbViewerPanel.cpp:70 msgid "Open connection" msgstr "接続を開く" -#: DatabaseExplorer/DbViewerPanel.cpp:67 +#: DatabaseExplorer/DbViewerPanel.cpp:71 msgid "Close selected connection" msgstr "選択した接続を閉じる" -#: DatabaseExplorer/DbViewerPanel.cpp:68 Subversion2/subversion_view.cpp:253 +#: DatabaseExplorer/DbViewerPanel.cpp:72 Subversion2/subversion_view.cpp:253 msgid "Refresh View" msgstr "表示を再読み込み" -#: DatabaseExplorer/DbViewerPanel.cpp:181 +#: DatabaseExplorer/DbViewerPanel.cpp:185 #: DatabaseExplorer/ErdCommitWizard.cpp:123 msgid "Databases" msgstr "データベース" -#: DatabaseExplorer/DbViewerPanel.cpp:189 +#: DatabaseExplorer/DbViewerPanel.cpp:193 #: DatabaseExplorer/ErdCommitWizard.cpp:130 #, c-format msgid "Databases (%s)" msgstr "データベース (%s)" -#: DatabaseExplorer/DbViewerPanel.cpp:201 +#: DatabaseExplorer/DbViewerPanel.cpp:205 msgid "Tables" msgstr "テーブル" -#: DatabaseExplorer/DbViewerPanel.cpp:229 +#: DatabaseExplorer/DbViewerPanel.cpp:233 msgid "Views" msgstr "ビュー" -#: DatabaseExplorer/DbViewerPanel.cpp:277 DatabaseExplorer/GUI.cpp:868 +#: DatabaseExplorer/DbViewerPanel.cpp:281 DatabaseExplorer/GUI.cpp:868 #: LiteEditor/batchbuildbasedlg.cpp:97 LiteEditor/edit_configuration.cpp:100 #: LiteEditor/editorframe.cpp:65 LiteEditor/findinfiles_dlg.cpp:176 -#: LiteEditor/frame.cpp:1383 LiteEditor/quickfindbar.cpp:118 -#: Plugin/DiffFoldersFrame.cpp:31 Plugin/clPluginsFindBar.cpp:106 -#: Plugin/clTreeCtrlPanel.cpp:121 Runtime/rc/menu.xrc:761 -#: Runtime/rc/menu.xrc:772 Runtime/rc/menu.xrc:780 +#: LiteEditor/frame.cpp:1040 LiteEditor/frame.cpp:1534 +#: LiteEditor/quickfindbar.cpp:118 Plugin/DiffFoldersFrame.cpp:31 +#: Plugin/clPluginsFindBar.cpp:106 Plugin/clTreeCtrlPanel.cpp:121 +#: Runtime/rc/menu.xrc:761 Runtime/rc/menu.xrc:772 Runtime/rc/menu.xrc:780 #: SnipWiz/editsnippetsbasedlg.cpp:134 Subversion2/subversion_view.cpp:506 -#: git/gitui.cpp:610 git/gitui.cpp:736 wxcrafter/gui.cpp:645 -#: wxcrafter/main.cpp:208 +#: git/gitui.cpp:610 git/gitui.cpp:736 wxcrafter/main.cpp:206 msgid "Close" msgstr "閉じる" -#: DatabaseExplorer/DbViewerPanel.cpp:277 +#: DatabaseExplorer/DbViewerPanel.cpp:281 msgid "Close connection?" msgstr "接続を閉じますか？" -#: DatabaseExplorer/DbViewerPanel.cpp:329 +#: DatabaseExplorer/DbViewerPanel.cpp:333 msgid "Add database" msgstr "データベースを追加" -#: DatabaseExplorer/DbViewerPanel.cpp:329 +#: DatabaseExplorer/DbViewerPanel.cpp:333 msgid "Database name" msgstr "データベース名" -#: DatabaseExplorer/DbViewerPanel.cpp:339 +#: DatabaseExplorer/DbViewerPanel.cpp:343 msgid "Database created successfully" msgstr "データベースが正常に作成されました" -#: DatabaseExplorer/DbViewerPanel.cpp:344 +#: DatabaseExplorer/DbViewerPanel.cpp:348 msgid "Can't create new db in this database engine!" msgstr "このデータベースエンジンでは、新しいデータベースを作成できません！" -#: DatabaseExplorer/DbViewerPanel.cpp:344 Gizmos/newwxprojectdlg.cpp:103 +#: DatabaseExplorer/DbViewerPanel.cpp:348 Gizmos/newwxprojectdlg.cpp:103 #: LiteEditor/advanced_settings.cpp:89 LiteEditor/cl_editor.cpp:1684 #: LiteEditor/fileview.cpp:916 LiteEditor/fileview.cpp:927 #: LiteEditor/manager.cpp:304 LiteEditor/manager.cpp:321 @@ -2551,162 +2558,162 @@ msgstr "このデータベースエンジンでは、新しいデータベース msgid "Error" msgstr "エラー" -#: DatabaseExplorer/DbViewerPanel.cpp:358 +#: DatabaseExplorer/DbViewerPanel.cpp:362 #, c-format msgid "Remove database '%s'?" msgstr "データベース '%s' を削除しますか？" -#: DatabaseExplorer/DbViewerPanel.cpp:359 -#: DatabaseExplorer/DbViewerPanel.cpp:715 +#: DatabaseExplorer/DbViewerPanel.cpp:363 +#: DatabaseExplorer/DbViewerPanel.cpp:719 msgid "Drop database" msgstr "データベースを削除" -#: DatabaseExplorer/DbViewerPanel.cpp:365 +#: DatabaseExplorer/DbViewerPanel.cpp:369 msgid "Database dropped successfully" msgstr "データベースが正常に削除されました" -#: DatabaseExplorer/DbViewerPanel.cpp:401 +#: DatabaseExplorer/DbViewerPanel.cpp:405 #, c-format msgid "Remove table '%s'?" msgstr "テーブル '%s' を削除しますか？" -#: DatabaseExplorer/DbViewerPanel.cpp:402 -#: DatabaseExplorer/DbViewerPanel.cpp:741 +#: DatabaseExplorer/DbViewerPanel.cpp:406 +#: DatabaseExplorer/DbViewerPanel.cpp:745 msgid "Drop table" msgstr "テーブルを削除" -#: DatabaseExplorer/DbViewerPanel.cpp:408 +#: DatabaseExplorer/DbViewerPanel.cpp:412 msgid "Table dropped successfully" msgstr "テーブルを正常に削除しました" -#: DatabaseExplorer/DbViewerPanel.cpp:418 +#: DatabaseExplorer/DbViewerPanel.cpp:422 #, c-format msgid "Remove view '%s'?" msgstr "ビュー '%s' を削除しますか？" -#: DatabaseExplorer/DbViewerPanel.cpp:419 -#: DatabaseExplorer/DbViewerPanel.cpp:758 +#: DatabaseExplorer/DbViewerPanel.cpp:423 +#: DatabaseExplorer/DbViewerPanel.cpp:762 msgid "Drop view" msgstr "ビューを削除" -#: DatabaseExplorer/DbViewerPanel.cpp:425 +#: DatabaseExplorer/DbViewerPanel.cpp:429 msgid "View dropped successfully" msgstr "ビューを正常に削除しました" -#: DatabaseExplorer/DbViewerPanel.cpp:484 +#: DatabaseExplorer/DbViewerPanel.cpp:488 msgid "Import database from SQL file ..." msgstr "データベースを SQL ファイルからインポート..." -#: DatabaseExplorer/DbViewerPanel.cpp:498 +#: DatabaseExplorer/DbViewerPanel.cpp:502 msgid "Dump data into file ..." msgstr "データをファイルにダンプ..." -#: DatabaseExplorer/DbViewerPanel.cpp:503 +#: DatabaseExplorer/DbViewerPanel.cpp:507 msgid "Data was saved to " msgstr "データが正常に保存されました: " -#: DatabaseExplorer/DbViewerPanel.cpp:512 +#: DatabaseExplorer/DbViewerPanel.cpp:516 msgid "Export database..." msgstr "データベースをエクスポート..." -#: DatabaseExplorer/DbViewerPanel.cpp:558 +#: DatabaseExplorer/DbViewerPanel.cpp:562 #, c-format msgid "The database has been exported to '%s'." msgstr "データベースが '%s' にエクスポートされました。" -#: DatabaseExplorer/DbViewerPanel.cpp:559 +#: DatabaseExplorer/DbViewerPanel.cpp:563 msgid "wxDbExplorer" msgstr "wxDbExplorer" -#: DatabaseExplorer/DbViewerPanel.cpp:607 +#: DatabaseExplorer/DbViewerPanel.cpp:611 #: DatabaseExplorer/ErdCommitWizard.cpp:451 msgid "Successful!" msgstr "成功！" -#: DatabaseExplorer/DbViewerPanel.cpp:620 +#: DatabaseExplorer/DbViewerPanel.cpp:624 #: DatabaseExplorer/ErdCommitWizard.cpp:464 msgid "Fail!" msgstr "失敗！" -#: DatabaseExplorer/DbViewerPanel.cpp:703 +#: DatabaseExplorer/DbViewerPanel.cpp:707 msgid "Close Connection" msgstr "接続を閉じる" -#: DatabaseExplorer/DbViewerPanel.cpp:705 +#: DatabaseExplorer/DbViewerPanel.cpp:709 msgid "Refresh Connection" msgstr "接続を再読み込み" -#: DatabaseExplorer/DbViewerPanel.cpp:711 -#: DatabaseExplorer/DbViewerPanel.cpp:737 -#: DatabaseExplorer/DbViewerPanel.cpp:755 +#: DatabaseExplorer/DbViewerPanel.cpp:715 +#: DatabaseExplorer/DbViewerPanel.cpp:741 +#: DatabaseExplorer/DbViewerPanel.cpp:759 msgid "Open SQL panel" msgstr "SQL パネルを開く" -#: DatabaseExplorer/DbViewerPanel.cpp:712 +#: DatabaseExplorer/DbViewerPanel.cpp:716 msgid "Open SQL command panel for the database" msgstr "データベースの SQL コマンドパネルを開く" -#: DatabaseExplorer/DbViewerPanel.cpp:716 +#: DatabaseExplorer/DbViewerPanel.cpp:720 msgid "Run SQL command for deleting Database" msgstr "データベースを削除する SQL コマンドを実行" -#: DatabaseExplorer/DbViewerPanel.cpp:719 +#: DatabaseExplorer/DbViewerPanel.cpp:723 msgid "Create classes from DB" msgstr "データベースからクラスを作成" -#: DatabaseExplorer/DbViewerPanel.cpp:720 +#: DatabaseExplorer/DbViewerPanel.cpp:724 msgid "Create C++ classes for the database" msgstr "データベース用の C++ クラスを作成" -#: DatabaseExplorer/DbViewerPanel.cpp:723 +#: DatabaseExplorer/DbViewerPanel.cpp:727 msgid "Import database from file" msgstr "データベースをファイルからインポート" -#: DatabaseExplorer/DbViewerPanel.cpp:724 +#: DatabaseExplorer/DbViewerPanel.cpp:728 msgid "Run SQL commands stored in *.sql file" msgstr ".sql ファイルに記述されている SQL コマンドを実行" -#: DatabaseExplorer/DbViewerPanel.cpp:725 +#: DatabaseExplorer/DbViewerPanel.cpp:729 msgid "Export database to file" msgstr "データベースをファイルにエクスポート" -#: DatabaseExplorer/DbViewerPanel.cpp:726 +#: DatabaseExplorer/DbViewerPanel.cpp:730 msgid "Export database CREATE SQL statements into *.sql file" msgstr "データベースの CREATE SQL 文を .sql ファイルにエクスポート" -#: DatabaseExplorer/DbViewerPanel.cpp:729 +#: DatabaseExplorer/DbViewerPanel.cpp:733 msgid "Dump data to file" msgstr "データをファイルにダンプ" -#: DatabaseExplorer/DbViewerPanel.cpp:730 +#: DatabaseExplorer/DbViewerPanel.cpp:734 msgid "Dump data from database into .sql file" msgstr "データベースからデータを .sql ファイルにダンプ" -#: DatabaseExplorer/DbViewerPanel.cpp:738 +#: DatabaseExplorer/DbViewerPanel.cpp:742 msgid "Open SQL command panel for the table" msgstr "テーブルの SQL コマンドパネルを開く" -#: DatabaseExplorer/DbViewerPanel.cpp:741 +#: DatabaseExplorer/DbViewerPanel.cpp:745 msgid "Run SQL command to delete the table" msgstr "テーブルを削除する SQL コマンドを実行" -#: DatabaseExplorer/DbViewerPanel.cpp:743 +#: DatabaseExplorer/DbViewerPanel.cpp:747 msgid "Create classes from Table" msgstr "テーブルからクラスを作成" -#: DatabaseExplorer/DbViewerPanel.cpp:744 +#: DatabaseExplorer/DbViewerPanel.cpp:748 msgid "Create C++ classes for the table" msgstr "テーブル用の C++ クラスを作成" -#: DatabaseExplorer/DbViewerPanel.cpp:749 +#: DatabaseExplorer/DbViewerPanel.cpp:753 msgid "Copy Column Name" msgstr "列名をコピー" -#: DatabaseExplorer/DbViewerPanel.cpp:755 +#: DatabaseExplorer/DbViewerPanel.cpp:759 msgid "Open SQL command panel for the view" msgstr "ビューの SQL コマンドパネルを開く" -#: DatabaseExplorer/DbViewerPanel.cpp:758 +#: DatabaseExplorer/DbViewerPanel.cpp:762 msgid "Run SQL command to delete the view" msgstr "ビューを削除する SQL コマンドを実行" @@ -2752,7 +2759,7 @@ msgstr "データファイルをバックアップ" #: DatabaseExplorer/ErdCommitWizard.cpp:175 #: DatabaseExplorer/ErdCommitWizard.cpp:181 -#: DatabaseExplorer/ErdCommitWizard.cpp:399 LiteEditor/context_cpp.cpp:2189 +#: DatabaseExplorer/ErdCommitWizard.cpp:399 LiteEditor/context_cpp.cpp:2208 #: LiteEditor/syntaxhighlightdlg.cpp:643 msgid "Select file" msgstr "ファイルを選択" @@ -2842,7 +2849,7 @@ msgstr "復元ログ:" msgid "Restore" msgstr "復元" -#: DatabaseExplorer/ErdPanel.cpp:176 LiteEditor/frame.cpp:1379 +#: DatabaseExplorer/ErdPanel.cpp:176 LiteEditor/frame.cpp:1530 #: MemCheck/memcheckui.cpp:362 Plugin/clRemoteDirCtrl.cpp:193 #: Plugin/clTreeCtrlPanel.cpp:152 #: codelitephp/php-plugin/php_workspace_view.cpp:295 @@ -2854,9 +2861,9 @@ msgid "Open diagram" msgstr "ダイヤグラムを開く" #: DatabaseExplorer/ErdPanel.cpp:178 LiteEditor/editorframe.cpp:64 -#: LiteEditor/frame.cpp:1381 Plugin/DiffSideBySidePanel.cpp:95 +#: LiteEditor/frame.cpp:1532 Plugin/DiffSideBySidePanel.cpp:95 #: Runtime/rc/menu.xrc:775 Runtime/rc/menu.xrc:805 -#: wxcrafter/allocator_mgr.cpp:1044 wxcrafter/main.cpp:209 +#: wxcrafter/allocator_mgr.cpp:1044 wxcrafter/main.cpp:207 msgid "Save" msgstr "保存" @@ -2893,9 +2900,9 @@ msgid "Print preview" msgstr "印刷プレビュー" #: DatabaseExplorer/ErdPanel.cpp:188 DatabaseExplorer/FrameCanvas.cpp:173 -#: LiteEditor/BuildTab.cpp:292 LiteEditor/frame.cpp:1386 -#: LiteEditor/project_settings_base_dlg.cpp:313 Runtime/rc/menu.xrc:877 -#: Runtime/rc/menu.xrc:922 Runtime/rc/menu.xrc:1085 +#: LiteEditor/BuildTab.cpp:286 LiteEditor/frame.cpp:999 +#: LiteEditor/frame.cpp:1537 LiteEditor/project_settings_base_dlg.cpp:313 +#: Runtime/rc/menu.xrc:877 Runtime/rc/menu.xrc:922 Runtime/rc/menu.xrc:1085 #: wxcrafter/allocator_mgr.cpp:1092 msgid "Copy" msgstr "コピー" @@ -2905,8 +2912,8 @@ msgid "Copy item" msgstr "項目をコピー" #: DatabaseExplorer/ErdPanel.cpp:190 DatabaseExplorer/FrameCanvas.cpp:174 -#: LiteEditor/frame.cpp:1385 Runtime/rc/menu.xrc:890 Runtime/rc/menu.xrc:919 -#: wxcrafter/allocator_mgr.cpp:1093 +#: LiteEditor/frame.cpp:998 LiteEditor/frame.cpp:1536 Runtime/rc/menu.xrc:890 +#: Runtime/rc/menu.xrc:919 wxcrafter/allocator_mgr.cpp:1093 msgid "Cut" msgstr "切り取り" @@ -2915,8 +2922,9 @@ msgid "Cut item" msgstr "項目を切り取り" #: DatabaseExplorer/ErdPanel.cpp:192 DatabaseExplorer/FrameCanvas.cpp:175 -#: LiteEditor/frame.cpp:1387 Runtime/rc/menu.xrc:880 Runtime/rc/menu.xrc:925 -#: wxcrafter/allocator_mgr.cpp:731 wxcrafter/allocator_mgr.cpp:1094 +#: LiteEditor/frame.cpp:1000 LiteEditor/frame.cpp:1538 Runtime/rc/menu.xrc:880 +#: Runtime/rc/menu.xrc:925 wxcrafter/allocator_mgr.cpp:731 +#: wxcrafter/allocator_mgr.cpp:1094 msgid "Paste" msgstr "貼り付け" @@ -2925,14 +2933,16 @@ msgid "Paste item" msgstr "項目を貼り付け" #: DatabaseExplorer/ErdPanel.cpp:195 LiteEditor/editorframe.cpp:69 -#: LiteEditor/frame.cpp:1388 LiteEditor/wxcrafter.cpp:393 -#: Runtime/rc/menu.xrc:883 Runtime/rc/menu.xrc:912 wxcrafter/main.cpp:211 +#: LiteEditor/frame.cpp:996 LiteEditor/frame.cpp:1539 +#: LiteEditor/wxcrafter.cpp:393 Runtime/rc/menu.xrc:883 Runtime/rc/menu.xrc:912 +#: wxcrafter/main.cpp:209 msgid "Undo" msgstr "元に戻す" #: DatabaseExplorer/ErdPanel.cpp:197 LiteEditor/editorframe.cpp:70 -#: LiteEditor/frame.cpp:1389 LiteEditor/wxcrafter.cpp:396 -#: Runtime/rc/menu.xrc:886 Runtime/rc/menu.xrc:915 wxcrafter/main.cpp:212 +#: LiteEditor/frame.cpp:997 LiteEditor/frame.cpp:1540 +#: LiteEditor/wxcrafter.cpp:396 Runtime/rc/menu.xrc:886 Runtime/rc/menu.xrc:915 +#: wxcrafter/main.cpp:210 msgid "Redo" msgstr "やり直す" @@ -2952,8 +2962,8 @@ msgstr "DBE テーブル" msgid "Database table" msgstr "データベースのテーブル" -#: DatabaseExplorer/ErdPanel.cpp:216 LiteEditor/wxcrafter.cpp:609 -#: codelitephp/php-plugin/php_ui.cpp:822 +#: DatabaseExplorer/ErdPanel.cpp:216 LiteEditor/frame.cpp:1089 +#: LiteEditor/wxcrafter.cpp:609 codelitephp/php-plugin/php_ui.cpp:822 msgid "View" msgstr "表示" @@ -3007,8 +3017,7 @@ msgid "The SQL script has been saved to '%s'." msgstr "SQL スクリプトが '%s' に保存されました。" #: DatabaseExplorer/ErdPanel.cpp:340 DatabaseExplorer/ErdPanel.cpp:478 -#: DatabaseExplorer/databaseexplorer.cpp:97 -#: DatabaseExplorer/databaseexplorer.cpp:214 +#: DatabaseExplorer/databaseexplorer.cpp:217 msgid "DatabaseExplorer" msgstr "データベースエクスプローラー" @@ -3166,7 +3175,7 @@ msgstr "データベースのパスワード" #: SnipWiz/templateclassbasedlg.cpp:191 WebTools/WebToolsBase.cpp:365 #: abbreviation/abbreviationssettingsbase.cpp:86 #: codelitephp/php-plugin/new_class.cpp:56 codelitephp/php-plugin/php_ui.cpp:96 -#: codelitephp/php-plugin/php_ui.cpp:193 wxcrafter/wxgui_defs.h:120 +#: codelitephp/php-plugin/php_ui.cpp:193 wxcrafter/wxgui_defs.h:126 msgid "Name:" msgstr "名前:" @@ -3291,7 +3300,7 @@ msgstr "生成" msgid "Table name:" msgstr "テーブル名:" -#: DatabaseExplorer/GUI.cpp:1305 wxcrafter/wxgui_defs.h:134 +#: DatabaseExplorer/GUI.cpp:1305 wxcrafter/wxgui_defs.h:140 msgid "Columns:" msgstr "列:" @@ -3454,8 +3463,8 @@ msgid "Load SQL Script" msgstr "SQL スクリプトを読み込み" #: DatabaseExplorer/SqlCommandPanel.cpp:101 -#: DatabaseExplorer/databaseexplorer.cpp:146 -#: DatabaseExplorer/databaseexplorer.cpp:162 +#: DatabaseExplorer/databaseexplorer.cpp:149 +#: DatabaseExplorer/databaseexplorer.cpp:165 msgid "Execute SQL" msgstr "SQL を実行" @@ -3519,26 +3528,27 @@ msgstr "DELETE SQL 文のテンプレートをエディターに挿入します msgid "column" msgstr "column" -#: DatabaseExplorer/databaseexplorer.cpp:98 -#: DatabaseExplorer/databaseexplorer.cpp:143 +#: DatabaseExplorer/databaseexplorer.cpp:100 +#: DatabaseExplorer/databaseexplorer.cpp:146 msgid "DatabaseExplorer for CodeLite" msgstr "CodeLite 用のデータベースエクスプローラー" -#: DatabaseExplorer/databaseexplorer.cpp:118 -#: DatabaseExplorer/databaseexplorer.cpp:126 +#: DatabaseExplorer/databaseexplorer.cpp:120 #: DatabaseExplorer/databaseexplorer.cpp:128 -#: DatabaseExplorer/databaseexplorer.cpp:204 -#: DatabaseExplorer/databaseexplorer.cpp:245 -#: DatabaseExplorer/databaseexplorer.cpp:252 -#: DatabaseExplorer/databaseexplorer.cpp:254 +#: DatabaseExplorer/databaseexplorer.cpp:130 +#: DatabaseExplorer/databaseexplorer.cpp:207 +#: DatabaseExplorer/databaseexplorer.cpp:248 +#: DatabaseExplorer/databaseexplorer.cpp:255 +#: DatabaseExplorer/databaseexplorer.cpp:257 msgid "DbExplorer" msgstr "DB エクスプローラー" -#: DatabaseExplorer/databaseexplorer.cpp:164 +#: DatabaseExplorer/databaseexplorer.cpp:149 +#: DatabaseExplorer/databaseexplorer.cpp:167 msgid "Database Explorer" msgstr "データベースエクスプローラー" -#: DatabaseExplorer/databaseexplorer.cpp:210 +#: DatabaseExplorer/databaseexplorer.cpp:213 msgid "" "Cross platform database explorer\n" "\n" @@ -3546,7 +3556,7 @@ msgstr "" "クロスプラットフォームなデータベースエクスプローラー\n" "\n" -#: DatabaseExplorer/databaseexplorer.cpp:217 +#: DatabaseExplorer/databaseexplorer.cpp:220 msgid "2011 - 2015 (C) Tomas Bata University, Zlin, Czech Republic" msgstr "2011 - 2015 (C) Tomas Bata University, Zlin, Czech Republic" @@ -3562,7 +3572,7 @@ msgstr "キャンバスのスケールには小数値を指定してください msgid "Export ERD to image..." msgstr "ERD を画像にエクスポート..." -#: Debugger/dbgcmd.cpp:263 +#: Debugger/dbgcmd.cpp:272 #, c-format msgid "" "Internal breakpoint was hit (id=%d), Applying user breakpoints and continuing" @@ -3570,96 +3580,96 @@ msgstr "" "内部ブレークポイントがヒットしました (id=%d)。ユーザーのブレークポイントを適" "用し、続行しています" -#: Debugger/dbgcmd.cpp:332 +#: Debugger/dbgcmd.cpp:341 msgid "Program exited normally." msgstr "プログラムが正常に終了しました。" -#: Debugger/dbgcmd.cpp:376 +#: Debugger/dbgcmd.cpp:385 #, c-format msgid "ERROR: failed to place breakpoint: \"%s\"" msgstr "エラー: ブレークポイントの設置に失敗しました: \"%s\"" -#: Debugger/dbgcmd.cpp:391 +#: Debugger/dbgcmd.cpp:400 msgid "Found the breakpoint ID!" msgstr "ブレークポイント ID が見つかりました！" -#: Debugger/dbgcmd.cpp:413 +#: Debugger/dbgcmd.cpp:422 #, c-format msgid "Successfully set breakpoint %ld at: " msgstr "ブレークポイント %ld を正常に設定しました: " -#: Debugger/dbgcmd.cpp:416 +#: Debugger/dbgcmd.cpp:425 #, c-format msgid "Successfully set conditional breakpoint %ld at: " msgstr "条件付きブレークポイント %ld を正常に設定しました: " -#: Debugger/dbgcmd.cpp:419 +#: Debugger/dbgcmd.cpp:428 #, c-format msgid "Successfully set temporary breakpoint %ld at: " msgstr "一時的なブレークポイント %ld を正常に設定しました: " -#: Debugger/dbgcmd.cpp:424 +#: Debugger/dbgcmd.cpp:433 #, c-format msgid "Successfully set watchpoint %ld watching: " msgstr "ウォッチポイント %ld を正常に設定しました: " -#: Debugger/dbgcmd.cpp:427 +#: Debugger/dbgcmd.cpp:436 #, c-format msgid "Successfully set read watchpoint %ld watching: " msgstr "読み取りウォッチポイント %ld を正常に設定しました: " -#: Debugger/dbgcmd.cpp:430 +#: Debugger/dbgcmd.cpp:439 #, c-format msgid "Successfully set read/write watchpoint %ld watching: " msgstr "読み書きウォッチポイント %ld を正常に設定しました: " -#: Debugger/dbgcmd.cpp:438 +#: Debugger/dbgcmd.cpp:447 msgid "address " msgstr "アドレス " -#: Debugger/dbgcmd.cpp:563 +#: Debugger/dbgcmd.cpp:572 msgid "Successfully connected to debugger server" msgstr "デバッガーサーバーへ正常に接続しました" -#: Debugger/dbgcmd.cpp:566 +#: Debugger/dbgcmd.cpp:575 msgid "Applying breakpoints..." msgstr "ブレークポイントを適用しています..." -#: Debugger/dbgcmd.cpp:571 +#: Debugger/dbgcmd.cpp:580 msgid "Applying breakpoints... done" msgstr "ブレークポイントを適用しています... 完了" -#: Debugger/dbgcmd.cpp:672 +#: Debugger/dbgcmd.cpp:681 #, c-format msgid "Breakpoint %i condition cleared" msgstr "ブレークポイント %i の条件を消去しました" -#: Debugger/dbgcmd.cpp:674 +#: Debugger/dbgcmd.cpp:683 #, c-format msgid "Condition %s set for breakpoint %i" msgstr "条件 %s をブレークポイント %i に設定しました" -#: Debugger/debuggergdb.cpp:271 +#: Debugger/debuggergdb.cpp:272 msgid "Debugging over SSH, using account: " msgstr "SSH 経由でデバッグしています - アカウント: " -#: Debugger/debuggergdb.cpp:272 +#: Debugger/debuggergdb.cpp:273 msgid "Current working dir: " msgstr "現在の作業ディレクトリ: " -#: Debugger/debuggergdb.cpp:273 +#: Debugger/debuggergdb.cpp:274 msgid "Launching gdb from : " msgstr "GDB の起動元 : " -#: Debugger/debuggergdb.cpp:274 +#: Debugger/debuggergdb.cpp:275 msgid "Starting debugger : " msgstr "デバッガーを開始しています : " -#: Debugger/debuggergdb.cpp:659 Debugger/debuggergdb.cpp:705 +#: Debugger/debuggergdb.cpp:658 Debugger/debuggergdb.cpp:704 msgid "Can't interrupt debuggee process: I don't know its PID!" msgstr "デバッギープロセスを中断できません: PID が分かりません！" -#: Debugger/debuggergdb.cpp:834 +#: Debugger/debuggergdb.cpp:833 msgid "Failed to start debugger: permission denied" msgstr "デバッガーの開始に失敗しました: 権限がありません" @@ -3683,7 +3693,7 @@ msgid "Remove unused images" msgstr "未使用の画像を削除" #: Docker/DockerOutputPane.cpp:87 Docker/UI.cpp:413 -#: wxcrafter/wxcrafter_gui.cpp:187 +#: wxcrafter/wxcrafter_gui.cpp:188 msgid "Containers" msgstr "コンテナー" @@ -3700,7 +3710,7 @@ msgid "Restart" msgstr "再起動" #: Docker/DockerOutputPane.cpp:257 ExternalTools/external_tools.cpp:150 -#: LiteEditor/shelltab.cpp:77 +#: LiteEditor/frame.cpp:956 LiteEditor/shelltab.cpp:77 msgid "Stop" msgstr "停止" @@ -3745,7 +3755,7 @@ msgstr "" "例:\n" "'-t my_container .'" -#: Docker/UI.cpp:259 +#: Docker/UI.cpp:259 LiteEditor/frame.cpp:955 msgid "Run" msgstr "実行" @@ -3782,7 +3792,7 @@ msgid "Image" msgstr "画像" #: Docker/UI.cpp:434 ExternalTools/external_tools.cpp:144 -#: LanguageServer/UI.cpp:204 LiteEditor/project_settings_base_dlg.cpp:1173 +#: LanguageServer/UI.cpp:196 LiteEditor/project_settings_base_dlg.cpp:1173 #: Plugin/clFileSystemWorkspaceDlgBase.cpp:442 msgid "Command" msgstr "コマンド" @@ -3881,13 +3891,14 @@ msgid "Docker for CodeLite" msgstr "CodeLite への Docker 統合" #: Docker/docker.cpp:66 HelpPlugin/HelpPluginUI.h:99 -#: LLDBDebugger/LLDBPlugin.cpp:278 LanguageServer/languageserver.cpp:90 -#: MemCheck/memcheckui.cpp:257 Plugin/clFileSystemWorkspaceView.cpp:23 +#: LLDBDebugger/LLDBPlugin.cpp:278 LanguageServer/languageserver.cpp:91 +#: LiteEditor/frame.cpp:1078 MemCheck/memcheckui.cpp:257 +#: Plugin/clFileSystemWorkspaceView.cpp:23 #: Plugin/clFileSystemWorkspaceView.cpp:123 #: WordCompletion/wordcompletion.cpp:69 ZoomNavigator/zoomnavigator.cpp:130 -#: codelite_terminal/wxcrafter.h:92 cppchecker/cppchecker.cpp:149 -#: cppchecker/cppchecker.cpp:226 cppchecker/cppchecker.cpp:242 -#: cppchecker/cppchecker.cpp:256 cppchecker/cppchecker.cpp:270 +#: codelite_terminal/wxcrafter.h:95 cppchecker/cppchecker.cpp:157 +#: cppchecker/cppchecker.cpp:234 cppchecker/cppchecker.cpp:250 +#: cppchecker/cppchecker.cpp:264 cppchecker/cppchecker.cpp:278 #: git/gitui.cpp:1423 msgid "Settings" msgstr "設定" @@ -3988,7 +3999,7 @@ msgstr "ツールへのパス:" msgid "Path to the executable to run" msgstr "実行するファイルへのパス" -#: ExternalTools/NewToolBase.cpp:83 LanguageServer/UI.cpp:340 +#: ExternalTools/NewToolBase.cpp:83 LanguageServer/UI.cpp:332 #: LiteEditor/quickdebugbase.cpp:140 LiteEditor/quickdebugbase.cpp:313 #: Plugin/clFileSystemWorkspaceDlgBase.cpp:278 WebTools/WebToolsBase.cpp:242 #: codelitephp/php-plugin/php_ui.cpp:705 @@ -4008,7 +4019,7 @@ msgid "Toolbar icon (24x24):" msgstr "ツールバーのアイコン (24x24):" #: ExternalTools/NewToolBase.cpp:126 ExternalTools/NewToolBase.cpp:143 -#: LanguageServer/UI.cpp:359 Plugin/SwitchToWorkspaceBase.cpp:58 +#: LanguageServer/UI.cpp:351 Plugin/SwitchToWorkspaceBase.cpp:58 #: Plugin/sftp_ui.cpp:363 Remoty/RemotyUI.cpp:89 Remoty/RemotyUI.cpp:198 msgid "Browse..." msgstr "参照..." @@ -4018,7 +4029,7 @@ msgid "Toolbar icon (16x16):" msgstr "ツールバーのアイコン (16x16):" #: ExternalTools/NewToolBase.cpp:147 codelitephp/php-plugin/new_class.cpp:29 -#: wxcrafter/gui.cpp:1095 +#: wxcrafter/gui.cpp:990 msgid "General:" msgstr "一般:" @@ -4055,7 +4066,7 @@ msgid "External Tool" msgstr "外部ツール" #: ExternalTools/external_tools.cpp:39 LLDBDebugger/LLDBLocalsView.cpp:54 -#: LLDBDebugger/UI.cpp:574 LanguageServer/UI.cpp:156 +#: LLDBDebugger/UI.cpp:574 LanguageServer/UI.cpp:148 #: LiteEditor/CompilerMainPage.cpp:77 LiteEditor/CompilersFoundDlgBase.cpp:39 #: LiteEditor/attachdbgprocbasedlg.cpp:72 LiteEditor/localstable.cpp:54 #: Plugin/clFileSystemWorkspace.cpp:820 Plugin/clSelectSymbolDialogBase.cpp:40 @@ -4063,7 +4074,7 @@ msgstr "外部ツール" #: Subversion2/subversion2_ui.cpp:76 codelitephp/php-plugin/localsview.cpp:33 #: codelitephp/php-plugin/php_ui.cpp:286 wxcrafter/aui_pane_info.cpp:51 #: wxcrafter/aui_pane_info.cpp:174 wxcrafter/info_bar_button_wrapper.cpp:16 -#: wxcrafter/properties_list_view.cpp:286 +#: wxcrafter/properties_list_view.cpp:316 #: wxcrafter/ribbon_tool_separator.cpp:15 #: wxcrafter/wx_collapsible_pane_pane_wrapper.cpp:12 #: wxcrafter/wxcrafter.cpp:1126 @@ -4106,7 +4117,8 @@ msgstr "PID" msgid "Stop All" msgstr "全て停止" -#: ExternalTools/external_tools.h:61 ExternalTools/externaltools.cpp:272 +#: ExternalTools/external_tools.h:61 ExternalTools/externaltools.cpp:106 +#: ExternalTools/externaltools.cpp:269 msgid "External Tools" msgstr "外部ツール" @@ -4119,15 +4131,20 @@ msgstr "ツール" msgid "Are you sure you want to delete this tool?" msgstr "このツールを削除しますか？" -#: ExternalTools/externaltools.cpp:75 ExternalTools/externaltools.cpp:91 +#: ExternalTools/externaltools.cpp:74 ExternalTools/externaltools.cpp:87 msgid "A plugin that allows user to launch external tools from within CodeLite" msgstr "CodeLite から外部ツールを起動できるようにするプラグイン" -#: ExternalTools/externaltools.cpp:127 ExternalTools/externaltools.cpp:254 +#: ExternalTools/externaltools.cpp:107 +#, c-format +msgid "External Tool %d" +msgstr "外部ツール %d" + +#: ExternalTools/externaltools.cpp:124 ExternalTools/externaltools.cpp:251 msgid "Configure external tools..." msgstr "外部ツールの構成..." -#: ExternalTools/externaltools.cpp:128 ExternalTools/externaltools.cpp:257 +#: ExternalTools/externaltools.cpp:125 ExternalTools/externaltools.cpp:254 msgid "Show Running Tools..." msgstr "実行中のツールを表示..." @@ -4239,7 +4256,7 @@ msgid "New Plugin Wizard" msgstr "新しいプラグインウィザード" #: Gizmos/newclassbasedlg.cpp:36 UnitTestCPP/testclassbasedlg.cpp:42 -#: wxcrafter/wxgui_defs.h:121 +#: wxcrafter/wxgui_defs.h:127 msgid "Class Name:" msgstr "クラス名:" @@ -4247,7 +4264,7 @@ msgstr "クラス名:" msgid "The class name" msgstr "クラス名" -#: Gizmos/newclassbasedlg.cpp:49 Plugin/newkeyshortcutdlg.cpp:90 +#: Gizmos/newclassbasedlg.cpp:49 Plugin/newkeyshortcutdlg.cpp:91 msgid "*" msgstr "*" @@ -4313,10 +4330,10 @@ msgstr "" #: Gizmos/newclassbasedlg.cpp:171 LLDBDebugger/UI.cpp:37 #: LLDBDebugger/UI.cpp:580 LiteEditor/ThreadListPanelBase.cpp:43 -#: LiteEditor/breakpointslistctrl.h:55 LiteEditor/listctrlpanelbase.cpp:37 -#: LiteEditor/symbols_dialog.cpp:44 LiteEditor/wxcrafter.cpp:374 -#: MemCheck/memcheckui.cpp:290 -#: Runtime/templates/projects/executable-wxcrafter-frame/wxcrafter.cpp:34 +#: LiteEditor/breakpointslistctrl.h:55 LiteEditor/frame.cpp:1033 +#: LiteEditor/listctrlpanelbase.cpp:37 LiteEditor/symbols_dialog.cpp:44 +#: LiteEditor/wxcrafter.cpp:374 MemCheck/memcheckui.cpp:290 +#: Runtime/templates/projects/executable-wxcrafter-frame/wxcrafter.cpp:36 #: UnitTestCPP/unittestreport.cpp:100 WebTools/WebToolsBase.cpp:537 #: WebTools/WebToolsBase.cpp:560 codelite-cli/codelite-client/wxcrafter.cpp:107 #: codelite_terminal/wxcrafter.cpp:54 codelitephp/php-plugin/php_ui.cpp:290 @@ -4342,7 +4359,7 @@ msgid "Use #pragma once" msgstr "#pragma once を使用" #: Gizmos/newclassbasedlg.cpp:205 LLDBDebugger/UI.cpp:446 -#: LiteEditor/compiler_pages.cpp:670 wxcrafter/wxcrafter_gui.cpp:952 +#: LiteEditor/compiler_pages.cpp:670 wxcrafter/wxcrafter_gui.cpp:953 msgid "Advanced" msgstr "詳細" @@ -4716,7 +4733,7 @@ msgstr "値" msgid "Local Variables" msgstr "ローカル変数" -#: LLDBDebugger/LLDBLocalsView.cpp:76 LiteEditor/frame.cpp:1378 +#: LLDBDebugger/LLDBLocalsView.cpp:76 LiteEditor/frame.cpp:1529 #: LiteEditor/simpletablebase.cpp:59 Plugin/clFileSystemWorkspaceDlgBase.cpp:41 #: Plugin/clFileSystemWorkspaceDlgBase.cpp:449 Runtime/rc/menu.xrc:975 msgid "New" @@ -4732,7 +4749,7 @@ msgstr "新規" #: Plugin/clTreeCtrlPanel.cpp:105 Plugin/clTreeCtrlPanel.cpp:157 #: QmakePlugin/qmakesettingsdlg.cpp:102 Runtime/rc/menu.xrc:893 #: Runtime/rc/menu.xrc:928 Runtime/rc/menu.xrc:1096 Runtime/rc/menu.xrc:1138 -#: SFTP/UI.cpp:245 Subversion2/subversion2.cpp:274 +#: SFTP/UI.cpp:245 Subversion2/subversion2.cpp:280 #: Subversion2/subversion_view.cpp:461 #: abbreviation/abbreviationssettingsbase.cpp:47 #: codelitephp/php-plugin/PHPDebugPane.cpp:33 @@ -4777,8 +4794,9 @@ msgstr "表示形式" #: LLDBDebugger/LLDBLocalsView.cpp:459 LiteEditor/AddOptionsDialogBase.h:49 #: LiteEditor/CompilerMainPage.cpp:623 #: LiteEditor/editoroptionsgeneralguidespanelbase.cpp:157 -#: LiteEditor/free_text_dialog.h:57 LiteEditor/options_dlg2.cpp:105 -#: LiteEditor/wxcrafter.cpp:388 Plugin/clFileSystemWorkspaceDlgBase.cpp:419 +#: LiteEditor/frame.cpp:996 LiteEditor/free_text_dialog.h:57 +#: LiteEditor/options_dlg2.cpp:105 LiteEditor/wxcrafter.cpp:388 +#: Plugin/clFileSystemWorkspaceDlgBase.cpp:419 #: Plugin/clFileSystemWorkspaceDlgBase.cpp:454 Runtime/rc/menu.xrc:1092 msgid "Edit" msgstr "編集" @@ -4787,11 +4805,12 @@ msgstr "編集" msgid "New value:" msgstr "新しい値:" -#: LLDBDebugger/LLDBOutputView.cpp:59 LiteEditor/breakpointdlg.cpp:212 +#: LLDBDebugger/LLDBOutputView.cpp:59 LiteEditor/breakpointdlg.cpp:213 msgid "Delete Breakpoint" msgstr "ブレークポイントを削除" -#: LLDBDebugger/LLDBOutputView.cpp:60 Runtime/rc/menu.xrc:907 +#: LLDBDebugger/LLDBOutputView.cpp:60 LiteEditor/frame.cpp:994 +#: Runtime/rc/menu.xrc:907 msgid "Delete All Breakpoints" msgstr "全てのブレークポイントを削除" @@ -4807,17 +4826,17 @@ msgstr "CodeLite 用の LLDB デバッガー" msgid "LLDB Settings..." msgstr "LLDB の設定..." -#: LLDBDebugger/LLDBPlugin.cpp:304 LiteEditor/cl_editor.cpp:4161 -#: Runtime/rc/menu.xrc:623 +#: LLDBDebugger/LLDBPlugin.cpp:304 LiteEditor/cl_editor.cpp:4163 +#: LiteEditor/frame.cpp:990 Runtime/rc/menu.xrc:623 msgid "Jump to Caret Line" msgstr "キャレットがある行へジャンプ" -#: LLDBDebugger/LLDBPlugin.cpp:307 LiteEditor/cl_editor.cpp:4160 -#: Runtime/rc/menu.xrc:626 +#: LLDBDebugger/LLDBPlugin.cpp:307 LiteEditor/cl_editor.cpp:4162 +#: LiteEditor/frame.cpp:989 Runtime/rc/menu.xrc:626 msgid "Run to Caret Line" msgstr "キャレットがある行まで実行" -#: LLDBDebugger/LLDBPlugin.cpp:324 LiteEditor/cl_editor.cpp:4152 +#: LLDBDebugger/LLDBPlugin.cpp:324 LiteEditor/cl_editor.cpp:4154 #: LiteEditor/new_quick_watch_dlg.cpp:273 msgid "Add Watch" msgstr "ウォッチを追加" @@ -5128,19 +5147,19 @@ msgstr "LLDB の設定" msgid "Folder Mapping" msgstr "フォルダーの対応付け" -#: LanguageServer/LSPOutlineViewDlg.cpp:40 Outline/outline_tab.cpp:71 +#: LanguageServer/LSPOutlineViewDlg.cpp:41 Outline/outline_tab.cpp:75 msgid "Language Server is still not ready... " msgstr "言語サーバーの準備がまだ終わってません... " -#: LanguageServer/LSPOutlineViewDlg.cpp:41 Outline/outline_tab.cpp:72 +#: LanguageServer/LSPOutlineViewDlg.cpp:42 Outline/outline_tab.cpp:76 msgid "(hit ESCAPE key to dismiss)" msgstr "(Esc キーで閉じます)" -#: LanguageServer/LanguageServerCluster.cpp:614 +#: LanguageServer/LanguageServerCluster.cpp:627 msgid "Restarting Language Servers..." msgstr "言語サーバーを再起動しています..." -#: LanguageServer/LanguageServerCluster.cpp:616 LiteEditor/cl_editor.cpp:3441 +#: LanguageServer/LanguageServerCluster.cpp:629 LiteEditor/cl_editor.cpp:3441 #: Plugin/CompileCommandsGenerator.cpp:52 cscope/cscopetab.cpp:63 #: cscope/cscopetab.cpp:144 msgid "Ready" @@ -5183,54 +5202,54 @@ msgstr "追加..." msgid "Add new Language Server" msgstr "新しい言語サーバーを追加" -#: LanguageServer/UI.cpp:150 LiteEditor/breakpointslistctrl.h:55 +#: LanguageServer/UI.cpp:142 LiteEditor/breakpointslistctrl.h:55 #: WordCompletion/UI.cpp:38 msgid "Enabled" msgstr "有効" -#: LanguageServer/UI.cpp:157 +#: LanguageServer/UI.cpp:149 msgid "Give this language server a unique name" msgstr "この言語サーバーに一意な名前を付けてください" -#: LanguageServer/UI.cpp:176 +#: LanguageServer/UI.cpp:168 msgid "Remote Server" msgstr "リモートサーバー" -#: LanguageServer/UI.cpp:189 +#: LanguageServer/UI.cpp:181 msgid "The language server executable" msgstr "言語サーバーの実行ファイル" -#: LanguageServer/UI.cpp:250 LiteEditor/project_settings_dlg.cpp:108 +#: LanguageServer/UI.cpp:242 LiteEditor/project_settings_dlg.cpp:108 #: LiteEditor/workspacesettingsbase.cpp:35 #: Plugin/clFileSystemWorkspaceDlgBase.cpp:597 msgid "Environment" msgstr "環境" -#: LanguageServer/UI.cpp:296 +#: LanguageServer/UI.cpp:288 msgid "Initialization Options" msgstr "初期化のオプション" -#: LanguageServer/UI.cpp:342 +#: LanguageServer/UI.cpp:334 msgid "Set the language server working directory" msgstr "言語サーバーの作業ディレクトリを設定" -#: LanguageServer/UI.cpp:364 +#: LanguageServer/UI.cpp:356 msgid "Languages:" msgstr "言語:" -#: LanguageServer/UI.cpp:365 +#: LanguageServer/UI.cpp:357 msgid "List of supported languages by this Language Server" msgstr "この言語サーバーがサポートする言語の一覧" -#: LanguageServer/UI.cpp:383 +#: LanguageServer/UI.cpp:375 msgid "Show List of Languages" msgstr "言語の一覧を表示" -#: LanguageServer/UI.cpp:387 +#: LanguageServer/UI.cpp:379 msgid "Connection string:" msgstr "接続文字列:" -#: LanguageServer/UI.cpp:389 +#: LanguageServer/UI.cpp:381 msgid "" "Set the connection string here.\n" "If the server connects using 'stdio', choose the 'stdio' entry\n" @@ -5243,11 +5262,11 @@ msgstr "" "tcp://127.0.0.1:12345\n" "の形式で設定します" -#: LanguageServer/UI.cpp:395 +#: LanguageServer/UI.cpp:387 msgid "stdio" msgstr "stdio" -#: LanguageServer/UI.cpp:399 +#: LanguageServer/UI.cpp:391 msgid "" "If the language server is using TCP\n" "Type the connection string in the format of:\n" @@ -5259,11 +5278,11 @@ msgstr "" "\n" "tcp://host:port" -#: LanguageServer/UI.cpp:408 +#: LanguageServer/UI.cpp:400 msgid "Priority:" msgstr "優先度:" -#: LanguageServer/UI.cpp:410 +#: LanguageServer/UI.cpp:402 msgid "" "Multiple Plugins / Servers can compete for providing code completion\n" "for a given language. Set here the server priority.\n" @@ -5280,44 +5299,44 @@ msgstr "" "注: 内蔵のプラグインは 10 - 75 の範囲の優先度を使用しています\n" "言語サーバーを最優先に発動させたい場合は、優先度を 75 よりも高くしてください" -#: LanguageServer/UI.cpp:424 +#: LanguageServer/UI.cpp:416 msgid "Display diagnostics" msgstr "診断を表示" -#: LanguageServer/UI.h:81 +#: LanguageServer/UI.h:82 msgid "Language Server Settings" msgstr "言語サーバーの設定" -#: LanguageServer/UI.h:163 +#: LanguageServer/UI.h:164 msgid "New Language Server" msgstr "新しい言語サーバー" -#: LanguageServer/UI.h:187 +#: LanguageServer/UI.h:188 msgid "Outline View" msgstr "アウトライン表示" -#: LanguageServer/languageserver.cpp:36 LanguageServer/languageserver.cpp:46 +#: LanguageServer/languageserver.cpp:37 LanguageServer/languageserver.cpp:47 msgid "Support for Language Server Protocol (LSP)" msgstr "言語サーバープロトコル (LSP) のサポート" -#: LanguageServer/languageserver.cpp:53 LanguageServer/languageserver.cpp:54 -#: LanguageServer/languageserver.cpp:92 +#: LanguageServer/languageserver.cpp:54 LanguageServer/languageserver.cpp:55 +#: LanguageServer/languageserver.cpp:93 msgid "Language Server" msgstr "言語サーバー" -#: LanguageServer/languageserver.cpp:91 +#: LanguageServer/languageserver.cpp:92 msgid "Restart Language Servers" msgstr "言語サーバーを再起動" -#: LanguageServer/languageserver.cpp:210 +#: LanguageServer/languageserver.cpp:211 msgid "Find references" msgstr "参照を検索" -#: LanguageServer/languageserver.cpp:214 +#: LanguageServer/languageserver.cpp:215 msgid "Rename symbol" msgstr "シンボル名を変更" -#: LanguageServer/languageserver.cpp:216 +#: LanguageServer/languageserver.cpp:217 msgid "Find symbol" msgstr "シンボルを検索" @@ -5329,7 +5348,7 @@ msgstr "" "キーの組み合わせや、アクションの説明を入力して、キーボードショートカットを検" "索します" -#: LiteEditor/AccelTableBaseDlg.cpp:51 wxcrafter/menu_item_wrapper.cpp:34 +#: LiteEditor/AccelTableBaseDlg.cpp:51 wxcrafter/menu_item_wrapper.cpp:35 msgid "Keyboard Shortcut" msgstr "キーボードショートカット" @@ -5360,55 +5379,55 @@ msgid "" msgstr "" "保存されていない変更があります。構成を切り替える前に、変更を保存しますか？" -#: LiteEditor/BuildTab.cpp:295 +#: LiteEditor/BuildTab.cpp:289 msgid "Copy all" msgstr "全てコピー" -#: LiteEditor/BuildTab.cpp:361 +#: LiteEditor/BuildTab.cpp:355 msgid "A file with the same name already exists, continue?" msgstr "同じ名前のファイルが既に存在します。続行しますか？" -#: LiteEditor/BuildTab.cpp:409 +#: LiteEditor/BuildTab.cpp:403 msgid "total time" msgstr "合計時間" -#: LiteEditor/BuildTab.cpp:410 +#: LiteEditor/BuildTab.cpp:404 msgid "seconds" msgstr "秒" -#: LiteEditor/BuildTab.cpp:416 +#: LiteEditor/BuildTab.cpp:410 msgid "(Build cancelled by the user)\n" msgstr "(ユーザーによりビルドが取り消されました)\n" -#: LiteEditor/BuildTab.cpp:424 +#: LiteEditor/BuildTab.cpp:418 msgid "==== build ended with " msgstr "==== ビルドは終了しましたが、" -#: LiteEditor/BuildTab.cpp:425 +#: LiteEditor/BuildTab.cpp:419 msgid "errors" msgstr "エラーがありました" -#: LiteEditor/BuildTab.cpp:427 +#: LiteEditor/BuildTab.cpp:421 msgid "=== build ended with " msgstr "=== ビルドは終了しましたが、" -#: LiteEditor/BuildTab.cpp:428 +#: LiteEditor/BuildTab.cpp:422 msgid "warnings" msgstr "警告がありました" -#: LiteEditor/BuildTab.cpp:430 +#: LiteEditor/BuildTab.cpp:424 msgid "=== build completed " msgstr "=== ビルドが正常に" -#: LiteEditor/BuildTab.cpp:431 +#: LiteEditor/BuildTab.cpp:425 msgid "successfully" msgstr "完了しました" -#: LiteEditor/BuildTab.cpp:433 +#: LiteEditor/BuildTab.cpp:427 msgid " errors, " msgstr " 件のエラー, " -#: LiteEditor/BuildTab.cpp:433 +#: LiteEditor/BuildTab.cpp:427 msgid " warnings)" msgstr " 件の警告)" @@ -5439,7 +5458,8 @@ msgid "Switch" msgstr "スイッチ" #: LiteEditor/CompilerMainPage.cpp:84 LiteEditor/CompilerMainPage.cpp:90 -#: Runtime/templates/projects/executable-wxcrafter-frame/wxcrafter.cpp:40 +#: LiteEditor/frame.cpp:1044 +#: Runtime/templates/projects/executable-wxcrafter-frame/wxcrafter.cpp:42 #: codelite-cli/codelite-client/wxcrafter.cpp:113 #: codelite_terminal/wxcrafter.cpp:70 codelitephp/php-plugin/php.cpp:507 msgid "Help" @@ -5709,7 +5729,7 @@ msgstr "ドキュメント" msgid "Click to open a web browser in CodeLite's documentation page" msgstr "クリックで CodeLite のドキュメントページをウェブブラウザーに開きます" -#: LiteEditor/acceltabledlg.cpp:155 +#: LiteEditor/acceltabledlg.cpp:153 #, c-format msgid "" "'%s' is already assigned to: '%s'\n" @@ -5748,9 +5768,9 @@ msgstr "この名前のコンパイラーが既に存在します" #: LiteEditor/advanced_settings.cpp:106 LiteEditor/edit_configuration.cpp:179 #: LiteEditor/fileview.cpp:853 LiteEditor/fileview.cpp:894 -#: LiteEditor/fileview.cpp:1117 LiteEditor/frame.cpp:2366 -#: LiteEditor/mainbook.cpp:287 LiteEditor/manager.cpp:2788 -#: LiteEditor/manager.cpp:2839 LiteEditor/manager.cpp:2877 +#: LiteEditor/fileview.cpp:1117 LiteEditor/frame.cpp:2526 +#: LiteEditor/mainbook.cpp:287 LiteEditor/manager.cpp:2789 +#: LiteEditor/manager.cpp:2840 LiteEditor/manager.cpp:2878 #: LiteEditor/syntaxhighlightdlg.cpp:686 Plugin/EnvironmentVariablesDlg.cpp:122 #: Plugin/clTreeCtrlPanel.cpp:598 Subversion2/subversion_view.cpp:716 #: Subversion2/subversion_view.cpp:1306 Subversion2/svn_checkout_dialog.cpp:84 @@ -5781,7 +5801,7 @@ msgstr "新しいコンパイラーが見つかりました！" msgid "Set a name to the compiler" msgstr "コンパイラーに名前を設定" -#: LiteEditor/app.cpp:1059 LiteEditor/fileexplorer.cpp:82 +#: LiteEditor/app.cpp:1061 LiteEditor/fileexplorer.cpp:82 #: LiteEditor/workspace_pane.cpp:169 LiteEditor/workspace_pane.cpp:360 #: LiteEditor/workspace_pane.cpp:384 LiteEditor/workspace_pane.cpp:385 msgid "Explorer" @@ -5791,7 +5811,7 @@ msgstr "エクスプローラー" msgid "Debugger to use:" msgstr "使用するデバッガー:" -#: LiteEditor/attachdbgprocbasedlg.cpp:47 wxcrafter/wxgui_defs.h:190 +#: LiteEditor/attachdbgprocbasedlg.cpp:47 wxcrafter/wxgui_defs.h:196 msgid "Filter:" msgstr "フィルター:" @@ -5831,12 +5851,12 @@ msgstr "全てチェック解除 (&U)" #: LiteEditor/batchbuildbasedlg.cpp:79 Plugin/addincludefiledlg.cpp:62 #: Plugin/addincludefiledlg.cpp:63 wxcrafter/allocator_mgr.cpp:1031 -#: wxcrafter/wxguicraft_main_view.cpp:218 +#: wxcrafter/wxguicraft_main_view.cpp:217 msgid "Move Up" msgstr "上へ移動" #: LiteEditor/batchbuildbasedlg.cpp:82 wxcrafter/allocator_mgr.cpp:1032 -#: wxcrafter/wxguicraft_main_view.cpp:219 +#: wxcrafter/wxguicraft_main_view.cpp:218 msgid "Move Down" msgstr "下へ移動" @@ -5844,7 +5864,7 @@ msgstr "下へ移動" msgid "Batch Build" msgstr "一括ビルド" -#: LiteEditor/breakpointdlg.cpp:93 LiteEditor/cl_editor.cpp:3966 +#: LiteEditor/breakpointdlg.cpp:93 LiteEditor/cl_editor.cpp:3968 msgid "Breakpoint successfully deleted" msgstr "ブレークポイントを正常に削除しました" @@ -5856,25 +5876,25 @@ msgstr "全てのブレークポイントを削除しました" msgid "Pending Breakpoints reapplied" msgstr "保留ブレークポイントを再適用しました" -#: LiteEditor/breakpointdlg.cpp:172 +#: LiteEditor/breakpointdlg.cpp:173 msgid "Temp. " msgstr "一時的な" -#: LiteEditor/breakpointdlg.cpp:174 LiteEditor/breakpointdlgbase.cpp:133 +#: LiteEditor/breakpointdlg.cpp:175 LiteEditor/breakpointdlgbase.cpp:133 #: LiteEditor/breakpointpropertiesdlg.cpp:237 msgid "Breakpoint" msgstr "ブレークポイント" -#: LiteEditor/breakpointdlg.cpp:174 LiteEditor/breakpointdlgbase.cpp:248 +#: LiteEditor/breakpointdlg.cpp:175 LiteEditor/breakpointdlgbase.cpp:248 #: LiteEditor/breakpointpropertiesdlg.cpp:110 msgid "Watchpoint" msgstr "ウォッチポイント" -#: LiteEditor/breakpointdlg.cpp:179 +#: LiteEditor/breakpointdlg.cpp:180 msgid "disabled" msgstr "無効" -#: LiteEditor/breakpointdlg.cpp:211 +#: LiteEditor/breakpointdlg.cpp:212 msgid "Edit Breakpoint..." msgstr "ブレークポイントを編集..." @@ -6255,7 +6275,7 @@ msgstr "ブレークポイント、またはウォッチポイントを作成" msgid "Watchpoint successfully added" msgstr "ウォッチポイントを正常に追加しました" -#: LiteEditor/breakpointsmgr.cpp:140 LiteEditor/cl_editor.cpp:3938 +#: LiteEditor/breakpointsmgr.cpp:140 LiteEditor/cl_editor.cpp:3940 msgid "Breakpoint successfully added" msgstr "ブレークポイントを正常に追加しました" @@ -6553,7 +6573,7 @@ msgstr "ブックマークを追加" msgid "Remove Bookmark" msgstr "ブックマークを削除" -#: LiteEditor/cl_editor.cpp:3845 +#: LiteEditor/cl_editor.cpp:3845 LiteEditor/frame.cpp:1059 msgid "Remove All Bookmarks" msgstr "全てのブックマークを削除" @@ -6605,53 +6625,53 @@ msgstr "条件付きブレークポイントを作成" msgid "Enter the condition statement" msgstr "条件文を入力" -#: LiteEditor/cl_editor.cpp:3933 +#: LiteEditor/cl_editor.cpp:3935 msgid "Failed to insert breakpoint" msgstr "ブレークポイントの挿入に失敗しました" -#: LiteEditor/cl_editor.cpp:3940 +#: LiteEditor/cl_editor.cpp:3942 msgid "Temporary " msgstr "一時的な" -#: LiteEditor/cl_editor.cpp:3942 +#: LiteEditor/cl_editor.cpp:3944 msgid "Disabled " msgstr "無効化した" -#: LiteEditor/cl_editor.cpp:3944 +#: LiteEditor/cl_editor.cpp:3946 msgid "Conditional " msgstr "条件付き" -#: LiteEditor/cl_editor.cpp:3971 +#: LiteEditor/cl_editor.cpp:3973 msgid "No breakpoint found on this line" msgstr "この行にブレークポイントは見つかりません" -#: LiteEditor/cl_editor.cpp:3974 +#: LiteEditor/cl_editor.cpp:3976 msgid "Breakpoint deletion failed" msgstr "ブレークポイントの削除に失敗しました" -#: LiteEditor/cl_editor.cpp:3977 +#: LiteEditor/cl_editor.cpp:3979 msgid "Breakpoint not deleted" msgstr "ブレークポイントは削除されませんでした" -#: LiteEditor/cl_editor.cpp:4149 +#: LiteEditor/cl_editor.cpp:4151 msgid "More Watches" msgstr "他のウォッチ" -#: LiteEditor/cl_editor.cpp:5114 +#: LiteEditor/cl_editor.cpp:5116 msgid "Watch" msgstr "ウォッチ" -#: LiteEditor/cl_editor.cpp:5114 +#: LiteEditor/cl_editor.cpp:5116 msgid "as" msgstr "- 型" -#: LiteEditor/cl_editor.cpp:5917 LiteEditor/cl_editor.cpp:5958 +#: LiteEditor/cl_editor.cpp:5919 LiteEditor/cl_editor.cpp:5960 #: Plugin/clPluginsFindBar.cpp:676 Plugin/clPluginsFindBar.cpp:900 #: Plugin/clPluginsFindBar.cpp:1039 msgid " matches" msgstr " 件の一致" -#: LiteEditor/cl_editor.cpp:5917 LiteEditor/cl_editor.cpp:5958 +#: LiteEditor/cl_editor.cpp:5919 LiteEditor/cl_editor.cpp:5960 #: Plugin/clPluginsFindBar.cpp:676 msgid "Found and selected " msgstr "発見箇所を選択しました: " @@ -6660,7 +6680,8 @@ msgstr "発見箇所を選択しました: " msgid "Ask me for each file" msgstr "各ファイルごとに尋ねる" -#: LiteEditor/close_all_dlg.cpp:70 Runtime/rc/menu.xrc:87 +#: LiteEditor/close_all_dlg.cpp:70 LiteEditor/frame.cpp:1039 +#: Runtime/rc/menu.xrc:87 msgid "Save all files" msgstr "全てのファイルを保存" @@ -6672,8 +6693,8 @@ msgstr "全てのファイルへの変更を破棄" msgid "Some of the files are modified, what action should CodeLite take?" msgstr "一部のファイルが変更されています。どうしますか？" -#: LiteEditor/close_all_dlg.h:67 Runtime/rc/menu.xrc:108 -#: Runtime/rc/menu.xrc:764 Runtime/rc/menu.xrc:783 +#: LiteEditor/close_all_dlg.h:67 LiteEditor/frame.cpp:1041 +#: Runtime/rc/menu.xrc:108 Runtime/rc/menu.xrc:764 Runtime/rc/menu.xrc:783 msgid "Close All" msgstr "全て閉じる" @@ -6851,7 +6872,7 @@ msgstr "コンパイラーのエラーパターン:" #: LiteEditor/reconcileprojectbase.cpp:349 #: LiteEditor/reconcileprojectbase.cpp:380 SnipWiz/editsnippetsbasedlg.cpp:98 #: SnipWiz/templateclassbasedlg.cpp:205 SpellChecker/spellcheck.cpp:225 -#: SpellChecker/wxcrafter.cpp:236 Subversion2/subversion2.cpp:298 +#: SpellChecker/wxcrafter.cpp:236 Subversion2/subversion2.cpp:304 #: cppchecker/cppchecksettingsdlgbase.cpp:132 #: cppchecker/cppchecksettingsdlgbase.cpp:170 #: cppchecker/cppchecksettingsdlgbase.cpp:221 @@ -7044,103 +7065,103 @@ msgstr "新しい構成名を入力:" msgid "New Configuration" msgstr "新しい構成" -#: LiteEditor/context_cpp.cpp:581 +#: LiteEditor/context_cpp.cpp:582 msgid "Open Include File \"" msgstr "インクルードファイルを開く \"" -#: LiteEditor/context_cpp.cpp:597 +#: LiteEditor/context_cpp.cpp:598 msgid "Add Forward Declaration for \"" msgstr "前方宣言を追加: \"" -#: LiteEditor/context_cpp.cpp:601 +#: LiteEditor/context_cpp.cpp:602 msgid "Add Include File for \"" msgstr "インクルードファイルを追加: \"" -#: LiteEditor/context_cpp.cpp:821 +#: LiteEditor/context_cpp.cpp:822 msgid "Multiple candidates found. Select a file to open:" msgstr "複数の候補が見つかりました。開くファイルを選択してください:" -#: LiteEditor/context_cpp.cpp:822 +#: LiteEditor/context_cpp.cpp:823 msgid "Swap Header/Source Implementation" msgstr "ヘッダー/ソースの実装を切り替え" -#: LiteEditor/context_cpp.cpp:844 +#: LiteEditor/context_cpp.cpp:845 msgid "No matched file was found, would you like to create one?" msgstr "一致するファイルが見つかりませんでした。作成しますか？" -#: LiteEditor/context_cpp.cpp:845 +#: LiteEditor/context_cpp.cpp:846 msgid "Create" msgstr "作成" -#: LiteEditor/context_cpp.cpp:845 +#: LiteEditor/context_cpp.cpp:846 msgid "Don't Create" msgstr "作成しない" -#: LiteEditor/context_cpp.cpp:846 LiteEditor/fileview.cpp:903 +#: LiteEditor/context_cpp.cpp:847 LiteEditor/fileview.cpp:903 #: Plugin/compile_request.cpp:93 Plugin/globals.h:448 Plugin/globals.h:465 #: codelitephp/php-plugin/php_workspace_view.cpp:817 #: codelitephp/php-plugin/php_workspace_view.cpp:835 msgid "Remember my answer and don't ask me again" msgstr "次回から確認しない" -#: LiteEditor/context_cpp.cpp:1193 +#: LiteEditor/context_cpp.cpp:1194 msgid "Seems like you have all the getters/setters you need..." msgstr "既に全てのゲッター/セッターが揃っているようです..." -#: LiteEditor/context_cpp.cpp:1193 LiteEditor/frame.cpp:4085 -#: LiteEditor/frame.cpp:4169 +#: LiteEditor/context_cpp.cpp:1194 LiteEditor/frame.cpp:4244 +#: LiteEditor/frame.cpp:4328 msgid "codelite" msgstr "CodeLite" -#: LiteEditor/context_cpp.cpp:1593 +#: LiteEditor/context_cpp.cpp:1603 msgid "Could not locate implementation file!" msgstr "実装ファイルが見つかりませんでした！" -#: LiteEditor/context_cpp.cpp:1607 +#: LiteEditor/context_cpp.cpp:1617 msgid "Could not read file: " msgstr "ファイルを読み取れませんでした: " -#: LiteEditor/context_cpp.cpp:1625 +#: LiteEditor/context_cpp.cpp:1644 msgid "No prototypes were found" msgstr "プロトタイプ宣言が見つかりませんでした" -#: LiteEditor/context_cpp.cpp:1634 +#: LiteEditor/context_cpp.cpp:1653 msgid "'Add Functions Implementation' can only work inside valid scope, got (" msgstr "'関数の実装を追加' は有効なスコープでのみ使えます。現在は (" -#: LiteEditor/context_cpp.cpp:1661 +#: LiteEditor/context_cpp.cpp:1680 msgid "No un-implemented functions found" msgstr "未実装の関数は見つかりません" -#: LiteEditor/context_cpp.cpp:2027 +#: LiteEditor/context_cpp.cpp:2046 msgid "Symbol renamed" msgstr "シンボル名が変更されました" -#: LiteEditor/context_cpp.cpp:2039 +#: LiteEditor/context_cpp.cpp:2058 msgid "Please save the file before retagging it" msgstr "タグを再生成する前に、ファイルを保存してください" -#: LiteEditor/context_cpp.cpp:2189 +#: LiteEditor/context_cpp.cpp:2208 msgid "Select file to open:" msgstr "開くファイルを選択:" -#: LiteEditor/context_cpp.cpp:2202 +#: LiteEditor/context_cpp.cpp:2221 msgid "Create File" msgstr "ファイルを作成" -#: LiteEditor/context_cpp.cpp:2202 +#: LiteEditor/context_cpp.cpp:2221 msgid "New File Name:" msgstr "新しいファイル名:" -#: LiteEditor/context_cpp.cpp:2550 +#: LiteEditor/context_cpp.cpp:2569 LiteEditor/frame.cpp:1054 msgid "Find Symbol" msgstr "シンボルを検索" -#: LiteEditor/context_cpp.cpp:2551 +#: LiteEditor/context_cpp.cpp:2570 msgid "Go to Declaration" msgstr "宣言へ移動" -#: LiteEditor/context_cpp.cpp:2552 +#: LiteEditor/context_cpp.cpp:2571 msgid "Go to Implementation" msgstr "実装へ移動" @@ -7193,7 +7214,7 @@ msgstr "デバッガーを選択:" #: LiteEditor/debugcoredumpbase.cpp:109 #: LiteEditor/editorsettingsdockingwindowsbase.cpp:396 -#: LiteEditor/frame.cpp:2936 Plugin/clFileSystemWorkspaceDlgBase.cpp:466 +#: LiteEditor/frame.cpp:3099 Plugin/clFileSystemWorkspaceDlgBase.cpp:466 #: Plugin/clStrings.h:7 Plugin/editor_config.cpp:459 #: Plugin/editor_config.cpp:496 codelitephp/php-plugin/php_ui.cpp:852 msgid "Debug" @@ -7362,9 +7383,9 @@ msgid "Use default Hex Display" msgstr "既定で 16 進数表示を使用" #: LiteEditor/debuggersettingsbasedlg.cpp:438 -#: wxcrafter/AuiToolBarTopLevel.cpp:22 wxcrafter/std_button_wrapper.cpp:31 -#: wxcrafter/tool_bar_item_wrapper.cpp:41 wxcrafter/toolbar_base_wrapper.cpp:37 -#: wxcrafter/toolbar_base_wrapper.cpp:183 wxcrafter/wxc_widget.cpp:141 +#: wxcrafter/AuiToolBarTopLevel.cpp:24 wxcrafter/std_button_wrapper.cpp:31 +#: wxcrafter/tool_bar_item_wrapper.cpp:41 wxcrafter/toolbar_base_wrapper.cpp:39 +#: wxcrafter/toolbar_base_wrapper.cpp:216 wxcrafter/wxc_widget.cpp:140 msgid "Tooltip" msgstr "ツールチップ" @@ -7501,7 +7522,7 @@ msgstr "利用できるセット:" msgid "Current function:" msgstr "現在の関数:" -#: LiteEditor/debuggersettingsbasedlg.cpp:859 wxcrafter/gui.cpp:643 +#: LiteEditor/debuggersettingsbasedlg.cpp:859 msgid "Register" msgstr "レジスター" @@ -7568,7 +7589,7 @@ msgstr "新しい名前を入力:" #: LiteEditor/edit_configuration.cpp:143 LiteEditor/edit_configuration.cpp:163 #: LiteEditor/edit_workspace_conf_dlg.cpp:136 Plugin/clRemoteDirCtrl.cpp:262 -#: Plugin/clTreeCtrlPanel.cpp:153 Subversion2/subversion2.cpp:301 +#: Plugin/clTreeCtrlPanel.cpp:153 Subversion2/subversion2.cpp:307 #: Subversion2/subversion_view.cpp:462 #: codelitephp/php-plugin/php_workspace_view.cpp:296 #: codelitephp/php-plugin/php_workspace_view.cpp:327 @@ -7671,10 +7692,10 @@ msgstr "水平スクロールバーの幅を自動調整" msgid "Auto adjust the horizontal toolbar to fit to the page content" msgstr "ページの内容に合わせて、水平ツールバーを自動調整します" -#: LiteEditor/editorframe.cpp:67 LiteEditor/frame.cpp:1401 +#: LiteEditor/editorframe.cpp:67 LiteEditor/frame.cpp:1552 #: LiteEditor/quickfindbarbase.cpp:50 Plugin/DiffSideBySidePanel.cpp:97 -#: Plugin/quickfindbarbase.cpp:50 wxcrafter/gui.cpp:147 wxcrafter/main.cpp:214 -#: wxcrafter/main.cpp:815 wxcrafter/main.cpp:837 +#: Plugin/quickfindbarbase.cpp:50 cscope/cscope.cpp:103 wxcrafter/gui.cpp:147 +#: wxcrafter/main.cpp:212 wxcrafter/main.cpp:798 wxcrafter/main.cpp:820 msgid "Find" msgstr "検索" @@ -7733,8 +7754,8 @@ msgid "Whitespaces" msgstr "空白" #: LiteEditor/editoroptionsgeneralguidespanelbase.cpp:73 -#: LiteEditor/editorsettingslocal.cpp:80 Plugin/clBoostrapWizardBase.cpp:251 -#: Runtime/rc/menu.xrc:287 +#: LiteEditor/editorsettingslocal.cpp:80 LiteEditor/frame.cpp:1108 +#: Plugin/clBoostrapWizardBase.cpp:251 Runtime/rc/menu.xrc:287 msgid "Invisible" msgstr "非表示" @@ -7769,7 +7790,7 @@ msgid "Unix (LF)" msgstr "Unix (LF)" #: LiteEditor/editoroptionsgeneralguidespanelbase.cpp:88 -#: wxcrafter/styled_text_ctrl_wrapper.cpp:201 wxcrafter/wxgui_defs.h:219 +#: wxcrafter/styled_text_ctrl_wrapper.cpp:201 wxcrafter/wxgui_defs.h:225 msgid "EOL Mode" msgstr "改行コード" @@ -7963,7 +7984,7 @@ msgid "Columns per tab character in document:" msgstr "タブ文字の列幅:" #: LiteEditor/editoroptionsgeneralrightmarginpanelbase.cpp:45 -#: wxcrafter/wxgui_defs.h:125 +#: wxcrafter/wxgui_defs.h:131 msgid "Disabled" msgstr "無効" @@ -8299,6 +8320,7 @@ msgstr "" "ンドウを移動できます" #: LiteEditor/editorsettingsdockingwindowsbase.cpp:234 +#: LiteEditor/frame.cpp:1101 msgid "Navigation Bar" msgstr "ナビゲーションバー" @@ -8373,9 +8395,9 @@ msgstr "" "際に有用です。" #: LiteEditor/editorsettingsdockingwindowsbase.cpp:308 -#: Plugin/clRemoteFinderHelper.cpp:104 Plugin/clStrings.h:4 -#: Plugin/editor_config.cpp:451 Plugin/editor_config.cpp:488 -#: SFTP/SFTPStatusPage.cpp:195 SFTP/UI.cpp:82 +#: LiteEditor/frame.cpp:1046 Plugin/clRemoteFinderHelper.cpp:104 +#: Plugin/clStrings.h:4 Plugin/editor_config.cpp:451 +#: Plugin/editor_config.cpp:488 SFTP/SFTPStatusPage.cpp:195 SFTP/UI.cpp:82 msgid "Search" msgstr "検索" @@ -8399,7 +8421,7 @@ msgstr "" "ません。" #: LiteEditor/editorsettingsdockingwindowsbase.cpp:316 -#: LiteEditor/frame.cpp:1402 LiteEditor/project_settings_base_dlg.cpp:389 +#: LiteEditor/frame.cpp:1553 LiteEditor/project_settings_base_dlg.cpp:389 #: LiteEditor/quickfindbarbase.cpp:74 Plugin/clStrings.h:8 #: Plugin/editor_config.cpp:453 Plugin/editor_config.cpp:490 #: Plugin/quickfindbarbase.cpp:74 @@ -8423,21 +8445,24 @@ msgstr "タスク" #: LiteEditor/editorsettingsdockingwindowsbase.cpp:364 #: Plugin/editor_config.cpp:467 Plugin/editor_config.cpp:504 -#: cppchecker/cppchecker.cpp:131 cppchecker/cppchecker.cpp:132 -#: cppchecker/cppchecker.cpp:151 cppchecker/cppchecker.cpp:159 -#: cppchecker/cppchecker.cpp:165 cppchecker/cppchecker.cpp:171 -#: cppchecker/cppchecker.cpp:663 cppchecker/cppchecksettingsdlg.cpp:183 +#: cppchecker/cppchecker.cpp:130 cppchecker/cppchecker.cpp:139 +#: cppchecker/cppchecker.cpp:140 cppchecker/cppchecker.cpp:159 +#: cppchecker/cppchecker.cpp:167 cppchecker/cppchecker.cpp:173 +#: cppchecker/cppchecker.cpp:179 cppchecker/cppchecker.cpp:672 +#: cppchecker/cppchecksettingsdlg.cpp:183 #: cppchecker/cppchecksettingsdlg.cpp:203 msgid "CppCheck" msgstr "C++ チェック" #: LiteEditor/editorsettingsdockingwindowsbase.cpp:371 #: Plugin/editor_config.cpp:469 Plugin/editor_config.cpp:506 +#: Subversion2/subversion2.cpp:216 msgid "Subversion" msgstr "Subversion" #: LiteEditor/editorsettingsdockingwindowsbase.cpp:380 -#: Plugin/editor_config.cpp:471 cscope/cscope.cpp:54 cscope/cscope.cpp:688 +#: Plugin/editor_config.cpp:471 cscope/cscope.cpp:56 cscope/cscope.cpp:102 +#: cscope/cscope.cpp:688 msgid "CScope" msgstr "CScope" @@ -8964,7 +8989,7 @@ msgstr "削除しますか '" msgid "Remember my answer and apply it all files" msgstr "次回から確認せず、全てのファイルに適用" -#: LiteEditor/fileview.cpp:860 LiteEditor/frame.cpp:2028 +#: LiteEditor/fileview.cpp:860 LiteEditor/frame.cpp:2182 msgid "Are you sure?" msgstr "よろしいですか？" @@ -8976,8 +9001,8 @@ msgstr "' をディスクからも削除しますか？" msgid "Do you also want to delete the file '" msgstr "ファイル '" -#: LiteEditor/fileview.cpp:902 LiteEditor/frame.cpp:3668 -#: LiteEditor/frame.cpp:4715 LiteEditor/pluginmgrdlg.cpp:127 +#: LiteEditor/fileview.cpp:902 LiteEditor/frame.cpp:3824 +#: LiteEditor/frame.cpp:4880 LiteEditor/pluginmgrdlg.cpp:127 #: Plugin/compile_request.cpp:92 Plugin/globals.h:447 Plugin/globals.h:465 #: codelitephp/php-plugin/php_workspace_view.cpp:816 #: codelitephp/php-plugin/php_workspace_view.cpp:834 @@ -8985,8 +9010,8 @@ msgstr "ファイル '" msgid "No" msgstr "いいえ" -#: LiteEditor/fileview.cpp:902 LiteEditor/frame.cpp:3321 -#: LiteEditor/frame.cpp:4715 LiteEditor/pluginmgrdlg.cpp:127 +#: LiteEditor/fileview.cpp:902 LiteEditor/frame.cpp:3477 +#: LiteEditor/frame.cpp:4880 LiteEditor/pluginmgrdlg.cpp:127 #: Plugin/compile_request.cpp:92 Plugin/globals.h:446 Plugin/globals.h:464 #: codelitephp/php-plugin/php_workspace_view.cpp:816 #: codelitephp/php-plugin/php_workspace_view.cpp:834 @@ -9129,7 +9154,7 @@ msgstr "クリーン" msgid "Clean project" msgstr "プロジェクトをクリーン" -#: LiteEditor/fileview.cpp:2483 +#: LiteEditor/fileview.cpp:2483 LiteEditor/frame.cpp:964 msgid "Stop Build" msgstr "ビルドを停止" @@ -9142,9 +9167,10 @@ msgid "Build Order..." msgstr "ビルドの順番..." #: LiteEditor/fileview.cpp:2524 LiteEditor/fileview.cpp:2525 -#: Plugin/clEditorBar.cpp:234 Plugin/clTreeCtrlPanel.cpp:116 -#: Plugin/clTreeCtrlPanel.cpp:160 Runtime/rc/menu.xrc:833 -#: Runtime/rc/menu.xrc:1052 codelitephp/php-plugin/php_workspace_view.cpp:300 +#: LiteEditor/frame.cpp:1062 Plugin/clEditorBar.cpp:234 +#: Plugin/clTreeCtrlPanel.cpp:116 Plugin/clTreeCtrlPanel.cpp:160 +#: Runtime/rc/menu.xrc:833 Runtime/rc/menu.xrc:1052 +#: codelitephp/php-plugin/php_workspace_view.cpp:300 #: codelitephp/php-plugin/php_workspace_view.cpp:329 #: codelitephp/php-plugin/php_workspace_view.cpp:358 #: codelitephp/php-plugin/php_workspace_view.cpp:395 @@ -9226,8 +9252,8 @@ msgstr "フォルダー名を入力:" msgid "New Folder Name" msgstr "新しいフォルダー名" -#: LiteEditor/fileview.cpp:2896 LiteEditor/frame.cpp:2129 -#: codelitephp/php-plugin/php_workspace_view.cpp:1437 wxcrafter/main.cpp:207 +#: LiteEditor/fileview.cpp:2896 LiteEditor/frame.cpp:2285 +#: codelitephp/php-plugin/php_workspace_view.cpp:1437 wxcrafter/main.cpp:205 msgid "Open Project" msgstr "プロジェクトを開く" @@ -9440,8 +9466,8 @@ msgstr "削除" msgid "Remove the selected path" msgstr "選択したパスを削除" -#: LiteEditor/findinfiles_dlg.h:243 LiteEditor/frame.cpp:1403 -#: LiteEditor/frame.cpp:1404 Runtime/rc/menu.xrc:420 +#: LiteEditor/findinfiles_dlg.h:243 LiteEditor/frame.cpp:1554 +#: LiteEditor/frame.cpp:1555 Runtime/rc/menu.xrc:420 msgid "Find In Files" msgstr "ファイルから検索" @@ -9486,13 +9512,13 @@ msgid " ; Match whole word: " msgstr " ; 単語全体に一致: " #: LiteEditor/findresultstab.cpp:186 LiteEditor/findresultstab.cpp:187 -#: LiteEditor/findresultstab.cpp:188 Subversion2/subversion2.cpp:1343 -#: Subversion2/subversion2.cpp:1432 +#: LiteEditor/findresultstab.cpp:188 Subversion2/subversion2.cpp:1360 +#: Subversion2/subversion2.cpp:1449 msgid "false" msgstr "false" #: LiteEditor/findresultstab.cpp:186 LiteEditor/findresultstab.cpp:187 -#: LiteEditor/findresultstab.cpp:188 Subversion2/subversion2.cpp:1430 +#: LiteEditor/findresultstab.cpp:188 Subversion2/subversion2.cpp:1447 msgid "true" msgstr "true" @@ -9516,303 +9542,896 @@ msgstr "'ファイルから検索' 結果の始まりに到達しました" msgid "Search result is no longer valid" msgstr "検索結果が古くなっています" -#: LiteEditor/findresultstab.cpp:510 Subversion2/SvnCommitDialog.cpp:313 +#: LiteEditor/findresultstab.cpp:511 Subversion2/SvnCommitDialog.cpp:313 msgid "Clear History" msgstr "履歴を消去" -#: LiteEditor/findusagetab.cpp:239 LiteEditor/findusagetab.cpp:291 +#: LiteEditor/findusagetab.cpp:242 LiteEditor/findusagetab.cpp:294 msgid "Failed to open file: " msgstr "ファイルを開けませんでした: " -#: LiteEditor/findusagetab.cpp:282 Remoty/RemotyWorkspace.cpp:532 +#: LiteEditor/findusagetab.cpp:285 Remoty/RemotyWorkspace.cpp:532 msgid "Failed to download file: " msgstr "ファイルのダウンロードに失敗しました: " -#: LiteEditor/frame.cpp:831 -msgid "Edit::Split selection into multiple carets" -msgstr "編集::選択範囲を複数のキャレットに分ける" - -#: LiteEditor/frame.cpp:833 -msgid "Search::Toggle the Quick-Replace Bar" -msgstr "検索::クイック置換バーを切り替え" - -#: LiteEditor/frame.cpp:936 +#: LiteEditor/frame.cpp:914 msgid "CodeLite " msgstr "CodeLite " -#: LiteEditor/frame.cpp:939 -msgid "Switch to Next Tab" -msgstr "次のタブに切り替え" +#: LiteEditor/frame.cpp:953 +msgid "Configuration Manager..." +msgstr "構成マネージャー..." -#: LiteEditor/frame.cpp:940 -msgid "Switch to Previous Tab" -msgstr "前のタブに切り替え" +#: LiteEditor/frame.cpp:954 Runtime/rc/menu.xrc:577 +msgid "Batch Build..." +msgstr "一括ビルド..." -#: LiteEditor/frame.cpp:941 -msgid "Move Tab Left" -msgstr "タブを左へ移動" +#: LiteEditor/frame.cpp:957 Runtime/rc/menu.xrc:1059 +msgid "Build Project" +msgstr "プロジェクトをビルド" -#: LiteEditor/frame.cpp:942 -msgid "Move Tab Right" -msgstr "タブを右へ移動" +#: LiteEditor/frame.cpp:958 Runtime/rc/menu.xrc:567 Runtime/rc/menu.xrc:986 +msgid "Build Workspace" +msgstr "ワークスペースをビルド" -#: LiteEditor/frame.cpp:1060 Runtime/rc/menu.xrc:382 -msgid "Show Menu Bar" -msgstr "メニューバーを表示" +#: LiteEditor/frame.cpp:959 Runtime/rc/menu.xrc:573 +msgid "Rebuild Workspace" +msgstr "ワークスペースを再ビルド" -#: LiteEditor/frame.cpp:1066 Runtime/rc/menu.xrc:378 -msgid "Show Tool Bar" -msgstr "ツールバーを表示" +#: LiteEditor/frame.cpp:960 Runtime/rc/menu.xrc:570 Runtime/rc/menu.xrc:989 +msgid "Clean Workspace" +msgstr "ワークスペースをクリーン" -#: LiteEditor/frame.cpp:1078 -msgid "Show Output View " -msgstr "出力ビューを表示 " +#: LiteEditor/frame.cpp:961 +msgid "Compile Current File" +msgstr "現在のファイルをコンパイル" -#: LiteEditor/frame.cpp:1141 -msgid "Output View" -msgstr "出力ビュー" +#: LiteEditor/frame.cpp:962 +msgid "Compile Current File's Project" +msgstr "現在のファイルを持つプロジェクトをコンパイル" -#: LiteEditor/frame.cpp:1142 -msgid "Workspace View" -msgstr "ワークスペースビュー" +#: LiteEditor/frame.cpp:963 +msgid "Clean Project" +msgstr "プロジェクトをクリーン" -#: LiteEditor/frame.cpp:1144 wxcrafter/gui.h:168 wxcrafter/main.cpp:185 -#: wxcrafter/main.cpp:707 wxcrafter/wxcrafter_plugin.cpp:188 -#: wxcrafter/wxcrafter_plugin.cpp:189 wxcrafter/wxcrafter_plugin.cpp:416 -#: wxcrafter/wxcrafter_plugin.cpp:447 wxcrafter/wxcrafter_plugin.cpp:570 -#: wxcrafter/wxcrafter_plugin.cpp:692 wxcrafter/wxcrafter_plugin.cpp:745 -#: wxcrafter/wxcrafter_plugin.cpp:758 wxcrafter/wxcrafter_plugin.cpp:772 -#: wxcrafter/wxcrafter_plugin.cpp:991 wxcrafter/wxcrafter_plugin.cpp:1199 -#: wxcrafter/wxcrafter_plugin.cpp:1360 wxcrafter/wxcrafter_plugin.cpp:1368 -#: wxcrafter/wxcrafter_plugin.cpp:1370 wxcrafter/wxguicraft_main_view.cpp:1883 -#: wxcrafter/wxguicraft_main_view.cpp:1963 -msgid "wxCrafter" -msgstr "wxCrafter" +#: LiteEditor/frame.cpp:965 +msgid "Rebuild Project" +msgstr "プロジェクトを再ビルド" -#: LiteEditor/frame.cpp:1378 Plugin/clTreeCtrlPanel.cpp:102 -#: Plugin/clTreeCtrlPanel.cpp:434 codelitephp/php-plugin/php_ui.h:134 -#: codelitephp/php-plugin/php_workspace_view.cpp:644 -msgid "New File" -msgstr "新しいファイル" +#: LiteEditor/frame.cpp:966 +msgid "Build and Run Project" +msgstr "プロジェクトをビルドして実行" -#: LiteEditor/frame.cpp:1379 LiteEditor/frame.cpp:1958 -#: Subversion2/subversion_view.cpp:448 git/GitConsole.cpp:399 -msgid "Open File" -msgstr "ファイルを開く" +#: LiteEditor/frame.cpp:967 +msgid "Next Build Error" +msgstr "次のビルドエラー" -#: LiteEditor/frame.cpp:1380 LiteEditor/frame.cpp:1824 -msgid "Reload File" -msgstr "ファイルを再読み込み" +#: LiteEditor/frame.cpp:968 +msgid "Swap Header/Implementation file" +msgstr "ヘッダー/実装ファイルを切り替え" -#: LiteEditor/frame.cpp:1382 -msgid "Save All" -msgstr "全て保存" +#: LiteEditor/frame.cpp:969 +msgid "Goto Declaration" +msgstr "宣言へ移動" -#: LiteEditor/frame.cpp:1383 -msgid "Close File" -msgstr "ファイルを閉じる" +#: LiteEditor/frame.cpp:970 +msgid "Goto Implementation" +msgstr "実装へ移動" -#: LiteEditor/frame.cpp:1391 -msgid "Backward" -msgstr "後方" +#: LiteEditor/frame.cpp:971 +msgid "Open Include File" +msgstr "インクルードファイルを開く" -#: LiteEditor/frame.cpp:1392 -msgid "Forward" -msgstr "前方" +#: LiteEditor/frame.cpp:972 +msgid "Add Include File" +msgstr "インクルードファイルを追加" -#: LiteEditor/frame.cpp:1398 LiteEditor/frame.cpp:1399 Runtime/rc/menu.xrc:901 -msgid "Toggle Bookmark" -msgstr "ブックマークを切り替え" +#: LiteEditor/frame.cpp:973 +msgid "C++ | Code Generation / Refactoring" +msgstr "C++ | コードの生成 / リファクタリング" -#: LiteEditor/frame.cpp:1405 LiteEditor/frame.cpp:1406 -msgid "Find Resource In Workspace" -msgstr "ワークスペースからリソースを検索" +#: LiteEditor/frame.cpp:974 Runtime/rc/menu.xrc:855 +msgid "Generate Setters/Getters..." +msgstr "セッター/ゲッターを生成..." -#: LiteEditor/frame.cpp:1407 -msgid "Highlight Word" -msgstr "単語を強調表示" +#: LiteEditor/frame.cpp:975 Runtime/rc/menu.xrc:866 +msgid "Move Function Implementation to..." +msgstr "関数の実装を移動..." -#: LiteEditor/frame.cpp:1408 -msgid "Highlight Matching Words" -msgstr "一致する単語を強調表示" +#: LiteEditor/frame.cpp:976 Runtime/rc/menu.xrc:869 +msgid "Add Function Implementation..." +msgstr "関数の実装を追加..." -#: LiteEditor/frame.cpp:1415 LiteEditor/frame.cpp:1416 -#: LiteEditor/workspacetab.cpp:153 LiteEditor/workspacetab.cpp:154 -#: LiteEditor/workspacetab.cpp:580 Plugin/clFileSystemWorkspaceView.cpp:29 -msgid "Build Active Project" -msgstr "アクティブなプロジェクトをビルド" +#: LiteEditor/frame.cpp:977 Runtime/rc/menu.xrc:872 +msgid "Implement all Un-implemented Functions..." +msgstr "未実装の関数を全て実装..." -#: LiteEditor/frame.cpp:1417 LiteEditor/frame.cpp:1418 -#: LiteEditor/workspacetab.cpp:567 Plugin/clFileSystemWorkspaceView.cpp:30 -msgid "Stop Current Build" -msgstr "現在のビルドを停止" +#: LiteEditor/frame.cpp:978 LiteEditor/project_settings_base_dlg.cpp:246 +#: LiteEditor/project_settings_dlg.cpp:109 +msgid "Debugger" +msgstr "デバッガー" -#: LiteEditor/frame.cpp:1419 LiteEditor/frame.cpp:1420 -msgid "Clean Active Project" -msgstr "アクティブなプロジェクトをクリーン" +#: LiteEditor/frame.cpp:978 +msgid "Start/Continue Debugger" +msgstr "デバッガーを開始/続行" -#: LiteEditor/frame.cpp:1422 LiteEditor/frame.cpp:1423 -#: LiteEditor/workspacetab.cpp:155 LiteEditor/workspacetab.cpp:156 -msgid "Run Active Project" -msgstr "アクティブなプロジェクトを実行" +#: LiteEditor/frame.cpp:979 +msgid "Restart Debugger" +msgstr "デバッガーを再起動" -#: LiteEditor/frame.cpp:1424 LiteEditor/frame.cpp:1425 -msgid "Stop Running Program" -msgstr "実行中のプログラムを停止" +#: LiteEditor/frame.cpp:980 +msgid "Attach to process..." +msgstr "プロセスにアタッチ..." -#: LiteEditor/frame.cpp:1431 LiteEditor/frame.cpp:1432 -msgid "Start or Continue debugger" -msgstr "デバッガーを開始、または続行" +#: LiteEditor/frame.cpp:981 Plugin/DebuggerToolBar.cpp:41 +msgid "Pause debugger" +msgstr "デバッガーを一時停止" -#: LiteEditor/frame.cpp:1447 -msgid "Applying your choices and restarting CodeLite" -msgstr "新しい設定を適用し、CodeLite を再起動しています" +#: LiteEditor/frame.cpp:982 Plugin/DebuggerToolBar.cpp:40 +msgid "Stop debugger" +msgstr "デバッガーを停止" -#: LiteEditor/frame.cpp:1449 -msgid "Applying your choices, this may take a few seconds" -msgstr "新しい設定を適用しています。しばらくお待ちください" +#: LiteEditor/frame.cpp:983 Plugin/DebuggerToolBar.cpp:46 +msgid "Step Into" +msgstr "ステップイン" -#: LiteEditor/frame.cpp:1651 -msgid "Eran Ifrah (Project admin)" -msgstr "Eran Ifrah (プロジェクトの管理者)" +#: LiteEditor/frame.cpp:984 Plugin/DebuggerToolBar.cpp:48 +msgid "Step Out" +msgstr "ステップアウト" -#: LiteEditor/frame.cpp:1652 Plugin/clAboutDialog.cpp:35 -msgid "David G. Hart" -msgstr "David G. Hart" +#: LiteEditor/frame.cpp:985 +msgid "Step Into Instruction" +msgstr "命令へステップイン" -#: LiteEditor/frame.cpp:1653 Plugin/clAboutDialog.cpp:38 -msgid "Frank Lichtner" -msgstr "Frank Lichtner" +#: LiteEditor/frame.cpp:986 Plugin/DebuggerToolBar.cpp:47 git/gitui.cpp:451 +#: git/gitui.cpp:1399 +msgid "Next" +msgstr "次" -#: LiteEditor/frame.cpp:1654 Plugin/clAboutDialog.cpp:39 -msgid "Jacek Kucharski" -msgstr "Jacek Kucharski" +#: LiteEditor/frame.cpp:987 Runtime/rc/menu.xrc:616 +msgid "Next Instruction" +msgstr "次の命令" -#: LiteEditor/frame.cpp:1655 Plugin/clAboutDialog.cpp:40 -msgid "Marrianne Gagnon" -msgstr "Marrianne Gagnon" +#: LiteEditor/frame.cpp:988 +msgid "Show Cursor" +msgstr "カーソルを表示" -#: LiteEditor/frame.cpp:1656 Plugin/clAboutDialog.cpp:41 -msgid "Scott Dolim" -msgstr "Scott Dolim" +#: LiteEditor/frame.cpp:991 Runtime/rc/menu.xrc:904 +msgid "Toggle Breakpoint" +msgstr "ブレークポイントを切り替え" -#: LiteEditor/frame.cpp:1659 -msgid "CodeLite Home" -msgstr "CodeLite ホーム" +#: LiteEditor/frame.cpp:992 +msgid "Disable All Breakpoints" +msgstr "全てのブレークポイントを無効化" -#: LiteEditor/frame.cpp:1668 Plugin/clAboutDialogBase.cpp:100 -msgid "CodeLite IDE" -msgstr "CodeLite IDE" +#: LiteEditor/frame.cpp:993 +msgid "Enable All Breakpoints" +msgstr "全てのブレークポイントを有効化" -#: LiteEditor/frame.cpp:1669 -msgid "A free, open source, C/C++/PHP and JavaScript IDE" -msgstr "フリーでオープンソースの C/C++, PHP, JavaScript 統合開発環境" +#: LiteEditor/frame.cpp:995 +msgid "Quick Debug..." +msgstr "クイックデバッグ..." -#: LiteEditor/frame.cpp:1823 -msgid "" -"' is modified\n" -"Continue with reload?" -msgstr "" -"' が変更されています\n" -"それでも再読み込みしますか？" +#: LiteEditor/frame.cpp:1001 +msgid "Duplicate Selection / Line" +msgstr "選択範囲 / 行を複製" -#: LiteEditor/frame.cpp:1823 -msgid "File '" -msgstr "ファイル '" +#: LiteEditor/frame.cpp:1002 +msgid "Delete to Line End" +msgstr "行の終了まで削除" -#: LiteEditor/frame.cpp:2011 -msgid "Please enter a name for the tab group" -msgstr "タブグループの名前を入力してください" +#: LiteEditor/frame.cpp:1003 +msgid "Delete to Line Start" +msgstr "行の開始まで削除" -#: LiteEditor/frame.cpp:2027 -msgid "There is already a file with this name. Do you want to overwrite it?" -msgstr "この名前のファイルが既に存在します。上書きしますか？" +#: LiteEditor/frame.cpp:1004 +msgid "Delete Line" +msgstr "行を削除" -#: LiteEditor/frame.cpp:2049 -msgid "Tab group saved" -msgstr "タブグループを保存しました" +#: LiteEditor/frame.cpp:1005 Runtime/rc/menu.xrc:174 +msgid "Copy Line" +msgstr "行をコピー" -#: LiteEditor/frame.cpp:2090 -msgid "Select the workspace type:" -msgstr "ワークスペースの種類を選択:" +#: LiteEditor/frame.cpp:1006 Runtime/rc/menu.xrc:177 +msgid "Cut Line" +msgstr "行を切り取り" -#: LiteEditor/frame.cpp:2366 -msgid "Build ended with errors. Continue?" -msgstr "ビルドがエラーで終了しました。続行しますか？" +#: LiteEditor/frame.cpp:1007 Runtime/rc/menu.xrc:156 +msgid "Split selection into lines" +msgstr "選択範囲を複数のキャレットに分ける" -#: LiteEditor/frame.cpp:2394 -msgid "Build starting..." -msgstr "ビルドを開始しています..." +#: LiteEditor/frame.cpp:1008 +msgid "Make Lowercase" +msgstr "小文字にする" -#: LiteEditor/frame.cpp:2586 -msgid "" -"Would you like to build the active project\n" -"before executing it?" -msgstr "" -"実行する前に、アクティブなプロジェクトを\n" -"ビルドしますか？" +#: LiteEditor/frame.cpp:1009 +msgid "Make Uppercase" +msgstr "大文字にする" -#: LiteEditor/frame.cpp:2587 -msgid "Build and Execute" -msgstr "ビルドして実行" +#: LiteEditor/frame.cpp:1010 Runtime/rc/menu.xrc:201 +msgid "Insert Comment Block" +msgstr "コメントのブロックを挿入" -#: LiteEditor/frame.cpp:2587 +#: LiteEditor/frame.cpp:1011 Runtime/rc/menu.xrc:198 +msgid "Comment Line" +msgstr "行をコメント化" + +#: LiteEditor/frame.cpp:1012 Runtime/rc/menu.xrc:195 +msgid "Comment Selection" +msgstr "選択範囲をコメント化" + +#: LiteEditor/frame.cpp:1013 +msgid "Transpose Lines" +msgstr "行を交換" + +#: LiteEditor/frame.cpp:1014 Runtime/rc/menu.xrc:183 +msgid "Move Line Up" +msgstr "行を上へ移動" + +#: LiteEditor/frame.cpp:1015 Runtime/rc/menu.xrc:186 +msgid "Move Line Down" +msgstr "行を下へ移動" + +#: LiteEditor/frame.cpp:1016 Runtime/rc/menu.xrc:221 +msgid "Convert Indentation to Tabs" +msgstr "インデントをタブに変換" + +#: LiteEditor/frame.cpp:1017 Runtime/rc/menu.xrc:224 +msgid "Convert Indentation to Spaces" +msgstr "インデントをスペースに変換" + +#: LiteEditor/frame.cpp:1018 Runtime/rc/menu.xrc:189 +msgid "Center Line in Editor" +msgstr "行を中心にスクロール" + +#: LiteEditor/frame.cpp:1019 Runtime/rc/menu.xrc:897 Runtime/rc/menu.xrc:932 +msgid "Select All" +msgstr "全て選択" + +#: LiteEditor/frame.cpp:1020 +msgid "Match Brace" +msgstr "対応する括弧に移動" + +#: LiteEditor/frame.cpp:1021 +msgid "Select to Brace" +msgstr "対応する括弧までを選択" + +#: LiteEditor/frame.cpp:1022 +msgid "Code Complete" +msgstr "コードを補完" + +#: LiteEditor/frame.cpp:1023 +msgid "Complete Word" +msgstr "単語を補完" + +#: LiteEditor/frame.cpp:1024 +msgid "Display Function Calltip" +msgstr "関数呼び出しのヒントを表示" + +#: LiteEditor/frame.cpp:1025 Plugin/clStatusBar.cpp:508 Runtime/rc/menu.xrc:214 +msgid "Convert to Windows Format" +msgstr "Windows 形式に変換" + +#: LiteEditor/frame.cpp:1026 Runtime/rc/menu.xrc:217 +msgid "Convert to Unix Format" +msgstr "Unix 形式に変換" + +#: LiteEditor/frame.cpp:1027 +msgid "Trim Trailing Spaces" +msgstr "行末の空白を削除" + +#: LiteEditor/frame.cpp:1028 Runtime/rc/menu.xrc:821 +msgid "Copy Path Relative to Workspace" +msgstr "ワークスペースへの相対パスをコピー" + +#: LiteEditor/frame.cpp:1030 Runtime/rc/menu.xrc:817 +msgid "Copy Path to Clipboard" +msgstr "パスをクリップボードにコピー" + +#: LiteEditor/frame.cpp:1031 Runtime/rc/menu.xrc:814 +msgid "Copy Full Path to Clipboard" +msgstr "完全なパスをクリップボードにコピー" + +#: LiteEditor/frame.cpp:1032 Runtime/rc/menu.xrc:811 +msgid "Copy File Name to Clipboard" +msgstr "ファイル名をクリップボードにコピー" + +#: LiteEditor/frame.cpp:1033 LiteEditor/frame.cpp:1529 +#: Plugin/clTreeCtrlPanel.cpp:102 Plugin/clTreeCtrlPanel.cpp:434 +#: codelitephp/php-plugin/php_ui.h:134 +#: codelitephp/php-plugin/php_workspace_view.cpp:644 +msgid "New File" +msgstr "新しいファイル" + +#: LiteEditor/frame.cpp:1034 +msgid "Open File..." +msgstr "ファイルを開く..." + +#: LiteEditor/frame.cpp:1035 LiteEditor/frame.cpp:1531 +#: LiteEditor/frame.cpp:1977 +msgid "Reload File" +msgstr "ファイルを再読み込み" + +#: LiteEditor/frame.cpp:1036 +msgid "Save File" +msgstr "ファイルを保存" + +#: LiteEditor/frame.cpp:1037 +msgid "Duplicate Tab" +msgstr "タブを複製" + +#: LiteEditor/frame.cpp:1038 +msgid "Save As..." +msgstr "名前を付けて保存..." + +#: LiteEditor/frame.cpp:1042 Runtime/rc/menu.xrc:101 +msgid "Print..." +msgstr "印刷..." + +#: LiteEditor/frame.cpp:1043 +msgid "Exit" +msgstr "終了" + +#: LiteEditor/frame.cpp:1045 +msgid "Manage Plugins..." +msgstr "プラグインを管理..." + +#: LiteEditor/frame.cpp:1045 LiteEditor/plugindlgbase.cpp:51 +msgid "Plugins" +msgstr "プラグイン" + +#: LiteEditor/frame.cpp:1047 Runtime/rc/menu.xrc:465 +msgid "Grep Selection in the Current File" +msgstr "選択したテキストを現在のファイルから検索" + +#: LiteEditor/frame.cpp:1048 Runtime/rc/menu.xrc:468 +msgid "Grep Selection in the Workspace" +msgstr "選択したテキストをワークスペースから検索" + +#: LiteEditor/frame.cpp:1049 Runtime/rc/menu.xrc:471 +msgid "Search for Selection with default browser" +msgstr "選択したテキストを既定のブラウザーで検索" + +#: LiteEditor/frame.cpp:1050 Plugin/GotoAnythingBaseUI.h:54 +#: Runtime/rc/menu.xrc:485 +msgid "Goto Anything" +msgstr "CodeLite の機能を表示/実行" + +#: LiteEditor/frame.cpp:1051 +msgid "Find Previous" +msgstr "前を検索" + +#: LiteEditor/frame.cpp:1052 +msgid "Find Resource..." +msgstr "リソースを検索..." + +#: LiteEditor/frame.cpp:1053 +msgid "Quick Outline..." +msgstr "クイックアウトライン..." + +#: LiteEditor/frame.cpp:1055 +msgid "Search | Bookmarks" +msgstr "検索 | ブックマーク" + +#: LiteEditor/frame.cpp:1056 LiteEditor/frame.cpp:1549 +#: LiteEditor/frame.cpp:1550 Runtime/rc/menu.xrc:901 +msgid "Toggle Bookmark" +msgstr "ブックマークを切り替え" + +#: LiteEditor/frame.cpp:1057 Plugin/bookmark_manager.cpp:82 +msgid "Next Bookmark" +msgstr "次のブックマーク" + +#: LiteEditor/frame.cpp:1058 Plugin/bookmark_manager.cpp:83 +msgid "Previous Bookmark" +msgstr "前のブックマーク" + +#: LiteEditor/frame.cpp:1060 Plugin/bookmark_manager.cpp:106 +msgid "Remove All Currently-Active Bookmarks" +msgstr "現在アクティブなブックマークを全て削除" + +#: LiteEditor/frame.cpp:1061 +msgid "Open Shell From File Path" +msgstr "ファイルパスからシェルを開く" + +#: LiteEditor/frame.cpp:1063 +msgid "Search | Find In Files" +msgstr "検索 | ファイルから検索" + +#: LiteEditor/frame.cpp:1064 +msgid "Find In Files..." +msgstr "ファイルから検索..." + +#: LiteEditor/frame.cpp:1065 Runtime/rc/menu.xrc:425 +msgid "Go to Next 'Find In File' Match" +msgstr "次の 'ファイルから検索' の一致へ移動" + +#: LiteEditor/frame.cpp:1066 Runtime/rc/menu.xrc:428 +msgid "Go to Previous 'Find In File' Match" +msgstr "前の 'ファイルから検索' の一致へ移動" + +#: LiteEditor/frame.cpp:1067 +msgid "Search | Find and Replace" +msgstr "検索 | 検索と置換" + +#: LiteEditor/frame.cpp:1068 +msgid "Find..." +msgstr "検索..." + +#: LiteEditor/frame.cpp:1069 Runtime/rc/menu.xrc:412 +msgid "Quick Add Next" +msgstr "次をクイック追加" + +#: LiteEditor/frame.cpp:1070 Runtime/rc/menu.xrc:415 +msgid "Quick Find All" +msgstr "全てをクイック検索" + +#: LiteEditor/frame.cpp:1071 +msgid "Replace..." +msgstr "置換..." + +#: LiteEditor/frame.cpp:1072 +msgid "Find Next" +msgstr "次を検索" + +#: LiteEditor/frame.cpp:1073 Runtime/rc/menu.xrc:405 +msgid "Find Word At Caret" +msgstr "キャレットの単語を検索" + +#: LiteEditor/frame.cpp:1074 Runtime/rc/menu.xrc:408 +msgid "Find Word At Caret Backward" +msgstr "キャレットの単語を後方へ検索" + +#: LiteEditor/frame.cpp:1075 +msgid "Go To Previous Location" +msgstr "前の場所へ移動" + +#: LiteEditor/frame.cpp:1075 +msgid "Search | Go To" +msgstr "検索 | 指定先へ移動" + +#: LiteEditor/frame.cpp:1076 +msgid "Go To Forward Location" +msgstr "次の場所へ移動" + +#: LiteEditor/frame.cpp:1077 +msgid "Go To Line..." +msgstr "行へ移動..." + +#: LiteEditor/frame.cpp:1078 LiteEditor/options_base_dlg2.h:58 +#: Plugin/DiffSideBySidePanel.cpp:108 +msgid "Preferences" +msgstr "個人設定" + +#: LiteEditor/frame.cpp:1079 +msgid "Colours and Fonts..." +msgstr "色とフォント..." + +#: LiteEditor/frame.cpp:1080 +msgid "Keyboard shortcuts..." +msgstr "キーボードショートカット..." + +#: LiteEditor/frame.cpp:1081 +msgid "Environment Variables..." +msgstr "環境変数..." + +#: LiteEditor/frame.cpp:1082 +msgid "Build Settings..." +msgstr "ビルドの設定..." + +#: LiteEditor/frame.cpp:1083 +msgid "GDB Settings..." +msgstr "GDB の設定..." + +#: LiteEditor/frame.cpp:1084 +msgid "Code Completion..." +msgstr "コード補完..." + +#: LiteEditor/frame.cpp:1085 +msgid "Switch to Next Tab" +msgstr "次のタブに切り替え" + +#: LiteEditor/frame.cpp:1085 +msgid "Tab" +msgstr "タブ" + +#: LiteEditor/frame.cpp:1086 +msgid "Switch to Previous Tab" +msgstr "前のタブに切り替え" + +#: LiteEditor/frame.cpp:1087 +msgid "Move Tab Left" +msgstr "タブを左へ移動" + +#: LiteEditor/frame.cpp:1088 +msgid "Move Tab Right" +msgstr "タブを右へ移動" + +#: LiteEditor/frame.cpp:1089 LiteEditor/outputtabwindow.cpp:204 +#: LiteEditor/shelltab.cpp:216 +msgid "Word Wrap" +msgstr "単語を折り返す" + +#: LiteEditor/frame.cpp:1090 +msgid "Toggle Current Fold" +msgstr "現在のブロックを折り畳む/広げる" + +#: LiteEditor/frame.cpp:1091 +msgid "Toggle All Folds" +msgstr "全てのブロックを折り畳む/広げる" + +#: LiteEditor/frame.cpp:1092 +msgid "Toggle All Topmost Folds in Selection" +msgstr "選択箇所の最上位ブロックを全て折り畳む/広げる" + +#: LiteEditor/frame.cpp:1093 +msgid "Toggle Every Fold in Selection" +msgstr "選択しているブロックを全て折り畳む/広げる" + +#: LiteEditor/frame.cpp:1094 Plugin/clStatusBar.cpp:501 +msgid "Display EOL" +msgstr "改行コードを表示" + +#: LiteEditor/frame.cpp:1095 Runtime/rc/menu.xrc:305 +msgid "Next tab" +msgstr "次のタブ" + +#: LiteEditor/frame.cpp:1096 Runtime/rc/menu.xrc:308 +msgid "Previous tab" +msgstr "前のタブ" + +#: LiteEditor/frame.cpp:1097 Runtime/rc/menu.xrc:312 +msgid "Full Screen..." +msgstr "全画面表示..." + +#: LiteEditor/frame.cpp:1098 +msgid "Output Pane" +msgstr "出力ペイン" + +#: LiteEditor/frame.cpp:1099 +msgid "Workspace Pane" +msgstr "ワークスペースペイン" + +#: LiteEditor/frame.cpp:1100 +msgid "Debugger Pane" +msgstr "デバッガーペイン" + +#: LiteEditor/frame.cpp:1102 +msgid "Toggle All Panes" +msgstr "全てのペインを切り替え" + +#: LiteEditor/frame.cpp:1103 Runtime/rc/menu.xrc:369 +msgid "Toggle Minimal View" +msgstr "最小表示を切り替え" + +#: LiteEditor/frame.cpp:1104 LiteEditor/frame.cpp:1211 Runtime/rc/menu.xrc:382 +msgid "Show Menu Bar" +msgstr "メニューバーを表示" + +#: LiteEditor/frame.cpp:1105 Runtime/rc/menu.xrc:374 +msgid "Show Status Bar" +msgstr "ステータスバーを表示" + +#: LiteEditor/frame.cpp:1106 LiteEditor/frame.cpp:1217 Runtime/rc/menu.xrc:378 +msgid "Show Tool Bar" +msgstr "ツールバーを表示" + +#: LiteEditor/frame.cpp:1107 +msgid "View | Show Whitespace" +msgstr "表示 | 空白の表示" + +#: LiteEditor/frame.cpp:1109 Runtime/rc/menu.xrc:291 +msgid "Show Always" +msgstr "常に表示" + +#: LiteEditor/frame.cpp:1110 Runtime/rc/menu.xrc:295 +msgid "Visible After First Indent" +msgstr "最初のインデント後に表示" + +#: LiteEditor/frame.cpp:1111 Runtime/rc/menu.xrc:299 +msgid "Indentation Only" +msgstr "インデントのみ" + +#: LiteEditor/frame.cpp:1112 +msgid "View | Zoom" +msgstr "表示 | ズーム" + +#: LiteEditor/frame.cpp:1112 Runtime/rc/menu.xrc:275 +msgid "Zoom In" +msgstr "拡大" + +#: LiteEditor/frame.cpp:1113 Runtime/rc/menu.xrc:278 +msgid "Zoom Out" +msgstr "縮小" + +#: LiteEditor/frame.cpp:1114 Runtime/rc/menu.xrc:281 +msgid "Reset Zoom" +msgstr "ズームをリセット" + +#: LiteEditor/frame.cpp:1115 +msgid "New Workspace..." +msgstr "新しいワークスペース..." + +#: LiteEditor/frame.cpp:1115 LiteEditor/frame.cpp:5521 +#: LiteEditor/tabgroupbasedlgs.cpp:163 LiteEditor/workspace_pane.cpp:129 +#: LiteEditor/workspace_pane.cpp:156 LiteEditor/workspace_pane.cpp:362 +#: LiteEditor/workspace_pane.cpp:380 LiteEditor/workspace_pane.cpp:381 +msgid "Workspace" +msgstr "ワークスペース" + +#: LiteEditor/frame.cpp:1116 +msgid "Open Workspace..." +msgstr "ワークスペースを開く..." + +#: LiteEditor/frame.cpp:1117 Runtime/rc/menu.xrc:111 Runtime/rc/menu.xrc:1005 +#: WebTools/NodeJSWorkspaceView.cpp:75 +msgid "Close Workspace" +msgstr "ワークスペースを閉じる" + +#: LiteEditor/frame.cpp:1118 Runtime/rc/menu.xrc:1008 +#: codelitephp/PHPParser/php_workspace.cpp:488 +msgid "Reload Workspace" +msgstr "ワークスペースを再読み込み" + +#: LiteEditor/frame.cpp:1119 Runtime/rc/menu.xrc:1016 +msgid "Workspace Settings..." +msgstr "ワークスペースの設定..." + +#: LiteEditor/frame.cpp:1120 Runtime/rc/menu.xrc:1012 +msgid "Workspace Editor Preferences..." +msgstr "エディターの個人設定 (ワークスペース固有)..." + +#: LiteEditor/frame.cpp:1121 +msgid "Import other IDEs solution/workspace files..." +msgstr "他の IDE ソリューション/ワークスペースファイルをインポート..." + +#: LiteEditor/frame.cpp:1122 +msgid "Open Active Project Settings..." +msgstr "アクティブなプロジェクトの設定を開く..." + +#: LiteEditor/frame.cpp:1123 +msgid "Create New Project" +msgstr "新しいプロジェクトを作成" + +#: LiteEditor/frame.cpp:1124 Runtime/rc/menu.xrc:997 +msgid "Add an Existing Project" +msgstr "既存のプロジェクトを追加" + +#: LiteEditor/frame.cpp:1229 +msgid "Show Output View " +msgstr "出力ビューを表示 " + +#: LiteEditor/frame.cpp:1292 +msgid "Output View" +msgstr "出力ビュー" + +#: LiteEditor/frame.cpp:1293 +msgid "Workspace View" +msgstr "ワークスペースビュー" + +#: LiteEditor/frame.cpp:1295 wxcrafter/gui.h:167 wxcrafter/main.cpp:714 +#: wxcrafter/wxcrafter_plugin.cpp:187 wxcrafter/wxcrafter_plugin.cpp:188 +#: wxcrafter/wxcrafter_plugin.cpp:270 wxcrafter/wxcrafter_plugin.cpp:415 +#: wxcrafter/wxcrafter_plugin.cpp:446 wxcrafter/wxcrafter_plugin.cpp:569 +#: wxcrafter/wxcrafter_plugin.cpp:697 wxcrafter/wxcrafter_plugin.cpp:750 +#: wxcrafter/wxcrafter_plugin.cpp:763 wxcrafter/wxcrafter_plugin.cpp:777 +#: wxcrafter/wxcrafter_plugin.cpp:1001 wxcrafter/wxcrafter_plugin.cpp:1209 +#: wxcrafter/wxcrafter_plugin.cpp:1371 wxcrafter/wxcrafter_plugin.cpp:1379 +#: wxcrafter/wxcrafter_plugin.cpp:1381 wxcrafter/wxguicraft_main_view.cpp:1891 +#: wxcrafter/wxguicraft_main_view.cpp:1971 +msgid "wxCrafter" +msgstr "wxCrafter" + +#: LiteEditor/frame.cpp:1530 LiteEditor/frame.cpp:2112 +#: Subversion2/subversion_view.cpp:448 git/GitConsole.cpp:399 +msgid "Open File" +msgstr "ファイルを開く" + +#: LiteEditor/frame.cpp:1533 +msgid "Save All" +msgstr "全て保存" + +#: LiteEditor/frame.cpp:1534 +msgid "Close File" +msgstr "ファイルを閉じる" + +#: LiteEditor/frame.cpp:1542 +msgid "Backward" +msgstr "後方" + +#: LiteEditor/frame.cpp:1543 +msgid "Forward" +msgstr "前方" + +#: LiteEditor/frame.cpp:1556 LiteEditor/frame.cpp:1557 +msgid "Find Resource In Workspace" +msgstr "ワークスペースからリソースを検索" + +#: LiteEditor/frame.cpp:1558 +msgid "Highlight Word" +msgstr "単語を強調表示" + +#: LiteEditor/frame.cpp:1559 +msgid "Highlight Matching Words" +msgstr "一致する単語を強調表示" + +#: LiteEditor/frame.cpp:1566 LiteEditor/frame.cpp:1567 +#: LiteEditor/workspacetab.cpp:153 LiteEditor/workspacetab.cpp:154 +#: LiteEditor/workspacetab.cpp:580 Plugin/clFileSystemWorkspaceView.cpp:29 +msgid "Build Active Project" +msgstr "アクティブなプロジェクトをビルド" + +#: LiteEditor/frame.cpp:1568 LiteEditor/frame.cpp:1569 +#: LiteEditor/workspacetab.cpp:567 Plugin/clFileSystemWorkspaceView.cpp:30 +msgid "Stop Current Build" +msgstr "現在のビルドを停止" + +#: LiteEditor/frame.cpp:1570 LiteEditor/frame.cpp:1571 +msgid "Clean Active Project" +msgstr "アクティブなプロジェクトをクリーン" + +#: LiteEditor/frame.cpp:1573 LiteEditor/frame.cpp:1574 +#: LiteEditor/workspacetab.cpp:155 LiteEditor/workspacetab.cpp:156 +msgid "Run Active Project" +msgstr "アクティブなプロジェクトを実行" + +#: LiteEditor/frame.cpp:1575 LiteEditor/frame.cpp:1576 +msgid "Stop Running Program" +msgstr "実行中のプログラムを停止" + +#: LiteEditor/frame.cpp:1582 LiteEditor/frame.cpp:1583 +msgid "Start or Continue debugger" +msgstr "デバッガーを開始、または続行" + +#: LiteEditor/frame.cpp:1598 +msgid "Applying your choices and restarting CodeLite" +msgstr "新しい設定を適用し、CodeLite を再起動しています" + +#: LiteEditor/frame.cpp:1600 +msgid "Applying your choices, this may take a few seconds" +msgstr "新しい設定を適用しています。しばらくお待ちください" + +#: LiteEditor/frame.cpp:1803 +msgid "Eran Ifrah (Project admin)" +msgstr "Eran Ifrah (プロジェクトの管理者)" + +#: LiteEditor/frame.cpp:1804 Plugin/clAboutDialog.cpp:35 +msgid "David G. Hart" +msgstr "David G. Hart" + +#: LiteEditor/frame.cpp:1805 Plugin/clAboutDialog.cpp:38 +msgid "Frank Lichtner" +msgstr "Frank Lichtner" + +#: LiteEditor/frame.cpp:1806 Plugin/clAboutDialog.cpp:39 +msgid "Jacek Kucharski" +msgstr "Jacek Kucharski" + +#: LiteEditor/frame.cpp:1807 Plugin/clAboutDialog.cpp:40 +msgid "Marrianne Gagnon" +msgstr "Marrianne Gagnon" + +#: LiteEditor/frame.cpp:1808 Plugin/clAboutDialog.cpp:41 +msgid "Scott Dolim" +msgstr "Scott Dolim" + +#: LiteEditor/frame.cpp:1811 +msgid "CodeLite Home" +msgstr "CodeLite ホーム" + +#: LiteEditor/frame.cpp:1820 Plugin/clAboutDialogBase.cpp:100 +msgid "CodeLite IDE" +msgstr "CodeLite IDE" + +#: LiteEditor/frame.cpp:1821 +msgid "A free, open source, C/C++/PHP and JavaScript IDE" +msgstr "フリーでオープンソースの C/C++, PHP, JavaScript 統合開発環境" + +#: LiteEditor/frame.cpp:1976 +msgid "" +"' is modified\n" +"Continue with reload?" +msgstr "" +"' が変更されています\n" +"それでも再読み込みしますか？" + +#: LiteEditor/frame.cpp:1976 +msgid "File '" +msgstr "ファイル '" + +#: LiteEditor/frame.cpp:2165 +msgid "Please enter a name for the tab group" +msgstr "タブグループの名前を入力してください" + +#: LiteEditor/frame.cpp:2181 +msgid "There is already a file with this name. Do you want to overwrite it?" +msgstr "この名前のファイルが既に存在します。上書きしますか？" + +#: LiteEditor/frame.cpp:2203 +msgid "Tab group saved" +msgstr "タブグループを保存しました" + +#: LiteEditor/frame.cpp:2244 +msgid "Select the workspace type:" +msgstr "ワークスペースの種類を選択:" + +#: LiteEditor/frame.cpp:2526 +msgid "Build ended with errors. Continue?" +msgstr "ビルドがエラーで終了しました。続行しますか？" + +#: LiteEditor/frame.cpp:2554 +msgid "Build starting..." +msgstr "ビルドを開始しています..." + +#: LiteEditor/frame.cpp:2747 +msgid "" +"Would you like to build the active project\n" +"before executing it?" +msgstr "" +"実行する前に、アクティブなプロジェクトを\n" +"ビルドしますか？" + +#: LiteEditor/frame.cpp:2748 +msgid "Build and Execute" +msgstr "ビルドして実行" + +#: LiteEditor/frame.cpp:2748 msgid "Execute" msgstr "実行" -#: LiteEditor/frame.cpp:2661 +#: LiteEditor/frame.cpp:2822 msgid "A workspace reparse is needed" msgstr "ワークスペースの再解析が必要です" -#: LiteEditor/frame.cpp:2857 +#: LiteEditor/frame.cpp:3019 msgid "Open IDE Solution/Workspace File" msgstr "IDE ソリューション/ワークスペースファイルを開く" -#: LiteEditor/frame.cpp:2870 +#: LiteEditor/frame.cpp:3032 msgid "Choose compiler" msgstr "コンパイラーを選択" -#: LiteEditor/frame.cpp:2870 +#: LiteEditor/frame.cpp:3032 msgid "Select the compiler to use:" msgstr "使用するコンパイラーを選択:" -#: LiteEditor/frame.cpp:2927 +#: LiteEditor/frame.cpp:3090 msgid "Attempting to debug workspace with no active project? Ignoring." msgstr "" "アクティブなプロジェクトがないのに、ワークスペースをデバッグしようとしている" "みたいですね？無視します。" -#: LiteEditor/frame.cpp:2935 +#: LiteEditor/frame.cpp:3098 msgid "Would you like to build the project before debugging it?" msgstr "デバッグする前に、プロジェクトをビルドしますか？" -#: LiteEditor/frame.cpp:2936 +#: LiteEditor/frame.cpp:3099 msgid "Build and Debug" msgstr "ビルドしてデバッグ" -#: LiteEditor/frame.cpp:3320 +#: LiteEditor/frame.cpp:3476 msgid "" "CodeLite now offers a better editor colour theme support, would you like to " "fix this now?" msgstr "エディターの配色を自動調整できます。今すぐ行いますか？" -#: LiteEditor/frame.cpp:3661 +#: LiteEditor/frame.cpp:3817 msgid "You already have the latest version of CodeLite" msgstr "既に最新の CodeLite をお使いです" -#: LiteEditor/frame.cpp:3666 +#: LiteEditor/frame.cpp:3822 msgid "A new version of CodeLite is available for download" msgstr "新しいバージョンの CodeLite をダウンロードできます" -#: LiteEditor/frame.cpp:3668 +#: LiteEditor/frame.cpp:3824 msgid "Download" msgstr "ダウンロード" -#: LiteEditor/frame.cpp:4085 LiteEditor/frame.cpp:4169 +#: LiteEditor/frame.cpp:4244 LiteEditor/frame.cpp:4328 msgid "Could not start TTY console for debugger!" msgstr "デバッガー用の TTY コンソールを開始できませんでした！" -#: LiteEditor/frame.cpp:4407 +#: LiteEditor/frame.cpp:4571 msgid "" "Workspace or project settings have been modified outside of CodeLite\n" "Would you like to reload the workspace?" @@ -9820,54 +10439,47 @@ msgstr "" "ワークスペース、またはプロジェクトの設定が外部から変更されました\n" "ワークスペースを再読み込みしますか？" -#: LiteEditor/frame.cpp:4409 +#: LiteEditor/frame.cpp:4573 msgid "Not now" msgstr "今はしない" -#: LiteEditor/frame.cpp:4409 codelitephp/php-plugin/php_workspace_view.cpp:319 +#: LiteEditor/frame.cpp:4573 codelitephp/php-plugin/php_workspace_view.cpp:319 msgid "Reload workspace" msgstr "ワークスペースを再読み込み" -#: LiteEditor/frame.cpp:4714 +#: LiteEditor/frame.cpp:4879 msgid "A CodeLite restart is needed. Would you like to restart it now?" msgstr "CodeLite の再起動が必要です。今すぐ再起動しますか？" -#: LiteEditor/frame.cpp:4938 LiteEditor/frame.cpp:4956 +#: LiteEditor/frame.cpp:5105 LiteEditor/frame.cpp:5123 msgid "Perspective" msgstr "外観" -#: LiteEditor/frame.cpp:4952 Runtime/rc/menu.xrc:704 +#: LiteEditor/frame.cpp:5119 Runtime/rc/menu.xrc:704 msgid "Manage Perspectives..." msgstr "外観を管理..." -#: LiteEditor/frame.cpp:4953 Runtime/rc/menu.xrc:707 +#: LiteEditor/frame.cpp:5120 Runtime/rc/menu.xrc:707 msgid "Save Current Layout As..." msgstr "現在のレイアウトを保存..." -#: LiteEditor/frame.cpp:4954 Runtime/rc/menu.xrc:710 +#: LiteEditor/frame.cpp:5121 Runtime/rc/menu.xrc:710 msgid "Reset..." msgstr "リセット..." -#: LiteEditor/frame.cpp:5022 +#: LiteEditor/frame.cpp:5190 msgid "Project Only - Build" msgstr "プロジェクトのみ - ビルド" -#: LiteEditor/frame.cpp:5023 +#: LiteEditor/frame.cpp:5191 msgid "Project Only - Clean" msgstr "プロジェクトのみ - クリーン" -#: LiteEditor/frame.cpp:5336 LiteEditor/tabgroupbasedlgs.cpp:163 -#: LiteEditor/workspace_pane.cpp:129 LiteEditor/workspace_pane.cpp:156 -#: LiteEditor/workspace_pane.cpp:362 LiteEditor/workspace_pane.cpp:380 -#: LiteEditor/workspace_pane.cpp:381 -msgid "Workspace" -msgstr "ワークスペース" - -#: LiteEditor/frame.cpp:5344 Plugin/DiffUI.h:61 +#: LiteEditor/frame.cpp:5529 Plugin/DiffUI.h:61 msgid "Select Folder" msgstr "フォルダーを選択" -#: LiteEditor/frame.cpp:5908 +#: LiteEditor/frame.cpp:6098 msgid "Select Project" msgstr "プロジェクトを選択" @@ -9882,7 +10494,7 @@ msgid "" msgstr "このクラスでオーバーライドしたい関数を、下の一覧から選択します" #: LiteEditor/implementparentvirtualfunctionsbase.cpp:45 -#: wxcrafter/wxgui_defs.h:166 +#: wxcrafter/wxgui_defs.h:172 msgid "File:" msgstr "ファイル:" @@ -10052,7 +10664,7 @@ msgid "Overwrite it?" msgstr "上書きしますか？" #: LiteEditor/manager.cpp:594 MacBundler/macbundler.cpp:400 -#: cppchecker/cppchecker.cpp:492 cppchecker/cppchecker.cpp:634 +#: cppchecker/cppchecker.cpp:500 cppchecker/cppchecker.cpp:643 msgid "Warning" msgstr "警告" @@ -10148,23 +10760,23 @@ msgstr "プロジェクトが正しく設定されていることを確認して msgid "Could not launch terminal for debugger" msgstr "デバッガー用の端末を起動できませんでした" -#: LiteEditor/manager.cpp:2158 LiteEditor/manager.cpp:2169 +#: LiteEditor/manager.cpp:2159 LiteEditor/manager.cpp:2170 msgid "Failed to initialize debugger: " msgstr "デバッガーの初期化に失敗しました: " -#: LiteEditor/manager.cpp:2202 +#: LiteEditor/manager.cpp:2203 msgid "Debug session started successfully!\n" msgstr "デバッグセッションを正常に開始しました！\n" -#: LiteEditor/manager.cpp:2475 LiteEditor/manager.cpp:2478 +#: LiteEditor/manager.cpp:2476 LiteEditor/manager.cpp:2479 msgid "Program Received signal " msgstr "プログラムがシグナルを受信しました " -#: LiteEditor/manager.cpp:2479 +#: LiteEditor/manager.cpp:2480 msgid "Stack trace is available in the 'Call Stack' tab\n" msgstr "スタックトレースは 'コールスタック' タブで確認できます\n" -#: LiteEditor/manager.cpp:2504 +#: LiteEditor/manager.cpp:2505 msgid "" "Assertion failed!\n" "Stack trace is available in the 'Call Stack' tab\n" @@ -10172,7 +10784,7 @@ msgstr "" "アサートが失敗しました！\n" "スタックトレースは 'コールスタック' タブで確認できます\n" -#: LiteEditor/manager.cpp:2535 +#: LiteEditor/manager.cpp:2536 #, c-format msgid "" "Debugger exited with the following error string:\n" @@ -10181,24 +10793,24 @@ msgstr "" "デバッガーがエラー文字列で終了しました:\n" "%s" -#: LiteEditor/manager.cpp:2554 +#: LiteEditor/manager.cpp:2555 msgid "Continuing...\n" msgstr "続行しています...\n" -#: LiteEditor/manager.cpp:2788 LiteEditor/manager.cpp:2839 -#: LiteEditor/manager.cpp:2877 +#: LiteEditor/manager.cpp:2789 LiteEditor/manager.cpp:2840 +#: LiteEditor/manager.cpp:2878 msgid "This would terminate the current debug session, continue?" msgstr "現在のデバッグセッションを中断します。よろしいですか？" -#: LiteEditor/manager.cpp:2802 +#: LiteEditor/manager.cpp:2803 msgid "Compile Single File" msgstr "単一ファイルをコンパイル" -#: LiteEditor/manager.cpp:2802 +#: LiteEditor/manager.cpp:2803 msgid "Preprocess File" msgstr "ファイルをプリプロセッサーに通す" -#: LiteEditor/manager.cpp:3427 +#: LiteEditor/manager.cpp:3428 msgid "" "Build cancelled. The following compilers referred by the workspace could not " "be found:\n" @@ -10206,15 +10818,15 @@ msgstr "" "ビルドをキャンセルしました。ワークスペースが使用しているコンパイラーを見つけ" "られませんでした:\n" -#: LiteEditor/manager.cpp:3429 +#: LiteEditor/manager.cpp:3430 msgid "Please fix your project settings by selecting a valid compiler" msgstr "プロジェクトの設定から、有効なコンパイラーを選択してください" -#: LiteEditor/manager.cpp:3430 +#: LiteEditor/manager.cpp:3431 msgid "Build Aborted" msgstr "ビルドを中断しました" -#: LiteEditor/manager.cpp:3458 +#: LiteEditor/manager.cpp:3459 msgid "" "Compilers updated successfully!\n" "You can now build your workspace" @@ -10369,10 +10981,6 @@ msgstr "この名前のワークスペースが既に存在します" msgid "Sort" msgstr "並べ替え" -#: LiteEditor/options_base_dlg2.h:58 Plugin/DiffSideBySidePanel.cpp:108 -msgid "Preferences" -msgstr "個人設定" - #: LiteEditor/options_dlg2.cpp:104 msgid "Guides" msgstr "ガイド" @@ -10421,10 +11029,6 @@ msgstr "エディターをフォーカスしても、このペインを閉じま msgid "Scroll on Output" msgstr "出力時にスクロール" -#: LiteEditor/outputtabwindow.cpp:204 LiteEditor/shelltab.cpp:216 -msgid "Word Wrap" -msgstr "単語を折り返す" - #: LiteEditor/outputtabwindow.cpp:206 LiteEditor/shelltab.cpp:218 #: LiteEditor/tabgroupbasedlgs.cpp:142 msgid "Clear All" @@ -10438,10 +11042,6 @@ msgstr "全ての結果を折り畳む" msgid "Repeat" msgstr "繰り返す" -#: LiteEditor/plugindlgbase.cpp:51 -msgid "Plugins" -msgstr "プラグイン" - #: LiteEditor/plugindlgbase.cpp:74 msgid "Uncheck All" msgstr "全てチェック解除" @@ -10610,11 +11210,6 @@ msgstr "実行、またはデバッグするプログラムに渡すコマンド msgid "Debugging" msgstr "デバッグ" -#: LiteEditor/project_settings_base_dlg.cpp:246 -#: LiteEditor/project_settings_dlg.cpp:109 -msgid "Debugger" -msgstr "デバッガー" - #: LiteEditor/project_settings_base_dlg.cpp:247 msgid "Select the debugger type to use for this project" msgstr "このプロジェクトに使用するデバッガーの種類を選択" @@ -11241,8 +11836,8 @@ msgstr "gdb を選択" msgid "Select working directory" msgstr "作業ディレクトリを選択" -#: LiteEditor/quickfindbar.cpp:124 LiteEditor/quickfindbarbase.cpp:169 -#: Plugin/clPluginsFindBar.cpp:112 Plugin/quickfindbarbase.cpp:171 +#: LiteEditor/quickfindbar.cpp:124 LiteEditor/quickfindbarbase.cpp:158 +#: Plugin/clPluginsFindBar.cpp:112 Plugin/quickfindbarbase.cpp:158 msgid "Case Sensitive" msgstr "大文字小文字を区別" @@ -11308,39 +11903,39 @@ msgstr "全て検索" msgid "Replace All" msgstr "全て置換" -#: LiteEditor/quickfindbarbase.cpp:172 Plugin/quickfindbarbase.cpp:174 +#: LiteEditor/quickfindbarbase.cpp:161 Plugin/quickfindbarbase.cpp:161 msgid "Use case sensitive match" msgstr "大文字小文字を区別" -#: LiteEditor/quickfindbarbase.cpp:176 Plugin/quickfindbarbase.cpp:178 +#: LiteEditor/quickfindbarbase.cpp:165 Plugin/quickfindbarbase.cpp:165 msgid "Regular Expression" msgstr "正規表現" -#: LiteEditor/quickfindbarbase.cpp:179 Plugin/quickfindbarbase.cpp:181 +#: LiteEditor/quickfindbarbase.cpp:168 Plugin/quickfindbarbase.cpp:168 msgid "Use regular expression" msgstr "正規表現を使用" -#: LiteEditor/quickfindbarbase.cpp:183 Plugin/quickfindbarbase.cpp:185 +#: LiteEditor/quickfindbarbase.cpp:172 Plugin/quickfindbarbase.cpp:172 msgid "Match a whole word" msgstr "単語全体に一致" -#: LiteEditor/quickfindbarbase.cpp:186 Plugin/quickfindbarbase.cpp:188 +#: LiteEditor/quickfindbarbase.cpp:175 Plugin/quickfindbarbase.cpp:175 msgid "Match a whole word only" msgstr "単語全体に一致する箇所のみ" -#: LiteEditor/quickfindbarbase.cpp:190 Plugin/quickfindbarbase.cpp:192 +#: LiteEditor/quickfindbarbase.cpp:179 Plugin/quickfindbarbase.cpp:179 msgid "Use wildcard syntax" msgstr "ワイルドカード構文を使用" -#: LiteEditor/quickfindbarbase.cpp:193 Plugin/quickfindbarbase.cpp:195 +#: LiteEditor/quickfindbarbase.cpp:182 Plugin/quickfindbarbase.cpp:182 msgid "Use wildcard syntax (* and ?)" msgstr "ワイルドカード構文を使用 (* と ?)" -#: LiteEditor/quickfindbarbase.cpp:197 Plugin/quickfindbarbase.cpp:199 +#: LiteEditor/quickfindbarbase.cpp:186 Plugin/quickfindbarbase.cpp:186 msgid "Enable multiple selections" msgstr "複数選択を有効化" -#: LiteEditor/quickfindbarbase.cpp:200 Plugin/quickfindbarbase.cpp:202 +#: LiteEditor/quickfindbarbase.cpp:189 Plugin/quickfindbarbase.cpp:189 msgid "Select each match without de-selectiing the previous match" msgstr "以前の一致も選択したまま、それぞれの一致を選択します" @@ -11544,7 +12139,7 @@ msgstr "登録先の仮想ディレクトリ:" msgid "Select the virtual folder in which to place the matching files" msgstr "一致するファイルを置く仮想フォルダーを選択" -#: LiteEditor/reconcileprojectbase.cpp:494 wxcrafter/wxcrafter_gui.cpp:1554 +#: LiteEditor/reconcileprojectbase.cpp:494 wxcrafter/wxcrafter_gui.cpp:1555 msgid "Browse for virtual folder" msgstr "仮想フォルダーを参照" @@ -11684,7 +12279,7 @@ msgstr "式を更新:" msgid "Symbol" msgstr "シンボル" -#: LiteEditor/symbols_dialog.cpp:43 wxcrafter/properties_list_view.cpp:385 +#: LiteEditor/symbols_dialog.cpp:43 wxcrafter/properties_list_view.cpp:415 msgid "Kind" msgstr "分類" @@ -11797,7 +12392,7 @@ msgstr "ファイルの拡張子:" msgid "Associate this lexer with files which have these extensions" msgstr "これらの拡張子を持つファイルを字句解析器に関連付け" -#: LiteEditor/syntaxhighlightbasedlg.cpp:316 wxcrafter/gui.cpp:676 +#: LiteEditor/syntaxhighlightbasedlg.cpp:316 wxcrafter/gui.cpp:605 msgid "Styles" msgstr "スタイル" @@ -11818,7 +12413,7 @@ msgid "Select the foreground colour for the selected style" msgstr "選択したスタイルの前景色を選択" #: LiteEditor/syntaxhighlightbasedlg.cpp:366 -#: codelite_terminal/wxcrafter.cpp:146 +#: codelite_terminal/wxcrafter.cpp:138 msgid "Background Colour:" msgstr "背景色:" @@ -11952,7 +12547,7 @@ msgid "Theme : '" msgstr "テーマ : '" #: LiteEditor/syntaxhighlightdlg.cpp:793 git/gitFileDiffDlg.cpp:60 -#: wxcrafter/wxguicraft_main_view.cpp:1012 +#: wxcrafter/wxguicraft_main_view.cpp:1011 msgid "Save as" msgstr "名前を付けて保存" @@ -12646,10 +13241,10 @@ msgid "Please wait, working..." msgstr "お待ちください、処理しています..." #: MemCheck/memcheckoutputview.cpp:29 MemCheck/memcheckui.cpp:289 -#: MemCheck/memcheckui.cpp:425 wxcrafter/collapsible_pane_wrapper.cpp:20 -#: wxcrafter/command_link_button_wrapper.cpp:29 +#: MemCheck/memcheckui.cpp:425 wxcrafter/collapsible_pane_wrapper.cpp:21 +#: wxcrafter/command_link_button_wrapper.cpp:30 #: wxcrafter/radio_box_wrapper.cpp:16 wxcrafter/radio_button_wrapper.cpp:14 -#: wxcrafter/static_box_sizer_wrapper.cpp:19 +#: wxcrafter/static_box_sizer_wrapper.cpp:20 msgid "Label" msgstr "ラベル" @@ -13192,14 +13787,6 @@ msgstr "" msgid "Continue" msgstr "続行" -#: Plugin/DebuggerToolBar.cpp:40 -msgid "Stop debugger" -msgstr "デバッガーを停止" - -#: Plugin/DebuggerToolBar.cpp:41 -msgid "Pause debugger" -msgstr "デバッガーを一時停止" - #: Plugin/DebuggerToolBar.cpp:42 Plugin/DebuggerToolBar.cpp:43 msgid "Restart debugger" msgstr "デバッガーを再起動" @@ -13212,18 +13799,6 @@ msgstr "現在の行を表示" msgid "Step In" msgstr "ステップイン" -#: Plugin/DebuggerToolBar.cpp:46 -msgid "Step Into" -msgstr "ステップイン" - -#: Plugin/DebuggerToolBar.cpp:47 git/gitui.cpp:451 git/gitui.cpp:1399 -msgid "Next" -msgstr "次" - -#: Plugin/DebuggerToolBar.cpp:48 -msgid "Step Out" -msgstr "ステップアウト" - #: Plugin/DebuggerToolBar.cpp:50 Plugin/DebuggerToolBar.cpp:51 msgid "Toggle Rewind Commands" msgstr "命令の巻き戻しを切り替え" @@ -13454,19 +14029,15 @@ msgstr "一致" msgid "Shortcut" msgstr "ショートカット" -#: Plugin/GotoAnythingBaseUI.h:54 Runtime/rc/menu.xrc:485 -msgid "Goto Anything" -msgstr "CodeLite の機能を表示/実行" - #: Plugin/LSPNetworkSTDIO.cpp:107 msgid "LSP: could not locate SSH account " msgstr "LSP: SSH アカウントが見つかりませんでした " -#: Plugin/LanguageServerProtocol.cpp:918 +#: Plugin/LanguageServerProtocol.cpp:911 msgid "Method: `" msgstr "メソッド: `" -#: Plugin/LanguageServerProtocol.cpp:918 +#: Plugin/LanguageServerProtocol.cpp:911 msgid "` is not supported" msgstr "` はサポートされていません" @@ -13540,7 +14111,7 @@ msgid "Build System:" msgstr "ビルドシステム:" #: Plugin/NewProjectDialogBase.h:89 Runtime/rc/menu.xrc:977 -#: wxcrafter/main.cpp:206 +#: wxcrafter/main.cpp:204 msgid "New Project" msgstr "新しいプロジェクト" @@ -13637,22 +14208,10 @@ msgstr "プログラムを実行しています: " msgid "Program exited with return code: " msgstr "プログラムが終了しました。返却コード: " -#: Plugin/bookmark_manager.cpp:82 -msgid "Next Bookmark" -msgstr "次のブックマーク" - -#: Plugin/bookmark_manager.cpp:83 -msgid "Previous Bookmark" -msgstr "前のブックマーク" - #: Plugin/bookmark_manager.cpp:101 msgid "Change Active Bookmark Type..." msgstr "アクティブなブックマークの種類を変更..." -#: Plugin/bookmark_manager.cpp:106 -msgid "Remove All Currently-Active Bookmarks" -msgstr "現在アクティブなブックマークを全て削除" - #: Plugin/bookmark_manager.cpp:109 msgid "More..." msgstr "詳細..." @@ -13836,7 +14395,7 @@ msgid "" "You can always change this from the menu: Settings -> Colours and fonts..." msgstr "" "一覧からエディターのテーマを選択します。\n" -"[設定] -> [色とフォント] ... からいつでも変更できます。" +"[設定] -> [色とフォント...] からいつでも変更できます。" #: Plugin/clBoostrapWizardBase.cpp:153 msgid "Theme:" @@ -14223,7 +14782,7 @@ msgid "New file name" msgstr "新しいファイル名" #: Plugin/clRemoteDirCtrl.cpp:392 QmakePlugin/qmakesettingsdlg.cpp:130 -#: Subversion2/subversion2.cpp:1071 Subversion2/subversion2.cpp:1077 +#: Subversion2/subversion2.cpp:1084 Subversion2/subversion2.cpp:1091 #: Subversion2/subversion_view.cpp:1254 msgid "New name:" msgstr "新しい名前:" @@ -14312,10 +14871,6 @@ msgstr "タブを使用" msgid "Use Spaces" msgstr "スペースを使用" -#: Plugin/clStatusBar.cpp:501 -msgid "Display EOL" -msgstr "改行コードを表示" - #: Plugin/clStatusBar.cpp:504 msgid "Use Linux Format (LF)" msgstr "Linux 形式 (LF) を使用" @@ -14324,10 +14879,6 @@ msgstr "Linux 形式 (LF) を使用" msgid "Use Windows Format (CRLF)" msgstr "Windows 形式 (CRLF) を使用" -#: Plugin/clStatusBar.cpp:508 Runtime/rc/menu.xrc:214 -msgid "Convert to Windows Format" -msgstr "Windows 形式に変換" - #: Plugin/clStatusBar.cpp:509 msgid "Convert to Linux Format" msgstr "Linux 形式に変換" @@ -14358,7 +14909,7 @@ msgstr "項目を表示中: " msgid " entries" msgstr " 件の項目" -#: Plugin/clTerminalViewCtrl.cpp:64 UnitTestCPP/unittestreport.cpp:104 +#: Plugin/clTerminalViewCtrl.cpp:65 UnitTestCPP/unittestreport.cpp:104 #: wxcrafter/wxcrafter.h:132 msgid "Message" msgstr "メッセージ" @@ -14749,7 +15300,7 @@ msgstr "アドレス:" msgid "Address or pointer to watch" msgstr "ウォッチするアドレス、またはポインター" -#: Plugin/memoryviewbase.cpp:50 wxcrafter/wxgui_defs.h:163 +#: Plugin/memoryviewbase.cpp:50 wxcrafter/wxgui_defs.h:169 msgid "Size:" msgstr "サイズ:" @@ -14765,7 +15316,7 @@ msgstr "列数:" msgid "Number of columns to use per row" msgstr "一行当たりの列数" -#: Plugin/memoryviewbase.cpp:113 wxcrafter/gui.cpp:1334 +#: Plugin/memoryviewbase.cpp:113 msgid "Evaluate" msgstr "評価" @@ -14773,7 +15324,7 @@ msgstr "評価" msgid "Evaluate the expression in the \"Address\" field" msgstr "\"アドレス\" 欄の式を評価" -#: Plugin/memoryviewbase.cpp:119 Subversion2/subversion2.cpp:268 +#: Plugin/memoryviewbase.cpp:119 Subversion2/subversion2.cpp:274 #: Subversion2/subversion_view.cpp:450 Subversion2/subversion_view.cpp:481 msgid "Update" msgstr "更新" @@ -14806,204 +15357,204 @@ msgstr "このテンプレートに説明を設定" msgid "Save Project As Template" msgstr "プロジェクトをテンプレートとして保存" -#: Plugin/newkeyshortcutdlg.cpp:36 Plugin/newkeyshortcutdlg.cpp:88 +#: Plugin/newkeyshortcutdlg.cpp:37 Plugin/newkeyshortcutdlg.cpp:89 msgid "DEL" msgstr "DEL" -#: Plugin/newkeyshortcutdlg.cpp:37 +#: Plugin/newkeyshortcutdlg.cpp:38 msgid "DELETE" msgstr "DELETE" -#: Plugin/newkeyshortcutdlg.cpp:38 +#: Plugin/newkeyshortcutdlg.cpp:39 msgid "BACK" msgstr "BACK" -#: Plugin/newkeyshortcutdlg.cpp:39 Plugin/newkeyshortcutdlg.cpp:87 +#: Plugin/newkeyshortcutdlg.cpp:40 Plugin/newkeyshortcutdlg.cpp:88 msgid "INS" msgstr "INS" -#: Plugin/newkeyshortcutdlg.cpp:40 Plugin/newkeyshortcutdlg.cpp:75 +#: Plugin/newkeyshortcutdlg.cpp:41 Plugin/newkeyshortcutdlg.cpp:76 msgid "ENTER" msgstr "ENTER" -#: Plugin/newkeyshortcutdlg.cpp:41 +#: Plugin/newkeyshortcutdlg.cpp:42 msgid "RETURN" msgstr "RETURN" -#: Plugin/newkeyshortcutdlg.cpp:42 Plugin/newkeyshortcutdlg.cpp:82 +#: Plugin/newkeyshortcutdlg.cpp:43 Plugin/newkeyshortcutdlg.cpp:83 msgid "PGUP" msgstr "PGUP" -#: Plugin/newkeyshortcutdlg.cpp:43 Plugin/newkeyshortcutdlg.cpp:84 +#: Plugin/newkeyshortcutdlg.cpp:44 Plugin/newkeyshortcutdlg.cpp:85 msgid "PGDN" msgstr "PGDN" -#: Plugin/newkeyshortcutdlg.cpp:44 Plugin/newkeyshortcutdlg.cpp:77 +#: Plugin/newkeyshortcutdlg.cpp:45 Plugin/newkeyshortcutdlg.cpp:78 msgid "LEFT" msgstr "LEFT" -#: Plugin/newkeyshortcutdlg.cpp:45 Plugin/newkeyshortcutdlg.cpp:79 +#: Plugin/newkeyshortcutdlg.cpp:46 Plugin/newkeyshortcutdlg.cpp:80 msgid "RIGHT" msgstr "RIGHT" -#: Plugin/newkeyshortcutdlg.cpp:46 Plugin/newkeyshortcutdlg.cpp:78 +#: Plugin/newkeyshortcutdlg.cpp:47 Plugin/newkeyshortcutdlg.cpp:79 msgid "UP" msgstr "UP" -#: Plugin/newkeyshortcutdlg.cpp:47 Plugin/newkeyshortcutdlg.cpp:80 +#: Plugin/newkeyshortcutdlg.cpp:48 Plugin/newkeyshortcutdlg.cpp:81 msgid "DOWN" msgstr "DOWN" -#: Plugin/newkeyshortcutdlg.cpp:48 Plugin/newkeyshortcutdlg.cpp:76 +#: Plugin/newkeyshortcutdlg.cpp:49 Plugin/newkeyshortcutdlg.cpp:77 msgid "HOME" msgstr "HOME" -#: Plugin/newkeyshortcutdlg.cpp:49 Plugin/newkeyshortcutdlg.cpp:85 +#: Plugin/newkeyshortcutdlg.cpp:50 Plugin/newkeyshortcutdlg.cpp:86 msgid "END" msgstr "END" -#: Plugin/newkeyshortcutdlg.cpp:50 Plugin/newkeyshortcutdlg.cpp:73 +#: Plugin/newkeyshortcutdlg.cpp:51 Plugin/newkeyshortcutdlg.cpp:74 msgid "SPACE" msgstr "SPACE" -#: Plugin/newkeyshortcutdlg.cpp:51 Plugin/newkeyshortcutdlg.cpp:74 +#: Plugin/newkeyshortcutdlg.cpp:52 Plugin/newkeyshortcutdlg.cpp:75 msgid "TAB" msgstr "TAB" -#: Plugin/newkeyshortcutdlg.cpp:52 +#: Plugin/newkeyshortcutdlg.cpp:53 msgid "ESC" msgstr "ESC" -#: Plugin/newkeyshortcutdlg.cpp:53 +#: Plugin/newkeyshortcutdlg.cpp:54 msgid "ESCAPE" msgstr "ESCAPE" -#: Plugin/newkeyshortcutdlg.cpp:54 +#: Plugin/newkeyshortcutdlg.cpp:55 msgid "CANCEL" msgstr "CANCEL" -#: Plugin/newkeyshortcutdlg.cpp:55 +#: Plugin/newkeyshortcutdlg.cpp:56 msgid "CLEAR" msgstr "CLEAR" -#: Plugin/newkeyshortcutdlg.cpp:56 +#: Plugin/newkeyshortcutdlg.cpp:57 msgid "MENU" msgstr "MENU" -#: Plugin/newkeyshortcutdlg.cpp:57 +#: Plugin/newkeyshortcutdlg.cpp:58 msgid "PAUSE" msgstr "PAUSE" -#: Plugin/newkeyshortcutdlg.cpp:58 +#: Plugin/newkeyshortcutdlg.cpp:59 msgid "CAPITAL" msgstr "CAPITAL" -#: Plugin/newkeyshortcutdlg.cpp:59 +#: Plugin/newkeyshortcutdlg.cpp:60 msgid "SELECT" msgstr "SELECT" -#: Plugin/newkeyshortcutdlg.cpp:60 +#: Plugin/newkeyshortcutdlg.cpp:61 msgid "PRINT" msgstr "PRINT" -#: Plugin/newkeyshortcutdlg.cpp:61 +#: Plugin/newkeyshortcutdlg.cpp:62 msgid "EXECUTE" msgstr "EXECUTE" -#: Plugin/newkeyshortcutdlg.cpp:62 +#: Plugin/newkeyshortcutdlg.cpp:63 msgid "SNAPSHOT" msgstr "SNAPSHOT" -#: Plugin/newkeyshortcutdlg.cpp:63 +#: Plugin/newkeyshortcutdlg.cpp:64 msgid "HELP" msgstr "HELP" -#: Plugin/newkeyshortcutdlg.cpp:64 +#: Plugin/newkeyshortcutdlg.cpp:65 msgid "ADD" msgstr "ADD" -#: Plugin/newkeyshortcutdlg.cpp:65 +#: Plugin/newkeyshortcutdlg.cpp:66 msgid "SEPARATOR" msgstr "SEPARATOR" -#: Plugin/newkeyshortcutdlg.cpp:66 +#: Plugin/newkeyshortcutdlg.cpp:67 msgid "SUBTRACT" msgstr "SUBTRACT" -#: Plugin/newkeyshortcutdlg.cpp:67 +#: Plugin/newkeyshortcutdlg.cpp:68 msgid "DECIMAL" msgstr "DECIMAL" -#: Plugin/newkeyshortcutdlg.cpp:68 +#: Plugin/newkeyshortcutdlg.cpp:69 msgid "DIVIDE" msgstr "DIVIDE" -#: Plugin/newkeyshortcutdlg.cpp:69 +#: Plugin/newkeyshortcutdlg.cpp:70 msgid "NUM_LOCK" msgstr "NUM_LOCK" -#: Plugin/newkeyshortcutdlg.cpp:70 +#: Plugin/newkeyshortcutdlg.cpp:71 msgid "SCROLL_LOCK" msgstr "SCROLL_LOCK" -#: Plugin/newkeyshortcutdlg.cpp:71 +#: Plugin/newkeyshortcutdlg.cpp:72 msgid "PAGEUP" msgstr "PAGEUP" -#: Plugin/newkeyshortcutdlg.cpp:72 +#: Plugin/newkeyshortcutdlg.cpp:73 msgid "PAGEDOWN" msgstr "PAGEDOWN" -#: Plugin/newkeyshortcutdlg.cpp:81 +#: Plugin/newkeyshortcutdlg.cpp:82 msgid "PRIOR" msgstr "PRIOR" -#: Plugin/newkeyshortcutdlg.cpp:83 +#: Plugin/newkeyshortcutdlg.cpp:84 msgid "NEXT" msgstr "NEXT" -#: Plugin/newkeyshortcutdlg.cpp:86 +#: Plugin/newkeyshortcutdlg.cpp:87 #: sdk/databaselayer/src/dblayer/PostgresDatabaseLayer.cpp:277 msgid "BEGIN" msgstr "BEGIN" -#: Plugin/newkeyshortcutdlg.cpp:89 +#: Plugin/newkeyshortcutdlg.cpp:90 msgid "=" msgstr "=" -#: Plugin/newkeyshortcutdlg.cpp:91 wxcrafter/wxcrafter_gui.cpp:1475 +#: Plugin/newkeyshortcutdlg.cpp:92 wxcrafter/wxcrafter_gui.cpp:1476 msgid "+" msgstr "+" -#: Plugin/newkeyshortcutdlg.cpp:92 +#: Plugin/newkeyshortcutdlg.cpp:93 msgid "KP_SEPARATOR" msgstr "KP_SEPARATOR" -#: Plugin/newkeyshortcutdlg.cpp:93 +#: Plugin/newkeyshortcutdlg.cpp:94 msgid "-" msgstr "-" -#: Plugin/newkeyshortcutdlg.cpp:94 +#: Plugin/newkeyshortcutdlg.cpp:95 msgid "." msgstr "." -#: Plugin/newkeyshortcutdlg.cpp:95 +#: Plugin/newkeyshortcutdlg.cpp:96 msgid "/" msgstr "/" -#: Plugin/newkeyshortcutdlg.cpp:96 +#: Plugin/newkeyshortcutdlg.cpp:97 msgid "WINDOWS_LEFT" msgstr "WINDOWS_LEFT" -#: Plugin/newkeyshortcutdlg.cpp:97 +#: Plugin/newkeyshortcutdlg.cpp:98 msgid "WINDOWS_RIGHT" msgstr "WINDOWS_RIGHT" -#: Plugin/newkeyshortcutdlg.cpp:98 +#: Plugin/newkeyshortcutdlg.cpp:99 msgid "WINDOWS_MENU" msgstr "WINDOWS_MENU" -#: Plugin/newkeyshortcutdlg.cpp:99 +#: Plugin/newkeyshortcutdlg.cpp:100 msgid "COMMAND" msgstr "COMMAND" @@ -15015,15 +15566,15 @@ msgstr "F" msgid "SPECIAL" msgstr "SPECIAL" -#: Plugin/newkeyshortcutdlg.cpp:240 +#: Plugin/newkeyshortcutdlg.cpp:219 msgid "Select a Keyboard Shortcut" msgstr "キーボードショートカットを選択" -#: Plugin/open_resource_dialog.cpp:87 codelitephp/php-plugin/php_ui.h:157 +#: Plugin/open_resource_dialog.cpp:92 codelitephp/php-plugin/php_ui.h:157 msgid "Open resource..." msgstr "リソースを開く..." -#: Plugin/openresourcedialogbase.cpp:30 +#: Plugin/openresourcedialogbase.cpp:31 msgid "" "Type resource name to open.\n" "You may use a space delimited list of words to narrow down the list of " @@ -15052,7 +15603,7 @@ msgstr "ファイルを表示 (&F)" msgid "Show &symbols" msgstr "シンボルを表示 (&S)" -#: Plugin/openresourcedialogbase.h:68 +#: Plugin/openresourcedialogbase.h:69 msgid "Open Resource" msgstr "リソースを開く" @@ -15266,7 +15817,7 @@ msgstr "テキスト" #: Plugin/wxcrafter_plugin.cpp:616 wxcrafter/data_view_list_ctrl_column.cpp:36 #: wxcrafter/grid_column_wrapper.cpp:15 #: wxcrafter/list_ctrl_column_wrapper.cpp:15 -#: wxcrafter/tree_list_ctrl_column_wrapper.cpp:23 +#: wxcrafter/tree_list_ctrl_column_wrapper.cpp:24 msgid "My Column" msgstr "列" @@ -15621,15 +16172,6 @@ msgstr "タブを複製..." msgid "Page Setup..." msgstr "ページの設定..." -#: Runtime/rc/menu.xrc:101 -msgid "Print..." -msgstr "印刷..." - -#: Runtime/rc/menu.xrc:111 Runtime/rc/menu.xrc:1005 -#: WebTools/NodeJSWorkspaceView.cpp:75 -msgid "Close Workspace" -msgstr "ワークスペースを閉じる" - #: Runtime/rc/menu.xrc:115 msgid "Recent &Files" msgstr "最近使ったファイル (&F)" @@ -15671,10 +16213,6 @@ msgstr "貼り付け (&E)" msgid "Select &All" msgstr "全て選択 (&A)" -#: Runtime/rc/menu.xrc:156 -msgid "Split selection into lines" -msgstr "選択範囲を複数のキャレットに分ける" - #: Runtime/rc/menu.xrc:162 msgid "&Delete Line" msgstr "行を削除 (&D)" @@ -15691,46 +16229,14 @@ msgstr "行の終了まで削除 (&E)" msgid "Delete to Line &Start" msgstr "行の開始まで削除 (&S)" -#: Runtime/rc/menu.xrc:174 -msgid "Copy Line" -msgstr "行をコピー" - -#: Runtime/rc/menu.xrc:177 -msgid "Cut Line" -msgstr "行を切り取り" - #: Runtime/rc/menu.xrc:180 msgid "&Transpose Lines" msgstr "行を交換 (&T)" -#: Runtime/rc/menu.xrc:183 -msgid "Move Line Up" -msgstr "行を上へ移動" - -#: Runtime/rc/menu.xrc:186 -msgid "Move Line Down" -msgstr "行を下へ移動" - -#: Runtime/rc/menu.xrc:189 -msgid "Center Line in Editor" -msgstr "行を中心にスクロール" - #: Runtime/rc/menu.xrc:193 msgid "Comment" msgstr "コメント" -#: Runtime/rc/menu.xrc:195 -msgid "Comment Selection" -msgstr "選択範囲をコメント化" - -#: Runtime/rc/menu.xrc:198 -msgid "Comment Line" -msgstr "行をコメント化" - -#: Runtime/rc/menu.xrc:201 -msgid "Insert Comment Block" -msgstr "コメントのブロックを挿入" - #: Runtime/rc/menu.xrc:205 msgid "Text Conversion" msgstr "テキストの変換" @@ -15743,18 +16249,6 @@ msgstr "大文字にする (&C)" msgid "Make &Lowercase" msgstr "小文字にする (&L)" -#: Runtime/rc/menu.xrc:217 -msgid "Convert to Unix Format" -msgstr "Unix 形式に変換" - -#: Runtime/rc/menu.xrc:221 -msgid "Convert Indentation to Tabs" -msgstr "インデントをタブに変換" - -#: Runtime/rc/menu.xrc:224 -msgid "Convert Indentation to Spaces" -msgstr "インデントをスペースに変換" - #: Runtime/rc/menu.xrc:229 msgid "Trim T&railing Spaces" msgstr "行末の空白を削除 (&R)" @@ -15807,46 +16301,10 @@ msgstr "選択しているブロックを全て折り畳む/広げる (&E)" msgid "&Display EOL" msgstr "改行コードを表示 (&D)" -#: Runtime/rc/menu.xrc:275 -msgid "Zoom In" -msgstr "拡大" - -#: Runtime/rc/menu.xrc:278 -msgid "Zoom Out" -msgstr "縮小" - -#: Runtime/rc/menu.xrc:281 -msgid "Reset Zoom" -msgstr "ズームをリセット" - #: Runtime/rc/menu.xrc:285 msgid "Show Whitespace" msgstr "空白の表示" -#: Runtime/rc/menu.xrc:291 -msgid "Show Always" -msgstr "常に表示" - -#: Runtime/rc/menu.xrc:295 -msgid "Visible After First Indent" -msgstr "最初のインデント後に表示" - -#: Runtime/rc/menu.xrc:299 -msgid "Indentation Only" -msgstr "インデントのみ" - -#: Runtime/rc/menu.xrc:305 -msgid "Next tab" -msgstr "次のタブ" - -#: Runtime/rc/menu.xrc:308 -msgid "Previous tab" -msgstr "前のタブ" - -#: Runtime/rc/menu.xrc:312 -msgid "Full Screen..." -msgstr "全画面表示..." - #: Runtime/rc/menu.xrc:316 msgid "&Output Pane" msgstr "出力ペイン (&O)" @@ -15867,14 +16325,6 @@ msgstr "デバッガーペイン (&D)" msgid "&Toggle All Panes" msgstr "全てのペインを切り替え (&T)" -#: Runtime/rc/menu.xrc:369 -msgid "Toggle Minimal View" -msgstr "最小表示を切り替え" - -#: Runtime/rc/menu.xrc:374 -msgid "Show Status Bar" -msgstr "ステータスバーを表示" - #: Runtime/rc/menu.xrc:387 wxcrafter/gui.cpp:145 msgid "&Search" msgstr "検索 (&S)" @@ -15899,34 +16349,10 @@ msgstr "次を検索 (&N)" msgid "Find &Previous" msgstr "前を検索 (&P)" -#: Runtime/rc/menu.xrc:405 -msgid "Find Word At Caret" -msgstr "キャレットの単語を検索" - -#: Runtime/rc/menu.xrc:408 -msgid "Find Word At Caret Backward" -msgstr "キャレットの単語を後方へ検索" - -#: Runtime/rc/menu.xrc:412 -msgid "Quick Add Next" -msgstr "次をクイック追加" - -#: Runtime/rc/menu.xrc:415 -msgid "Quick Find All" -msgstr "全てをクイック検索" - #: Runtime/rc/menu.xrc:422 msgid "&Find In Files..." msgstr "ファイルから検索 (&F)..." -#: Runtime/rc/menu.xrc:425 -msgid "Go to Next 'Find In File' Match" -msgstr "次の 'ファイルから検索' の一致へ移動" - -#: Runtime/rc/menu.xrc:428 -msgid "Go to Previous 'Find In File' Match" -msgstr "前の 'ファイルから検索' の一致へ移動" - #: Runtime/rc/menu.xrc:433 msgid "Go To" msgstr "指定先へ移動" @@ -15963,18 +16389,6 @@ msgstr "現在アクティブなブックマークを全て削除 (&C)" msgid "Remove &All Bookmarks" msgstr "全てのブックマークを削除 (&A)" -#: Runtime/rc/menu.xrc:465 -msgid "Grep Selection in the Current File" -msgstr "選択したテキストを現在のファイルから検索" - -#: Runtime/rc/menu.xrc:468 -msgid "Grep Selection in the Workspace" -msgstr "選択したテキストをワークスペースから検索" - -#: Runtime/rc/menu.xrc:471 -msgid "Search for Selection with default browser" -msgstr "選択したテキストを既定のブラウザーで検索" - #: Runtime/rc/menu.xrc:475 msgid "Find &Resource..." msgstr "リソースを検索 (&R)..." @@ -16071,22 +16485,6 @@ msgstr "プロジェクトを再ビルド (&U)" msgid "Build and Run Pro&ject" msgstr "プロジェクトをビルドして実行 (&J)" -#: Runtime/rc/menu.xrc:567 Runtime/rc/menu.xrc:986 -msgid "Build Workspace" -msgstr "ワークスペースをビルド" - -#: Runtime/rc/menu.xrc:570 Runtime/rc/menu.xrc:989 -msgid "Clean Workspace" -msgstr "ワークスペースをクリーン" - -#: Runtime/rc/menu.xrc:573 -msgid "Rebuild Workspace" -msgstr "ワークスペースを再ビルド" - -#: Runtime/rc/menu.xrc:577 -msgid "Batch Build..." -msgstr "一括ビルド..." - #: Runtime/rc/menu.xrc:581 msgid "Ne&xt Build Error" msgstr "次のビルドエラー (&X)" @@ -16131,10 +16529,6 @@ msgstr "命令へステップイン (&I)" msgid "Ne&xt" msgstr "次 (&X)" -#: Runtime/rc/menu.xrc:616 -msgid "Next Instruction" -msgstr "次の命令" - #: Runtime/rc/menu.xrc:619 msgid "Step &Out" msgstr "ステップアウト (&O)" @@ -16251,22 +16645,6 @@ msgstr "読み取り専用にする" msgid "Copy File Name" msgstr "ファイル名をコピー" -#: Runtime/rc/menu.xrc:811 -msgid "Copy File Name to Clipboard" -msgstr "ファイル名をクリップボードにコピー" - -#: Runtime/rc/menu.xrc:814 -msgid "Copy Full Path to Clipboard" -msgstr "完全なパスをクリップボードにコピー" - -#: Runtime/rc/menu.xrc:817 -msgid "Copy Path to Clipboard" -msgstr "パスをクリップボードにコピー" - -#: Runtime/rc/menu.xrc:821 -msgid "Copy Path Relative to Workspace" -msgstr "ワークスペースへの相対パスをコピー" - #: Runtime/rc/menu.xrc:826 msgid "Detach Editor" msgstr "エディターをデタッチ" @@ -16291,10 +16669,6 @@ msgstr "コードの生成 / リファクタリング" msgid "Insert Doxygen Comment\tCtrl-Shift-D" msgstr "Doxygen コメントを挿入\tCtrl-Shift-D" -#: Runtime/rc/menu.xrc:855 -msgid "Generate Setters/Getters..." -msgstr "セッター/ゲッターを生成..." - #: Runtime/rc/menu.xrc:859 msgid "Comment Selection\tCtrl-Shift-/" msgstr "選択範囲をコメント化\tCtrl-Shift-/" @@ -16303,26 +16677,6 @@ msgstr "選択範囲をコメント化\tCtrl-Shift-/" msgid "Toggle Line Comment\tCtrl-/" msgstr "行をコメント化/解除\tCtrl-/" -#: Runtime/rc/menu.xrc:866 -msgid "Move Function Implementation to..." -msgstr "関数の実装を移動..." - -#: Runtime/rc/menu.xrc:869 -msgid "Add Function Implementation..." -msgstr "関数の実装を追加..." - -#: Runtime/rc/menu.xrc:872 -msgid "Implement all Un-implemented Functions..." -msgstr "未実装の関数を全て実装..." - -#: Runtime/rc/menu.xrc:897 Runtime/rc/menu.xrc:932 -msgid "Select All" -msgstr "全て選択" - -#: Runtime/rc/menu.xrc:904 -msgid "Toggle Breakpoint" -msgstr "ブレークポイントを切り替え" - #: Runtime/rc/menu.xrc:940 msgid "Create new workspace..." msgstr "新しいワークスペースを作成..." @@ -16347,26 +16701,10 @@ msgstr "名前を変更..." msgid "ReBuild Workspace" msgstr "ワークスペースを再ビルド" -#: Runtime/rc/menu.xrc:997 -msgid "Add an Existing Project" -msgstr "既存のプロジェクトを追加" - #: Runtime/rc/menu.xrc:1001 msgid "Parse Workspace - Incremental" msgstr "ワークスペースを追加解析" -#: Runtime/rc/menu.xrc:1008 codelitephp/PHPParser/php_workspace.cpp:488 -msgid "Reload Workspace" -msgstr "ワークスペースを再読み込み" - -#: Runtime/rc/menu.xrc:1012 -msgid "Workspace Editor Preferences..." -msgstr "エディターの個人設定 (ワークスペース固有)..." - -#: Runtime/rc/menu.xrc:1016 -msgid "Workspace Settings..." -msgstr "ワークスペースの設定..." - #: Runtime/rc/menu.xrc:1022 Runtime/rc/menu.xrc:1037 msgid "Detach" msgstr "デタッチ" @@ -16387,10 +16725,6 @@ msgstr "既定のアプリケーションで開く (&D)" msgid "Compile" msgstr "コンパイル" -#: Runtime/rc/menu.xrc:1059 -msgid "Build Project" -msgstr "プロジェクトをビルド" - #: Runtime/rc/menu.xrc:1062 msgid "Preprocess" msgstr "プリプロセッサーに通す" @@ -16467,40 +16801,40 @@ msgstr "ここでシェルを開く" msgid "Open File Explorer here" msgstr "ここでファイルエクスプローラーを開く" -#: Runtime/templates/projects/executable-wxcrafter-dialog/wxcrafter.h:22 +#: Runtime/templates/projects/executable-wxcrafter-dialog/wxcrafter.hpp:50 #: wxcrafter/dialog_wrapper.cpp:27 msgid "My Dialog" msgstr "ダイアログ" -#: Runtime/templates/projects/executable-wxcrafter-frame/MainFrame.cpp:23 +#: Runtime/templates/projects/executable-wxcrafter-frame/MainFrame.cpp:17 #: codelite-cli/codelite-client/MainFrame.cpp:35 msgid "My MainFrame" msgstr "メインフレーム" -#: Runtime/templates/projects/executable-wxcrafter-frame/MainFrame.cpp:24 +#: Runtime/templates/projects/executable-wxcrafter-frame/MainFrame.cpp:18 #: codelite-cli/codelite-client/MainFrame.cpp:36 -#: codelite_terminal/MainFrame.cpp:45 +#: codelite_terminal/MainFrame.cpp:49 msgid "GPL v2 or later" msgstr "GPL v2 以降" -#: Runtime/templates/projects/executable-wxcrafter-frame/MainFrame.cpp:25 +#: Runtime/templates/projects/executable-wxcrafter-frame/MainFrame.cpp:19 #: codelite-cli/codelite-client/MainFrame.cpp:37 msgid "Short description goes here" msgstr "ここに簡単な説明を入れます" -#: Runtime/templates/projects/executable-wxcrafter-frame/wxcrafter.cpp:36 +#: Runtime/templates/projects/executable-wxcrafter-frame/wxcrafter.cpp:38 #: codelite-cli/codelite-client/wxcrafter.cpp:109 #: codelite_terminal/wxcrafter.cpp:66 msgid "Exit\tAlt-X" msgstr "終了\tAlt-X" -#: Runtime/templates/projects/executable-wxcrafter-frame/wxcrafter.cpp:36 +#: Runtime/templates/projects/executable-wxcrafter-frame/wxcrafter.cpp:38 #: codelite-cli/codelite-client/wxcrafter.cpp:109 #: codelite_terminal/wxcrafter.cpp:66 msgid "Quit" msgstr "終了" -#: Runtime/templates/projects/executable-wxcrafter-frame/wxcrafter.h:29 +#: Runtime/templates/projects/executable-wxcrafter-frame/wxcrafter.hpp:58 #: codelite-cli/codelite-client/wxcrafter.h:75 wxcrafter/frame_wrapper.cpp:29 msgid "My Frame" msgstr "フレーム" @@ -16773,11 +17107,16 @@ msgstr "スニペット" msgid "Edit Snippets" msgstr "スニペットを編集" -#: SnipWiz/editsnippetsdlg.cpp:78 SnipWiz/editsnippetsdlg.cpp:103 +#: SnipWiz/editsnippetsdlg.cpp:71 SnipWiz/editsnippetsdlg.cpp:176 +#: SnipWiz/snipwiz.cpp:169 +msgid "SnipWiz" +msgstr "スニペットウィザード" + +#: SnipWiz/editsnippetsdlg.cpp:80 SnipWiz/editsnippetsdlg.cpp:102 msgid "Menu entry is not unique!" msgstr "メニュー項目が重複しています！" -#: SnipWiz/editsnippetsdlg.cpp:184 +#: SnipWiz/editsnippetsdlg.cpp:182 msgid "That accelerator already exists" msgstr "指定したアクセラレーターが既に存在します" @@ -16793,10 +17132,6 @@ msgstr "スニペットウィザード" msgid "Template class..." msgstr "テンプレートクラス..." -#: SnipWiz/snipwiz.cpp:169 -msgid "SnipWiz" -msgstr "スニペットウィザード" - #: SnipWiz/snipwiz.cpp:193 msgid "New Class from Template..." msgstr "テンプレートから新しいクラスを作成..." @@ -17089,63 +17424,63 @@ msgstr "コミット履歴" msgid "Insert Last Message" msgstr "最後のメッセージを挿入" -#: Subversion2/subversion2.cpp:141 Subversion2/subversion2.cpp:159 +#: Subversion2/subversion2.cpp:144 Subversion2/subversion2.cpp:162 msgid "Subversion plugin for codelite2.0 based on the svn command line tool" msgstr "" "SVN コマンドラインツールをベースとした CodeLite 2.0 用の Subversion プラグイ" "ン" -#: Subversion2/subversion2.cpp:228 +#: Subversion2/subversion2.cpp:234 msgid "Subversion Options" msgstr "Subversion のオプション" -#: Subversion2/subversion2.cpp:230 +#: Subversion2/subversion2.cpp:236 msgid "Subversion2" msgstr "Subversion2" -#: Subversion2/subversion2.cpp:238 +#: Subversion2/subversion2.cpp:244 msgid "Sync Project Files..." msgstr "プロジェクトのファイルを同期..." -#: Subversion2/subversion2.cpp:262 +#: Subversion2/subversion2.cpp:268 msgid "Watch this folder" msgstr "このフォルダーをウォッチ" -#: Subversion2/subversion2.cpp:271 Subversion2/subversion_view.cpp:451 +#: Subversion2/subversion2.cpp:277 Subversion2/subversion_view.cpp:451 #: Subversion2/subversion_view.cpp:482 git/GitConsole.cpp:200 git/git.cpp:2379 #: git/gitui.cpp:480 git/gitui.cpp:823 git/gitui.cpp:879 msgid "Commit" msgstr "コミット" -#: Subversion2/subversion2.cpp:278 +#: Subversion2/subversion2.cpp:284 msgid "Revert changes" msgstr "変更を取り消す" -#: Subversion2/subversion2.cpp:284 +#: Subversion2/subversion2.cpp:290 msgid "Lock file" msgstr "ファイルをロック" -#: Subversion2/subversion2.cpp:287 +#: Subversion2/subversion2.cpp:293 msgid "UnLock file" msgstr "ファイルをロック解除" -#: Subversion2/subversion2.cpp:292 +#: Subversion2/subversion2.cpp:298 msgid "Show Recent Changes" msgstr "最近の変更を表示" -#: Subversion2/subversion2.cpp:306 Subversion2/subversion2.cpp:1454 +#: Subversion2/subversion2.cpp:312 Subversion2/subversion2.cpp:1471 msgid "Revert to revision" msgstr "リビジョンへ取り消す" -#: Subversion2/subversion2.cpp:311 +#: Subversion2/subversion2.cpp:317 msgid "Create Diff" msgstr "差分を作成" -#: Subversion2/subversion2.cpp:313 Subversion2/subversion_view.cpp:500 +#: Subversion2/subversion2.cpp:319 Subversion2/subversion_view.cpp:500 msgid "Change Log..." msgstr "変更履歴..." -#: Subversion2/subversion2.cpp:529 Subversion2/subversion_view.cpp:620 +#: Subversion2/subversion2.cpp:535 Subversion2/subversion_view.cpp:620 msgid "" "You are about to revert all your changes\n" "Are you sure?" @@ -17153,39 +17488,43 @@ msgstr "" "全ての変更を取り消そうとしています\n" "本当によろしいですか？" -#: Subversion2/subversion2.cpp:565 +#: Subversion2/subversion2.cpp:571 msgid "Insert base revision to diff against:" msgstr "差分を取る対象リビジョンを入力:" -#: Subversion2/subversion2.cpp:565 +#: Subversion2/subversion2.cpp:571 msgid "Svn Diff" msgstr "SVN 差分" -#: Subversion2/subversion2.cpp:979 +#: Subversion2/subversion2.cpp:991 msgid "Enter new URL:" msgstr "新しい URL を入力:" -#: Subversion2/subversion2.cpp:1071 Subversion2/subversion2.cpp:1077 +#: Subversion2/subversion2.cpp:991 +msgid "Svn Switch..." +msgstr "SVN 切り替え..." + +#: Subversion2/subversion2.cpp:1084 Subversion2/subversion2.cpp:1091 msgid "Svn Rename" msgstr "SVN 名前を変更" -#: Subversion2/subversion2.cpp:1129 +#: Subversion2/subversion2.cpp:1146 msgid "Fail to write commit message to a temporary file!" msgstr "一時ファイルにコミットメッセージを書き込めませんでした！" -#: Subversion2/subversion2.cpp:1274 +#: Subversion2/subversion2.cpp:1291 msgid " - application/octet-stream" msgstr " - application/octet-stream" -#: Subversion2/subversion2.cpp:1454 +#: Subversion2/subversion2.cpp:1471 msgid "Set the revision number:" msgstr "リビジョン番号を設定:" -#: Subversion2/subversion2.cpp:1462 +#: Subversion2/subversion2.cpp:1479 msgid "Invalid revision number" msgstr "無効なリビジョン番号です" -#: Subversion2/subversion2.cpp:1565 +#: Subversion2/subversion2.cpp:1583 msgid "" "Would you like to remove the following folders from SVN?\n" "\n" @@ -17193,7 +17532,7 @@ msgstr "" "これらのフォルダーを SVN から削除しますか？\n" "\n" -#: Subversion2/subversion2.cpp:1567 +#: Subversion2/subversion2.cpp:1585 msgid "" "Would you like to remove the following files from SVN?\n" "\n" @@ -17201,23 +17540,23 @@ msgstr "" "これらのファイルを SVN から削除しますか？\n" "\n" -#: Subversion2/subversion2.cpp:1583 +#: Subversion2/subversion2.cpp:1601 msgid " more folders" msgstr " 個のフォルダー" -#: Subversion2/subversion2.cpp:1583 Subversion2/subversion2.cpp:1585 +#: Subversion2/subversion2.cpp:1601 Subversion2/subversion2.cpp:1603 msgid ".. and " msgstr ".. と他 " -#: Subversion2/subversion2.cpp:1585 +#: Subversion2/subversion2.cpp:1603 msgid " more files" msgstr " 個のファイル" -#: Subversion2/subversion2.cpp:1626 +#: Subversion2/subversion2.cpp:1645 msgid "How many recent changes you want to view?" msgstr "最近の変更を何件まで表示しますか？" -#: Subversion2/subversion2.cpp:1627 +#: Subversion2/subversion2.cpp:1646 msgid "Svn show recent changes" msgstr "SVN 最近の変更を表示" @@ -17333,7 +17672,7 @@ msgstr "プリプロセッサー名:" msgid "Root URL:" msgstr "ルート URL:" -#: Subversion2/subversion2_ui.cpp:719 wxcrafter/wxgui_defs.h:174 +#: Subversion2/subversion2_ui.cpp:719 wxcrafter/wxgui_defs.h:180 msgid "URL:" msgstr "URL:" @@ -17951,40 +18290,49 @@ msgstr "このクラスには一致がありません '" msgid "Select class:" msgstr "クラスを選択:" -#: UnitTestCPP/unittestpp.cpp:73 UnitTestCPP/unittestpp.cpp:100 +#: UnitTestCPP/unittestpp.cpp:77 UnitTestCPP/unittestpp.cpp:104 msgid "A Unit test plugin based on the UnitTest++ framework" msgstr "UnitTest++ フレームワークをベースとした、ユニットテストプラグイン" -#: UnitTestCPP/unittestpp.cpp:96 UnitTestCPP/unittestpp.cpp:97 -#: UnitTestCPP/unittestpp.cpp:143 UnitTestCPP/unittestpp.cpp:556 +#: UnitTestCPP/unittestpp.cpp:100 UnitTestCPP/unittestpp.cpp:101 +#: UnitTestCPP/unittestpp.cpp:111 UnitTestCPP/unittestpp.cpp:153 +#: UnitTestCPP/unittestpp.cpp:569 msgid "UnitTest++" msgstr "UnitTest++" -#: UnitTestCPP/unittestpp.cpp:115 +#: UnitTestCPP/unittestpp.cpp:112 +msgid "Create new test..." +msgstr "新しいテストを作成..." + +#: UnitTestCPP/unittestpp.cpp:113 +msgid "Create tests for class..." +msgstr "クラスのテストを作成..." + +#: UnitTestCPP/unittestpp.cpp:114 UnitTestCPP/unittestpp.cpp:146 +msgid "Mark this project as UnitTest++ project" +msgstr "このプロジェクトを UnitTest++ プロジェクトとしてマーク" + +#: UnitTestCPP/unittestpp.cpp:115 UnitTestCPP/unittestpp.cpp:149 +msgid "Run Project as UnitTest++ and report" +msgstr "プロジェクトを UnitTest++ として実行し、結果を報告" + +#: UnitTestCPP/unittestpp.cpp:125 msgid "Run Unit tests..." msgstr "ユニットテストを実行..." -#: UnitTestCPP/unittestpp.cpp:116 +#: UnitTestCPP/unittestpp.cpp:126 msgid "Run project as unit test project..." msgstr "プロジェクトをユニットテストプロジェクトとして実行..." -#: UnitTestCPP/unittestpp.cpp:126 UnitTestCPP/unittestpp.cpp:181 +#: UnitTestCPP/unittestpp.cpp:136 UnitTestCPP/unittestpp.cpp:191 msgid "Create new &test..." msgstr "新しいテストを作成 (&T)..." -#: UnitTestCPP/unittestpp.cpp:130 UnitTestCPP/unittestpp.cpp:185 +#: UnitTestCPP/unittestpp.cpp:140 UnitTestCPP/unittestpp.cpp:195 msgid "Create tests for &class..." msgstr "クラスのテストを作成 (&C)..." -#: UnitTestCPP/unittestpp.cpp:136 -msgid "Mark this project as UnitTest++ project" -msgstr "このプロジェクトを UnitTest++ プロジェクトとしてマーク" - -#: UnitTestCPP/unittestpp.cpp:139 -msgid "Run Project as UnitTest++ and report" -msgstr "プロジェクトを UnitTest++ として実行し、結果を報告" - -#: UnitTestCPP/unittestpp.cpp:199 UnitTestCPP/unittestpp.cpp:267 +#: UnitTestCPP/unittestpp.cpp:209 UnitTestCPP/unittestpp.cpp:277 msgid "" "There are currently no UnitTest project in your workspace\n" "Would you like to create one now?" @@ -17992,16 +18340,16 @@ msgstr "" "ワークスペースにユニットテストプロジェクトがありません\n" "作成しますか？" -#: UnitTestCPP/unittestpp.cpp:322 +#: UnitTestCPP/unittestpp.cpp:332 msgid "Could not find the target project" msgstr "対象のプロジェクトが見つかりませんでした" -#: UnitTestCPP/unittestpp.cpp:389 +#: UnitTestCPP/unittestpp.cpp:400 #, c-format msgid "Could not create target file '%s'" msgstr "対象のファイル '%s' を作成できませんでした" -#: UnitTestCPP/unittestpp.cpp:494 +#: UnitTestCPP/unittestpp.cpp:505 msgid "Project contains 0 tests. Nothing to be done" msgstr "プロジェクトには処理するテストが全くありません" @@ -18272,21 +18620,22 @@ msgstr "コード全体を見渡せる、着脱可能なペインです。" msgid "Enable plugin" msgstr "プラグインを有効化" -#: abbreviation/abbreviation.cpp:62 abbreviation/abbreviation.cpp:81 +#: abbreviation/abbreviation.cpp:64 abbreviation/abbreviation.cpp:83 msgid "Abbreviation plugin" msgstr "短縮キーワードプラグイン" -#: abbreviation/abbreviation.cpp:100 abbreviation/abbreviation.cpp:101 +#: abbreviation/abbreviation.cpp:102 abbreviation/abbreviation.cpp:103 +#: abbreviation/abbreviation.cpp:211 msgid "Show abbreviations completion box" msgstr "短縮キーワードの補完ボックスを表示" -#: abbreviation/abbreviation.cpp:107 +#: abbreviation/abbreviation.cpp:109 msgid "Abbreviation" msgstr "短縮キーワード" -#: abbreviation/abbreviation.cpp:209 -msgid "Plugins::Abbreviations::Show abbreviations completion box" -msgstr "プラグイン::短縮キーワード::短縮キーワードの補完ボックスを表示" +#: abbreviation/abbreviation.cpp:210 +msgid "Abbreviations" +msgstr "短縮キーワード" #: abbreviation/abbreviationssettingsbase.cpp:30 msgid "" @@ -18364,7 +18713,7 @@ msgstr "" "います - 上書きしますか？" #: abbreviation/abbreviationssettingsdlg.cpp:232 -#: wxcrafter/wxcrafter_plugin.cpp:569 wxcrafter/wxguicraft_main_view.cpp:2840 +#: wxcrafter/wxcrafter_plugin.cpp:568 wxcrafter/wxguicraft_main_view.cpp:2832 msgid "'" msgstr "'" @@ -18412,7 +18761,7 @@ msgstr "テーマを生成" msgid "A makefile generator based on codelite's workspace" msgstr "CodeLite ワークスペースをベースとした Makefile ジェネレーター" -#: codelite_terminal/MainFrame.cpp:46 +#: codelite_terminal/MainFrame.cpp:50 msgid "CodeLite built-in terminal emulator" msgstr "CodeLite 内蔵の端末エミュレーター" @@ -18424,15 +18773,15 @@ msgstr "画面を消去\tCtrl-L" msgid "Preferences..." msgstr "個人設定..." -#: codelite_terminal/wxcrafter.cpp:137 +#: codelite_terminal/wxcrafter.cpp:129 msgid "Text Colour:" msgstr "テキストの色:" -#: codelite_terminal/wxcrafter.cpp:157 wxcrafter/wxgui_defs.h:118 +#: codelite_terminal/wxcrafter.cpp:149 wxcrafter/wxgui_defs.h:124 msgid "Font:" msgstr "フォント:" -#: codelite_terminal/wxcrafter.h:64 +#: codelite_terminal/wxcrafter.h:67 msgid "codelite-terminal" msgstr "codelite-terminal" @@ -18760,7 +19109,8 @@ msgid "Generate Setters / Getters" msgstr "セッター / ゲッターを生成" #: codelitephp/php-plugin/php_editor_context_menu.cpp:102 -#: wxcrafter/wxguicraft_main_view.cpp:2575 +#: wxcrafter/properties_list_view.cpp:69 +#: wxcrafter/wxguicraft_main_view.cpp:2595 msgid "Code Generation" msgstr "コードの生成" @@ -19437,33 +19787,33 @@ msgstr "" msgid "Do this for all files" msgstr "全てのファイルに行う" -#: cppchecker/cppchecker.cpp:73 +#: cppchecker/cppchecker.cpp:75 msgid "CppChecker integration for CodeLite IDE" msgstr "CodeLite IDE 用の CppChecker 統合" -#: cppchecker/cppchecker.cpp:97 +#: cppchecker/cppchecker.cpp:99 msgid "CppCheck integration for CodeLite IDE" msgstr "CodeLite IDE 用の CppCheck 統合" -#: cppchecker/cppchecker.cpp:143 +#: cppchecker/cppchecker.cpp:131 cppchecker/cppchecker.cpp:151 msgid "Check current file" msgstr "現在のファイルをチェック" -#: cppchecker/cppchecker.cpp:144 +#: cppchecker/cppchecker.cpp:132 cppchecker/cppchecker.cpp:152 msgid "Check current file's project" msgstr "現在のファイルを持つプロジェクトをチェック" -#: cppchecker/cppchecker.cpp:145 +#: cppchecker/cppchecker.cpp:133 cppchecker/cppchecker.cpp:153 msgid "Check workspace" msgstr "ワークスペースをチェック" -#: cppchecker/cppchecker.cpp:223 cppchecker/cppchecker.cpp:239 -#: cppchecker/cppchecker.cpp:253 cppchecker/cppchecker.cpp:267 +#: cppchecker/cppchecker.cpp:231 cppchecker/cppchecker.cpp:247 +#: cppchecker/cppchecker.cpp:261 cppchecker/cppchecker.cpp:275 msgid "Run CppCheck" msgstr "C++ チェックを実行" -#: cppchecker/cppchecker.cpp:279 cppchecker/cppchecker.cpp:294 -#: cppchecker/cppchecker.cpp:314 cppchecker/cppchecker.cpp:366 +#: cppchecker/cppchecker.cpp:287 cppchecker/cppchecker.cpp:302 +#: cppchecker/cppchecker.cpp:322 cppchecker/cppchecker.cpp:374 msgid "" "CppCheckPlugin: CppCheck is currently busy please wait for it to complete " "the current check" @@ -19471,20 +19821,20 @@ msgstr "" "C++ チェックプラグイン: C++ チェックは現在ビジー状態です。現在のチェックが完" "了するまでお待ちください" -#: cppchecker/cppchecker.cpp:475 +#: cppchecker/cppchecker.cpp:483 #, c-format msgid "Starting cppcheck: %s\n" msgstr "C++ チェックを開始しています: %s\n" -#: cppchecker/cppchecker.cpp:492 +#: cppchecker/cppchecker.cpp:500 msgid "Failed to launch codelite_cppcheck process!" msgstr "codelite_cppcheck プロセスの起動に失敗しました！" -#: cppchecker/cppchecker.cpp:573 +#: cppchecker/cppchecker.cpp:581 msgid "No files to check" msgstr "チェックするファイルがありません" -#: cppchecker/cppchecker.cpp:634 +#: cppchecker/cppchecker.cpp:643 msgid "Failed to open temporary file " msgstr "一時ファイルを開けませんでした " @@ -19869,94 +20219,95 @@ msgstr "CScope 実行ファイルへのパスを設定" msgid "CScope Settings" msgstr "CScope の設定" -#: cscope/cscope.cpp:70 cscope/cscope.cpp:81 +#: cscope/cscope.cpp:72 cscope/cscope.cpp:83 msgid "CScope Integration for CodeLite" msgstr "CodeLite 用の CScope 統合" -#: cscope/cscope.cpp:126 cscope/cscope.cpp:127 cscope/cscope.cpp:177 -msgid "Find this C symbol" -msgstr "この C 言語シンボルを検索" +#: cscope/cscope.cpp:104 cscope/cscope.cpp:176 +msgid "Find selected text" +msgstr "選択したテキストを検索" + +#: cscope/cscope.cpp:105 cscope/cscope.cpp:180 +msgid "Find this global definition" +msgstr "このグローバル定義を検索" + +#: cscope/cscope.cpp:106 cscope/cscope.cpp:129 cscope/cscope.cpp:130 +#: cscope/cscope.cpp:185 +msgid "Find functions called by this function" +msgstr "この関数から呼び出されている関数を検索" -#: cscope/cscope.cpp:128 cscope/cscope.cpp:129 cscope/cscope.cpp:191 -#: cscope/cscope.cpp:192 +#: cscope/cscope.cpp:107 cscope/cscope.cpp:127 cscope/cscope.cpp:128 +#: cscope/cscope.cpp:190 cscope/cscope.cpp:191 msgid "Find functions calling this function" msgstr "この関数を呼び出している関数を検索" -#: cscope/cscope.cpp:130 cscope/cscope.cpp:131 cscope/cscope.cpp:186 -msgid "Find functions called by this function" -msgstr "この関数から呼び出されている関数を検索" +#: cscope/cscope.cpp:108 cscope/cscope.cpp:201 +msgid "Create CScope database" +msgstr "CScope データベースを作成" + +#: cscope/cscope.cpp:125 cscope/cscope.cpp:126 cscope/cscope.cpp:176 +msgid "Find this C symbol" +msgstr "この C 言語シンボルを検索" -#: cscope/cscope.cpp:172 +#: cscope/cscope.cpp:171 msgid "Find ..." msgstr "検索..." -#: cscope/cscope.cpp:177 -msgid "Find selected text" -msgstr "選択したテキストを検索" - #: cscope/cscope.cpp:181 -msgid "Find this global definition" -msgstr "このグローバル定義を検索" - -#: cscope/cscope.cpp:182 msgid "Find this C global definition" msgstr "このグローバルな C 言語定義を検索" -#: cscope/cscope.cpp:196 cscope/cscope.cpp:282 +#: cscope/cscope.cpp:195 cscope/cscope.cpp:281 msgid "Find files #&including this filename" msgstr "このファイル名を #include しているファイルを検索 (&I)" -#: cscope/cscope.cpp:197 +#: cscope/cscope.cpp:196 msgid "Find files #including this filename" msgstr "このファイル名を #include しているファイルを検索" -#: cscope/cscope.cpp:202 -msgid "Create CScope database" -msgstr "CScope データベースを作成" - -#: cscope/cscope.cpp:203 cscope/cscope.cpp:288 +#: cscope/cscope.cpp:202 cscope/cscope.cpp:287 msgid "Create/Recreate the cscope database" msgstr "CScope データベースを作成/再作成" -#: cscope/cscope.cpp:208 +#: cscope/cscope.cpp:207 msgid "CScope settings" msgstr "CScope の設定" -#: cscope/cscope.cpp:208 +#: cscope/cscope.cpp:207 msgid "Configure cscope" msgstr "CScope を構成" -#: cscope/cscope.cpp:266 +#: cscope/cscope.cpp:265 msgid "&Find this C symbol" msgstr "この C 言語シンボルを探す (&F)" -#: cscope/cscope.cpp:269 +#: cscope/cscope.cpp:268 msgid "Find this &global definition" msgstr "このグローバル定義を検索 (&G)" -#: cscope/cscope.cpp:274 +#: cscope/cscope.cpp:273 msgid "Find functions &called by this function" msgstr "この関数から呼び出されている関数を検索 (&C)" -#: cscope/cscope.cpp:278 +#: cscope/cscope.cpp:277 msgid "Fi&nd functions calling this function" msgstr "この関数を呼び出している関数を検索 (&N)" -#: cscope/cscope.cpp:287 +#: cscope/cscope.cpp:286 msgid "Create CScope &database" msgstr "CScope データベースを作成 (&D)" -#: cscope/cscope.cpp:334 +#: cscope/cscope.cpp:333 msgid "Creating file list..." msgstr "ファイルの一覧を作成しています..." -#: cscope/cscope.cpp:381 +#: cscope/cscope.cpp:380 msgid "I can't find 'cscope' anywhere. Please check if it's installed." msgstr "" "'cscope' がどこにも見つかりません。インストールされていることを確認してくださ" "い。" -#: cscope/cscope.cpp:382 +#: cscope/cscope.cpp:381 msgid "" "Or tell me where it can be found, from the menu: 'Plugins | CScope | " "Settings'" @@ -19964,31 +20315,31 @@ msgstr "" "あるいは、メニュー: '[プラグイン] | [CScope] | [設定]' から、どこにあるかを教" "えてください" -#: cscope/cscope.cpp:383 +#: cscope/cscope.cpp:382 msgid "CScope not found" msgstr "CScope が見つかりませんでした" -#: cscope/cscope.cpp:442 +#: cscope/cscope.cpp:441 msgid "cscope results for: find global definition of '" msgstr "CScope の結果: グローバルな定義を検索 '" -#: cscope/cscope.cpp:469 +#: cscope/cscope.cpp:468 msgid "cscope results for: functions called by '" msgstr "CScope の結果: 呼び出し先の関数 '" -#: cscope/cscope.cpp:496 +#: cscope/cscope.cpp:495 msgid "cscope results for: functions calling '" msgstr "CScope の結果: 呼び出し元の関数 '" -#: cscope/cscope.cpp:538 +#: cscope/cscope.cpp:537 msgid "cscope results for: files that #include '" msgstr "CScope の結果: #include 元のファイル '" -#: cscope/cscope.cpp:562 +#: cscope/cscope.cpp:561 msgid "Recreated inverted CScope DB" msgstr "CScope 転置データベースを再作成しました" -#: cscope/cscope.cpp:565 +#: cscope/cscope.cpp:564 msgid "Recreated CScope DB" msgstr "CScope データベースを再作成しました" @@ -20020,23 +20371,19 @@ msgstr "ワークスペース全体" msgid "Line: " msgstr "行: " -#: ctagsd/lib/ProtocolHandler.cpp:276 +#: ctagsd/lib/ProtocolHandler.cpp:357 msgid "File: `" msgstr "ファイル: `" -#: ctagsd/lib/ProtocolHandler.cpp:276 +#: ctagsd/lib/ProtocolHandler.cpp:357 msgid "` is not opened on the server" msgstr "` をサーバーが開いていません" -#: ctagsd/lib/ProtocolHandler.cpp:430 -msgid "Updating symbols database..." -msgstr "シンボルデータベースを更新しています..." +#: ctagsd/lib/ProtocolHandler.cpp:502 +msgid "Initialization completed" +msgstr "初期化が完了しました" -#: ctagsd/lib/ProtocolHandler.cpp:432 -msgid "Success" -msgstr "成功" - -#: ctagsd/lib/ProtocolHandler.cpp:447 +#: ctagsd/lib/ProtocolHandler.cpp:524 msgid "unsupported message: `" msgstr "サポートしていないメッセージ: `" @@ -21485,7 +21832,7 @@ msgstr "拡張ライブラリのサポートは利用できません" #: wxcrafter/ActivityrIndicatorWrapper.cpp:8 #: wxcrafter/bitmap_button_wrapper.cpp:22 wxcrafter/button_wrapper.cpp:32 -#: wxcrafter/command_link_button_wrapper.cpp:26 +#: wxcrafter/command_link_button_wrapper.cpp:27 #: wxcrafter/info_bar_button_wrapper.cpp:23 wxcrafter/std_button_wrapper.cpp:25 msgid "" "Process a wxEVT_COMMAND_BUTTON_CLICKED event, when the button is clicked." @@ -21494,95 +21841,96 @@ msgstr "" "す。" #: wxcrafter/ActivityrIndicatorWrapper.cpp:11 -#: wxcrafter/AnimationCtrlWrapper.cpp:15 wxcrafter/AuiToolBarTopLevel.cpp:14 -#: wxcrafter/BitmapComboxWrapper.cpp:12 wxcrafter/RearrangeListWrapper.cpp:7 +#: wxcrafter/AnimationCtrlWrapper.cpp:17 wxcrafter/AuiToolBarTopLevel.cpp:16 +#: wxcrafter/BitmapComboxWrapper.cpp:13 wxcrafter/RearrangeListWrapper.cpp:8 #: wxcrafter/SimpleHtmlListBoxWrapper.cpp:22 #: wxcrafter/TimePickerCtrlWrapper.cpp:10 wxcrafter/aui_manager_wrapper.cpp:28 -#: wxcrafter/aui_notebook_wrapper.cpp:22 wxcrafter/banner_window_wrapper.cpp:21 +#: wxcrafter/aui_notebook_wrapper.cpp:22 wxcrafter/banner_window_wrapper.cpp:22 #: wxcrafter/bitmap_button_wrapper.cpp:26 -#: wxcrafter/bitmaptogglebuttonwrapper.cpp:9 wxcrafter/box_sizer_wrapper.cpp:17 +#: wxcrafter/bitmaptogglebuttonwrapper.cpp:9 wxcrafter/box_sizer_wrapper.cpp:18 #: wxcrafter/button_wrapper.cpp:36 wxcrafter/calendar_ctrl_wrapper.cpp:26 #: wxcrafter/check_box_wrapper.cpp:12 wxcrafter/check_list_box_wrapper.cpp:30 #: wxcrafter/choice_book_wrapper.cpp:14 wxcrafter/choice_wrapper.cpp:13 -#: wxcrafter/collapsible_pane_wrapper.cpp:19 +#: wxcrafter/collapsible_pane_wrapper.cpp:20 #: wxcrafter/colour_picker_wrapper.cpp:18 wxcrafter/combox_wrapper.cpp:13 -#: wxcrafter/command_link_button_wrapper.cpp:21 -#: wxcrafter/data_view_list_ctrl_wrapper.cpp:58 -#: wxcrafter/data_view_tree_ctrl_wrapper.cpp:58 -#: wxcrafter/data_view_tree_list_ctrl_wrapper.cpp:65 +#: wxcrafter/command_link_button_wrapper.cpp:22 +#: wxcrafter/data_view_list_ctrl_wrapper.cpp:59 +#: wxcrafter/data_view_tree_ctrl_wrapper.cpp:60 +#: wxcrafter/data_view_tree_list_ctrl_wrapper.cpp:67 #: wxcrafter/dialog_wrapper.cpp:26 wxcrafter/dir_picker_ctrl_wrapper.cpp:11 #: wxcrafter/file_picker_ctrl_wrapper.cpp:11 -#: wxcrafter/flexgridsizer_wrapper.cpp:11 +#: wxcrafter/flexgridsizer_wrapper.cpp:12 #: wxcrafter/font_picker_ctrl_wrapper.cpp:12 wxcrafter/frame_wrapper.cpp:28 #: wxcrafter/generic_dir_ctrl_wrapper.cpp:12 wxcrafter/gl_canvas_wrapper.cpp:11 -#: wxcrafter/grid_bag_sizer_wrapper.cpp:10 wxcrafter/grid_column_wrapper.cpp:13 -#: wxcrafter/grid_row_wrapper.cpp:12 wxcrafter/grid_sizer_wrapper.cpp:11 +#: wxcrafter/grid_bag_sizer_wrapper.cpp:11 wxcrafter/grid_column_wrapper.cpp:13 +#: wxcrafter/grid_row_wrapper.cpp:12 wxcrafter/grid_sizer_wrapper.cpp:12 #: wxcrafter/grid_wrapper.cpp:25 wxcrafter/html_window_wrapper.cpp:16 #: wxcrafter/hyper_link_ctrl_wrapper.cpp:22 wxcrafter/image_list_wrapper.cpp:16 #: wxcrafter/info_bar_button_wrapper.cpp:13 #: wxcrafter/info_bar_button_wrapper.cpp:14 wxcrafter/info_bar_wrapper.cpp:10 #: wxcrafter/list_book_wrapper.cpp:9 wxcrafter/list_box_wrapper.cpp:27 #: wxcrafter/list_ctrl_column_wrapper.cpp:13 wxcrafter/list_ctrl_wrapper.cpp:9 -#: wxcrafter/media_ctrl_wrapper.cpp:21 wxcrafter/menu_bar_wrapper.cpp:9 -#: wxcrafter/menu_item_wrapper.cpp:28 wxcrafter/menu_item_wrapper.cpp:29 +#: wxcrafter/media_ctrl_wrapper.cpp:22 wxcrafter/menu_bar_wrapper.cpp:9 +#: wxcrafter/menu_item_wrapper.cpp:29 wxcrafter/menu_item_wrapper.cpp:30 #: wxcrafter/menu_wrapper.cpp:21 wxcrafter/notebook_page_wrapper.cpp:24 #: wxcrafter/notebook_wrapper.cpp:9 wxcrafter/panel_wrapper.cpp:11 #: wxcrafter/panel_wrapper_top_level.cpp:12 #: wxcrafter/popup_window_wrapper.cpp:7 #: wxcrafter/property_grid_manager_wrapper.cpp:8 #: wxcrafter/property_grid_wrapper.cpp:40 wxcrafter/radio_box_wrapper.cpp:15 -#: wxcrafter/radio_button_wrapper.cpp:13 wxcrafter/ribbon_bar_wrapper.cpp:35 -#: wxcrafter/ribbon_button_bar_wrapper.cpp:8 -#: wxcrafter/ribbon_gallery_item_wrapper.cpp:12 -#: wxcrafter/ribbon_gallery_wrapper.cpp:8 wxcrafter/ribbon_page_wrapper.cpp:14 -#: wxcrafter/ribbon_panel_wrapper.cpp:19 -#: wxcrafter/ribbon_tool_bar_wrapper.cpp:9 +#: wxcrafter/radio_button_wrapper.cpp:13 wxcrafter/ribbon_bar_wrapper.cpp:37 +#: wxcrafter/ribbon_button_bar_wrapper.cpp:10 +#: wxcrafter/ribbon_gallery_item_wrapper.cpp:13 +#: wxcrafter/ribbon_gallery_wrapper.cpp:10 wxcrafter/ribbon_page_wrapper.cpp:16 +#: wxcrafter/ribbon_panel_wrapper.cpp:21 +#: wxcrafter/ribbon_tool_bar_wrapper.cpp:11 #: wxcrafter/rich_text_ctrl_wrapper.cpp:60 wxcrafter/scroll_bar_wrapper.cpp:32 #: wxcrafter/scrolled_window_wrapper.cpp:14 #: wxcrafter/search_ctrl_wrapper.cpp:18 wxcrafter/simple_book_wrapper.cpp:34 #: wxcrafter/slider_wrapper.cpp:9 wxcrafter/spin_button_wrapper.cpp:20 #: wxcrafter/spin_ctrl_wrapper.cpp:20 wxcrafter/splitter_window_wrapper.cpp:17 #: wxcrafter/static_bitmap_wrapper.cpp:12 -#: wxcrafter/static_box_sizer_wrapper.cpp:17 +#: wxcrafter/static_box_sizer_wrapper.cpp:18 #: wxcrafter/static_line_wrapper.cpp:8 wxcrafter/static_text_wrapper.cpp:15 #: wxcrafter/status_bar_wrapper.cpp:18 #: wxcrafter/styled_text_ctrl_wrapper.cpp:176 -#: wxcrafter/task_bar_icon_wrapper.cpp:20 wxcrafter/text_ctrl_wrapper.cpp:41 +#: wxcrafter/task_bar_icon_wrapper.cpp:22 wxcrafter/text_ctrl_wrapper.cpp:41 #: wxcrafter/timer_wrapper.cpp:16 wxcrafter/toggle_button_wrapper.cpp:12 #: wxcrafter/tool_bar_item_wrapper.cpp:35 wxcrafter/tool_book_wrapper.cpp:10 -#: wxcrafter/toolbar_base_wrapper.cpp:31 wxcrafter/toolbar_base_wrapper.cpp:177 +#: wxcrafter/toolbar_base_wrapper.cpp:33 wxcrafter/toolbar_base_wrapper.cpp:210 #: wxcrafter/tree_book_wrapper.cpp:9 wxcrafter/tree_ctrl_wrapper.cpp:9 -#: wxcrafter/tree_list_ctrl_wrapper.cpp:9 wxcrafter/web_view_wrapper.cpp:33 +#: wxcrafter/tree_list_ctrl_wrapper.cpp:10 wxcrafter/web_view_wrapper.cpp:33 #: wxcrafter/wizard_page_wrapper.cpp:15 wxcrafter/wizard_wrapper.cpp:15 -#: wxcrafter/wxc_widget.cpp:132 +#: wxcrafter/wxc_widget.cpp:131 msgid "Common Settings" msgstr "一般設定" -#: wxcrafter/AnimationCtrlWrapper.cpp:17 +#: wxcrafter/AnimationCtrlWrapper.cpp:19 msgid "Load and play animation on creation" msgstr "作成時にアニメーションを読み込んで再生" -#: wxcrafter/AnimationCtrlWrapper.cpp:18 +#: wxcrafter/AnimationCtrlWrapper.cpp:20 msgid "Select the animation file" msgstr "アニメーションファイルを選択" -#: wxcrafter/AnimationCtrlWrapper.cpp:21 +#: wxcrafter/AnimationCtrlWrapper.cpp:22 msgid "" "Sets the bitmap to show on the control when it's not playing an animation" msgstr "アニメーションを再生していないときに表示するビットマップを設定します" -#: wxcrafter/AuiToolBarTopLevel.cpp:16 wxcrafter/allocator_mgr.cpp:504 -#: wxcrafter/toolbar_base_wrapper.cpp:185 wxcrafter/wxcrafter_gui.cpp:754 +#: wxcrafter/AuiToolBarTopLevel.cpp:18 wxcrafter/allocator_mgr.cpp:504 +#: wxcrafter/toolbar_base_wrapper.cpp:218 wxcrafter/wxcrafter_gui.cpp:755 +#: wxcrafter/wxcrafter_gui.cpp:1419 msgid "wxAuiToolBar" msgstr "wxAuiToolBar" -#: wxcrafter/AuiToolBarTopLevel.cpp:18 wxcrafter/AuiToolBarTopLevel.cpp:37 -#: wxcrafter/image_list_wrapper.cpp:18 wxcrafter/top_level_win_wrapper.cpp:78 +#: wxcrafter/AuiToolBarTopLevel.cpp:20 wxcrafter/AuiToolBarTopLevel.cpp:39 +#: wxcrafter/image_list_wrapper.cpp:18 wxcrafter/top_level_win_wrapper.cpp:80 msgid "The generated C++ class name" msgstr "生成する C++ のクラス名" -#: wxcrafter/AuiToolBarTopLevel.cpp:20 wxcrafter/toolbar_base_wrapper.cpp:34 -#: wxcrafter/toolbar_base_wrapper.cpp:180 +#: wxcrafter/AuiToolBarTopLevel.cpp:22 wxcrafter/toolbar_base_wrapper.cpp:36 +#: wxcrafter/toolbar_base_wrapper.cpp:213 msgid "" "The control size. It is recommended to leave it as -1,-1 and let\n" "the sizers calculate the best size for the window" @@ -21590,13 +21938,13 @@ msgstr "" "コントロールのサイズです。-1,-1 (推奨) のままにすると\n" "サイザーがウィンドウに最も適切なサイズを計算してくれます" -#: wxcrafter/AuiToolBarTopLevel.cpp:24 -#: wxcrafter/data_view_tree_list_ctrl_wrapper.cpp:67 -#: wxcrafter/image_list_wrapper.cpp:17 wxcrafter/top_level_win_wrapper.cpp:65 +#: wxcrafter/AuiToolBarTopLevel.cpp:26 +#: wxcrafter/data_view_tree_list_ctrl_wrapper.cpp:69 +#: wxcrafter/image_list_wrapper.cpp:17 wxcrafter/top_level_win_wrapper.cpp:67 msgid "Inherited C++ Class Properties" msgstr "継承した C++ クラスのプロパティ" -#: wxcrafter/AuiToolBarTopLevel.cpp:26 wxcrafter/top_level_win_wrapper.cpp:67 +#: wxcrafter/AuiToolBarTopLevel.cpp:28 wxcrafter/top_level_win_wrapper.cpp:69 msgid "" "Inherited class name\n" "Fill this field to generate a class that inherits from the base class,\n" @@ -21609,18 +21957,18 @@ msgstr "" "例: 基底クラスが 'FooDialogBase' だったら、派生クラスは 'FooDialog' のように" "します。" -#: wxcrafter/AuiToolBarTopLevel.cpp:31 wxcrafter/top_level_win_wrapper.cpp:71 +#: wxcrafter/AuiToolBarTopLevel.cpp:33 wxcrafter/top_level_win_wrapper.cpp:73 msgid "" "The name for the inherited class's files (without any file extension).\n" -"wxCrafter will generate a $(FILE).cpp and $(FILE).h\n" +"wxCrafter will generate a $(FILE).cpp and $(FILE).hpp\n" "e.g. for an inherited class 'FooDialog', you might enter 'foodialog' here." msgstr "" "継承したクラスのファイル名 (拡張子は不要) です。\n" -"ファイル $(FILE).cpp と $(FILE).h が生成されます。\n" +"ファイル $(FILE).cpp と $(FILE).hpp が生成されます\n" "例: 継承クラスが 'FooDialog' だったら、ここは 'foodialog' のようにします。" -#: wxcrafter/AuiToolBarTopLevel.cpp:34 wxcrafter/image_list_wrapper.cpp:23 -#: wxcrafter/top_level_win_wrapper.cpp:75 +#: wxcrafter/AuiToolBarTopLevel.cpp:36 wxcrafter/image_list_wrapper.cpp:23 +#: wxcrafter/top_level_win_wrapper.cpp:77 msgid "" "MSW Only\n" "C++ macro decorator - allows exporting this class from a DLL" @@ -21628,34 +21976,34 @@ msgstr "" "Microsoft Windows のみ\n" "C++ マクロデコレーター - このクラスを DLL からエクスポートできます" -#: wxcrafter/AuiToolBarTopLevel.cpp:41 wxcrafter/image_list_wrapper.cpp:21 +#: wxcrafter/AuiToolBarTopLevel.cpp:43 wxcrafter/image_list_wrapper.cpp:21 msgid "codelite's virtual folder for the generated files" msgstr "生成したファイルを置く仮想フォルダー" -#: wxcrafter/AuiToolBarTopLevel.cpp:43 -#: wxcrafter/command_link_button_wrapper.cpp:22 +#: wxcrafter/AuiToolBarTopLevel.cpp:45 +#: wxcrafter/command_link_button_wrapper.cpp:23 #: wxcrafter/custom_control_wrapper.cpp:12 -#: wxcrafter/data_view_list_ctrl_wrapper.cpp:60 -#: wxcrafter/data_view_tree_ctrl_wrapper.cpp:59 -#: wxcrafter/data_view_tree_list_ctrl_wrapper.cpp:66 -#: wxcrafter/wxc_widget.cpp:158 wxcrafter/wxgui_defs.h:255 +#: wxcrafter/data_view_list_ctrl_wrapper.cpp:61 +#: wxcrafter/data_view_tree_ctrl_wrapper.cpp:61 +#: wxcrafter/data_view_tree_list_ctrl_wrapper.cpp:68 +#: wxcrafter/wxc_widget.cpp:158 wxcrafter/wxgui_defs.h:261 msgid "Control Specific Settings" msgstr "コントロール固有の設定" -#: wxcrafter/AuiToolBarTopLevel.cpp:44 wxcrafter/toolbar_base_wrapper.cpp:40 -#: wxcrafter/toolbar_base_wrapper.cpp:186 +#: wxcrafter/AuiToolBarTopLevel.cpp:46 wxcrafter/toolbar_base_wrapper.cpp:42 +#: wxcrafter/toolbar_base_wrapper.cpp:219 msgid "Sets the default size of each tool bitmap" msgstr "各ツールのビットマップの既定サイズを設定します" -#: wxcrafter/AuiToolBarTopLevel.cpp:46 wxcrafter/toolbar_base_wrapper.cpp:188 +#: wxcrafter/AuiToolBarTopLevel.cpp:47 wxcrafter/toolbar_base_wrapper.cpp:221 msgid "Set the values to be used as margins for the toolbar." msgstr "ツールバーのマージンに使う値を設定します。" -#: wxcrafter/BitmapComboxWrapper.cpp:13 wxcrafter/combox_wrapper.cpp:14 +#: wxcrafter/BitmapComboxWrapper.cpp:14 wxcrafter/combox_wrapper.cpp:14 msgid "Combobox drop down choices" msgstr "コンボボックスのドロップダウン選択肢" -#: wxcrafter/BitmapComboxWrapper.cpp:16 +#: wxcrafter/BitmapComboxWrapper.cpp:17 #: wxcrafter/SimpleHtmlListBoxWrapper.cpp:27 wxcrafter/combox_wrapper.cpp:18 #: wxcrafter/list_box_wrapper.cpp:31 msgid "" @@ -21664,11 +22012,11 @@ msgid "" msgstr "" "予め選択しておく文字列の位置番号 (0 始まり) か、未選択を表す -1 を指定します" -#: wxcrafter/BitmapComboxWrapper.cpp:17 wxcrafter/combox_wrapper.cpp:19 +#: wxcrafter/BitmapComboxWrapper.cpp:18 wxcrafter/combox_wrapper.cpp:19 msgid "The combobox initial value" msgstr "コンボボックスの初期値" -#: wxcrafter/BitmapComboxWrapper.cpp:20 wxcrafter/combox_wrapper.cpp:22 +#: wxcrafter/BitmapComboxWrapper.cpp:21 wxcrafter/combox_wrapper.cpp:22 msgid "" "Process a wxEVT_COMMAND_COMBOBOX_SELECTED event, when an item on the list is " "selected. Note that calling GetValue returns the new value of selection." @@ -21676,7 +22024,7 @@ msgstr "" "一覧の項目を選択したときの wxEVT_COMMAND_COMBOBOX_SELECTED イベントを処理しま" "す。注: GetValue() は新しく選択した値を返します。" -#: wxcrafter/BitmapComboxWrapper.cpp:23 wxcrafter/combox_wrapper.cpp:25 +#: wxcrafter/BitmapComboxWrapper.cpp:24 wxcrafter/combox_wrapper.cpp:25 #: wxcrafter/spin_ctrl_wrapper.cpp:18 msgid "" "Process a wxEVT_COMMAND_TEXT_UPDATED event, when the combobox text changes." @@ -21684,7 +22032,7 @@ msgstr "" "コンボボックスのテキストを変更したときの wxEVT_COMMAND_TEXT_UPDATED イベント" "を処理します。" -#: wxcrafter/BitmapComboxWrapper.cpp:25 wxcrafter/combox_wrapper.cpp:27 +#: wxcrafter/BitmapComboxWrapper.cpp:26 wxcrafter/combox_wrapper.cpp:27 msgid "" "Process a wxEVT_COMMAND_TEXT_ENTER event, when is pressed in the " "combobox." @@ -21722,27 +22070,27 @@ msgstr "イベントを表示中 - " msgid "Sample Text" msgstr "見本のテキスト" -#: wxcrafter/NewFormWizard.cpp:163 wxcrafter/wxcrafter_plugin.cpp:692 +#: wxcrafter/NewFormWizard.cpp:165 wxcrafter/wxcrafter_plugin.cpp:697 msgid "You must create a project before you can add new forms" msgstr "新しいフォームを追加する前に、プロジェクトを作成してください" -#: wxcrafter/NewFormWizard.cpp:172 +#: wxcrafter/NewFormWizard.cpp:174 msgid "Please enter a file name" msgstr "ファイル名を入力してください" -#: wxcrafter/NewFormWizard.cpp:178 +#: wxcrafter/NewFormWizard.cpp:180 msgid "Please enter a class name" msgstr "クラス名を入力してください" -#: wxcrafter/NewFormWizard.cpp:185 +#: wxcrafter/NewFormWizard.cpp:187 msgid "Please select a virtual folder for the generated code" msgstr "生成したファイルの置き場所となる、仮想フォルダーを選択してください" -#: wxcrafter/NewFormWizard.cpp:206 +#: wxcrafter/NewFormWizard.cpp:208 msgid "Enter the new wxCrafter file a name (full path):" msgstr "新しい wxCrafter ファイル名を入力 (完全なパス):" -#: wxcrafter/NewFormWizard.cpp:321 +#: wxcrafter/NewFormWizard.cpp:330 msgid "Select wxCrafter file" msgstr "wxCrafter ファイルを選択" @@ -22179,7 +22527,7 @@ msgid "ToolBar Pane" msgstr "ツールバーのペイン" #: wxcrafter/aui_pane_info.cpp:72 wxcrafter/aui_pane_info.cpp:182 -#: wxcrafter/wxgui_defs.h:269 +#: wxcrafter/wxgui_defs.h:275 msgid "Direction" msgstr "方向" @@ -22223,7 +22571,7 @@ msgstr "最大化ボタン" msgid "Pin Button" msgstr "ピン留めボタン" -#: wxcrafter/banner_window_wrapper.cpp:23 +#: wxcrafter/banner_window_wrapper.cpp:24 msgid "" "The Title\n" "Title is rendered in bold and should be single line" @@ -22231,7 +22579,7 @@ msgstr "" "題名です\n" "題名は一行だけを指定でき、太字で描画されます" -#: wxcrafter/banner_window_wrapper.cpp:25 +#: wxcrafter/banner_window_wrapper.cpp:26 msgid "" "Message can have multiple lines but is not wrapped automatically\n" "include explicit line breaks in the string if you want to have multiple lines" @@ -22240,7 +22588,7 @@ msgstr "" "ん\n" "複数の行に分けたいときは、明示的に改行を入れてください" -#: wxcrafter/banner_window_wrapper.cpp:30 +#: wxcrafter/banner_window_wrapper.cpp:31 msgid "" "The banner orientation changes how the text in it is displayed and also " "defines where is the bitmap truncated if it's too big to fit\n" @@ -22252,7 +22600,7 @@ msgstr "" "ただし、バナーの位置は変わりません (この場合は、サイザーなどを使って調整する" "のが一般的です)" -#: wxcrafter/banner_window_wrapper.cpp:35 +#: wxcrafter/banner_window_wrapper.cpp:36 msgid "" "Select the bitmap file\n" "Important: You can set text and title OR a bitmap, but not both" @@ -22262,18 +22610,18 @@ msgstr "" "度に両方は設定できません)" #: wxcrafter/bitmap_button_wrapper.cpp:27 wxcrafter/bitmap_wrapepr.cpp:21 -#: wxcrafter/command_link_button_wrapper.cpp:34 wxcrafter/ribbon_button.cpp:32 -#: wxcrafter/ribbon_gallery_item_wrapper.cpp:13 +#: wxcrafter/command_link_button_wrapper.cpp:35 wxcrafter/ribbon_button.cpp:34 +#: wxcrafter/ribbon_gallery_item_wrapper.cpp:14 #: wxcrafter/static_bitmap_wrapper.cpp:13 msgid "Select the bitmap file" msgstr "ビットマップファイルを選択" #: wxcrafter/bitmap_button_wrapper.cpp:28 wxcrafter/button_wrapper.cpp:38 -#: wxcrafter/command_link_button_wrapper.cpp:35 +#: wxcrafter/command_link_button_wrapper.cpp:36 msgid "Make this button the default button" msgstr "このボタンを既定のボタンにします" -#: wxcrafter/bitmap_wrapepr.cpp:16 wxcrafter/wxcrafter_gui.cpp:101 +#: wxcrafter/bitmap_wrapepr.cpp:16 wxcrafter/wxcrafter_gui.cpp:102 msgid "wxBitmap" msgstr "wxBitmap" @@ -22301,7 +22649,7 @@ msgstr "ボタンの初期状態" msgid "Handles a toggle button click event." msgstr "切り替え式のボタンをクリックしたときのイベントを処理します。" -#: wxcrafter/box_sizer_wrapper.cpp:18 wxcrafter/static_box_sizer_wrapper.cpp:18 +#: wxcrafter/box_sizer_wrapper.cpp:19 wxcrafter/static_box_sizer_wrapper.cpp:19 msgid "Sizer orientation" msgstr "サイザーの方向" @@ -22309,7 +22657,7 @@ msgstr "サイザーの方向" msgid "My Button" msgstr "ボタン" -#: wxcrafter/button_wrapper.cpp:37 wxcrafter/ribbon_button.cpp:31 +#: wxcrafter/button_wrapper.cpp:37 wxcrafter/ribbon_button.cpp:33 #: wxcrafter/toggle_button_wrapper.cpp:13 msgid "The button label" msgstr "ボタンのラベル" @@ -22422,19 +22770,19 @@ msgstr "" "一覧の項目を選択したときの wxEVT_COMMAND_CHOICE_SELECTED イベントを処理しま" "す。" -#: wxcrafter/collapsible_pane_wrapper.cpp:13 +#: wxcrafter/collapsible_pane_wrapper.cpp:14 msgid "The user expanded or collapsed the collapsible pane" msgstr "開閉可能なペインを折り畳み/広げました" -#: wxcrafter/collapsible_pane_wrapper.cpp:14 +#: wxcrafter/collapsible_pane_wrapper.cpp:15 msgid "Process a navigation key event" msgstr "ナビゲーションキーのイベントを処理します" -#: wxcrafter/collapsible_pane_wrapper.cpp:20 +#: wxcrafter/collapsible_pane_wrapper.cpp:21 msgid "The label" msgstr "ラベル" -#: wxcrafter/collapsible_pane_wrapper.cpp:21 +#: wxcrafter/collapsible_pane_wrapper.cpp:22 msgid "Set the state of the collapsible pane" msgstr "折り畳み可能なペインの状態を設定します" @@ -22458,7 +22806,7 @@ msgstr "" msgid "Sets a hint shown in an empty unfocused text control" msgstr "未フォーカス状態の空欄に表示するヒントを設定します" -#: wxcrafter/command_link_button_wrapper.cpp:30 +#: wxcrafter/command_link_button_wrapper.cpp:31 msgid "" "First line of text on the button, typically the label of an action that will " "be made when the button is pressed" @@ -22466,7 +22814,7 @@ msgstr "" "ボタン上に表示する、最初の行のテキストです。一般的には、ボタンを押したときに" "起こる動作をラベルとします" -#: wxcrafter/command_link_button_wrapper.cpp:33 +#: wxcrafter/command_link_button_wrapper.cpp:34 msgid "" "Second line of text describing the action performed when the button is " "pressed" @@ -22492,7 +22840,7 @@ msgstr "" "-1 - 未指定/既定値を表す、特別な値です\n" "-2 - 全ての値が収まるように、幅を自動調整します" -#: wxcrafter/data_view_list_ctrl_column.cpp:40 wxcrafter/wxgui_defs.h:221 +#: wxcrafter/data_view_list_ctrl_column.cpp:40 wxcrafter/wxgui_defs.h:227 msgid "Column Type" msgstr "列の種類" @@ -22516,15 +22864,15 @@ msgstr "セルのモード (編集やアクティブ化の可否)" msgid "One or more flags of the wxDataViewColumnFlags enumeration" msgstr "ひとつ以上の wxDataViewColumnFlags 列挙型フラグ" -#: wxcrafter/data_view_list_ctrl_wrapper.cpp:18 -#: wxcrafter/data_view_tree_ctrl_wrapper.cpp:18 -#: wxcrafter/data_view_tree_list_ctrl_wrapper.cpp:22 +#: wxcrafter/data_view_list_ctrl_wrapper.cpp:19 +#: wxcrafter/data_view_tree_ctrl_wrapper.cpp:20 +#: wxcrafter/data_view_tree_list_ctrl_wrapper.cpp:24 msgid "Process a wxEVT_COMMAND_DATAVIEW_SELECTION_CHANGED event" msgstr "wxEVT_COMMAND_DATAVIEW_SELECTION_CHANGED イベントを処理します" -#: wxcrafter/data_view_list_ctrl_wrapper.cpp:20 -#: wxcrafter/data_view_tree_ctrl_wrapper.cpp:20 -#: wxcrafter/data_view_tree_list_ctrl_wrapper.cpp:24 +#: wxcrafter/data_view_list_ctrl_wrapper.cpp:21 +#: wxcrafter/data_view_tree_ctrl_wrapper.cpp:22 +#: wxcrafter/data_view_tree_list_ctrl_wrapper.cpp:26 msgid "" "Process a wxEVT_COMMAND_DATAVIEW_ITEM_ACTIVATED event.\n" "This event is triggered by double clicking an item or pressing some special " @@ -22534,9 +22882,9 @@ msgstr "" "このイベントは、項目をダブルクリックするか、フォーカスした状態で特殊キー " "(\"Enter\" など) を押すと発動します" -#: wxcrafter/data_view_list_ctrl_wrapper.cpp:23 -#: wxcrafter/data_view_tree_ctrl_wrapper.cpp:23 -#: wxcrafter/data_view_tree_list_ctrl_wrapper.cpp:27 +#: wxcrafter/data_view_list_ctrl_wrapper.cpp:24 +#: wxcrafter/data_view_tree_ctrl_wrapper.cpp:25 +#: wxcrafter/data_view_tree_list_ctrl_wrapper.cpp:29 msgid "" "Process a wxEVT_COMMAND_DATAVIEW_ITEM_START_EDITING event.\n" "This event can be vetoed in order to prevent editing on an item by item basis" @@ -22544,51 +22892,51 @@ msgstr "" "wxEVT_COMMAND_DATAVIEW_ITEM_START_EDITING イベントを処理します。\n" "このイベントを拒否し、各項目ごとに編集を防止することもできます" -#: wxcrafter/data_view_list_ctrl_wrapper.cpp:26 -#: wxcrafter/data_view_tree_ctrl_wrapper.cpp:26 -#: wxcrafter/data_view_tree_list_ctrl_wrapper.cpp:30 +#: wxcrafter/data_view_list_ctrl_wrapper.cpp:27 +#: wxcrafter/data_view_tree_ctrl_wrapper.cpp:28 +#: wxcrafter/data_view_tree_list_ctrl_wrapper.cpp:32 msgid "Process a wxEVT_COMMAND_DATAVIEW_ITEM_EDITING_STARTED event" msgstr "wxEVT_COMMAND_DATAVIEW_ITEM_EDITING_STARTED イベントを処理します" -#: wxcrafter/data_view_list_ctrl_wrapper.cpp:28 -#: wxcrafter/data_view_tree_ctrl_wrapper.cpp:28 -#: wxcrafter/data_view_tree_list_ctrl_wrapper.cpp:32 +#: wxcrafter/data_view_list_ctrl_wrapper.cpp:29 +#: wxcrafter/data_view_tree_ctrl_wrapper.cpp:30 +#: wxcrafter/data_view_tree_list_ctrl_wrapper.cpp:34 msgid "Process a wxEVT_COMMAND_DATAVIEW_ITEM_EDITING_DONE event" msgstr "wxEVT_COMMAND_DATAVIEW_ITEM_EDITING_DONE イベントを処理します" -#: wxcrafter/data_view_list_ctrl_wrapper.cpp:30 -#: wxcrafter/data_view_tree_ctrl_wrapper.cpp:30 -#: wxcrafter/data_view_tree_list_ctrl_wrapper.cpp:34 +#: wxcrafter/data_view_list_ctrl_wrapper.cpp:31 +#: wxcrafter/data_view_tree_ctrl_wrapper.cpp:32 +#: wxcrafter/data_view_tree_list_ctrl_wrapper.cpp:36 msgid "Process a wxEVT_COMMAND_DATAVIEW_ITEM_COLLAPSING event" msgstr "wxEVT_COMMAND_DATAVIEW_ITEM_COLLAPSING イベントを処理します" -#: wxcrafter/data_view_list_ctrl_wrapper.cpp:32 -#: wxcrafter/data_view_tree_ctrl_wrapper.cpp:32 -#: wxcrafter/data_view_tree_list_ctrl_wrapper.cpp:36 +#: wxcrafter/data_view_list_ctrl_wrapper.cpp:33 +#: wxcrafter/data_view_tree_ctrl_wrapper.cpp:34 +#: wxcrafter/data_view_tree_list_ctrl_wrapper.cpp:38 msgid "Process a wxEVT_COMMAND_DATAVIEW_ITEM_COLLAPSED event" msgstr "wxEVT_COMMAND_DATAVIEW_ITEM_COLLAPSED イベントを処理します" -#: wxcrafter/data_view_list_ctrl_wrapper.cpp:34 -#: wxcrafter/data_view_tree_ctrl_wrapper.cpp:34 -#: wxcrafter/data_view_tree_list_ctrl_wrapper.cpp:38 +#: wxcrafter/data_view_list_ctrl_wrapper.cpp:35 +#: wxcrafter/data_view_tree_ctrl_wrapper.cpp:36 +#: wxcrafter/data_view_tree_list_ctrl_wrapper.cpp:40 msgid "Process a wxEVT_COMMAND_DATAVIEW_ITEM_EXPANDING event" msgstr "wxEVT_COMMAND_DATAVIEW_ITEM_EXPANDING イベントを処理します" -#: wxcrafter/data_view_list_ctrl_wrapper.cpp:36 -#: wxcrafter/data_view_tree_ctrl_wrapper.cpp:36 -#: wxcrafter/data_view_tree_list_ctrl_wrapper.cpp:40 +#: wxcrafter/data_view_list_ctrl_wrapper.cpp:37 +#: wxcrafter/data_view_tree_ctrl_wrapper.cpp:38 +#: wxcrafter/data_view_tree_list_ctrl_wrapper.cpp:42 msgid "Process a wxEVT_COMMAND_DATAVIEW_ITEM_EXPANDED event" msgstr "wxEVT_COMMAND_DATAVIEW_ITEM_EXPANDED イベントを処理します" -#: wxcrafter/data_view_list_ctrl_wrapper.cpp:38 -#: wxcrafter/data_view_tree_ctrl_wrapper.cpp:38 -#: wxcrafter/data_view_tree_list_ctrl_wrapper.cpp:42 +#: wxcrafter/data_view_list_ctrl_wrapper.cpp:39 +#: wxcrafter/data_view_tree_ctrl_wrapper.cpp:40 +#: wxcrafter/data_view_tree_list_ctrl_wrapper.cpp:44 msgid "Process a wxEVT_COMMAND_DATAVIEW_ITEM_VALUE_CHANGED event" msgstr "wxEVT_COMMAND_DATAVIEW_ITEM_VALUE_CHANGED イベントを処理します" -#: wxcrafter/data_view_list_ctrl_wrapper.cpp:40 -#: wxcrafter/data_view_tree_ctrl_wrapper.cpp:40 -#: wxcrafter/data_view_tree_list_ctrl_wrapper.cpp:44 +#: wxcrafter/data_view_list_ctrl_wrapper.cpp:41 +#: wxcrafter/data_view_tree_ctrl_wrapper.cpp:42 +#: wxcrafter/data_view_tree_list_ctrl_wrapper.cpp:46 msgid "" "Process a wxEVT_COMMAND_DATAVIEW_ITEM_CONTEXT_MENU event generated when the " "user right clicks inside the control.\n" @@ -22601,63 +22949,63 @@ msgstr "" "注: このメニューは、たとえ有効な項目をクリックせずとも生成されます。この場" "合、wxDataViewEvent::GetItem() は単に無効な項目を返します。" -#: wxcrafter/data_view_list_ctrl_wrapper.cpp:44 -#: wxcrafter/data_view_tree_ctrl_wrapper.cpp:44 -#: wxcrafter/data_view_tree_list_ctrl_wrapper.cpp:48 +#: wxcrafter/data_view_list_ctrl_wrapper.cpp:45 +#: wxcrafter/data_view_tree_ctrl_wrapper.cpp:46 +#: wxcrafter/data_view_tree_list_ctrl_wrapper.cpp:50 msgid "Process a wxEVT_COMMAND_DATAVIEW_COLUMN_HEADER_CLICK event" msgstr "wxEVT_COMMAND_DATAVIEW_COLUMN_HEADER_CLICK イベントを処理します" -#: wxcrafter/data_view_list_ctrl_wrapper.cpp:46 -#: wxcrafter/data_view_tree_ctrl_wrapper.cpp:46 -#: wxcrafter/data_view_tree_list_ctrl_wrapper.cpp:50 +#: wxcrafter/data_view_list_ctrl_wrapper.cpp:47 +#: wxcrafter/data_view_tree_ctrl_wrapper.cpp:48 +#: wxcrafter/data_view_tree_list_ctrl_wrapper.cpp:52 msgid "Process a wxEVT_COMMAND_DATAVIEW_COLUMN_HEADER_RIGHT_CLICK event" msgstr "wxEVT_COMMAND_DATAVIEW_COLUMN_HEADER_RIGHT_CLICK イベントを処理します" -#: wxcrafter/data_view_list_ctrl_wrapper.cpp:48 -#: wxcrafter/data_view_tree_ctrl_wrapper.cpp:48 -#: wxcrafter/data_view_tree_list_ctrl_wrapper.cpp:52 +#: wxcrafter/data_view_list_ctrl_wrapper.cpp:49 +#: wxcrafter/data_view_tree_ctrl_wrapper.cpp:50 +#: wxcrafter/data_view_tree_list_ctrl_wrapper.cpp:54 msgid "Process a wxEVT_COMMAND_DATAVIEW_COLUMN_SORTED event" msgstr "wxEVT_COMMAND_DATAVIEW_COLUMN_SORTED イベントを処理します" -#: wxcrafter/data_view_list_ctrl_wrapper.cpp:50 -#: wxcrafter/data_view_tree_ctrl_wrapper.cpp:50 -#: wxcrafter/data_view_tree_list_ctrl_wrapper.cpp:54 +#: wxcrafter/data_view_list_ctrl_wrapper.cpp:51 +#: wxcrafter/data_view_tree_ctrl_wrapper.cpp:52 +#: wxcrafter/data_view_tree_list_ctrl_wrapper.cpp:56 msgid "Process a wxEVT_COMMAND_DATAVIEW_COLUMN_REORDERED event" msgstr "wxEVT_COMMAND_DATAVIEW_COLUMN_REORDERED イベントを処理します" -#: wxcrafter/data_view_list_ctrl_wrapper.cpp:52 -#: wxcrafter/data_view_tree_ctrl_wrapper.cpp:52 -#: wxcrafter/data_view_tree_list_ctrl_wrapper.cpp:56 +#: wxcrafter/data_view_list_ctrl_wrapper.cpp:53 +#: wxcrafter/data_view_tree_ctrl_wrapper.cpp:54 +#: wxcrafter/data_view_tree_list_ctrl_wrapper.cpp:58 msgid "Process a wxEVT_COMMAND_DATAVIEW_ITEM_BEGIN_DRAG event" msgstr "wxEVT_COMMAND_DATAVIEW_ITEM_BEGIN_DRAG イベントを処理します" -#: wxcrafter/data_view_list_ctrl_wrapper.cpp:54 -#: wxcrafter/data_view_tree_ctrl_wrapper.cpp:54 -#: wxcrafter/data_view_tree_list_ctrl_wrapper.cpp:58 +#: wxcrafter/data_view_list_ctrl_wrapper.cpp:55 +#: wxcrafter/data_view_tree_ctrl_wrapper.cpp:56 +#: wxcrafter/data_view_tree_list_ctrl_wrapper.cpp:60 msgid "Process a wxEVT_COMMAND_DATAVIEW_ITEM_DROP_POSSIBLE event" msgstr "wxEVT_COMMAND_DATAVIEW_ITEM_DROP_POSSIBLE イベントを処理します" -#: wxcrafter/data_view_list_ctrl_wrapper.cpp:56 -#: wxcrafter/data_view_tree_ctrl_wrapper.cpp:56 -#: wxcrafter/data_view_tree_list_ctrl_wrapper.cpp:60 +#: wxcrafter/data_view_list_ctrl_wrapper.cpp:57 +#: wxcrafter/data_view_tree_ctrl_wrapper.cpp:58 +#: wxcrafter/data_view_tree_list_ctrl_wrapper.cpp:62 msgid "Process a wxEVT_COMMAND_DATAVIEW_ITEM_DROP event" msgstr "wxEVT_COMMAND_DATAVIEW_ITEM_DROP イベントを処理します" -#: wxcrafter/data_view_tree_list_ctrl_wrapper.cpp:70 +#: wxcrafter/data_view_tree_list_ctrl_wrapper.cpp:72 msgid "The generated model class name\n" msgstr "生成するモデルクラス名\n" -#: wxcrafter/data_view_tree_list_ctrl_wrapper.cpp:70 +#: wxcrafter/data_view_tree_list_ctrl_wrapper.cpp:73 msgid "wxCrafter will generate a TreeListCtrl model like 'Tree-List-Ctrl\n" msgstr "TreeListCtrl モデルは 'Tree-List-Ctrl' のように生成されます\n" -#: wxcrafter/data_view_tree_list_ctrl_wrapper.cpp:71 +#: wxcrafter/data_view_tree_list_ctrl_wrapper.cpp:74 msgid "" "** Leave this field empty if you do not want wxCrafter to generate a model " "class for you" msgstr "** モデルクラスを生成させない場合は、空欄のままにしてください" -#: wxcrafter/data_view_tree_list_ctrl_wrapper.cpp:81 +#: wxcrafter/data_view_tree_list_ctrl_wrapper.cpp:84 msgid "" "Indicate if a container item merely acts as a headline (or for " "categorisation) or if it also acts a normal item with entries for further " @@ -22746,19 +23094,19 @@ msgstr "" "場合、\n" "既存ディレクトリへのパスを正しく入力しないと、このイベントは発動しません)。" -#: wxcrafter/events_database.cpp:108 +#: wxcrafter/events_database.cpp:107 msgid "Process a wxEVT_KEY_DOWN event (any key has been pressed)" msgstr "何かキーを押したときの wxEVT_KEY_DOWN イベントを処理します" -#: wxcrafter/events_database.cpp:112 +#: wxcrafter/events_database.cpp:109 msgid "Process a wxEVT_KEY_UP event (any key has been released)" msgstr "何かキーを離したときの wxEVT_KEY_UP イベントを処理します" -#: wxcrafter/events_database.cpp:115 +#: wxcrafter/events_database.cpp:110 msgid "Process a wxEVT_CHAR event" msgstr "wxEVT_CHAR イベントを処理します" -#: wxcrafter/events_database.cpp:121 +#: wxcrafter/events_database.cpp:116 msgid "" "A right click (or other context menu command depending on platform) has been " "detected" @@ -22766,7 +23114,7 @@ msgstr "" "右クリック (またはプラットフォーム特有のコンテキストメニュー操作) が検出され" "ました" -#: wxcrafter/events_database.cpp:127 +#: wxcrafter/events_database.cpp:121 msgid "" "Process a wxEVT_LEFT_DOWN event. The handler of this event should normally " "call event.Skip() to allow the default processing to take place as otherwise " @@ -22776,83 +23124,83 @@ msgstr "" "Skip() を呼び出すものとされています。これを忘れると、既定の処理 (ウィンドウの" "フォーカス) が行われなくなります。" -#: wxcrafter/events_database.cpp:132 +#: wxcrafter/events_database.cpp:125 msgid "Process a wxEVT_LEFT_UP event." msgstr "wxEVT_LEFT_UP イベントを処理します。" -#: wxcrafter/events_database.cpp:136 +#: wxcrafter/events_database.cpp:127 msgid "Process a wxEVT_LEFT_DCLICK event." msgstr "wxEVT_LEFT_DCLICK イベントを処理します。" -#: wxcrafter/events_database.cpp:139 +#: wxcrafter/events_database.cpp:129 msgid "Process a wxEVT_MIDDLE_DOWN event" msgstr "wxEVT_MIDDLE_DOWN イベントを処理します" -#: wxcrafter/events_database.cpp:142 +#: wxcrafter/events_database.cpp:131 msgid "Process a wxEVT_MIDDLE_UP event" msgstr "wxEVT_MIDDLE_UP イベントを処理します" -#: wxcrafter/events_database.cpp:145 +#: wxcrafter/events_database.cpp:133 msgid "Process a wxEVT_MIDDLE_DCLICK event." msgstr "wxEVT_MIDDLE_DCLICK イベントを処理します。" -#: wxcrafter/events_database.cpp:148 +#: wxcrafter/events_database.cpp:135 msgid "Process a wxEVT_RIGHT_DOWN event" msgstr "wxEVT_RIGHT_DOWN イベントを処理します" -#: wxcrafter/events_database.cpp:150 +#: wxcrafter/events_database.cpp:137 msgid "Process a wxEVT_RIGHT_UP event" msgstr "wxEVT_RIGHT_UP イベントを処理します" -#: wxcrafter/events_database.cpp:154 +#: wxcrafter/events_database.cpp:139 msgid "Process a wxEVT_RIGHT_DCLICK event" msgstr "wxEVT_RIGHT_DCLICK イベントを処理します" -#: wxcrafter/events_database.cpp:156 +#: wxcrafter/events_database.cpp:141 msgid "Process a wxEVT_MOTION event" msgstr "wxEVT_MOTION イベントを処理します" -#: wxcrafter/events_database.cpp:160 +#: wxcrafter/events_database.cpp:143 msgid "Process a wxEVT_ENTER_WINDOW event" msgstr "wxEVT_ENTER_WINDOW イベントを処理します" -#: wxcrafter/events_database.cpp:163 +#: wxcrafter/events_database.cpp:145 msgid "Process a wxEVT_LEAVE_WINDOW event." msgstr "wxEVT_LEAVE_WINDOW イベントを処理します。" -#: wxcrafter/events_database.cpp:166 +#: wxcrafter/events_database.cpp:147 msgid "Process a wxEVT_MOUSEWHEEL event" msgstr "wxEVT_MOUSEWHEEL イベントを処理します" -#: wxcrafter/events_database.cpp:178 +#: wxcrafter/events_database.cpp:157 msgid "Process a wxEVT_SET_FOCUS event" msgstr "wxEVT_SET_FOCUS イベントを処理します" -#: wxcrafter/events_database.cpp:181 +#: wxcrafter/events_database.cpp:159 msgid "Process a wxEVT_KILL_FOCUS event" msgstr "wxEVT_KILL_FOCUS イベントを処理します" -#: wxcrafter/events_database.cpp:185 +#: wxcrafter/events_database.cpp:162 msgid "Process a wxEVT_PAINT event" msgstr "wxEVT_PAINT イベントを処理します" -#: wxcrafter/events_database.cpp:189 +#: wxcrafter/events_database.cpp:164 msgid "Process a wxEVT_ERASE_BACKGROUND event." msgstr "wxEVT_ERASE_BACKGROUND イベントを処理します。" -#: wxcrafter/events_database.cpp:191 +#: wxcrafter/events_database.cpp:165 msgid "Process a wxEVT_SIZE event" msgstr "wxEVT_SIZE イベントを処理します" -#: wxcrafter/events_database.cpp:194 +#: wxcrafter/events_database.cpp:168 msgid "Process a wxEVT_MOVE event, which is generated when a window is moved." msgstr "ウィンドウを移動したときに生成される wxEVT_MOVE イベントを処理します。" -#: wxcrafter/events_database.cpp:198 +#: wxcrafter/events_database.cpp:170 msgid "Process a wxEVT_UPDATE_UI event" msgstr "wxEVT_UPDATE_UI イベントを処理します" -#: wxcrafter/events_database.cpp:202 +#: wxcrafter/events_database.cpp:173 msgid "Process a wxEVT_IDLE event" msgstr "wxEVT_IDLE イベントを処理します" @@ -22882,11 +23230,11 @@ msgstr "" "場合、\n" "既存ファイルへのパスを正しく入力しないと、このイベントは発動しません)。" -#: wxcrafter/flexgridsizer_wrapper.cpp:12 wxcrafter/grid_sizer_wrapper.cpp:12 +#: wxcrafter/flexgridsizer_wrapper.cpp:13 wxcrafter/grid_sizer_wrapper.cpp:13 msgid "Number of columns in the grid" msgstr "グリッドの列数" -#: wxcrafter/flexgridsizer_wrapper.cpp:13 wxcrafter/grid_sizer_wrapper.cpp:13 +#: wxcrafter/flexgridsizer_wrapper.cpp:14 wxcrafter/grid_sizer_wrapper.cpp:14 msgid "Number of rows in the grid" msgstr "グリッドの行数" @@ -22895,18 +23243,18 @@ msgstr "グリッドの行数" msgid "Which columns are allowed to grow. Comma separated list" msgstr "どの列を引き伸ばせるようにするかです (カンマ区切りの一覧)" -#: wxcrafter/flexgridsizer_wrapper.cpp:17 -#: wxcrafter/grid_bag_sizer_wrapper.cpp:14 +#: wxcrafter/flexgridsizer_wrapper.cpp:16 +#: wxcrafter/grid_bag_sizer_wrapper.cpp:13 msgid "Which rows are allowed to grow. Comma separated list" msgstr "どの行を引き伸ばせるようにするかです (カンマ区切りの一覧)" -#: wxcrafter/flexgridsizer_wrapper.cpp:18 -#: wxcrafter/grid_bag_sizer_wrapper.cpp:15 wxcrafter/grid_sizer_wrapper.cpp:14 +#: wxcrafter/flexgridsizer_wrapper.cpp:17 +#: wxcrafter/grid_bag_sizer_wrapper.cpp:14 wxcrafter/grid_sizer_wrapper.cpp:15 msgid "The horizontal gap between grid cells" msgstr "グリッドセル同士の水平方向の間隔" -#: wxcrafter/flexgridsizer_wrapper.cpp:19 -#: wxcrafter/grid_bag_sizer_wrapper.cpp:16 wxcrafter/grid_sizer_wrapper.cpp:15 +#: wxcrafter/flexgridsizer_wrapper.cpp:18 +#: wxcrafter/grid_bag_sizer_wrapper.cpp:15 wxcrafter/grid_sizer_wrapper.cpp:16 msgid "The vertical gap between grid cells" msgstr "グリッドセル同士の垂直方向の間隔" @@ -23397,7 +23745,7 @@ msgid "Batch Generate Code...\tCtrl-Shift-G" msgstr "コードを一括生成...\tCtrl-Shift-G" #: wxcrafter/gui.cpp:96 -msgid "Back to codelite\tCtrl-Shift-F12" +msgid "Back to CodeLite\tCtrl-Shift-F12" msgstr "CodeLite に戻る\tCtrl-Shift-F12" #: wxcrafter/gui.cpp:102 @@ -23484,66 +23832,190 @@ msgstr "カスタムコントロールを削除" msgid "&Help" msgstr "ヘルプ (&H)" -#: wxcrafter/gui.cpp:403 +#: wxcrafter/gui.cpp:343 msgid "Designer" msgstr "デザイナー" -#: wxcrafter/gui.cpp:444 +#: wxcrafter/gui.cpp:384 msgid "Source" msgstr "ソース" -#: wxcrafter/gui.cpp:511 +#: wxcrafter/gui.cpp:451 msgid "Header" msgstr "ヘッダー" -#: wxcrafter/gui.cpp:578 +#: wxcrafter/gui.cpp:518 msgid "XRC" msgstr "XRC" -#: wxcrafter/gui.cpp:661 +#: wxcrafter/gui.cpp:590 msgid "Properties" msgstr "プロパティ" -#: wxcrafter/gui.cpp:693 wxcrafter/sizer_flags_list_view.cpp:101 -#: wxcrafter/wxguicraft_main_view.cpp:592 -#: wxcrafter/wxguicraft_main_view.cpp:598 -#: wxcrafter/wxguicraft_main_view.cpp:602 +#: wxcrafter/gui.cpp:622 wxcrafter/sizer_flags_list_view.cpp:101 +#: wxcrafter/wxguicraft_main_view.cpp:593 +#: wxcrafter/wxguicraft_main_view.cpp:599 +#: wxcrafter/wxguicraft_main_view.cpp:603 msgid "Sizer Flags" msgstr "サイザーのフラグ" -#: wxcrafter/gui.cpp:710 +#: wxcrafter/gui.cpp:639 msgid "wxAuiPaneInfo" msgstr "wxAuiPaneInfo" -#: wxcrafter/gui.cpp:1007 +#: wxcrafter/gui.cpp:878 +msgid "" +msgstr "<既定>" + +#: wxcrafter/gui.cpp:879 +msgid "wxSYS_COLOUR_SCROLLBAR" +msgstr "wxSYS_COLOUR_SCROLLBAR" + +#: wxcrafter/gui.cpp:880 +msgid "wxSYS_COLOUR_DESKTOP" +msgstr "wxSYS_COLOUR_DESKTOP" + +#: wxcrafter/gui.cpp:881 +msgid "wxSYS_COLOUR_ACTIVECAPTION" +msgstr "wxSYS_COLOUR_ACTIVECAPTION" + +#: wxcrafter/gui.cpp:882 +msgid "wxSYS_COLOUR_INACTIVECAPTION" +msgstr "wxSYS_COLOUR_INACTIVECAPTION" + +#: wxcrafter/gui.cpp:883 +msgid "wxSYS_COLOUR_MENU" +msgstr "wxSYS_COLOUR_MENU" + +#: wxcrafter/gui.cpp:884 +msgid "wxSYS_COLOUR_WINDOW" +msgstr "wxSYS_COLOUR_WINDOW" + +#: wxcrafter/gui.cpp:885 +msgid "wxSYS_COLOUR_WINDOWFRAME" +msgstr "wxSYS_COLOUR_WINDOWFRAME" + +#: wxcrafter/gui.cpp:886 +msgid "wxSYS_COLOUR_MENUTEXT" +msgstr "wxSYS_COLOUR_MENUTEXT" + +#: wxcrafter/gui.cpp:887 +msgid "wxSYS_COLOUR_WINDOWTEXT" +msgstr "wxSYS_COLOUR_WINDOWTEXT" + +#: wxcrafter/gui.cpp:888 +msgid "wxSYS_COLOUR_CAPTIONTEXT" +msgstr "wxSYS_COLOUR_CAPTIONTEXT" + +#: wxcrafter/gui.cpp:889 +msgid "wxSYS_COLOUR_ACTIVEBORDER" +msgstr "wxSYS_COLOUR_ACTIVEBORDER" + +#: wxcrafter/gui.cpp:890 +msgid "wxSYS_COLOUR_INACTIVEBORDER" +msgstr "wxSYS_COLOUR_INACTIVEBORDER" + +#: wxcrafter/gui.cpp:891 +msgid "wxSYS_COLOUR_APPWORKSPACE" +msgstr "wxSYS_COLOUR_APPWORKSPACE" + +#: wxcrafter/gui.cpp:892 +msgid "wxSYS_COLOUR_HIGHLIGHT" +msgstr "wxSYS_COLOUR_HIGHLIGHT" + +#: wxcrafter/gui.cpp:893 +msgid "wxSYS_COLOUR_HIGHLIGHTTEXT" +msgstr "wxSYS_COLOUR_HIGHLIGHTTEXT" + +#: wxcrafter/gui.cpp:894 +msgid "wxSYS_COLOUR_BTNFACE" +msgstr "wxSYS_COLOUR_BTNFACE" + +#: wxcrafter/gui.cpp:895 +msgid "wxSYS_COLOUR_BTNSHADOW" +msgstr "wxSYS_COLOUR_BTNSHADOW" + +#: wxcrafter/gui.cpp:896 +msgid "wxSYS_COLOUR_GRAYTEXT" +msgstr "wxSYS_COLOUR_GRAYTEXT" + +#: wxcrafter/gui.cpp:897 +msgid "wxSYS_COLOUR_BTNTEXT" +msgstr "wxSYS_COLOUR_BTNTEXT" + +#: wxcrafter/gui.cpp:898 +msgid "wxSYS_COLOUR_INACTIVECAPTIONTEXT" +msgstr "wxSYS_COLOUR_INACTIVECAPTIONTEXT" + +#: wxcrafter/gui.cpp:899 +msgid "wxSYS_COLOUR_BTNHIGHLIGHT" +msgstr "wxSYS_COLOUR_BTNHIGHLIGHT" + +#: wxcrafter/gui.cpp:900 +msgid "wxSYS_COLOUR_3DDKSHADOW" +msgstr "wxSYS_COLOUR_3DDKSHADOW" + +#: wxcrafter/gui.cpp:901 +msgid "wxSYS_COLOUR_3DLIGHT" +msgstr "wxSYS_COLOUR_3DLIGHT" + +#: wxcrafter/gui.cpp:902 +msgid "wxSYS_COLOUR_INFOTEXT" +msgstr "wxSYS_COLOUR_INFOTEXT" + +#: wxcrafter/gui.cpp:903 +msgid "wxSYS_COLOUR_INFOBK" +msgstr "wxSYS_COLOUR_INFOBK" + +#: wxcrafter/gui.cpp:904 +msgid "wxSYS_COLOUR_LISTBOX" +msgstr "wxSYS_COLOUR_LISTBOX" + +#: wxcrafter/gui.cpp:905 +msgid "wxSYS_COLOUR_HOTLIGHT" +msgstr "wxSYS_COLOUR_HOTLIGHT" + +#: wxcrafter/gui.cpp:906 +msgid "wxSYS_COLOUR_GRADIENTACTIVECAPTION" +msgstr "wxSYS_COLOUR_GRADIENTACTIVECAPTION" + +#: wxcrafter/gui.cpp:907 +msgid "wxSYS_COLOUR_GRADIENTINACTIVECAPTION" +msgstr "wxSYS_COLOUR_GRADIENTINACTIVECAPTION" + +#: wxcrafter/gui.cpp:908 +msgid "wxSYS_COLOUR_MENUHILIGHT" +msgstr "wxSYS_COLOUR_MENUHILIGHT" + +#: wxcrafter/gui.cpp:909 +msgid "wxSYS_COLOUR_MENUBAR" +msgstr "wxSYS_COLOUR_MENUBAR" + +#: wxcrafter/gui.cpp:912 msgid "Select a standard color from the list below" msgstr "下の一覧から、標準の色を選択します" -#: wxcrafter/gui.cpp:1012 +#: wxcrafter/gui.cpp:917 msgid "Custom Colour..." msgstr "カスタムの色..." -#: wxcrafter/gui.cpp:1014 +#: wxcrafter/gui.cpp:919 msgid "Select custom color..." msgstr "カスタム色を選択..." -#: wxcrafter/gui.cpp:1099 wxcrafter/gui.cpp:1102 +#: wxcrafter/gui.cpp:994 wxcrafter/gui.cpp:997 msgid "Close button minimizes wxCrafter to the tray" msgstr "閉じるボタンで wxCrafter をトレイに最小化" -#: wxcrafter/gui.cpp:1107 +#: wxcrafter/gui.cpp:1002 msgid "Code Generation:" msgstr "コードの生成:" -#: wxcrafter/gui.cpp:1111 -msgid "Keep wxSizers as class members" -msgstr "wxSizer をクラスメンバーとして保持" - -#: wxcrafter/gui.cpp:1117 +#: wxcrafter/gui.cpp:1006 msgid "Format inherited files" msgstr "継承ファイルを整形" -#: wxcrafter/gui.cpp:1121 +#: wxcrafter/gui.cpp:1010 msgid "" "When e.g. a new eventhandler is added, wxCrafter helpfully adds an empty " "handler to the derived class as well as to the generated base-class. If this " @@ -23554,11 +24026,11 @@ msgstr "" "空のハンドラーを追加します。これにチェックを入れると、ヘッダーと実装ファイル" "の全体を、前述した処理のたびに整形します。" -#: wxcrafter/gui.cpp:1128 +#: wxcrafter/gui.cpp:1017 msgid "Duplicating and Pasting:" msgstr "複製と貼り付け:" -#: wxcrafter/gui.cpp:1133 +#: wxcrafter/gui.cpp:1022 msgid "" "What should happen when duplicating or pasting a top-level window,\n" "or pasting some contents from one top-level window to another?" @@ -23566,11 +24038,11 @@ msgstr "" "トップレベルウィンドウを複製/貼り付けしたり、トップレベルウィンドウの内容\n" "を他の箇所に貼り付ける際はどうしますか？" -#: wxcrafter/gui.cpp:1140 +#: wxcrafter/gui.cpp:1029 msgid "Leave unchanged any user-set names of child controls" msgstr "ユーザー指定の子コントロール名は変更しない" -#: wxcrafter/gui.cpp:1144 +#: wxcrafter/gui.cpp:1033 msgid "" "You can't have two top-level windows with the same name, but you can have " "FooBase::m_textEntry and BarBase::m_textEntry.\n" @@ -23584,11 +24056,11 @@ msgstr "" "を Bar にコピー\" するようなコードを使っているが、m_text153 みたいな自動生成" "された名前は必要ない・・・という場合に便利です。" -#: wxcrafter/gui.cpp:1152 +#: wxcrafter/gui.cpp:1041 msgid "Leave unchanged the names of all child controls" msgstr "全ての子コントロール名を変更しない" -#: wxcrafter/gui.cpp:1156 +#: wxcrafter/gui.cpp:1045 msgid "" "You can't have two top-level windows with the same name, but you can have " "FooBase::m_text123 and BarBase::m_text123.\n" @@ -23600,11 +24072,11 @@ msgstr "" "これにチェックを入れると、そのような同一の名前を維持します; 既に \"Foo の変数" "を Bar にコピー\" するようなコードを使っている場合に便利です。" -#: wxcrafter/gui.cpp:1162 +#: wxcrafter/gui.cpp:1051 msgid "Copy any event-handlers too" msgstr "他のイベントハンドラーもコピー" -#: wxcrafter/gui.cpp:1166 +#: wxcrafter/gui.cpp:1055 msgid "" "If the class that you're duplicating has e.g. a wxTextCtrl with a " "wxEVT_COMMAND_TEXT_ENTER event-handler set, if this box is ticked the " @@ -23614,46 +24086,22 @@ msgstr "" "wxEVT_COMMAND_TEXT_ENTER が設定されていた場合、そのイベントハンドラーも含めて" "複製します。" -#: wxcrafter/gui.cpp:1324 -msgid "" -"wxCrafter may be evaluated for free\n" -"However, a license must be purchased for continued use." -msgstr "" -"wxCrafter は無料で試用できます\n" -"ただし、継続して使うにはライセンスを購入する必要があります。" - -#: wxcrafter/gui.cpp:1329 -msgid "Purchase" -msgstr "購入" - -#: wxcrafter/gui.cpp:1329 -msgid "Purchase wxCrafter" -msgstr "wxCrafter を購入" - -#: wxcrafter/gui.cpp:1334 -msgid "Continue with trial version" -msgstr "試用版を使い続ける" - -#: wxcrafter/gui.h:279 +#: wxcrafter/gui.h:269 msgid "Enter Text" msgstr "テキストを入力" -#: wxcrafter/gui.h:297 +#: wxcrafter/gui.h:287 msgid "Select Color" msgstr "色を選択" -#: wxcrafter/gui.h:324 +#: wxcrafter/gui.h:314 msgid "Select Colour..." msgstr "色を選択..." -#: wxcrafter/gui.h:356 +#: wxcrafter/gui.h:344 msgid "wxCrafter Settings" msgstr "wxCrafter の設定" -#: wxcrafter/gui.h:417 -msgid "This is an unregistered copy of wxCrafter" -msgstr "未登録の wxCrafter です" - #: wxcrafter/html_window_wrapper.cpp:17 msgid "HTML code to load" msgstr "読み込む HTML コード" @@ -23718,7 +24166,7 @@ msgstr "ハイパーリンクにマウスを合わせたときのラベル色を msgid "The filenames for the generated files" msgstr "生成するファイルの名前" -#: wxcrafter/image_list_wrapper.cpp:24 +#: wxcrafter/image_list_wrapper.cpp:24 wxcrafter/wxcrafter_gui.cpp:1417 msgid "wxImageList" msgstr "wxImageList" @@ -23738,7 +24186,7 @@ msgstr "インポートする wxFormBuilder プロジェクトを選択" msgid "Choose a wxSmith project to import" msgstr "インポートする wxSmith プロジェクトを選択" -#: wxcrafter/import_dlg.cpp:43 wxcrafter/wxcrafter_plugin.cpp:402 +#: wxcrafter/import_dlg.cpp:43 wxcrafter/wxcrafter_plugin.cpp:401 msgid "Import a wxFormBuilder project" msgstr "wxFormBuilder プロジェクトをインポート" @@ -23785,8 +24233,8 @@ msgid "Can't import unknown class %s from XRC" msgstr "不明なクラス %s を XRC からインポートできません" #: wxcrafter/info_bar_button_wrapper.cpp:18 -#: wxcrafter/ribbon_panel_wrapper.cpp:20 -#: wxcrafter/static_box_sizer_wrapper.cpp:19 +#: wxcrafter/ribbon_panel_wrapper.cpp:22 +#: wxcrafter/static_box_sizer_wrapper.cpp:20 msgid "My Label" msgstr "ラベル" @@ -23821,7 +24269,7 @@ msgid "wxListCtrl Column" msgstr "wxListCtrl の列" #: wxcrafter/list_ctrl_column_wrapper.cpp:15 -#: wxcrafter/tree_list_ctrl_column_wrapper.cpp:23 +#: wxcrafter/tree_list_ctrl_column_wrapper.cpp:24 msgid "Column caption" msgstr "列の見出し" @@ -23914,39 +24362,39 @@ msgstr "全ての項目を削除" msgid "An item has been inserted" msgstr "項目が挿入されました" -#: wxcrafter/main.cpp:204 +#: wxcrafter/main.cpp:202 msgid "Back to CodeLite" msgstr "CodeLite に戻る" -#: wxcrafter/main.cpp:216 wxcrafter/wxguicraft_main_view.cpp:179 +#: wxcrafter/main.cpp:214 wxcrafter/wxguicraft_main_view.cpp:180 msgid "Generate Code" msgstr "コードを生成" -#: wxcrafter/main.cpp:695 +#: wxcrafter/main.cpp:701 msgid "Create an empty wxCrafter project" msgstr "空の wxCrafter プロジェクトを作成" -#: wxcrafter/main.cpp:706 wxcrafter/wxcrafter_plugin.cpp:744 +#: wxcrafter/main.cpp:713 wxcrafter/wxcrafter_plugin.cpp:749 msgid "Could not create resource file '" msgstr "リソースファイルを作成できませんでした '" -#: wxcrafter/main.cpp:1021 +#: wxcrafter/main.cpp:997 msgid "Open a wxCrafter file" msgstr "wxCrafter ファイルを開く" -#: wxcrafter/media_ctrl_wrapper.cpp:23 +#: wxcrafter/media_ctrl_wrapper.cpp:24 msgid "Select the media control backend, leave empty for the default" msgstr "メディアコントロールのバックエンドを選択します (空欄で既定値を使用)" -#: wxcrafter/media_ctrl_wrapper.cpp:27 +#: wxcrafter/media_ctrl_wrapper.cpp:28 msgid "Show the player controls" msgstr "プレーヤーのコントロールを表示" -#: wxcrafter/media_ctrl_wrapper.cpp:30 +#: wxcrafter/media_ctrl_wrapper.cpp:31 msgid "Sent when a media has loaded enough data that it can start playing" msgstr "再生に充分なデータが読み込まれると送信されます" -#: wxcrafter/media_ctrl_wrapper.cpp:32 +#: wxcrafter/media_ctrl_wrapper.cpp:33 msgid "" "Sent when a media has switched to the wxMEDIASTATE_STOPPED state. You may be " "able to Veto this event to prevent it from stopping, causing it to continue " @@ -23960,53 +24408,53 @@ msgstr "" "とは限りません - 一例として、メディアを繰り返し再生したい場合は " "EVT_MEDIA_FINISHED を捕捉し、そこで再生を行ってください)。" -#: wxcrafter/media_ctrl_wrapper.cpp:37 +#: wxcrafter/media_ctrl_wrapper.cpp:38 msgid "Sent when a media has finished playing in a wxMediaCtrl." msgstr "wxMediaCtrl でのメディア再生が終わると送信されます。" -#: wxcrafter/media_ctrl_wrapper.cpp:39 +#: wxcrafter/media_ctrl_wrapper.cpp:40 msgid "Sent when a media has switched its state (from any media state)" msgstr "メディアの状態が切り替わると送信されます" -#: wxcrafter/media_ctrl_wrapper.cpp:41 +#: wxcrafter/media_ctrl_wrapper.cpp:42 msgid "Sent when a media has switched to the wxMEDIASTATE_PLAYING state" msgstr "メディアの状態が wxMEDIASTATE_PLAYING に切り替わると送信されます" -#: wxcrafter/media_ctrl_wrapper.cpp:43 +#: wxcrafter/media_ctrl_wrapper.cpp:44 msgid "Sent when a media has switched to the wxMEDIASTATE_PAUSED state" msgstr "メディアの状態が wxMEDIASTATE_PAUSED に切り替わると送信されます" -#: wxcrafter/menu_item_wrapper.cpp:22 +#: wxcrafter/menu_item_wrapper.cpp:23 msgid "Menu item has been clicked" msgstr "メニュー項目がクリックされました" -#: wxcrafter/menu_item_wrapper.cpp:31 wxcrafter/menu_wrapper.cpp:23 +#: wxcrafter/menu_item_wrapper.cpp:32 wxcrafter/menu_wrapper.cpp:23 #: wxcrafter/tool_bar_item_wrapper.cpp:37 #: wxcrafter/tool_bar_item_wrapper.cpp:488 msgid "C++ variable name" msgstr "C++ 変数名" -#: wxcrafter/menu_item_wrapper.cpp:32 +#: wxcrafter/menu_item_wrapper.cpp:33 msgid "Menu Item" msgstr "メニュー項目" -#: wxcrafter/menu_item_wrapper.cpp:33 +#: wxcrafter/menu_item_wrapper.cpp:34 msgid "The menu item label" msgstr "メニュー項目のラベル" -#: wxcrafter/menu_item_wrapper.cpp:35 +#: wxcrafter/menu_item_wrapper.cpp:36 msgid "Short help string" msgstr "簡単なヘルプ文字列" -#: wxcrafter/menu_item_wrapper.cpp:36 +#: wxcrafter/menu_item_wrapper.cpp:37 msgid "Menu item image" msgstr "メニュー項目の画像" -#: wxcrafter/menu_item_wrapper.cpp:42 +#: wxcrafter/menu_item_wrapper.cpp:43 msgid "The type of menu item: normal, radio, checkable or separator" msgstr "メニュー項目の種類です: 普通、ラジオ、チェック可能、区切り" -#: wxcrafter/menu_item_wrapper.cpp:43 +#: wxcrafter/menu_item_wrapper.cpp:44 msgid "For a checkable menu item, should this be checked" msgstr "" "メニュー項目がチェック可能なとき、最初からチェックを入れた状態にするかどうか" @@ -24059,44 +24507,44 @@ msgstr "" msgid "Expand this node" msgstr "このノードを展開" -#: wxcrafter/properties_list_view.cpp:47 +#: wxcrafter/properties_list_view.cpp:49 msgid "wxCrafter Project Settings" msgstr "wxCrafter プロジェクトの設定" -#: wxcrafter/properties_list_view.cpp:48 wxcrafter/properties_list_view.cpp:253 +#: wxcrafter/properties_list_view.cpp:50 wxcrafter/properties_list_view.cpp:267 msgid "Output Directory" msgstr "出力ディレクトリ" -#: wxcrafter/properties_list_view.cpp:49 +#: wxcrafter/properties_list_view.cpp:51 msgid "The generated files' output directory" msgstr "生成するファイルの出力ディレクトリ" -#: wxcrafter/properties_list_view.cpp:51 +#: wxcrafter/properties_list_view.cpp:53 msgid "" "The generated files' name.\n" -"wxCrafter will generate a $(FILE).cpp and $(FILE).h" +"wxCrafter will generate a $(FILE).cpp and $(FILE).hpp" msgstr "" "生成するファイルの名前です。\n" -"ファイル $(FILE).cpp と $(FILE).h が生成されます" +"ファイル $(FILE).cpp と $(FILE).hpp が生成されます" -#: wxcrafter/properties_list_view.cpp:52 wxcrafter/properties_list_view.cpp:256 +#: wxcrafter/properties_list_view.cpp:54 wxcrafter/properties_list_view.cpp:272 msgid "Additional Include Files" msgstr "追加のインクルードファイル" -#: wxcrafter/properties_list_view.cpp:53 +#: wxcrafter/properties_list_view.cpp:55 msgid "" "List of additional include files that should be included in the generated " "files\n" -"e.g. my_header.h ; string.h" +"e.g. my_header.hpp ; string.h" msgstr "" -"生成したコードにインクルードするファイルの一覧です\n" -"例: my_header.h ; string.h" +"生成したコードに追加でインクルードするファイルの一覧です\n" +"例: my_header.hpp ; string.h" -#: wxcrafter/properties_list_view.cpp:55 wxcrafter/properties_list_view.cpp:259 +#: wxcrafter/properties_list_view.cpp:57 wxcrafter/properties_list_view.cpp:277 msgid "Bitmap Files" msgstr "ビットマップファイル" -#: wxcrafter/properties_list_view.cpp:56 +#: wxcrafter/properties_list_view.cpp:58 msgid "" "Set here the file name for the bitmaps\n" "wxCrafter converts all the bitmaps in the project into C++ code and will " @@ -24106,15 +24554,15 @@ msgstr "" "プロジェクトのビットマップは全て C++ コードに変換され、このファイルに置かれま" "す" -#: wxcrafter/properties_list_view.cpp:59 +#: wxcrafter/properties_list_view.cpp:61 msgid "wxWindow ID Generation" msgstr "wxWindow ID の生成" -#: wxcrafter/properties_list_view.cpp:61 wxcrafter/properties_list_view.cpp:265 +#: wxcrafter/properties_list_view.cpp:63 wxcrafter/properties_list_view.cpp:287 msgid "Generate Window ID" msgstr "ウィンドウ ID を生成" -#: wxcrafter/properties_list_view.cpp:62 +#: wxcrafter/properties_list_view.cpp:64 msgid "" "Auto generate enum in the base class for the wxWindow IDs which are not a " "stock window ID nor wrapped with the XRCID macro\n" @@ -24126,22 +24574,22 @@ msgstr "" "チェックを入れないままにすると、自分で wxWindow ID のヘッダーファイルを準備す" "る必要があります" -#: wxcrafter/properties_list_view.cpp:64 wxcrafter/properties_list_view.cpp:268 +#: wxcrafter/properties_list_view.cpp:66 wxcrafter/properties_list_view.cpp:292 msgid "First Window ID" msgstr "最初のウィンドウ ID" -#: wxcrafter/properties_list_view.cpp:65 +#: wxcrafter/properties_list_view.cpp:67 msgid "" "When 'Generate Window ID' is checked, use this as the first enumerator value" msgstr "" "'ウィンドウ ID を生成' にチェックを入れた場合、これを最初の列挙値として使用し" "ます" -#: wxcrafter/properties_list_view.cpp:66 wxcrafter/properties_list_view.cpp:271 +#: wxcrafter/properties_list_view.cpp:70 wxcrafter/properties_list_view.cpp:297 msgid "Generate Translatable Strings" msgstr "翻訳可能な文字列を生成" -#: wxcrafter/properties_list_view.cpp:67 +#: wxcrafter/properties_list_view.cpp:71 msgid "" "When enabled, all generated strings are wrapped with the \"_\" macro, " "otherwise allow users to directly enter native text string encapsulated by " @@ -24150,27 +24598,27 @@ msgstr "" "有効にすると、全ての文字列を \"_\" マクロで囲んで生成します。無効にすると、代" "わりに wxT() マクロで囲みます" -#: wxcrafter/properties_list_view.cpp:69 wxcrafter/properties_list_view.cpp:274 +#: wxcrafter/properties_list_view.cpp:73 wxcrafter/properties_list_view.cpp:302 msgid "Add wxWidgets Handlers if missing" msgstr "足りない wxWidgets ハンドラーを追加" -#: wxcrafter/properties_list_view.cpp:70 +#: wxcrafter/properties_list_view.cpp:74 msgid "" "When enabled, wxCrafter will add missing handlers (e.g. wxBitmapXmlHandler)" msgstr "" "有効にすると、必要なハンドラー (例: wxBitmapXmlHandler) を自動追加します" -#: wxcrafter/properties_list_view.cpp:147 -#: wxcrafter/properties_list_view.cpp:148 wxcrafter/sizer_wrapper_base.cpp:17 -#: wxcrafter/toolbar_base_wrapper.cpp:46 wxcrafter/wxc_widget.cpp:151 +#: wxcrafter/properties_list_view.cpp:157 +#: wxcrafter/properties_list_view.cpp:158 wxcrafter/sizer_wrapper_base.cpp:21 +#: wxcrafter/toolbar_base_wrapper.cpp:48 wxcrafter/wxc_widget.cpp:150 msgid "Subclass" msgstr "サブクラス" -#: wxcrafter/properties_list_view.cpp:289 +#: wxcrafter/properties_list_view.cpp:319 msgid "A control with this name already exists!" msgstr "この名前のコントロールが既に存在します！" -#: wxcrafter/properties_list_view.cpp:386 +#: wxcrafter/properties_list_view.cpp:416 msgid "Construct the Dropdown Menu" msgstr "ドロップダウンメニューを構築" @@ -24413,13 +24861,13 @@ msgstr "" "ラジオボタンをクリックしたときの wxEVT_COMMAND_RADIOBUTTON_SELECTED イベント" "を処理します。" -#: wxcrafter/ribbon_bar_wrapper.cpp:11 +#: wxcrafter/ribbon_bar_wrapper.cpp:13 msgid "" "Triggered after the transition from one page being active to a different " "page being active." msgstr "ページ間を移動するトランジションがアクティブになった後に発動します。" -#: wxcrafter/ribbon_bar_wrapper.cpp:13 +#: wxcrafter/ribbon_bar_wrapper.cpp:15 msgid "" "Triggered prior to the transition from one page being active to a different " "page being active, and can veto the change." @@ -24427,50 +24875,50 @@ msgstr "" "ページ間を移動するトランジションがアクティブになる前に発動します。このイベン" "トを拒否し、変更を防止することも可能です。" -#: wxcrafter/ribbon_bar_wrapper.cpp:16 +#: wxcrafter/ribbon_bar_wrapper.cpp:18 msgid "Triggered when the middle mouse button is pressed on a tab." msgstr "タブ上でマウスの中ボタンを押すと発動します。" -#: wxcrafter/ribbon_bar_wrapper.cpp:18 +#: wxcrafter/ribbon_bar_wrapper.cpp:20 msgid "Triggered when the middle mouse button is released on a tab." msgstr "タブ上でマウスの中ボタンを離すと発動します。" -#: wxcrafter/ribbon_bar_wrapper.cpp:20 +#: wxcrafter/ribbon_bar_wrapper.cpp:22 msgid "Triggered when the right mouse button is pressed on a tab." msgstr "タブ上でマウスの右ボタンを押すと発動します。" -#: wxcrafter/ribbon_bar_wrapper.cpp:22 +#: wxcrafter/ribbon_bar_wrapper.cpp:24 msgid "Triggered when the right mouse button is released on a tab." msgstr "タブ上でマウスの右ボタンを離すと発動します。" -#: wxcrafter/ribbon_bar_wrapper.cpp:24 +#: wxcrafter/ribbon_bar_wrapper.cpp:26 msgid "Triggered when the left mouse button is double clicked on a tab." msgstr "タブ上でマウスの左ボタンをダブルクリックすると発動します。" -#: wxcrafter/ribbon_bar_wrapper.cpp:44 +#: wxcrafter/ribbon_bar_wrapper.cpp:46 msgid "Select the ribbon bar theme" msgstr "リボンバーのテーマを選択" -#: wxcrafter/ribbon_button.cpp:31 +#: wxcrafter/ribbon_button.cpp:33 msgid "Button" msgstr "ボタン" -#: wxcrafter/ribbon_button.cpp:33 +#: wxcrafter/ribbon_button.cpp:35 msgid "Help string" msgstr "ヘルプの文字列" -#: wxcrafter/ribbon_button.cpp:34 +#: wxcrafter/ribbon_button.cpp:36 msgid "The button type" msgstr "ボタンの種類" -#: wxcrafter/ribbon_button.cpp:46 +#: wxcrafter/ribbon_button.cpp:48 msgid "" "Triggered when the normal (non-dropdown) region of a button on the button " "bar is clicked." msgstr "" "ボタンバーの (ドロップダウン式ではない) ボタンをクリックすると発動します。" -#: wxcrafter/ribbon_button.cpp:48 +#: wxcrafter/ribbon_button.cpp:50 msgid "" "Triggered when the dropdown region of a button on the button bar is clicked. " "wxRibbonButtonBarEvent::PopupMenu() should be called by the event handler if " @@ -24482,14 +24930,14 @@ msgstr "" "PopupMenu() を呼び出します (通常、ドロップダウン式のボタンには、ポップアップ" "メニューを割り当てることが多いです)。" -#: wxcrafter/ribbon_button.cpp:56 +#: wxcrafter/ribbon_button.cpp:58 msgid "" "Triggered when the normal (non-dropdown) region of a tool on the toolbar is " "clicked." msgstr "" "ツールバーの (ドロップダウン式ではない) ツールをクリックすると発動します。" -#: wxcrafter/ribbon_button.cpp:58 +#: wxcrafter/ribbon_button.cpp:60 msgid "" "Triggered when the dropdown region of a tool on the toolbar is clicked. " "wxRibbonToolBarEvent::PopupMenu() should be called by the event handler if " @@ -24501,7 +24949,7 @@ msgstr "" "を呼び出します (通常、ドロップダウン式のボタンには、ポップアップメニューを割" "り当てることが多いです)。" -#: wxcrafter/ribbon_gallery_wrapper.cpp:10 +#: wxcrafter/ribbon_gallery_wrapper.cpp:12 msgid "" "Triggered when the user selects an item from the gallery. Note that the ID " "is that of the gallery, not of the item." @@ -24509,7 +24957,7 @@ msgstr "" "ユーザーがギャラリーの項目を選択すると発動します。注: イベントの ID は項目で" "なく、そのギャラリーを指します。" -#: wxcrafter/ribbon_gallery_wrapper.cpp:13 +#: wxcrafter/ribbon_gallery_wrapper.cpp:15 msgid "" "Similar to EVT_RIBBONGALLERY_SELECTED but triggered every time a gallery " "item is clicked, even if it is already selected. Note that the ID of the " @@ -24521,7 +24969,7 @@ msgstr "" "でなく、そのギャラリーを指します。このイベントは wxWidgets 2.9.2 以降で使用で" "きます。" -#: wxcrafter/ribbon_gallery_wrapper.cpp:17 +#: wxcrafter/ribbon_gallery_wrapper.cpp:19 msgid "" "Triggered when the item being hovered over by the user changes. The item in " "the event will be the new item being hovered, or NULL if there is no longer " @@ -24532,40 +24980,40 @@ msgstr "" "は、イベントから取得できます (マウスが外れた場合は NULL です)。注: イベント" "の ID は項目でなく、そのギャラリーを指します。" -#: wxcrafter/ribbon_gallery_wrapper.cpp:21 +#: wxcrafter/ribbon_gallery_wrapper.cpp:23 msgid "Triggered when the \"extension\" button of the gallery is pressed" msgstr "ギャラリーの \"拡張\" ボタンが押されると発動します" -#: wxcrafter/ribbon_page_wrapper.cpp:15 +#: wxcrafter/ribbon_page_wrapper.cpp:17 msgid "Page Icon" msgstr "ページのアイコン" -#: wxcrafter/ribbon_page_wrapper.cpp:16 +#: wxcrafter/ribbon_page_wrapper.cpp:18 msgid "Page Label" msgstr "ページのラベル" -#: wxcrafter/ribbon_page_wrapper.cpp:17 wxcrafter/wxgui_defs.h:194 +#: wxcrafter/ribbon_page_wrapper.cpp:19 wxcrafter/wxgui_defs.h:200 msgid "Selected" msgstr "選択状態" -#: wxcrafter/ribbon_panel_wrapper.cpp:20 +#: wxcrafter/ribbon_panel_wrapper.cpp:22 msgid "The Label" msgstr "ラベル" -#: wxcrafter/ribbon_panel_wrapper.cpp:22 +#: wxcrafter/ribbon_panel_wrapper.cpp:24 msgid "" "Icon to be used in place of the panel's children when the panel is minimised" msgstr "最小化されているパネルに表示するアイコンです" -#: wxcrafter/ribbon_panel_wrapper.cpp:25 +#: wxcrafter/ribbon_panel_wrapper.cpp:27 msgid "Triggered when the user activate the panel extension button" msgstr "パネル拡張ボタンを押すと発動します" -#: wxcrafter/ribbon_tool_bar_wrapper.cpp:14 +#: wxcrafter/ribbon_tool_bar_wrapper.cpp:16 msgid "Set the minimum number of rows to distribute tool groups over" msgstr "ツールのグループを分ける最小行数を設定します" -#: wxcrafter/ribbon_tool_bar_wrapper.cpp:17 +#: wxcrafter/ribbon_tool_bar_wrapper.cpp:19 msgid "" "Set the maximum number of rows to distribute tool groups over. Use -1 as " "default value" @@ -24911,7 +25359,14 @@ msgstr "wxGBSpan" msgid "GridBagSizer" msgstr "GridBagSizer" -#: wxcrafter/sizer_wrapper_base.cpp:13 wxcrafter/wxc_widget.cpp:146 +#: wxcrafter/sizer_wrapper_base.cpp:9 +msgid "" +"When enabled, this sizer is kept as a class member and become accessible" +msgstr "" +"有効にすると、このサイザーをクラスメンバーとして保持・アクセスできるようにし" +"ます" + +#: wxcrafter/sizer_wrapper_base.cpp:17 wxcrafter/wxc_widget.cpp:145 msgid "Initial State" msgstr "初期の状態" @@ -25024,7 +25479,7 @@ msgstr "" "仕切りがダブルクリックされました。\n" "最小のペインサイズが 0 の場合、既定ではウィンドウの分割を解除します" -#: wxcrafter/static_text_wrapper.cpp:16 wxcrafter/wxgui_defs.h:128 +#: wxcrafter/static_text_wrapper.cpp:16 wxcrafter/wxgui_defs.h:134 msgid "Label:" msgstr "ラベル:" @@ -25036,16 +25491,16 @@ msgstr "N ピクセル目でテキストを折り返します (-1 にすると msgid "Sets the number of fields" msgstr "フィールドの数を設定します" -#: wxcrafter/std_button_wrapper.cpp:29 wxcrafter/wxgui_defs.h:232 +#: wxcrafter/std_button_wrapper.cpp:29 wxcrafter/wxgui_defs.h:238 msgid "Button ID" msgstr "ボタン ID" -#: wxcrafter/std_button_wrapper.cpp:30 wxcrafter/toolbar_base_wrapper.cpp:36 -#: wxcrafter/toolbar_base_wrapper.cpp:182 wxcrafter/wxc_widget.cpp:140 +#: wxcrafter/std_button_wrapper.cpp:30 wxcrafter/toolbar_base_wrapper.cpp:38 +#: wxcrafter/toolbar_base_wrapper.cpp:215 wxcrafter/wxc_widget.cpp:139 msgid "C++ member name" msgstr "C++ メンバー名" -#: wxcrafter/std_button_wrapper.cpp:31 wxcrafter/wxc_widget.cpp:141 +#: wxcrafter/std_button_wrapper.cpp:31 wxcrafter/wxc_widget.cpp:140 msgid "Tooltip text:" msgstr "ツールチップのテキスト:" @@ -25255,43 +25710,43 @@ msgstr "キーワードのセット 5" msgid "wxWindow" msgstr "wxWindow" -#: wxcrafter/task_bar_icon_wrapper.cpp:14 +#: wxcrafter/task_bar_icon_wrapper.cpp:16 msgid "Set the wxTaskBarIcon tooltip" msgstr "wxTaskBarIcon のツールチップを設定" -#: wxcrafter/task_bar_icon_wrapper.cpp:22 +#: wxcrafter/task_bar_icon_wrapper.cpp:24 msgid "The iconType is only applicable on wxOSX_Cocoa" msgstr "iconType は wxOSX_Cocoa でのみ使用されます" -#: wxcrafter/task_bar_icon_wrapper.cpp:23 +#: wxcrafter/task_bar_icon_wrapper.cpp:25 msgid "Set the wxTaskBarIcon icon" msgstr "wxTaskBarIcon のアイコンを設定" -#: wxcrafter/task_bar_icon_wrapper.cpp:25 +#: wxcrafter/task_bar_icon_wrapper.cpp:27 msgid "Process a wxEVT_TASKBAR_MOVE event" msgstr "wxEVT_TASKBAR_MOVE イベントを処理します" -#: wxcrafter/task_bar_icon_wrapper.cpp:26 +#: wxcrafter/task_bar_icon_wrapper.cpp:28 msgid "Process a wxEVT_TASKBAR_LEFT_DOWN event" msgstr "wxEVT_TASKBAR_LEFT_DOWN イベントを処理します" -#: wxcrafter/task_bar_icon_wrapper.cpp:27 +#: wxcrafter/task_bar_icon_wrapper.cpp:29 msgid "Process a wxEVT_TASKBAR_LEFT_UP event" msgstr "wxEVT_TASKBAR_LEFT_UP イベントを処理します" -#: wxcrafter/task_bar_icon_wrapper.cpp:28 +#: wxcrafter/task_bar_icon_wrapper.cpp:30 msgid "Process a wxEVT_TASKBAR_RIGHT_DOWN event" msgstr "wxEVT_TASKBAR_RIGHT_DOWN イベントを処理します" -#: wxcrafter/task_bar_icon_wrapper.cpp:29 +#: wxcrafter/task_bar_icon_wrapper.cpp:31 msgid "Process a wxEVT_TASKBAR_RIGHT_UP event" msgstr "wxEVT_TASKBAR_RIGHT_UP イベントを処理します" -#: wxcrafter/task_bar_icon_wrapper.cpp:30 +#: wxcrafter/task_bar_icon_wrapper.cpp:32 msgid "Process a wxEVT_TASKBAR_LEFT_DCLICK event" msgstr "wxEVT_TASKBAR_LEFT_DCLICK イベントを処理します" -#: wxcrafter/task_bar_icon_wrapper.cpp:31 +#: wxcrafter/task_bar_icon_wrapper.cpp:33 msgid "Process a wxEVT_TASKBAR_RIGHT_DCLICK event" msgstr "wxEVT_TASKBAR_RIGHT_DCLICK イベントを処理します" @@ -25350,7 +25805,7 @@ msgstr "" "す。この機能は現在 wxMSW ポートでのみ実装されており、他のプラットフォームでは" "何も起こりません。" -#: wxcrafter/timer_wrapper.cpp:17 wxcrafter/wxcrafter_gui.cpp:1049 +#: wxcrafter/timer_wrapper.cpp:17 wxcrafter/wxcrafter_gui.cpp:1050 msgid "wxTimer" msgstr "wxTimer" @@ -25362,7 +25817,7 @@ msgstr "コントロール名" msgid "Sets the current interval for the timer (in milliseconds)" msgstr "タイマーの間隔を設定します (ミリ秒単位)" -#: wxcrafter/timer_wrapper.cpp:20 wxcrafter/wxgui_defs.h:246 +#: wxcrafter/timer_wrapper.cpp:20 wxcrafter/wxgui_defs.h:252 msgid "Start the timer" msgstr "タイマーを開始" @@ -25471,34 +25926,35 @@ msgstr "ラベルのテキスト" msgid "Optionally, specify the label's width" msgstr "ラベルの幅を指定します (任意)" -#: wxcrafter/toolbar_base_wrapper.cpp:39 +#: wxcrafter/toolbar_base_wrapper.cpp:41 msgid "ToolBar" msgstr "ツールバー" -#: wxcrafter/toolbar_base_wrapper.cpp:42 +#: wxcrafter/toolbar_base_wrapper.cpp:44 msgid "Sets the values to be used as margins for the toolbar." msgstr "ツールバーのマージンに使う値を設定します。" -#: wxcrafter/toolbar_base_wrapper.cpp:43 +#: wxcrafter/toolbar_base_wrapper.cpp:45 msgid "Sets the space between tools." msgstr "ツール間のスペースを設定します。" -#: wxcrafter/toolbar_base_wrapper.cpp:44 +#: wxcrafter/toolbar_base_wrapper.cpp:46 msgid "Sets the width of separators." msgstr "区切りの幅を設定します。" -#: wxcrafter/toolbar_base_wrapper.cpp:48 wxcrafter/wxc_widget.cpp:153 +#: wxcrafter/toolbar_base_wrapper.cpp:50 wxcrafter/wxc_widget.cpp:152 msgid "" "The name of the derived class. Used both for C++ and XRC generated code." msgstr "派生クラスの名前です。生成した C++ と XRC コードの両方で使われます。" -#: wxcrafter/toolbar_base_wrapper.cpp:50 wxcrafter/wxc_widget.cpp:155 +#: wxcrafter/toolbar_base_wrapper.cpp:53 wxcrafter/wxc_widget.cpp:155 msgid "" -"(C++ only) The name of any extra header file to be #included e.g. mydialog.h" +"(C++ only) The name of any extra header file to be #included e.g. mydialog." +"hpp" msgstr "" -"(C++ のみ) #include される追加のヘッダーファイル名です - 例: mydialog.h" +"(C++ のみ) 追加で #include するヘッダーファイルの名前です - 例: mydialog.hpp" -#: wxcrafter/toolbar_base_wrapper.cpp:52 wxcrafter/wxc_widget.cpp:157 +#: wxcrafter/toolbar_base_wrapper.cpp:55 wxcrafter/wxc_widget.cpp:157 msgid "" "Override the default class style with the content of this field.\n" "The style should be | separated" @@ -25506,15 +25962,15 @@ msgstr "" "既定クラスのスタイルを、この欄の内容で上書きします。\n" "スタイルは | で区切ります" -#: wxcrafter/top_level_win_wrapper.cpp:30 +#: wxcrafter/top_level_win_wrapper.cpp:32 msgid "Process a wxEVT_MAXIMIZE event" msgstr "wxEVT_MAXIMIZE イベントを処理します" -#: wxcrafter/top_level_win_wrapper.cpp:32 +#: wxcrafter/top_level_win_wrapper.cpp:34 msgid "Process a wxEVT_MOVE event, which is generated when a window is moved" msgstr "ウィンドウを移動したときに生成される wxEVT_MOVE イベントを処理します" -#: wxcrafter/top_level_win_wrapper.cpp:34 +#: wxcrafter/top_level_win_wrapper.cpp:36 msgid "" "Process a wxEVT_MOVE_START event, which is generated when the user starts to " "move or size a window. Windows only" @@ -25522,7 +25978,7 @@ msgstr "" "ユーザーがウィンドウの移動・リサイズを始めたときの wxEVT_MOVE_START イベント" "を処理します (Windows のみ)" -#: wxcrafter/top_level_win_wrapper.cpp:37 +#: wxcrafter/top_level_win_wrapper.cpp:39 msgid "" "Process a wxEVT_MOVE_END event, which is generated when the user stops " "moving or sizing a window. Windows only" @@ -25530,11 +25986,11 @@ msgstr "" "ユーザーがウィンドウの移動・リサイズを止めたときの wxEVT_MOVE_END イベントを" "処理します (Windows のみ)" -#: wxcrafter/top_level_win_wrapper.cpp:39 +#: wxcrafter/top_level_win_wrapper.cpp:41 msgid "Process a wxEVT_SHOW event" msgstr "wxEVT_SHOW イベントを処理します" -#: wxcrafter/top_level_win_wrapper.cpp:47 +#: wxcrafter/top_level_win_wrapper.cpp:49 msgid "" "When enabled, the generated code will add support for wxPersistenceManager " "(i.e. the Window will remember its size, position and any child " @@ -25544,15 +26000,15 @@ msgstr "" "り、ウィンドウが自身のサイズ、位置、子 wxBookCtrlBase の選択を記憶するように" "なります)" -#: wxcrafter/top_level_win_wrapper.cpp:58 +#: wxcrafter/top_level_win_wrapper.cpp:60 msgid "The title, if any" msgstr "題名 (任意)" -#: wxcrafter/top_level_win_wrapper.cpp:60 +#: wxcrafter/top_level_win_wrapper.cpp:62 msgid "CodeLite's virtual folder for the generated files" msgstr "生成したファイルを置く仮想フォルダー" -#: wxcrafter/top_level_win_wrapper.cpp:62 +#: wxcrafter/top_level_win_wrapper.cpp:64 msgid "" "Centre on parent. This may be in both dimensions (the default); only " "vertically or horizontally; or not at all." @@ -25560,7 +26016,7 @@ msgstr "" "親ウィンドウの中央に合わせます。両方向 (既定)、縦方向のみ、横方向のみ、何もし" "ない、のいずれかを指定できます。" -#: wxcrafter/top_level_win_wrapper.cpp:112 +#: wxcrafter/top_level_win_wrapper.cpp:114 msgid "" "You did not set the 'Inherited C++ Class Properties -> File name' property " "for the top level window: '" @@ -25568,7 +26024,7 @@ msgstr "" "トップレベルウィンドウに対して '[継承した C++ クラスのプロパティ] -> [ファイ" "ル名]' を設定していません: '" -#: wxcrafter/top_level_win_wrapper.cpp:115 +#: wxcrafter/top_level_win_wrapper.cpp:117 msgid "" "This means that only base class code will be generated\n" "To fix this, select the toplevel entry from the tree-view and provide an " @@ -25578,15 +26034,15 @@ msgstr "" "派生クラスも生成するには、ツリー表示からトップレベルの項目を選択し、継承クラ" "ス名とファイル名を指定してください" -#: wxcrafter/top_level_win_wrapper.cpp:119 +#: wxcrafter/top_level_win_wrapper.cpp:121 msgid "OK, continue with code generation" msgstr "はい、コードの生成を続けます" -#: wxcrafter/top_level_win_wrapper.cpp:120 wxcrafter/wxcrafter.cpp:272 +#: wxcrafter/top_level_win_wrapper.cpp:122 wxcrafter/wxcrafter.cpp:272 msgid "Don't show this message again" msgstr "次回からメッセージを表示しない" -#: wxcrafter/top_level_win_wrapper.cpp:213 +#: wxcrafter/top_level_win_wrapper.cpp:220 msgid "" "Can not generate code.\n" "Make sure that all toplevel windows have a valid C++ class name" @@ -25595,7 +26051,7 @@ msgstr "" "全てのトップレベルウィンドウに対して、有効な C++ クラス名を設定しているか確認" "してください" -#: wxcrafter/top_level_win_wrapper.cpp:283 +#: wxcrafter/top_level_win_wrapper.cpp:309 msgid "Base class and inherited class have the same name" msgstr "基底クラスと派生クラスの名前が同じです" @@ -25607,15 +26063,15 @@ msgstr "ページのノードが折り畳まれようとしています" msgid "The page node is going to be expanded" msgstr "ページのノードが広げられようとしています" -#: wxcrafter/tree_list_ctrl_column_wrapper.cpp:22 +#: wxcrafter/tree_list_ctrl_column_wrapper.cpp:23 msgid "wxTreeListCtrl Column" msgstr "wxTreeListCtrl の列" -#: wxcrafter/tree_list_ctrl_column_wrapper.cpp:25 +#: wxcrafter/tree_list_ctrl_column_wrapper.cpp:26 msgid "Alignment of both the column header and its items" msgstr "列のヘッダーと、その項目の両方を揃える" -#: wxcrafter/tree_list_ctrl_column_wrapper.cpp:28 +#: wxcrafter/tree_list_ctrl_column_wrapper.cpp:29 msgid "" "The width of the column in pixels or the special wxCOL_WIDTH_AUTOSIZE(-2) " "value indicating that the column should adjust to its contents. Notice that " @@ -25627,7 +26083,7 @@ msgstr "" "に合わせます。ただし、最初の列は特別に扱われ、他が未使用のスペースを全部埋め" "てリサイズします。従って、ここでの設定値は無視されます" -#: wxcrafter/tree_list_ctrl_column_wrapper.cpp:33 +#: wxcrafter/tree_list_ctrl_column_wrapper.cpp:34 msgid "" "Column flags, currently can include wxCOL_RESIZABLE to allow the user to " "resize the column and wxCOL_SORTABLE to allow the user to resort the control " @@ -25636,7 +26092,7 @@ msgstr "" "列のフラグです。現在は wxCOL_RESIZABLE (列のリサイズを許可) と " "wxCOL_SORTABLE (列のクリックによる内容の並べ替えを許可) を指定できます" -#: wxcrafter/tree_list_ctrl_wrapper.cpp:18 +#: wxcrafter/tree_list_ctrl_wrapper.cpp:20 msgid "" "Process wxEVT_TREELIST_SELECTION_CHANGED event and notifies about the " "selection change in the control. In the single selection case the item " @@ -25652,7 +26108,7 @@ msgstr "" "ベントで通知されるのはそのうちのひとつだけです。現在選択中の項目を全て取得す" "るには wxTreeListCtrl::GetSelections() を使ってください。" -#: wxcrafter/tree_list_ctrl_wrapper.cpp:25 +#: wxcrafter/tree_list_ctrl_wrapper.cpp:27 msgid "" "Process wxEVT_TREELIST_ITEM_EXPANDING event notifying about the given branch " "being expanded. This event is sent before the expansion occurs and can be " @@ -25661,7 +26117,7 @@ msgstr "" "対象の枝が広げられようとしているときの wxEVT_TREELIST_ITEM_EXPANDING イベント" "を処理します。このイベントを拒否すると、枝の畳んだ状態を維持します。" -#: wxcrafter/tree_list_ctrl_wrapper.cpp:28 +#: wxcrafter/tree_list_ctrl_wrapper.cpp:31 msgid "" "Process wxEVT_TREELIST_ITEM_EXPANDED event notifying about the expansion of " "the given branch. This event is sent after the expansion occurs and can't be " @@ -25670,7 +26126,7 @@ msgstr "" "対象の枝が広がったときの wxEVT_TREELIST_ITEM_EXPANDED イベントを処理します。" "前述の通り、この時点で枝は既に広がっているため、イベントの拒否はできません。" -#: wxcrafter/tree_list_ctrl_wrapper.cpp:31 +#: wxcrafter/tree_list_ctrl_wrapper.cpp:35 msgid "" "Process wxEVT_TREELIST_ITEM_CHECKED event notifying about the user checking " "or unchecking the item. You can use wxTreeListCtrl::GetCheckedState() to " @@ -25681,7 +26137,7 @@ msgstr "" "ベントを処理します。新しいチェック状態は wxTreeListCtrl::GetCheckedState()、" "古いチェック状態は wxTreeListEvent::GetOldCheckedState() で取得できます。" -#: wxcrafter/tree_list_ctrl_wrapper.cpp:35 +#: wxcrafter/tree_list_ctrl_wrapper.cpp:39 msgid "" "Process wxEVT_TREELIST_ITEM_ACTIVATED event notifying about the user double " "clicking the item or activating it from keyboard." @@ -25689,7 +26145,7 @@ msgstr "" "項目をダブルクリック、またはキーボードでアクティブ化したときの " "wxEVT_TREELIST_ITEM_ACTIVATED イベントを処理します。" -#: wxcrafter/tree_list_ctrl_wrapper.cpp:38 +#: wxcrafter/tree_list_ctrl_wrapper.cpp:42 msgid "" "Process wxEVT_TREELIST_ITEM_CONTEXT_MENU event indicating that the popup " "menu for the given item should be displayed." @@ -25697,7 +26153,7 @@ msgstr "" "対象の項目にポップアップメニューが必要なときの " "wxEVT_TREELIST_ITEM_CONTEXT_MENU イベントを処理します。" -#: wxcrafter/tree_list_ctrl_wrapper.cpp:41 +#: wxcrafter/tree_list_ctrl_wrapper.cpp:45 msgid "" "Process wxEVT_TREELIST_COLUMN_SORTED event indicating that the control " "contents has just been resorted using the specified column. The event " @@ -25841,13 +26297,13 @@ msgstr "wxCrafter へ時間内に接続できませんでした" msgid "Could not start wxCrafter at: " msgstr "wxCrafter を開始できませんでした: " -#: wxcrafter/wxcTreeView.cpp:29 wxcrafter/wxguicraft_main_view.cpp:418 +#: wxcrafter/wxcTreeView.cpp:31 wxcrafter/wxguicraft_main_view.cpp:418 #: wxcrafter/wxguicraft_main_view.cpp:1156 #: wxcrafter/wxguicraft_main_view.cpp:1177 msgid "wxCrafter Project" msgstr "wxCrafter プロジェクト" -#: wxcrafter/wxc_widget.cpp:135 +#: wxcrafter/wxc_widget.cpp:134 msgid "" "The control's size. It is recommended to leave it as -1,-1 and let\n" "the sizers calculate the best size for the window" @@ -25855,7 +26311,7 @@ msgstr "" "コントロールのサイズです。-1,-1 (推奨) のままにすると\n" "サイザーがウィンドウに最も適切なサイズを計算してくれます" -#: wxcrafter/wxc_widget.cpp:138 +#: wxcrafter/wxc_widget.cpp:137 msgid "" "The control's minimum size, to indicate to the sizer layout mechanism that " "this is the minimum required size" @@ -25863,27 +26319,27 @@ msgstr "" "コントロールの最小サイズです。サイザーのレイアウト機構に対し、少なくともこの" "サイズ以上を割り当てるよう指示します" -#: wxcrafter/wxc_widget.cpp:142 +#: wxcrafter/wxc_widget.cpp:141 msgid "Set the control's background colour" msgstr "コントロールの背景色を設定" -#: wxcrafter/wxc_widget.cpp:143 +#: wxcrafter/wxc_widget.cpp:142 msgid "Set the control's foreground colour" msgstr "コントロールの前景色を設定" -#: wxcrafter/wxc_widget.cpp:144 +#: wxcrafter/wxc_widget.cpp:143 msgid "Set the control's font" msgstr "コントロールのフォントを設定" -#: wxcrafter/wxc_widget.cpp:147 +#: wxcrafter/wxc_widget.cpp:146 msgid "Sets the control initial state to 'Hidden'" msgstr "コントロールの初期状態を '非表示' に設定します" -#: wxcrafter/wxc_widget.cpp:148 +#: wxcrafter/wxc_widget.cpp:147 msgid "Sets the control initial state to 'Disabled'" msgstr "コントロールの初期状態を '無効' に設定します" -#: wxcrafter/wxc_widget.cpp:149 +#: wxcrafter/wxc_widget.cpp:148 msgid "This control should have keyboard focus" msgstr "このコントロールにキーボードをフォーカスさせます" @@ -25895,6 +26351,34 @@ msgstr "テキストエディター" msgid "Use pre-defined font" msgstr "事前定義のフォントを使用" +#: wxcrafter/wxcrafter.cpp:81 +msgid "wxSYS_DEFAULT_GUI_FONT" +msgstr "wxSYS_DEFAULT_GUI_FONT" + +#: wxcrafter/wxcrafter.cpp:82 +msgid "wxSYS_OEM_FIXED_FONT" +msgstr "wxSYS_OEM_FIXED_FONT" + +#: wxcrafter/wxcrafter.cpp:83 +msgid "wxSYS_ANSI_FIXED_FONT" +msgstr "wxSYS_ANSI_FIXED_FONT" + +#: wxcrafter/wxcrafter.cpp:84 +msgid "wxSYS_ANSI_VAR_FONT" +msgstr "wxSYS_ANSI_VAR_FONT" + +#: wxcrafter/wxcrafter.cpp:85 +msgid "wxSYS_SYSTEM_FONT" +msgstr "wxSYS_SYSTEM_FONT" + +#: wxcrafter/wxcrafter.cpp:86 +msgid "wxSYS_DEVICE_DEFAULT_FONT" +msgstr "wxSYS_DEVICE_DEFAULT_FONT" + +#: wxcrafter/wxcrafter.cpp:87 +msgid "wxSYS_SYSTEM_FIXED_FONT" +msgstr "wxSYS_SYSTEM_FIXED_FONT" + #: wxcrafter/wxcrafter.cpp:98 msgid "Bold" msgstr "太字" @@ -25947,10 +26431,10 @@ msgstr "インクルードファイル:" #: wxcrafter/wxcrafter.cpp:443 msgid "" "Place here the include file that this custom control requires\n" -"e.g. #include " +"e.g. #include " msgstr "" "カスタムコントロールに必要なインクルードファイルを入力します\n" -"例: #include " +"例: #include " #: wxcrafter/wxcrafter.cpp:456 msgid "Implementation file content" @@ -26134,6 +26618,42 @@ msgid "" "wxArtProvider." msgstr "wxArtProvider に要求するアートオブジェクトのクライアントです。" +#: wxcrafter/wxcrafter.cpp:1465 +msgid "wxART_TOOLBAR" +msgstr "wxART_TOOLBAR" + +#: wxcrafter/wxcrafter.cpp:1466 +msgid "wxART_MENU" +msgstr "wxART_MENU" + +#: wxcrafter/wxcrafter.cpp:1467 +msgid "wxART_FRAME_ICON" +msgstr "wxART_FRAME_ICON" + +#: wxcrafter/wxcrafter.cpp:1468 +msgid "wxART_CMN_DIALOG" +msgstr "wxART_CMN_DIALOG" + +#: wxcrafter/wxcrafter.cpp:1469 +msgid "wxART_HELP_BROWSER" +msgstr "wxART_HELP_BROWSER" + +#: wxcrafter/wxcrafter.cpp:1470 +msgid "wxART_MESSAGE_BOX" +msgstr "wxART_MESSAGE_BOX" + +#: wxcrafter/wxcrafter.cpp:1471 +msgid "wxART_BUTTON" +msgstr "wxART_BUTTON" + +#: wxcrafter/wxcrafter.cpp:1472 +msgid "wxART_LIST" +msgstr "wxART_LIST" + +#: wxcrafter/wxcrafter.cpp:1473 +msgid "wxART_OTHER" +msgstr "wxART_OTHER" + #: wxcrafter/wxcrafter.cpp:1483 msgid "Size Hint:" msgstr "サイズのヒント:" @@ -26142,6 +26662,26 @@ msgstr "サイズのヒント:" msgid "Size of the returned bitmap or wxDefaultSize if size doesn't matter" msgstr "返却するビットマップのサイズか、既定値の wxDefaultSize を指定します" +#: wxcrafter/wxcrafter.cpp:1489 +msgid "wxDefaultSize" +msgstr "wxDefaultSize" + +#: wxcrafter/wxcrafter.cpp:1490 +msgid "16" +msgstr "16" + +#: wxcrafter/wxcrafter.cpp:1491 +msgid "24" +msgstr "24" + +#: wxcrafter/wxcrafter.cpp:1492 +msgid "32" +msgstr "32" + +#: wxcrafter/wxcrafter.cpp:1493 +msgid "64" +msgstr "64" + #: wxcrafter/wxcrafter.cpp:1621 msgid "Control Events" msgstr "コントロールのイベント" @@ -26236,493 +26776,494 @@ msgstr "ビットマップ / テキストを選択" msgid "Set File and Bitmap" msgstr "ファイルとビットマップを設定" -#: wxcrafter/wxcrafter_gui.cpp:40 +#: wxcrafter/wxcrafter_gui.cpp:41 msgid "Forms" msgstr "フォーム" -#: wxcrafter/wxcrafter_gui.cpp:53 +#: wxcrafter/wxcrafter_gui.cpp:54 wxcrafter/wxcrafter_gui.cpp:1414 msgid "wxDialog" msgstr "wxDialog" -#: wxcrafter/wxcrafter_gui.cpp:59 +#: wxcrafter/wxcrafter_gui.cpp:60 wxcrafter/wxcrafter_gui.cpp:1413 msgid "wxFrame" msgstr "wxFrame" -#: wxcrafter/wxcrafter_gui.cpp:65 wxcrafter/wxcrafter_gui.cpp:200 +#: wxcrafter/wxcrafter_gui.cpp:66 wxcrafter/wxcrafter_gui.cpp:201 +#: wxcrafter/wxcrafter_gui.cpp:1416 msgid "wxPanel" msgstr "wxPanel" -#: wxcrafter/wxcrafter_gui.cpp:71 +#: wxcrafter/wxcrafter_gui.cpp:72 wxcrafter/wxcrafter_gui.cpp:1415 msgid "wxWizard" msgstr "wxWizard" -#: wxcrafter/wxcrafter_gui.cpp:88 +#: wxcrafter/wxcrafter_gui.cpp:89 msgid "wxImagList" msgstr "wxImagList" -#: wxcrafter/wxcrafter_gui.cpp:95 +#: wxcrafter/wxcrafter_gui.cpp:96 wxcrafter/wxcrafter_gui.cpp:1418 msgid "wxPopupWindow" msgstr "wxPopupWindow" -#: wxcrafter/wxcrafter_gui.cpp:109 +#: wxcrafter/wxcrafter_gui.cpp:110 msgid "Sizers" msgstr "サイザー" -#: wxcrafter/wxcrafter_gui.cpp:122 +#: wxcrafter/wxcrafter_gui.cpp:123 msgid "wxBoxSizer" msgstr "wxBoxSizer" -#: wxcrafter/wxcrafter_gui.cpp:129 +#: wxcrafter/wxcrafter_gui.cpp:130 msgid "wxFlexGridSizer" msgstr "wxFlexGridSizer" -#: wxcrafter/wxcrafter_gui.cpp:136 +#: wxcrafter/wxcrafter_gui.cpp:137 msgid "wxStaticBoxSizer" msgstr "wxStaticBoxSizer" -#: wxcrafter/wxcrafter_gui.cpp:142 +#: wxcrafter/wxcrafter_gui.cpp:143 msgid "wxGridSizer" msgstr "wxGridSizer" -#: wxcrafter/wxcrafter_gui.cpp:149 +#: wxcrafter/wxcrafter_gui.cpp:150 msgid "wxGridBagSizer" msgstr "wxGridBagSizer" -#: wxcrafter/wxcrafter_gui.cpp:156 +#: wxcrafter/wxcrafter_gui.cpp:157 msgid "wxStdDialogButtonSizer" msgstr "wxStdDialogButtonSizer" -#: wxcrafter/wxcrafter_gui.cpp:162 +#: wxcrafter/wxcrafter_gui.cpp:163 msgid "" "A standard wxButton that can be placed in side a wxStdDialogButtonSizer class" msgstr "wxStdDialogButtonSizer クラス内に配置できる、標準の wxButton です" -#: wxcrafter/wxcrafter_gui.cpp:173 +#: wxcrafter/wxcrafter_gui.cpp:174 msgid "Stretchable spacer" msgstr "引き伸ばし可能なスペーサー" -#: wxcrafter/wxcrafter_gui.cpp:179 +#: wxcrafter/wxcrafter_gui.cpp:180 msgid "wxAuiManager" msgstr "wxAuiManager" -#: wxcrafter/wxcrafter_gui.cpp:207 +#: wxcrafter/wxcrafter_gui.cpp:208 msgid "wxScrolledWindow" msgstr "wxScrolledWindow" -#: wxcrafter/wxcrafter_gui.cpp:214 +#: wxcrafter/wxcrafter_gui.cpp:215 msgid "wxSplitterWindow" msgstr "wxSplitterWindow" -#: wxcrafter/wxcrafter_gui.cpp:221 +#: wxcrafter/wxcrafter_gui.cpp:222 msgid "Splitter Window Page" msgstr "分割ウィンドウページ" -#: wxcrafter/wxcrafter_gui.cpp:228 +#: wxcrafter/wxcrafter_gui.cpp:229 msgid "Notebook Page" msgstr "ノートブックのページ" -#: wxcrafter/wxcrafter_gui.cpp:235 +#: wxcrafter/wxcrafter_gui.cpp:236 msgid "wxWizardPage" msgstr "wxWizardPage" -#: wxcrafter/wxcrafter_gui.cpp:252 +#: wxcrafter/wxcrafter_gui.cpp:253 msgid "wxNotebook" msgstr "wxNotebook" -#: wxcrafter/wxcrafter_gui.cpp:258 +#: wxcrafter/wxcrafter_gui.cpp:259 msgid "wxListbook" msgstr "wxListbook" -#: wxcrafter/wxcrafter_gui.cpp:265 +#: wxcrafter/wxcrafter_gui.cpp:266 msgid "wxChoicebook" msgstr "wxChoicebook" -#: wxcrafter/wxcrafter_gui.cpp:271 +#: wxcrafter/wxcrafter_gui.cpp:272 msgid "wxTreebook" msgstr "wxTreebook" -#: wxcrafter/wxcrafter_gui.cpp:277 +#: wxcrafter/wxcrafter_gui.cpp:278 msgid "wxToolbook" msgstr "wxToolbook" -#: wxcrafter/wxcrafter_gui.cpp:284 +#: wxcrafter/wxcrafter_gui.cpp:285 msgid "wxAuiNotebook" msgstr "wxAuiNotebook" -#: wxcrafter/wxcrafter_gui.cpp:291 +#: wxcrafter/wxcrafter_gui.cpp:292 msgid "wxSimplebook" msgstr "wxSimplebook" -#: wxcrafter/wxcrafter_gui.cpp:309 +#: wxcrafter/wxcrafter_gui.cpp:310 msgid "wxCollapsiblePane" msgstr "wxCollapsiblePane" -#: wxcrafter/wxcrafter_gui.cpp:316 +#: wxcrafter/wxcrafter_gui.cpp:317 msgid "wxCollapsiblePane Pane" msgstr "wxCollapsiblePane のペイン" -#: wxcrafter/wxcrafter_gui.cpp:334 +#: wxcrafter/wxcrafter_gui.cpp:335 msgid "wxGLCanvas" msgstr "wxGLCanvas" -#: wxcrafter/wxcrafter_gui.cpp:342 +#: wxcrafter/wxcrafter_gui.cpp:343 msgid "Controls" msgstr "コントロール" -#: wxcrafter/wxcrafter_gui.cpp:359 +#: wxcrafter/wxcrafter_gui.cpp:360 msgid "wxButton" msgstr "wxButton" -#: wxcrafter/wxcrafter_gui.cpp:366 +#: wxcrafter/wxcrafter_gui.cpp:367 msgid "wxBitmapButton" msgstr "wxBitmapButton" -#: wxcrafter/wxcrafter_gui.cpp:372 +#: wxcrafter/wxcrafter_gui.cpp:373 msgid "wxHyperlinkCtrl" msgstr "wxHyperlinkCtrl" -#: wxcrafter/wxcrafter_gui.cpp:379 +#: wxcrafter/wxcrafter_gui.cpp:380 msgid "wxToggleButton" msgstr "wxToggleButton" -#: wxcrafter/wxcrafter_gui.cpp:386 +#: wxcrafter/wxcrafter_gui.cpp:387 msgid "wxSpinButton" msgstr "wxSpinButton" -#: wxcrafter/wxcrafter_gui.cpp:392 +#: wxcrafter/wxcrafter_gui.cpp:393 msgid "wxSpinCtrl" msgstr "wxSpinCtrl" -#: wxcrafter/wxcrafter_gui.cpp:399 +#: wxcrafter/wxcrafter_gui.cpp:400 msgid "wxBitmapToggleButton" msgstr "wxBitmapToggleButton" -#: wxcrafter/wxcrafter_gui.cpp:416 +#: wxcrafter/wxcrafter_gui.cpp:417 msgid "wxCheckBox" msgstr "wxCheckBox" -#: wxcrafter/wxcrafter_gui.cpp:422 +#: wxcrafter/wxcrafter_gui.cpp:423 msgid "wxRadioBox" msgstr "wxRadioBox" -#: wxcrafter/wxcrafter_gui.cpp:429 +#: wxcrafter/wxcrafter_gui.cpp:430 msgid "wxRadioButton" msgstr "wxRadioButton" -#: wxcrafter/wxcrafter_gui.cpp:447 +#: wxcrafter/wxcrafter_gui.cpp:448 msgid "wxStaticText" msgstr "wxStaticText" -#: wxcrafter/wxcrafter_gui.cpp:454 +#: wxcrafter/wxcrafter_gui.cpp:455 msgid "wxStaticLine" msgstr "wxStaticLine" -#: wxcrafter/wxcrafter_gui.cpp:460 +#: wxcrafter/wxcrafter_gui.cpp:461 msgid "wxTextCtrl" msgstr "wxTextCtrl" -#: wxcrafter/wxcrafter_gui.cpp:467 +#: wxcrafter/wxcrafter_gui.cpp:468 msgid "wxRichTextCtrl" msgstr "wxRichTextCtrl" -#: wxcrafter/wxcrafter_gui.cpp:473 +#: wxcrafter/wxcrafter_gui.cpp:474 msgid "wxStaticBitmap" msgstr "wxStaticBitmap" -#: wxcrafter/wxcrafter_gui.cpp:479 +#: wxcrafter/wxcrafter_gui.cpp:480 msgid "wxHtmlWindow" msgstr "wxHtmlWindow" -#: wxcrafter/wxcrafter_gui.cpp:485 +#: wxcrafter/wxcrafter_gui.cpp:486 msgid "wxStyledTextCtrl" msgstr "wxStyledTextCtrl" -#: wxcrafter/wxcrafter_gui.cpp:502 +#: wxcrafter/wxcrafter_gui.cpp:503 msgid "wxChoice" msgstr "wxChoice" -#: wxcrafter/wxcrafter_gui.cpp:508 +#: wxcrafter/wxcrafter_gui.cpp:509 msgid "wxComboBox" msgstr "wxComboBox" -#: wxcrafter/wxcrafter_gui.cpp:515 +#: wxcrafter/wxcrafter_gui.cpp:516 msgid "wxBitmapComboBox" msgstr "wxBitmapComboBox" -#: wxcrafter/wxcrafter_gui.cpp:532 +#: wxcrafter/wxcrafter_gui.cpp:533 msgid "wxListBox" msgstr "wxListBox" -#: wxcrafter/wxcrafter_gui.cpp:539 +#: wxcrafter/wxcrafter_gui.cpp:540 msgid "wxSimpleHtmlListBox" msgstr "wxSimpleHtmlListBox" -#: wxcrafter/wxcrafter_gui.cpp:546 +#: wxcrafter/wxcrafter_gui.cpp:547 msgid "wxCheckListBox" msgstr "wxCheckListBox" -#: wxcrafter/wxcrafter_gui.cpp:553 +#: wxcrafter/wxcrafter_gui.cpp:554 msgid "wxRearrangeList" msgstr "wxRearrangeList" -#: wxcrafter/wxcrafter_gui.cpp:559 +#: wxcrafter/wxcrafter_gui.cpp:560 msgid "wxListCtrl" msgstr "wxListCtrl" -#: wxcrafter/wxcrafter_gui.cpp:565 +#: wxcrafter/wxcrafter_gui.cpp:566 msgid "wxGrid" msgstr "wxGrid" -#: wxcrafter/wxcrafter_gui.cpp:571 +#: wxcrafter/wxcrafter_gui.cpp:572 msgid "wxTreeCtrl" msgstr "wxTreeCtrl" -#: wxcrafter/wxcrafter_gui.cpp:589 +#: wxcrafter/wxcrafter_gui.cpp:590 msgid "wxActivityIndicator" msgstr "wxActivityIndicator" -#: wxcrafter/wxcrafter_gui.cpp:595 +#: wxcrafter/wxcrafter_gui.cpp:596 msgid "wxSlider" msgstr "wxSlider" -#: wxcrafter/wxcrafter_gui.cpp:601 +#: wxcrafter/wxcrafter_gui.cpp:602 msgid "wxGauge" msgstr "wxGauge" -#: wxcrafter/wxcrafter_gui.cpp:607 +#: wxcrafter/wxcrafter_gui.cpp:608 msgid "wxScrollBar" msgstr "wxScrollBar" -#: wxcrafter/wxcrafter_gui.cpp:625 +#: wxcrafter/wxcrafter_gui.cpp:626 msgid "wxSearchCtrl" msgstr "wxSearchCtrl" -#: wxcrafter/wxcrafter_gui.cpp:632 +#: wxcrafter/wxcrafter_gui.cpp:633 msgid "wxColourPickerCtrl" msgstr "wxColourPickerCtrl" -#: wxcrafter/wxcrafter_gui.cpp:639 +#: wxcrafter/wxcrafter_gui.cpp:640 msgid "wxFontPickerCtrl" msgstr "wxFontPickerCtrl" -#: wxcrafter/wxcrafter_gui.cpp:646 +#: wxcrafter/wxcrafter_gui.cpp:647 msgid "wxFilePickerCtrl" msgstr "wxFilePickerCtrl" -#: wxcrafter/wxcrafter_gui.cpp:653 +#: wxcrafter/wxcrafter_gui.cpp:654 msgid "wxDirPickerCtrl" msgstr "wxDirPickerCtrl" -#: wxcrafter/wxcrafter_gui.cpp:660 +#: wxcrafter/wxcrafter_gui.cpp:661 msgid "wxDatePickerCtrl" msgstr "wxDatePickerCtrl" -#: wxcrafter/wxcrafter_gui.cpp:667 +#: wxcrafter/wxcrafter_gui.cpp:668 msgid "wxTimePickerCtrl" msgstr "wxTimePickerCtrl" -#: wxcrafter/wxcrafter_gui.cpp:674 +#: wxcrafter/wxcrafter_gui.cpp:675 msgid "wxCalendarCtrl" msgstr "wxCalendarCtrl" -#: wxcrafter/wxcrafter_gui.cpp:681 +#: wxcrafter/wxcrafter_gui.cpp:682 msgid "wxGenericDirCtrl" msgstr "wxGenericDirCtrl" -#: wxcrafter/wxcrafter_gui.cpp:687 +#: wxcrafter/wxcrafter_gui.cpp:688 msgid "Custom Control" msgstr "カスタムコントロール" -#: wxcrafter/wxcrafter_gui.cpp:695 +#: wxcrafter/wxcrafter_gui.cpp:696 msgid "Menu / ToolBar" msgstr "メニュー / ツールバー" -#: wxcrafter/wxcrafter_gui.cpp:712 +#: wxcrafter/wxcrafter_gui.cpp:713 msgid "wxMenuBar" msgstr "wxMenuBar" -#: wxcrafter/wxcrafter_gui.cpp:718 +#: wxcrafter/wxcrafter_gui.cpp:719 msgid "wxMenu" msgstr "wxMenu" -#: wxcrafter/wxcrafter_gui.cpp:724 +#: wxcrafter/wxcrafter_gui.cpp:725 msgid "Sub Menu" msgstr "サブメニュー" -#: wxcrafter/wxcrafter_gui.cpp:730 +#: wxcrafter/wxcrafter_gui.cpp:731 msgid "wxMenuItem" msgstr "wxMenuItem" -#: wxcrafter/wxcrafter_gui.cpp:747 +#: wxcrafter/wxcrafter_gui.cpp:748 msgid "wxToolBar" msgstr "wxToolBar" -#: wxcrafter/wxcrafter_gui.cpp:761 +#: wxcrafter/wxcrafter_gui.cpp:762 msgid "Toolbar Item" msgstr "ツールバーの項目" -#: wxcrafter/wxcrafter_gui.cpp:768 +#: wxcrafter/wxcrafter_gui.cpp:769 msgid "Toolbar Separator" msgstr "ツールバーの区切り" -#: wxcrafter/wxcrafter_gui.cpp:786 +#: wxcrafter/wxcrafter_gui.cpp:787 msgid "wxStatusBar" msgstr "wxStatusBar" -#: wxcrafter/wxcrafter_gui.cpp:794 wxcrafter/wxcrafter_gui.cpp:808 +#: wxcrafter/wxcrafter_gui.cpp:795 wxcrafter/wxcrafter_gui.cpp:809 msgid "wxRibbonBar" msgstr "wxRibbonBar" -#: wxcrafter/wxcrafter_gui.cpp:815 +#: wxcrafter/wxcrafter_gui.cpp:816 msgid "wxRibbonPage" msgstr "wxRibbonPage" -#: wxcrafter/wxcrafter_gui.cpp:822 +#: wxcrafter/wxcrafter_gui.cpp:823 msgid "wxRibbonPanel" msgstr "wxRibbonPanel" -#: wxcrafter/wxcrafter_gui.cpp:840 +#: wxcrafter/wxcrafter_gui.cpp:841 msgid "wxRibbonButtonBar" msgstr "wxRibbonButtonBar" -#: wxcrafter/wxcrafter_gui.cpp:847 +#: wxcrafter/wxcrafter_gui.cpp:848 msgid "wxRibbonButton (Normal)" msgstr "wxRibbonButton (普通)" -#: wxcrafter/wxcrafter_gui.cpp:854 +#: wxcrafter/wxcrafter_gui.cpp:855 msgid "wxRibbonButton (Dropdown)" msgstr "wxRibbonButton (ドロップダウン)" -#: wxcrafter/wxcrafter_gui.cpp:861 +#: wxcrafter/wxcrafter_gui.cpp:862 msgid "wxRibbonButton (Hybrid)" msgstr "wxRibbonButton (ハイブリッド)" -#: wxcrafter/wxcrafter_gui.cpp:868 +#: wxcrafter/wxcrafter_gui.cpp:869 msgid "wxRibbonButton (Toggle)" msgstr "wxRibbonButton (トグル)" -#: wxcrafter/wxcrafter_gui.cpp:886 +#: wxcrafter/wxcrafter_gui.cpp:887 msgid "wxRibbonToolBar" msgstr "wxRibbonToolBar" -#: wxcrafter/wxcrafter_gui.cpp:893 +#: wxcrafter/wxcrafter_gui.cpp:894 msgid "wxRibbonTool (Normal)" msgstr "wxRibbonTool (普通)" -#: wxcrafter/wxcrafter_gui.cpp:900 +#: wxcrafter/wxcrafter_gui.cpp:901 msgid "wxRibbonTool (Dropdown)" msgstr "wxRibbonTool (ドロップダウン)" -#: wxcrafter/wxcrafter_gui.cpp:907 +#: wxcrafter/wxcrafter_gui.cpp:908 msgid "wxRibbonTool (Hybrid)" msgstr "wxRibbonTool (ハイブリッド)" -#: wxcrafter/wxcrafter_gui.cpp:914 +#: wxcrafter/wxcrafter_gui.cpp:915 msgid "wxRibbonTool (Toggle)" msgstr "wxRibbonTool (トグル)" -#: wxcrafter/wxcrafter_gui.cpp:921 +#: wxcrafter/wxcrafter_gui.cpp:922 msgid "wxRibbonTool (Separator)" msgstr "wxRibbonTool (区切り)" -#: wxcrafter/wxcrafter_gui.cpp:939 +#: wxcrafter/wxcrafter_gui.cpp:940 msgid "wxRibbonGallery" msgstr "wxRibbonGallery" -#: wxcrafter/wxcrafter_gui.cpp:946 +#: wxcrafter/wxcrafter_gui.cpp:947 msgid "wxRibbonGalleryItem" msgstr "wxRibbonGalleryItem" -#: wxcrafter/wxcrafter_gui.cpp:966 +#: wxcrafter/wxcrafter_gui.cpp:967 msgid "wxDataViewListCtrl" msgstr "wxDataViewListCtrl" -#: wxcrafter/wxcrafter_gui.cpp:973 +#: wxcrafter/wxcrafter_gui.cpp:974 msgid "wxDataViewTreeCtrl" msgstr "wxDataViewTreeCtrl" -#: wxcrafter/wxcrafter_gui.cpp:980 +#: wxcrafter/wxcrafter_gui.cpp:981 msgid "wxDataViewCtrl (with tree-list custom model)" msgstr "wxDataViewCtrl (+ ツリーリストのカスタムモデル)" -#: wxcrafter/wxcrafter_gui.cpp:986 +#: wxcrafter/wxcrafter_gui.cpp:987 msgid "Add a column..." msgstr "列を追加..." -#: wxcrafter/wxcrafter_gui.cpp:1004 +#: wxcrafter/wxcrafter_gui.cpp:1005 msgid "wxPropertyGridManager" msgstr "wxPropertyGridManager" -#: wxcrafter/wxcrafter_gui.cpp:1011 +#: wxcrafter/wxcrafter_gui.cpp:1012 msgid "wxTreeListCtrl" msgstr "wxTreeListCtrl" -#: wxcrafter/wxcrafter_gui.cpp:1018 +#: wxcrafter/wxcrafter_gui.cpp:1019 msgid "wxPGProperty" msgstr "wxPGProperty" -#: wxcrafter/wxcrafter_gui.cpp:1036 +#: wxcrafter/wxcrafter_gui.cpp:1037 msgid "wxBannerWindow" msgstr "wxBannerWindow" -#: wxcrafter/wxcrafter_gui.cpp:1043 +#: wxcrafter/wxcrafter_gui.cpp:1044 msgid "wxCommandLinkButton" msgstr "wxCommandLinkButton" -#: wxcrafter/wxcrafter_gui.cpp:1056 +#: wxcrafter/wxcrafter_gui.cpp:1057 msgid "wxTaskBarIcon" msgstr "wxTaskBarIcon" -#: wxcrafter/wxcrafter_gui.cpp:1068 +#: wxcrafter/wxcrafter_gui.cpp:1069 msgid "wxInfoBar" msgstr "wxInfoBar" -#: wxcrafter/wxcrafter_gui.cpp:1075 +#: wxcrafter/wxcrafter_gui.cpp:1076 msgid "wxInfoBar Button" msgstr "wxInfoBar のボタン" -#: wxcrafter/wxcrafter_gui.cpp:1093 +#: wxcrafter/wxcrafter_gui.cpp:1094 msgid "wxWebView" msgstr "wxWebView" -#: wxcrafter/wxcrafter_gui.cpp:1100 +#: wxcrafter/wxcrafter_gui.cpp:1101 msgid "wxAnimationCtrl" msgstr "wxAnimationCtrl" -#: wxcrafter/wxcrafter_gui.cpp:1107 wxcrafter/wxcrafter_gui.cpp:1697 -#: wxcrafter/wxcrafter_gui.cpp:1706 +#: wxcrafter/wxcrafter_gui.cpp:1108 wxcrafter/wxcrafter_gui.cpp:1698 +#: wxcrafter/wxcrafter_gui.cpp:1707 msgid "wxMediaCtrl" msgstr "wxMediaCtrl" -#: wxcrafter/wxcrafter_gui.cpp:1406 +#: wxcrafter/wxcrafter_gui.cpp:1407 msgid "Select the form type:" msgstr "フォームの種類を選択:" -#: wxcrafter/wxcrafter_gui.cpp:1421 +#: wxcrafter/wxcrafter_gui.cpp:1422 msgid "Select the form type" msgstr "フォームの種類を選択" -#: wxcrafter/wxcrafter_gui.cpp:1426 +#: wxcrafter/wxcrafter_gui.cpp:1427 msgid "Set the form title (optional):" msgstr "フォームの題名を設定 (任意):" -#: wxcrafter/wxcrafter_gui.cpp:1459 +#: wxcrafter/wxcrafter_gui.cpp:1460 msgid "Resource file:" msgstr "リソースファイル:" -#: wxcrafter/wxcrafter_gui.cpp:1471 +#: wxcrafter/wxcrafter_gui.cpp:1472 msgid "Select the wxcp project in which to put this new form" msgstr "この新しいフォームを置く wxcp プロジェクトを選択" -#: wxcrafter/wxcrafter_gui.cpp:1477 +#: wxcrafter/wxcrafter_gui.cpp:1478 msgid "Create a new wxcp file" msgstr "新しい wxcp ファイルを作成" -#: wxcrafter/wxcrafter_gui.cpp:1486 +#: wxcrafter/wxcrafter_gui.cpp:1487 msgid "Base class name:" msgstr "基底クラス名:" -#: wxcrafter/wxcrafter_gui.cpp:1494 +#: wxcrafter/wxcrafter_gui.cpp:1495 msgid "" "The base class name e.g. FooBase\n" "wxCrafter will place all the generated UI code into this class.\n" @@ -26733,11 +27274,11 @@ msgstr "" "生成した UI コードは、全てこのクラスに配置されます。\n" "通常は、このクラスから Foo クラスを派生し、そこに自分のコードを書き込みます。" -#: wxcrafter/wxcrafter_gui.cpp:1502 +#: wxcrafter/wxcrafter_gui.cpp:1503 msgid "Derived class name:" msgstr "派生クラス名:" -#: wxcrafter/wxcrafter_gui.cpp:1510 +#: wxcrafter/wxcrafter_gui.cpp:1511 msgid "" "The name of the class derived from 'Base class name' e.g. 'Foo' where the " "base-class is 'FooBase'." @@ -26745,25 +27286,25 @@ msgstr "" "'基底クラス名' から派生したクラスの名前です。例: 基底クラス 'FooBase' からの" "派生クラス 'Foo'。" -#: wxcrafter/wxcrafter_gui.cpp:1517 +#: wxcrafter/wxcrafter_gui.cpp:1518 msgid "Subclass file:" msgstr "サブクラスのファイル:" -#: wxcrafter/wxcrafter_gui.cpp:1525 +#: wxcrafter/wxcrafter_gui.cpp:1526 msgid "" "The filename in which to store the derived class (no need to add the " "extension).\n" -"e.g. for a class Foo, stored in files foo.cpp and foo.h, write 'foo' here." +"e.g. for a class Foo, stored in files foo.cpp and foo.hpp, write 'foo' here." msgstr "" "派生クラスを収納するファイル名 (拡張子は不要) です。\n" -"例: クラス Foo をファイル foo.cpp / foo.h に収納するのであれば、ここは 'foo' " -"と入力します。" +"例: クラス Foo をファイル foo.cpp / foo.hpp に収納するのであれば、ここは " +"'foo' と入力します。" -#: wxcrafter/wxcrafter_gui.cpp:1533 wxcrafter/wxgui_defs.h:167 +#: wxcrafter/wxcrafter_gui.cpp:1534 wxcrafter/wxgui_defs.h:173 msgid "Virtual Folder:" msgstr "仮想フォルダー:" -#: wxcrafter/wxcrafter_gui.cpp:1544 +#: wxcrafter/wxcrafter_gui.cpp:1545 msgid "Select the virtual folder within the project for the generated files" msgstr "生成したファイルを置く、プロジェクトの仮想フォルダーを選択" @@ -26771,51 +27312,47 @@ msgstr "生成したファイルを置く、プロジェクトの仮想フォル msgid "Create new wxCrafter Form" msgstr "新しい wxCrafter フォームを作成" -#: wxcrafter/wxcrafter_plugin.cpp:93 wxcrafter/wxcrafter_plugin.cpp:179 +#: wxcrafter/wxcrafter_plugin.cpp:92 wxcrafter/wxcrafter_plugin.cpp:178 msgid "wxWidgets GUI Designer" msgstr "wxWidgets GUI デザイナー" -#: wxcrafter/wxcrafter_plugin.cpp:272 -msgid "Plugins::wxCrafter::Show the designer" -msgstr "プラグイン::wxCrafter::デザイナーを表示" +#: wxcrafter/wxcrafter_plugin.cpp:270 wxcrafter/wxcrafter_plugin.cpp:409 +msgid "Show the designer" +msgstr "デザイナーを表示" -#: wxcrafter/wxcrafter_plugin.cpp:398 +#: wxcrafter/wxcrafter_plugin.cpp:397 msgid "Open wxCrafter project..." msgstr "wxCrafter プロジェクトを開く..." -#: wxcrafter/wxcrafter_plugin.cpp:399 +#: wxcrafter/wxcrafter_plugin.cpp:398 msgid "Close wxCrafter project" msgstr "wxCrafter プロジェクトを閉じる" -#: wxcrafter/wxcrafter_plugin.cpp:400 +#: wxcrafter/wxcrafter_plugin.cpp:399 msgid "Save project" msgstr "プロジェクトを保存" -#: wxcrafter/wxcrafter_plugin.cpp:403 +#: wxcrafter/wxcrafter_plugin.cpp:402 msgid "Import a wxSmith file" msgstr "wxSmith ファイルをインポート" -#: wxcrafter/wxcrafter_plugin.cpp:404 +#: wxcrafter/wxcrafter_plugin.cpp:403 msgid "Import from XRC" msgstr "XRC からインポート" -#: wxcrafter/wxcrafter_plugin.cpp:406 wxcrafter/wxguicraft_main_view.cpp:2615 +#: wxcrafter/wxcrafter_plugin.cpp:405 wxcrafter/wxguicraft_main_view.cpp:2635 msgid "Define custom control..." msgstr "カスタムコントロールを定義..." -#: wxcrafter/wxcrafter_plugin.cpp:407 +#: wxcrafter/wxcrafter_plugin.cpp:406 msgid "Edit custom controls..." msgstr "カスタムコントロールを編集..." -#: wxcrafter/wxcrafter_plugin.cpp:408 +#: wxcrafter/wxcrafter_plugin.cpp:407 msgid "Delete custom control..." msgstr "カスタムコントロールを削除..." -#: wxcrafter/wxcrafter_plugin.cpp:410 -msgid "Show the designer" -msgstr "デザイナーを表示" - -#: wxcrafter/wxcrafter_plugin.cpp:445 +#: wxcrafter/wxcrafter_plugin.cpp:444 msgid "" "wxCrafter project is modified\n" "Do you want to save your changes?" @@ -26823,644 +27360,648 @@ msgstr "" "wxCrafter プロジェクトは変更されています\n" "変更を保存しますか？" -#: wxcrafter/wxcrafter_plugin.cpp:567 +#: wxcrafter/wxcrafter_plugin.cpp:566 msgid "'\n" msgstr "'\n" -#: wxcrafter/wxcrafter_plugin.cpp:567 +#: wxcrafter/wxcrafter_plugin.cpp:566 msgid "Could not find target project: '" msgstr "対象のプロジェクトが見つかりませんでした: '" -#: wxcrafter/wxcrafter_plugin.cpp:568 +#: wxcrafter/wxcrafter_plugin.cpp:567 msgid "Make sure that the virtual folder entry is valid (it must exist)\n" msgstr "" "仮想フォルダーの項目が有効 (存在している) であることを確認してください\n" -#: wxcrafter/wxcrafter_plugin.cpp:569 +#: wxcrafter/wxcrafter_plugin.cpp:568 msgid "Virtual Folder provided was: '" msgstr "指定された仮想フォルダーは: '" -#: wxcrafter/wxcrafter_plugin.cpp:662 +#: wxcrafter/wxcrafter_plugin.cpp:667 msgid "wxCrafter: code generation completed successfully!" msgstr "wxCrafter: コードの生成が正常に完了しました！" -#: wxcrafter/wxcrafter_plugin.cpp:679 +#: wxcrafter/wxcrafter_plugin.cpp:684 msgid "Add wxWidgets UI Form..." msgstr "wxWidgets の UI フォームを追加..." -#: wxcrafter/wxcrafter_plugin.cpp:772 +#: wxcrafter/wxcrafter_plugin.cpp:777 msgid "Could not create virtual folder 'wxcrafter'" msgstr "仮想フォルダー 'wxcrafter' を作成できませんでした" -#: wxcrafter/wxcrafter_plugin.cpp:989 +#: wxcrafter/wxcrafter_plugin.cpp:999 msgid "'.\n" msgstr "'。\n" -#: wxcrafter/wxcrafter_plugin.cpp:989 +#: wxcrafter/wxcrafter_plugin.cpp:999 msgid "Error while reading file content: '" msgstr "ファイルの内容を読み取り中にエラーが発生しました: '" -#: wxcrafter/wxcrafter_plugin.cpp:990 +#: wxcrafter/wxcrafter_plugin.cpp:1000 msgid "Could not read file content" msgstr "ファイルの内容を読み取れませんでした" -#: wxcrafter/wxcrafter_plugin.cpp:1082 +#: wxcrafter/wxcrafter_plugin.cpp:1092 msgid "[wxCrafter]" msgstr "[wxCrafter]" -#: wxcrafter/wxcrafter_plugin.cpp:1199 +#: wxcrafter/wxcrafter_plugin.cpp:1209 msgid "In order for the change to take place, you need to restart codelite" msgstr "変更を適用するには CodeLite の再起動が必要です" -#: wxcrafter/wxcrafter_plugin.cpp:1263 +#: wxcrafter/wxcrafter_plugin.cpp:1273 msgid "Open with wxCrafter..." msgstr "wxCrafter で開く..." -#: wxcrafter/wxcrafter_plugin.cpp:1270 wxcrafter/wxcrafter_plugin.cpp:1276 +#: wxcrafter/wxcrafter_plugin.cpp:1280 wxcrafter/wxcrafter_plugin.cpp:1286 msgid "Import with wxCrafter..." msgstr "wxCrafter でインポート..." -#: wxcrafter/wxcrafter_plugin.cpp:1317 +#: wxcrafter/wxcrafter_plugin.cpp:1327 msgid "Re-generate code for project" msgstr "プロジェクトのコードを再生成" -#: wxcrafter/wxcrafter_plugin.cpp:1346 +#: wxcrafter/wxcrafter_plugin.cpp:1357 msgid "This project does not contain any wxCrafter files" msgstr "このプロジェクトには wxCrafter ファイルが含まれていません" -#: wxcrafter/wxgui_defs.h:115 +#: wxcrafter/wxgui_defs.h:121 msgid "Icon Type:" msgstr "アイコンの種類:" -#: wxcrafter/wxgui_defs.h:116 +#: wxcrafter/wxgui_defs.h:122 msgid "Bg Colour:" msgstr "背景色:" -#: wxcrafter/wxgui_defs.h:117 +#: wxcrafter/wxgui_defs.h:123 msgid "Fg Colour:" msgstr "前景色:" -#: wxcrafter/wxgui_defs.h:119 +#: wxcrafter/wxgui_defs.h:125 msgid "ID:" msgstr "ID:" -#: wxcrafter/wxgui_defs.h:122 +#: wxcrafter/wxgui_defs.h:128 msgid "Include File:" msgstr "インクルードファイル:" -#: wxcrafter/wxgui_defs.h:123 +#: wxcrafter/wxgui_defs.h:129 msgid "Style:" msgstr "スタイル:" -#: wxcrafter/wxgui_defs.h:124 +#: wxcrafter/wxgui_defs.h:130 msgid "Hidden" msgstr "非表示" -#: wxcrafter/wxgui_defs.h:126 +#: wxcrafter/wxgui_defs.h:132 msgid "Focused" msgstr "フォーカス" -#: wxcrafter/wxgui_defs.h:127 +#: wxcrafter/wxgui_defs.h:133 msgid "Tooltip:" msgstr "ツールチップ:" -#: wxcrafter/wxgui_defs.h:129 +#: wxcrafter/wxgui_defs.h:135 msgid "Centre:" msgstr "中央:" -#: wxcrafter/wxgui_defs.h:130 +#: wxcrafter/wxgui_defs.h:136 msgid "Shortcut:" msgstr "ショートカット:" -#: wxcrafter/wxgui_defs.h:131 +#: wxcrafter/wxgui_defs.h:137 msgid "Default Button" msgstr "既定のボタン" -#: wxcrafter/wxgui_defs.h:132 +#: wxcrafter/wxgui_defs.h:138 msgid "Wrap:" msgstr "折り返し:" -#: wxcrafter/wxgui_defs.h:133 +#: wxcrafter/wxgui_defs.h:139 msgid "# Columns:" msgstr "列数:" -#: wxcrafter/wxgui_defs.h:135 +#: wxcrafter/wxgui_defs.h:141 msgid "Col Label Vertical Align" msgstr "列ラベルの垂直揃え" -#: wxcrafter/wxgui_defs.h:136 +#: wxcrafter/wxgui_defs.h:142 msgid "Col Label Horizontal Align" msgstr "列ラベルの水平揃え" -#: wxcrafter/wxgui_defs.h:137 +#: wxcrafter/wxgui_defs.h:143 msgid "Rows:" msgstr "行:" -#: wxcrafter/wxgui_defs.h:138 +#: wxcrafter/wxgui_defs.h:144 msgid "Row Label Vertical Align" msgstr "行ラベルの垂直揃え" -#: wxcrafter/wxgui_defs.h:139 +#: wxcrafter/wxgui_defs.h:145 msgid "Row Label Horizontal Align" msgstr "行ラベルの水平揃え" -#: wxcrafter/wxgui_defs.h:140 +#: wxcrafter/wxgui_defs.h:146 msgid "Use Native Header" msgstr "ネイティブなヘッダーを使用" -#: wxcrafter/wxgui_defs.h:141 +#: wxcrafter/wxgui_defs.h:147 msgid "Use Native Column Labels" msgstr "ネイティブな列ラベルを使用" -#: wxcrafter/wxgui_defs.h:142 +#: wxcrafter/wxgui_defs.h:148 msgid "# Rows:" msgstr "行数:" -#: wxcrafter/wxgui_defs.h:143 +#: wxcrafter/wxgui_defs.h:149 msgid "Growable columns:" msgstr "伸長可能な列:" -#: wxcrafter/wxgui_defs.h:144 +#: wxcrafter/wxgui_defs.h:150 msgid "Growable rows:" msgstr "伸長可能な行:" -#: wxcrafter/wxgui_defs.h:145 +#: wxcrafter/wxgui_defs.h:151 msgid "Horizontal gap:" msgstr "水平の間隔:" -#: wxcrafter/wxgui_defs.h:146 +#: wxcrafter/wxgui_defs.h:152 msgid "Vertical gap:" msgstr "垂直の間隔:" -#: wxcrafter/wxgui_defs.h:147 +#: wxcrafter/wxgui_defs.h:153 msgid "Value:" msgstr "値:" -#: wxcrafter/wxgui_defs.h:148 +#: wxcrafter/wxgui_defs.h:154 msgid "Max Length:" msgstr "最大長:" -#: wxcrafter/wxgui_defs.h:149 +#: wxcrafter/wxgui_defs.h:155 msgid "Auto Complete Directories:" msgstr "ディレクトリを自動補完:" -#: wxcrafter/wxgui_defs.h:150 +#: wxcrafter/wxgui_defs.h:156 msgid "Auto Complete Files:" msgstr "ファイルを自動補完:" -#: wxcrafter/wxgui_defs.h:151 +#: wxcrafter/wxgui_defs.h:157 msgid "Orientation:" msgstr "方向:" -#: wxcrafter/wxgui_defs.h:152 +#: wxcrafter/wxgui_defs.h:158 msgid "Minimum Size:" msgstr "最小サイズ:" -#: wxcrafter/wxgui_defs.h:153 +#: wxcrafter/wxgui_defs.h:159 msgid "Bitmap File:" msgstr "ビットマップファイル:" -#: wxcrafter/wxgui_defs.h:154 +#: wxcrafter/wxgui_defs.h:160 msgid "Bitmap File (16x16) :" msgstr "ビットマップファイル (16x16) :" -#: wxcrafter/wxgui_defs.h:155 +#: wxcrafter/wxgui_defs.h:161 msgid "Bitmap File (32x32) :" msgstr "ビットマップファイル (32x32) :" -#: wxcrafter/wxgui_defs.h:156 +#: wxcrafter/wxgui_defs.h:162 msgid "Bitmap File (64x64) :" msgstr "ビットマップファイル (64x64) :" -#: wxcrafter/wxgui_defs.h:157 +#: wxcrafter/wxgui_defs.h:163 msgid "Bitmap File (128x128):" msgstr "ビットマップファイル (128x128):" -#: wxcrafter/wxgui_defs.h:158 +#: wxcrafter/wxgui_defs.h:164 msgid "Bitmap File (256x256):" msgstr "ビットマップファイル (256x256):" -#: wxcrafter/wxgui_defs.h:159 +#: wxcrafter/wxgui_defs.h:165 msgid "Disabled-Bitmap File" msgstr "無効状態のビットマップファイル" -#: wxcrafter/wxgui_defs.h:160 +#: wxcrafter/wxgui_defs.h:166 msgid "Choices:" msgstr "選択肢:" -#: wxcrafter/wxgui_defs.h:161 +#: wxcrafter/wxgui_defs.h:167 msgid "ComboBox Choices:" msgstr "コンボボックスの選択肢:" -#: wxcrafter/wxgui_defs.h:162 +#: wxcrafter/wxgui_defs.h:168 msgid "Selection:" msgstr "既定の選択項目:" -#: wxcrafter/wxgui_defs.h:164 wxformbuilder/wxfbitembasedlg.cpp:61 +#: wxcrafter/wxgui_defs.h:170 wxformbuilder/wxfbitembasedlg.cpp:61 msgid "Title:" msgstr "題名:" -#: wxcrafter/wxgui_defs.h:165 +#: wxcrafter/wxgui_defs.h:171 msgid "Enable Window Persistency:" msgstr "ウィンドウの永続性を有効化:" -#: wxcrafter/wxgui_defs.h:168 +#: wxcrafter/wxgui_defs.h:174 msgid "Width:" msgstr "幅:" -#: wxcrafter/wxgui_defs.h:169 +#: wxcrafter/wxgui_defs.h:175 msgid "Height:" msgstr "高さ:" -#: wxcrafter/wxgui_defs.h:170 +#: wxcrafter/wxgui_defs.h:176 msgid "Major Dimension:" msgstr "主軸に対する個数:" -#: wxcrafter/wxgui_defs.h:171 +#: wxcrafter/wxgui_defs.h:177 msgid "Min value:" msgstr "最小値:" -#: wxcrafter/wxgui_defs.h:172 +#: wxcrafter/wxgui_defs.h:178 msgid "Max value:" msgstr "最大値:" -#: wxcrafter/wxgui_defs.h:173 +#: wxcrafter/wxgui_defs.h:179 msgid "Range:" msgstr "範囲:" -#: wxcrafter/wxgui_defs.h:175 +#: wxcrafter/wxgui_defs.h:181 msgid "HTML Code:" msgstr "HTML コード:" -#: wxcrafter/wxgui_defs.h:176 +#: wxcrafter/wxgui_defs.h:182 msgid "Fit Content to Columns" msgstr "列に内容を合わせる" -#: wxcrafter/wxgui_defs.h:177 +#: wxcrafter/wxgui_defs.h:183 msgid "Allow Cell Editing" msgstr "セルの編集を許容" -#: wxcrafter/wxgui_defs.h:178 +#: wxcrafter/wxgui_defs.h:184 msgid "Checked" msgstr "チェック" -#: wxcrafter/wxgui_defs.h:179 +#: wxcrafter/wxgui_defs.h:185 msgid "Show Cancel Button" msgstr "キャンセルボタンを表示" -#: wxcrafter/wxgui_defs.h:180 +#: wxcrafter/wxgui_defs.h:186 msgid "Show Search Button" msgstr "検索ボタンを表示" -#: wxcrafter/wxgui_defs.h:181 +#: wxcrafter/wxgui_defs.h:187 msgid "Message:" msgstr "メッセージ:" -#: wxcrafter/wxgui_defs.h:182 +#: wxcrafter/wxgui_defs.h:188 msgid "Wildcard:" msgstr "ワイルドカード:" -#: wxcrafter/wxgui_defs.h:183 +#: wxcrafter/wxgui_defs.h:189 msgid "Thumbsize:" msgstr "つまみの大きさ:" -#: wxcrafter/wxgui_defs.h:184 +#: wxcrafter/wxgui_defs.h:190 msgid "Page Size:" msgstr "ページのサイズ:" -#: wxcrafter/wxgui_defs.h:185 +#: wxcrafter/wxgui_defs.h:191 msgid "Normal Colour:" msgstr "通常の色:" -#: wxcrafter/wxgui_defs.h:186 +#: wxcrafter/wxgui_defs.h:192 msgid "Visited Colour:" msgstr "訪問済みの色:" -#: wxcrafter/wxgui_defs.h:187 +#: wxcrafter/wxgui_defs.h:193 msgid "Hover Colour:" msgstr "ホバー時の色:" -#: wxcrafter/wxgui_defs.h:188 +#: wxcrafter/wxgui_defs.h:194 msgid "Default Path:" msgstr "既定のパス:" -#: wxcrafter/wxgui_defs.h:189 +#: wxcrafter/wxgui_defs.h:195 msgid "Filter Index:" msgstr "フィルターのインデックス:" -#: wxcrafter/wxgui_defs.h:191 +#: wxcrafter/wxgui_defs.h:197 msgid "Show Hidden Files:" msgstr "隠しファイルを表示:" -#: wxcrafter/wxgui_defs.h:192 +#: wxcrafter/wxgui_defs.h:198 msgid "Scroll Rate X:" msgstr "横のスクロール率:" -#: wxcrafter/wxgui_defs.h:193 +#: wxcrafter/wxgui_defs.h:199 msgid "Scroll Rate Y:" msgstr "縦のスクロール率:" -#: wxcrafter/wxgui_defs.h:195 +#: wxcrafter/wxgui_defs.h:201 msgid "Expand Node" msgstr "ノードを展開" -#: wxcrafter/wxgui_defs.h:196 +#: wxcrafter/wxgui_defs.h:202 msgid "Null Page" msgstr "NULL ページ" -#: wxcrafter/wxgui_defs.h:197 +#: wxcrafter/wxgui_defs.h:203 msgid "Split Mode:" msgstr "分割モード:" -#: wxcrafter/wxgui_defs.h:198 +#: wxcrafter/wxgui_defs.h:204 msgid "Sash Gravity:" msgstr "仕切りの重力:" -#: wxcrafter/wxgui_defs.h:199 +#: wxcrafter/wxgui_defs.h:205 msgid "Minimum Pane Size:" msgstr "最小のペインサイズ:" -#: wxcrafter/wxgui_defs.h:200 +#: wxcrafter/wxgui_defs.h:206 msgid "Sash Position:" msgstr "仕切りの位置:" -#: wxcrafter/wxgui_defs.h:201 +#: wxcrafter/wxgui_defs.h:207 msgid "Set Splitter Left:" msgstr "区切りの左寄せ:" -#: wxcrafter/wxgui_defs.h:202 +#: wxcrafter/wxgui_defs.h:208 msgid "Cell Position:" msgstr "セルの位置:" -#: wxcrafter/wxgui_defs.h:203 +#: wxcrafter/wxgui_defs.h:209 msgid "Cell Span:" msgstr "セルの間隔:" -#: wxcrafter/wxgui_defs.h:204 +#: wxcrafter/wxgui_defs.h:210 msgid "Kind:" msgstr "分類:" -#: wxcrafter/wxgui_defs.h:205 +#: wxcrafter/wxgui_defs.h:211 msgid "Help String:" msgstr "ヘルプの文字列:" -#: wxcrafter/wxgui_defs.h:206 +#: wxcrafter/wxgui_defs.h:212 msgid "Margins:" msgstr "マージン:" -#: wxcrafter/wxgui_defs.h:207 +#: wxcrafter/wxgui_defs.h:213 msgid "Bitmap Size:" msgstr "ビットマップのサイズ:" -#: wxcrafter/wxgui_defs.h:208 +#: wxcrafter/wxgui_defs.h:214 msgid "Field Count:" msgstr "フィールド数:" -#: wxcrafter/wxgui_defs.h:209 +#: wxcrafter/wxgui_defs.h:215 msgid "Padding:" msgstr "パディング:" -#: wxcrafter/wxgui_defs.h:210 +#: wxcrafter/wxgui_defs.h:216 msgid "Separator Size:" msgstr "区切りのサイズ:" -#: wxcrafter/wxgui_defs.h:211 +#: wxcrafter/wxgui_defs.h:217 msgid "Line Number Margin" msgstr "行番号のマージン" -#: wxcrafter/wxgui_defs.h:212 +#: wxcrafter/wxgui_defs.h:218 msgid "Symbol Margin" msgstr "シンボルのマージン" -#: wxcrafter/wxgui_defs.h:213 +#: wxcrafter/wxgui_defs.h:219 msgid "Fold Margin" msgstr "折り畳みのマージン" -#: wxcrafter/wxgui_defs.h:214 +#: wxcrafter/wxgui_defs.h:220 msgid "Separator Margin" msgstr "区切りのマージン" -#: wxcrafter/wxgui_defs.h:215 +#: wxcrafter/wxgui_defs.h:221 msgid "Lexer" msgstr "字句解析器" -#: wxcrafter/wxgui_defs.h:216 +#: wxcrafter/wxgui_defs.h:222 msgid "Wrap Text" msgstr "テキストを折り返す" -#: wxcrafter/wxgui_defs.h:217 +#: wxcrafter/wxgui_defs.h:223 msgid "Indentation Guides" msgstr "インデントのガイド" -#: wxcrafter/wxgui_defs.h:218 +#: wxcrafter/wxgui_defs.h:224 msgid "Display EOL Markers" msgstr "改行コードのマーカーを表示" -#: wxcrafter/wxgui_defs.h:220 +#: wxcrafter/wxgui_defs.h:226 msgid "Class Decorator" msgstr "クラスのデコレーター" -#: wxcrafter/wxgui_defs.h:222 +#: wxcrafter/wxgui_defs.h:228 msgid "Alignment" msgstr "整列" -#: wxcrafter/wxgui_defs.h:223 +#: wxcrafter/wxgui_defs.h:229 msgid "Generated Model Class Name" msgstr "生成するモデルクラス名" -#: wxcrafter/wxgui_defs.h:224 +#: wxcrafter/wxgui_defs.h:230 msgid "Cell Mode" msgstr "セルのモード" -#: wxcrafter/wxgui_defs.h:225 wxcrafter/wxgui_defs.h:264 +#: wxcrafter/wxgui_defs.h:231 wxcrafter/wxgui_defs.h:270 msgid "Column Flags" msgstr "列のフラグ" -#: wxcrafter/wxgui_defs.h:226 +#: wxcrafter/wxgui_defs.h:232 msgid "Container Item Has Columns" msgstr "列持ちのコンテナー項目" -#: wxcrafter/wxgui_defs.h:227 +#: wxcrafter/wxgui_defs.h:233 msgid "Gradient Start" msgstr "階調の開始" -#: wxcrafter/wxgui_defs.h:228 +#: wxcrafter/wxgui_defs.h:234 msgid "Gradient End" msgstr "階調の終了" -#: wxcrafter/wxgui_defs.h:229 +#: wxcrafter/wxgui_defs.h:235 msgid "Note" msgstr "ノート" -#: wxcrafter/wxgui_defs.h:230 +#: wxcrafter/wxgui_defs.h:236 msgid "Collapsed" msgstr "折り畳み" -#: wxcrafter/wxgui_defs.h:231 +#: wxcrafter/wxgui_defs.h:237 msgid "Icon ID" msgstr "アイコン ID" -#: wxcrafter/wxgui_defs.h:233 +#: wxcrafter/wxgui_defs.h:239 msgid "Sash Size" msgstr "仕切りのサイズ" -#: wxcrafter/wxgui_defs.h:234 +#: wxcrafter/wxgui_defs.h:240 msgid "Pane Border Size" msgstr "ペインの境界サイズ" -#: wxcrafter/wxgui_defs.h:235 +#: wxcrafter/wxgui_defs.h:241 msgid "Sash Colour" msgstr "仕切りの色" -#: wxcrafter/wxgui_defs.h:236 +#: wxcrafter/wxgui_defs.h:242 msgid "Caption Colour" msgstr "見出しの色" -#: wxcrafter/wxgui_defs.h:237 +#: wxcrafter/wxgui_defs.h:243 msgid "Caption Gradient Colour" msgstr "見出しの階調色" -#: wxcrafter/wxgui_defs.h:238 +#: wxcrafter/wxgui_defs.h:244 msgid "Inactive Caption Colour" msgstr "非アクティブな見出しの色" -#: wxcrafter/wxgui_defs.h:239 +#: wxcrafter/wxgui_defs.h:245 msgid "Inactive Caption Gradient Colour" msgstr "非アクティブな見出しの階調色" -#: wxcrafter/wxgui_defs.h:240 +#: wxcrafter/wxgui_defs.h:246 msgid "Active Caption Text Colour" msgstr "アクティブな見出しのテキスト色" -#: wxcrafter/wxgui_defs.h:241 +#: wxcrafter/wxgui_defs.h:247 msgid "Inactive Caption Text Colour" msgstr "非アクティブな見出しのテキスト色" -#: wxcrafter/wxgui_defs.h:242 +#: wxcrafter/wxgui_defs.h:248 msgid "Gradient Type" msgstr "階調の種類" -#: wxcrafter/wxgui_defs.h:243 +#: wxcrafter/wxgui_defs.h:249 msgid "Bitmap Mask" msgstr "ビットマップのマスク" -#: wxcrafter/wxgui_defs.h:244 +#: wxcrafter/wxgui_defs.h:250 msgid "Base Class Suffix" msgstr "基底クラスのサフィックス" -#: wxcrafter/wxgui_defs.h:245 +#: wxcrafter/wxgui_defs.h:251 msgid "Interval" msgstr "間隔" -#: wxcrafter/wxgui_defs.h:247 +#: wxcrafter/wxgui_defs.h:253 msgid "One Shot Timer" msgstr "一発タイマー" -#: wxcrafter/wxgui_defs.h:248 +#: wxcrafter/wxgui_defs.h:254 msgid "Output File Name" msgstr "出力ファイル名" -#: wxcrafter/wxgui_defs.h:249 +#: wxcrafter/wxgui_defs.h:255 msgid "Inherited Class" msgstr "継承したクラス" -#: wxcrafter/wxgui_defs.h:250 +#: wxcrafter/wxgui_defs.h:256 msgid "Keywords Set 1" msgstr "キーワードのセット 1" -#: wxcrafter/wxgui_defs.h:251 +#: wxcrafter/wxgui_defs.h:257 msgid "Keywords Set 2" msgstr "キーワードのセット 2" -#: wxcrafter/wxgui_defs.h:252 +#: wxcrafter/wxgui_defs.h:258 msgid "Keywords Set 3" msgstr "キーワードのセット 3" -#: wxcrafter/wxgui_defs.h:253 +#: wxcrafter/wxgui_defs.h:259 msgid "Keywords Set 4" msgstr "キーワードのセット 4" -#: wxcrafter/wxgui_defs.h:254 +#: wxcrafter/wxgui_defs.h:260 msgid "Keywords Set 5" msgstr "キーワードのセット 5" -#: wxcrafter/wxgui_defs.h:256 +#: wxcrafter/wxgui_defs.h:262 msgid "Ribbon Theme" msgstr "リボンテーマ" -#: wxcrafter/wxgui_defs.h:257 +#: wxcrafter/wxgui_defs.h:263 msgid "Minimum #Rows" msgstr "最小の行数" -#: wxcrafter/wxgui_defs.h:258 +#: wxcrafter/wxgui_defs.h:264 msgid "Maximum #Rows" msgstr "最大の行数" -#: wxcrafter/wxgui_defs.h:259 +#: wxcrafter/wxgui_defs.h:265 msgid "Backend" msgstr "バックエンド" -#: wxcrafter/wxgui_defs.h:260 +#: wxcrafter/wxgui_defs.h:266 msgid "wxMediaCtrl Controls" msgstr "wxMediaCtrl のコントロール" -#: wxcrafter/wxgui_defs.h:263 +#: wxcrafter/wxgui_defs.h:269 msgid "wxFrame Type" msgstr "wxFrame の種類" -#: wxcrafter/wxgui_defs.h:265 +#: wxcrafter/wxgui_defs.h:271 msgid "Show Effect" msgstr "視覚効果" -#: wxcrafter/wxgui_defs.h:266 +#: wxcrafter/wxgui_defs.h:272 msgid "Property Editor Control" msgstr "プロパティの編集方式" -#: wxcrafter/wxgui_defs.h:267 +#: wxcrafter/wxgui_defs.h:273 msgid "Construct the Dropdown Menu:" msgstr "ドロップダウンメニューを構築:" -#: wxcrafter/wxgui_defs.h:268 +#: wxcrafter/wxgui_defs.h:274 msgid "Text Hint" msgstr "テキストのヒント" -#: wxcrafter/wxgui_defs.h:270 +#: wxcrafter/wxgui_defs.h:276 msgid "Load and play" msgstr "読み込みと再生" -#: wxcrafter/wxgui_defs.h:271 +#: wxcrafter/wxgui_defs.h:277 msgid "Proportion:" msgstr "比率:" -#: wxcrafter/wxgui_defs.h:272 +#: wxcrafter/wxgui_defs.h:278 msgid "Enable Spell Checking" msgstr "スペルチェックを有効化" -#: wxcrafter/wxgui_helpers.cpp:221 +#: wxcrafter/wxgui_defs.h:279 +msgid "Keep as a class member" +msgstr "クラスメンバーとして保持" + +#: wxcrafter/wxgui_helpers.cpp:223 msgid "Invalid XRC! could not save DesignerPreview.xrc" msgstr "無効な XRC です！DesignerPreview.xrc を保存できませんでした" -#: wxcrafter/wxguicraft_main_view.cpp:181 +#: wxcrafter/wxguicraft_main_view.cpp:182 msgid "Show Preview" msgstr "プレビューを表示" -#: wxcrafter/wxguicraft_main_view.cpp:181 +#: wxcrafter/wxguicraft_main_view.cpp:182 msgid "Show Preview..." msgstr "プレビューを表示..." -#: wxcrafter/wxguicraft_main_view.cpp:182 +#: wxcrafter/wxguicraft_main_view.cpp:183 msgid "Close Preview" msgstr "プレビューを閉じる" -#: wxcrafter/wxguicraft_main_view.cpp:182 +#: wxcrafter/wxguicraft_main_view.cpp:183 msgid "Close Preview..." msgstr "プレビューを閉じる..." -#: wxcrafter/wxguicraft_main_view.cpp:185 +#: wxcrafter/wxguicraft_main_view.cpp:186 msgid "Delete Item" msgstr "項目を削除" -#: wxcrafter/wxguicraft_main_view.cpp:187 +#: wxcrafter/wxguicraft_main_view.cpp:188 msgid "Align Left" msgstr "左側に揃える" @@ -27504,40 +28045,40 @@ msgstr "左側の境界" msgid "Top Border" msgstr "上側の境界" -#: wxcrafter/wxguicraft_main_view.cpp:207 +#: wxcrafter/wxguicraft_main_view.cpp:206 msgid "Right Border" msgstr "右側の境界" -#: wxcrafter/wxguicraft_main_view.cpp:209 +#: wxcrafter/wxguicraft_main_view.cpp:208 msgid "Bottom Border" msgstr "下側の境界" +#: wxcrafter/wxguicraft_main_view.cpp:212 #: wxcrafter/wxguicraft_main_view.cpp:213 -#: wxcrafter/wxguicraft_main_view.cpp:214 msgid "Set Sizer Proportion to 1" msgstr "サイザーの比率を 1 に設定" -#: wxcrafter/wxguicraft_main_view.cpp:215 +#: wxcrafter/wxguicraft_main_view.cpp:214 msgid "Expand Item" msgstr "項目を拡張" -#: wxcrafter/wxguicraft_main_view.cpp:220 +#: wxcrafter/wxguicraft_main_view.cpp:219 msgid "Move Left" msgstr "左へ移動" -#: wxcrafter/wxguicraft_main_view.cpp:221 +#: wxcrafter/wxguicraft_main_view.cpp:220 msgid "Move Left into parent sizer" msgstr "左を親サイザーへ移動" -#: wxcrafter/wxguicraft_main_view.cpp:222 +#: wxcrafter/wxguicraft_main_view.cpp:221 msgid "Move Right" msgstr "右へ移動" -#: wxcrafter/wxguicraft_main_view.cpp:223 +#: wxcrafter/wxguicraft_main_view.cpp:222 msgid "Move Right into a sibling sizer" msgstr "右を兄弟サイザーへ移動" -#: wxcrafter/wxguicraft_main_view.cpp:1012 +#: wxcrafter/wxguicraft_main_view.cpp:1011 msgid "my_gui.wxcp" msgstr "my_gui.wxcp" @@ -27561,23 +28102,23 @@ msgstr "" msgid "Open wxCrafter project" msgstr "wxCrafter プロジェクトを開く" -#: wxcrafter/wxguicraft_main_view.cpp:1863 -#: wxcrafter/wxguicraft_main_view.cpp:1942 +#: wxcrafter/wxguicraft_main_view.cpp:1871 +#: wxcrafter/wxguicraft_main_view.cpp:1950 msgid "Can't paste it here" msgstr "ここには貼り付けられません" -#: wxcrafter/wxguicraft_main_view.cpp:1883 -#: wxcrafter/wxguicraft_main_view.cpp:1963 +#: wxcrafter/wxguicraft_main_view.cpp:1891 +#: wxcrafter/wxguicraft_main_view.cpp:1971 msgid "This name is already in use. Try again?" msgstr "この名前は既に使われています。再試行しますか？" -#: wxcrafter/wxguicraft_main_view.cpp:2016 -#: wxcrafter/wxguicraft_main_view.cpp:2636 +#: wxcrafter/wxguicraft_main_view.cpp:2024 +#: wxcrafter/wxguicraft_main_view.cpp:2656 msgid "Only one wxAui Manager is allowed" msgstr "配置できる wxAuiManager はひとつだけです" -#: wxcrafter/wxguicraft_main_view.cpp:2026 -#: wxcrafter/wxguicraft_main_view.cpp:2662 +#: wxcrafter/wxguicraft_main_view.cpp:2034 +#: wxcrafter/wxguicraft_main_view.cpp:2682 msgid "" "Can't insert this item here\n" "There is already a main sizer" @@ -27585,7 +28126,7 @@ msgstr "" "ここには挿入できない項目です\n" "メインサイザーが既に存在します" -#: wxcrafter/wxguicraft_main_view.cpp:2031 +#: wxcrafter/wxguicraft_main_view.cpp:2039 msgid "" "Can't insert this item here\n" "This item is managed by wxAUI" @@ -27593,7 +28134,7 @@ msgstr "" "ここには挿入できない項目です\n" "項目は wxAUI により管理されています" -#: wxcrafter/wxguicraft_main_view.cpp:2331 +#: wxcrafter/wxguicraft_main_view.cpp:2348 msgid "" "Current file has been modified\n" "Close anyway?" @@ -27601,55 +28142,51 @@ msgstr "" "現在のファイルは変更されています\n" "それでも閉じますか？" -#: wxcrafter/wxguicraft_main_view.cpp:2576 +#: wxcrafter/wxguicraft_main_view.cpp:2596 msgid "Generate C++ code" msgstr "C++ コードを生成" -#: wxcrafter/wxguicraft_main_view.cpp:2578 +#: wxcrafter/wxguicraft_main_view.cpp:2598 msgid "Generate XRC" msgstr "XRC を生成" -#: wxcrafter/wxguicraft_main_view.cpp:2603 +#: wxcrafter/wxguicraft_main_view.cpp:2623 msgid "Choose a control" msgstr "コントロールを選択" -#: wxcrafter/wxguicraft_main_view.cpp:2642 +#: wxcrafter/wxguicraft_main_view.cpp:2662 msgid "wxAui Manager can not be placed onto a control with a main sizer" msgstr "" "wxAuiManager をメインサイザーがあるコントロール上に置くことはできません" -#: wxcrafter/wxguicraft_main_view.cpp:2650 +#: wxcrafter/wxguicraft_main_view.cpp:2670 msgid "wxRibbonPanel can only have one direct child" msgstr "wxRibbonPanel は直接的な子をひとつだけしか持てません" -#: wxcrafter/wxguicraft_main_view.cpp:2667 +#: wxcrafter/wxguicraft_main_view.cpp:2687 msgid "A Main Sizer can not be placed into a wxAui managed window" msgstr "メインサイザーを wxAui 管理下のウィンドウに置くことはできません" -#: wxcrafter/wxguicraft_main_view.cpp:2678 +#: wxcrafter/wxguicraft_main_view.cpp:2698 msgid "Can't insert this item here" msgstr "ここには挿入できない項目です" -#: wxcrafter/wxguicraft_main_view.cpp:2743 -msgid "is not available in the free edition of wxCrafter" -msgstr "を無料版の wxCrafter で使うことはできません" - -#: wxcrafter/wxguicraft_main_view.cpp:2840 +#: wxcrafter/wxguicraft_main_view.cpp:2832 msgid "Rename '" msgstr "名前を変更 '" -#: wxcrafter/wxguicraft_main_view.cpp:2841 +#: wxcrafter/wxguicraft_main_view.cpp:2833 msgid "Enter the new name:" msgstr "新しい名前を入力:" -#: wxcrafter/wxguicraft_main_view.cpp:3055 +#: wxcrafter/wxguicraft_main_view.cpp:3050 msgid "" "You need to enable at least one of 'Generate C++ code' and 'Generate XRC'" msgstr "" "少なくとも 'C++ コードを生成' か 'XRC を生成' のどちらかを有効にする必要があ" "ります" -#: wxcrafter/wxguicraft_main_view.cpp:3066 +#: wxcrafter/wxguicraft_main_view.cpp:3062 msgid "" "Please set the base classes generated files output directory\n" "This can be done by selecting the root item of the tree and edit the " @@ -27658,24 +28195,24 @@ msgstr "" "基底クラスのファイルを生成する、出力ディレクトリを設定してください\n" "ツリーのルート項目を選択し、プロパティを編集することで行えます" -#: wxcrafter/wxguicraft_main_view.cpp:3076 +#: wxcrafter/wxguicraft_main_view.cpp:3073 msgid "You must save the project before generating code" msgstr "コードを生成する前に、プロジェクトを保存してください" -#: wxcrafter/wxguicraft_main_view.cpp:3256 +#: wxcrafter/wxguicraft_main_view.cpp:3251 msgid "Select wxCrafter files:" msgstr "wxCrafter ファイルを選択:" -#: wxcrafter/wxguicraft_main_view.cpp:3268 +#: wxcrafter/wxguicraft_main_view.cpp:3265 msgid "Please close the current wxCrafter project before batch generating code" msgstr "" "コードを一括生成する前に、現在の wxCrafter プロジェクトを閉じてください" -#: wxcrafter/wxguicraft_main_view.cpp:3275 +#: wxcrafter/wxguicraft_main_view.cpp:3272 msgid "Generating Code..." msgstr "コードを生成しています..." -#: wxcrafter/wxguicraft_main_view.cpp:3297 +#: wxcrafter/wxguicraft_main_view.cpp:3294 msgid "Generated Code For the following projects:\n" msgstr "これらのプロジェクトにコードを生成しました:\n" diff --git a/wxcrafter/wxcrafter_plugin.cpp b/wxcrafter/wxcrafter_plugin.cpp index d729550885..0d2633ac13 100644 --- a/wxcrafter/wxcrafter_plugin.cpp +++ b/wxcrafter/wxcrafter_plugin.cpp @@ -13,10 +13,15 @@ #include "VirtualDirectorySelectorDlg.h" #include "allocator_mgr.h" #include "clKeyboardManager.h" +#include "clStatusBar.h" #include "cl_command_event.h" #include "codelite_events.h" +#include "ctags_manager.h" +#include "editor_config.h" +#include "entry.h" #include "event_notifier.h" #include "functions_parser.h" +#include "globals.h" #include "gui.h" #include "import_from_wxFB.h" #include "import_from_wxSmith.h" @@ -47,6 +52,9 @@ #include "myxh_treebk.h" #include "myxh_treelist.h" #include "myxh_webview.h" +#include "plugin.h" +#include "project.h" +#include "workspace.h" #include "wxcNetworkThread.h" #include "wxcSettingsDlg.h" #include "wxcTreeView.h" @@ -57,15 +65,6 @@ #include "wxgui_helpers.h" #include "wxguicraft_main_view.h" -#include -#include -#include -#include -#include -#include -#include -#include -#include #include #include #include @@ -91,7 +90,7 @@ CL_PLUGIN_API PluginInfo* GetPluginInfo() info.SetAuthor("Eran"); info.SetName("wxcrafter"); info.SetDescription(_("wxWidgets GUI Designer")); - info.SetVersion(wxT("v2.4")); + info.SetVersion("v2.4"); return &info; } @@ -177,7 +176,7 @@ wxCrafterPlugin::wxCrafterPlugin(IManager* manager, bool serverMode) // wxCrafter::ResourceLoader bmps; m_longName = _("wxWidgets GUI Designer"); - m_shortName = wxT("wxCrafter"); + m_shortName = "wxCrafter"; m_useFrame = true; if(!m_useFrame) { @@ -268,8 +267,8 @@ wxCrafterPlugin::wxCrafterPlugin(IManager* manager, bool serverMode) #if !STANDALONE_BUILD m_mgr->GetWorkspacePaneNotebook()->Bind(wxEVT_BOOK_PAGE_CHANGED, &wxCrafterPlugin::OnWorkspaceTabSelected, this); - clKeyboardManager::Get()->AddGlobalAccelerator("ID_SHOW_DESIGNER", "Ctrl-Shift-F12", - _("Plugins::wxCrafter::Show the designer")); + clKeyboardManager::Get()->AddAccelerator("ID_SHOW_DESIGNER", _("wxCrafter"), _("Show the designer"), + "Ctrl-Shift-F12"); #endif } @@ -551,7 +550,7 @@ void wxCrafterPlugin::OnBitmapCodeGenerationCompleted(wxCommandEvent& e) projectName = m_mgr->GetProjectNameByFile(projectFile.GetFullPath()); } else { - projectName = vd.BeforeFirst(wxT(':')); + projectName = vd.BeforeFirst(':'); } projectName.Trim().Trim(false); @@ -580,18 +579,19 @@ void wxCrafterPlugin::OnBitmapCodeGenerationCompleted(wxCommandEvent& e) sourceFilesVD.Trim().Trim(false); if(sourceFilesVD.IsEmpty()) { - sourceFilesVD << projectName << wxT(":src"); + sourceFilesVD << projectName << ":src"; } - baseFilesVD << projectName << wxT(":wxcrafter:base"); - bitmapFilesVD << projectName << wxT(":wxcrafter:resources"); - xrcVD << projectName << wxT(":wxcrafter:XRC"); + baseFilesVD << projectName << ":wxcrafter:base"; + bitmapFilesVD << projectName << ":wxcrafter:resources"; + xrcVD << projectName << ":wxcrafter:XRC"; ////////////////////////////////////////////////////////////// // Add the bitmap resource files ////////////////////////////////////////////////////////////// - if(uniqueFiles.find(bitmapSourceFile.GetFullPath()) == uniqueFiles.end()) + if(uniqueFiles.find(bitmapSourceFile.GetFullPath()) == uniqueFiles.end()) { filesToAdd.Add(bitmapSourceFile.GetFullPath()); + } if(filesToAdd.IsEmpty() == false) { DoCreateVirtualFolder(bitmapFilesVD); @@ -602,8 +602,9 @@ void wxCrafterPlugin::OnBitmapCodeGenerationCompleted(wxCommandEvent& e) // Add the XRC files ////////////////////////////////////////////////////////////// filesToAdd.Clear(); - if(xrcFile.IsOk() && uniqueFiles.find(xrcFile.GetFullPath()) == uniqueFiles.end()) + if(xrcFile.IsOk() && uniqueFiles.find(xrcFile.GetFullPath()) == uniqueFiles.end()) { filesToAdd.Add(xrcFile.GetFullPath()); + } if(filesToAdd.IsEmpty() == false) { DoCreateVirtualFolder(xrcVD); @@ -614,10 +615,12 @@ void wxCrafterPlugin::OnBitmapCodeGenerationCompleted(wxCommandEvent& e) // Add the base classes files ////////////////////////////////////////////////////////////// filesToAdd.Clear(); - if(uniqueFiles.find(headerFile.GetFullPath()) == uniqueFiles.end()) + if(uniqueFiles.find(headerFile.GetFullPath()) == uniqueFiles.end()) { filesToAdd.Add(headerFile.GetFullPath()); - if(uniqueFiles.find(sourceFile.GetFullPath()) == uniqueFiles.end()) + } + if(uniqueFiles.find(sourceFile.GetFullPath()) == uniqueFiles.end()) { filesToAdd.Add(sourceFile.GetFullPath()); + } // The additional files are added to the 'base' for(size_t i = 0; i < additionalFiles.GetCount(); ++i) { @@ -642,11 +645,13 @@ void wxCrafterPlugin::OnBitmapCodeGenerationCompleted(wxCommandEvent& e) #if !STANDALONE_BUILD if(clCxxWorkspaceST::Get()->IsOpen()) { filesToAdd.Clear(); - if(uniqueFiles.find(derivedHeader.GetFullPath()) == uniqueFiles.end()) + if(uniqueFiles.find(derivedHeader.GetFullPath()) == uniqueFiles.end()) { filesToAdd.Add(derivedHeader.GetFullPath()); + } - if(uniqueFiles.find(derivedSource.GetFullPath()) == uniqueFiles.end()) + if(uniqueFiles.find(derivedSource.GetFullPath()) == uniqueFiles.end()) { filesToAdd.Add(derivedSource.GetFullPath()); + } if(filesToAdd.IsEmpty() == false) { DoCreateVirtualFolder(sourceFilesVD); @@ -677,7 +682,7 @@ wxMenu* wxCrafterPlugin::DoCreateFolderMenu() wxCrafter::ResourceLoader bmps; item = new wxMenuItem(menu, XRCID("wxcp_new_form"), _("Add wxWidgets UI Form..."), wxEmptyString, wxITEM_NORMAL); - item->SetBitmap(bmps.Bitmap(wxT("new-form"))); + item->SetBitmap(bmps.Bitmap("new-form")); menu->Append(item); return menu; @@ -735,13 +740,13 @@ void wxCrafterPlugin::DoGenerateCode(const NewFormDetails& fd) wxFileName wxcpFile = wxFileName(fd.wxcpFile); if(!wxcpFile.FileExists()) { - wxFFile fp(wxcpFile.GetFullPath(), wxT("w+b")); + wxFFile fp(wxcpFile.GetFullPath(), "w+b"); if(fp.IsOpened()) { fp.Close(); } else { wxString msg; - msg << _("Could not create resource file '") << wxcpFile.GetFullPath() << wxT("'"); + msg << _("Could not create resource file '") << wxcpFile.GetFullPath() << "'"; ::wxMessageBox(msg, _("wxCrafter"), wxOK | wxICON_WARNING | wxCENTRE); return; } @@ -752,7 +757,7 @@ void wxCrafterPlugin::DoGenerateCode(const NewFormDetails& fd) if(clCxxWorkspaceST::Get()->IsOpen()) { // Step 1: // Check if we already got a virtual folder named 'wxcrafter' - wxString projectName = fd.virtualFolder.BeforeFirst(wxT(':')); + wxString projectName = fd.virtualFolder.BeforeFirst(':'); ProjectPtr project = clCxxWorkspaceST::Get()->FindProjectByName(projectName, errMsg); if(!project) { ::wxMessageBox(errMsg, _("wxCrafter"), wxOK | wxICON_WARNING | wxCENTRE); @@ -768,7 +773,7 @@ void wxCrafterPlugin::DoGenerateCode(const NewFormDetails& fd) if(!files.count(wxcpFile.GetFullPath())) { - if(!m_mgr->CreateVirtualDirectory(vdFullPath, wxT("wxcrafter"))) { + if(!m_mgr->CreateVirtualDirectory(vdFullPath, "wxcrafter")) { ::wxMessageBox(_("Could not create virtual folder 'wxcrafter'"), _("wxCrafter"), wxOK | wxICON_WARNING | wxCENTRE); return; @@ -777,7 +782,8 @@ void wxCrafterPlugin::DoGenerateCode(const NewFormDetails& fd) // Add the resource file to the newly created virtual folder wxArrayString f; f.Add(wxcpFile.GetFullPath()); - vdFullPath << wxT(":") << wxT("wxcrafter"); + vdFullPath << ":" + << "wxcrafter"; m_mgr->AddFilesToVirtualFolder(vdFullPath, f); } } @@ -806,8 +812,9 @@ void wxCrafterPlugin::DoGenerateCode(const NewFormDetails& fd) bool wxCrafterPlugin::DoShowDesigner(bool createIfNotExist) { - if(!m_mgr) + if(!m_mgr) { return false; + } m_mainFrame->DisplayDesigner(); return false; @@ -816,8 +823,8 @@ bool wxCrafterPlugin::DoShowDesigner(bool createIfNotExist) bool wxCrafterPlugin::DoCreateVirtualFolder(const wxString& vdFullPath) { CHECK_POINTER_RET_FALSE(m_mgr); - wxString name = vdFullPath.AfterLast(wxT(':')); - wxString parent = vdFullPath.BeforeLast(wxT(':')); + wxString name = vdFullPath.AfterLast(':'); + wxString parent = vdFullPath.BeforeLast(':'); return m_mgr->CreateVirtualDirectory(parent, name); } @@ -854,8 +861,8 @@ void wxCrafterPlugin::OnProjectModified(wxCommandEvent& e) CHECK_POINTER(m_mgr); wxString title = m_mgr->GetPageTitle(m_mainPanel); - if(!title.StartsWith(wxT("*"))) { - title.Prepend(wxT("*")); + if(!title.StartsWith("*")) { + title.Prepend("*"); m_mgr->SetPageTitle(m_mainPanel, title); } } @@ -867,7 +874,7 @@ void wxCrafterPlugin::OnProjectSynched(wxCommandEvent& e) CHECK_POINTER(m_mgr); wxString title = m_mgr->GetPageTitle(m_mainPanel); - if(title.StartsWith(wxT("*"))) { + if(title.StartsWith("*")) { title.Remove(0, 1); m_mgr->SetPageTitle(m_mainPanel, title); } @@ -916,11 +923,13 @@ void wxCrafterPlugin::DoUpdateDerivedClassEventHandlers() wxString headerContent, sourceContent; IEditor *headerEditor(NULL), *sourceEditor(NULL); - if(!DoReadFileContentAndPrompt(m_generatedClassInfo.derivedHeader, headerContent, &headerEditor)) + if(!DoReadFileContentAndPrompt(m_generatedClassInfo.derivedHeader, headerContent, &headerEditor)) { return; + } - if(!DoReadFileContentAndPrompt(m_generatedClassInfo.derivedSource, sourceContent, &sourceEditor)) + if(!DoReadFileContentAndPrompt(m_generatedClassInfo.derivedSource, sourceContent, &sourceEditor)) { return; + } CHECK_POINTER(m_mainPanel); @@ -934,8 +943,9 @@ void wxCrafterPlugin::DoUpdateDerivedClassEventHandlers() wxString decl, impl; const wxcWidget::Map_t& newEvents = parser.GetAllEvents(); - if(newEvents.empty()) + if(newEvents.empty()) { return; + } wxcWidget::Map_t::const_iterator iter = newEvents.begin(); for(; iter != newEvents.end(); ++iter) { @@ -1331,8 +1341,9 @@ void wxCrafterPlugin::OnReGenerateForProject(wxCommandEvent& e) wxStringSet_t all_files; wxArrayString projects; ProjectPtr activeProject = clGetManager()->GetSelectedProject(); - if(!activeProject) + if(!activeProject) { return; + } wxCrafter::GetProjectFiles(activeProject->GetName(), all_files); // Filter out and keep only wxcp files