theme: support $ for scaled number

This commit is contained in:
Le Tan 2018-03-20 20:52:30 +08:00
parent 0bf7284728
commit 49e2c74122
5 changed files with 183 additions and 151 deletions

View File

@ -37,8 +37,8 @@ QMainWindow {
QMainWindow::separator { QMainWindow::separator {
background: @dock_separator_bg; background: @dock_separator_bg;
width: 2px; width: $2px;
height: 2px; height: $2px;
} }
QMainWindow::separator:hover { QMainWindow::separator:hover {
@ -132,11 +132,11 @@ QToolBar::separator {
/* QToolButton */ /* QToolButton */
QToolButton[popupMode="1"] { /* only for MenuButtonPopup */ QToolButton[popupMode="1"] { /* only for MenuButtonPopup */
padding-right: 16px; /* make way for the popup button */ padding-right: $16px; /* make way for the popup button */
} }
QToolButton[popupMode="2"] { /* only for InstantPopup */ QToolButton[popupMode="2"] { /* only for InstantPopup */
padding-right: 10px; /* make way for the popup button */ padding-right: $10px; /* make way for the popup button */
} }
QToolButton { QToolButton {
@ -162,13 +162,13 @@ QToolButton:pressed {
/* the subcontrols below are used only in the MenuButtonPopup mode */ /* the subcontrols below are used only in the MenuButtonPopup mode */
QToolButton::menu-button { QToolButton::menu-button {
border: none; border: none;
width: 16px; width: $16px;
} }
QToolButton::menu-arrow { QToolButton::menu-arrow {
image: url(arrow_dropdown.svg); image: url(arrow_dropdown.svg);
width: 16px; width: $16px;
height: 16px; height: $16px;
} }
/* End QToolButton*/ /* End QToolButton*/
@ -426,11 +426,11 @@ VButtonMenuItem:disabled {
/* QComboBox */ /* QComboBox */
QComboBox#NotebookSelector { QComboBox#NotebookSelector {
border: none; border: none;
border-bottom: 2px solid @combobox_notebookselector_border; border-bottom: $2px solid @combobox_notebookselector_border;
font-size: 13pt; font-size: 13pt;
padding-top: 3px; padding-top: 3px;
padding-bottom: 3px; padding-bottom: 3px;
icon-size: 30px; icon-size: $30px;
font-weight: bold; font-weight: bold;
color: @combobox_notebookselector_fg; color: @combobox_notebookselector_fg;
background: @combobox_notebookselector_bg; background: @combobox_notebookselector_bg;
@ -451,12 +451,12 @@ QComboBox#NotebookSelector QListWidget {
background-color: @combobox_bg; background-color: @combobox_bg;
font-size: 13pt; font-size: 13pt;
font-weight: normal; font-weight: normal;
icon-size: 30px; icon-size: $30px;
} }
QComboBox#NotebookSelector QListWidget::item { QComboBox#NotebookSelector QListWidget::item {
padding-top: 10px; padding-top: $10px;
padding-bottom: 10px; padding-bottom: $10px;
} }
QComboBox#NotebookSelector QListWidget::item:hover { QComboBox#NotebookSelector QListWidget::item:hover {
@ -488,21 +488,21 @@ QComboBox:disabled {
QComboBox::drop-down { QComboBox::drop-down {
subcontrol-origin: padding; subcontrol-origin: padding;
subcontrol-position: top right; subcontrol-position: top right;
width: 20px; width: $20px;
border: none; border: none;
background: transparent; background: transparent;
} }
QComboBox::down-arrow { QComboBox::down-arrow {
image: url(arrow_dropdown.svg); image: url(arrow_dropdown.svg);
width: 20px; width: $20px;
height: 20px; height: $20px;
} }
QComboBox::down-arrow:disabled { QComboBox::down-arrow:disabled {
image: url(arrow_dropdown_disabled.svg); image: url(arrow_dropdown_disabled.svg);
width: 20px; width: $20px;
height: 20px; height: $20px;
} }
QComboBox QAbstractItemView { QComboBox QAbstractItemView {
@ -680,8 +680,8 @@ QTabBar::tab {
color: @tabbar_fg; color: @tabbar_fg;
background: @tabbar_bg; background: @tabbar_bg;
border: none; border: none;
border-top: 2px solid transparent; border-top: $2px solid transparent;
border-right: 1px solid @tabbar_border; border-right: $1px solid @tabbar_border;
padding: 2px 0px 2px 0px; padding: 2px 0px 2px 0px;
} }
@ -693,7 +693,7 @@ QTabBar::tab:hover {
QTabBar::tab:selected { QTabBar::tab:selected {
color: @tabbar_selected_fg; color: @tabbar_selected_fg;
background: @tabbar_selected_bg; background: @tabbar_selected_bg;
border-top: 2px solid @master_bg; border-top: $2px solid @master_bg;
} }
QTabBar::close-button { QTabBar::close-button {
@ -709,7 +709,7 @@ QTabBar::close-button:hover {
} }
QTabBar::scroller { QTabBar::scroller {
width: 20px; width: $20px;
} }
QTabBar QToolButton { QTabBar QToolButton {
@ -735,7 +735,7 @@ QTabBar QToolButton::left-arrow:disabled {
VSelectorItemWidget QLabel[SelectorItemShortcutLabel="true"] { VSelectorItemWidget QLabel[SelectorItemShortcutLabel="true"] {
font: bold; font: bold;
border: 2px solid @selectoritem_border; border: $2px solid @selectoritem_border;
padding: 3px; padding: 3px;
border-radius: 5px; border-radius: 5px;
background-color: @selectoritem_bg; background-color: @selectoritem_bg;
@ -751,7 +751,7 @@ VInsertSelector {
QTreeView[ItemBorder="true"]::item { QTreeView[ItemBorder="true"]::item {
padding-top: 5px; padding-top: 5px;
padding-bottom: 5px; padding-bottom: 5px;
border-bottom: 1px solid @treeview_item_border_bg; border-bottom: $1px solid @treeview_item_border_bg;
} }
QTreeView[PlainTree="true"]::branch:has-siblings:!adjoins-item { QTreeView[PlainTree="true"]::branch:has-siblings:!adjoins-item {
@ -891,11 +891,11 @@ QSplitter::handle:pressed {
} }
QSplitter::handle:vertical { QSplitter::handle:vertical {
height: 2px; height: $2px;
} }
QSplitter::handle:horizontal { QSplitter::handle:horizontal {
width: 2px; width: $2px;
} }
/* End QSplitter */ /* End QSplitter */
@ -919,15 +919,15 @@ QScrollBar::add-page, QScrollBar::sub-page {
QScrollBar:vertical { QScrollBar:vertical {
background: @scrollbar_bg; background: @scrollbar_bg;
width: 16px; width: $16px;
margin: 16px 0px 16px 0px; margin: $16px 0px $16px 0px;
padding: 0px 2px 0px 2px; padding: 0px $2px 0px $2px;
border: none; border: none;
} }
QScrollBar::handle:vertical { QScrollBar::handle:vertical {
background: @scrollbar_handle_bg; background: @scrollbar_handle_bg;
min-height: 16px; min-height: $16px;
} }
QScrollBar::handle:vertical:hover { QScrollBar::handle:vertical:hover {
@ -941,8 +941,8 @@ QScrollBar::handle:vertical:pressed {
QScrollBar::add-line:vertical { QScrollBar::add-line:vertical {
border: none; border: none;
background: @scrollbar_bg; background: @scrollbar_bg;
width: 16px; width: $16px;
height: 16px; height: $16px;
subcontrol-position: bottom; subcontrol-position: bottom;
subcontrol-origin: margin; subcontrol-origin: margin;
} }
@ -958,8 +958,8 @@ QScrollBar::add-line:vertical:pressed {
QScrollBar::sub-line:vertical { QScrollBar::sub-line:vertical {
border: none; border: none;
background: @scrollbar_bg; background: @scrollbar_bg;
width: 16px; width: $16px;
height: 16px; height: $16px;
subcontrol-position: top; subcontrol-position: top;
subcontrol-origin: margin; subcontrol-origin: margin;
} }
@ -974,27 +974,27 @@ QScrollBar::sub-line:vertical:pressed {
QScrollBar::down-arrow:vertical { QScrollBar::down-arrow:vertical {
image: url(down.svg); image: url(down.svg);
width: 16px; width: $16px;
height: 16px; height: $16px;
} }
QScrollBar::up-arrow:vertical { QScrollBar::up-arrow:vertical {
image: url(up.svg); image: url(up.svg);
width: 16px; width: $16px;
height: 16px; height: $16px;
} }
QScrollBar:horizontal { QScrollBar:horizontal {
background: @scrollbar_bg; background: @scrollbar_bg;
height: 16px; height: $16px;
margin: 0px 16px 0px 16px; margin: 0px $16px 0px $16px;
padding: 2px 0px 2px 0px; padding: $2px 0px $2px 0px;
border: none; border: none;
} }
QScrollBar::handle:horizontal { QScrollBar::handle:horizontal {
background: @scrollbar_handle_bg; background: @scrollbar_handle_bg;
min-width: 16px; min-width: $16px;
} }
QScrollBar::handle:horizontal:hover { QScrollBar::handle:horizontal:hover {
@ -1008,8 +1008,8 @@ QScrollBar::handle:horizontal:pressed {
QScrollBar::add-line:horizontal { QScrollBar::add-line:horizontal {
border: none; border: none;
background: @scrollbar_bg; background: @scrollbar_bg;
width: 16px; width: $16px;
height: 16px; height: $16px;
subcontrol-position: right; subcontrol-position: right;
subcontrol-origin: margin; subcontrol-origin: margin;
} }
@ -1025,8 +1025,8 @@ QScrollBar::add-line:horizontal:pressed {
QScrollBar::sub-line:horizontal { QScrollBar::sub-line:horizontal {
border: none; border: none;
background: @scrollbar_bg; background: @scrollbar_bg;
width: 16px; width: $16px;
height: 16px; height: $16px;
subcontrol-position: left; subcontrol-position: left;
subcontrol-origin: margin; subcontrol-origin: margin;
} }
@ -1041,20 +1041,20 @@ QScrollBar::sub-line:horizontal:pressed {
QScrollBar::right-arrow:horizontal { QScrollBar::right-arrow:horizontal {
image: url(right.svg); image: url(right.svg);
width: 16px; width: $16px;
height: 16px; height: $16px;
} }
QScrollBar::left-arrow:horizontal { QScrollBar::left-arrow:horizontal {
image: url(left.svg); image: url(left.svg);
width: 16px; width: $16px;
height: 16px; height: $16px;
} }
/* End QScrollBar */ /* End QScrollBar */
/* QCheckBox */ /* QCheckBox */
QCheckBox { QCheckBox {
spacing: 5px; spacing: $5px;
} }
QCheckBox:disabled { QCheckBox:disabled {
@ -1078,8 +1078,8 @@ QCheckBox::indicator:checked:disabled {
} }
QCheckBox::indicator { QCheckBox::indicator {
width: 20px; width: $20px;
height: 20px; height: $20px;
} }
QCheckBox::indicator:focus { QCheckBox::indicator:focus {
@ -1097,7 +1097,7 @@ QCheckBox::indicator:pressed {
/* QRadioButton */ /* QRadioButton */
QRadioButton { QRadioButton {
spacing: 5px; spacing: $5px;
} }
QRadioButton:disabled { QRadioButton:disabled {
@ -1121,8 +1121,8 @@ QRadioButton::indicator:checked:disabled {
} }
QRadioButton::indicator { QRadioButton::indicator {
width: 20px; width: $20px;
height: 20px; height: $20px;
} }
QRadioButton::indicator:focus { QRadioButton::indicator:focus {
@ -1143,8 +1143,8 @@ QSpinBox, QDoubleSpinBox {
border: 1px solid @spinbox_border; border: 1px solid @spinbox_border;
color: @spinbox_fg; color: @spinbox_fg;
background: @spinbox_bg; background: @spinbox_bg;
padding-right: 25px; padding-right: $25px;
min-height: 25px; min-height: $25px;
selection-color: @spinbox_selection_fg; selection-color: @spinbox_selection_fg;
selection-background-color: @spinbox_selection_bg; selection-background-color: @spinbox_selection_bg;
} }
@ -1162,7 +1162,7 @@ QSpinBox:hover, QDoubleSpinBox::hover {
QSpinBox::up-button, QDoubleSpinBox::up-button { QSpinBox::up-button, QDoubleSpinBox::up-button {
subcontrol-origin: border; subcontrol-origin: border;
subcontrol-position: top right; /* position at the top right corner */ subcontrol-position: top right; /* position at the top right corner */
width: 25px; width: $25px;
border: none; border: none;
background: transparent; background: transparent;
} }
@ -1177,8 +1177,8 @@ QSpinBox::up-button:pressed, QDoubleSpinBox::up-button:pressed {
QSpinBox::up-arrow, QDoubleSpinBox::up-arrow { QSpinBox::up-arrow, QDoubleSpinBox::up-arrow {
image: url(up.svg); image: url(up.svg);
width: 12px; width: $12px;
height: 12px; height: $12px;
} }
QSpinBox::up-arrow:disabled, QSpinBox::up-arrow:off, QDoubleSpinBox::up-arrow:disabled, QDoubleSpinBox::up-arrow:off { QSpinBox::up-arrow:disabled, QSpinBox::up-arrow:off, QDoubleSpinBox::up-arrow:disabled, QDoubleSpinBox::up-arrow:off {
@ -1188,7 +1188,7 @@ QSpinBox::up-arrow:disabled, QSpinBox::up-arrow:off, QDoubleSpinBox::up-arrow:di
QSpinBox::down-button, QDoubleSpinBox::down-button { QSpinBox::down-button, QDoubleSpinBox::down-button {
subcontrol-origin: border; subcontrol-origin: border;
subcontrol-position: bottom right; /* position at the top right corner */ subcontrol-position: bottom right; /* position at the top right corner */
width: 25px; width: $25px;
border: none; border: none;
background: transparent; background: transparent;
} }
@ -1203,8 +1203,8 @@ QSpinBox::down-button:pressed, QDoubleSpinBox::down-button:pressed {
QSpinBox::down-arrow, QDoubleSpinBox::down-arrow { QSpinBox::down-arrow, QDoubleSpinBox::down-arrow {
image: url(down.svg); image: url(down.svg);
width: 12px; width: $12px;
height: 12px; height: $12px;
} }
QSpinBox::down-arrow:disabled, QSpinBox::down-arrow:off, QDoubleSpinBox::down-arrow:disabled, QDoubleSpinBox::down-arrow:off { QSpinBox::down-arrow:disabled, QSpinBox::down-arrow:off, QDoubleSpinBox::down-arrow:disabled, QDoubleSpinBox::down-arrow:off {
@ -1231,14 +1231,14 @@ QHeaderView::section:checked
/* style the sort indicator */ /* style the sort indicator */
QHeaderView::down-arrow { QHeaderView::down-arrow {
image: url(down.svg); image: url(down.svg);
width: 12px; width: $12px;
height: 12px; height: $12px;
} }
QHeaderView::up-arrow { QHeaderView::up-arrow {
image: url(up.svg); image: url(up.svg);
width: 12px; width: $12px;
height: 12px; height: $12px;
} }
/* End QHeaderView */ /* End QHeaderView */
@ -1250,12 +1250,12 @@ QAbstractScrollArea::corner {
/* QProgressBar */ /* QProgressBar */
QProgressBar { QProgressBar {
background: @progressbar_bg; background: @progressbar_bg;
border: 1px solid @progressbar_border_bg; border: $1px solid @progressbar_border_bg;
text-align: center; text-align: center;
} }
QProgressBar::chunk { QProgressBar::chunk {
background-color: @progressbar_chunk_bg; background-color: @progressbar_chunk_bg;
width: 20px; width: $20px;
} }
/* End QProgressBar */ /* End QProgressBar */

View File

@ -309,7 +309,7 @@ QComboBox#NotebookSelector {
font-size: 13pt; font-size: 13pt;
padding-top: 3px; padding-top: 3px;
padding-bottom: 3px; padding-bottom: 3px;
icon-size: 30px; icon-size: $30px;
background: @combobox_bg; background: @combobox_bg;
} }
@ -320,33 +320,33 @@ QComboBox#NotebookSelector:focus {
QComboBox#NotebookSelector::drop-down { QComboBox#NotebookSelector::drop-down {
subcontrol-origin: padding; subcontrol-origin: padding;
subcontrol-position: top right; subcontrol-position: top right;
width: 20px; width: $20px;
border: none; border: none;
background: transparent; background: transparent;
} }
QComboBox#NotebookSelector::down-arrow { QComboBox#NotebookSelector::down-arrow {
image: url(arrow_dropdown.svg); image: url(arrow_dropdown.svg);
width: 20px; width: $20px;
height: 20px; height: $20px;
} }
QComboBox#NotebookSelector::down-arrow:disabled { QComboBox#NotebookSelector::down-arrow:disabled {
image: url(arrow_dropdown_disabled.svg); image: url(arrow_dropdown_disabled.svg);
width: 20px; width: $20px;
height: 20px; height: $20px;
} }
QComboBox#NotebookSelector QListWidget { QComboBox#NotebookSelector QListWidget {
border: 1px solid @combobox_view_border; border: 1px solid @combobox_view_border;
background-color: @combobox_bg; background-color: @combobox_bg;
font-size: 13pt; font-size: 13pt;
icon-size: 30px; icon-size: $30px;
} }
QComboBox#NotebookSelector QListWidget::item { QComboBox#NotebookSelector QListWidget::item {
padding-top: 10px; padding-top: $10px;
padding-bottom: 10px; padding-bottom: $10px;
} }
QComboBox#NotebookSelector QListWidget::item:hover { QComboBox#NotebookSelector QListWidget::item:hover {
@ -454,7 +454,7 @@ QTabBar::close-button:hover {
VSelectorItemWidget QLabel[SelectorItemShortcutLabel="true"] { VSelectorItemWidget QLabel[SelectorItemShortcutLabel="true"] {
font: bold; font: bold;
border: 2px solid @selectoritem_border; border: $2px solid @selectoritem_border;
padding: 3px; padding: 3px;
border-radius: 5px; border-radius: 5px;
background-color: @selectoritem_bg; background-color: @selectoritem_bg;
@ -498,11 +498,11 @@ QSplitter::handle {
} }
QSplitter::handle:vertical { QSplitter::handle:vertical {
height: 2px; height: $2px;
} }
QSplitter::handle:horizontal { QSplitter::handle:horizontal {
width: 2px; width: $2px;
} }
/* End QSplitter */ /* End QSplitter */

View File

@ -15,7 +15,7 @@ QWidget#FindReplaceTitleWidget {
} }
QWidget[ToolBoxTitle="true"] { QWidget[ToolBoxTitle="true"] {
border-bottom: 2px solid @toolbox_title_border; border-bottom: $2px solid @toolbox_title_border;
} }
QWidget[MainEditor="true"] { QWidget[MainEditor="true"] {
@ -37,8 +37,8 @@ QMainWindow {
QMainWindow::separator { QMainWindow::separator {
background: @dock_separator_bg; background: @dock_separator_bg;
width: 2px; width: $2px;
height: 2px; height: $2px;
} }
QMainWindow::separator:hover { QMainWindow::separator:hover {
@ -132,11 +132,11 @@ QToolBar::separator {
/* QToolButton */ /* QToolButton */
QToolButton[popupMode="1"] { /* only for MenuButtonPopup */ QToolButton[popupMode="1"] { /* only for MenuButtonPopup */
padding-right: 16px; /* make way for the popup button */ padding-right: $16px; /* make way for the popup button */
} }
QToolButton[popupMode="2"] { /* only for InstantPopup */ QToolButton[popupMode="2"] { /* only for InstantPopup */
padding-right: 10px; /* make way for the popup button */ padding-right: $10px; /* make way for the popup button */
} }
QToolButton { QToolButton {
@ -162,13 +162,13 @@ QToolButton:pressed {
/* the subcontrols below are used only in the MenuButtonPopup mode */ /* the subcontrols below are used only in the MenuButtonPopup mode */
QToolButton::menu-button { QToolButton::menu-button {
border: none; border: none;
width: 16px; width: $16px;
} }
QToolButton::menu-arrow { QToolButton::menu-arrow {
image: url(arrow_dropdown.svg); image: url(arrow_dropdown.svg);
width: 16px; width: $16px;
height: 16px; height: $16px;
} }
/* End QToolButton*/ /* End QToolButton*/
@ -426,11 +426,11 @@ VButtonMenuItem:disabled {
/* QComboBox */ /* QComboBox */
QComboBox#NotebookSelector { QComboBox#NotebookSelector {
border: none; border: none;
border-bottom: 2px solid @combobox_notebookselector_border; border-bottom: $2px solid @combobox_notebookselector_border;
font-size: 13pt; font-size: 13pt;
padding-top: 3px; padding-top: 3px;
padding-bottom: 3px; padding-bottom: 3px;
icon-size: 30px; icon-size: $30px;
font-weight: bold; font-weight: bold;
color: @combobox_notebookselector_fg; color: @combobox_notebookselector_fg;
background: @combobox_notebookselector_bg; background: @combobox_notebookselector_bg;
@ -451,12 +451,12 @@ QComboBox#NotebookSelector QListWidget {
background-color: @combobox_bg; background-color: @combobox_bg;
font-size: 13pt; font-size: 13pt;
font-weight: normal; font-weight: normal;
icon-size: 30px; icon-size: $30px;
} }
QComboBox#NotebookSelector QListWidget::item { QComboBox#NotebookSelector QListWidget::item {
padding-top: 10px; padding-top: $10px;
padding-bottom: 10px; padding-bottom: $10px;
} }
QComboBox#NotebookSelector QListWidget::item:hover { QComboBox#NotebookSelector QListWidget::item:hover {
@ -488,21 +488,21 @@ QComboBox:disabled {
QComboBox::drop-down { QComboBox::drop-down {
subcontrol-origin: padding; subcontrol-origin: padding;
subcontrol-position: top right; subcontrol-position: top right;
width: 20px; width: $20px;
border: none; border: none;
background: transparent; background: transparent;
} }
QComboBox::down-arrow { QComboBox::down-arrow {
image: url(arrow_dropdown.svg); image: url(arrow_dropdown.svg);
width: 20px; width: $20px;
height: 20px; height: $20px;
} }
QComboBox::down-arrow:disabled { QComboBox::down-arrow:disabled {
image: url(arrow_dropdown_disabled.svg); image: url(arrow_dropdown_disabled.svg);
width: 20px; width: $20px;
height: 20px; height: $20px;
} }
QComboBox QAbstractItemView { QComboBox QAbstractItemView {
@ -680,8 +680,8 @@ QTabBar::tab {
color: @tabbar_fg; color: @tabbar_fg;
background: @tabbar_bg; background: @tabbar_bg;
border: none; border: none;
border-top: 2px solid transparent; border-top: $2px solid transparent;
border-right: 1px solid @tabbar_border; border-right: $1px solid @tabbar_border;
padding: 2px 0px 2px 0px; padding: 2px 0px 2px 0px;
} }
@ -693,7 +693,7 @@ QTabBar::tab:hover {
QTabBar::tab:selected { QTabBar::tab:selected {
color: @tabbar_selected_fg; color: @tabbar_selected_fg;
background: @tabbar_selected_bg; background: @tabbar_selected_bg;
border-top: 2px solid @master_bg; border-top: $2px solid @master_bg;
} }
QTabBar::close-button { QTabBar::close-button {
@ -709,7 +709,7 @@ QTabBar::close-button:hover {
} }
QTabBar::scroller { QTabBar::scroller {
width: 20px; width: $20px;
} }
QTabBar QToolButton { QTabBar QToolButton {
@ -735,7 +735,7 @@ QTabBar QToolButton::left-arrow:disabled {
VSelectorItemWidget QLabel[SelectorItemShortcutLabel="true"] { VSelectorItemWidget QLabel[SelectorItemShortcutLabel="true"] {
font: bold; font: bold;
border: 2px solid @selectoritem_border; border: $2px solid @selectoritem_border;
padding: 3px; padding: 3px;
border-radius: 5px; border-radius: 5px;
background-color: @selectoritem_bg; background-color: @selectoritem_bg;
@ -751,7 +751,7 @@ VInsertSelector {
QTreeView[ItemBorder="true"]::item { QTreeView[ItemBorder="true"]::item {
padding-top: 5px; padding-top: 5px;
padding-bottom: 5px; padding-bottom: 5px;
border-bottom: 1px solid @treeview_item_border_bg; border-bottom: $1px solid @treeview_item_border_bg;
} }
QTreeView[PlainTree="true"]::branch:has-siblings:!adjoins-item { QTreeView[PlainTree="true"]::branch:has-siblings:!adjoins-item {
@ -891,11 +891,11 @@ QSplitter::handle:pressed {
} }
QSplitter::handle:vertical { QSplitter::handle:vertical {
height: 2px; height: $2px;
} }
QSplitter::handle:horizontal { QSplitter::handle:horizontal {
width: 2px; width: $2px;
} }
/* End QSplitter */ /* End QSplitter */
@ -918,15 +918,15 @@ QScrollBar::add-page, QScrollBar::sub-page {
QScrollBar:vertical { QScrollBar:vertical {
background: @scrollbar_bg; background: @scrollbar_bg;
width: 16px; width: $16px;
margin: 16px 0px 16px 0px; margin: $16px 0px $16px 0px;
padding: 0px 2px 0px 2px; padding: 0px $2px 0px $2px;
border: none; border: none;
} }
QScrollBar::handle:vertical { QScrollBar::handle:vertical {
background: @scrollbar_handle_bg; background: @scrollbar_handle_bg;
min-height: 16px; min-height: $16px;
} }
QScrollBar::handle:vertical:hover { QScrollBar::handle:vertical:hover {
@ -940,8 +940,8 @@ QScrollBar::handle:vertical:pressed {
QScrollBar::add-line:vertical { QScrollBar::add-line:vertical {
border: none; border: none;
background: @scrollbar_bg; background: @scrollbar_bg;
width: 16px; width: $16px;
height: 16px; height: $16px;
subcontrol-position: bottom; subcontrol-position: bottom;
subcontrol-origin: margin; subcontrol-origin: margin;
} }
@ -957,8 +957,8 @@ QScrollBar::add-line:vertical:pressed {
QScrollBar::sub-line:vertical { QScrollBar::sub-line:vertical {
border: none; border: none;
background: @scrollbar_bg; background: @scrollbar_bg;
width: 16px; width: $16px;
height: 16px; height: $16px;
subcontrol-position: top; subcontrol-position: top;
subcontrol-origin: margin; subcontrol-origin: margin;
} }
@ -973,27 +973,27 @@ QScrollBar::sub-line:vertical:pressed {
QScrollBar::down-arrow:vertical { QScrollBar::down-arrow:vertical {
image: url(down.svg); image: url(down.svg);
width: 16px; width: $16px;
height: 16px; height: $16px;
} }
QScrollBar::up-arrow:vertical { QScrollBar::up-arrow:vertical {
image: url(up.svg); image: url(up.svg);
width: 16px; width: $16px;
height: 16px; height: $16px;
} }
QScrollBar:horizontal { QScrollBar:horizontal {
background: @scrollbar_bg; background: @scrollbar_bg;
height: 16px; height: $16px;
margin: 0px 16px 0px 16px; margin: 0px $16px 0px $16px;
padding: 2px 0px 2px 0px; padding: $2px 0px $2px 0px;
border: none; border: none;
} }
QScrollBar::handle:horizontal { QScrollBar::handle:horizontal {
background: @scrollbar_handle_bg; background: @scrollbar_handle_bg;
min-width: 16px; min-width: $16px;
} }
QScrollBar::handle:horizontal:hover { QScrollBar::handle:horizontal:hover {
@ -1007,8 +1007,8 @@ QScrollBar::handle:horizontal:pressed {
QScrollBar::add-line:horizontal { QScrollBar::add-line:horizontal {
border: none; border: none;
background: @scrollbar_bg; background: @scrollbar_bg;
width: 16px; width: $16px;
height: 16px; height: $16px;
subcontrol-position: right; subcontrol-position: right;
subcontrol-origin: margin; subcontrol-origin: margin;
} }
@ -1024,8 +1024,8 @@ QScrollBar::add-line:horizontal:pressed {
QScrollBar::sub-line:horizontal { QScrollBar::sub-line:horizontal {
border: none; border: none;
background: @scrollbar_bg; background: @scrollbar_bg;
width: 16px; width: $16px;
height: 16px; height: $16px;
subcontrol-position: left; subcontrol-position: left;
subcontrol-origin: margin; subcontrol-origin: margin;
} }
@ -1040,20 +1040,20 @@ QScrollBar::sub-line:horizontal:pressed {
QScrollBar::right-arrow:horizontal { QScrollBar::right-arrow:horizontal {
image: url(right.svg); image: url(right.svg);
width: 16px; width: $16px;
height: 16px; height: $16px;
} }
QScrollBar::left-arrow:horizontal { QScrollBar::left-arrow:horizontal {
image: url(left.svg); image: url(left.svg);
width: 16px; width: $16px;
height: 16px; height: $16px;
} }
/* End QScrollBar */ /* End QScrollBar */
/* QCheckBox */ /* QCheckBox */
QCheckBox { QCheckBox {
spacing: 5px; spacing: $5px;
} }
QCheckBox:disabled { QCheckBox:disabled {
@ -1077,8 +1077,8 @@ QCheckBox::indicator:checked:disabled {
} }
QCheckBox::indicator { QCheckBox::indicator {
width: 20px; width: $20px;
height: 20px; height: $20px;
} }
QCheckBox::indicator:focus { QCheckBox::indicator:focus {
@ -1096,7 +1096,7 @@ QCheckBox::indicator:pressed {
/* QRadioButton */ /* QRadioButton */
QRadioButton { QRadioButton {
spacing: 5px; spacing: $5px;
} }
QRadioButton:disabled { QRadioButton:disabled {
@ -1120,8 +1120,8 @@ QRadioButton::indicator:checked:disabled {
} }
QRadioButton::indicator { QRadioButton::indicator {
width: 20px; width: $20px;
height: 20px; height: $20px;
} }
QRadioButton::indicator:focus { QRadioButton::indicator:focus {
@ -1142,8 +1142,8 @@ QSpinBox, QDoubleSpinBox {
border: 1px solid @spinbox_border; border: 1px solid @spinbox_border;
color: @spinbox_fg; color: @spinbox_fg;
background: @spinbox_bg; background: @spinbox_bg;
padding-right: 25px; padding-right: $25px;
min-height: 25px; min-height: $25px;
selection-color: @spinbox_selection_fg; selection-color: @spinbox_selection_fg;
selection-background-color: @spinbox_selection_bg; selection-background-color: @spinbox_selection_bg;
} }
@ -1161,7 +1161,7 @@ QSpinBox:hover, QDoubleSpinBox::hover {
QSpinBox::up-button, QDoubleSpinBox::up-button { QSpinBox::up-button, QDoubleSpinBox::up-button {
subcontrol-origin: border; subcontrol-origin: border;
subcontrol-position: top right; /* position at the top right corner */ subcontrol-position: top right; /* position at the top right corner */
width: 25px; width: $25px;
border: none; border: none;
background: transparent; background: transparent;
} }
@ -1176,8 +1176,8 @@ QSpinBox::up-button:pressed, QDoubleSpinBox::up-button:pressed {
QSpinBox::up-arrow, QDoubleSpinBox::up-arrow { QSpinBox::up-arrow, QDoubleSpinBox::up-arrow {
image: url(up.svg); image: url(up.svg);
width: 12px; width: $12px;
height: 12px; height: $12px;
} }
QSpinBox::up-arrow:disabled, QSpinBox::up-arrow:off, QDoubleSpinBox::up-arrow:disabled, QDoubleSpinBox::up-arrow:off { QSpinBox::up-arrow:disabled, QSpinBox::up-arrow:off, QDoubleSpinBox::up-arrow:disabled, QDoubleSpinBox::up-arrow:off {
@ -1187,7 +1187,7 @@ QSpinBox::up-arrow:disabled, QSpinBox::up-arrow:off, QDoubleSpinBox::up-arrow:di
QSpinBox::down-button, QDoubleSpinBox::down-button { QSpinBox::down-button, QDoubleSpinBox::down-button {
subcontrol-origin: border; subcontrol-origin: border;
subcontrol-position: bottom right; /* position at the top right corner */ subcontrol-position: bottom right; /* position at the top right corner */
width: 25px; width: $25px;
border: none; border: none;
background: transparent; background: transparent;
} }
@ -1202,8 +1202,8 @@ QSpinBox::down-button:pressed, QDoubleSpinBox::down-button:pressed {
QSpinBox::down-arrow, QDoubleSpinBox::down-arrow { QSpinBox::down-arrow, QDoubleSpinBox::down-arrow {
image: url(down.svg); image: url(down.svg);
width: 12px; width: $12px;
height: 12px; height: $12px;
} }
QSpinBox::down-arrow:disabled, QSpinBox::down-arrow:off, QDoubleSpinBox::down-arrow:disabled, QDoubleSpinBox::down-arrow:off { QSpinBox::down-arrow:disabled, QSpinBox::down-arrow:off, QDoubleSpinBox::down-arrow:disabled, QDoubleSpinBox::down-arrow:off {
@ -1230,14 +1230,14 @@ QHeaderView::section:checked
/* style the sort indicator */ /* style the sort indicator */
QHeaderView::down-arrow { QHeaderView::down-arrow {
image: url(down.svg); image: url(down.svg);
width: 12px; width: $12px;
height: 12px; height: $12px;
} }
QHeaderView::up-arrow { QHeaderView::up-arrow {
image: url(up.svg); image: url(up.svg);
width: 12px; width: $12px;
height: 12px; height: $12px;
} }
/* End QHeaderView */ /* End QHeaderView */
@ -1249,12 +1249,12 @@ QAbstractScrollArea::corner {
/* QProgressBar */ /* QProgressBar */
QProgressBar { QProgressBar {
background: @progressbar_bg; background: @progressbar_bg;
border: 1px solid @progressbar_border_bg; border: $1px solid @progressbar_border_bg;
text-align: center; text-align: center;
} }
QProgressBar::chunk { QProgressBar::chunk {
background-color: @progressbar_chunk_bg; background-color: @progressbar_chunk_bg;
width: 20px; width: $20px;
} }
/* End QProgressBar */ /* End QProgressBar */

View File

@ -117,6 +117,7 @@ QString VPalette::fetchQtStyleSheet() const
fillStyle(style); fillStyle(style);
fillAbsoluteUrl(style); fillAbsoluteUrl(style);
fillFontFamily(style); fillFontFamily(style);
fillScaledSize(style);
return style; return style;
} }
@ -304,3 +305,31 @@ void VPalette::fillFontFamily(QString &p_text) const
} }
} }
} }
void VPalette::fillScaledSize(QString &p_text) const
{
// Cap(2) is the number string.
QRegExp reg("(\\s|:)\\$(\\d+)(?=\\D)");
const qreal factor = VUtils::calculateScaleFactor();
int pos = 0;
while (pos < p_text.size()) {
int idx = p_text.indexOf(reg, pos);
if (idx == -1) {
break;
}
QString str = reg.cap(2);
bool ok;
int val = str.toInt(&ok);
if (!ok) {
pos = idx + reg.matchedLength();
continue;
}
val = val * factor + 0.5;
QString newStr = QString("%1%2").arg(reg.cap(1)).arg(val);
p_text.replace(idx, reg.matchedLength(), newStr);
pos = idx + newStr.size();
}
}

View File

@ -50,6 +50,9 @@ public:
// Fill "@xxx" in @p_text with corresponding style. // Fill "@xxx" in @p_text with corresponding style.
void fillStyle(QString &p_text) const; void fillStyle(QString &p_text) const;
// Fill "$xxx" in @p_text with scaled num.
void fillScaledSize(QString &p_text) const;
// QSS seems not to recognize multiple font-family values. // QSS seems not to recognize multiple font-family values.
// We will choose the first existing one. // We will choose the first existing one.
void fillFontFamily(QString &p_text) const; void fillFontFamily(QString &p_text) const;