From 84df970e22749210bd6470a4db898e5108ebd41a Mon Sep 17 00:00:00 2001 From: Le Tan Date: Sun, 18 Mar 2018 17:12:08 +0800 Subject: [PATCH] theme: replace v_white with v_native Change v_white to a more native theme. --- .../{v_white => v_native}/arrow_dropdown.svg | 0 .../arrow_dropdown_disabled.svg | 0 .../themes/{v_white => v_native}/close.svg | 0 .../{v_white => v_native}/close_grey.svg | 0 .../themes/{v_white => v_native}/float.svg | 0 .../v_white.css => v_native/v_native.css} | 69 - .../v_white.mdhl => v_native/v_native.mdhl} | 0 .../v_native.palette} | 145 +- src/resources/themes/v_native/v_native.qss | 511 +++++++ .../v_native_codeblock.css} | 0 .../v_native_mermaid.css} | 0 .../themes/v_white/branch_closed.svg | 8 - src/resources/themes/v_white/branch_end.svg | 7 - src/resources/themes/v_white/branch_more.svg | 7 - src/resources/themes/v_white/branch_open.svg | 8 - .../themes/v_white/checkbox_checked.svg | 7 - .../themes/v_white/checkbox_unchecked.svg | 6 - src/resources/themes/v_white/down.svg | 8 - .../themes/v_white/down_disabled.svg | 8 - src/resources/themes/v_white/left.svg | 8 - .../themes/v_white/left_disabled.svg | 8 - src/resources/themes/v_white/line.svg | 6 - .../themes/v_white/menu_checkbox.svg | 6 - .../themes/v_white/menu_radiobutton.svg | 6 - .../themes/v_white/radiobutton_checked.svg | 7 - .../themes/v_white/radiobutton_unchecked.svg | 6 - src/resources/themes/v_white/right.svg | 8 - .../themes/v_white/right_disabled.svg | 8 - src/resources/themes/v_white/up.svg | 8 - src/resources/themes/v_white/up_disabled.svg | 8 - src/resources/themes/v_white/v_white.qss | 1227 ----------------- src/vconfigmanager.cpp | 2 +- src/vnote.qrc | 41 +- src/vsearcher.cpp | 7 +- 34 files changed, 532 insertions(+), 1608 deletions(-) rename src/resources/themes/{v_white => v_native}/arrow_dropdown.svg (100%) rename src/resources/themes/{v_white => v_native}/arrow_dropdown_disabled.svg (100%) rename src/resources/themes/{v_white => v_native}/close.svg (100%) rename src/resources/themes/{v_white => v_native}/close_grey.svg (100%) rename src/resources/themes/{v_white => v_native}/float.svg (100%) rename src/resources/themes/{v_white/v_white.css => v_native/v_native.css} (69%) rename src/resources/themes/{v_white/v_white.mdhl => v_native/v_native.mdhl} (100%) rename src/resources/themes/{v_white/v_white.palette => v_native/v_native.palette} (50%) create mode 100644 src/resources/themes/v_native/v_native.qss rename src/resources/themes/{v_white/v_white_codeblock.css => v_native/v_native_codeblock.css} (100%) rename src/resources/themes/{v_white/v_white_mermaid.css => v_native/v_native_mermaid.css} (100%) delete mode 100644 src/resources/themes/v_white/branch_closed.svg delete mode 100644 src/resources/themes/v_white/branch_end.svg delete mode 100644 src/resources/themes/v_white/branch_more.svg delete mode 100644 src/resources/themes/v_white/branch_open.svg delete mode 100644 src/resources/themes/v_white/checkbox_checked.svg delete mode 100644 src/resources/themes/v_white/checkbox_unchecked.svg delete mode 100644 src/resources/themes/v_white/down.svg delete mode 100644 src/resources/themes/v_white/down_disabled.svg delete mode 100644 src/resources/themes/v_white/left.svg delete mode 100644 src/resources/themes/v_white/left_disabled.svg delete mode 100644 src/resources/themes/v_white/line.svg delete mode 100644 src/resources/themes/v_white/menu_checkbox.svg delete mode 100644 src/resources/themes/v_white/menu_radiobutton.svg delete mode 100644 src/resources/themes/v_white/radiobutton_checked.svg delete mode 100644 src/resources/themes/v_white/radiobutton_unchecked.svg delete mode 100644 src/resources/themes/v_white/right.svg delete mode 100644 src/resources/themes/v_white/right_disabled.svg delete mode 100644 src/resources/themes/v_white/up.svg delete mode 100644 src/resources/themes/v_white/up_disabled.svg delete mode 100644 src/resources/themes/v_white/v_white.qss diff --git a/src/resources/themes/v_white/arrow_dropdown.svg b/src/resources/themes/v_native/arrow_dropdown.svg similarity index 100% rename from src/resources/themes/v_white/arrow_dropdown.svg rename to src/resources/themes/v_native/arrow_dropdown.svg diff --git a/src/resources/themes/v_white/arrow_dropdown_disabled.svg b/src/resources/themes/v_native/arrow_dropdown_disabled.svg similarity index 100% rename from src/resources/themes/v_white/arrow_dropdown_disabled.svg rename to src/resources/themes/v_native/arrow_dropdown_disabled.svg diff --git a/src/resources/themes/v_white/close.svg b/src/resources/themes/v_native/close.svg similarity index 100% rename from src/resources/themes/v_white/close.svg rename to src/resources/themes/v_native/close.svg diff --git a/src/resources/themes/v_white/close_grey.svg b/src/resources/themes/v_native/close_grey.svg similarity index 100% rename from src/resources/themes/v_white/close_grey.svg rename to src/resources/themes/v_native/close_grey.svg diff --git a/src/resources/themes/v_white/float.svg b/src/resources/themes/v_native/float.svg similarity index 100% rename from src/resources/themes/v_white/float.svg rename to src/resources/themes/v_native/float.svg diff --git a/src/resources/themes/v_white/v_white.css b/src/resources/themes/v_native/v_native.css similarity index 69% rename from src/resources/themes/v_white/v_white.css rename to src/resources/themes/v_native/v_native.css index f49d89c1..758f625a 100644 --- a/src/resources/themes/v_white/v_white.css +++ b/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; -} diff --git a/src/resources/themes/v_white/v_white.mdhl b/src/resources/themes/v_native/v_native.mdhl similarity index 100% rename from src/resources/themes/v_white/v_white.mdhl rename to src/resources/themes/v_native/v_native.mdhl diff --git a/src/resources/themes/v_white/v_white.palette b/src/resources/themes/v_native/v_native.palette similarity index 50% rename from src/resources/themes/v_white/v_white.palette rename to src/resources/themes/v_native/v_native.palette index 4c60c198..611883fe 100644 --- a/src/resources/themes/v_white/v_white.palette +++ b/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 diff --git a/src/resources/themes/v_native/v_native.qss b/src/resources/themes/v_native/v_native.qss new file mode 100644 index 00000000..0381318c --- /dev/null +++ b/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; +} diff --git a/src/resources/themes/v_white/v_white_codeblock.css b/src/resources/themes/v_native/v_native_codeblock.css similarity index 100% rename from src/resources/themes/v_white/v_white_codeblock.css rename to src/resources/themes/v_native/v_native_codeblock.css diff --git a/src/resources/themes/v_white/v_white_mermaid.css b/src/resources/themes/v_native/v_native_mermaid.css similarity index 100% rename from src/resources/themes/v_white/v_white_mermaid.css rename to src/resources/themes/v_native/v_native_mermaid.css diff --git a/src/resources/themes/v_white/branch_closed.svg b/src/resources/themes/v_white/branch_closed.svg deleted file mode 100644 index c524ab79..00000000 --- a/src/resources/themes/v_white/branch_closed.svg +++ /dev/null @@ -1,8 +0,0 @@ - - - Layer 1 - - - - - diff --git a/src/resources/themes/v_white/branch_end.svg b/src/resources/themes/v_white/branch_end.svg deleted file mode 100644 index baa0c23f..00000000 --- a/src/resources/themes/v_white/branch_end.svg +++ /dev/null @@ -1,7 +0,0 @@ - - - Layer 2 - - - - diff --git a/src/resources/themes/v_white/branch_more.svg b/src/resources/themes/v_white/branch_more.svg deleted file mode 100644 index cb0fecad..00000000 --- a/src/resources/themes/v_white/branch_more.svg +++ /dev/null @@ -1,7 +0,0 @@ - - - Layer 2 - - - - diff --git a/src/resources/themes/v_white/branch_open.svg b/src/resources/themes/v_white/branch_open.svg deleted file mode 100644 index c1e8e141..00000000 --- a/src/resources/themes/v_white/branch_open.svg +++ /dev/null @@ -1,8 +0,0 @@ - - - Layer 1 - - - - - diff --git a/src/resources/themes/v_white/checkbox_checked.svg b/src/resources/themes/v_white/checkbox_checked.svg deleted file mode 100644 index f017b5b4..00000000 --- a/src/resources/themes/v_white/checkbox_checked.svg +++ /dev/null @@ -1,7 +0,0 @@ - - - Layer 1 - - - - diff --git a/src/resources/themes/v_white/checkbox_unchecked.svg b/src/resources/themes/v_white/checkbox_unchecked.svg deleted file mode 100644 index 5167523e..00000000 --- a/src/resources/themes/v_white/checkbox_unchecked.svg +++ /dev/null @@ -1,6 +0,0 @@ - - - Layer 1 - - - diff --git a/src/resources/themes/v_white/down.svg b/src/resources/themes/v_white/down.svg deleted file mode 100644 index 386ac7f8..00000000 --- a/src/resources/themes/v_white/down.svg +++ /dev/null @@ -1,8 +0,0 @@ - - - Layer 1 - - - - - diff --git a/src/resources/themes/v_white/down_disabled.svg b/src/resources/themes/v_white/down_disabled.svg deleted file mode 100644 index 2a53e0f0..00000000 --- a/src/resources/themes/v_white/down_disabled.svg +++ /dev/null @@ -1,8 +0,0 @@ - - - Layer 1 - - - - - diff --git a/src/resources/themes/v_white/left.svg b/src/resources/themes/v_white/left.svg deleted file mode 100644 index aee69f4a..00000000 --- a/src/resources/themes/v_white/left.svg +++ /dev/null @@ -1,8 +0,0 @@ - - - Layer 1 - - - - - diff --git a/src/resources/themes/v_white/left_disabled.svg b/src/resources/themes/v_white/left_disabled.svg deleted file mode 100644 index 3cabd4b5..00000000 --- a/src/resources/themes/v_white/left_disabled.svg +++ /dev/null @@ -1,8 +0,0 @@ - - - Layer 1 - - - - - diff --git a/src/resources/themes/v_white/line.svg b/src/resources/themes/v_white/line.svg deleted file mode 100644 index 8c981419..00000000 --- a/src/resources/themes/v_white/line.svg +++ /dev/null @@ -1,6 +0,0 @@ - - - Layer 2 - - - diff --git a/src/resources/themes/v_white/menu_checkbox.svg b/src/resources/themes/v_white/menu_checkbox.svg deleted file mode 100644 index 0aeb35a1..00000000 --- a/src/resources/themes/v_white/menu_checkbox.svg +++ /dev/null @@ -1,6 +0,0 @@ - - - Layer 1 - - - diff --git a/src/resources/themes/v_white/menu_radiobutton.svg b/src/resources/themes/v_white/menu_radiobutton.svg deleted file mode 100644 index aafaa309..00000000 --- a/src/resources/themes/v_white/menu_radiobutton.svg +++ /dev/null @@ -1,6 +0,0 @@ - - - Layer 1 - - - diff --git a/src/resources/themes/v_white/radiobutton_checked.svg b/src/resources/themes/v_white/radiobutton_checked.svg deleted file mode 100644 index c9834cc5..00000000 --- a/src/resources/themes/v_white/radiobutton_checked.svg +++ /dev/null @@ -1,7 +0,0 @@ - - - Layer 1 - - - - diff --git a/src/resources/themes/v_white/radiobutton_unchecked.svg b/src/resources/themes/v_white/radiobutton_unchecked.svg deleted file mode 100644 index 7cd0863a..00000000 --- a/src/resources/themes/v_white/radiobutton_unchecked.svg +++ /dev/null @@ -1,6 +0,0 @@ - - - Layer 1 - - - diff --git a/src/resources/themes/v_white/right.svg b/src/resources/themes/v_white/right.svg deleted file mode 100644 index c524ab79..00000000 --- a/src/resources/themes/v_white/right.svg +++ /dev/null @@ -1,8 +0,0 @@ - - - Layer 1 - - - - - diff --git a/src/resources/themes/v_white/right_disabled.svg b/src/resources/themes/v_white/right_disabled.svg deleted file mode 100644 index c0c83ba8..00000000 --- a/src/resources/themes/v_white/right_disabled.svg +++ /dev/null @@ -1,8 +0,0 @@ - - - Layer 1 - - - - - diff --git a/src/resources/themes/v_white/up.svg b/src/resources/themes/v_white/up.svg deleted file mode 100644 index 52be26da..00000000 --- a/src/resources/themes/v_white/up.svg +++ /dev/null @@ -1,8 +0,0 @@ - - - Layer 1 - - - - - diff --git a/src/resources/themes/v_white/up_disabled.svg b/src/resources/themes/v_white/up_disabled.svg deleted file mode 100644 index 36e54158..00000000 --- a/src/resources/themes/v_white/up_disabled.svg +++ /dev/null @@ -1,8 +0,0 @@ - - - Layer 1 - - - - - diff --git a/src/resources/themes/v_white/v_white.qss b/src/resources/themes/v_white/v_white.qss deleted file mode 100644 index 3a5cf42d..00000000 --- a/src/resources/themes/v_white/v_white.qss +++ /dev/null @@ -1,1227 +0,0 @@ -QToolTip -{ - border: 1px solid @tooltip_border; - background: @tooltip_bg; - color: @tooltip_fg; -} - -/* 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 */ - -/* QMainWindow */ -QMainWindow { - color: @base_fg; - background: @base_bg; -} - -QMainWindow::separator { - background: @dock_separator_bg; - width: 2px; - height: 2px; -} - -QMainWindow::separator:hover { - background: @dock_separator_hover_bg; -} -/* End QMainWindow */ - -QMenuBar { - border: none; - background: @menubar_bg; - color: @menubar_fg; -} - -QMenuBar::item:selected { - background: @menubar_item_selected_bg; -} - -/* QMenu */ -QMenu { - background: @menu_bg; - color: @menu_fg; - margin: 2px; -} - -QMenu::icon { - margin: 5px; -} - -QMenu::item { - padding: 5px 30px 5px 30px; - border: 1px solid transparent; -} - -QMenu::item:disabled { - color: @menu_item_disabled_fg; -} - -QMenu::item:selected { - color: @menu_item_selected_fg; - background: @menu_item_selected_bg; -} - -QMenu::icon:checked { /* appearance of a 'checked' icon */ - border: 2px solid @menu_fg; -} - -QMenu::separator { - height: 2px; - background: @menu_separator_bg; - margin-left: 10px; - margin-right: 5px; -} - -QMenu::indicator { - width: 20px; - height: 20px; -} - -QMenu::indicator:non-exclusive:unchecked { - image: none; -} - -QMenu::indicator:non-exclusive:checked { - image: url(menu_checkbox.svg); -} - -QMenu::indicator:exclusive:unchecked { - image: none; -} - -QMenu::indicator:exclusive:checked { - image: url(menu_radiobutton.svg); -} -/* End QMenu */ - -QToolBar { - border: none; - background: @toolbar_bg; -} - -/* QToolButton */ -QToolButton { - border: none; - background: transparent; - margin: 1px 3px 1px 3px; - padding: 0px; -} - -QToolButton[popupMode="1"] { /* only for MenuButtonPopup */ - padding-right: 16px; /* make way for the popup button */ -} - -QToolButton[popupMode="2"] { /* only for InstantPopup */ - padding-right: 10px; /* make way for the popup button */ -} - -QToolButton:hover { - border:none; - background: @toolbutton_hover_bg; -} - -QToolButton:pressed { - background: @toolbutton_pressed_bg; -} - -QToolButton:checked { - background: @toolbutton_checked_bg; -} - -QToolButton:checked:hover { - background: @toolbutton_hover_bg; -} - -/* the subcontrols below are used only in the MenuButtonPopup mode */ -QToolButton::menu-button { - border: none; - width: 16px; -} - -QToolButton::menu-arrow { - image: url(arrow_dropdown.svg); - width: 16px; - height: 16px; -} -/* End QToolButton*/ - -/* DockWidget */ -QDockWidget { - color: @dockwidget_title_fg; - 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 { - color: @pushbutton_fg; - background: @pushbutton_bg; - border: 1px solid @pushbutton_border; - padding: 3px; - min-width: 80px; -} - -QPushButton:pressed { - background-color: @pushbutton_pressed_bg; -} - -QPushButton:checked { - background-color: @pushbutton_checked_bg; -} - -QPushButton:checked:hover { - background-color: @pushbutton_hover_bg; -} - -QPushButton:hover { - background-color: @pushbutton_hover_bg; -} - -QPushButton:flat { - border: none; -} - -QPushButton:default { - border: 1px solid @pushbutton_default_border; -} - -QPushButton:disabled { - color: @pushbutton_disabled_fg; - background-color: @pushbutton_disabled_bg; -} - -QPushButton::menu-indicator { - image: url(arrow_dropdown.svg); - width: 16px; - height: 16px; -} - -QPushButton[CornerBtn="true"] { - padding: 4px -2px 4px -2px; - margin: 0px; - border: none; - background-color: transparent; - min-width: -1; -} - -QPushButton[CornerBtn="true"]::menu-indicator { - image: none; -} - -QPushButton[CornerBtn="true"]:hover { - background-color: @pushbutton_cornerbtn_hover_bg; -} - -QPushButton[CornerBtn="true"]:focus { - background-color: @pushbutton_cornerbtn_focus_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; - min-width: -1; -} - -QPushButton[StatusBtn="true"]:hover { - background-color: @pushbutton_statusbtn_hover_bg; -} - -QPushButton[StatusBtn="true"]:focus { - background-color: @pushbutton_statusbtn_focus_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; - min-width: -1; -} - -QPushButton[FlatBtn="true"]:hover { - background-color: @pushbutton_flatbtn_hover_bg; -} - -QPushButton[FlatBtn="true"]:focus { - background-color: @pushbutton_flatbtn_focus_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; - min-width: -1; -} - -QPushButton[SelectionBtn="true"]:hover { - background-color: @pushbutton_selectionbtn_hover_bg; -} - -QPushButton[SelectionBtn="true"]:focus { - background-color: @pushbutton_selectionbtn_focus_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; - min-width: -1; -} - -QPushButton[TitleBtn="true"]:hover { - background-color: @pushbutton_titlebtn_hover_bg; -} - -QPushButton[TitleBtn="true"]:focus { - background-color: @pushbutton_titlebtn_focus_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; - min-width: -1; -} - -QPushButton[DangerBtn="true"]:hover { - background-color: @pushbutton_dangerbtn_hover_bg; -} - -QPushButton[DangerBtn="true"]:focus { - background-color: @pushbutton_dangerbtn_focus_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; - min-width: -1; -} - -QPushButton[AvatarBtn="true"]:hover { - background-color: @pushbutton_avatarbtn_hover_bg; -} - -QPushButton[AvatarBtn="true"]:focus { - background-color: @pushbutton_avatarbtn_focus_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; - min-width: -1; - 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:hover { - background-color: @menubar_item_selected_bg; -} - -VButtonMenuItem:focus { - background-color: @menubar_item_selected_bg; -} - -VButtonMenuItem:disabled { - color: @pushbutton_disabled_fg; - background-color: @pushbutton_disabled_bg; -} -/* End QPushButton*/ - -/* QComboBox */ -QComboBox { - padding: 3px; - color: @combobox_fg; - background: @combobox_bg; - border: 1px solid @combobox_border; -} - -QComboBox:disabled { - color: @combobox_disabled_fg; -} - -QComboBox:focus { - background-color: @combobox_focus_bg; -} - -QComboBox::drop-down { - subcontrol-origin: padding; - subcontrol-position: top right; - width: 20px; - border: none; - background: transparent; -} - -QComboBox::down-arrow { - image: url(arrow_dropdown.svg); - width: 20px; - height: 20px; -} - -QComboBox::down-arrow:disabled { - image: url(arrow_dropdown_disabled.svg); - width: 20px; - height: 20px; -} - -QComboBox QAbstractItemView { - padding: 2px; - border: 1px solid @combobox_view_border; - background: @combobox_bg; - selection-color: @combobox_view_selected_fg; - selection-background-color: @combobox_view_selected_bg; -} - -QComboBox QAbstractItemView::item { - background: transparent; - padding: 3px; -} - -QComboBox QAbstractItemView::item:hover { - color: @combobox_view_item_hover_fg; - background: @combobox_view_item_hover_bg; -} - -QComboBox#NotebookSelector { - border: none; - font-size: 13pt; - padding-top: 3px; - padding-bottom: 3px; - icon-size: 30px; -} - -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 { - border: none; - color: @label_fg; - background: transparent; -} - -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 { - border: 1px solid @lineedit_border; - padding: 3px; - color: @lineedit_fg; - background: @lineedit_bg; - selection-color: @lineedit_selection_fg; - selection-background-color: @lineedit_selection_bg; -} - -QLineEdit:disabled { - color: @lineedit_disabled_fg; -} - -QLineEdit[VimCommandLine="true"] { - padding: 0px; - margin: 0px; - border: none; - color: @lineedit_fg; - background: @lineedit_bg; -} -/* End QLineEdit */ - -/* QTabWidget */ -QTabWidget { - border: none; -} - -QTabWidget::pane { - border: none; - border-top: 3px solid @tabwidget_pane_border; -} -/* End QTabWidget */ - -/* QTabBar */ -QTabBar::tab { - color: @tabbar_fg; - background: @tabbar_bg; - border: none; - border-right: 1px solid @tabbar_border; - padding: 2px 0px 2px 0px; -} - -QTabBar::tab:selected { - color: @tabbar_selected_fg; - background: @tabbar_selected_bg; - border: none; - border-right: 1px solid @tabbar_border; -} - -QTabBar::tab:hover { - color: @tabbar_hover_fg; - background: @tabbar_hover_bg; - border: none; - border-right: 1px solid @tabbar_border; -} - -QTabBar::close-button { - image: url(close_grey.svg); -} - -QTabBar::close-button:hover { - image: url(close.svg); - background-color: @tabbar_closebutton_hover_bg; -} - -QTabBar::close-button:focus { - image: url(close.svg); - background-color: @tabbar_closebutton_focus_bg; -} - -QTabBar::scroller { - width: 20px; -} - -QTabBar QToolButton { - border: none; -} - -QTabBar QToolButton::right-arrow:enabled { - image: url(right.svg); -} - -QTabBar QToolButton::left-arrow:enabled { - image: url(left.svg); -} - -QTabBar QToolButton::right-arrow:disabled { - image: url(right_disabled.svg); -} - -QTabBar QToolButton::left-arrow:disabled { - image: url(left_disabled.svg); -} -/* 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 { - color: @treeview_fg; - background: @treeview_bg; - show-decoration-selected: 0; - border: none; - selection-background-color: transparent; - outline: none; -} - -QTreeView::item { - padding-top: 5px; - padding-bottom: 5px; -} - -QTreeView[ItemBorder="true"]::item { - padding-top: 5px; - padding-bottom: 5px; - border-bottom: 1px solid @treeview_item_border_bg; -} - -QTreeView::item:hover { - color: @treeview_item_hover_fg; - background: @treeview_item_hover_bg; -} - -QTreeView::item:selected { - color: @treeview_item_selected_fg; - background: @treeview_item_selected_bg; -} - -QTreeView::item:selected:active { - color: @treeview_item_selected_active_fg; - background: @treeview_item_selected_active_bg; -} - -QTreeView::item:selected:!active { - color: @treeview_item_selected_inactive_fg; - background: @treeview_item_selected_inactive_bg; -} - -QTreeView::branch:has-siblings:!adjoins-item { - border-image: url(line.svg) 0; -} - -QTreeView::branch:has-siblings:adjoins-item { - border-image: url(branch_more.svg) 0; -} - -QTreeView::branch:!has-children:!has-siblings:adjoins-item { - border-image: url(branch_end.svg) 0; -} - -QTreeView::branch:has-children:!has-siblings:closed, -QTreeView::branch:closed:has-children:has-siblings { - border-image: none; - image: url(branch_closed.svg); -} - -QTreeView::branch:open:has-children:!has-siblings, -QTreeView::branch:open:has-children:has-siblings { - border-image: none; - image: url(branch_open.svg); -} - -QTreeView[PlainTree="true"]::branch:has-siblings:!adjoins-item { - border-image: none; -} - -QTreeView[PlainTree="true"]::branch:has-siblings:adjoins-item { - border-image: none; -} - -QTreeView[PlainTree="true"]::branch:!has-children:!has-siblings:adjoins-item { - border-image: none; -} - -QTreeView[PlainTree="true"]::branch:has-children:!has-siblings:closed, -QTreeView[PlainTree="true"]::branch:closed:has-children:has-siblings { - border-image: none; - image: none; -} - -QTreeView[PlainTree="true"]::branch:open:has-children:!has-siblings, -QTreeView[PlainTree="true"]::branch:open:has-children:has-siblings { - border-image: none; - image: none; -} -/* End QTreeView */ - -/* QListView */ -QListView { - color: @listview_fg; - background: @listview_bg; - show-decoration-selected: 0; - border: none; - selection-background-color: transparent; - outline: none; -} - -QListView::item { - padding-top: 5px; - padding-bottom: 5px; -} - -QListView::item:hover { - color: @listview_item_hover_fg; - background: @listview_item_hover_bg; -} - -QListView::item:selected { - color: @listview_item_selected_fg; - background: @listview_item_selected_bg; -} - -QListView::item:selected:active { - color: @listview_item_selected_active_fg; - background: @listview_item_selected_active_bg; -} - -QListView::item:selected:!active { - color: @listview_item_selected_inactive_fg; - background: @listview_item_selected_inactive_bg; -} -/* 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 */ - -/* QStatusBar */ -QStatusBar { - color: @statusbar_fg; - background: @statusbar_bg; -} -/* End QStatusBar */ - -QWidget[MainEditor="true"] { - border: none; -} - -QDialog { - color: @base_fg; - background: @base_bg; -} - -/* QScrollBar */ -QScrollBar::sub-page, QScrollBar::add-page { - background: transparent; -} - -QScrollBar:vertical { - background: @scrollbar_bg; - width: 16px; - margin: 16px 0px 16px 0px; - padding: 0px 2px 0px 2px; - border: none; -} - -QScrollBar::handle:vertical { - background: @scrollbar_handle_bg; - min-height: 16px; -} - -QScrollBar::handle:vertical:hover { - background: @scrollbar_handle_hover_bg; -} - -QScrollBar::handle:vertical:pressed { - background: @scrollbar_handle_pressed_bg; -} - -QScrollBar::add-line:vertical { - border: none; - background: @scrollbar_bg; - width: 16px; - height: 16px; - subcontrol-position: bottom; - subcontrol-origin: margin; -} - -QScrollBar::add-line:vertical:hover { - background: @scrollbar_handle_hover_bg; -} - -QScrollBar::add-line:vertical:pressed { - background: @scrollbar_handle_pressed_bg; -} - -QScrollBar::sub-line:vertical { - border: none; - background: @scrollbar_bg; - width: 16px; - height: 16px; - subcontrol-position: top; - subcontrol-origin: margin; -} - -QScrollBar::sub-line:vertical:hover { - background: @scrollbar_handle_hover_bg; -} - -QScrollBar::sub-line:vertical:pressed { - background: @scrollbar_handle_pressed_bg; -} - -QScrollBar::down-arrow:vertical { - image: url(down.svg); - width: 16px; - height: 16px; -} - -QScrollBar::up-arrow:vertical { - image: url(up.svg); - width: 16px; - height: 16px; -} - -QScrollBar:horizontal { - background: @scrollbar_bg; - height: 16px; - margin: 0px 16px 0px 16px; - padding: 2px 0px 2px 0px; - border: none; -} - -QScrollBar::handle:horizontal { - background: @scrollbar_handle_bg; - min-width: 16px; -} - -QScrollBar::handle:horizontal:hover { - background: @scrollbar_handle_hover_bg; -} - -QScrollBar::handle:horizontal:pressed { - background: @scrollbar_handle_pressed_bg; -} - -QScrollBar::add-line:horizontal { - border: none; - background: @scrollbar_bg; - width: 16px; - height: 16px; - subcontrol-position: right; - subcontrol-origin: margin; -} - -QScrollBar::add-line:horizontal:hover { - background: @scrollbar_handle_hover_bg; -} - -QScrollBar::add-line:horizontal:pressed { - background: @scrollbar_handle_pressed_bg; -} - -QScrollBar::sub-line:horizontal { - border: none; - background: @scrollbar_bg; - width: 16px; - height: 16px; - subcontrol-position: left; - subcontrol-origin: margin; -} - -QScrollBar::sub-line:horizontal:hover { - background: @scrollbar_handle_hover_bg; -} - -QScrollBar::sub-line:horizontal:pressed { - background: @scrollbar_handle_pressed_bg; -} - -QScrollBar::right-arrow:horizontal { - image: url(right.svg); - width: 16px; - height: 16px; -} - -QScrollBar::left-arrow:horizontal { - image: url(left.svg); - width: 16px; - height: 16px; -} -/* End QScrollBar */ - -/* QCheckBox */ -QCheckBox { - spacing: 5px; -} - -QCheckBox:disabled { - color: @checkbox_disabled_fg; -} - -QCheckBox::indicator { - width: 20px; - height: 20px; -} - -QCheckBox::indicator:unchecked { - image: url(checkbox_unchecked.svg); -} - -QCheckBox::indicator:unchecked:hover { - background: @checkbox_indicator_hover_bg; -} - -QCheckBox::indicator:unchecked:pressed { - background: @checkbox_indicator_pressed_bg; -} - -QCheckBox::indicator:checked { - image: url(checkbox_checked.svg); -} - -QCheckBox::indicator:checked:hover { - background: @checkbox_indicator_hover_bg; -} - -QCheckBox::indicator:checked:pressed { - background: @checkbox_indicator_pressed_bg; -} - -QCheckBox::indicator:indeterminate:hover { - background: @checkbox_indicator_hover_bg; -} - -QCheckBox::indicator:indeterminate:pressed { - background: @checkbox_indicator_pressed_bg; -} -/* End QCheckBox */ - -/* QRadioButton */ -QRadioButton { - spacing: 5px; -} - -QRadioButton::indicator { - width: 20px; - height: 20px; -} - -QRadioButton::indicator:unchecked { - image: url(radiobutton_unchecked.svg); -} - -QRadioButton::indicator:unchecked:hover { - background: @radiobutton_indicator_hover_bg; -} - -QRadioButton::indicator:unchecked:pressed { - background: @radiobutton_indicator_pressed_bg; -} - -QRadioButton::indicator:checked { - image: url(radiobutton_checked.svg); -} - -QRadioButton::indicator:checked:hover { - background: @radiobutton_indicator_hover_bg; -} - -QRadioButton::indicator:checked:pressed { - background: @radiobutton_indicator_pressed_bg; -} -/* End QRadioButton */ - -/* QSpinBox */ -QSpinBox, QDoubleSpinBox { - border: 1px solid @spinbox_border; - color: @spinbox_fg; - background: @spinbox_bg; - padding-right: 25px; - min-height: 25px; -} - -QSpinBox::up-button, QDoubleSpinBox::up-button { - subcontrol-origin: border; - subcontrol-position: top right; /* position at the top right corner */ - width: 25px; - border: none; - background: transparent; -} - -QSpinBox::up-button:hover, QDoubleSpinBox::up-button:hover { - background: @spinbox_button_hover_bg; -} - -QSpinBox::up-button:pressed, QDoubleSpinBox::up-button:pressed { - background: @spinbox_button_pressed_bg; -} - -QSpinBox::up-arrow, QDoubleSpinBox::up-arrow { - image: url(up.svg); - width: 12px; - height: 12px; -} - -QSpinBox::up-arrow:disabled, QSpinBox::up-arrow:off, QDoubleSpinBox::up-arrow:disabled, QDoubleSpinBox::up-arrow:off { - image: url(up_disabled.svg); -} - -QSpinBox::down-button, QDoubleSpinBox::down-button { - subcontrol-origin: border; - subcontrol-position: bottom right; /* position at the top right corner */ - width: 25px; - border: none; - background: transparent; -} - -QSpinBox::down-button:hover, QDoubleSpinBox::down-button:hover { - background: @spinbox_button_hover_bg; -} - -QSpinBox::down-button:pressed, QDoubleSpinBox::down-button:pressed { - background: @spinbox_button_pressed_bg; -} - -QSpinBox::down-arrow, QDoubleSpinBox::down-arrow { - image: url(down.svg); - width: 12px; - height: 12px; -} - -QSpinBox::down-arrow:disabled, QSpinBox::down-arrow:off, QDoubleSpinBox::down-arrow:disabled, QDoubleSpinBox::down-arrow:off { - image: url(down_disabled.svg); -} -/* End QSpinBox */ - -/* QHeaderView */ -QHeaderView::section { - background: @headerview_bg; - color: @headerview_fg; - padding-left: 4px; - border: none; - border-left: 1px solid @headerview_border; - border-bottom: 1px solid @headerview_border; -} - -QHeaderView::section:checked -{ - color: @headerview_checked_fg; - background: @headerview_checked_bg; -} - -/* style the sort indicator */ -QHeaderView::down-arrow { - image: url(down.svg); -} - -QHeaderView::up-arrow { - image: url(up.svg); -} -/* End QHeaderView */ - -QWidget#FindReplaceTitleWidget { - background: @title_bg; -} - -QAbstractScrollArea::corner { - background: @scrollbar_bg; - border: none; -} diff --git a/src/vconfigmanager.cpp b/src/vconfigmanager.cpp index be53e44a..1fbe474b 100644 --- a/src/vconfigmanager.cpp +++ b/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); diff --git a/src/vnote.qrc b/src/vnote.qrc index d4af266b..e0361bd6 100644 --- a/src/vnote.qrc +++ b/src/vnote.qrc @@ -106,29 +106,6 @@ resources/icons/reading_modified.svg resources/icons/flash_page.svg resources/icons/heading.svg - resources/themes/v_white/arrow_dropdown.svg - resources/themes/v_white/close.svg - resources/themes/v_white/close_grey.svg - resources/themes/v_white/float.svg - resources/themes/v_white/v_white.palette - resources/themes/v_white/v_white.qss - resources/themes/v_white/branch_closed.svg - resources/themes/v_white/branch_end.svg - resources/themes/v_white/branch_more.svg - resources/themes/v_white/branch_open.svg - resources/themes/v_white/line.svg - resources/themes/v_white/down.svg - resources/themes/v_white/left.svg - resources/themes/v_white/right.svg - resources/themes/v_white/up.svg - resources/themes/v_white/left_disabled.svg - resources/themes/v_white/right_disabled.svg - resources/themes/v_white/down_disabled.svg - resources/themes/v_white/up_disabled.svg - resources/themes/v_white/checkbox_checked.svg - resources/themes/v_white/checkbox_unchecked.svg - resources/themes/v_white/radiobutton_checked.svg - resources/themes/v_white/radiobutton_unchecked.svg resources/themes/v_pure/arrow_dropdown.svg resources/themes/v_pure/branch_closed.svg resources/themes/v_pure/branch_end.svg @@ -152,16 +129,11 @@ resources/themes/v_pure/up_disabled.svg resources/themes/v_pure/v_pure.palette resources/themes/v_pure/v_pure.qss - resources/themes/v_white/menu_checkbox.svg - resources/themes/v_white/menu_radiobutton.svg resources/themes/v_pure/menu_checkbox.svg resources/themes/v_pure/menu_radiobutton.svg resources/themes/v_pure/v_pure.mdhl - resources/themes/v_white/v_white.mdhl - resources/themes/v_white/v_white.css resources/themes/v_pure/v_pure.css resources/themes/v_pure/v_pure_codeblock.css - resources/themes/v_white/v_white_codeblock.css resources/themes/v_material/arrow_dropdown.svg resources/themes/v_material/branch_closed.svg resources/themes/v_material/branch_end.svg @@ -238,15 +210,24 @@ resources/icons/menubar.svg resources/export_template.html resources/themes/v_pure/v_pure_mermaid.css - resources/themes/v_white/v_white_mermaid.css resources/themes/v_moonlight/v_moonlight_mermaid.css resources/themes/v_moonlight/arrow_dropdown_disabled.svg resources/themes/v_pure/arrow_dropdown_disabled.svg - resources/themes/v_white/arrow_dropdown_disabled.svg resources/icons/clear_search.svg resources/icons/search.svg resources/icons/search_advanced.svg resources/icons/search_console.svg resources/icons/note_item.svg + resources/themes/v_native/arrow_dropdown.svg + resources/themes/v_native/arrow_dropdown_disabled.svg + resources/themes/v_native/close.svg + resources/themes/v_native/close_grey.svg + resources/themes/v_native/float.svg + resources/themes/v_native/v_native.css + resources/themes/v_native/v_native.mdhl + resources/themes/v_native/v_native.palette + resources/themes/v_native/v_native.qss + resources/themes/v_native/v_native_codeblock.css + resources/themes/v_native/v_native_mermaid.css diff --git a/src/vsearcher.cpp b/src/vsearcher.cpp index 69969cd5..68772a31 100644 --- a/src/vsearcher.cpp +++ b/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); }