Browse Source

refine default theme

Le Tan 8 years ago
parent
commit
9f0963eace

+ 8 - 0
src/resources/themes/v_white/branch_closed.svg

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

+ 7 - 0
src/resources/themes/v_white/branch_end.svg

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

+ 7 - 0
src/resources/themes/v_white/branch_more.svg

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

+ 8 - 0
src/resources/themes/v_white/branch_open.svg

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

+ 6 - 0
src/resources/themes/v_white/line.svg

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

+ 117 - 91
src/resources/themes/v_white/v_white.palette

@@ -7,15 +7,41 @@ qss_file=v_white.qss
 [phony]
 ; Abstract color attributes.
 base_fg=#000000
-base_color_1=#EEEEEE
-hover_color_1=#C4C4C4
-selected_color_1=#BEBEBE
-base_color_2=#E0E0E0
-separator_color=#E0E0E0
-border_color=#9E9E9E
-focus_color=#BDBDBD
-content_color=#FAFAFA
-selection_color=#64B5F6
+base_bg=#F5F5F5
+
+main_fg=#000000
+main_bg=#F5F5F5
+
+title_fg=#000000
+title_bg=#E3DEDE
+
+hover_fg=#000000
+hover_bg=#DCDCDC
+
+selected_fg=#000000
+selected_bg=#D3D3D3
+
+active_fg=#000000
+active_bg=#C0C0C0
+
+inactive_fg=#000000
+inactive_bg=#D0D0D0
+
+focus_fg=#000000
+focus_bg=#C0C0C0
+
+pressed_fg=#000000
+pressed_bg=#808080
+
+separator_bg=#C0C0C0
+
+border_bg=#C0C0C0
+
+content_fg=#000000
+content_bg=#FFFFFF
+
+selection_fg=#000000
+selection_bg=#64b5f6
 
 [widgets]
 ; Widget color attributes.
@@ -24,57 +50,57 @@ selection_color=#64B5F6
 widget_fg=@base_fg
 
 ; Separator of dock widgets.
-dock_separator_bg=@base_color_2
-dock_separator_hover_bg=@base_color_2
+dock_separator_bg=@title_bg
+dock_separator_hover_bg=@title_bg
 
 ; Menubar.
-menubar_bg=@base_color_1
-menubar_fg=@base_fg
-menubar_item_selected_bg=@selected_color_1
+menubar_bg=@main_bg
+menubar_fg=@main_fg
+menubar_item_selected_bg=@selected_bg
 
 ; Menu.
-menu_bg=@base_color_1
+menu_bg=@base_bg
 menu_fg=@base_fg
-menu_item_selected_bg=@selected_color_1
-menu_separator_bg=@separator_color
+menu_item_selected_bg=@selected_bg
+menu_separator_bg=@separator_bg
 
 ; Tooltip.
-tooltip_border=@base_color_2
-tooltip_bg=@base_color_1
+tooltip_border=@border_bg
+tooltip_bg=@base_bg
 tooltip_fg=@base_fg
 
 ; Toolbar.
-toolbar_bg=@base_color_1
-toolbutton_hover_bg=@hover_color_1
-toolbutton_pressed_bg=@selected_color_1
+toolbar_bg=@main_bg
+toolbutton_hover_bg=@hover_bg
+toolbutton_pressed_bg=@pressed_bg
 
 ; Dockwidget.
-dockwidget_title_bg=@base_color_2
-dockwidget_button_hover_bg=@hover_color_1
+dockwidget_title_bg=@title_bg
+dockwidget_button_hover_bg=@hover_bg
 
 ; PushButton.
 pushbutton_fg=@base_fg
 pushbutton_bg=transparent
-pushbutton_border=@border_color
-pushbutton_pressed_bg=@selected_color_1
-pushbutton_hover_bg=@hover_color_1
+pushbutton_border=@border_bg
+pushbutton_pressed_bg=@pressed_bg
+pushbutton_hover_bg=@hover_bg
 pushbutton_default_border=#424242
 
-pushbutton_cornerbtn_hover_bg=@hover_color_1
-pushbutton_cornerbtn_focus_bg=@focus_color
+pushbutton_cornerbtn_hover_bg=@hover_bg
+pushbutton_cornerbtn_focus_bg=@focus_bg
 
-pushbutton_statusbtn_hover_bg=@hover_color_1
-pushbutton_statusbtn_focus_bg=@focus_color
+pushbutton_statusbtn_hover_bg=@hover_bg
+pushbutton_statusbtn_focus_bg=@focus_bg
 
-pushbutton_flatbtn_hover_bg=@hover_color_1
-pushbutton_flatbtn_focus_bg=@focus_color
+pushbutton_flatbtn_hover_bg=@hover_bg
+pushbutton_flatbtn_focus_bg=@focus_bg
 
-pushbutton_selectionbtn_hover_bg=@hover_color_1
-pushbutton_selectionbtn_focus_bg=@focus_color
+pushbutton_selectionbtn_hover_bg=@hover_bg
+pushbutton_selectionbtn_focus_bg=@focus_bg
 
-pushbutton_titlebtn_bg=@base_color_2
-pushbutton_titlebtn_hover_bg=@hover_color_1
-pushbutton_titlebtn_focus_bg=@focus_color
+pushbutton_titlebtn_bg=@title_bg
+pushbutton_titlebtn_hover_bg=@hover_bg
+pushbutton_titlebtn_focus_bg=@focus_bg
 
 pushbutton_dangerbtn_fg=#FFF
 pushbutton_dangerbtn_border=#D43F3A
@@ -84,86 +110,86 @@ pushbutton_dangerbtn_hover_bg=#C9302C
 pushbutton_dangerbtn_hover_border=#AC2925
 
 ; ComboBox.
-combobox_border=@border_color
-combobox_fg=@base_fg
-combobox_bg=@content_color
-combobox_view_border=@border_color
-combobox_view_selected_bg=@selected_color_1
-combobox_view_selected_fg=@base_fg
-combobox_view_item_hover_fg=@base_fg
-combobox_view_item_hover_bg=@hover_color_1
-combobox_focus_bg=@focus_color
+combobox_border=@border_bg
+combobox_fg=@content_fg
+combobox_bg=@content_bg
+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
 
 ; Label.
 label_fg=@base_fg
-label_titlelabel_fg=@base_fg
-label_titlelabel_bg=@base_color_2
+label_titlelabel_fg=@title_fg
+label_titlelabel_bg=@title_bg
 
 ; LineEdit.
-lineedit_border=@border_color
-lineedit_fg=@base_fg
-lineedit_bg=@content_color
-lineedit_selection_fg=@base_fg
-lineedit_selection_bg=@selection_color
+lineedit_border=@border_bg
+lineedit_fg=@content_fg
+lineedit_bg=@content_bg
+lineedit_selection_fg=@selection_fg
+lineedit_selection_bg=@selection_bg
 
 ; TabWidget.
-tabwidget_pane_border=@selected_color_1
+tabwidget_pane_border=@selected_bg
 
 ; TabBar.
 tabbar_fg=@base_fg
-tabbar_bg=@base_color_1
-tabbar_border=@border_color
+tabbar_bg=@base_bg
+tabbar_border=@border_bg
 
-tabbar_selected_fg=@base_fg
-tabbar_selected_bg=@selected_color_1
-tabbar_selected_border=@border_color
+tabbar_selected_fg=@selected_fg
+tabbar_selected_bg=@selected_bg
+tabbar_selected_border=@border_bg
 
-tabbar_hover_fg=@base_fg
-tabbar_hover_bg=@hover_color_1
-tabbar_hover_border=@border_color
+tabbar_hover_fg=@hover_fg
+tabbar_hover_bg=@hover_bg
+tabbar_hover_border=@border_bg
 
-tabbar_closebutton_hover_bg=@hover_color_1
-tabbar_clostbutton_focus_bg=@focus_color
+tabbar_closebutton_hover_bg=@hover_bg
+tabbar_clostbutton_focus_bg=@focus_bg
 
 ; SelectorItem.
 selectoritem_border=@base_fg
 selectoritem_fg=@base_fg
-selectoritem_bg=@base_color_1
+selectoritem_bg=@base_bg
 
 ; InsertSelector.
-insertselector_bg=@base_color_1
+insertselector_bg=@base_bg
 
 ; TreeView.
-treeview_fg=@base_fg
-treeview_bg=@content_color
-treeview_item_hover_fg=@base_fg
-treeview_item_hover_bg=@hover_color_1
-treeview_item_selected_fg=@base_fg
-treeview_item_selected_bg=@selected_color_1
-treeview_item_selected_avtive_fg=@base_fg
-treeview_item_selected_avtive_bg=@selected_color_1
-treeview_item_selected_inactive_fg=@base_fg
-treeview_item_selected_inactive_bg=#D0D0D0
+treeview_fg=@content_fg
+treeview_bg=@content_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
 
 ; ListView.
-listview_fg=@base_fg
-listview_bg=@content_color
-listview_item_hover_fg=@base_fg
-listview_item_hover_bg=@hover_color_1
-listview_item_selected_fg=@base_fg
-listview_item_selected_bg=@selected_color_1
-listview_item_selected_avtive_fg=@base_fg
-listview_item_selected_avtive_bg=@selected_color_1
-listview_item_selected_inactive_fg=@base_fg
-listview_item_selected_inactive_bg=#D0D0D0
+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=@base_color_2
-splitter_mainsplitter_border=@base_color_2
+splitter_handle_bg=@title_bg
+splitter_mainsplitter_border=@title_bg
 
 ; StatusBar.
-statusbar_fg=@base_fg
-statusbar_bg=@base_color_1
+statusbar_fg=@main_fg
+statusbar_bg=@main_bg
 
 ; ScrollBar.
 scrollbar_bg=#EEEEEE

+ 26 - 2
src/resources/themes/v_white/v_white.qss

@@ -461,7 +461,7 @@ VInsertSelector {
 QTreeView {
     color: @treeview_fg;
     background: @treeview_bg;
-    show-decoration-selected: 1;
+    show-decoration-selected: 0;
     padding-top: 3px;
     border: none;
 }
@@ -490,13 +490,37 @@ 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);
+}
 /* End QTreeView */
 
 /* QListView */
 QListView {
     color: @listview_fg;
     background: @listview_bg;
-    show-decoration-selected: 1;
+    show-decoration-selected: 0;
     padding-top: 3px;
     border: none;
 }

+ 5 - 0
src/vnote.qrc

@@ -146,5 +146,10 @@
         <file>resources/themes/v_white/float.svg</file>
         <file>resources/themes/v_white/v_white.palette</file>
         <file>resources/themes/v_white/v_white.qss</file>
+        <file>resources/themes/v_white/branch_closed.svg</file>
+        <file>resources/themes/v_white/branch_end.svg</file>
+        <file>resources/themes/v_white/branch_more.svg</file>
+        <file>resources/themes/v_white/branch_open.svg</file>
+        <file>resources/themes/v_white/line.svg</file>
     </qresource>
 </RCC>