diff --git a/src/resources/themes/v_material/v_material.palette b/src/resources/themes/v_material/v_material.palette index 75ff09a1..dc4d3697 100644 --- a/src/resources/themes/v_material/v_material.palette +++ b/src/resources/themes/v_material/v_material.palette @@ -6,6 +6,7 @@ qss_file=v_material.qss mdhl_file=v_material.mdhl css_file=v_material.css codeblock_css_file=v_material_codeblock.css +vsersion=1 [phony] ; Abstract color attributes. diff --git a/src/resources/themes/v_moonlight/checkbox_checked_disabled.svg b/src/resources/themes/v_moonlight/checkbox_checked_disabled.svg new file mode 100644 index 00000000..69dadc72 --- /dev/null +++ b/src/resources/themes/v_moonlight/checkbox_checked_disabled.svg @@ -0,0 +1,7 @@ + + + Layer 1 + + + + diff --git a/src/resources/themes/v_moonlight/checkbox_unchecked_disabled.svg b/src/resources/themes/v_moonlight/checkbox_unchecked_disabled.svg new file mode 100644 index 00000000..19e54451 --- /dev/null +++ b/src/resources/themes/v_moonlight/checkbox_unchecked_disabled.svg @@ -0,0 +1,6 @@ + + + Layer 1 + + + diff --git a/src/resources/themes/v_moonlight/radiobutton_checked_disabled.svg b/src/resources/themes/v_moonlight/radiobutton_checked_disabled.svg new file mode 100644 index 00000000..f12828f7 --- /dev/null +++ b/src/resources/themes/v_moonlight/radiobutton_checked_disabled.svg @@ -0,0 +1,7 @@ + + + Layer 1 + + + + diff --git a/src/resources/themes/v_moonlight/radiobutton_unchecked_disabled.svg b/src/resources/themes/v_moonlight/radiobutton_unchecked_disabled.svg new file mode 100644 index 00000000..dc6a604b --- /dev/null +++ b/src/resources/themes/v_moonlight/radiobutton_unchecked_disabled.svg @@ -0,0 +1,6 @@ + + + Layer 1 + + + diff --git a/src/resources/themes/v_moonlight/v_moonlight.palette b/src/resources/themes/v_moonlight/v_moonlight.palette index 97eb4281..5d3cabe1 100644 --- a/src/resources/themes/v_moonlight/v_moonlight.palette +++ b/src/resources/themes/v_moonlight/v_moonlight.palette @@ -7,7 +7,7 @@ mdhl_file=v_moonlight.mdhl css_file=v_moonlight.css codeblock_css_file=v_moonlight_codeblock.css mermaid_css_file=v_moonlight_mermaid.css -version=5 +version=6 ; This mapping will be used to translate colors when the content of HTML is copied ; without background. You could just specify the foreground colors mapping here. @@ -65,6 +65,8 @@ edit_fg=#D7DAE0 edit_bg=#282C34 edit_focus_bg=#1B1D23 edit_focus_border=@master_bg +edit_hover_bg=#313338 +edit_hover_border=@master_bg edit_selection_fg=@edit_fg edit_selection_bg=#4D5565 @@ -74,7 +76,7 @@ icon_disabled_fg=@disabled_fg danger_fg=#F5F5F5 danger_bg=#C9302C danger_focus_bg=#D9534F -danger_hover_bg=#D9534F +danger_hover_bg=#DE6764 danger_pressed_bg=#AC2925 [soft_defined] @@ -121,7 +123,8 @@ widget_fg=@base_fg ; Separator of dock widgets. dock_separator_bg=@border_bg -dock_separator_hover_bg=@border_bg +dock_separator_hover_bg=@hover_bg +dock_separator_pressed_bg=@pressed_bg ; Menubar. menubar_bg=@main_bg @@ -182,30 +185,7 @@ pushbutton_specialbtn_hover_bg=@master_hover_bg pushbutton_specialbtn_checked_bg=@master_focus_bg pushbutton_specialbtn_pressed_bg=@master_pressed_bg -pushbutton_cornerbtn_hover_bg=@hover_bg -pushbutton_cornerbtn_focus_bg=@focus_bg -pushbutton_cornerbtn_pressed_bg=@pressed_bg - -pushbutton_statusbtn_hover_bg=@hover_bg -pushbutton_statusbtn_focus_bg=@focus_bg -pushbutton_statusbtn_pressed_bg=@pressed_bg - -pushbutton_avatarbtn_hover_bg=@hover_bg -pushbutton_avatarbtn_focus_bg=@focus_bg -pushbutton_avatarbtn_pressed_bg=@pressed_bg - -pushbutton_flatbtn_hover_bg=@hover_bg -pushbutton_flatbtn_focus_bg=@focus_bg -pushbutton_flatbtn_pressed_bg=@pressed_bg - -pushbutton_selectionbtn_hover_bg=@hover_bg -pushbutton_selectionbtn_focus_bg=@focus_bg -pushbutton_selectionbtn_pressed_bg=@pressed_bg - pushbutton_titlebtn_bg=@title_bg -pushbutton_titlebtn_hover_bg=@hover_bg -pushbutton_titlebtn_focus_bg=@focus_bg -pushbutton_titlebtn_pressed_bg=@pressed_bg pushbutton_dangerbtn_fg=@danger_fg pushbutton_dangerbtn_bg=@danger_bg @@ -234,6 +214,8 @@ combobox_view_item_hover_fg=@hover_fg combobox_view_item_hover_bg=@hover_bg combobox_focus_bg=@edit_focus_bg combobox_focus_border=@edit_focus_border +combobox_hover_bg=@edit_hover_bg +combobox_hover_border=@edit_hover_border combobox_item_icon_fg=@item_icon_fg combobox_notebookselector_fg=@master_bg @@ -256,6 +238,8 @@ lineedit_bg=@edit_bg lineedit_disabled_fg=@disabled_fg lineedit_focus_bg=@edit_focus_bg lineedit_focus_border=@edit_focus_border +lineedit_hover_bg=@edit_hover_bg +lineedit_hover_border=@edit_hover_border lineedit_selection_fg=@edit_selection_fg lineedit_selection_bg=@edit_selection_bg @@ -313,6 +297,7 @@ listview_item_selected_inactive_bg=@inactive_bg ; Splitter. splitter_handle_bg=@border_bg +splitter_handle_pressed_bg=@pressed_bg ; StatusBar. statusbar_fg=@main_fg @@ -332,10 +317,13 @@ editwindow_corner_icon_inactive_fg=@icon_fg ; CheckBox. checkbox_disabled_fg=@disabled_fg +checkbox_indicator_focus_bg=@focus_bg checkbox_indicator_hover_bg=@hover_bg checkbox_indicator_pressed_bg=@pressed_bg ; RadioButton. +radiobutton_disabled_fg=@disabled_fg +radiobutton_indicator_focus_bg=@focus_bg radiobutton_indicator_hover_bg=@hover_bg radiobutton_indicator_pressed_bg=@pressed_bg @@ -347,6 +335,8 @@ spinbox_selection_fg=@edit_selection_fg spinbox_selection_bg=@edit_selection_bg spinbox_focus_border=@edit_focus_border spinbox_focus_bg=@edit_focus_bg +spinbox_hover_border=@edit_hover_border +spinbox_hover_bg=@edit_hover_bg spinbox_button_hover_bg=@hover_bg spinbox_button_pressed_bg=@pressed_bg diff --git a/src/resources/themes/v_moonlight/v_moonlight.qss b/src/resources/themes/v_moonlight/v_moonlight.qss index fd94e39e..035f702a 100644 --- a/src/resources/themes/v_moonlight/v_moonlight.qss +++ b/src/resources/themes/v_moonlight/v_moonlight.qss @@ -6,16 +6,27 @@ QToolTip } /* QWidget */ +QWidget[NotebookPanel="true"] { + padding-left: 3px; +} + +QWidget#FindReplaceTitleWidget { + background: @title_bg; +} + +QWidget[ToolBoxTitle="true"] { + border-bottom: 2px solid @toolbox_title_border; +} + +QWidget[MainEditor="true"] { + border: none; +} + 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 */ @@ -33,6 +44,10 @@ QMainWindow::separator { QMainWindow::separator:hover { background: @dock_separator_hover_bg; } + +QMainWindow::separator:pressed { + background: @dock_separator_pressed_bg; +} /* End QMainWindow */ QMenuBar { @@ -61,15 +76,15 @@ QMenu::item { 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::item:disabled { + color: @menu_item_disabled_fg; +} + QMenu::icon:checked { /* appearance of a 'checked' icon */ border: 2px solid @menu_fg; } @@ -116,6 +131,14 @@ QToolBar::separator { } /* QToolButton */ +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 { border: none; background: transparent; @@ -123,12 +146,8 @@ QToolButton { 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:checked { + background: @toolbutton_checked_bg; } QToolButton:hover { @@ -140,14 +159,6 @@ 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; @@ -201,10 +212,6 @@ QPushButton[SpecialBtn="true"]:checked { background-color: @pushbutton_specialbtn_checked_bg; } -QPushButton[SpecialBtn="true"]:checked:hover { - background-color: @pushbutton_specialbtn_hover_bg; -} - QPushButton[SpecialBtn="true"]:hover { background-color: @pushbutton_specialbtn_hover_bg; } @@ -213,11 +220,6 @@ QPushButton[SpecialBtn="true"]:pressed { background-color: @pushbutton_specialbtn_pressed_bg; } -QPushButton[SpecialBtn="true"]:disabled { - color: @pushbutton_disabled_fg; - background-color: @pushbutton_disabled_bg; -} - QPushButton[CornerBtn="true"] { padding: 4px -2px 4px -2px; margin: 0px; @@ -230,28 +232,6 @@ QPushButton[CornerBtn="true"]::menu-indicator { image: none; } -QPushButton[CornerBtn="true"]:default { - border: 1px solid @pushbutton_default_border; - background-color: transparent; -} - -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[StatusBtn="true"] { font: bold; padding: 0px 2px 0px 2px; @@ -261,28 +241,6 @@ QPushButton[StatusBtn="true"] { min-width: -1; } -QPushButton[StatusBtn="true"]:default { - border: 1px solid @pushbutton_default_border; - 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[FlatBtn="true"] { padding: 4px; margin: 0px; @@ -291,28 +249,6 @@ QPushButton[FlatBtn="true"] { min-width: -1; } -QPushButton[FlatBtn="true"]:default { - border: 1px solid @pushbutton_default_border; - 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[SelectionBtn="true"] { padding: 4px 10px 4px 10px; border: none; @@ -322,28 +258,6 @@ QPushButton[SelectionBtn="true"] { min-width: -1; } -QPushButton[SelectionBtn="true"]:default { - border: 1px solid @pushbutton_default_border; - background-color: transparent; -} - -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[TitleBtn="true"] { padding: 4px; margin: 0px; @@ -352,28 +266,6 @@ QPushButton[TitleBtn="true"] { min-width: -1; } -QPushButton[TitleBtn="true"]:default { - border: 1px solid @pushbutton_default_border; - 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[DangerBtn="true"] { color: @pushbutton_dangerbtn_fg; border: none; @@ -402,11 +294,6 @@ QPushButton[DangerBtn="true"]:pressed { background-color: @pushbutton_dangerbtn_pressed_bg; } -QPushButton[DangerBtn="true"]:disabled { - color: @pushbutton_disabled_fg; - background-color: @pushbutton_disabled_bg; -} - QPushButton[ToolBoxActiveBtn="true"] { padding: 4px 10px 4px 4px; margin: 0px; @@ -446,28 +333,6 @@ QPushButton[AvatarBtn="true"] { min-width: -1; } -QPushButton[AvatarBtn="true"]:default { - border: 1px solid @pushbutton_default_border; - 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 { color: @pushbutton_fg; background: @pushbutton_bg; @@ -488,10 +353,6 @@ QPushButton:checked { background-color: @pushbutton_checked_bg; } -QPushButton:checked:hover { - background-color: @pushbutton_hover_bg; -} - QPushButton:flat { border: none; } @@ -563,6 +424,46 @@ VButtonMenuItem:disabled { /* End QPushButton*/ /* QComboBox */ +QComboBox#NotebookSelector { + border: none; + border-bottom: 2px solid @combobox_notebookselector_border; + font-size: 13pt; + padding-top: 3px; + padding-bottom: 3px; + icon-size: 30px; + font-weight: bold; + color: @combobox_notebookselector_fg; + background: @combobox_notebookselector_bg; +} + +QComboBox#NotebookSelector:focus, QComboBox#NotebookSelector:on { + color: @combobox_notebookselector_focus_fg; + background: @combobox_notebookselector_focus_bg; +} + +QComboBox#NotebookSelector:hover { + color: @combobox_notebookselector_hover_fg; + background: @combobox_notebookselector_hover_bg; +} + +QComboBox#NotebookSelector QListWidget { + border: 1px solid @combobox_view_border; + background-color: @combobox_bg; + font-size: 13pt; + font-weight: normal; + 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; +} + QComboBox { padding: 3px; color: @combobox_fg; @@ -570,15 +471,20 @@ QComboBox { border: 1px solid @combobox_border; } -QComboBox:disabled { - color: @combobox_disabled_fg; -} - QComboBox:focus, QComboBox:on { background-color: @combobox_focus_bg; border: 2px solid @combobox_focus_border; } +QComboBox:hover { + background-color: @combobox_hover_bg; + border: 2px solid @combobox_hover_border; +} + +QComboBox:disabled { + color: @combobox_disabled_fg; +} + QComboBox::drop-down { subcontrol-origin: padding; subcontrol-position: top right; @@ -616,61 +522,9 @@ QComboBox QAbstractItemView::item:hover { color: @combobox_view_item_hover_fg; background: @combobox_view_item_hover_bg; } - -QComboBox#NotebookSelector { - border: none; - border-bottom: 2px solid @combobox_notebookselector_border; - font-size: 13pt; - padding-top: 3px; - padding-bottom: 3px; - icon-size: 30px; - font-weight: bold; - color: @combobox_notebookselector_fg; - background: @combobox_notebookselector_bg; -} - -QComboBox#NotebookSelector::down-arrow { - image: url(arrow_dropdown.svg); - width: 20px; - height: 20px; -} - -QComboBox#NotebookSelector:hover { - color: @combobox_notebookselector_hover_fg; - background: @combobox_notebookselector_hover_bg; -} - -QComboBox#NotebookSelector:focus, QComboBox#NotebookSelector:on { - color: @combobox_notebookselector_focus_fg; - background: @combobox_notebookselector_focus_bg; -} - -QComboBox#NotebookSelector QListWidget { - border: 1px solid @combobox_view_border; - background-color: @combobox_bg; - font-size: 13pt; - font-weight: normal; - 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; @@ -739,9 +593,33 @@ VTabIndicator QLabel[TabIndicatorLabel="true"] { color: @tab_indicator_label_fg; background: transparent; } + +QLabel { + border: none; + color: @label_fg; + background: transparent; +} /* End QLabel */ /* QLineEdit */ +QLineEdit[VimCommandLine="true"] { + padding: 0px; + margin: 0px; + border: none; + color: @lineedit_fg; + background: @lineedit_bg; +} + +QLineEdit[VimCommandLine="true"]:focus { + border: none; + background: @lineedit_focus_bg; +} + +QLineEdit[VimCommandLine="true"]:hover { + border: none; + background: @lineedit_hover_bg; +} + QLineEdit { border: 1px solid @lineedit_border; padding: 3px; @@ -756,16 +634,13 @@ QLineEdit:focus { background: @lineedit_focus_bg; } -QLineEdit:disabled { - color: @lineedit_disabled_fg; +QLineEdit:hover { + border: 2px solid @lineedit_hover_border; + background: @lineedit_hover_bg; } -QLineEdit[VimCommandLine="true"] { - padding: 0px; - margin: 0px; - border: none; - color: @lineedit_fg; - background: @lineedit_bg; +QLineEdit:disabled { + color: @lineedit_disabled_fg; } /* End QLineEdit */ @@ -783,6 +658,11 @@ QPlainTextEdit[LineEdit="true"]:focus, QTextEdit[LineEdit="true"]:focus { border: 2px solid @lineedit_focus_border; background: @lineedit_focus_bg; } + +QPlainTextEdit[LineEdit="true"]:hover, QTextEdit[LineEdit="true"]:hover { + border: 2px solid @lineedit_hover_border; + background: @lineedit_hover_bg; +} /* End QPlainTextEdit QTextEdit */ /* QTabWidget */ @@ -805,26 +685,26 @@ QTabBar::tab { padding: 2px 0px 2px 0px; } +QTabBar::tab:hover { + color: @tabbar_hover_fg; + background: @tabbar_hover_bg; +} + QTabBar::tab:selected { color: @tabbar_selected_fg; background: @tabbar_selected_bg; border-top: 2px solid @master_bg; } -QTabBar::tab:hover { - color: @tabbar_hover_fg; - background: @tabbar_hover_bg; -} - QTabBar::close-button { image: url(close_grey.svg); } -QTabBar::close-button:hover { +QTabBar::close-button:focus { image: url(close.svg); } -QTabBar::close-button:focus { +QTabBar::close-button:hover { image: url(close.svg); } @@ -868,6 +748,36 @@ VInsertSelector { } /* QTreeView */ +QTreeView[ItemBorder="true"]::item { + padding-top: 5px; + padding-bottom: 5px; + border-bottom: 1px solid @treeview_item_border_bg; +} + +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; +} + QTreeView { color: @treeview_fg; background: @treeview_bg; @@ -882,12 +792,6 @@ QTreeView::item { 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; @@ -931,30 +835,6 @@ 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 */ @@ -994,6 +874,10 @@ QListView::item:selected:!active { /* End QListView */ /* QSplitter */ +QSplitter#MainSplitter { + border: none; +} + QSplitter { border: none; } @@ -1002,6 +886,10 @@ QSplitter::handle { background-color: @splitter_handle_bg; } +QSplitter::handle:pressed { + background-color: @splitter_handle_pressed_bg; +} + QSplitter::handle:vertical { height: 2px; } @@ -1009,10 +897,6 @@ QSplitter::handle:vertical { QSplitter::handle:horizontal { width: 2px; } - -QSplitter#MainSplitter { - border: none; -} /* End QSplitter */ /* QStatusBar */ @@ -1023,10 +907,6 @@ QStatusBar { } /* End QStatusBar */ -QWidget[MainEditor="true"] { - border: none; -} - QDialog { color: @base_fg; background: @base_bg; @@ -1181,40 +1061,36 @@ 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:unchecked:disabled { + image: url(checkbox_unchecked_disabled.svg); } QCheckBox::indicator:checked { image: url(checkbox_checked.svg); } -QCheckBox::indicator:checked:hover { +QCheckBox::indicator:checked:disabled { + image: url(checkbox_checked_disabled.svg); +} + +QCheckBox::indicator { + width: 20px; + height: 20px; +} + +QCheckBox::indicator:focus { + background: @checkbox_indicator_focus_bg; +} + +QCheckBox::indicator: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 { +QCheckBox::indicator:pressed { background: @checkbox_indicator_pressed_bg; } /* End QCheckBox */ @@ -1224,32 +1100,40 @@ QRadioButton { spacing: 5px; } -QRadioButton::indicator { - width: 20px; - height: 20px; +QRadioButton:disabled { + color: @radiobutton_disabled_fg; } 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:unchecked:disabled { + image: url(radiobutton_unchecked_disabled.svg); } QRadioButton::indicator:checked { image: url(radiobutton_checked.svg); } -QRadioButton::indicator:checked:hover { +QRadioButton::indicator:checked:disabled { + image: url(radiobutton_checked_disabled.svg); +} + +QRadioButton::indicator { + width: 20px; + height: 20px; +} + +QRadioButton::indicator:focus { + background: @radiobutton_indicator_focus_bg; +} + +QRadioButton::indicator:hover { background: @radiobutton_indicator_hover_bg; } -QRadioButton::indicator:checked:pressed { +QRadioButton::indicator:pressed { background: @radiobutton_indicator_pressed_bg; } /* End QRadioButton */ @@ -1270,6 +1154,11 @@ QSpinBox:focus, QDoubleSpinBox::focus { background: @spinbox_focus_bg; } +QSpinBox:hover, QDoubleSpinBox::hover { + border: 2px solid @spinbox_hover_border; + background: @spinbox_hover_bg; +} + QSpinBox::up-button, QDoubleSpinBox::up-button { subcontrol-origin: border; subcontrol-position: top right; /* position at the top right corner */ @@ -1342,21 +1231,17 @@ QHeaderView::section:checked /* style the sort indicator */ QHeaderView::down-arrow { image: url(down.svg); + width: 12px; + height: 12px; } QHeaderView::up-arrow { image: url(up.svg); + width: 12px; + height: 12px; } /* End QHeaderView */ -QWidget#FindReplaceTitleWidget { - background: @title_bg; -} - -QWidget[ToolBoxTitle="true"] { - border-bottom: 2px solid @toolbox_title_border; -} - QAbstractScrollArea::corner { background: @scrollbar_bg; border: none; diff --git a/src/resources/themes/v_native/v_native.palette b/src/resources/themes/v_native/v_native.palette index 611883fe..27d37c21 100644 --- a/src/resources/themes/v_native/v_native.palette +++ b/src/resources/themes/v_native/v_native.palette @@ -7,16 +7,13 @@ 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 +version=6 [phony] ; Abstract color attributes. base_fg=#000000 base_bg=#F5F5F5 -main_fg=#000000 -main_bg=#F5F5F5 - title_fg=#000000 title_bg=#DADBDB @@ -26,12 +23,6 @@ hover_bg=#C0C0C0 selected_fg=#000000 selected_bg=#BCBCBC -active_fg=#000000 -active_bg=#C0C0C0 - -inactive_fg=#000000 -inactive_bg=#D3D3D3 - focus_fg=#000000 focus_bg=#A9A9A9 @@ -47,9 +38,6 @@ border_bg=#C0C0C0 content_fg=#000000 content_bg=#FFFFFF -selection_fg=#000000 -selection_bg=#64b5f6 - icon_fg=#222222 icon_disabled_fg=@disabled_fg diff --git a/src/resources/themes/v_pure/checkbox_checked_disabled.svg b/src/resources/themes/v_pure/checkbox_checked_disabled.svg new file mode 100644 index 00000000..39c47873 --- /dev/null +++ b/src/resources/themes/v_pure/checkbox_checked_disabled.svg @@ -0,0 +1,7 @@ + + + Layer 1 + + + + diff --git a/src/resources/themes/v_pure/checkbox_unchecked_disabled.svg b/src/resources/themes/v_pure/checkbox_unchecked_disabled.svg new file mode 100644 index 00000000..35788230 --- /dev/null +++ b/src/resources/themes/v_pure/checkbox_unchecked_disabled.svg @@ -0,0 +1,6 @@ + + + Layer 1 + + + diff --git a/src/resources/themes/v_pure/radiobutton_checked_disabled.svg b/src/resources/themes/v_pure/radiobutton_checked_disabled.svg new file mode 100644 index 00000000..b67faef0 --- /dev/null +++ b/src/resources/themes/v_pure/radiobutton_checked_disabled.svg @@ -0,0 +1,7 @@ + + + Layer 1 + + + + diff --git a/src/resources/themes/v_pure/radiobutton_unchecked_disabled.svg b/src/resources/themes/v_pure/radiobutton_unchecked_disabled.svg new file mode 100644 index 00000000..8308f78b --- /dev/null +++ b/src/resources/themes/v_pure/radiobutton_unchecked_disabled.svg @@ -0,0 +1,6 @@ + + + Layer 1 + + + diff --git a/src/resources/themes/v_pure/v_pure.palette b/src/resources/themes/v_pure/v_pure.palette index 2158040a..c9a5cbbb 100644 --- a/src/resources/themes/v_pure/v_pure.palette +++ b/src/resources/themes/v_pure/v_pure.palette @@ -7,7 +7,7 @@ mdhl_file=v_pure.mdhl css_file=v_pure.css codeblock_css_file=v_pure_codeblock.css mermaid_css_file=v_pure_mermaid.css -version=5 +version=6 [phony] ; Abstract color attributes. @@ -41,16 +41,16 @@ hover_fg=@base_fg hover_bg=#D0D0D0 selected_fg=@base_fg -selected_bg=#BDBDBD +selected_bg=#80CBC4 active_fg=@selected_fg active_bg=@selected_bg inactive_fg=@selected_fg -inactive_bg=#D3D3D3 +inactive_bg=#B2DFDB -focus_fg=@selected_fg -focus_bg=@selected_bg +focus_fg=@base_fg +focus_bg=#BDBDBD pressed_fg=@base_fg pressed_bg=#B2B2B2 @@ -59,6 +59,8 @@ edit_fg=#222222 edit_bg=#F5F5F5 edit_focus_bg=#E0F2F1 edit_focus_border=@master_bg +edit_hover_bg=#F2FAF9 +edit_hover_border=@master_bg edit_selection_fg=@edit_fg edit_selection_bg=@master_light_bg @@ -68,7 +70,7 @@ icon_disabled_fg=@disabled_fg danger_fg=#F5F5F5 danger_bg=#C9302C danger_focus_bg=#D9534F -danger_hover_bg=#D9534F +danger_hover_bg=#DE6764 danger_pressed_bg=#AC2925 [soft_defined] @@ -115,7 +117,8 @@ widget_fg=@base_fg ; Separator of dock widgets. dock_separator_bg=@border_bg -dock_separator_hover_bg=@border_bg +dock_separator_hover_bg=@hover_bg +dock_separator_pressed_bg=@pressed_bg ; Menubar. menubar_bg=@main_bg @@ -174,30 +177,7 @@ pushbutton_specialbtn_hover_bg=@master_hover_bg pushbutton_specialbtn_checked_bg=#3F51B5 pushbutton_specialbtn_pressed_bg=@master_pressed_bg -pushbutton_cornerbtn_hover_bg=@hover_bg -pushbutton_cornerbtn_focus_bg=@focus_bg -pushbutton_cornerbtn_pressed_bg=@pressed_bg - -pushbutton_statusbtn_hover_bg=@hover_bg -pushbutton_statusbtn_focus_bg=@focus_bg -pushbutton_statusbtn_pressed_bg=@pressed_bg - -pushbutton_avatarbtn_hover_bg=@hover_bg -pushbutton_avatarbtn_focus_bg=@focus_bg -pushbutton_avatarbtn_pressed_bg=@pressed_bg - -pushbutton_flatbtn_hover_bg=@hover_bg -pushbutton_flatbtn_focus_bg=@focus_bg -pushbutton_flatbtn_pressed_bg=@pressed_bg - -pushbutton_selectionbtn_hover_bg=@hover_bg -pushbutton_selectionbtn_focus_bg=@focus_bg -pushbutton_selectionbtn_pressed_bg=@pressed_bg - pushbutton_titlebtn_bg=@title_bg -pushbutton_titlebtn_hover_bg=@hover_bg -pushbutton_titlebtn_focus_bg=@focus_bg -pushbutton_titlebtn_pressed_bg=@pressed_bg pushbutton_dangerbtn_fg=@danger_fg pushbutton_dangerbtn_bg=@danger_bg @@ -228,6 +208,8 @@ combobox_view_item_hover_fg=@hover_fg combobox_view_item_hover_bg=@hover_bg combobox_focus_bg=@edit_focus_bg combobox_focus_border=@edit_focus_border +combobox_hover_bg=@edit_hover_bg +combobox_hover_border=@edit_hover_border combobox_item_icon_fg=@item_icon_fg combobox_notebookselector_fg=@master_dark_bg @@ -250,6 +232,8 @@ lineedit_bg=@edit_bg lineedit_disabled_fg=@disabled_fg lineedit_focus_bg=@edit_focus_bg lineedit_focus_border=@edit_focus_border +lineedit_hover_bg=@edit_hover_bg +lineedit_hover_border=@edit_hover_border lineedit_selection_fg=@edit_selection_fg lineedit_selection_bg=@edit_selection_bg @@ -307,6 +291,7 @@ listview_item_selected_inactive_bg=@inactive_bg ; Splitter. splitter_handle_bg=@border_bg +splitter_handle_pressed_bg=@pressed_bg ; StatusBar. statusbar_fg=@main_fg @@ -325,10 +310,13 @@ editwindow_corner_icon_inactive_fg=#D3D3D3 ; CheckBox. checkbox_disabled_fg=@disabled_fg +checkbox_indicator_focus_bg=@focus_bg checkbox_indicator_hover_bg=@hover_bg checkbox_indicator_pressed_bg=@pressed_bg ; RadioButton. +radiobutton_disabled_fg=@disabled_fg +radiobutton_indicator_focus_bg=@focus_bg radiobutton_indicator_hover_bg=@hover_bg radiobutton_indicator_pressed_bg=@pressed_bg @@ -340,6 +328,8 @@ spinbox_selection_fg=@edit_selection_fg spinbox_selection_bg=@edit_selection_bg spinbox_focus_border=@edit_focus_border spinbox_focus_bg=@edit_focus_bg +spinbox_hover_border=@edit_hover_border +spinbox_hover_bg=@edit_hover_bg spinbox_button_hover_bg=@hover_bg spinbox_button_pressed_bg=@pressed_bg diff --git a/src/resources/themes/v_pure/v_pure.qss b/src/resources/themes/v_pure/v_pure.qss index a8cbbd92..43389684 100644 --- a/src/resources/themes/v_pure/v_pure.qss +++ b/src/resources/themes/v_pure/v_pure.qss @@ -6,16 +6,27 @@ QToolTip } /* QWidget */ +QWidget[NotebookPanel="true"] { + padding-left: 3px; +} + +QWidget#FindReplaceTitleWidget { + background: @title_bg; +} + +QWidget[ToolBoxTitle="true"] { + border-bottom: 2px solid @toolbox_title_border; +} + +QWidget[MainEditor="true"] { + border: none; +} + 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 */ @@ -33,6 +44,10 @@ QMainWindow::separator { QMainWindow::separator:hover { background: @dock_separator_hover_bg; } + +QMainWindow::separator:pressed { + background: @dock_separator_pressed_bg; +} /* End QMainWindow */ QMenuBar { @@ -61,15 +76,15 @@ QMenu::item { 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::item:disabled { + color: @menu_item_disabled_fg; +} + QMenu::icon:checked { /* appearance of a 'checked' icon */ border: 2px solid @menu_fg; } @@ -116,6 +131,14 @@ QToolBar::separator { } /* QToolButton */ +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 { border: none; background: transparent; @@ -123,12 +146,8 @@ QToolButton { 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:checked { + background: @toolbutton_checked_bg; } QToolButton:hover { @@ -140,14 +159,6 @@ 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; @@ -201,10 +212,6 @@ QPushButton[SpecialBtn="true"]:checked { background-color: @pushbutton_specialbtn_checked_bg; } -QPushButton[SpecialBtn="true"]:checked:hover { - background-color: @pushbutton_specialbtn_hover_bg; -} - QPushButton[SpecialBtn="true"]:hover { background-color: @pushbutton_specialbtn_hover_bg; } @@ -213,11 +220,6 @@ QPushButton[SpecialBtn="true"]:pressed { background-color: @pushbutton_specialbtn_pressed_bg; } -QPushButton[SpecialBtn="true"]:disabled { - color: @pushbutton_disabled_fg; - background-color: @pushbutton_disabled_bg; -} - QPushButton[CornerBtn="true"] { padding: 4px -2px 4px -2px; margin: 0px; @@ -230,28 +232,6 @@ QPushButton[CornerBtn="true"]::menu-indicator { image: none; } -QPushButton[CornerBtn="true"]:default { - border: 1px solid @pushbutton_default_border; - background-color: transparent; -} - -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[StatusBtn="true"] { font: bold; padding: 0px 2px 0px 2px; @@ -261,28 +241,6 @@ QPushButton[StatusBtn="true"] { min-width: -1; } -QPushButton[StatusBtn="true"]:default { - border: 1px solid @pushbutton_default_border; - 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[FlatBtn="true"] { padding: 4px; margin: 0px; @@ -291,28 +249,6 @@ QPushButton[FlatBtn="true"] { min-width: -1; } -QPushButton[FlatBtn="true"]:default { - border: 1px solid @pushbutton_default_border; - 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[SelectionBtn="true"] { padding: 4px 10px 4px 10px; border: none; @@ -322,28 +258,6 @@ QPushButton[SelectionBtn="true"] { min-width: -1; } -QPushButton[SelectionBtn="true"]:default { - border: 1px solid @pushbutton_default_border; - background-color: transparent; -} - -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[TitleBtn="true"] { padding: 4px; margin: 0px; @@ -352,28 +266,6 @@ QPushButton[TitleBtn="true"] { min-width: -1; } -QPushButton[TitleBtn="true"]:default { - border: 1px solid @pushbutton_default_border; - 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[DangerBtn="true"] { color: @pushbutton_dangerbtn_fg; border: none; @@ -402,11 +294,6 @@ QPushButton[DangerBtn="true"]:pressed { background-color: @pushbutton_dangerbtn_pressed_bg; } -QPushButton[DangerBtn="true"]:disabled { - color: @pushbutton_disabled_fg; - background-color: @pushbutton_disabled_bg; -} - QPushButton[ToolBoxActiveBtn="true"] { padding: 4px 10px 4px 4px; margin: 0px; @@ -425,14 +312,14 @@ QPushButton[ToolBoxActiveBtn="true"]:focus { background-color: @pushbutton_toolboxbtn_active_focus_bg; } -QPushButton[ToolBoxActiveBtn="true"]:pressed { - background-color: @pushbutton_toolboxbtn_active_pressed_bg; -} - QPushButton[ToolBoxActiveBtn="true"]:hover { background-color: @pushbutton_toolboxbtn_active_hover_bg; } +QPushButton[ToolBoxActiveBtn="true"]:pressed { + background-color: @pushbutton_toolboxbtn_active_pressed_bg; +} + QPushButton[ToolBoxActiveBtn="true"]:disabled { color: @pushbutton_disabled_fg; background-color: @pushbutton_disabled_bg; @@ -446,28 +333,6 @@ QPushButton[AvatarBtn="true"] { min-width: -1; } -QPushButton[AvatarBtn="true"]:focus { - background-color: @pushbutton_avatarbtn_focus_bg;; -} - -QPushButton[AvatarBtn="true"]:default { - border: 1px solid @pushbutton_default_border; - background-color: transparent; -} - -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 { color: @pushbutton_fg; background: @pushbutton_bg; @@ -484,10 +349,6 @@ QPushButton:checked { background-color: @pushbutton_checked_bg; } -QPushButton:checked:hover { - background-color: @pushbutton_hover_bg; -} - QPushButton:flat { border: none; } @@ -563,6 +424,46 @@ VButtonMenuItem:disabled { /* End QPushButton*/ /* QComboBox */ +QComboBox#NotebookSelector { + border: none; + border-bottom: 2px solid @combobox_notebookselector_border; + font-size: 13pt; + padding-top: 3px; + padding-bottom: 3px; + icon-size: 30px; + font-weight: bold; + color: @combobox_notebookselector_fg; + background: @combobox_notebookselector_bg; +} + +QComboBox#NotebookSelector:focus, QComboBox#NotebookSelector:on { + color: @combobox_notebookselector_focus_fg; + background: @combobox_notebookselector_focus_bg; +} + +QComboBox#NotebookSelector:hover { + color: @combobox_notebookselector_hover_fg; + background: @combobox_notebookselector_hover_bg; +} + +QComboBox#NotebookSelector QListWidget { + border: 1px solid @combobox_view_border; + background-color: @combobox_bg; + font-size: 13pt; + font-weight: normal; + 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; +} + QComboBox { padding: 3px; color: @combobox_fg; @@ -570,15 +471,20 @@ QComboBox { border: 1px solid @combobox_border; } -QComboBox:disabled { - color: @combobox_disabled_fg; -} - QComboBox:focus, QComboBox:on { background-color: @combobox_focus_bg; border: 2px solid @combobox_focus_border; } +QComboBox:hover { + background-color: @combobox_hover_bg; + border: 2px solid @combobox_hover_border; +} + +QComboBox:disabled { + color: @combobox_disabled_fg; +} + QComboBox::drop-down { subcontrol-origin: padding; subcontrol-position: top right; @@ -616,61 +522,9 @@ QComboBox QAbstractItemView::item:hover { color: @combobox_view_item_hover_fg; background: @combobox_view_item_hover_bg; } - -QComboBox#NotebookSelector { - border: none; - border-bottom: 2px solid @combobox_notebookselector_border; - font-size: 13pt; - padding-top: 3px; - padding-bottom: 3px; - icon-size: 30px; - font-weight: bold; - color: @combobox_notebookselector_fg; - background: @combobox_notebookselector_bg; -} - -QComboBox#NotebookSelector::down-arrow { - image: url(arrow_dropdown.svg); - width: 20px; - height: 20px; -} - -QComboBox#NotebookSelector:hover { - color: @combobox_notebookselector_hover_fg; - background: @combobox_notebookselector_hover_bg; -} - -QComboBox#NotebookSelector:focus, QComboBox#NotebookSelector:on { - color: @combobox_notebookselector_focus_fg; - background: @combobox_notebookselector_focus_bg; -} - -QComboBox#NotebookSelector QListWidget { - border: 1px solid @combobox_view_border; - background-color: @combobox_bg; - font-size: 13pt; - font-weight: normal; - 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; @@ -739,9 +593,33 @@ VTabIndicator QLabel[TabIndicatorLabel="true"] { color: @tab_indicator_label_fg; background: transparent; } + +QLabel { + border: none; + color: @label_fg; + background: transparent; +} /* End QLabel */ /* QLineEdit */ +QLineEdit[VimCommandLine="true"] { + padding: 0px; + margin: 0px; + border: none; + color: @lineedit_fg; + background: @lineedit_bg; +} + +QLineEdit[VimCommandLine="true"]:focus { + background: @lineedit_focus_bg; + border: none; +} + +QLineEdit[VimCommandLine="true"]:hover { + background: @lineedit_hover_bg; + border: none; +} + QLineEdit { border: 1px solid @lineedit_border; padding: 3px; @@ -756,21 +634,14 @@ QLineEdit:focus { background: @lineedit_focus_bg; } +QLineEdit:hover { + border: 2px solid @lineedit_hover_border; + background: @lineedit_hover_bg; +} + QLineEdit:disabled { color: @lineedit_disabled_fg; } - -QLineEdit[VimCommandLine="true"] { - padding: 0px; - margin: 0px; - border: none; - color: @lineedit_fg; - background: @lineedit_bg; -} - -QLineEdit[VimCommandLine="true"]:focus { - background: @lineedit_focus_bg; -} /* End QLineEdit */ /* QPlainTextEdit QTextEdit */ @@ -787,6 +658,11 @@ QPlainTextEdit[LineEdit="true"]:focus, QTextEdit[LineEdit="true"]:focus { border: 2px solid @lineedit_focus_border; background: @lineedit_focus_bg; } + +QPlainTextEdit[LineEdit="true"]:hover, QTextEdit[LineEdit="true"]:hover { + border: 2px solid @lineedit_hover_border; + background: @lineedit_hover_bg; +} /* End QPlainTextEdit QTextEdit */ /* QTabWidget */ @@ -809,26 +685,26 @@ QTabBar::tab { padding: 2px 0px 2px 0px; } +QTabBar::tab:hover { + color: @tabbar_hover_fg; + background: @tabbar_hover_bg; +} + QTabBar::tab:selected { color: @tabbar_selected_fg; background: @tabbar_selected_bg; border-top: 2px solid @master_bg; } -QTabBar::tab:hover { - color: @tabbar_hover_fg; - background: @tabbar_hover_bg; -} - QTabBar::close-button { image: url(close_grey.svg); } -QTabBar::close-button:hover { +QTabBar::close-button:focus { image: url(close.svg); } -QTabBar::close-button:focus { +QTabBar::close-button:hover { image: url(close.svg); } @@ -872,6 +748,36 @@ VInsertSelector { } /* QTreeView */ +QTreeView[ItemBorder="true"]::item { + padding-top: 5px; + padding-bottom: 5px; + border-bottom: 1px solid @treeview_item_border_bg; +} + +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; +} + QTreeView { color: @treeview_fg; background: @treeview_bg; @@ -886,12 +792,6 @@ QTreeView::item { 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; @@ -935,30 +835,6 @@ 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 */ @@ -998,6 +874,10 @@ QListView::item:selected:!active { /* End QListView */ /* QSplitter */ +QSplitter#MainSplitter { + border: none; +} + QSplitter { border: none; } @@ -1006,6 +886,10 @@ QSplitter::handle { background-color: @splitter_handle_bg; } +QSplitter::handle:pressed { + background-color: @splitter_handle_pressed_bg; +} + QSplitter::handle:vertical { height: 2px; } @@ -1013,10 +897,6 @@ QSplitter::handle:vertical { QSplitter::handle:horizontal { width: 2px; } - -QSplitter#MainSplitter { - border: none; -} /* End QSplitter */ /* QStatusBar */ @@ -1026,10 +906,6 @@ QStatusBar { } /* End QStatusBar */ -QWidget[MainEditor="true"] { - border: none; -} - QDialog { color: @base_fg; background: @base_bg; @@ -1184,40 +1060,36 @@ 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:unchecked:disabled { + image: url(checkbox_unchecked_disabled.svg); } QCheckBox::indicator:checked { image: url(checkbox_checked.svg); } -QCheckBox::indicator:checked:hover { +QCheckBox::indicator:checked:disabled { + image: url(checkbox_checked_disabled.svg); +} + +QCheckBox::indicator { + width: 20px; + height: 20px; +} + +QCheckBox::indicator:focus { + background: @checkbox_indicator_focus_bg; +} + +QCheckBox::indicator: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 { +QCheckBox::indicator:pressed { background: @checkbox_indicator_pressed_bg; } /* End QCheckBox */ @@ -1227,32 +1099,40 @@ QRadioButton { spacing: 5px; } -QRadioButton::indicator { - width: 20px; - height: 20px; +QRadioButton:disabled { + color: @radiobutton_disabled_fg; } 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:unchecked:disabled { + image: url(radiobutton_unchecked_disabled.svg); } QRadioButton::indicator:checked { image: url(radiobutton_checked.svg); } -QRadioButton::indicator:checked:hover { +QRadioButton::indicator:checked:disabled { + image: url(radiobutton_checked_disabled.svg); +} + +QRadioButton::indicator { + width: 20px; + height: 20px; +} + +QRadioButton::indicator:focus { + background: @radiobutton_indicator_focus_bg; +} + +QRadioButton::indicator:hover { background: @radiobutton_indicator_hover_bg; } -QRadioButton::indicator:checked:pressed { +QRadioButton::indicator:pressed { background: @radiobutton_indicator_pressed_bg; } /* End QRadioButton */ @@ -1273,6 +1153,11 @@ QSpinBox:focus, QDoubleSpinBox::focus { background: @spinbox_focus_bg; } +QSpinBox:hover, QDoubleSpinBox::hover { + border: 2px solid @spinbox_hover_border; + background: @spinbox_hover_bg; +} + QSpinBox::up-button, QDoubleSpinBox::up-button { subcontrol-origin: border; subcontrol-position: top right; /* position at the top right corner */ @@ -1345,21 +1230,17 @@ QHeaderView::section:checked /* style the sort indicator */ QHeaderView::down-arrow { image: url(down.svg); + width: 12px; + height: 12px; } QHeaderView::up-arrow { image: url(up.svg); + width: 12px; + height: 12px; } /* End QHeaderView */ -QWidget#FindReplaceTitleWidget { - background: @title_bg; -} - -QWidget[ToolBoxTitle="true"] { - border-bottom: 2px solid @toolbox_title_border; -} - QAbstractScrollArea::corner { background: @scrollbar_bg; border: none; diff --git a/src/vcart.cpp b/src/vcart.cpp index 986af91c..61c08893 100644 --- a/src/vcart.cpp +++ b/src/vcart.cpp @@ -50,7 +50,7 @@ void VCart::setupUI() btnLayout->addWidget(m_clearBtn); btnLayout->addStretch(); btnLayout->addWidget(m_numLabel); - btnLayout->setContentsMargins(0, 0, 3, 0); + btnLayout->setContentsMargins(0, 0, 0, 0); m_itemList = new QListWidget(); m_itemList->setAttribute(Qt::WA_MacShowFocusRect, false); @@ -65,7 +65,7 @@ void VCart::setupUI() QVBoxLayout *mainLayout = new QVBoxLayout(); mainLayout->addLayout(btnLayout); mainLayout->addWidget(m_itemList); - mainLayout->setContentsMargins(0, 0, 0, 0); + mainLayout->setContentsMargins(3, 0, 3, 0); setLayout(mainLayout); } diff --git a/src/vconfigmanager.cpp b/src/vconfigmanager.cpp index 1fbe474b..e7d06d1a 100644 --- a/src/vconfigmanager.cpp +++ b/src/vconfigmanager.cpp @@ -1305,11 +1305,8 @@ void VConfigManager::initThemes() m_themes.insert(VPalette::themeName(file), file); file = ":/resources/themes/v_moonlight/v_moonlight.palette"; m_themes.insert(VPalette::themeName(file), file); - - /* NOT ready yet. Wait for author's tuning. file = ":/resources/themes/v_material/v_material.palette"; m_themes.insert(VPalette::themeName(file), file); - */ outputBuiltInThemes(); diff --git a/src/vnote.qrc b/src/vnote.qrc index e0361bd6..d954ab3b 100644 --- a/src/vnote.qrc +++ b/src/vnote.qrc @@ -229,5 +229,13 @@ resources/themes/v_native/v_native.qss resources/themes/v_native/v_native_codeblock.css resources/themes/v_native/v_native_mermaid.css + resources/themes/v_pure/checkbox_checked_disabled.svg + resources/themes/v_pure/checkbox_unchecked_disabled.svg + resources/themes/v_pure/radiobutton_checked_disabled.svg + resources/themes/v_pure/radiobutton_unchecked_disabled.svg + resources/themes/v_moonlight/checkbox_checked_disabled.svg + resources/themes/v_moonlight/checkbox_unchecked_disabled.svg + resources/themes/v_moonlight/radiobutton_checked_disabled.svg + resources/themes/v_moonlight/radiobutton_unchecked_disabled.svg diff --git a/src/vsearcher.cpp b/src/vsearcher.cpp index 68772a31..7f823389 100644 --- a/src/vsearcher.cpp +++ b/src/vsearcher.cpp @@ -92,7 +92,7 @@ void VSearcher::setupUI() btnLayout->addWidget(m_consoleBtn); btnLayout->addStretch(); btnLayout->addWidget(m_numLabel); - btnLayout->setContentsMargins(0, 0, 3, 0); + btnLayout->setContentsMargins(0, 0, 0, 0); // Keyword. m_keywordCB = VUtils::getComboBox(this); @@ -166,7 +166,7 @@ void VSearcher::setupUI() advLayout->addRow(m_wholeWordOnlyCB); advLayout->addRow(m_fuzzyCB); advLayout->addRow(m_regularExpressionCB); - advLayout->setContentsMargins(0, 0, 3, 0); + advLayout->setContentsMargins(0, 0, 0, 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, 3, 0); + proLayout->setContentsMargins(0, 0, 0, 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, 3, 0); + formLayout->setContentsMargins(0, 0, 0, 0); QVBoxLayout *mainLayout = new QVBoxLayout(); mainLayout->addLayout(btnLayout); @@ -228,7 +228,7 @@ void VSearcher::setupUI() mainLayout->addLayout(proLayout); mainLayout->addWidget(m_consoleEdit); mainLayout->addWidget(m_results); - mainLayout->setContentsMargins(0, 0, 0, 0); + mainLayout->setContentsMargins(3, 0, 3, 0); setLayout(mainLayout); } diff --git a/src/vsnippetlist.cpp b/src/vsnippetlist.cpp index 094535e8..20f10a1b 100644 --- a/src/vsnippetlist.cpp +++ b/src/vsnippetlist.cpp @@ -66,7 +66,7 @@ void VSnippetList::setupUI() btnLayout->addWidget(m_locateBtn); btnLayout->addStretch(); btnLayout->addWidget(m_numLabel); - btnLayout->setContentsMargins(0, 0, 3, 0); + btnLayout->setContentsMargins(0, 0, 0, 0); m_snippetList = new QListWidget(); m_snippetList->setAttribute(Qt::WA_MacShowFocusRect, false); @@ -80,7 +80,7 @@ void VSnippetList::setupUI() QVBoxLayout *mainLayout = new QVBoxLayout(); mainLayout->addLayout(btnLayout); mainLayout->addWidget(m_snippetList); - mainLayout->setContentsMargins(0, 0, 0, 0); + mainLayout->setContentsMargins(3, 0, 3, 0); setLayout(mainLayout); }