diff --git a/src/data/core/core.qrc b/src/data/core/core.qrc
index 766cfe9b..d2467518 100644
--- a/src/data/core/core.qrc
+++ b/src/data/core/core.qrc
@@ -93,6 +93,7 @@
icons/search_dock.svg
icons/snippet_dock.svg
icons/location_list_dock.svg
+ icons/console_dock.svg
logo/vnote.svg
logo/vnote.png
logo/256x256/vnote.png
diff --git a/src/data/core/icons/console_dock.svg b/src/data/core/icons/console_dock.svg
new file mode 100644
index 00000000..c8c10882
--- /dev/null
+++ b/src/data/core/icons/console_dock.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/src/data/extra/extra.qrc b/src/data/extra/extra.qrc
index cfb8c026..1fa43ccb 100644
--- a/src/data/extra/extra.qrc
+++ b/src/data/extra/extra.qrc
@@ -540,5 +540,39 @@
syntax-highlighting/syntax/yang.xml
syntax-highlighting/syntax/zonnon.xml
syntax-highlighting/syntax/zsh.xml
+ syntax-highlighting/themes/vscode-dark.theme
+ themes/vscode-dark/arrow_dropdown.svg
+ themes/vscode-dark/arrow_dropdown_disabled.svg
+ themes/vscode-dark/branch_closed.svg
+ themes/vscode-dark/branch_open.svg
+ themes/vscode-dark/checkbox_checked.svg
+ themes/vscode-dark/checkbox_checked_disabled.svg
+ themes/vscode-dark/checkbox_unchecked.svg
+ themes/vscode-dark/checkbox_unchecked_disabled.svg
+ themes/vscode-dark/close.svg
+ themes/vscode-dark/close_grey.svg
+ themes/vscode-dark/cover.png
+ themes/vscode-dark/down.svg
+ themes/vscode-dark/down_disabled.svg
+ themes/vscode-dark/float.svg
+ themes/vscode-dark/highlight.css
+ themes/vscode-dark/interface.qss
+ themes/vscode-dark/left.svg
+ themes/vscode-dark/left_disabled.svg
+ themes/vscode-dark/menu_checkbox.svg
+ themes/vscode-dark/menu_radiobutton.svg
+ themes/vscode-dark/palette.json
+ themes/vscode-dark/radiobutton_checked.svg
+ themes/vscode-dark/radiobutton_checked_disabled.svg
+ themes/vscode-dark/radiobutton_unchecked.svg
+ themes/vscode-dark/radiobutton_unchecked_disabled.svg
+ themes/vscode-dark/readme.md
+ themes/vscode-dark/right.svg
+ themes/vscode-dark/right_disabled.svg
+ themes/vscode-dark/sizegrip.svg
+ themes/vscode-dark/text-editor.theme
+ themes/vscode-dark/up.svg
+ themes/vscode-dark/up_disabled.svg
+ themes/vscode-dark/web.css
diff --git a/src/data/extra/syntax-highlighting/themes/dark_vs.theme b/src/data/extra/syntax-highlighting/themes/vscode-dark.theme
similarity index 99%
rename from src/data/extra/syntax-highlighting/themes/dark_vs.theme
rename to src/data/extra/syntax-highlighting/themes/vscode-dark.theme
index ba7eb2be..1ace47be 100644
--- a/src/data/extra/syntax-highlighting/themes/dark_vs.theme
+++ b/src/data/extra/syntax-highlighting/themes/vscode-dark.theme
@@ -1,7 +1,7 @@
{
"metadata" : {
"revision" : 1,
- "name" : "dark_vs"
+ "name" : "vscode-dark"
},
"text-styles": {
"Normal" : {
diff --git a/src/data/extra/themes/dark_vs/arrow_dropdown.svg b/src/data/extra/themes/vscode-dark/arrow_dropdown.svg
similarity index 100%
rename from src/data/extra/themes/dark_vs/arrow_dropdown.svg
rename to src/data/extra/themes/vscode-dark/arrow_dropdown.svg
diff --git a/src/data/extra/themes/dark_vs/arrow_dropdown_disabled.svg b/src/data/extra/themes/vscode-dark/arrow_dropdown_disabled.svg
similarity index 100%
rename from src/data/extra/themes/dark_vs/arrow_dropdown_disabled.svg
rename to src/data/extra/themes/vscode-dark/arrow_dropdown_disabled.svg
diff --git a/src/data/extra/themes/dark_vs/branch_closed.svg b/src/data/extra/themes/vscode-dark/branch_closed.svg
similarity index 100%
rename from src/data/extra/themes/dark_vs/branch_closed.svg
rename to src/data/extra/themes/vscode-dark/branch_closed.svg
diff --git a/src/data/extra/themes/dark_vs/branch_open.svg b/src/data/extra/themes/vscode-dark/branch_open.svg
similarity index 100%
rename from src/data/extra/themes/dark_vs/branch_open.svg
rename to src/data/extra/themes/vscode-dark/branch_open.svg
diff --git a/src/data/extra/themes/dark_vs/checkbox_checked.svg b/src/data/extra/themes/vscode-dark/checkbox_checked.svg
similarity index 100%
rename from src/data/extra/themes/dark_vs/checkbox_checked.svg
rename to src/data/extra/themes/vscode-dark/checkbox_checked.svg
diff --git a/src/data/extra/themes/dark_vs/checkbox_checked_disabled.svg b/src/data/extra/themes/vscode-dark/checkbox_checked_disabled.svg
similarity index 100%
rename from src/data/extra/themes/dark_vs/checkbox_checked_disabled.svg
rename to src/data/extra/themes/vscode-dark/checkbox_checked_disabled.svg
diff --git a/src/data/extra/themes/dark_vs/checkbox_unchecked.svg b/src/data/extra/themes/vscode-dark/checkbox_unchecked.svg
similarity index 100%
rename from src/data/extra/themes/dark_vs/checkbox_unchecked.svg
rename to src/data/extra/themes/vscode-dark/checkbox_unchecked.svg
diff --git a/src/data/extra/themes/dark_vs/checkbox_unchecked_disabled.svg b/src/data/extra/themes/vscode-dark/checkbox_unchecked_disabled.svg
similarity index 100%
rename from src/data/extra/themes/dark_vs/checkbox_unchecked_disabled.svg
rename to src/data/extra/themes/vscode-dark/checkbox_unchecked_disabled.svg
diff --git a/src/data/extra/themes/dark_vs/close.svg b/src/data/extra/themes/vscode-dark/close.svg
similarity index 100%
rename from src/data/extra/themes/dark_vs/close.svg
rename to src/data/extra/themes/vscode-dark/close.svg
diff --git a/src/data/extra/themes/dark_vs/close_grey.svg b/src/data/extra/themes/vscode-dark/close_grey.svg
similarity index 100%
rename from src/data/extra/themes/dark_vs/close_grey.svg
rename to src/data/extra/themes/vscode-dark/close_grey.svg
diff --git a/src/data/extra/themes/dark_vs/cover.png b/src/data/extra/themes/vscode-dark/cover.png
similarity index 100%
rename from src/data/extra/themes/dark_vs/cover.png
rename to src/data/extra/themes/vscode-dark/cover.png
diff --git a/src/data/extra/themes/dark_vs/down.svg b/src/data/extra/themes/vscode-dark/down.svg
similarity index 100%
rename from src/data/extra/themes/dark_vs/down.svg
rename to src/data/extra/themes/vscode-dark/down.svg
diff --git a/src/data/extra/themes/dark_vs/down_disabled.svg b/src/data/extra/themes/vscode-dark/down_disabled.svg
similarity index 100%
rename from src/data/extra/themes/dark_vs/down_disabled.svg
rename to src/data/extra/themes/vscode-dark/down_disabled.svg
diff --git a/src/data/extra/themes/dark_vs/float.svg b/src/data/extra/themes/vscode-dark/float.svg
similarity index 100%
rename from src/data/extra/themes/dark_vs/float.svg
rename to src/data/extra/themes/vscode-dark/float.svg
diff --git a/src/data/extra/themes/dark_vs/highlight.css b/src/data/extra/themes/vscode-dark/highlight.css
similarity index 100%
rename from src/data/extra/themes/dark_vs/highlight.css
rename to src/data/extra/themes/vscode-dark/highlight.css
diff --git a/src/data/extra/themes/dark_vs/interface.qss b/src/data/extra/themes/vscode-dark/interface.qss
similarity index 100%
rename from src/data/extra/themes/dark_vs/interface.qss
rename to src/data/extra/themes/vscode-dark/interface.qss
diff --git a/src/data/extra/themes/dark_vs/left.svg b/src/data/extra/themes/vscode-dark/left.svg
similarity index 100%
rename from src/data/extra/themes/dark_vs/left.svg
rename to src/data/extra/themes/vscode-dark/left.svg
diff --git a/src/data/extra/themes/dark_vs/left_disabled.svg b/src/data/extra/themes/vscode-dark/left_disabled.svg
similarity index 100%
rename from src/data/extra/themes/dark_vs/left_disabled.svg
rename to src/data/extra/themes/vscode-dark/left_disabled.svg
diff --git a/src/data/extra/themes/dark_vs/menu_checkbox.svg b/src/data/extra/themes/vscode-dark/menu_checkbox.svg
similarity index 100%
rename from src/data/extra/themes/dark_vs/menu_checkbox.svg
rename to src/data/extra/themes/vscode-dark/menu_checkbox.svg
diff --git a/src/data/extra/themes/dark_vs/menu_radiobutton.svg b/src/data/extra/themes/vscode-dark/menu_radiobutton.svg
similarity index 100%
rename from src/data/extra/themes/dark_vs/menu_radiobutton.svg
rename to src/data/extra/themes/vscode-dark/menu_radiobutton.svg
diff --git a/src/data/extra/themes/dark_vs/palette.json b/src/data/extra/themes/vscode-dark/palette.json
similarity index 99%
rename from src/data/extra/themes/dark_vs/palette.json
rename to src/data/extra/themes/vscode-dark/palette.json
index 5779881c..92bd1961 100644
--- a/src/data/extra/themes/dark_vs/palette.json
+++ b/src/data/extra/themes/vscode-dark/palette.json
@@ -3,14 +3,14 @@
"revision" : 0,
"//comment" : "If there is a file named 'editor-highlight.theme' under theme folder, this value will be ignored.",
"//comment" : "Otherwise, this value specify the theme name to use for syntax highlighting.",
- "editor-highlight-theme" : "dark_vs",
+ "editor-highlight-theme" : "vscode-dark",
"//comment" : "If there is a file named 'markdown-editor-highlight.theme' under theme folder, this value will be ignored.",
"//comment" : "Otherwise, this value specify the theme name to use for syntax highlighting.",
"//comment" : "If empty, 'editor-highlight-theme' will be used.",
- "markdown-editor-highlight-theme" : "dark_vs",
- "display_name" : "dark_vs",
+ "markdown-editor-highlight-theme" : "vscode-dark",
+ "display_name" : "VSCode-dark",
"//comment" : "Display name for different locales",
- "display_name_zh_CN" : "黑暗"
+ "display_name_zh_CN" : "VSCode-深色"
},
"palette" : {
"bg1_1" : "#07080d",
diff --git a/src/data/extra/themes/dark_vs/radiobutton_checked.svg b/src/data/extra/themes/vscode-dark/radiobutton_checked.svg
similarity index 100%
rename from src/data/extra/themes/dark_vs/radiobutton_checked.svg
rename to src/data/extra/themes/vscode-dark/radiobutton_checked.svg
diff --git a/src/data/extra/themes/dark_vs/radiobutton_checked_disabled.svg b/src/data/extra/themes/vscode-dark/radiobutton_checked_disabled.svg
similarity index 100%
rename from src/data/extra/themes/dark_vs/radiobutton_checked_disabled.svg
rename to src/data/extra/themes/vscode-dark/radiobutton_checked_disabled.svg
diff --git a/src/data/extra/themes/dark_vs/radiobutton_unchecked.svg b/src/data/extra/themes/vscode-dark/radiobutton_unchecked.svg
similarity index 100%
rename from src/data/extra/themes/dark_vs/radiobutton_unchecked.svg
rename to src/data/extra/themes/vscode-dark/radiobutton_unchecked.svg
diff --git a/src/data/extra/themes/dark_vs/radiobutton_unchecked_disabled.svg b/src/data/extra/themes/vscode-dark/radiobutton_unchecked_disabled.svg
similarity index 100%
rename from src/data/extra/themes/dark_vs/radiobutton_unchecked_disabled.svg
rename to src/data/extra/themes/vscode-dark/radiobutton_unchecked_disabled.svg
diff --git a/src/data/extra/themes/dark_vs/readme.md b/src/data/extra/themes/vscode-dark/readme.md
similarity index 100%
rename from src/data/extra/themes/dark_vs/readme.md
rename to src/data/extra/themes/vscode-dark/readme.md
diff --git a/src/data/extra/themes/dark_vs/right.svg b/src/data/extra/themes/vscode-dark/right.svg
similarity index 100%
rename from src/data/extra/themes/dark_vs/right.svg
rename to src/data/extra/themes/vscode-dark/right.svg
diff --git a/src/data/extra/themes/dark_vs/right_disabled.svg b/src/data/extra/themes/vscode-dark/right_disabled.svg
similarity index 100%
rename from src/data/extra/themes/dark_vs/right_disabled.svg
rename to src/data/extra/themes/vscode-dark/right_disabled.svg
diff --git a/src/data/extra/themes/dark_vs/sizegrip.svg b/src/data/extra/themes/vscode-dark/sizegrip.svg
similarity index 100%
rename from src/data/extra/themes/dark_vs/sizegrip.svg
rename to src/data/extra/themes/vscode-dark/sizegrip.svg
diff --git a/src/data/extra/themes/dark_vs/text-editor.theme b/src/data/extra/themes/vscode-dark/text-editor.theme
similarity index 99%
rename from src/data/extra/themes/dark_vs/text-editor.theme
rename to src/data/extra/themes/vscode-dark/text-editor.theme
index 61032d70..7a77c8fa 100644
--- a/src/data/extra/themes/dark_vs/text-editor.theme
+++ b/src/data/extra/themes/vscode-dark/text-editor.theme
@@ -1,7 +1,7 @@
{
"metadata" : {
"revision" : 0,
- "name" : "dark_vs",
+ "name" : "vscode-dark",
"type" : "vtextedit"
},
"editor-styles" : {
diff --git a/src/data/extra/themes/dark_vs/up.svg b/src/data/extra/themes/vscode-dark/up.svg
similarity index 100%
rename from src/data/extra/themes/dark_vs/up.svg
rename to src/data/extra/themes/vscode-dark/up.svg
diff --git a/src/data/extra/themes/dark_vs/up_disabled.svg b/src/data/extra/themes/vscode-dark/up_disabled.svg
similarity index 100%
rename from src/data/extra/themes/dark_vs/up_disabled.svg
rename to src/data/extra/themes/vscode-dark/up_disabled.svg
diff --git a/src/data/extra/themes/dark_vs/web.css b/src/data/extra/themes/vscode-dark/web.css
similarity index 100%
rename from src/data/extra/themes/dark_vs/web.css
rename to src/data/extra/themes/vscode-dark/web.css
diff --git a/src/widgets/dockwidgethelper.cpp b/src/widgets/dockwidgethelper.cpp
index 1af3c41a..31d500a6 100644
--- a/src/widgets/dockwidgethelper.cpp
+++ b/src/widgets/dockwidgethelper.cpp
@@ -79,6 +79,8 @@ QString DockWidgetHelper::iconFileName(DockIndex p_dockIndex)
return "snippet_dock.svg";
case DockIndex::LocationListDock:
return "location_list_dock.svg";
+ case DockIndex::ConsoleDock:
+ return "console_dock.svg";
default:
return QString();
}
diff --git a/src/widgets/editors/markdowneditor.cpp b/src/widgets/editors/markdowneditor.cpp
index 28e9586e..413422c0 100644
--- a/src/widgets/editors/markdowneditor.cpp
+++ b/src/widgets/editors/markdowneditor.cpp
@@ -1057,7 +1057,6 @@ void MarkdownEditor::parseToMarkdownAndPaste()
void MarkdownEditor::handleHtmlToMarkdownData(quint64 p_id, TimeStamp p_timeStamp, const QString &p_text)
{
Q_UNUSED(p_id);
- qDebug() << "htmlToMarkdownData" << p_timeStamp << p_text;
if (m_timeStamp == p_timeStamp && !p_text.isEmpty()) {
QString text(p_text);