theme: replace v_white with v_native

Change v_white to a more native theme.

src/resources/themes/v_native/v_native.css

@@ -228,72 +228,3 @@ table.hljs-ln tr td.hljs-ln-numbers {
 table.hljs-ln tr td.hljs-ln-code {
     padding-left: 10px;
 }
-
-::-webkit-scrollbar {
-    background-color: #EEEEEE;
-    width: 14px;
-    height: 14px;
-    border: none;
-}
-
-::-webkit-scrollbar-corner {
-    background-color: #EEEEEE;
-}
-
-::-webkit-scrollbar-button {
-    /* This selector affects the styling of both the up & down and left & right buttons of a scrollbar */
-    height: 14px;
-    width: 14px;
-    background-color: #EEEEEE;
-}
-
-::-webkit-scrollbar-button:hover {
-    background-color: #C0C0C0;
-}
-
-::-webkit-scrollbar-button:active {
-    background-color: #808080;
-}
-
-::-webkit-scrollbar-track {
-    /* This selector affects the styling of the area in the scrollbar between the two buttons */
-    background-color: #EEEEEE;
-}
-
-::-webkit-scrollbar-thumb {
-    /* This selector affects the styling of draggable element of the scollbar */
-    border: none;
-    background-color: #D0D0D0;
-}
-
-::-webkit-scrollbar-thumb:hover {
-    background-color: #C0C0C0;
-}
-
-::-webkit-scrollbar-thumb:active {
-    background-color: #808080;
-}
-
-::-webkit-scrollbar-button:horizontal:increment {
-    background-image: url(right.svg);
-    background-repeat: no-repeat;
-    background-size: contain;
-}
-
-::-webkit-scrollbar-button:horizontal:decrement {
-    background-image: url(left.svg);
-    background-repeat: no-repeat;
-    background-size: contain;
-}
-
-::-webkit-scrollbar-button:vertical:increment {
-    background-image: url(down.svg);
-    background-repeat: no-repeat;
-    background-size: contain;
-}
-
-::-webkit-scrollbar-button:vertical:decrement {
-    background-image: url(up.svg);
-    background-repeat: no-repeat;
-    background-size: contain;
-}

src/resources/themes/v_native/v_native.palette

@@ -2,11 +2,11 @@
 ; Use @color_tag to reference a style.
 
 [metadata]
-qss_file=v_white.qss
-mdhl_file=v_white.mdhl
-css_file=v_white.css
-codeblock_css_file=v_white_codeblock.css
-mermaid_css_file=v_white_mermaid.css
+qss_file=v_native.qss
+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=5
 
 [phony]
@@ -101,54 +101,20 @@ search_hit_item_bg=#80CBC4
 ; QWidget.
 widget_fg=@base_fg
 
-; Separator of dock widgets.
-dock_separator_bg=@title_bg
-dock_separator_hover_bg=@title_bg
-
 ; Menubar.
-menubar_bg=@main_bg
-menubar_fg=@main_fg
 menubar_item_selected_bg=@selected_bg
 
 ; Menu.
-menu_bg=@base_bg
-menu_fg=@base_fg
-menu_item_disabled_fg=@disabled_fg
-menu_item_selected_fg=@selected_fg
-menu_item_selected_bg=@selected_bg
 menu_separator_bg=@separator_bg
-menu_icon_fg=@icon_fg
-menu_icon_danger_fg=@danger_icon_fg
-
-; Tooltip.
-tooltip_border=@border_bg
-tooltip_bg=@base_bg
-tooltip_fg=@base_fg
 
 ; Toolbar.
-toolbar_bg=@main_bg
 toolbutton_hover_bg=@hover_bg
-toolbutton_pressed_bg=@pressed_bg
-toolbutton_checked_bg=@selected_bg
-toolbutton_icon_fg=@icon_fg
-toolbutton_icon_danger_fg=@danger_icon_fg
-
-; Toolbox.
-toolbox_icon_fg=@icon_fg
-toolbox_icon_active_fg=@icon_fg
 
 ; Dockwidget.
-dockwidget_title_fg=@title_fg
 dockwidget_title_bg=@title_bg
 dockwidget_button_hover_bg=@hover_bg
 
 ; PushButton.
-pushbutton_fg=@base_fg
-pushbutton_bg=transparent
-pushbutton_border=@border_bg
-pushbutton_pressed_bg=@pressed_bg
-pushbutton_checked_bg=@selected_bg
-pushbutton_hover_bg=@hover_bg
 pushbutton_default_border=#424242
 pushbutton_disabled_fg=@disabled_fg
 pushbutton_disabled_bg=@pushbutton_bg
@@ -184,58 +150,20 @@ pushbutton_dangerbtn_hover_bg=@danger_hover_bg
 pushbutton_dangerbtn_focus_bg=@danger_focus_bg
 pushbutton_dangerbtn_pressed_bg=@danger_pressed_bg
 
-button_icon_fg=@icon_fg
-button_icon_danger_fg=@danger_icon_fg
-
-buttonmenuitem_decoration_text_fg=#00796B
-
 ; ComboBox.
-combobox_border=@border_bg
-combobox_fg=@content_fg
 combobox_bg=@content_bg
-combobox_disabled_fg=@disabled_fg
 combobox_view_border=@border_bg
-combobox_view_selected_bg=@selected_bg
-combobox_view_selected_fg=@selected_fg
 combobox_view_item_hover_fg=@hover_fg
 combobox_view_item_hover_bg=@hover_bg
 combobox_focus_bg=@focus_bg
-combobox_item_icon_fg=@item_icon_fg
 
 ; Label.
-label_fg=@base_fg
 label_titlelabel_fg=@title_fg
 label_titlelabel_bg=@title_bg
 
 ; LineEdit.
-lineedit_border=@border_bg
 lineedit_fg=@content_fg
 lineedit_bg=@content_bg
-lineedit_disabled_fg=@disabled_fg
-lineedit_selection_fg=@selection_fg
-lineedit_selection_bg=@selection_bg
-
-; TabWidget.
-tabwidget_pane_border=@selected_bg
-
-; TabBar.
-tabbar_fg=@base_fg
-tabbar_bg=@base_bg
-tabbar_border=@border_bg
-
-tabbar_selected_fg=@selected_fg
-tabbar_selected_bg=@selected_bg
-tabbar_selected_border=@border_bg
-
-tabbar_hover_fg=@hover_fg
-tabbar_hover_bg=@hover_bg
-tabbar_hover_border=@border_bg
-
-tabbar_closebutton_hover_bg=@hover_bg
-tabbar_closebutton_focus_bg=@focus_bg
-
-tabbar_icon_fg=@icon_fg
-tabbar_icon_special_fg=@danger_bg
 
 ; SelectorItem.
 selectoritem_border=@base_fg
@@ -245,68 +173,5 @@ selectoritem_bg=@base_bg
 ; InsertSelector.
 insertselector_bg=@base_bg
 
-; TreeView.
-treeview_fg=@content_fg
-treeview_bg=@content_bg
-treeview_item_border_bg=@border_bg
-treeview_item_hover_fg=@hover_fg
-treeview_item_hover_bg=@hover_bg
-treeview_item_selected_fg=@selected_fg
-treeview_item_selected_bg=@selected_bg
-treeview_item_selected_avtive_fg=@active_fg
-treeview_item_selected_avtive_bg=@active_bg
-treeview_item_selected_inactive_fg=@inactive_fg
-treeview_item_selected_inactive_bg=@inactive_bg
-treeview_item_icon_fg=@item_icon_fg
-
-; ListView.
-listview_fg=@content_fg
-listview_bg=@content_bg
-listview_item_hover_fg=@hover_fg
-listview_item_hover_bg=@hover_bg
-listview_item_selected_fg=@selected_fg
-listview_item_selected_bg=@selected_bg
-listview_item_selected_avtive_fg=@active_fg
-listview_item_selected_avtive_bg=@active_bg
-listview_item_selected_inactive_fg=@inactive_fg
-listview_item_selected_inactive_bg=@inactive_bg
-
 ; Splitter.
 splitter_handle_bg=@title_bg
-
-; StatusBar.
-statusbar_fg=@main_fg
-statusbar_bg=@main_bg
-
-; ScrollBar.
-scrollbar_bg=#EEEEEE
-scrollbar_handle_bg=#D0D0D0
-scrollbar_handle_hover_bg=@hover_bg
-scrollbar_handle_pressed_bg=@pressed_bg
-
-; VEditWindow.
-editwindow_corner_icon_fg=@icon_fg
-editwindow_corner_icon_inactive_fg=#808080
-
-; CheckBox.
-checkbox_disabled_fg=@disabled_fg
-checkbox_indicator_hover_bg=@hover_bg
-checkbox_indicator_pressed_bg=@pressed_bg
-
-; RadioButton.
-radiobutton_indicator_hover_bg=@hover_bg
-radiobutton_indicator_pressed_bg=@pressed_bg
-
-; SpinBox.
-spinbox_fg=@content_fg
-spinbox_bg=@content_bg
-spinbox_border=@border_bg
-spinbox_button_hover_bg=@hover_bg
-spinbox_button_pressed_bg=@pressed_bg
-
-; HeaderView.
-headerview_bg=@base_bg
-headerview_fg=@base_fg
-headerview_border=@border_bg
-headerview_checked_fg=@selected_fg
-headerview_checked_bg=@selected_bg

src/resources/themes/v_native/v_native.qss

@@ -0,0 +1,511 @@
+/* QWidget */
+QWidget
+{
+    color: @widget_fg;
+    font-family: "Hiragino Sans GB", "冬青黑体", "Microsoft YaHei", "微软雅黑", "Microsoft YaHei UI", "WenQuanYi Micro Hei", "文泉驿雅黑", "Dengxian", "等线体", "STXihei", "华文细黑", "Liberation Sans", "Droid Sans", "NSimSun", "新宋体", "SimSun", "宋体", "Helvetica", "sans-serif", "Tahoma", "Arial", "Verdana", "Geneva", "Georgia", "Times New Roman";
+}
+
+QWidget[NotebookPanel="true"] {
+    padding-left: 3px;
+}
+/* End QWidget */
+
+/* QMenuBar */
+QMenuBar {
+    border: none;
+}
+
+QMenuBar::item:selected {
+    background: @menubar_item_selected_bg;
+}
+/* End QMenuBar */
+
+QToolBar {
+    border: none;
+}
+
+QToolButton:hover {
+    background: @toolbutton_hover_bg;
+}
+
+/* DockWidget */
+QDockWidget {
+    titlebar-close-icon: url(close.svg);
+    titlebar-normal-icon: url(float.svg);
+}
+
+QDockWidget::Title {
+    background: @dockwidget_title_bg;
+    text-align: center left;
+}
+
+QDockWidget::close-button, QDockWidget::float-button {
+    border: none;
+}
+
+QDockWidget::close-button:hover, QDockWidget::float-button:hover {
+    background: @dockwidget_button_hover_bg;
+}
+/* End DockWidget */
+
+/* QPushButton */
+QPushButton[CornerBtn="true"] {
+    padding: 4px -2px 4px -2px;
+    margin: 0px;
+    border: none;
+    background-color: transparent;
+}
+
+QPushButton[CornerBtn="true"]::menu-indicator {
+    image: none;
+}
+
+QPushButton[CornerBtn="true"]:focus {
+    background-color: @pushbutton_cornerbtn_focus_bg;
+}
+
+QPushButton[CornerBtn="true"]:hover {
+    background-color: @pushbutton_cornerbtn_hover_bg;
+}
+
+QPushButton[CornerBtn="true"]:pressed {
+    background-color: @pushbutton_cornerbtn_pressed_bg;
+}
+
+QPushButton[CornerBtn="true"]:disabled {
+    color: @pushbutton_disabled_fg;
+    background-color: @pushbutton_disabled_bg;
+}
+
+QPushButton[CornerBtn="true"]:default {
+    border: 1px solid @pushbutton_default_border;
+    background-color: transparent;
+}
+
+QPushButton[StatusBtn="true"] {
+    font: bold;
+    padding: 0px 2px 0px 2px;
+    margin: 0px;
+    border: none;
+    background-color: transparent;
+}
+
+QPushButton[StatusBtn="true"]:focus {
+    background-color: @pushbutton_statusbtn_focus_bg;;
+}
+
+QPushButton[StatusBtn="true"]:hover {
+    background-color: @pushbutton_statusbtn_hover_bg;
+}
+
+QPushButton[StatusBtn="true"]:pressed {
+    background-color: @pushbutton_statusbtn_pressed_bg;
+}
+
+QPushButton[StatusBtn="true"]:disabled {
+    color: @pushbutton_disabled_fg;
+    background-color: @pushbutton_disabled_bg;
+}
+
+QPushButton[StatusBtn="true"]:default {
+    border: 1px solid @pushbutton_default_border;
+    background-color: transparent;
+}
+
+QPushButton[FlatBtn="true"] {
+    padding: 4px;
+    margin: 0px;
+    border: none;
+    background-color: transparent;
+}
+
+QPushButton[FlatBtn="true"]:focus {
+    background-color: @pushbutton_flatbtn_focus_bg;
+}
+
+QPushButton[FlatBtn="true"]:hover {
+    background-color: @pushbutton_flatbtn_hover_bg;
+}
+
+QPushButton[FlatBtn="true"]:pressed {
+    background-color: @pushbutton_flatbtn_pressed_bg;
+}
+
+QPushButton[FlatBtn="true"]:disabled {
+    color: @pushbutton_disabled_fg;
+    background-color: @pushbutton_disabled_bg;
+}
+
+QPushButton[FlatBtn="true"]:default {
+    border: 1px solid @pushbutton_default_border;
+    background-color: transparent;
+}
+
+QPushButton[SelectionBtn="true"] {
+    padding: 4px 10px 4px 10px;
+    border: none;
+    background-color: transparent;
+    font-size: 15pt;
+    text-align: left;
+}
+
+QPushButton[SelectionBtn="true"]:focus {
+    background-color: @pushbutton_selectionbtn_focus_bg;
+}
+
+QPushButton[SelectionBtn="true"]:hover {
+    background-color: @pushbutton_selectionbtn_hover_bg;
+}
+
+QPushButton[SelectionBtn="true"]:pressed {
+    background-color: @pushbutton_selectionbtn_pressed_bg;
+}
+
+QPushButton[SelectionBtn="true"]:disabled {
+    color: @pushbutton_disabled_fg;
+    background-color: @pushbutton_disabled_bg;
+}
+
+QPushButton[SelectionBtn="true"]:default {
+    border: 1px solid @pushbutton_default_border;
+    background-color: transparent;
+}
+
+QPushButton[TitleBtn="true"] {
+    padding: 4px;
+    margin: 0px;
+    border: none;
+    background-color: @pushbutton_titlebtn_bg;
+}
+
+QPushButton[TitleBtn="true"]:focus {
+    background-color: @pushbutton_titlebtn_focus_bg;
+}
+
+QPushButton[TitleBtn="true"]:hover {
+    background-color: @pushbutton_titlebtn_hover_bg;
+}
+
+QPushButton[TitleBtn="true"]:pressed {
+    background-color: @pushbutton_titlebtn_pressed_bg;
+}
+
+QPushButton[TitleBtn="true"]:disabled {
+    color: @pushbutton_disabled_fg;
+    background-color: @pushbutton_disabled_bg;
+}
+
+QPushButton[TitleBtn="true"]:default {
+    border: 1px solid @pushbutton_default_border;
+    background-color: @pushbutton_titlebtn_bg;
+}
+
+QPushButton[DangerBtn="true"] {
+    color: @pushbutton_dangerbtn_fg;
+    border: none;
+    background-color: @pushbutton_dangerbtn_bg;
+}
+
+QPushButton[DangerBtn="true"]:focus {
+    background-color: @pushbutton_dangerbtn_focus_bg;
+}
+
+QPushButton[DangerBtn="true"]:hover {
+    background-color: @pushbutton_dangerbtn_hover_bg;
+}
+
+QPushButton[DangerBtn="true"]:pressed {
+    background-color: @pushbutton_dangerbtn_pressed_bg;
+}
+
+QPushButton[DangerBtn="true"]:disabled {
+    color: @pushbutton_disabled_fg;
+    background-color: @pushbutton_disabled_bg;
+}
+
+QPushButton[DangerBtn="true"]:default {
+    border: 1px solid @pushbutton_default_border;
+    background-color: @pushbutton_dangerbtn_bg;
+}
+
+QPushButton[AvatarBtn="true"] {
+    padding: 2px 4px 2px 4px;
+    margin: 0px;
+    border: none;
+    background-color: transparent;
+}
+
+QPushButton[AvatarBtn="true"]:focus {
+    background-color: @pushbutton_avatarbtn_focus_bg;;
+}
+
+QPushButton[AvatarBtn="true"]:hover {
+    background-color: @pushbutton_avatarbtn_hover_bg;
+}
+
+QPushButton[AvatarBtn="true"]:pressed {
+    background-color: @pushbutton_avatarbtn_pressed_bg;
+}
+
+QPushButton[AvatarBtn="true"]:disabled {
+    color: @pushbutton_disabled_fg;
+    background-color: @pushbutton_disabled_bg;
+}
+
+QPushButton[AvatarBtn="true"]:default {
+    border: 1px solid @pushbutton_default_border;
+    background-color: transparent;
+}
+
+VButtonMenuItem {
+    padding: 5px;
+    padding-right: 30px;
+    border: 1px solid transparent;
+    background-color: transparent;
+    text-align: left;
+}
+
+VButtonMenuItem[Heading1="true"] {
+    font-size: 22pt;
+}
+
+VButtonMenuItem[Heading2="true"] {
+    font-size: 20pt;
+}
+
+VButtonMenuItem[Heading3="true"] {
+    font-size: 18pt;
+}
+
+VButtonMenuItem[Heading4="true"] {
+    font-size: 16pt;
+}
+
+VButtonMenuItem[Heading5="true"] {
+    font-size: 14pt;
+}
+
+VButtonMenuItem[Heading6="true"] {
+    font-size: 14pt;
+}
+
+VButtonMenuItem:focus {
+    background-color: @menubar_item_selected_bg;
+}
+
+VButtonMenuItem:hover {
+    background-color: @menubar_item_selected_bg;
+}
+
+VButtonMenuItem:disabled {
+    color: @pushbutton_disabled_fg;
+    background-color: @pushbutton_disabled_bg;
+}
+/* End QPushButton*/
+
+/* QComboBox */
+QComboBox#NotebookSelector {
+    border: none;
+    font-size: 13pt;
+    padding-top: 3px;
+    padding-bottom: 3px;
+    icon-size: 30px;
+    background: @combobox_bg;
+}
+
+QComboBox#NotebookSelector:focus {
+    background-color: @combobox_focus_bg;
+}
+
+QComboBox#NotebookSelector::drop-down {
+    subcontrol-origin: padding;
+    subcontrol-position: top right;
+    width: 20px;
+    border: none;
+    background: transparent;
+}
+
+QComboBox#NotebookSelector::down-arrow {
+    image: url(arrow_dropdown.svg);
+    width: 20px;
+    height: 20px;
+}
+
+QComboBox#NotebookSelector::down-arrow:disabled {
+    image: url(arrow_dropdown_disabled.svg);
+    width: 20px;
+    height: 20px;
+}
+
+QComboBox#NotebookSelector QListWidget {
+    border: 1px solid @combobox_view_border;
+    background-color: @combobox_bg;
+    font-size: 13pt;
+    icon-size: 30px;
+}
+
+QComboBox#NotebookSelector QListWidget::item {
+    padding-top: 10px;
+    padding-bottom: 10px;
+}
+
+QComboBox#NotebookSelector QListWidget::item:hover {
+    color: @combobox_view_item_hover_fg;
+    background-color: @combobox_view_item_hover_bg;
+}
+/* End QComboBox */
+
+/* QLabel */
+QLabel[TitleLabel="true"] {
+    padding-top: 5px;
+    padding-bottom: 5px;
+    color: @label_titlelabel_fg;
+    background-color: @label_titlelabel_bg;
+}
+
+QLabel[ColorRedLabel="true"] {
+    padding-left: 5px;
+    padding-right: 5px;
+    font: bold;
+    color: white;
+    border-radius: 2px;
+    background-color: #D32F2F;
+}
+
+QLabel[ColorGreenLabel="true"] {
+    padding-left: 5px;
+    padding-right: 5px;
+    font: bold;
+    color: white;
+    border-radius: 2px;
+    background-color: #388E3C;
+}
+
+QLabel[ColorGreyLabel="true"] {
+    padding-left: 5px;
+    padding-right: 5px;
+    font: bold;
+    color: white;
+    border-radius: 2px;
+    background-color: #616161;
+}
+
+QLabel[ColorTealLabel="true"] {
+    padding-left: 5px;
+    padding-right: 5px;
+    font: bold;
+    color: white;
+    border-radius: 2px;
+    background-color: #00796B;
+}
+
+QLabel[MenuSeparator="true"] {
+    padding-top: 5px;
+    padding-bottom: 5px;
+    margin-top: 3px;
+    font: italic;
+    border-top: 1px solid @menu_separator_bg
+}
+
+VVimIndicator QLabel[VimIndicatorKeyLabel="true"] {
+    font: bold;
+    color: @vim_indicator_key_label_fg;
+    background: transparent;
+}
+
+VVimIndicator QLabel[VimIndicatorModeLabel="true"] {
+    padding: 0px 2px 0px 2px;
+    font: bold;
+    color: @vim_indicator_mode_label_fg;
+    /* background color will be controlled by the code. */
+}
+
+VTabIndicator QLabel[TabIndicatorLabel="true"] {
+    color: @tab_indicator_label_fg;
+    background: transparent;
+}
+/* End QLabel */
+
+/* QLineEdit */
+QLineEdit[VimCommandLine="true"] {
+    padding: 0px;
+    margin: 0px;
+    border: none;
+    color: @lineedit_fg;
+    background: @lineedit_bg;
+}
+/* End QLineEdit */
+
+/* QTabBar */
+QTabBar::close-button {
+    image: url(close_grey.svg);
+}
+
+QTabBar::close-button:focus {
+    image: url(close.svg);
+    background-color: @tabbar_closebutton_focus_bg;
+}
+
+QTabBar::close-button:hover {
+    image: url(close.svg);
+    background-color: @tabbar_closebutton_hover_bg;
+}
+/* End QTabBar */
+
+VSelectorItemWidget QLabel[SelectorItemShortcutLabel="true"] {
+    font: bold;
+    border: 2px solid @selectoritem_border;
+    padding: 3px;
+    border-radius: 5px;
+    background-color: @selectoritem_bg;
+    color: @selectoritem_fg;
+}
+
+VInsertSelector {
+    border: none;
+    background: @insertselector_bg;
+}
+
+/* QTreeView */
+QTreeView {
+    border: none;
+}
+
+QTreeView::item {
+    padding-top: 5px;
+    padding-bottom: 5px;
+}
+/* End QTreeView */
+
+/* QListView */
+QListView {
+    border: none;
+}
+
+QListView::item {
+    padding-top: 5px;
+    padding-bottom: 5px;
+}
+/* End QListView */
+
+/* QSplitter */
+QSplitter {
+    border: none;
+}
+
+QSplitter::handle {
+    background-color: @splitter_handle_bg;
+}
+
+QSplitter::handle:vertical {
+    height: 2px;
+}
+
+QSplitter::handle:horizontal {
+    width: 2px;
+}
+/* End QSplitter */
+
+QWidget#FindReplaceTitleWidget {
+    background: @title_bg;
+}

src/resources/themes/v_white/branch_closed.svg

@@ -1,8 +0,0 @@
-<svg width="512" height="512" xmlns="http://www.w3.org/2000/svg" xmlns:svg="http://www.w3.org/2000/svg">
- <g>
-  <title>Layer 1</title>
-  <g transform="rotate(-90 256.00000000000006,256) " id="svg_1">
-   <polygon fill="#333333" id="svg_2" points="128,192 256,320 384,192  "/>
-  </g>
- </g>
-</svg>

src/resources/themes/v_white/branch_end.svg

@@ -1,7 +0,0 @@
-<svg width="512" height="512" xmlns="http://www.w3.org/2000/svg" xmlns:svg="http://www.w3.org/2000/svg">
- <g>
-  <title>Layer 2</title>
-  <rect stroke="null" fill="#E0E0E0" stroke-width="null" stroke-dasharray="null" stroke-linejoin="null" stroke-linecap="null" x="225.3" y="0.100029" width="51" height="281.537138" id="svg_3"/>
-  <rect fill="#E0E0E0" stroke-width="null" stroke-dasharray="null" stroke-linejoin="null" stroke-linecap="null" x="346.499997" y="116.499998" width="51" height="278.999996" id="svg_6" transform="rotate(90 372,256.00000000000006) " stroke="null"/>
- </g>
-</svg>

src/resources/themes/v_white/branch_more.svg

@@ -1,7 +0,0 @@
-<svg width="512" height="512" xmlns="http://www.w3.org/2000/svg" xmlns:svg="http://www.w3.org/2000/svg">
- <g>
-  <title>Layer 2</title>
-  <rect stroke="null" fill="#E0E0E0" stroke-width="null" stroke-dasharray="null" stroke-linejoin="null" stroke-linecap="null" x="225.3" y="0.100029" width="51" height="511.910139" id="svg_3"/>
-  <rect fill="#E0E0E0" stroke-width="null" stroke-dasharray="null" stroke-linejoin="null" stroke-linecap="null" x="346.499997" y="116.499998" width="51" height="278.999996" id="svg_6" transform="rotate(90 372,256.00000000000006) " stroke="null"/>
- </g>
-</svg>

src/resources/themes/v_white/branch_open.svg

@@ -1,8 +0,0 @@
-<svg width="512" height="512" xmlns="http://www.w3.org/2000/svg" xmlns:svg="http://www.w3.org/2000/svg">
- <g>
-  <title>Layer 1</title>
-  <g id="svg_1">
-   <polygon fill="#333333" id="svg_2" points="128,192 256,320 384,192  "/>
-  </g>
- </g>
-</svg>

src/resources/themes/v_white/checkbox_checked.svg

@@ -1,7 +0,0 @@
-<svg width="512" height="512" xmlns="http://www.w3.org/2000/svg" xmlns:svg="http://www.w3.org/2000/svg">
- <g>
-  <title>Layer 1</title>
-  <rect id="svg_6" fill-opacity="0" height="299" width="299" y="106.5" x="106.5" stroke-linecap="null" stroke-linejoin="null" stroke-dasharray="null" stroke-width="30" stroke="#333333" fill="#000000"/>
-  <path stroke-opacity="0" id="svg_3" d="m126,243.24589l27.93756,-27.94743l76.53449,76.52461l127.58052,-127.54102l27.94743,27.92768l-155.52795,155.50821" stroke-width="5" fill="#333333" stroke="#000000"/>
- </g>
-</svg>

src/resources/themes/v_white/checkbox_unchecked.svg

@@ -1,6 +0,0 @@
-<svg width="512" height="512" xmlns="http://www.w3.org/2000/svg" xmlns:svg="http://www.w3.org/2000/svg">
- <g>
-  <title>Layer 1</title>
-  <rect id="svg_6" fill-opacity="0" height="299" width="299" y="106.5" x="106.5" stroke-linecap="null" stroke-linejoin="null" stroke-dasharray="null" stroke-width="30" stroke="#333333" fill="#000000"/>
- </g>
-</svg>

src/resources/themes/v_white/down.svg

@@ -1,8 +0,0 @@
-<svg width="512" height="512" xmlns="http://www.w3.org/2000/svg" xmlns:svg="http://www.w3.org/2000/svg">
- <g>
-  <title>Layer 1</title>
-  <g transform="null" id="svg_1">
-   <polygon points="128,192 256,320 384,192  " id="svg_2" fill="#333333"/>
-  </g>
- </g>
-</svg>

src/resources/themes/v_white/down_disabled.svg

@@ -1,8 +0,0 @@
-<svg width="512" height="512" xmlns="http://www.w3.org/2000/svg" xmlns:svg="http://www.w3.org/2000/svg">
- <g>
-  <title>Layer 1</title>
-  <g transform="null" id="svg_1">
-   <polygon points="128,192 256,320 384,192  " id="svg_2" fill="#C0C0C0"/>
-  </g>
- </g>
-</svg>

src/resources/themes/v_white/left.svg

@@ -1,8 +0,0 @@
-<svg width="512" height="512" xmlns="http://www.w3.org/2000/svg" xmlns:svg="http://www.w3.org/2000/svg">
- <g>
-  <title>Layer 1</title>
-  <g transform="rotate(90 255.99999999999997,256.00000000000006) " id="svg_1">
-   <polygon points="128,192 256,320 384,192  " id="svg_2" fill="#333333"/>
-  </g>
- </g>
-</svg>

src/resources/themes/v_white/left_disabled.svg

@@ -1,8 +0,0 @@
-<svg width="512" height="512" xmlns="http://www.w3.org/2000/svg" xmlns:svg="http://www.w3.org/2000/svg">
- <g>
-  <title>Layer 1</title>
-  <g transform="rotate(90 255.99999999999997,256.00000000000006) " id="svg_1">
-   <polygon points="128,192 256,320 384,192  " id="svg_2" fill="#C0C0C0"/>
-  </g>
- </g>
-</svg>

src/resources/themes/v_white/line.svg

@@ -1,6 +0,0 @@
-<svg width="512" height="512" xmlns="http://www.w3.org/2000/svg" xmlns:svg="http://www.w3.org/2000/svg">
- <g>
-  <title>Layer 2</title>
-  <rect stroke="null" id="svg_3" height="510.999989" width="51" y="0.100029" x="225.3" stroke-linecap="null" stroke-linejoin="null" stroke-dasharray="null" stroke-width="null" fill="#E0E0E0"/>
- </g>
-</svg>

src/resources/themes/v_white/menu_checkbox.svg

@@ -1,6 +0,0 @@
-<svg width="512" height="512" xmlns="http://www.w3.org/2000/svg" xmlns:svg="http://www.w3.org/2000/svg">
- <g>
-  <title>Layer 1</title>
-  <path stroke-opacity="0" id="svg_3" d="m126,243.24589l27.93756,-27.94743l76.53449,76.52461l127.58052,-127.54102l27.94743,27.92768l-155.52795,155.50821" stroke-width="5" fill="#333333" stroke="#000000"/>
- </g>
-</svg>

src/resources/themes/v_white/menu_radiobutton.svg

@@ -1,6 +0,0 @@
-<svg width="512" height="512" xmlns="http://www.w3.org/2000/svg" xmlns:svg="http://www.w3.org/2000/svg">
- <g>
-  <title>Layer 1</title>
-  <circle fill="#333333" stroke="#000000" stroke-width="20" stroke-dasharray="null" stroke-linejoin="null" stroke-linecap="null" stroke-opacity="0" cx="257.00002" cy="256" r="83.2406" id="svg_11"/>
- </g>
-</svg>

src/resources/themes/v_white/radiobutton_checked.svg

@@ -1,7 +0,0 @@
-<svg width="512" height="512" xmlns="http://www.w3.org/2000/svg" xmlns:svg="http://www.w3.org/2000/svg">
- <g>
-  <title>Layer 1</title>
-  <circle fill="#000000" stroke-width="30" stroke-dasharray="null" stroke-linejoin="null" stroke-linecap="null" fill-opacity="0" cx="256.00001" cy="256.00001" r="142.96561" id="svg_9" stroke="#333333"/>
-  <circle fill="#333333" stroke="#000000" stroke-width="20" stroke-dasharray="null" stroke-linejoin="null" stroke-linecap="null" stroke-opacity="0" cx="256.00002" cy="256" r="83.2406" id="svg_11"/>
- </g>
-</svg>

src/resources/themes/v_white/radiobutton_unchecked.svg

@@ -1,6 +0,0 @@
-<svg width="512" height="512" xmlns="http://www.w3.org/2000/svg" xmlns:svg="http://www.w3.org/2000/svg">
- <g>
-  <title>Layer 1</title>
-  <circle fill="#000000" stroke-width="30" stroke-dasharray="null" stroke-linejoin="null" stroke-linecap="null" fill-opacity="0" cx="256.00001" cy="256.00001" r="142.96561" id="svg_9" stroke="#333333"/>
- </g>
-</svg>

src/resources/themes/v_white/right.svg

@@ -1,8 +0,0 @@
-<svg width="512" height="512" xmlns="http://www.w3.org/2000/svg" xmlns:svg="http://www.w3.org/2000/svg">
- <g>
-  <title>Layer 1</title>
-  <g transform="rotate(-90 256.00000000000006,256) " id="svg_1">
-   <polygon fill="#333333" id="svg_2" points="128,192 256,320 384,192  "/>
-  </g>
- </g>
-</svg>

src/resources/themes/v_white/right_disabled.svg

@@ -1,8 +0,0 @@
-<svg width="512" height="512" xmlns="http://www.w3.org/2000/svg" xmlns:svg="http://www.w3.org/2000/svg">
- <g>
-  <title>Layer 1</title>
-  <g transform="rotate(-90 256.00000000000006,256) " id="svg_1">
-   <polygon fill="#C0C0C0" id="svg_2" points="128,192 256,320 384,192  "/>
-  </g>
- </g>
-</svg>

src/resources/themes/v_white/up.svg

@@ -1,8 +0,0 @@
-<svg width="512" height="512" xmlns="http://www.w3.org/2000/svg" xmlns:svg="http://www.w3.org/2000/svg">
- <g>
-  <title>Layer 1</title>
-  <g transform="rotate(180 255.99999999999997,256) " id="svg_1">
-   <polygon points="128,192 256,320 384,192  " id="svg_2" fill="#333333"/>
-  </g>
- </g>
-</svg>

src/resources/themes/v_white/up_disabled.svg

@@ -1,8 +0,0 @@
-<svg width="512" height="512" xmlns="http://www.w3.org/2000/svg" xmlns:svg="http://www.w3.org/2000/svg">
- <g>
-  <title>Layer 1</title>
-  <g transform="rotate(180 255.99999999999997,256) " id="svg_1">
-   <polygon points="128,192 256,320 384,192  " id="svg_2" fill="#C0C0C0"/>
-  </g>
- </g>
-</svg>

src/vconfigmanager.cpp

@@ -1299,7 +1299,7 @@ void VConfigManager::initThemes()
     m_themes.clear();
 
     // Built-in.
-    QString file(":/resources/themes/v_white/v_white.palette");
+    QString file(":/resources/themes/v_native/v_native.palette");
     m_themes.insert(VPalette::themeName(file), file);
     file = ":/resources/themes/v_pure/v_pure.palette";
     m_themes.insert(VPalette::themeName(file), file);

src/vnote.qrc

@@ -106,29 +106,6 @@
         <file>resources/icons/reading_modified.svg</file>
         <file>resources/icons/flash_page.svg</file>
         <file>resources/icons/heading.svg</file>
-        <file>resources/themes/v_white/arrow_dropdown.svg</file>
-        <file>resources/themes/v_white/close.svg</file>
-        <file>resources/themes/v_white/close_grey.svg</file>
-        <file>resources/themes/v_white/float.svg</file>
-        <file>resources/themes/v_white/v_white.palette</file>
-        <file>resources/themes/v_white/v_white.qss</file>
-        <file>resources/themes/v_white/branch_closed.svg</file>
-        <file>resources/themes/v_white/branch_end.svg</file>
-        <file>resources/themes/v_white/branch_more.svg</file>
-        <file>resources/themes/v_white/branch_open.svg</file>
-        <file>resources/themes/v_white/line.svg</file>
-        <file>resources/themes/v_white/down.svg</file>
-        <file>resources/themes/v_white/left.svg</file>
-        <file>resources/themes/v_white/right.svg</file>
-        <file>resources/themes/v_white/up.svg</file>
-        <file>resources/themes/v_white/left_disabled.svg</file>
-        <file>resources/themes/v_white/right_disabled.svg</file>
-        <file>resources/themes/v_white/down_disabled.svg</file>
-        <file>resources/themes/v_white/up_disabled.svg</file>
-        <file>resources/themes/v_white/checkbox_checked.svg</file>
-        <file>resources/themes/v_white/checkbox_unchecked.svg</file>
-        <file>resources/themes/v_white/radiobutton_checked.svg</file>
-        <file>resources/themes/v_white/radiobutton_unchecked.svg</file>
         <file>resources/themes/v_pure/arrow_dropdown.svg</file>
         <file>resources/themes/v_pure/branch_closed.svg</file>
         <file>resources/themes/v_pure/branch_end.svg</file>
@@ -152,16 +129,11 @@
         <file>resources/themes/v_pure/up_disabled.svg</file>
         <file>resources/themes/v_pure/v_pure.palette</file>
         <file>resources/themes/v_pure/v_pure.qss</file>
-        <file>resources/themes/v_white/menu_checkbox.svg</file>
-        <file>resources/themes/v_white/menu_radiobutton.svg</file>
         <file>resources/themes/v_pure/menu_checkbox.svg</file>
         <file>resources/themes/v_pure/menu_radiobutton.svg</file>
         <file>resources/themes/v_pure/v_pure.mdhl</file>
-        <file>resources/themes/v_white/v_white.mdhl</file>
-        <file>resources/themes/v_white/v_white.css</file>
         <file>resources/themes/v_pure/v_pure.css</file>
         <file>resources/themes/v_pure/v_pure_codeblock.css</file>
-        <file>resources/themes/v_white/v_white_codeblock.css</file>
         <file>resources/themes/v_material/arrow_dropdown.svg</file>
         <file>resources/themes/v_material/branch_closed.svg</file>
         <file>resources/themes/v_material/branch_end.svg</file>
@@ -238,15 +210,24 @@
         <file>resources/icons/menubar.svg</file>
         <file>resources/export_template.html</file>
         <file>resources/themes/v_pure/v_pure_mermaid.css</file>
-        <file>resources/themes/v_white/v_white_mermaid.css</file>
         <file>resources/themes/v_moonlight/v_moonlight_mermaid.css</file>
         <file>resources/themes/v_moonlight/arrow_dropdown_disabled.svg</file>
         <file>resources/themes/v_pure/arrow_dropdown_disabled.svg</file>
-        <file>resources/themes/v_white/arrow_dropdown_disabled.svg</file>
         <file>resources/icons/clear_search.svg</file>
         <file>resources/icons/search.svg</file>
         <file>resources/icons/search_advanced.svg</file>
         <file>resources/icons/search_console.svg</file>
         <file>resources/icons/note_item.svg</file>
+        <file>resources/themes/v_native/arrow_dropdown.svg</file>
+        <file>resources/themes/v_native/arrow_dropdown_disabled.svg</file>
+        <file>resources/themes/v_native/close.svg</file>
+        <file>resources/themes/v_native/close_grey.svg</file>
+        <file>resources/themes/v_native/float.svg</file>
+        <file>resources/themes/v_native/v_native.css</file>
+        <file>resources/themes/v_native/v_native.mdhl</file>
+        <file>resources/themes/v_native/v_native.palette</file>
+        <file>resources/themes/v_native/v_native.qss</file>
+        <file>resources/themes/v_native/v_native_codeblock.css</file>
+        <file>resources/themes/v_native/v_native_mermaid.css</file>
     </qresource>
 </RCC>

src/vsearcher.cpp

@@ -166,7 +166,7 @@ void VSearcher::setupUI()
     advLayout->addRow(m_wholeWordOnlyCB);
     advLayout->addRow(m_fuzzyCB);
     advLayout->addRow(m_regularExpressionCB);
-    advLayout->setContentsMargins(0, 0, 0, 0);
+    advLayout->setContentsMargins(0, 0, 3, 0);
 
     m_advWidget = new QWidget(this);
     m_advWidget->setLayout(advLayout);
@@ -194,7 +194,7 @@ void VSearcher::setupUI()
     QHBoxLayout *proLayout = new QHBoxLayout();
     proLayout->addWidget(m_proBar);
     proLayout->addWidget(m_cancelBtn);
-    proLayout->setContentsMargins(0, 0, 0, 0);
+    proLayout->setContentsMargins(0, 0, 3, 0);
 
     // Console.
     m_consoleEdit = new QPlainTextEdit(this);
@@ -219,7 +219,7 @@ void VSearcher::setupUI()
     formLayout->addRow(tr("Scope:"), m_searchScopeCB);
     formLayout->addRow(tr("Object:"), m_searchObjectCB);
     formLayout->addRow(tr("Target:"), m_searchTargetCB);
-    formLayout->setContentsMargins(0, 0, 0, 0);
+    formLayout->setContentsMargins(0, 0, 3, 0);
 
     QVBoxLayout *mainLayout = new QVBoxLayout();
     mainLayout->addLayout(btnLayout);
@@ -228,6 +228,7 @@ void VSearcher::setupUI()
     mainLayout->addLayout(proLayout);
     mainLayout->addWidget(m_consoleEdit);
     mainLayout->addWidget(m_results);
+    mainLayout->setContentsMargins(0, 0, 0, 0);
 
     setLayout(mainLayout);
 }