diff --git a/NEWS.md b/NEWS.md
index 71437e1d..22e7e537 100644
--- a/NEWS.md
+++ b/NEWS.md
@@ -5,6 +5,12 @@ Red Panda C++ Version 2.0
   - fix: save/load bookmark doesn't work
   - fix: if project has custom makefile but not enabled, project won't auto generate makefile.
   - fix: File path of Issues in project compilation is relative, and can't be correctly marked in the editors.
+  - fix: editor & class browser not correct updated when editor is switched but not focused
+  - enhancement: show all project statements in the class browser
+  - fix: namespace members defined in multiple places not correctly merged in the class browser
+  - fix: correctly display statements whose parent is not in the current file
+  - fix: statements is the class browser is correctly sorted
+  - enhancement: Weither double click on the class browser should goto definition/declaration,  depends on the current cursor position
 
 Red Panda C++ Version 1.5
 
diff --git a/RedPandaIDE/mainwindow.cpp b/RedPandaIDE/mainwindow.cpp
index 6243bb4e..f96ef232 100644
--- a/RedPandaIDE/mainwindow.cpp
+++ b/RedPandaIDE/mainwindow.cpp
@@ -1117,30 +1117,47 @@ void MainWindow::rebuildOpenedFileHisotryMenu()
 
 void MainWindow::updateClassBrowserForEditor(Editor *editor)
 {
-    if (!editor) {
+    if (mQuitting) {
         mClassBrowserModel.setParser(nullptr);
         mClassBrowserModel.setCurrentFile("");
         return;
     }
-    if (mQuitting)
-        return;
-//    if not devCodeCompletion.Enabled then
-//      Exit;
-    if ((mClassBrowserModel.currentFile() == editor->filename())
-         && (mClassBrowserModel.parser() == editor->parser()))
-            return;
 
-    mClassBrowserModel.beginUpdate();
-    {
-        auto action = finally([this] {
-            mClassBrowserModel.endUpdate();
-        });
+    if (editor) {
+        if ((mClassBrowserModel.currentFile() == editor->filename())
+             && (mClassBrowserModel.parser() == editor->parser()))
+                return;
+
+        if (mClassBrowserModel.parser() == editor->parser() && mClassBrowserModel.classBrowserType()==ProjectClassBrowserType::WholeProject) {
+            mClassBrowserModel.setCurrentFile(editor->filename());
+            return;
+        }
+
+        mClassBrowserModel.beginUpdate();
         mClassBrowserModel.setParser(editor->parser());
-//              if e.InProject then begin
-//                ClassBrowser.StatementsType := devClassBrowsing.StatementsType;
-//              end else
-//                ClassBrowser.StatementsType := cbstFile;
+        if (editor->inProject()) {
+            mClassBrowserModel.setClassBrowserType(mProject->options().classBrowserType);
+            mClassBrowserModel.setCurrentFiles(mProject->unitFiles());
+        } else
+            mClassBrowserModel.setClassBrowserType(ProjectClassBrowserType::CurrentFile);
         mClassBrowserModel.setCurrentFile(editor->filename());
+        mClassBrowserModel.endUpdate();
+    } else if (mProject) {
+        if (mClassBrowserModel.parser() == mProject->cppParser()) {
+            mClassBrowserModel.setCurrentFile("");
+            return;
+        }
+
+        mClassBrowserModel.beginUpdate();
+        mClassBrowserModel.setParser(mProject->cppParser());
+        mClassBrowserModel.setClassBrowserType(mProject->options().classBrowserType);
+        mClassBrowserModel.setCurrentFiles(mProject->unitFiles());
+        mClassBrowserModel.setCurrentFile("");
+        mClassBrowserModel.endUpdate();
+    } else {
+        mClassBrowserModel.setParser(nullptr);
+        mClassBrowserModel.setCurrentFile("");
+        return;
     }
 }
 
@@ -2757,6 +2774,14 @@ void MainWindow::buildContextMenus()
     mClassBrowser_goto_definition = createActionFor(
                 tr("Goto definition"),
                 ui->tabStructure);
+    mClassBrowser_Show_CurrentFile = createActionFor(
+                tr("In current file"),
+                ui->tabStructure);
+    mClassBrowser_Show_CurrentFile->setCheckable(true);
+    mClassBrowser_Show_WholeProject = createActionFor(
+                tr("In current project"),
+                ui->tabStructure);
+    mClassBrowser_Show_WholeProject->setCheckable(true);
 
     mClassBrowser_Sort_By_Name->setChecked(pSettings->ui().classBrowserSortAlpha());
     mClassBrowser_Sort_By_Type->setChecked(pSettings->ui().classBrowserSortType());
@@ -2774,6 +2799,12 @@ void MainWindow::buildContextMenus()
     connect(mClassBrowser_goto_declaration,&QAction::triggered,
             this, &MainWindow::onClassBrowserGotoDeclaration);
 
+    connect(mClassBrowser_Show_CurrentFile,&QAction::triggered,
+            this, &MainWindow::onClassBrowserChangeScope);
+
+    connect(mClassBrowser_Show_WholeProject,&QAction::triggered,
+            this, &MainWindow::onClassBrowserChangeScope);
+
     //toolbar for class browser
     mClassBrowserToolbar = new QWidget();
     {
@@ -3272,6 +3303,16 @@ void MainWindow::onClassBrowserContextMenu(const QPoint &pos)
     menu.addAction(mClassBrowser_Sort_By_Name);
     menu.addAction(mClassBrowser_Sort_By_Type);
     menu.addAction(mClassBrowser_Show_Inherited);
+    Editor * editor = mEditorList->getEditor();
+    if (editor) {
+        menu.addSeparator();
+        menu.addAction(mClassBrowser_Show_CurrentFile);
+        menu.addAction(mClassBrowser_Show_WholeProject);
+        if (mProject) {
+            mClassBrowser_Show_CurrentFile->setChecked(mProject->options().classBrowserType==ProjectClassBrowserType::CurrentFile);
+            mClassBrowser_Show_WholeProject->setChecked(mProject->options().classBrowserType==ProjectClassBrowserType::WholeProject);
+        }
+    }
 
     menu.exec(ui->projectView->mapToGlobal(pos));
 }
@@ -4000,7 +4041,24 @@ void MainWindow::onFilesViewOpen()
 
 void MainWindow::onClassBrowserGotoDeclaration()
 {
-    on_classBrowser_doubleClicked(ui->classBrowser->currentIndex());
+    QModelIndex index = ui->classBrowser->currentIndex();
+    if (!index.isValid())
+        return ;
+    ClassBrowserNode * node = static_cast<ClassBrowserNode*>(index.internalPointer());
+    if (!node)
+        return ;
+    PStatement statement = node->statement;
+    if (!statement) {
+        return;
+    }
+    QString filename;
+    int line;
+    filename = statement->fileName;
+    line = statement->line;
+    Editor* e=openFile(filename);
+    if (e) {
+        e->setCaretPositionAndActivate(line,1);
+    }
 }
 
 void MainWindow::onClassBrowserGotoDefinition()
@@ -4046,6 +4104,25 @@ void MainWindow::onClassBrowserSortByName()
     mClassBrowserModel.fillStatements();
 }
 
+void MainWindow::onClassBrowserChangeScope()
+{
+    if (!mProject)
+        return;
+    ProjectClassBrowserType classBrowserType;
+    if (mProject->options().classBrowserType==ProjectClassBrowserType::CurrentFile) {
+        classBrowserType=ProjectClassBrowserType::WholeProject;
+    } else {
+        classBrowserType=ProjectClassBrowserType::CurrentFile;
+    }
+    mProject->options().classBrowserType=classBrowserType;
+    mProject->saveOptions();
+    Editor* editor = mEditorList->getEditor();
+    if (editor && editor->inProject() &&
+            mClassBrowserModel.classBrowserType()!=classBrowserType) {
+        mClassBrowserModel.setClassBrowserType(classBrowserType);
+    }
+}
+
 void MainWindow::onProjectSwitchCustomViewMode()
 {
     mProject->setModelType(ProjectModelType::Custom);
@@ -6256,8 +6333,27 @@ void MainWindow::on_classBrowser_doubleClicked(const QModelIndex &index)
     }
     QString filename;
     int line;
-    filename = statement->fileName;
-    line = statement->line;
+    Editor* currentEditor = mEditorList->getEditor();
+    if (currentEditor) {
+        if (statement->fileName == currentEditor->filename()
+                && statement->definitionFileName!=currentEditor->filename()) {
+            filename = statement->definitionFileName;
+            line = statement->definitionLine;
+        } else if (statement->fileName != currentEditor->filename()
+                && statement->definitionFileName==currentEditor->filename()) {
+            filename = statement->fileName;
+            line = statement->line;
+        } else if (currentEditor->caretY()==statement->line) {
+            filename = statement->definitionFileName;
+            line = statement->definitionLine;
+        } else {
+            filename = statement->fileName;
+            line = statement->line;
+        }
+    } else {
+        filename = statement->fileName;
+        line = statement->line;
+    }
     Editor* e = openFile(filename);
     if (e) {
         e->setCaretPositionAndActivate(line,1);
diff --git a/RedPandaIDE/mainwindow.h b/RedPandaIDE/mainwindow.h
index 1e0fc487..1eb109a7 100644
--- a/RedPandaIDE/mainwindow.h
+++ b/RedPandaIDE/mainwindow.h
@@ -347,6 +347,8 @@ private slots:
     void onClassBrowserShowInherited();
     void onClassBrowserSortByType();
     void onClassBrowserSortByName();
+    void onClassBrowserChangeScope();
+
     void onProjectSwitchCustomViewMode();
     void onProjectSwitchFileSystemViewMode();
     void onProjectRemoveFolder();
@@ -814,6 +816,8 @@ private:
     QAction * mClassBrowser_Show_Inherited;
     QAction * mClassBrowser_goto_declaration;
     QAction * mClassBrowser_goto_definition;
+    QAction * mClassBrowser_Show_CurrentFile;
+    QAction * mClassBrowser_Show_WholeProject;
     QWidget * mClassBrowserToolbar;
 
     //actions for files view
diff --git a/RedPandaIDE/parser/cppparser.cpp b/RedPandaIDE/parser/cppparser.cpp
index db272acf..307d323b 100644
--- a/RedPandaIDE/parser/cppparser.cpp
+++ b/RedPandaIDE/parser/cppparser.cpp
@@ -2593,7 +2593,8 @@ void CppParser::handlePreprocessor()
         if (delimPos>=0) {
             mCurrentFile = s.mid(0,delimPos).trimmed();
             mIsSystemHeader = isSystemHeaderFile(mCurrentFile) || isProjectHeaderFile(mCurrentFile);
-            mIsProjectFile = mProjectFiles.contains(mCurrentFile);             mIsHeader = isHFile(mCurrentFile);
+            mIsProjectFile = mProjectFiles.contains(mCurrentFile);
+            mIsHeader = isHFile(mCurrentFile);
 
             // Mention progress to user if we enter a NEW file
             bool ok;
diff --git a/RedPandaIDE/parser/parserutils.h b/RedPandaIDE/parser/parserutils.h
index 0f711e73..21d8dea6 100644
--- a/RedPandaIDE/parser/parserutils.h
+++ b/RedPandaIDE/parser/parserutils.h
@@ -69,25 +69,25 @@ enum class SkipType {
 
 enum StatementKind  {
   skUnknown,
+  skNamespace,
+  skNamespaceAlias,
+  skClass,
   skPreprocessor,
   skEnumType,
   skEnumClassType,
-  skEnum,
   skTypedef,
-  skClass,
   skFunction,
+  skVariable,
+  skGlobalVariable,
+  skLocalVariable,
+  skEnum,
   skOperator,
   skConstructor,
   skDestructor,
-  skVariable,
   skParameter,
-  skNamespace,
-  skNamespaceAlias,
   skBlock,
   skUserCodeSnippet,  // user code template
   skKeyword, // keywords
-  skGlobalVariable,
-  skLocalVariable,
   skAlias
 };
 
diff --git a/RedPandaIDE/project.cpp b/RedPandaIDE/project.cpp
index 54f50712..472d22c8 100644
--- a/RedPandaIDE/project.cpp
+++ b/RedPandaIDE/project.cpp
@@ -1027,6 +1027,7 @@ bool Project::saveAsTemplate(const QString &templateFolder,
         ini->SetValue("Project","Encoding",mOptions.encoding.toUtf8());
     if (mOptions.modelType!=ProjectModelType::FileSystem)
         ini->SetLongValue("Project", "ModelType", (int)mOptions.modelType);
+    ini->SetLongValue("Project","ClassBrowserType", (int)mOptions.classBrowserType);
 
     int i=0;
     foreach (const PProjectUnit &unit, mUnits) {
@@ -1118,6 +1119,7 @@ void Project::saveOptions()
     ini.SetValue("Project","ExecEncoding", mOptions.execEncoding);
     ini.SetValue("Project","Encoding",toByteArray(mOptions.encoding));
     ini.SetLongValue("Project","ModelType", (int)mOptions.modelType);
+    ini.SetLongValue("Project","ClassBrowserType", (int)mOptions.classBrowserType);
     //for Red Panda Dev C++ 6 compatibility
     ini.SetLongValue("Project","UseUTF8",mOptions.encoding == ENCODING_UTF8);
 
@@ -1947,6 +1949,7 @@ void Project::loadOptions(SimpleIni& ini)
         mOptions.supportXPThemes = ini.GetBoolValue("Project", "SupportXPThemes", false);
         mOptions.compilerSet = ini.GetLongValue("Project", "CompilerSet", pSettings->compilerSets().defaultIndex());
         mOptions.modelType = (ProjectModelType)ini.GetLongValue("Project", "ModelType", (int)ProjectModelType::Custom);
+        mOptions.classBrowserType = (ProjectClassBrowserType)ini.GetLongValue("Project", "ClassBrowserType", (int)ProjectClassBrowserType::CurrentFile);
 
         if (mOptions.compilerSet >= (int)pSettings->compilerSets().size()
                 || mOptions.compilerSet < 0) { // TODO: change from indices to names
diff --git a/RedPandaIDE/projectoptions.cpp b/RedPandaIDE/projectoptions.cpp
index fe38aceb..d286bb99 100644
--- a/RedPandaIDE/projectoptions.cpp
+++ b/RedPandaIDE/projectoptions.cpp
@@ -54,5 +54,6 @@ ProjectOptions::ProjectOptions()
     staticLink = true;
     addCharset = true;
     modelType = ProjectModelType::FileSystem;
+    classBrowserType = ProjectClassBrowserType::CurrentFile;
     execEncoding = ENCODING_SYSTEM_DEFAULT;
 }
diff --git a/RedPandaIDE/projectoptions.h b/RedPandaIDE/projectoptions.h
index 28848b91..864f5e13 100644
--- a/RedPandaIDE/projectoptions.h
+++ b/RedPandaIDE/projectoptions.h
@@ -25,6 +25,11 @@ enum class ProjectModelType {
     Custom
 };
 
+enum class ProjectClassBrowserType {
+    CurrentFile,
+    WholeProject
+};
+
 enum class ProjectType {
     GUI=0,
     Console=1,
@@ -92,5 +97,6 @@ struct ProjectOptions{
     QByteArray execEncoding;
     QString encoding;
     ProjectModelType modelType;
+    ProjectClassBrowserType classBrowserType;
 };
 #endif // PROJECTOPTIONS_H
diff --git a/RedPandaIDE/projecttemplate.cpp b/RedPandaIDE/projecttemplate.cpp
index 74012232..f9408cde 100644
--- a/RedPandaIDE/projecttemplate.cpp
+++ b/RedPandaIDE/projecttemplate.cpp
@@ -161,6 +161,7 @@ void ProjectTemplate::readTemplateFile(const QString &fileName)
         mOptions.encoding = fromByteArray(mIni->GetValue("Project","Encoding", ENCODING_AUTO_DETECT));
     }
     mOptions.modelType = (ProjectModelType)mIni->GetLongValue("Project", "ModelType", (int)ProjectModelType::FileSystem);
+    mOptions.classBrowserType = (ProjectClassBrowserType)mIni->GetLongValue("Project", "ClassBrowserType", (int)ProjectClassBrowserType::CurrentFile);
 
 }
 
diff --git a/RedPandaIDE/translations/RedPandaIDE_pt_BR.ts b/RedPandaIDE/translations/RedPandaIDE_pt_BR.ts
index f94567d9..58329a9a 100644
--- a/RedPandaIDE/translations/RedPandaIDE_pt_BR.ts
+++ b/RedPandaIDE/translations/RedPandaIDE_pt_BR.ts
@@ -4676,6 +4676,14 @@
         <source>Can&apos;t open last open information file &apos;%1&apos; for write!</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>In current file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>In current project</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>NewClassDialog</name>
@@ -4933,11 +4941,11 @@
     </message>
     <message>
         <source>Can&apos;t save file</source>
-        <translation>Impossível salvar arquivo</translation>
+        <translation type="vanished">Impossível salvar arquivo</translation>
     </message>
     <message>
         <source>Can&apos;t save file &apos;%1&apos;</source>
-        <translation>Impossível salvar arquivo &apos;%1&apos;</translation>
+        <translation type="vanished">Impossível salvar arquivo &apos;%1&apos;</translation>
     </message>
     <message>
         <source>Error Load File</source>
diff --git a/RedPandaIDE/translations/RedPandaIDE_zh_CN.ts b/RedPandaIDE/translations/RedPandaIDE_zh_CN.ts
index a2de02a4..dcbe77b4 100644
--- a/RedPandaIDE/translations/RedPandaIDE_zh_CN.ts
+++ b/RedPandaIDE/translations/RedPandaIDE_zh_CN.ts
@@ -188,17 +188,17 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>BacktraceModel</name>
     <message>
-        <location filename="../debugger.cpp" line="2000"/>
+        <location filename="../debugger.cpp" line="2007"/>
         <source>Function</source>
         <translation>函数</translation>
     </message>
     <message>
-        <location filename="../debugger.cpp" line="2002"/>
+        <location filename="../debugger.cpp" line="2009"/>
         <source>Filename</source>
         <translation>文件名</translation>
     </message>
     <message>
-        <location filename="../debugger.cpp" line="2004"/>
+        <location filename="../debugger.cpp" line="2011"/>
         <source>Line</source>
         <translation>行</translation>
     </message>
@@ -206,37 +206,37 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>BookmarkModel</name>
     <message>
-        <location filename="../widgets/bookmarkmodel.cpp" line="273"/>
+        <location filename="../widgets/bookmarkmodel.cpp" line="267"/>
         <source>Save file &apos;%1&apos; failed.</source>
         <translation>保存文件&apos;%1&apos;失败。</translation>
     </message>
     <message>
-        <location filename="../widgets/bookmarkmodel.cpp" line="277"/>
+        <location filename="../widgets/bookmarkmodel.cpp" line="271"/>
         <source>Can&apos;t open file &apos;%1&apos; for write.</source>
         <translation>无法写入文件&apos;%1&apos;.</translation>
     </message>
     <message>
-        <location filename="../widgets/bookmarkmodel.cpp" line="295"/>
+        <location filename="../widgets/bookmarkmodel.cpp" line="289"/>
         <source>Error in json file &apos;%1&apos;:%2 : %3</source>
         <translation>JSON文件&apos;%1&apos;:%2中存在错误：%3</translation>
     </message>
     <message>
-        <location filename="../widgets/bookmarkmodel.cpp" line="321"/>
+        <location filename="../widgets/bookmarkmodel.cpp" line="315"/>
         <source>Can&apos;t open file &apos;%1&apos; for read.</source>
         <translation>无法读取文件&apos;%1&apos;.</translation>
     </message>
     <message>
-        <location filename="../widgets/bookmarkmodel.cpp" line="527"/>
+        <location filename="../widgets/bookmarkmodel.cpp" line="521"/>
         <source>Description</source>
         <translation>描述</translation>
     </message>
     <message>
-        <location filename="../widgets/bookmarkmodel.cpp" line="529"/>
+        <location filename="../widgets/bookmarkmodel.cpp" line="523"/>
         <source>Line</source>
         <translation>行</translation>
     </message>
     <message>
-        <location filename="../widgets/bookmarkmodel.cpp" line="531"/>
+        <location filename="../widgets/bookmarkmodel.cpp" line="525"/>
         <source>Filename</source>
         <translation>文件名</translation>
     </message>
@@ -244,17 +244,17 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>BreakpointModel</name>
     <message>
-        <location filename="../debugger.cpp" line="1791"/>
+        <location filename="../debugger.cpp" line="1798"/>
         <source>Filename</source>
         <translation>文件名</translation>
     </message>
     <message>
-        <location filename="../debugger.cpp" line="1793"/>
+        <location filename="../debugger.cpp" line="1800"/>
         <source>Line</source>
         <translation>行</translation>
     </message>
     <message>
-        <location filename="../debugger.cpp" line="1795"/>
+        <location filename="../debugger.cpp" line="1802"/>
         <source>Condition</source>
         <translation>条件</translation>
     </message>
@@ -563,27 +563,27 @@ p, li { white-space: pre-wrap; }
         <translation>- 编译时间: %1 秒</translation>
     </message>
     <message>
-        <location filename="../compiler/compiler.cpp" line="159"/>
+        <location filename="../compiler/compiler.cpp" line="164"/>
         <source>[Error] </source>
         <translation>[错误]</translation>
     </message>
     <message>
-        <location filename="../compiler/compiler.cpp" line="163"/>
+        <location filename="../compiler/compiler.cpp" line="168"/>
         <source>[Warning] </source>
         <translation>[警告]</translation>
     </message>
     <message>
-        <location filename="../compiler/compiler.cpp" line="167"/>
+        <location filename="../compiler/compiler.cpp" line="172"/>
         <source>[Info] </source>
         <translation>[信息]</translation>
     </message>
     <message>
-        <location filename="../compiler/compiler.cpp" line="171"/>
+        <location filename="../compiler/compiler.cpp" line="176"/>
         <source>[Note] </source>
         <translation>[说明]</translation>
     </message>
     <message>
-        <location filename="../compiler/compiler.cpp" line="707"/>
+        <location filename="../compiler/compiler.cpp" line="712"/>
         <source>The compiler process for &apos;%1&apos; failed to start.</source>
         <translation>无法启动编译器进程&apos;%1&apos;。</translation>
     </message>
@@ -592,27 +592,27 @@ p, li { white-space: pre-wrap; }
         <translation type="vanished">无法启动编译进程。</translation>
     </message>
     <message>
-        <location filename="../compiler/compiler.cpp" line="711"/>
+        <location filename="../compiler/compiler.cpp" line="716"/>
         <source>The compiler process crashed after starting successfully.</source>
         <translation>编译进程启动后崩溃。</translation>
     </message>
     <message>
-        <location filename="../compiler/compiler.cpp" line="714"/>
+        <location filename="../compiler/compiler.cpp" line="719"/>
         <source>The last waitFor...() function timed out.</source>
         <translation>waitFor()函数等待超时。</translation>
     </message>
     <message>
-        <location filename="../compiler/compiler.cpp" line="717"/>
+        <location filename="../compiler/compiler.cpp" line="722"/>
         <source>An error occurred when attempting to write to the compiler process.</source>
         <translation>在向编译进程输入内容时出错。</translation>
     </message>
     <message>
-        <location filename="../compiler/compiler.cpp" line="720"/>
+        <location filename="../compiler/compiler.cpp" line="725"/>
         <source>An error occurred when attempting to read from the compiler process.</source>
         <translation>在从编译进程读取内容时出错。</translation>
     </message>
     <message>
-        <location filename="../compiler/compiler.cpp" line="723"/>
+        <location filename="../compiler/compiler.cpp" line="728"/>
         <source>An unknown error occurred.</source>
         <translation>发生了未知错误。</translation>
     </message>
@@ -1253,27 +1253,27 @@ Are you really want to continue?</oldsource>
         <translation>无法在&quot;%1&quot;找到gdb server</translation>
     </message>
     <message>
-        <location filename="../debugger.cpp" line="463"/>
+        <location filename="../debugger.cpp" line="469"/>
         <source>Execute to evaluate</source>
         <translation>执行以求值</translation>
     </message>
     <message>
-        <location filename="../debugger.cpp" line="713"/>
+        <location filename="../debugger.cpp" line="719"/>
         <source>Save file &apos;%1&apos; failed.</source>
         <translation>保存文件&apos;%1&apos;失败。</translation>
     </message>
     <message>
-        <location filename="../debugger.cpp" line="717"/>
+        <location filename="../debugger.cpp" line="723"/>
         <source>Can&apos;t open file &apos;%1&apos; for write.</source>
         <translation>无法写入文件&apos;%1&apos;.</translation>
     </message>
     <message>
-        <location filename="../debugger.cpp" line="740"/>
+        <location filename="../debugger.cpp" line="746"/>
         <source>Error in json file &apos;%1&apos;:%2 : %3</source>
         <translation>JSON文件&apos;%1&apos;:%2中存在错误：%3</translation>
     </message>
     <message>
-        <location filename="../debugger.cpp" line="759"/>
+        <location filename="../debugger.cpp" line="765"/>
         <source>Can&apos;t open file &apos;%1&apos; for read.</source>
         <translation>无法读取文件&apos;%1&apos;.</translation>
     </message>
@@ -1282,22 +1282,22 @@ Are you really want to continue?</oldsource>
         <translation type="vanished">不在当前语境中</translation>
     </message>
     <message>
-        <location filename="../debugger.cpp" line="779"/>
+        <location filename="../debugger.cpp" line="785"/>
         <source>Compile</source>
         <translation>编译</translation>
     </message>
     <message>
-        <location filename="../debugger.cpp" line="780"/>
+        <location filename="../debugger.cpp" line="786"/>
         <source>Source file is more recent than executable.</source>
         <translation>源文件比程序文件新。</translation>
     </message>
     <message>
-        <location filename="../debugger.cpp" line="780"/>
+        <location filename="../debugger.cpp" line="786"/>
         <source>Recompile?</source>
         <translation>重新编译？</translation>
     </message>
     <message>
-        <location filename="../debugger.cpp" line="825"/>
+        <location filename="../debugger.cpp" line="831"/>
         <source>Signal &quot;%1&quot; Received: </source>
         <translation>收到信号&quot;%1&quot;:</translation>
     </message>
@@ -1305,7 +1305,7 @@ Are you really want to continue?</oldsource>
 <context>
     <name>Editor</name>
     <message>
-        <location filename="../editor.cpp" line="103"/>
+        <location filename="../editor.cpp" line="105"/>
         <source>untitled</source>
         <translation>无标题</translation>
     </message>
@@ -1318,13 +1318,13 @@ Are you really want to continue?</oldsource>
         <translation type="vanished">失败</translation>
     </message>
     <message>
-        <location filename="../editor.cpp" line="273"/>
-        <location filename="../editor.cpp" line="334"/>
-        <location filename="../editor.cpp" line="358"/>
-        <location filename="../editor.cpp" line="1332"/>
-        <location filename="../editor.cpp" line="1337"/>
-        <location filename="../editor.cpp" line="1357"/>
-        <location filename="../editor.cpp" line="1362"/>
+        <location filename="../editor.cpp" line="268"/>
+        <location filename="../editor.cpp" line="328"/>
+        <location filename="../editor.cpp" line="352"/>
+        <location filename="../editor.cpp" line="1338"/>
+        <location filename="../editor.cpp" line="1343"/>
+        <location filename="../editor.cpp" line="1363"/>
+        <location filename="../editor.cpp" line="1368"/>
         <source>Error</source>
         <translation>错误</translation>
     </message>
@@ -1333,44 +1333,44 @@ Are you really want to continue?</oldsource>
         <translation type="vanished">无法写入文件&quot;%1&quot;</translation>
     </message>
     <message>
-        <location filename="../editor.cpp" line="303"/>
+        <location filename="../editor.cpp" line="297"/>
         <source>Save As</source>
         <translation>另存为</translation>
     </message>
     <message>
-        <location filename="../editor.cpp" line="335"/>
+        <location filename="../editor.cpp" line="329"/>
         <source>File %1 already openned!</source>
         <translation>文件%1已经被打开！</translation>
     </message>
     <message>
-        <location filename="../editor.cpp" line="1333"/>
+        <location filename="../editor.cpp" line="1339"/>
         <source>The text to be copied exceeds count limit!</source>
         <translation>要复制的内容超过了行数限制！</translation>
     </message>
     <message>
-        <location filename="../editor.cpp" line="1338"/>
+        <location filename="../editor.cpp" line="1344"/>
         <source>The text to be copied exceeds character limit!</source>
         <translation>要复制的内容超过了字符数限制！</translation>
     </message>
     <message>
-        <location filename="../editor.cpp" line="1358"/>
+        <location filename="../editor.cpp" line="1364"/>
         <source>The text to be cut exceeds count limit!</source>
         <translation>要剪切的内容超过了行数限制！</translation>
     </message>
     <message>
-        <location filename="../editor.cpp" line="1363"/>
+        <location filename="../editor.cpp" line="1369"/>
         <source>The text to be cut exceeds character limit!</source>
         <translation>要剪切的内容超过了字符数限制！</translation>
     </message>
     <message>
-        <location filename="../editor.cpp" line="2819"/>
+        <location filename="../editor.cpp" line="2827"/>
         <source>Print Document</source>
         <translation>打印文档</translation>
     </message>
     <message>
-        <location filename="../editor.cpp" line="3445"/>
-        <location filename="../editor.cpp" line="3490"/>
-        <location filename="../editor.cpp" line="3535"/>
+        <location filename="../editor.cpp" line="3453"/>
+        <location filename="../editor.cpp" line="3498"/>
+        <location filename="../editor.cpp" line="3543"/>
         <source>Ctrl+click for more info</source>
         <translation>Ctrl+单击以获取更多信息</translation>
     </message>
@@ -1379,27 +1379,27 @@ Are you really want to continue?</oldsource>
         <translation type="vanished">未找到符号&apos;%1&apos;!</translation>
     </message>
     <message>
-        <location filename="../editor.cpp" line="4297"/>
+        <location filename="../editor.cpp" line="4305"/>
         <source>astyle not found</source>
         <translation>找不到astyle程序</translation>
     </message>
     <message>
-        <location filename="../editor.cpp" line="4298"/>
+        <location filename="../editor.cpp" line="4306"/>
         <source>Can&apos;t find astyle in &quot;%1&quot;.</source>
         <translation>找不到astyle程序&quot;%1&quot;.</translation>
     </message>
     <message>
-        <location filename="../editor.cpp" line="4452"/>
+        <location filename="../editor.cpp" line="4459"/>
         <source>Break point condition</source>
         <translation>断点条件</translation>
     </message>
     <message>
-        <location filename="../editor.cpp" line="4453"/>
+        <location filename="../editor.cpp" line="4460"/>
         <source>Enter the condition of the breakpoint:</source>
         <translation>输入当前断点的生效条件:</translation>
     </message>
     <message>
-        <location filename="../editor.cpp" line="4671"/>
+        <location filename="../editor.cpp" line="4678"/>
         <source>Readonly</source>
         <translation>只读</translation>
     </message>
@@ -3894,18 +3894,18 @@ Are you really want to continue?</oldsource>
     <name>MainWindow</name>
     <message>
         <location filename="../mainwindow.ui" line="14"/>
-        <location filename="../mainwindow.cpp" line="940"/>
+        <location filename="../mainwindow.cpp" line="948"/>
         <source>Red Panda C++</source>
         <translation>小熊猫C++</translation>
     </message>
     <message>
         <location filename="../mainwindow.ui" line="913"/>
         <location filename="../mainwindow.ui" line="2927"/>
-        <location filename="../mainwindow.cpp" line="4890"/>
-        <location filename="../mainwindow.cpp" line="4893"/>
-        <location filename="../mainwindow.cpp" line="4897"/>
-        <location filename="../mainwindow.cpp" line="4900"/>
-        <location filename="../mainwindow.cpp" line="6845"/>
+        <location filename="../mainwindow.cpp" line="4974"/>
+        <location filename="../mainwindow.cpp" line="4977"/>
+        <location filename="../mainwindow.cpp" line="4981"/>
+        <location filename="../mainwindow.cpp" line="4984"/>
+        <location filename="../mainwindow.cpp" line="6947"/>
         <source>Issues</source>
         <translation>编译器</translation>
     </message>
@@ -3979,7 +3979,7 @@ Are you really want to continue?</oldsource>
     </message>
     <message>
         <location filename="../mainwindow.ui" line="1098"/>
-        <location filename="../mainwindow.cpp" line="1435"/>
+        <location filename="../mainwindow.cpp" line="1458"/>
         <source>Debug Console</source>
         <translation>调试主控台</translation>
     </message>
@@ -4113,8 +4113,8 @@ Are you really want to continue?</oldsource>
         <location filename="../mainwindow.ui" line="387"/>
         <location filename="../mainwindow.ui" line="2099"/>
         <location filename="../mainwindow.ui" line="2102"/>
-        <location filename="../mainwindow.cpp" line="2020"/>
-        <location filename="../mainwindow.cpp" line="2032"/>
+        <location filename="../mainwindow.cpp" line="2045"/>
+        <location filename="../mainwindow.cpp" line="2057"/>
         <source>Compile</source>
         <translation>编译</translation>
     </message>
@@ -4192,9 +4192,9 @@ Are you really want to continue?</oldsource>
     </message>
     <message>
         <location filename="../mainwindow.ui" line="2170"/>
-        <location filename="../mainwindow.cpp" line="2581"/>
-        <location filename="../mainwindow.cpp" line="2623"/>
-        <location filename="../mainwindow.cpp" line="2881"/>
+        <location filename="../mainwindow.cpp" line="2606"/>
+        <location filename="../mainwindow.cpp" line="2648"/>
+        <location filename="../mainwindow.cpp" line="2920"/>
         <source>Copy</source>
         <translation>复制</translation>
     </message>
@@ -4205,7 +4205,7 @@ Are you really want to continue?</oldsource>
     </message>
     <message>
         <location filename="../mainwindow.ui" line="2183"/>
-        <location filename="../mainwindow.cpp" line="2587"/>
+        <location filename="../mainwindow.cpp" line="2612"/>
         <source>Paste</source>
         <translation>粘贴</translation>
     </message>
@@ -4216,8 +4216,8 @@ Are you really want to continue?</oldsource>
     </message>
     <message>
         <location filename="../mainwindow.ui" line="2191"/>
-        <location filename="../mainwindow.cpp" line="2593"/>
-        <location filename="../mainwindow.cpp" line="2887"/>
+        <location filename="../mainwindow.cpp" line="2618"/>
+        <location filename="../mainwindow.cpp" line="2926"/>
         <source>Select All</source>
         <translation>选择全部</translation>
     </message>
@@ -4343,7 +4343,7 @@ Are you really want to continue?</oldsource>
     <message>
         <location filename="../mainwindow.ui" line="768"/>
         <location filename="../mainwindow.ui" line="771"/>
-        <location filename="../mainwindow.cpp" line="7221"/>
+        <location filename="../mainwindow.cpp" line="7328"/>
         <source>New Problem Set</source>
         <translation>新建试题集</translation>
     </message>
@@ -4362,14 +4362,14 @@ Are you really want to continue?</oldsource>
     <message>
         <location filename="../mainwindow.ui" line="810"/>
         <location filename="../mainwindow.ui" line="813"/>
-        <location filename="../mainwindow.cpp" line="7263"/>
+        <location filename="../mainwindow.cpp" line="7370"/>
         <source>Save Problem Set</source>
         <translation>保存试题集</translation>
     </message>
     <message>
         <location filename="../mainwindow.ui" line="824"/>
         <location filename="../mainwindow.ui" line="827"/>
-        <location filename="../mainwindow.cpp" line="7296"/>
+        <location filename="../mainwindow.cpp" line="7403"/>
         <source>Load Problem Set</source>
         <translation>载入试题集</translation>
     </message>
@@ -4430,7 +4430,7 @@ Are you really want to continue?</oldsource>
     <message>
         <location filename="../mainwindow.ui" line="1675"/>
         <location filename="../mainwindow.ui" line="1678"/>
-        <location filename="../mainwindow.cpp" line="2517"/>
+        <location filename="../mainwindow.cpp" line="2542"/>
         <source>Run All Cases</source>
         <oldsource>Run Current Case</oldsource>
         <translation>运行所有案例</translation>
@@ -4723,7 +4723,7 @@ Are you really want to continue?</oldsource>
     </message>
     <message>
         <location filename="../mainwindow.ui" line="2593"/>
-        <location filename="../mainwindow.cpp" line="5800"/>
+        <location filename="../mainwindow.cpp" line="5884"/>
         <source>Clear all breakpoints</source>
         <translation>删除所有断点</translation>
     </message>
@@ -4888,7 +4888,7 @@ Are you really want to continue?</oldsource>
         <translation type="vanished">保存为模板...</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="2805"/>
+        <location filename="../mainwindow.cpp" line="2844"/>
         <source>New File</source>
         <translation>新建文件</translation>
     </message>
@@ -4929,7 +4929,7 @@ Are you really want to continue?</oldsource>
     </message>
     <message>
         <location filename="../mainwindow.ui" line="2756"/>
-        <location filename="../mainwindow.cpp" line="6788"/>
+        <location filename="../mainwindow.cpp" line="6890"/>
         <source>Rename Symbol</source>
         <translation>重命名符号</translation>
     </message>
@@ -4950,13 +4950,13 @@ Are you really want to continue?</oldsource>
     </message>
     <message>
         <location filename="../mainwindow.ui" line="2776"/>
-        <location filename="../mainwindow.cpp" line="6998"/>
+        <location filename="../mainwindow.cpp" line="7100"/>
         <source>Export As RTF</source>
         <translation>导出为RTF</translation>
     </message>
     <message>
         <location filename="../mainwindow.ui" line="2781"/>
-        <location filename="../mainwindow.cpp" line="7020"/>
+        <location filename="../mainwindow.cpp" line="7122"/>
         <source>Export As HTML</source>
         <translation>导出为HTML</translation>
     </message>
@@ -5225,7 +5225,7 @@ Are you really want to continue?</oldsource>
         <translation>运行参数...</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="2930"/>
+        <location filename="../mainwindow.cpp" line="2969"/>
         <source>File Encoding</source>
         <translation>文件编码</translation>
     </message>
@@ -5235,32 +5235,32 @@ Are you really want to continue?</oldsource>
         <translation>文件历史</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="951"/>
-        <location filename="../mainwindow.cpp" line="953"/>
-        <location filename="../mainwindow.cpp" line="983"/>
-        <location filename="../mainwindow.cpp" line="985"/>
-        <location filename="../mainwindow.cpp" line="1012"/>
-        <location filename="../mainwindow.cpp" line="1014"/>
+        <location filename="../mainwindow.cpp" line="959"/>
+        <location filename="../mainwindow.cpp" line="961"/>
+        <location filename="../mainwindow.cpp" line="991"/>
+        <location filename="../mainwindow.cpp" line="993"/>
+        <location filename="../mainwindow.cpp" line="1020"/>
+        <location filename="../mainwindow.cpp" line="1022"/>
         <source>Debugging</source>
         <translation>正在调试</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="956"/>
-        <location filename="../mainwindow.cpp" line="958"/>
-        <location filename="../mainwindow.cpp" line="989"/>
-        <location filename="../mainwindow.cpp" line="991"/>
-        <location filename="../mainwindow.cpp" line="1017"/>
-        <location filename="../mainwindow.cpp" line="1019"/>
+        <location filename="../mainwindow.cpp" line="964"/>
+        <location filename="../mainwindow.cpp" line="966"/>
+        <location filename="../mainwindow.cpp" line="997"/>
+        <location filename="../mainwindow.cpp" line="999"/>
+        <location filename="../mainwindow.cpp" line="1025"/>
+        <location filename="../mainwindow.cpp" line="1027"/>
         <source>Running</source>
         <translation>正在运行</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="961"/>
-        <location filename="../mainwindow.cpp" line="963"/>
-        <location filename="../mainwindow.cpp" line="995"/>
-        <location filename="../mainwindow.cpp" line="997"/>
-        <location filename="../mainwindow.cpp" line="1022"/>
-        <location filename="../mainwindow.cpp" line="1024"/>
+        <location filename="../mainwindow.cpp" line="969"/>
+        <location filename="../mainwindow.cpp" line="971"/>
+        <location filename="../mainwindow.cpp" line="1003"/>
+        <location filename="../mainwindow.cpp" line="1005"/>
+        <location filename="../mainwindow.cpp" line="1030"/>
+        <location filename="../mainwindow.cpp" line="1032"/>
         <source>Compiling</source>
         <translation>正在编译</translation>
     </message>
@@ -5269,23 +5269,23 @@ Are you really want to continue?</oldsource>
         <translation type="vanished">行:%1    列:%2    已选择:%3    总行数:%4    总长度:%5</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1173"/>
+        <location filename="../mainwindow.cpp" line="1187"/>
         <source>Line:%1 Col:%2 Selected:%3 Lines:%4 Length:%5</source>
         <oldsource>Line: %1 Col: %2 Selected: %3 Lines: %4 Length: %5</oldsource>
         <translation>行: %1 列: %2 已选择 :%3 总行数: %4 总长度: %5</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1191"/>
+        <location filename="../mainwindow.cpp" line="1205"/>
         <source>Read Only</source>
         <translation>只读</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1193"/>
+        <location filename="../mainwindow.cpp" line="1207"/>
         <source>Insert</source>
         <translation>插入</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1195"/>
+        <location filename="../mainwindow.cpp" line="1209"/>
         <source>Overwrite</source>
         <translation>覆写</translation>
     </message>
@@ -5298,133 +5298,133 @@ Are you really want to continue?</oldsource>
         <translation type="vanished">你确定要关闭&apos;%1&apos;吗？</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1730"/>
-        <location filename="../mainwindow.cpp" line="1745"/>
+        <location filename="../mainwindow.cpp" line="1755"/>
+        <location filename="../mainwindow.cpp" line="1770"/>
         <source>Confirm</source>
         <translation>确认</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1731"/>
-        <location filename="../mainwindow.cpp" line="1739"/>
-        <location filename="../mainwindow.cpp" line="2021"/>
+        <location filename="../mainwindow.cpp" line="1756"/>
+        <location filename="../mainwindow.cpp" line="1764"/>
+        <location filename="../mainwindow.cpp" line="2046"/>
         <source>Source file is not compiled.</source>
         <translation>源文件尚未编译。</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1732"/>
-        <location filename="../mainwindow.cpp" line="2021"/>
+        <location filename="../mainwindow.cpp" line="1757"/>
+        <location filename="../mainwindow.cpp" line="2046"/>
         <source>Compile now?</source>
         <translation>现在编译？</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1746"/>
-        <location filename="../mainwindow.cpp" line="2033"/>
+        <location filename="../mainwindow.cpp" line="1771"/>
+        <location filename="../mainwindow.cpp" line="2058"/>
         <source>Source file is more recent than executable.</source>
         <translation>源文件比可执行程序新。</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1747"/>
+        <location filename="../mainwindow.cpp" line="1772"/>
         <source>Recompile now?</source>
         <translation>重新编译？</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1837"/>
-        <location filename="../mainwindow.cpp" line="2011"/>
-        <location filename="../mainwindow.cpp" line="4934"/>
-        <location filename="../mainwindow.cpp" line="4941"/>
+        <location filename="../mainwindow.cpp" line="1862"/>
+        <location filename="../mainwindow.cpp" line="2036"/>
+        <location filename="../mainwindow.cpp" line="5018"/>
+        <location filename="../mainwindow.cpp" line="5025"/>
         <source>Wrong Compiler Settings</source>
         <translation>错误的编译器设置</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1838"/>
-        <location filename="../mainwindow.cpp" line="2012"/>
-        <location filename="../mainwindow.cpp" line="4935"/>
-        <location filename="../mainwindow.cpp" line="4942"/>
+        <location filename="../mainwindow.cpp" line="1863"/>
+        <location filename="../mainwindow.cpp" line="2037"/>
+        <location filename="../mainwindow.cpp" line="5019"/>
+        <location filename="../mainwindow.cpp" line="5026"/>
         <source>Compiler is set not to generate executable.</source>
         <translation>编译器被设置为不生成可执行文件。</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1839"/>
-        <location filename="../mainwindow.cpp" line="4936"/>
+        <location filename="../mainwindow.cpp" line="1864"/>
+        <location filename="../mainwindow.cpp" line="5020"/>
         <source>We need the executabe to run problem case.</source>
         <translation>我们需要可执行文件来运行试题案例。</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1854"/>
+        <location filename="../mainwindow.cpp" line="1879"/>
         <source>No compiler set</source>
         <translation>无编译器设置</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1855"/>
+        <location filename="../mainwindow.cpp" line="1880"/>
         <source>No compiler set is configured.</source>
         <translation>没有配置编译器设置。</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1855"/>
+        <location filename="../mainwindow.cpp" line="1880"/>
         <source>Can&apos;t start debugging.</source>
         <translation>无法启动调试器</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1872"/>
-        <location filename="../mainwindow.cpp" line="1972"/>
+        <location filename="../mainwindow.cpp" line="1897"/>
+        <location filename="../mainwindow.cpp" line="1997"/>
         <source>Enable debugging</source>
         <translation>启用调试参数</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1873"/>
-        <location filename="../mainwindow.cpp" line="1973"/>
+        <location filename="../mainwindow.cpp" line="1898"/>
+        <location filename="../mainwindow.cpp" line="1998"/>
         <source>You have not enabled debugging info (-g3) and/or stripped it from the executable (-s) in Compiler Options.&lt;BR /&gt;&lt;BR /&gt;Do you want to correct this now?</source>
         <translation>当前编译设置中未启用调试选项(-g3)，或启用了信息剥除选项(-s)&lt;br /&gt;&lt;br/&gt;是否纠正这一问题？</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1895"/>
+        <location filename="../mainwindow.cpp" line="1920"/>
         <source>Project not built</source>
         <translation>项目尚未构建</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1896"/>
+        <location filename="../mainwindow.cpp" line="1921"/>
         <source>Project hasn&apos;t been built. Build it now?</source>
         <translation>项目尚未构建。是否构建？</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1926"/>
+        <location filename="../mainwindow.cpp" line="1951"/>
         <source>Host applcation missing</source>
         <translation>宿主程序不存在</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1927"/>
+        <location filename="../mainwindow.cpp" line="1952"/>
         <source>DLL project needs a host application to run.</source>
         <translation>动态链接库（DLL）需要一个宿主程序来运行。</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1929"/>
+        <location filename="../mainwindow.cpp" line="1954"/>
         <source>But it&apos;s missing.</source>
         <translation>但它不存在。</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1934"/>
+        <location filename="../mainwindow.cpp" line="1959"/>
         <source>Host application not exists</source>
         <translation>宿主程序不存在</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1935"/>
+        <location filename="../mainwindow.cpp" line="1960"/>
         <source>Host application file &apos;%1&apos; doesn&apos;t exist.</source>
         <translation>宿主程序&apos;%1&apos;不存在。</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="2013"/>
-        <location filename="../mainwindow.cpp" line="4943"/>
+        <location filename="../mainwindow.cpp" line="2038"/>
+        <location filename="../mainwindow.cpp" line="5027"/>
         <source>Please correct this before start debugging</source>
         <translation>请在调试前改正设置。</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="2033"/>
+        <location filename="../mainwindow.cpp" line="2058"/>
         <source>Recompile?</source>
         <translation>重新编译？</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="2294"/>
-        <location filename="../mainwindow.cpp" line="2323"/>
+        <location filename="../mainwindow.cpp" line="2319"/>
+        <location filename="../mainwindow.cpp" line="2348"/>
         <source>Save last open info error</source>
         <translation>保存上次打开信息失败</translation>
     </message>
@@ -5433,60 +5433,60 @@ Are you really want to continue?</oldsource>
         <translation type="vanished">无法删除旧上次打开信息文件&apos;%1&apos;</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="2324"/>
+        <location filename="../mainwindow.cpp" line="2349"/>
         <source>Can&apos;t save last open info file &apos;%1&apos;</source>
         <translation>无法保存上次打开信息文件&apos;%1&apos;</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="2340"/>
-        <location filename="../mainwindow.cpp" line="2350"/>
+        <location filename="../mainwindow.cpp" line="2365"/>
+        <location filename="../mainwindow.cpp" line="2375"/>
         <source>Load last open info error</source>
         <translation>载入上次打开信息失败</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="2341"/>
-        <location filename="../mainwindow.cpp" line="2351"/>
+        <location filename="../mainwindow.cpp" line="2366"/>
+        <location filename="../mainwindow.cpp" line="2376"/>
         <source>Can&apos;t load last open info file &apos;%1&apos;</source>
         <translation>无法载入上次打开信息文件&apos;%1&apos;</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="2506"/>
+        <location filename="../mainwindow.cpp" line="2531"/>
         <source>Open Source File</source>
         <translation>打开源代码文件</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="2533"/>
-        <location filename="../mainwindow.cpp" line="3558"/>
+        <location filename="../mainwindow.cpp" line="2558"/>
+        <location filename="../mainwindow.cpp" line="3605"/>
         <source>Batch Set Cases</source>
         <translation>批量设置案例</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="2575"/>
+        <location filename="../mainwindow.cpp" line="2600"/>
         <source>Show detail debug logs</source>
         <translation>显示详细调试器日志</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="2630"/>
+        <location filename="../mainwindow.cpp" line="2655"/>
         <source>Copy all</source>
         <translation>全部复制</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="8310"/>
+        <location filename="../mainwindow.cpp" line="8413"/>
         <source>Go to Line</source>
         <translation>跳转到行</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="8310"/>
+        <location filename="../mainwindow.cpp" line="8413"/>
         <source>Line</source>
         <translation>行</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="8332"/>
+        <location filename="../mainwindow.cpp" line="8435"/>
         <source>Template Exists</source>
         <translation>模板已存在</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="8333"/>
+        <location filename="../mainwindow.cpp" line="8436"/>
         <source>Template %1 already exists. Do you want to overwrite?</source>
         <translation>模板%1已存在。是否覆盖？</translation>
     </message>
@@ -5494,9 +5494,9 @@ Are you really want to continue?</oldsource>
         <location filename="../mainwindow.ui" line="1821"/>
         <location filename="../mainwindow.ui" line="1923"/>
         <location filename="../mainwindow.ui" line="1926"/>
-        <location filename="../mainwindow.cpp" line="2598"/>
-        <location filename="../mainwindow.cpp" line="2637"/>
-        <location filename="../mainwindow.cpp" line="2876"/>
+        <location filename="../mainwindow.cpp" line="2623"/>
+        <location filename="../mainwindow.cpp" line="2662"/>
+        <location filename="../mainwindow.cpp" line="2915"/>
         <source>Clear</source>
         <translation>清除</translation>
     </message>
@@ -5512,7 +5512,7 @@ Are you really want to continue?</oldsource>
     </message>
     <message>
         <location filename="../mainwindow.cpp" line="317"/>
-        <location filename="../mainwindow.cpp" line="7230"/>
+        <location filename="../mainwindow.cpp" line="7337"/>
         <source>Problem Set %1</source>
         <translation>试题集%1</translation>
     </message>
@@ -5533,68 +5533,68 @@ Are you really want to continue?</oldsource>
         <translation type="vanished">或者选择使用其他的网络端口。</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1798"/>
-        <location filename="../mainwindow.cpp" line="1911"/>
+        <location filename="../mainwindow.cpp" line="1823"/>
+        <location filename="../mainwindow.cpp" line="1936"/>
         <source>Rebuild Project</source>
         <translation>重新构建项目</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1799"/>
-        <location filename="../mainwindow.cpp" line="1912"/>
+        <location filename="../mainwindow.cpp" line="1824"/>
+        <location filename="../mainwindow.cpp" line="1937"/>
         <source>Project has been modified, do you want to rebuild it?</source>
         <translation>项目已经被修改过，是否需要重新构建？</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="2217"/>
+        <location filename="../mainwindow.cpp" line="2242"/>
         <source>Auto Save Error</source>
         <translation>自动保存出错</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="2218"/>
+        <location filename="../mainwindow.cpp" line="2243"/>
         <source>Auto save &quot;%1&quot; to &quot;%2&quot; failed:%3</source>
         <translation>自动保存&quot;%1&quot;到&quot;%2&quot;失败：%3</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="2498"/>
+        <location filename="../mainwindow.cpp" line="2523"/>
         <source>Properties...</source>
         <translation>试题属性...</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="3860"/>
+        <location filename="../mainwindow.cpp" line="3904"/>
         <source>Set Problem Set Name</source>
         <translation>设置试题集名称</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="3861"/>
+        <location filename="../mainwindow.cpp" line="3905"/>
         <source>Problem Set Name:</source>
         <translation>试题集名称：</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="2554"/>
+        <location filename="../mainwindow.cpp" line="2579"/>
         <source>Remove</source>
         <translation>删除</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="2560"/>
+        <location filename="../mainwindow.cpp" line="2585"/>
         <source>Remove All Bookmarks</source>
         <translation>删除全部书签</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="2565"/>
+        <location filename="../mainwindow.cpp" line="2590"/>
         <source>Modify Description</source>
         <translation>修改描述</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="3902"/>
-        <location filename="../mainwindow.cpp" line="7079"/>
-        <location filename="../mainwindow.cpp" line="7121"/>
+        <location filename="../mainwindow.cpp" line="3946"/>
+        <location filename="../mainwindow.cpp" line="7186"/>
+        <location filename="../mainwindow.cpp" line="7228"/>
         <source>Bookmark Description</source>
         <translation>书签描述</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="3903"/>
-        <location filename="../mainwindow.cpp" line="7080"/>
-        <location filename="../mainwindow.cpp" line="7122"/>
+        <location filename="../mainwindow.cpp" line="3947"/>
+        <location filename="../mainwindow.cpp" line="7187"/>
+        <location filename="../mainwindow.cpp" line="7229"/>
         <source>Description:</source>
         <translation>描述：</translation>
     </message>
@@ -5603,184 +5603,194 @@ Are you really want to continue?</oldsource>
         <translation type="vanished">在调试主控台中显示调试器输出</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="2647"/>
+        <location filename="../mainwindow.cpp" line="2672"/>
         <source>Remove this search</source>
         <translation>清除这次搜索</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="2652"/>
+        <location filename="../mainwindow.cpp" line="2677"/>
         <source>Clear all searches</source>
         <translation>删除所有搜索</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="2662"/>
+        <location filename="../mainwindow.cpp" line="2687"/>
         <source>Breakpoint condition...</source>
         <translation>断点条件...</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="4157"/>
+        <location filename="../mainwindow.cpp" line="4220"/>
         <source>Break point condition</source>
         <translation>断点条件</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="4158"/>
+        <location filename="../mainwindow.cpp" line="4221"/>
         <source>Enter the condition of the breakpoint:</source>
         <translation>输入当前断点的生效条件:</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="2668"/>
+        <location filename="../mainwindow.cpp" line="2693"/>
         <source>Remove All Breakpoints</source>
         <oldsource>Remove all breakpoints</oldsource>
         <translation>删除所有断点</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="2673"/>
+        <location filename="../mainwindow.cpp" line="2698"/>
         <source>Remove Breakpoint</source>
         <translation>删除当前断点</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="2683"/>
+        <location filename="../mainwindow.cpp" line="2708"/>
         <source>Rename File</source>
         <translation>重命名文件</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="2688"/>
-        <location filename="../mainwindow.cpp" line="4099"/>
+        <location filename="../mainwindow.cpp" line="2713"/>
+        <location filename="../mainwindow.cpp" line="4162"/>
         <source>Add Folder</source>
         <translation>添加文件夹</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="4091"/>
-        <location filename="../mainwindow.cpp" line="4094"/>
+        <location filename="../mainwindow.cpp" line="4154"/>
+        <location filename="../mainwindow.cpp" line="4157"/>
         <source>New folder</source>
         <translation>新文件夹</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="4100"/>
+        <location filename="../mainwindow.cpp" line="4163"/>
         <source>Folder name:</source>
         <translation>文件夹：</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="2694"/>
+        <location filename="../mainwindow.cpp" line="2719"/>
         <source>Rename Folder</source>
         <translation>重命名</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="2295"/>
+        <location filename="../mainwindow.cpp" line="2320"/>
         <source>Can&apos;t open last open information file &apos;%1&apos; for write!</source>
         <translation>无法写入配置文件&apos;%1&apos;。</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="2525"/>
+        <location filename="../mainwindow.cpp" line="2550"/>
         <source>Run Current Case</source>
         <translation>运行当前案例</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="2700"/>
+        <location filename="../mainwindow.cpp" line="2725"/>
         <source>Remove Folder</source>
         <translation>删除文件夹</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="2705"/>
+        <location filename="../mainwindow.cpp" line="2730"/>
         <source>Switch to normal view</source>
         <translation>切换为普通视图</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="2711"/>
+        <location filename="../mainwindow.cpp" line="2736"/>
         <source>Switch to custom view</source>
         <translation>切换为自定义视图</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="2721"/>
+        <location filename="../mainwindow.cpp" line="2746"/>
         <source>Sort By Type</source>
         <translation>按类型排序</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="2726"/>
+        <location filename="../mainwindow.cpp" line="2751"/>
         <source>Sort alphabetically</source>
         <translation>按名称排序</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="2731"/>
+        <location filename="../mainwindow.cpp" line="2756"/>
         <source>Show inherited members</source>
         <translation>显示继承的成员</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="2736"/>
+        <location filename="../mainwindow.cpp" line="2761"/>
         <source>Goto declaration</source>
         <translation>跳转到声明处</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="2739"/>
+        <location filename="../mainwindow.cpp" line="2764"/>
         <source>Goto definition</source>
         <translation>跳转到定义处</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="2799"/>
-        <location filename="../mainwindow.cpp" line="3748"/>
+        <location filename="../mainwindow.cpp" line="2767"/>
+        <source>In current file</source>
+        <translation>仅当前文件</translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.cpp" line="2771"/>
+        <source>In current project</source>
+        <translation>整个项目</translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.cpp" line="2838"/>
+        <location filename="../mainwindow.cpp" line="3795"/>
         <source>New Folder</source>
         <translation>新建文件夹</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="2811"/>
+        <location filename="../mainwindow.cpp" line="2850"/>
         <source>Rename</source>
         <translation>重命名</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="2817"/>
-        <location filename="../mainwindow.cpp" line="3795"/>
-        <location filename="../mainwindow.cpp" line="3801"/>
-        <location filename="../mainwindow.cpp" line="6482"/>
+        <location filename="../mainwindow.cpp" line="2856"/>
+        <location filename="../mainwindow.cpp" line="3842"/>
+        <location filename="../mainwindow.cpp" line="3848"/>
+        <location filename="../mainwindow.cpp" line="6567"/>
         <source>Delete</source>
         <translation>删除</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="2823"/>
+        <location filename="../mainwindow.cpp" line="2862"/>
         <source>Open in Editor</source>
         <translation>在编辑器中打开</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="2829"/>
+        <location filename="../mainwindow.cpp" line="2868"/>
         <source>Open in External Program</source>
         <translation>使用外部程序打开</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="2834"/>
+        <location filename="../mainwindow.cpp" line="2873"/>
         <source>Open in Terminal</source>
         <translation>在终端中打开</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="2840"/>
+        <location filename="../mainwindow.cpp" line="2879"/>
         <source>Open in Windows Explorer</source>
         <translation>在Windows浏览器中打开</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="2896"/>
+        <location filename="../mainwindow.cpp" line="2935"/>
         <source>Character sets</source>
         <translation>字符集</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="2946"/>
+        <location filename="../mainwindow.cpp" line="2985"/>
         <source>Convert to %1</source>
         <translation>转换为%1编码</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="3063"/>
+        <location filename="../mainwindow.cpp" line="3102"/>
         <source>%1 files autosaved</source>
         <translation>已自动保存%1个文件</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="3375"/>
+        <location filename="../mainwindow.cpp" line="3424"/>
         <source>Set answer to...</source>
         <translation>设置答案源代码...</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="3407"/>
+        <location filename="../mainwindow.cpp" line="3456"/>
         <source>select other file...</source>
         <translation>选择其他文件...</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="3412"/>
+        <location filename="../mainwindow.cpp" line="3461"/>
         <source>Select Answer Source File</source>
         <translation>选择答案源代码文件</translation>
     </message>
@@ -5790,7 +5800,7 @@ Are you really want to continue?</oldsource>
         <translation type="vanished">C/C++源代码文件 (*.c *.cpp *.cc *.cxx)</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="3752"/>
+        <location filename="../mainwindow.cpp" line="3799"/>
         <source>New Folder %1</source>
         <translation>新建文件夹%1</translation>
     </message>
@@ -5803,67 +5813,67 @@ Are you really want to continue?</oldsource>
         <translation type="vanished">无标题%1</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="3796"/>
+        <location filename="../mainwindow.cpp" line="3843"/>
         <source>Do you really want to delete %1?</source>
         <translation>你真的要删除%1吗？</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="3802"/>
+        <location filename="../mainwindow.cpp" line="3849"/>
         <source>Do you really want to delete %1 files?</source>
         <translation>你真的要删除%1个文件吗？</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="4403"/>
+        <location filename="../mainwindow.cpp" line="4474"/>
         <source>Save project</source>
         <translation>保存项目</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="4404"/>
+        <location filename="../mainwindow.cpp" line="4475"/>
         <source>The project &apos;%1&apos; has modifications.</source>
         <translation>项目&apos;%1&apos;有改动。</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="4406"/>
-        <location filename="../mainwindow.cpp" line="7224"/>
+        <location filename="../mainwindow.cpp" line="4477"/>
+        <location filename="../mainwindow.cpp" line="7331"/>
         <source>Do you want to save it?</source>
         <translation>需要保存吗？</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="4498"/>
-        <location filename="../mainwindow.cpp" line="4512"/>
+        <location filename="../mainwindow.cpp" line="4575"/>
+        <location filename="../mainwindow.cpp" line="4589"/>
         <source>File Changed</source>
         <translation>文件已发生变化</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="4583"/>
+        <location filename="../mainwindow.cpp" line="4660"/>
         <source>New Project File?</source>
         <translation>新建项目文件?</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="4584"/>
+        <location filename="../mainwindow.cpp" line="4661"/>
         <source>Do you want to add the new file to the project?</source>
         <translation>您是否要将新建的文件加入项目?</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="4668"/>
-        <location filename="../mainwindow.cpp" line="4678"/>
-        <location filename="../mainwindow.cpp" line="7285"/>
+        <location filename="../mainwindow.cpp" line="4745"/>
+        <location filename="../mainwindow.cpp" line="4755"/>
+        <location filename="../mainwindow.cpp" line="7392"/>
         <source>Save Error</source>
         <translation>保存失败</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="4818"/>
+        <location filename="../mainwindow.cpp" line="4894"/>
         <source>Change Project Compiler Set</source>
         <translation>改变项目编译器配置集</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="4819"/>
+        <location filename="../mainwindow.cpp" line="4895"/>
         <source>Change the project&apos;s compiler set will lose all custom compiler set options.</source>
         <translation>改变项目的编译器配置集会导致所有的自定义编译器选项被重置。</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="3561"/>
-        <location filename="../mainwindow.cpp" line="4821"/>
+        <location filename="../mainwindow.cpp" line="3608"/>
+        <location filename="../mainwindow.cpp" line="4897"/>
         <source>Do you really want to do that?</source>
         <translation>你真的想要那么做吗？</translation>
     </message>
@@ -5872,119 +5882,119 @@ Are you really want to continue?</oldsource>
         <translation type="vanished">批量设置案例</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="3570"/>
+        <location filename="../mainwindow.cpp" line="3617"/>
         <source>Choose input files</source>
         <translation>选择输入数据文件</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="3572"/>
+        <location filename="../mainwindow.cpp" line="3619"/>
         <source>Input data files (*.in)</source>
         <translation>输入数据文件 (*.in)</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="3781"/>
+        <location filename="../mainwindow.cpp" line="3828"/>
         <source>untitled%1</source>
         <translation>无标题%1</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="5668"/>
+        <location filename="../mainwindow.cpp" line="5752"/>
         <source>Modify Watch</source>
         <translation>修改监视表达式</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="5669"/>
+        <location filename="../mainwindow.cpp" line="5753"/>
         <source>Watch Expression</source>
         <translation>监视表达式</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="5801"/>
+        <location filename="../mainwindow.cpp" line="5885"/>
         <source>Do you really want to clear all breakpoints in this file?</source>
         <translation>您真的要清除该文件的所有断点吗？</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="5999"/>
+        <location filename="../mainwindow.cpp" line="6083"/>
         <source>New project</source>
         <translation>新建项目</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="6000"/>
+        <location filename="../mainwindow.cpp" line="6084"/>
         <source>Close %1 and start new project?</source>
         <translation>关闭&apos;%1&apos;以打开新项目?</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="6013"/>
+        <location filename="../mainwindow.cpp" line="6097"/>
         <source>Folder not exist</source>
         <translation>文件夹不存在</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="6014"/>
+        <location filename="../mainwindow.cpp" line="6098"/>
         <source>Folder &apos;%1&apos; doesn&apos;t exist. Create it now?</source>
         <translation>文件夹&apos;%1&apos;不存在。是否创建？</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="6021"/>
+        <location filename="../mainwindow.cpp" line="6105"/>
         <source>Can&apos;t create folder</source>
         <translation>无法创建文件夹</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="6022"/>
+        <location filename="../mainwindow.cpp" line="6106"/>
         <source>Failed to create folder &apos;%1&apos;.</source>
         <translation>创建文件夹&apos;%1&apos;失败。</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="6037"/>
+        <location filename="../mainwindow.cpp" line="6121"/>
         <source>Save new project as</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="6483"/>
+        <location filename="../mainwindow.cpp" line="6568"/>
         <source>Folder %1 is not empty.</source>
         <translation>文件夹%1不是空的。</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="6484"/>
+        <location filename="../mainwindow.cpp" line="6569"/>
         <source>Do you really want to delete it?</source>
         <translation>你真的要删除它吗？</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="7144"/>
+        <location filename="../mainwindow.cpp" line="7251"/>
         <source>Change working folder</source>
         <translation>改变工作文件夹</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="7145"/>
+        <location filename="../mainwindow.cpp" line="7252"/>
         <source>File &apos;%1&apos; is not in the current working folder.</source>
         <oldsource>File &apos;%1&apos; is not in the current working folder</oldsource>
         <translation>文件&apos;%1&apos;不在当前工作文件夹中。</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="7148"/>
+        <location filename="../mainwindow.cpp" line="7255"/>
         <source>Do you want to change working folder to &apos;%1&apos;?</source>
         <translation>是否将工作文件夹改设为&apos;%1&apos;?</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="7827"/>
+        <location filename="../mainwindow.cpp" line="7930"/>
         <source>Can&apos;t Commit</source>
         <translation>无法提交</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="7828"/>
+        <location filename="../mainwindow.cpp" line="7931"/>
         <source>Git needs user info to commit.</source>
         <translation>Git需要用信息进行提交。</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="8101"/>
+        <location filename="../mainwindow.cpp" line="8204"/>
         <source>Choose Input Data File</source>
         <translation>选择输入数据文件</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="8103"/>
-        <location filename="../mainwindow.cpp" line="8158"/>
+        <location filename="../mainwindow.cpp" line="8206"/>
+        <location filename="../mainwindow.cpp" line="8261"/>
         <source>All files (*.*)</source>
         <translation>所有文件 (*.*)</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="8156"/>
+        <location filename="../mainwindow.cpp" line="8259"/>
         <source>Choose Expected Output Data File</source>
         <oldsource>Choose Expected Input Data File</oldsource>
         <translation>选择期望输出文件</translation>
@@ -5996,59 +6006,59 @@ Are you really want to continue?</oldsource>
     <message>
         <location filename="../mainwindow.ui" line="2846"/>
         <location filename="../mainwindow.ui" line="2849"/>
-        <location filename="../mainwindow.cpp" line="7200"/>
+        <location filename="../mainwindow.cpp" line="7307"/>
         <source>Choose Working Folder</source>
         <translation>选择工作文件夹</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="7594"/>
-        <location filename="../mainwindow.cpp" line="7646"/>
+        <location filename="../mainwindow.cpp" line="7701"/>
+        <location filename="../mainwindow.cpp" line="7750"/>
         <source>Header Exists</source>
         <translation>头文件已存在</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="7595"/>
-        <location filename="../mainwindow.cpp" line="7647"/>
+        <location filename="../mainwindow.cpp" line="7702"/>
+        <location filename="../mainwindow.cpp" line="7751"/>
         <source>Header file &quot;%1&quot; already exists!</source>
         <translation>头文件&quot;%1&quot;已存在！</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="7652"/>
+        <location filename="../mainwindow.cpp" line="7756"/>
         <source>Source Exists</source>
         <translation>源文件已存在！</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="7653"/>
+        <location filename="../mainwindow.cpp" line="7757"/>
         <source>Source file &quot;%1&quot; already exists!</source>
         <translation>源文件&quot;%1&quot;已存在！</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="7806"/>
+        <location filename="../mainwindow.cpp" line="7909"/>
         <source>Can&apos;t commit!</source>
         <translation>无法提交！</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="7807"/>
+        <location filename="../mainwindow.cpp" line="7910"/>
         <source>The following files are in conflicting:</source>
         <translation>下列文件处于冲突状态，请解决后重新添加和提交：</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="7812"/>
+        <location filename="../mainwindow.cpp" line="7915"/>
         <source>Commit Message</source>
         <translation>提交信息</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="7812"/>
+        <location filename="../mainwindow.cpp" line="7915"/>
         <source>Commit Message:</source>
         <translation>提交信息：</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="7815"/>
+        <location filename="../mainwindow.cpp" line="7918"/>
         <source>Commit Failed</source>
         <translation>提交失败</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="7816"/>
+        <location filename="../mainwindow.cpp" line="7919"/>
         <source>Commit message shouldn&apos;t be empty!</source>
         <translation>提交信息不能为空！</translation>
     </message>
@@ -6057,137 +6067,137 @@ Are you really want to continue?</oldsource>
         <translation type="vanished">小熊猫Dev-C++项目文件 (*.dev)</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="6051"/>
+        <location filename="../mainwindow.cpp" line="6135"/>
         <source>New project fail</source>
         <translation>新建项目失败</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="6052"/>
+        <location filename="../mainwindow.cpp" line="6136"/>
         <source>Can&apos;t assign project template</source>
         <translation>无法使用模板创建项目</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="6147"/>
+        <location filename="../mainwindow.cpp" line="6229"/>
         <source>Remove file</source>
         <translation>删除文件</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="6148"/>
+        <location filename="../mainwindow.cpp" line="6230"/>
         <source>Remove the file from disk?</source>
         <translation>同时从硬盘上删除文件？</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="3777"/>
-        <location filename="../mainwindow.cpp" line="6402"/>
-        <location filename="../mainwindow.cpp" line="7581"/>
+        <location filename="../mainwindow.cpp" line="3824"/>
+        <location filename="../mainwindow.cpp" line="6484"/>
+        <location filename="../mainwindow.cpp" line="7688"/>
         <source>untitled</source>
         <translation>无标题</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="6410"/>
+        <location filename="../mainwindow.cpp" line="6492"/>
         <source>New Project File Name</source>
         <translation>新的项目文件名</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="6411"/>
+        <location filename="../mainwindow.cpp" line="6493"/>
         <source>File Name:</source>
         <translation>文件名：</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="6419"/>
+        <location filename="../mainwindow.cpp" line="6501"/>
         <source>File Already Exists!</source>
         <translation>文件已存在！</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="6420"/>
+        <location filename="../mainwindow.cpp" line="6502"/>
         <source>File &apos;%1&apos; already exists!</source>
         <translation>文件&apos;%1&apos;已经存在！</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="6097"/>
+        <location filename="../mainwindow.cpp" line="6175"/>
         <source>Add to project</source>
         <translation>添加到项目</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="3414"/>
+        <location filename="../mainwindow.cpp" line="3463"/>
         <source>C/C++ Source Files (*.c *.cpp *.cc *.cxx)</source>
         <translation>C/C++源代码文件 (*.c *.cpp *.cc *.cxx)</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="3559"/>
+        <location filename="../mainwindow.cpp" line="3606"/>
         <source>This operation will remove all cases for the current problem.</source>
         <translation>本操作会删除此试题的所有案例。</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="6039"/>
+        <location filename="../mainwindow.cpp" line="6123"/>
         <source>Red Panda C++ project file (*.dev)</source>
         <translation>小熊猫C++项目文件(*.dev)</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="6761"/>
+        <location filename="../mainwindow.cpp" line="6863"/>
         <source>Rename Error</source>
         <translation>重命名出错</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="6762"/>
+        <location filename="../mainwindow.cpp" line="6864"/>
         <source>Symbol &apos;%1&apos; is defined in system header.</source>
         <translation>符号&apos;%1&apos;在系统头文件中定义，无法修改。</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="6789"/>
+        <location filename="../mainwindow.cpp" line="6891"/>
         <source>New Name</source>
         <translation>新名称</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="6936"/>
-        <location filename="../mainwindow.cpp" line="6948"/>
+        <location filename="../mainwindow.cpp" line="7038"/>
+        <location filename="../mainwindow.cpp" line="7050"/>
         <source>Replace Error</source>
         <translation>替换出错</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="6937"/>
+        <location filename="../mainwindow.cpp" line="7039"/>
         <source>Can&apos;t open file &apos;%1&apos; for replace!</source>
         <translation>无法打开文件&apos;%1&apos;进行替换！</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="6949"/>
+        <location filename="../mainwindow.cpp" line="7051"/>
         <source>Contents has changed since last search!</source>
         <translation>内容和上次查找时不一致。</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="7000"/>
+        <location filename="../mainwindow.cpp" line="7102"/>
         <source>Rich Text Format Files (*.rtf)</source>
         <translation>RTF格式文件 (*.rtf)</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="7022"/>
+        <location filename="../mainwindow.cpp" line="7124"/>
         <source>HTML Files (*.html)</source>
         <translation>HTML文件 (*.html)</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="7222"/>
+        <location filename="../mainwindow.cpp" line="7329"/>
         <source>The current problem set is not empty.</source>
         <translation>当前的试题集不是空的。</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="7240"/>
+        <location filename="../mainwindow.cpp" line="7347"/>
         <source>Problem %1</source>
         <translation>试题%1</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="7270"/>
-        <location filename="../mainwindow.cpp" line="7298"/>
+        <location filename="../mainwindow.cpp" line="7377"/>
+        <location filename="../mainwindow.cpp" line="7405"/>
         <source>Problem Set Files (*.pbs)</source>
         <translation>试题集文件 (*.pbs)</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="7304"/>
+        <location filename="../mainwindow.cpp" line="7411"/>
         <source>Load Error</source>
         <translation>载入失败</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="3643"/>
-        <location filename="../mainwindow.cpp" line="7318"/>
+        <location filename="../mainwindow.cpp" line="3690"/>
+        <location filename="../mainwindow.cpp" line="7425"/>
         <source>Problem Case %1</source>
         <translation>试题案例%1</translation>
     </message>
@@ -6197,16 +6207,16 @@ Are you really want to continue?</oldsource>
         <location filename="../mainwindow.cpp" line="270"/>
         <location filename="../mainwindow.cpp" line="278"/>
         <location filename="../mainwindow.cpp" line="287"/>
-        <location filename="../mainwindow.cpp" line="1275"/>
-        <location filename="../mainwindow.cpp" line="2486"/>
-        <location filename="../mainwindow.cpp" line="2921"/>
-        <location filename="../mainwindow.cpp" line="4505"/>
-        <location filename="../mainwindow.cpp" line="4623"/>
-        <location filename="../mainwindow.cpp" line="4787"/>
-        <location filename="../mainwindow.cpp" line="4799"/>
-        <location filename="../mainwindow.cpp" line="5230"/>
-        <location filename="../mainwindow.cpp" line="5242"/>
-        <location filename="../mainwindow.cpp" line="8241"/>
+        <location filename="../mainwindow.cpp" line="1291"/>
+        <location filename="../mainwindow.cpp" line="2511"/>
+        <location filename="../mainwindow.cpp" line="2960"/>
+        <location filename="../mainwindow.cpp" line="4582"/>
+        <location filename="../mainwindow.cpp" line="4700"/>
+        <location filename="../mainwindow.cpp" line="4864"/>
+        <location filename="../mainwindow.cpp" line="4876"/>
+        <location filename="../mainwindow.cpp" line="5314"/>
+        <location filename="../mainwindow.cpp" line="5326"/>
+        <location filename="../mainwindow.cpp" line="8344"/>
         <source>Error</source>
         <translation>错误</translation>
     </message>
@@ -6216,96 +6226,96 @@ Are you really want to continue?</oldsource>
         <translation>项目历史</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="752"/>
+        <location filename="../mainwindow.cpp" line="760"/>
         <source>Load Theme Error</source>
         <translation>载入主题失败</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1079"/>
-        <location filename="../mainwindow.cpp" line="1101"/>
+        <location filename="../mainwindow.cpp" line="1087"/>
+        <location filename="../mainwindow.cpp" line="1109"/>
         <source>Clear History</source>
         <translation>清除历史</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="3181"/>
-        <location filename="../mainwindow.cpp" line="3323"/>
+        <location filename="../mainwindow.cpp" line="3220"/>
+        <location filename="../mainwindow.cpp" line="3372"/>
         <source>Version Control</source>
         <translation>版本控制</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="4499"/>
+        <location filename="../mainwindow.cpp" line="4576"/>
         <source>File &apos;%1&apos; was changed.</source>
         <translation>磁盘文件&apos;%1&apos;已被修改。</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="4499"/>
+        <location filename="../mainwindow.cpp" line="4576"/>
         <source>Reload its content from disk?</source>
         <translation>是否重新读取它的内容？</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="4513"/>
+        <location filename="../mainwindow.cpp" line="4590"/>
         <source>File &apos;%1&apos; was removed.</source>
         <translation>磁盘文件&apos;%1&apos;已被删除。</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="4513"/>
+        <location filename="../mainwindow.cpp" line="4590"/>
         <source>Keep it open?</source>
         <translation>是否保持它在小熊猫C++中打开的编辑窗口？</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="4616"/>
+        <location filename="../mainwindow.cpp" line="4693"/>
         <source>Open</source>
         <translation>打开</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="5001"/>
+        <location filename="../mainwindow.cpp" line="5085"/>
         <source>Compile Failed</source>
         <translation>编译失败</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="5007"/>
+        <location filename="../mainwindow.cpp" line="5091"/>
         <source>Run Failed</source>
         <translation>运行失败</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="2952"/>
-        <location filename="../mainwindow.cpp" line="5259"/>
-        <location filename="../mainwindow.cpp" line="5273"/>
-        <location filename="../mainwindow.cpp" line="8224"/>
+        <location filename="../mainwindow.cpp" line="2991"/>
+        <location filename="../mainwindow.cpp" line="5343"/>
+        <location filename="../mainwindow.cpp" line="5357"/>
+        <location filename="../mainwindow.cpp" line="8327"/>
         <source>Confirm Convertion</source>
         <translation>确认转换</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="2953"/>
-        <location filename="../mainwindow.cpp" line="5260"/>
-        <location filename="../mainwindow.cpp" line="5274"/>
-        <location filename="../mainwindow.cpp" line="8225"/>
+        <location filename="../mainwindow.cpp" line="2992"/>
+        <location filename="../mainwindow.cpp" line="5344"/>
+        <location filename="../mainwindow.cpp" line="5358"/>
+        <location filename="../mainwindow.cpp" line="8328"/>
         <source>The editing file will be saved using %1 encoding. &lt;br /&gt;This operation can&apos;t be reverted. &lt;br /&gt;Are you sure to continue?</source>
         <translation>当前编辑器中的文件将会使用%1编码保存。&lt;br /&gt;这项操作无法被撤回。&lt;br /&gt;你确定要继续吗？</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="5418"/>
+        <location filename="../mainwindow.cpp" line="5502"/>
         <source>New Watch Expression</source>
         <translation>新监视表达式</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="5419"/>
+        <location filename="../mainwindow.cpp" line="5503"/>
         <source>Enter Watch Expression (it is recommended to use &apos;this-&gt;&apos; for class members):</source>
         <translation>输入监视表达式</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="5476"/>
+        <location filename="../mainwindow.cpp" line="5560"/>
         <source>Parsing file %1 of %2: &quot;%3&quot;</source>
         <translation>（%1/%2）正在解析文件&quot;%3&quot;</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="5498"/>
-        <location filename="../mainwindow.cpp" line="5504"/>
+        <location filename="../mainwindow.cpp" line="5582"/>
+        <location filename="../mainwindow.cpp" line="5588"/>
         <source>Done parsing %1 files in %2 seconds</source>
         <translation>完成%1个文件的解析,用时%2秒</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="5501"/>
+        <location filename="../mainwindow.cpp" line="5585"/>
         <source>(%1 files per second)</source>
         <translation>(每秒%1个文件）</translation>
     </message>
@@ -6644,120 +6654,118 @@ Are you really want to continue?</oldsource>
         <translation type="vanished">找不到项目文件&apos;%1&apos;!</translation>
     </message>
     <message>
-        <location filename="../project.cpp" line="330"/>
+        <location filename="../project.cpp" line="331"/>
         <source>untitled</source>
         <translation>无标题</translation>
     </message>
     <message>
-        <location filename="../project.cpp" line="714"/>
         <source>Can&apos;t save file</source>
-        <translation>无法保存文件</translation>
+        <translation type="vanished">无法保存文件</translation>
     </message>
     <message>
-        <location filename="../project.cpp" line="715"/>
         <source>Can&apos;t save file &apos;%1&apos;</source>
-        <translation>无法保存文件&apos;%1&apos;.</translation>
+        <translation type="vanished">无法保存文件&apos;%1&apos;.</translation>
     </message>
     <message>
-        <location filename="../project.cpp" line="941"/>
+        <location filename="../project.cpp" line="946"/>
         <source>Error Load File</source>
         <translation>载入文件错误</translation>
     </message>
     <message>
-        <location filename="../project.cpp" line="965"/>
-        <location filename="../project.cpp" line="1061"/>
+        <location filename="../project.cpp" line="970"/>
+        <location filename="../project.cpp" line="1067"/>
         <source>Error</source>
         <translation>错误</translation>
     </message>
     <message>
-        <location filename="../project.cpp" line="966"/>
+        <location filename="../project.cpp" line="971"/>
         <source>Can&apos;t create folder %1 </source>
         <translation>无法创建文件夹%1</translation>
     </message>
     <message>
-        <location filename="../project.cpp" line="1032"/>
+        <location filename="../project.cpp" line="1038"/>
         <source>Warning</source>
         <translation>警告</translation>
     </message>
     <message>
-        <location filename="../project.cpp" line="1033"/>
-        <location filename="../project.cpp" line="1062"/>
+        <location filename="../project.cpp" line="1039"/>
+        <location filename="../project.cpp" line="1068"/>
         <source>Can&apos;t save file %1</source>
         <translation>无法保存文件%1</translation>
     </message>
     <message>
-        <location filename="../project.cpp" line="1176"/>
+        <location filename="../project.cpp" line="1183"/>
         <source>File Exists</source>
         <translation>文件已存在</translation>
     </message>
     <message>
-        <location filename="../project.cpp" line="1177"/>
+        <location filename="../project.cpp" line="1184"/>
         <source>File &apos;%1&apos; is already in the project</source>
         <translation>文件&apos;%1&apos;已在项目中</translation>
     </message>
     <message>
-        <location filename="../project.cpp" line="1560"/>
+        <location filename="../project.cpp" line="1566"/>
         <source>Project Updated</source>
         <translation>项目已升级</translation>
     </message>
     <message>
-        <location filename="../project.cpp" line="1561"/>
+        <location filename="../project.cpp" line="1567"/>
         <source>Your project was succesfully updated to a newer file format!</source>
         <translation>已成功将项目升级到新的格式</translation>
     </message>
     <message>
-        <location filename="../project.cpp" line="1563"/>
+        <location filename="../project.cpp" line="1569"/>
         <source>If something has gone wrong, we kept a backup-file: &apos;%1&apos;...</source>
         <translation>旧项目文件备份在&apos;%1&apos;。</translation>
     </message>
     <message>
-        <location filename="../project.cpp" line="1634"/>
+        <location filename="../project.cpp" line="1640"/>
         <source>Headers</source>
         <translation>头文件</translation>
     </message>
     <message>
-        <location filename="../project.cpp" line="1642"/>
+        <location filename="../project.cpp" line="1648"/>
         <source>Sources</source>
         <translation>源文件</translation>
     </message>
     <message>
-        <location filename="../project.cpp" line="1650"/>
+        <location filename="../project.cpp" line="1656"/>
         <source>Others</source>
         <translation>其他文件</translation>
     </message>
     <message>
-        <location filename="../project.cpp" line="1868"/>
+        <location filename="../project.cpp" line="1874"/>
         <source>Settings need update</source>
         <translation>设置需要更新</translation>
     </message>
     <message>
-        <location filename="../project.cpp" line="1869"/>
+        <location filename="../project.cpp" line="1875"/>
         <source>The compiler settings format of Red Panda C++ has changed.</source>
         <oldsource>The compiler settings format of Dev-C++ has changed.</oldsource>
         <translation>小熊猫C++的编译器设置格式已发生改变。</translation>
     </message>
     <message>
-        <location filename="../project.cpp" line="1871"/>
+        <location filename="../project.cpp" line="1877"/>
         <source>Please update your settings at Project &gt;&gt; Project Options &gt;&gt; Compiler and save your project.</source>
         <translation>请在项目 &gt;&gt; 项目属性 &gt;&gt; 编译器设置中修改您的设置并保存您的项目</translation>
     </message>
     <message>
-        <location filename="../project.cpp" line="1951"/>
+        <location filename="../project.cpp" line="1958"/>
         <source>Compiler not found</source>
         <translation>未找到编译器</translation>
     </message>
     <message>
-        <location filename="../project.cpp" line="1952"/>
+        <location filename="../project.cpp" line="1959"/>
         <source>The compiler set you have selected for this project, no longer exists.</source>
         <translation>您为该项目设置的编译器不存在。</translation>
     </message>
     <message>
-        <location filename="../project.cpp" line="1954"/>
+        <location filename="../project.cpp" line="1961"/>
         <source>It will be substituted by the global compiler set.</source>
         <translation>它将会被全局编译器设置代替。</translation>
     </message>
     <message>
-        <location filename="../project.cpp" line="2042"/>
+        <location filename="../project.cpp" line="2049"/>
         <source>Developed using the Red Panda C++ IDE</source>
         <oldsource>Developed using the Red Panda Dev-C++ IDE</oldsource>
         <translation>使用小熊猫C++编辑器开发</translation>
@@ -6863,32 +6871,32 @@ Are you really want to continue?</oldsource>
         <translation>- 资源文件: %1</translation>
     </message>
     <message>
-        <location filename="../compiler/projectcompiler.cpp" line="520"/>
+        <location filename="../compiler/projectcompiler.cpp" line="526"/>
         <source>Compiling project changes...</source>
         <translation>正在编译项目修改...</translation>
     </message>
     <message>
-        <location filename="../compiler/projectcompiler.cpp" line="522"/>
+        <location filename="../compiler/projectcompiler.cpp" line="528"/>
         <source>- Project Filename: %1</source>
         <translation>- 项目文件名: %1</translation>
     </message>
     <message>
-        <location filename="../compiler/projectcompiler.cpp" line="523"/>
+        <location filename="../compiler/projectcompiler.cpp" line="529"/>
         <source>- Compiler Set Name: %1</source>
         <translation>- 编译器配置: %1</translation>
     </message>
     <message>
-        <location filename="../compiler/projectcompiler.cpp" line="544"/>
+        <location filename="../compiler/projectcompiler.cpp" line="550"/>
         <source>Processing makefile:</source>
         <translation>正在处理makefile...</translation>
     </message>
     <message>
-        <location filename="../compiler/projectcompiler.cpp" line="546"/>
+        <location filename="../compiler/projectcompiler.cpp" line="552"/>
         <source>- makefile processer: %1</source>
         <translation>- makefile处理器: %1</translation>
     </message>
     <message>
-        <location filename="../compiler/projectcompiler.cpp" line="547"/>
+        <location filename="../compiler/projectcompiler.cpp" line="553"/>
         <source>- Command: %1 %2</source>
         <translation>- 命令: %1 %2</translation>
     </message>
@@ -7226,32 +7234,32 @@ Are you really want to continue?</oldsource>
 <context>
     <name>ProjectModel</name>
     <message>
-        <location filename="../project.cpp" line="2659"/>
+        <location filename="../project.cpp" line="2617"/>
         <source>File exists</source>
         <translation>文件已存在</translation>
     </message>
     <message>
-        <location filename="../project.cpp" line="2660"/>
+        <location filename="../project.cpp" line="2618"/>
         <source>File &apos;%1&apos; already exists. Delete it now?</source>
         <translation>文件&apos;%1&apos;已存在。是否删除？</translation>
     </message>
     <message>
-        <location filename="../project.cpp" line="2678"/>
+        <location filename="../project.cpp" line="2636"/>
         <source>Remove failed</source>
         <translation>删除失败</translation>
     </message>
     <message>
-        <location filename="../project.cpp" line="2679"/>
+        <location filename="../project.cpp" line="2637"/>
         <source>Failed to remove file &apos;%1&apos;</source>
         <translation>无法删除文件&apos;%1&apos;</translation>
     </message>
     <message>
-        <location filename="../project.cpp" line="2696"/>
+        <location filename="../project.cpp" line="2654"/>
         <source>Rename failed</source>
         <translation>改名失败</translation>
     </message>
     <message>
-        <location filename="../project.cpp" line="2697"/>
+        <location filename="../project.cpp" line="2655"/>
         <source>Failed to rename file &apos;%1&apos; to &apos;%2&apos;</source>
         <translation>无法将文件&apos;%1&apos;改名为&apos;%2&apos;</translation>
     </message>
@@ -7483,7 +7491,7 @@ Are you really want to continue?</oldsource>
 <context>
     <name>QApplication</name>
     <message>
-        <location filename="../main.cpp" line="424"/>
+        <location filename="../main.cpp" line="421"/>
         <source>Error</source>
         <translation>错误</translation>
     </message>
@@ -7491,12 +7499,12 @@ Are you really want to continue?</oldsource>
 <context>
     <name>QObject</name>
     <message>
-        <location filename="../editorlist.cpp" line="157"/>
+        <location filename="../editorlist.cpp" line="169"/>
         <source>Save</source>
         <translation>保存</translation>
     </message>
     <message>
-        <location filename="../editorlist.cpp" line="158"/>
+        <location filename="../editorlist.cpp" line="170"/>
         <source>Save changes to %1?</source>
         <translation>将修改保存到&quot;%1&quot;？</translation>
     </message>
@@ -7553,7 +7561,7 @@ Are you really want to continue?</oldsource>
         <translation>无法写入配置文件夹&quot;%1&quot;</translation>
     </message>
     <message>
-        <location filename="../main.cpp" line="371"/>
+        <location filename="../main.cpp" line="368"/>
         <source>Can&apos;t load autolink settings</source>
         <translation>无法载入自动链接设置</translation>
     </message>
@@ -7857,22 +7865,22 @@ Are you really want to continue?</oldsource>
         <translation type="vanished">下标&quot;%1&quot;越界</translation>
     </message>
     <message>
-        <location filename="../utils.cpp" line="517"/>
+        <location filename="../utils.cpp" line="521"/>
         <source>bytes</source>
         <translation>字节</translation>
     </message>
     <message>
-        <location filename="../utils.cpp" line="519"/>
+        <location filename="../utils.cpp" line="523"/>
         <source>KB</source>
         <translation>KB</translation>
     </message>
     <message>
-        <location filename="../utils.cpp" line="521"/>
+        <location filename="../utils.cpp" line="525"/>
         <source>MB</source>
         <translation>MB</translation>
     </message>
     <message>
-        <location filename="../utils.cpp" line="523"/>
+        <location filename="../utils.cpp" line="527"/>
         <source>GB</source>
         <translation>GB</translation>
     </message>
@@ -8158,12 +8166,12 @@ Are you really want to continue?</oldsource>
         <translation type="vanished">无标题</translation>
     </message>
     <message>
-        <location filename="../parser/cppparser.cpp" line="1037"/>
+        <location filename="../parser/cppparser.cpp" line="1050"/>
         <source>constructor</source>
         <translation>构造函数</translation>
     </message>
     <message>
-        <location filename="../parser/cppparser.cpp" line="1044"/>
+        <location filename="../parser/cppparser.cpp" line="1057"/>
         <source>destructor</source>
         <translation>析构函数</translation>
     </message>
@@ -8180,7 +8188,7 @@ Are you really want to continue?</oldsource>
         <location filename="../autolinkmanager.cpp" line="60"/>
         <location filename="../autolinkmanager.cpp" line="74"/>
         <location filename="../autolinkmanager.cpp" line="105"/>
-        <location filename="../project.cpp" line="668"/>
+        <location filename="../project.cpp" line="676"/>
         <source>Can&apos;t open file &apos;%1&apos; for write.</source>
         <translation>无法写入文件&apos;%1&apos;.</translation>
     </message>
@@ -8199,12 +8207,12 @@ Are you really want to continue?</oldsource>
 <context>
     <name>RegisterModel</name>
     <message>
-        <location filename="../debugger.cpp" line="2580"/>
+        <location filename="../debugger.cpp" line="2597"/>
         <source>Register</source>
         <translation>寄存器</translation>
     </message>
     <message>
-        <location filename="../debugger.cpp" line="2582"/>
+        <location filename="../debugger.cpp" line="2599"/>
         <source>Value</source>
         <translation>值</translation>
     </message>
@@ -8632,14 +8640,14 @@ Are you really want to continue?</oldsource>
         <translation>性能</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="8249"/>
+        <location filename="../mainwindow.cpp" line="8352"/>
         <location filename="../settingsdialog/settingsdialog.cpp" line="166"/>
         <location filename="../settingsdialog/settingsdialog.cpp" line="246"/>
         <source>Compiler Set</source>
         <translation>编译器配置集</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="8250"/>
+        <location filename="../mainwindow.cpp" line="8353"/>
         <location filename="../settingsdialog/settingsdialog.cpp" line="166"/>
         <location filename="../settingsdialog/settingsdialog.cpp" line="169"/>
         <source>Compiler</source>
@@ -8651,7 +8659,7 @@ Are you really want to continue?</oldsource>
         <translation>自动链接</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="7211"/>
+        <location filename="../mainwindow.cpp" line="7318"/>
         <location filename="../settingsdialog/settingsdialog.cpp" line="172"/>
         <location filename="../settingsdialog/settingsdialog.cpp" line="205"/>
         <location filename="../settingsdialog/settingsdialog.cpp" line="211"/>
@@ -8727,15 +8735,15 @@ Are you really want to continue?</oldsource>
         <translation>杂项</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="7212"/>
-        <location filename="../mainwindow.cpp" line="7541"/>
+        <location filename="../mainwindow.cpp" line="7319"/>
+        <location filename="../mainwindow.cpp" line="7648"/>
         <location filename="../settingsdialog/settingsdialog.cpp" line="205"/>
         <location filename="../settingsdialog/settingsdialog.cpp" line="208"/>
         <source>Program Runner</source>
         <translation>程序运行</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="7540"/>
+        <location filename="../mainwindow.cpp" line="7647"/>
         <location filename="../settingsdialog/settingsdialog.cpp" line="208"/>
         <source>Problem Set</source>
         <translation>试题集</translation>
@@ -8906,42 +8914,42 @@ Are you really want to continue?</oldsource>
 <context>
     <name>StdinCompiler</name>
     <message>
-        <location filename="../compiler/stdincompiler.cpp" line="34"/>
+        <location filename="../compiler/stdincompiler.cpp" line="33"/>
         <source>Checking file syntax...</source>
         <translation>正在检查语法...</translation>
     </message>
     <message>
-        <location filename="../compiler/stdincompiler.cpp" line="36"/>
+        <location filename="../compiler/stdincompiler.cpp" line="35"/>
         <source>- Filename: %1</source>
         <translation>- 文件名: %1</translation>
     </message>
     <message>
-        <location filename="../compiler/stdincompiler.cpp" line="37"/>
+        <location filename="../compiler/stdincompiler.cpp" line="36"/>
         <source>- Compiler Set Name: %1</source>
         <translation>- 编译器配置: %1</translation>
     </message>
     <message>
-        <location filename="../compiler/stdincompiler.cpp" line="66"/>
+        <location filename="../compiler/stdincompiler.cpp" line="65"/>
         <source>Can&apos;t find the compiler for file %1</source>
         <translation>找不到适合文件%1的编译器</translation>
     </message>
     <message>
-        <location filename="../compiler/stdincompiler.cpp" line="72"/>
+        <location filename="../compiler/stdincompiler.cpp" line="71"/>
         <source>The Compiler &apos;%1&apos; doesn&apos;t exists!</source>
         <translation>编译器程序&apos;%1&apos;不存在！</translation>
     </message>
     <message>
-        <location filename="../compiler/stdincompiler.cpp" line="75"/>
+        <location filename="../compiler/stdincompiler.cpp" line="74"/>
         <source>Processing %1 source file:</source>
         <translation>正在处理%1源程序文件:</translation>
     </message>
     <message>
-        <location filename="../compiler/stdincompiler.cpp" line="77"/>
+        <location filename="../compiler/stdincompiler.cpp" line="76"/>
         <source>%1 Compiler: %2</source>
         <translation>%1编译器: %2</translation>
     </message>
     <message>
-        <location filename="../compiler/stdincompiler.cpp" line="78"/>
+        <location filename="../compiler/stdincompiler.cpp" line="77"/>
         <source>Command: %1 %2</source>
         <translation>命令: %1 %2</translation>
     </message>
@@ -9013,22 +9021,22 @@ Are you really want to continue?</oldsource>
 <context>
     <name>TodoModel</name>
     <message>
-        <location filename="../todoparser.cpp" line="161"/>
+        <location filename="../todoparser.cpp" line="271"/>
         <source>Filename</source>
         <translation>文件名</translation>
     </message>
     <message>
-        <location filename="../todoparser.cpp" line="163"/>
+        <location filename="../todoparser.cpp" line="273"/>
         <source>Line</source>
         <translation>行</translation>
     </message>
     <message>
-        <location filename="../todoparser.cpp" line="165"/>
+        <location filename="../todoparser.cpp" line="275"/>
         <source>Column</source>
         <translation>列</translation>
     </message>
     <message>
-        <location filename="../todoparser.cpp" line="167"/>
+        <location filename="../todoparser.cpp" line="277"/>
         <source>Content</source>
         <translation>内容</translation>
     </message>
@@ -9225,14 +9233,14 @@ Are you really want to continue?</oldsource>
         <translation type="vanished">JSON文件&apos;%1&apos;:%2中存在错误：%3</translation>
     </message>
     <message>
-        <location filename="../debugger.cpp" line="2351"/>
-        <location filename="../debugger.cpp" line="2457"/>
+        <location filename="../debugger.cpp" line="2368"/>
+        <location filename="../debugger.cpp" line="2474"/>
         <source>Execute to evaluate</source>
         <translation>执行以求值</translation>
     </message>
     <message>
-        <location filename="../debugger.cpp" line="2227"/>
-        <location filename="../debugger.cpp" line="2298"/>
+        <location filename="../debugger.cpp" line="2244"/>
+        <location filename="../debugger.cpp" line="2315"/>
         <source>Not Valid</source>
         <translation>在当前作用域中无效</translation>
     </message>
@@ -9241,17 +9249,17 @@ Are you really want to continue?</oldsource>
         <translation type="vanished">无法读取文件&apos;%1&apos;.</translation>
     </message>
     <message>
-        <location filename="../debugger.cpp" line="2500"/>
+        <location filename="../debugger.cpp" line="2517"/>
         <source>Expression</source>
         <translation>表达式</translation>
     </message>
     <message>
-        <location filename="../debugger.cpp" line="2502"/>
+        <location filename="../debugger.cpp" line="2519"/>
         <source>Type</source>
         <translation>类型</translation>
     </message>
     <message>
-        <location filename="../debugger.cpp" line="2504"/>
+        <location filename="../debugger.cpp" line="2521"/>
         <source>Value</source>
         <translation>值</translation>
     </message>
diff --git a/RedPandaIDE/translations/RedPandaIDE_zh_TW.ts b/RedPandaIDE/translations/RedPandaIDE_zh_TW.ts
index aeea4d47..23169567 100644
--- a/RedPandaIDE/translations/RedPandaIDE_zh_TW.ts
+++ b/RedPandaIDE/translations/RedPandaIDE_zh_TW.ts
@@ -4529,6 +4529,14 @@
         <source>Can&apos;t open last open information file &apos;%1&apos; for write!</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>In current file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>In current project</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>NewClassDialog</name>
@@ -4780,14 +4788,6 @@
         <source>untitled</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Can&apos;t save file</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Can&apos;t save file &apos;%1&apos;</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <source>Error Load File</source>
         <translation type="unfinished"></translation>
diff --git a/RedPandaIDE/widgets/classbrowser.cpp b/RedPandaIDE/widgets/classbrowser.cpp
index 488495f4..d6776dc5 100644
--- a/RedPandaIDE/widgets/classbrowser.cpp
+++ b/RedPandaIDE/widgets/classbrowser.cpp
@@ -206,6 +206,7 @@ void ClassBrowserModel::clear()
     mRoot->children.clear();
     mNodes.clear();
     mDummyStatements.clear();
+    mScopeNodes.clear();
     endResetModel();
 }
 
@@ -230,25 +231,15 @@ void ClassBrowserModel::fillStatements()
             return;
         if (!mParser->freeze())
             return;
-        {
-            auto action2 = finally([this]{
-                mParser->unFreeze();
-            });
-            QString mParserSerialId = mParser->serialId();
-            if (!mCurrentFile.isEmpty()) {
-                // QSet<QString> includedFiles = mParser->getFileIncludes(mCurrentFile);
-
-                addMembers();
-                // Remember selection
-//                  if fLastSelection <> '' then
-//                    ReSelect;
-            }
-
+        QString mParserSerialId = mParser->serialId();
+        if (!mCurrentFile.isEmpty()) {
+            addMembers();
         }
+        mParser->unFreeze();
     }
 }
 
-void ClassBrowserModel::addChild(ClassBrowserNode *node, PStatement statement)
+PClassBrowserNode ClassBrowserModel::addChild(ClassBrowserNode *node, const PStatement& statement)
 {
     PClassBrowserNode newNode = std::make_shared<ClassBrowserNode>();
     newNode->parent = node;
@@ -256,23 +247,71 @@ void ClassBrowserModel::addChild(ClassBrowserNode *node, PStatement statement)
 //    newNode->childrenFetched = false;
     node->children.append(newNode.get());
     mNodes.append(newNode);
+    if (statement->kind == StatementKind::skClass
+            || statement->kind == StatementKind::skNamespace)
+        mScopeNodes.insert(statement->fullName,newNode);
     //don't show enum type's children values (they are displayed in parent scope)
-    if (statement->kind != StatementKind::skEnumType)
+    if (statement->kind != StatementKind::skEnumType) {
         filterChildren(newNode.get(), statement->children);
+    }
+    return newNode;
 }
 
 void ClassBrowserModel::addMembers()
 {
-    // show statements in the file
-    PFileIncludes p = mParser->findFileIncludes(mCurrentFile);
-    if (!p)
-        return;
-    filterChildren(mRoot,p->statements);
+    if (mClassBrowserType==ProjectClassBrowserType::CurrentFile) {
+        // show statements in the file
+        PFileIncludes p = mParser->findFileIncludes(mCurrentFile);
+        if (!p)
+            return;
+        filterChildren(mRoot,p->statements);
+    } else {
+        foreach(const QString& file,mCurrentFiles) {
+            PFileIncludes p = mParser->findFileIncludes(file);
+            if (!p)
+                return;
+            filterChildren(mRoot,p->statements);
+        }
+    }
+    sortNode(mRoot);
+}
+
+void ClassBrowserModel::sortNode(ClassBrowserNode *node)
+{
+    if (pSettings->ui().classBrowserSortAlpha()
+            && pSettings->ui().classBrowserSortType()) {
+        std::sort(node->children.begin(),node->children.end(),
+                  [](ClassBrowserNode* node1,ClassBrowserNode* node2) {
+            if (node1->statement->kind < node2->statement->kind) {
+                return true;
+            } else if (node1->statement->kind == node2->statement->kind) {
+                return node1->statement->command.toLower() < node2->statement->command.toLower();
+            } else {
+                return false;
+            }
+        });
+    } else if (pSettings->ui().classBrowserSortAlpha()) {
+        std::sort(node->children.begin(),node->children.end(),
+                  [](ClassBrowserNode* node1,ClassBrowserNode* node2) {
+            return node1->statement->command.toLower() < node2->statement->command.toLower();
+        });
+    } else if (pSettings->ui().classBrowserSortType()) {
+        std::sort(node->children.begin(),node->children.end(),
+                  [](ClassBrowserNode* node1,ClassBrowserNode* node2) {
+            return node1->statement->kind < node2->statement->kind;
+        });
+    }
+    foreach(ClassBrowserNode* child,node->children) {
+        sortNode(child);
+    }
 }
 
 void ClassBrowserModel::filterChildren(ClassBrowserNode *node, const StatementMap &statements)
 {
     for (PStatement statement:statements) {
+        if (mClassBrowserType==ProjectClassBrowserType::WholeProject
+                && !statement->inProject)
+            continue;
         if (statement->kind == StatementKind::skBlock)
             continue;
         if (statement->isInherited && !pSettings->ui().classBrowserShowInherited())
@@ -284,91 +323,51 @@ void ClassBrowserModel::filterChildren(ClassBrowserNode *node, const StatementMa
         if (statement->scope == StatementScope::ssLocal)
             continue;
 
+        if (pSettings->codeCompletion().hideSymbolsStartsWithTwoUnderLine()
+                && statement->command.startsWith("__"))
+            continue;
 
-//        if (fStatementsType = cbstProject) then begin
-//          if not Statement^._InProject then
-//            Continue;
-//          if Statement^._Static and not SameText(Statement^._FileName,fCurrentFile)
-//            and not SameText(Statement^._FileName,fCurrentFile) then
-//            Continue;
-//        end;
+        if (pSettings->codeCompletion().hideSymbolsStartsWithUnderLine()
+                && statement->command.startsWith('_'))
+            continue;
 
         // we only test and handle orphan statements in the top level (node->statement is null)
         PStatement parentScope = statement->parentScope.lock();
-        if ((parentScope!=node->statement) && (!node->statement)) {
-
-//          // we only handle orphan statements when type is cbstFile
-//          if fStatementsType <> cbstFile then
-//            Continue;
-
+        if ( (mClassBrowserType==ProjectClassBrowserType::CurrentFile)
+                && (parentScope!=node->statement)
+                && (!parentScope || !node->statement
+                    || parentScope->fullName!=node->statement->fullName)) {
 //          //should not happend, just in case of error
             if (!parentScope)
                 continue;
 
             // Processing the orphan statement
-            while (statement) {
                 //the statement's parent is in this file, so it's not a real orphan
-                if ((parentScope->fileName==mCurrentFile)
-                        ||(parentScope->definitionFileName==mCurrentFile))
-                    break;
-
-                PStatement dummyParent = mDummyStatements.value(parentScope->fullName,PStatement());
-                if (dummyParent) {
-                    dummyParent->children.insert(statement->command,statement);
-                    break;
-                }
-                dummyParent = createDummy(parentScope);
-                dummyParent->children.insert(statement->command,statement);
-                //we are adding an orphan statement, just add it
-                statement = dummyParent;
-                parentScope = statement->parentScope.lock();
-                if (!parentScope) {
-                    addChild(node,statement);
-
-                    break;
-                }
-            }
-        } else if (statement->kind == StatementKind::skNamespace) {
-            PStatement dummy = mDummyStatements.value(statement->fullName,PStatement());
-            if (dummy) {
-                for (PStatement child: statement->children) {
-                    dummy->children.insert(child->command,child);
-                }
+            if ((parentScope->fileName==mCurrentFile)
+                    ||(parentScope->definitionFileName==mCurrentFile))
                 continue;
+
+            ClassBrowserNode *dummyNode = getParentNode(parentScope,1);
+            if (dummyNode)
+                addChild(dummyNode,statement);
+        } else if (statement->kind == StatementKind::skNamespace) {
+            //PStatement dummy = mDummyStatements.value(statement->fullName,PStatement());
+            PClassBrowserNode dummyNode = mScopeNodes.value(statement->fullName,PClassBrowserNode());
+            if (dummyNode) {
+                filterChildren(dummyNode.get(),statement->children);
+                continue;
+            } else {
+                PStatement dummy = createDummy(statement);
+                dummy->children = statement->children;
+                dummyNode = addChild(node,dummy);
             }
-            dummy = createDummy(statement);
-            dummy->children = statement->children;
-            addChild(node,dummy);
         } else {
             addChild(node,statement);
         }
     }
-    if (pSettings->ui().classBrowserSortAlpha()
-            && pSettings->ui().classBrowserSortType()) {
-        std::sort(node->children.begin(),node->children.end(),
-                  [](ClassBrowserNode* node1,ClassBrowserNode* node2) {
-            if (node1->statement->kind < node2->statement->kind) {
-                return true;
-            } else if (node1->statement->kind == node2->statement->kind) {
-                return node1->statement->command < node2->statement->command;
-            } else {
-                return false;
-            }
-        });
-    } else if (pSettings->ui().classBrowserSortAlpha()) {
-        std::sort(node->children.begin(),node->children.end(),
-                  [](ClassBrowserNode* node1,ClassBrowserNode* node2) {
-            return node1->statement->command < node2->statement->command;
-        });
-    } else if (pSettings->ui().classBrowserSortType()) {
-        std::sort(node->children.begin(),node->children.end(),
-                  [](ClassBrowserNode* node1,ClassBrowserNode* node2) {
-            return node1->statement->kind < node2->statement->kind;
-        });
-    }
 }
 
-PStatement ClassBrowserModel::createDummy(PStatement statement)
+PStatement ClassBrowserModel::createDummy(const PStatement& statement)
 {
     PStatement result = std::make_shared<Statement>();
     result->parentScope = statement->parentScope;
@@ -393,6 +392,49 @@ PStatement ClassBrowserModel::createDummy(PStatement statement)
     return result;
 }
 
+ClassBrowserNode* ClassBrowserModel::getParentNode(const PStatement &parentStatement, int depth)
+{
+    if (depth>10)
+        return nullptr;
+    if (!parentStatement)
+        return mRoot;
+    if (parentStatement->kind!=skClass
+            && parentStatement->kind!=skNamespace)
+        return mRoot;
+    PClassBrowserNode parentNode = mScopeNodes.value(parentStatement->fullName,PClassBrowserNode());
+    if (!parentNode) {
+        PStatement dummyParent = createDummy(parentStatement);
+        //todo: find the correct parent node
+        ClassBrowserNode *grandNode = getParentNode(parentStatement->parentScope.lock(), depth+1);
+        parentNode = addChild(grandNode,dummyParent);
+    }
+    return parentNode.get();
+}
+
+const QStringList &ClassBrowserModel::currentFiles() const
+{
+    return mCurrentFiles;
+}
+
+void ClassBrowserModel::setCurrentFiles(const QStringList &newCurrentFiles)
+{
+    mCurrentFiles = newCurrentFiles;
+}
+
+ProjectClassBrowserType ClassBrowserModel::classBrowserType() const
+{
+    return mClassBrowserType;
+}
+
+void ClassBrowserModel::setClassBrowserType(ProjectClassBrowserType newClassBrowserType)
+{
+    if (mClassBrowserType != newClassBrowserType) {
+        beginUpdate();
+        mClassBrowserType = newClassBrowserType;
+        endUpdate();
+    }
+}
+
 const std::shared_ptr<QHash<StatementKind, std::shared_ptr<ColorSchemeItem> > > &ClassBrowserModel::colors() const
 {
     return mColors;
diff --git a/RedPandaIDE/widgets/classbrowser.h b/RedPandaIDE/widgets/classbrowser.h
index 7274b3ca..e628d6dc 100644
--- a/RedPandaIDE/widgets/classbrowser.h
+++ b/RedPandaIDE/widgets/classbrowser.h
@@ -19,6 +19,7 @@
 
 #include <QAbstractItemModel>
 #include "parser/cppparser.h"
+#include "../projectoptions.h"
 
 struct ClassBrowserNode {
     ClassBrowserNode* parent;
@@ -55,27 +56,37 @@ public:
     void beginUpdate();
     void endUpdate();
 
-
     const std::shared_ptr<QHash<StatementKind, std::shared_ptr<ColorSchemeItem> > > &colors() const;
     void setColors(const std::shared_ptr<QHash<StatementKind, std::shared_ptr<ColorSchemeItem> > > &newColors);
 
+    ProjectClassBrowserType classBrowserType() const;
+    void setClassBrowserType(ProjectClassBrowserType newClassBrowserType);
+
+    const QStringList &currentFiles() const;
+    void setCurrentFiles(const QStringList &newCurrentFiles);
+
 public slots:
     void fillStatements();
 private:
-    void addChild(ClassBrowserNode* node, PStatement statement);
+    PClassBrowserNode addChild(ClassBrowserNode* node, const PStatement& statement);
     void addMembers();
+    void sortNode(ClassBrowserNode * node);
     void filterChildren(ClassBrowserNode * node, const StatementMap& statements);
-    PStatement createDummy(PStatement statement);
+    PStatement createDummy(const PStatement& statement);
+    ClassBrowserNode* getParentNode(const PStatement &parentStatement, int depth);
 private:
     ClassBrowserNode * mRoot;
     QHash<QString,PStatement> mDummyStatements;
+    QHash<QString,PClassBrowserNode> mScopeNodes;
     QVector<PClassBrowserNode> mNodes;
     PCppParser mParser;
     bool mUpdating;
     int mUpdateCount;
     QMutex mMutex;
     QString mCurrentFile;
+    QStringList mCurrentFiles;
     std::shared_ptr<QHash<StatementKind, std::shared_ptr<ColorSchemeItem> > > mColors;
+    ProjectClassBrowserType mClassBrowserType;
 
 };