From 27be40a45489f4974c24b2cc1694a59b16150d1b Mon Sep 17 00:00:00 2001
From: Le Tan <tamlokveer@gmail.com>
Date: Fri, 8 Dec 2017 19:31:05 +0800
Subject: [PATCH] v_white theme: support checkbox and radiobutton style

---
 src/resources/themes/v_white/branch_end.svg   |  4 +-
 src/resources/themes/v_white/branch_more.svg  |  4 +-
 .../themes/v_white/checkbox_checked.svg       |  7 ++
 .../themes/v_white/checkbox_unchecked.svg     |  6 ++
 src/resources/themes/v_white/line.svg         |  2 +-
 .../themes/v_white/radiobutton_checked.svg    |  7 ++
 .../themes/v_white/radiobutton_unchecked.svg  |  6 ++
 src/resources/themes/v_white/v_white.palette  | 12 +++
 src/resources/themes/v_white/v_white.qss      | 85 +++++++++++++++++++
 src/vnote.qrc                                 |  4 +
 10 files changed, 132 insertions(+), 5 deletions(-)
 create mode 100644 src/resources/themes/v_white/checkbox_checked.svg
 create mode 100644 src/resources/themes/v_white/checkbox_unchecked.svg
 create mode 100644 src/resources/themes/v_white/radiobutton_checked.svg
 create mode 100644 src/resources/themes/v_white/radiobutton_unchecked.svg

diff --git a/src/resources/themes/v_white/branch_end.svg b/src/resources/themes/v_white/branch_end.svg
index 14180aff..baa0c23f 100644
--- a/src/resources/themes/v_white/branch_end.svg
+++ b/src/resources/themes/v_white/branch_end.svg
@@ -1,7 +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"/>
+  <rect stroke="null" fill="#E0E0E0" stroke-width="null" stroke-dasharray="null" stroke-linejoin="null" stroke-linecap="null" x="225.3" y="0.100029" width="51" height="281.537138" id="svg_3"/>
+  <rect fill="#E0E0E0" stroke-width="null" stroke-dasharray="null" stroke-linejoin="null" stroke-linecap="null" x="346.499997" y="116.499998" width="51" height="278.999996" id="svg_6" transform="rotate(90 372,256.00000000000006) " stroke="null"/>
  </g>
 </svg>
diff --git a/src/resources/themes/v_white/branch_more.svg b/src/resources/themes/v_white/branch_more.svg
index 1f990e6a..cb0fecad 100644
--- a/src/resources/themes/v_white/branch_more.svg
+++ b/src/resources/themes/v_white/branch_more.svg
@@ -1,7 +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"/>
+  <rect stroke="null" fill="#E0E0E0" stroke-width="null" stroke-dasharray="null" stroke-linejoin="null" stroke-linecap="null" x="225.3" y="0.100029" width="51" height="511.910139" id="svg_3"/>
+  <rect fill="#E0E0E0" stroke-width="null" stroke-dasharray="null" stroke-linejoin="null" stroke-linecap="null" x="346.499997" y="116.499998" width="51" height="278.999996" id="svg_6" transform="rotate(90 372,256.00000000000006) " stroke="null"/>
  </g>
 </svg>
diff --git a/src/resources/themes/v_white/checkbox_checked.svg b/src/resources/themes/v_white/checkbox_checked.svg
new file mode 100644
index 00000000..e9ae3b12
--- /dev/null
+++ b/src/resources/themes/v_white/checkbox_checked.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 1</title>
+  <rect fill="#000000" stroke="#333333" stroke-width="30" stroke-dasharray="null" stroke-linejoin="null" stroke-linecap="null" x="106" y="141.5" width="299" height="299" fill-opacity="0" id="svg_6"/>
+  <path stroke="#000000" fill="#333333" stroke-width="5" d="m125.49193,290.33243l27.93756,-27.94743l76.53449,76.52461l127.58052,-127.54102l27.94743,27.92768l-155.52795,155.50821" id="svg_3" stroke-opacity="0"/>
+ </g>
+</svg>
diff --git a/src/resources/themes/v_white/checkbox_unchecked.svg b/src/resources/themes/v_white/checkbox_unchecked.svg
new file mode 100644
index 00000000..3ecf0f54
--- /dev/null
+++ b/src/resources/themes/v_white/checkbox_unchecked.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 1</title>
+  <rect id="svg_6" fill-opacity="0" height="299" width="299" y="141.5" x="106" stroke-linecap="null" stroke-linejoin="null" stroke-dasharray="null" stroke-width="30" stroke="#333333" fill="#000000"/>
+ </g>
+</svg>
diff --git a/src/resources/themes/v_white/line.svg b/src/resources/themes/v_white/line.svg
index 8be69cb6..8c981419 100644
--- a/src/resources/themes/v_white/line.svg
+++ b/src/resources/themes/v_white/line.svg
@@ -1,6 +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"/>
+  <rect stroke="null" id="svg_3" height="510.999989" width="51" y="0.100029" x="225.3" stroke-linecap="null" stroke-linejoin="null" stroke-dasharray="null" stroke-width="null" fill="#E0E0E0"/>
  </g>
 </svg>
diff --git a/src/resources/themes/v_white/radiobutton_checked.svg b/src/resources/themes/v_white/radiobutton_checked.svg
new file mode 100644
index 00000000..33d62fbb
--- /dev/null
+++ b/src/resources/themes/v_white/radiobutton_checked.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 1</title>
+  <circle stroke="#333333" id="svg_9" r="142.96561" cy="291.50001" cx="255.49999" fill-opacity="0" stroke-linecap="null" stroke-linejoin="null" stroke-dasharray="null" stroke-width="30" fill="#000000"/>
+  <circle id="svg_11" r="83.2406" cy="290" cx="255" stroke-opacity="0" stroke-linecap="null" stroke-linejoin="null" stroke-dasharray="null" stroke-width="20" stroke="#000000" fill="#333333"/>
+ </g>
+</svg>
diff --git a/src/resources/themes/v_white/radiobutton_unchecked.svg b/src/resources/themes/v_white/radiobutton_unchecked.svg
new file mode 100644
index 00000000..700ccea2
--- /dev/null
+++ b/src/resources/themes/v_white/radiobutton_unchecked.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 1</title>
+  <circle stroke="#333333" id="svg_9" r="142.96561" cy="291.50001" cx="255.49999" fill-opacity="0" stroke-linecap="null" stroke-linejoin="null" stroke-dasharray="null" stroke-width="30" fill="#000000"/>
+ </g>
+</svg>
diff --git a/src/resources/themes/v_white/v_white.palette b/src/resources/themes/v_white/v_white.palette
index c18b7e44..929fa510 100644
--- a/src/resources/themes/v_white/v_white.palette
+++ b/src/resources/themes/v_white/v_white.palette
@@ -33,6 +33,8 @@ focus_bg=#A9A9A9
 pressed_fg=#000000
 pressed_bg=#808080
 
+disabled_fg=#BCBCBC
+
 separator_bg=#C0C0C0
 
 border_bg=#C0C0C0
@@ -93,6 +95,8 @@ 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
@@ -255,3 +259,11 @@ scrollbar_handle_pressed_bg=@pressed_bg
 ; VEditWindow.
 editwindow_corner_icon_fg=@icon_fg
 editwindow_corner_icon_inactive_fg=#808080
+
+; CheckBox.
+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
diff --git a/src/resources/themes/v_white/v_white.qss b/src/resources/themes/v_white/v_white.qss
index d2dcff64..1a5379fe 100644
--- a/src/resources/themes/v_white/v_white.qss
+++ b/src/resources/themes/v_white/v_white.qss
@@ -44,6 +44,7 @@ QMenuBar::item:selected {
     background: @menubar_item_selected_bg;
 }
 
+/* QMenu */
 QMenu {
     background: @menu_bg;
     color: @menu_fg;
@@ -59,7 +60,12 @@ 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;
 }
 
@@ -78,6 +84,7 @@ QMenu::indicator {
     width: 20px;
     height: 20px;
 }
+/* End QMenu */
 
 QToolBar {
     border: none;
@@ -879,3 +886,81 @@ QScrollBar::left-arrow:horizontal {
     height: 20px;
 }
 /* End QScrollBar */
+
+/* QCheckBox */
+QCheckBox {
+    spacing: 5px;
+}
+
+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 */
diff --git a/src/vnote.qrc b/src/vnote.qrc
index 498ab7a7..ec78be65 100644
--- a/src/vnote.qrc
+++ b/src/vnote.qrc
@@ -159,5 +159,9 @@
         <file>resources/themes/v_white/right_disabled.svg</file>
         <file>resources/themes/v_white/down_disabled.svg</file>
         <file>resources/themes/v_white/up_disabled.svg</file>
+        <file>resources/themes/v_white/checkbox_checked.svg</file>
+        <file>resources/themes/v_white/checkbox_unchecked.svg</file>
+        <file>resources/themes/v_white/radiobutton_checked.svg</file>
+        <file>resources/themes/v_white/radiobutton_unchecked.svg</file>
     </qresource>
 </RCC>