diff --git a/src/resources/themes/v_native/v_native.mdhl b/src/resources/themes/v_native/v_native.mdhl
index ee9e3c18..db9812f1 100644
--- a/src/resources/themes/v_native/v_native.mdhl
+++ b/src/resources/themes/v_native/v_native.mdhl
@@ -48,7 +48,7 @@ vim-insert-background: c5cae9
# [VNote] Vim normal mode cursor line background
vim-normal-background: e0e0e0
# [VNote] Vim visual mode cursor line background
-vim-visual-background: d3eafc
+vim-visual-background: ffe0b2
# [VNote] Vim replace mode cursor line background
vim-replace-background: f8bbd0
diff --git a/src/resources/themes/v_native/v_native.palette b/src/resources/themes/v_native/v_native.palette
index 6e5a73ac..926aaafa 100644
--- a/src/resources/themes/v_native/v_native.palette
+++ b/src/resources/themes/v_native/v_native.palette
@@ -7,7 +7,7 @@ mdhl_file=v_native.mdhl
css_file=v_native.css
codeblock_css_file=v_native_codeblock.css
mermaid_css_file=v_native_mermaid.css
-version=19
+version=20
[phony]
; Abstract color attributes.
diff --git a/src/resources/themes/v_pure/v_pure.mdhl b/src/resources/themes/v_pure/v_pure.mdhl
index da4b7ca4..a8c54cf3 100644
--- a/src/resources/themes/v_pure/v_pure.mdhl
+++ b/src/resources/themes/v_pure/v_pure.mdhl
@@ -49,7 +49,7 @@ vim-insert-background: c5cae9
# [VNote] Vim normal mode cursor line background
vim-normal-background: e0e0e0
# [VNote] Vim visual mode cursor line background
-vim-visual-background: d3eafc
+vim-visual-background: ffe0b2
# [VNote] Vim replace mode cursor line background
vim-replace-background: f8bbd0
diff --git a/src/resources/themes/v_pure/v_pure.palette b/src/resources/themes/v_pure/v_pure.palette
index 3697cd4c..0e8ac9e1 100644
--- a/src/resources/themes/v_pure/v_pure.palette
+++ b/src/resources/themes/v_pure/v_pure.palette
@@ -7,7 +7,7 @@ mdhl_file=v_pure.mdhl
css_file=v_pure.css
codeblock_css_file=v_pure_codeblock.css
mermaid_css_file=v_pure_mermaid.css
-version=20
+version=21
[phony]
; Abstract color attributes.
diff --git a/src/resources/vnote.ini b/src/resources/vnote.ini
index 84da0ba6..f4836129 100644
--- a/src/resources/vnote.ini
+++ b/src/resources/vnote.ini
@@ -257,6 +257,7 @@ max_num_of_tag_labels=3
smart_live_preview=3
; Support multiple keyboard layout
+; Not valid on macOS
multiple_keyboard_layout=true
; Whether insert new note in front
diff --git a/src/vcaptain.cpp b/src/vcaptain.cpp
index 30e41999..1e56270b 100644
--- a/src/vcaptain.cpp
+++ b/src/vcaptain.cpp
@@ -96,11 +96,10 @@ void VCaptain::keyPressEvent(QKeyEvent *p_event)
}
if (g_config->getMultipleKeyboardLayout()) {
- qDebug() << "Captain mode" << key << p_event->nativeScanCode() << p_event->nativeVirtualKey();
+ // Use virtual key here for different layout.
key = p_event->nativeVirtualKey();
}
- // Use virtual key here for different layout.
if (handleKeyPress(key, modifiers)) {
p_event->accept();
} else {
diff --git a/src/vconfigmanager.cpp b/src/vconfigmanager.cpp
index c4751b55..10f61e09 100644
--- a/src/vconfigmanager.cpp
+++ b/src/vconfigmanager.cpp
@@ -314,8 +314,12 @@ void VConfigManager::initialize()
m_smartLivePreview = getConfigFromSettings("global",
"smart_live_preview").toInt();
+#if defined(Q_OS_MACOS) || defined(Q_OS_MAC)
+ m_multipleKeyboardLayout = false;
+#else
m_multipleKeyboardLayout = getConfigFromSettings("global",
"multiple_keyboard_layout").toBool();
+#endif
m_insertNewNoteInFront = getConfigFromSettings("global",
"insert_new_note_in_front").toBool();
diff --git a/src/vfilelist.cpp b/src/vfilelist.cpp
index 8ec5cc83..f1174e6b 100644
--- a/src/vfilelist.cpp
+++ b/src/vfilelist.cpp
@@ -1286,7 +1286,9 @@ QMenu *VFileList::getOpenWithMenu()
if (item) {
VNoteFile *file = getVFile(item);
if (file
- && (!editArea->isFileOpened(file) || editArea->closeFile(file, false))) {
+ && (!g_config->getCloseBeforeExternalEditor()
+ || !editArea->isFileOpened(file)
+ || editArea->closeFile(file, false))) {
QUrl url = QUrl::fromLocalFile(file->fetchPath());
QDesktopServices::openUrl(url);
}
diff --git a/src/vmainwindow.cpp b/src/vmainwindow.cpp
index f0edb928..f8d17123 100644
--- a/src/vmainwindow.cpp
+++ b/src/vmainwindow.cpp
@@ -1442,10 +1442,14 @@ void VMainWindow::changeMarkdownConverter(QAction *action)
void VMainWindow::aboutMessage()
{
- QString info = tr("v%1").arg(VConfigManager::c_version);
- info += "
";
- info += tr("VNote is a free Vim-inspired note-taking application that knows programmers and Markdown better.");
+ QString info = tr("VNote");
info += "
";
+ info += tr("Version: %1").arg(VConfigManager::c_version);
+ info += "
";
+ info += tr("Author: Le Tan (tamlok)");
+ info += "
";
+ info += tr("VNote is a free and open source Vim-inspired note-taking application that knows programmers and Markdown better.");
+ info += "
";
info += tr("Please visit Github for more information.");
QMessageBox::about(this, tr("About VNote"), info);
}