Improvements and fixes
Added Herb theme. Fixed theme map keys.
This commit is contained in:
parent
7f2ec84e40
commit
12e1ff2bfa
GPG Key ID:
1719E976DB2D4E71
|
|
@ -34,7 +34,7 @@ void StyleSec::getStyleSheet( QString& stylesheet, const QString& icons_theme, c
|
|||
"rgb( 32, 32, 32 )"},
|
||||
{"menu_base_hover",
|
||||
"rgb( 64, 64, 64 )"},
|
||||
{"menu_base_dropdown",
|
||||
{"menu_base_dropdown_selection",
|
||||
"rgb( 192, 192, 192 )"},
|
||||
{"window_base_primary",
|
||||
"rgb( 32, 32, 32 )"},
|
||||
|
|
@ -162,9 +162,9 @@ void StyleSec::getStyleSheet( QString& stylesheet, const QString& icons_theme, c
|
|||
"rgb( 96, 96, 96 )"},
|
||||
{"inner-tabs_lines",
|
||||
"rgb( 192, 192, 192 )"},
|
||||
{"sub-tabs_base",
|
||||
{"sub-tabs_tab_base",
|
||||
"rgb( 48, 48, 48 )"},
|
||||
{"sub-tabs_base_unselected",
|
||||
{"sub-tabs_tab_base_unselected",
|
||||
"rgb( 40, 40, 40 )"},
|
||||
{"sub-tabs_pane_base",
|
||||
"rgb( 48, 48, 48 )"},
|
||||
|
|
@ -194,7 +194,7 @@ void StyleSec::getStyleSheet( QString& stylesheet, const QString& icons_theme, c
|
|||
"rgb( 205, 154, 93 )"},
|
||||
{"menu_base_hover",
|
||||
"rgb( 165, 114, 63 )"},
|
||||
{"menu_base_dropdown",
|
||||
{"menu_base_dropdown_selection",
|
||||
"rgb( 145, 100, 130 )"},
|
||||
{"window_base_primary",
|
||||
"rgb( 255, 204, 143 )"},
|
||||
|
|
@ -322,9 +322,9 @@ void StyleSec::getStyleSheet( QString& stylesheet, const QString& icons_theme, c
|
|||
"rgb( 195, 80, 81 )"},
|
||||
{"inner-tabs_lines",
|
||||
"rgb( 195, 80, 81 )"},
|
||||
{"sub-tabs_base",
|
||||
{"sub-tabs_tab_base",
|
||||
"rgb( 255, 140, 141 )"},
|
||||
{"sub-tabs_base_unselected",
|
||||
{"sub-tabs_tab_base_unselected",
|
||||
"rgb( 245, 172, 142 )"},
|
||||
{"sub-tabs_pane_base",
|
||||
"rgb( 255, 140, 141 )"},
|
||||
|
|
@ -335,6 +335,164 @@ void StyleSec::getStyleSheet( QString& stylesheet, const QString& icons_theme, c
|
|||
};
|
||||
break;
|
||||
case 3:
|
||||
style_map = {
|
||||
{"text_primary",
|
||||
"rgb( 220, 211, 187 )"},
|
||||
{"text_secondary",
|
||||
"rgb( 193, 175, 129 )"},
|
||||
{"text_disabled",
|
||||
"rgb( 163, 145, 99 )"},
|
||||
{"tooltips_base",
|
||||
"rgb( 193, 175, 129 )"},
|
||||
{"tooltips_text",
|
||||
"rgb( 14, 28, 0 )"},
|
||||
{"tooltips_border",
|
||||
"rgb( 163, 145, 99 )"},
|
||||
{"menu_text",
|
||||
"rgb( 163, 145, 99 )"},
|
||||
{"menu_base",
|
||||
"rgb( 24, 48, 0 )"},
|
||||
{"menu_base_hover",
|
||||
"rgb( 54, 78, 30 )"},
|
||||
{"menu_base_dropdown_selection",
|
||||
"rgb( 74, 98, 50 )"},
|
||||
{"window_base_primary",
|
||||
"rgb( 24, 48, 0 )"},
|
||||
{"window_base_secondary",
|
||||
"rgb( 14, 28, 0 )"},
|
||||
{"window_base_tertiary",
|
||||
"rgb( 54, 78, 30 )"},
|
||||
{"border_primary",
|
||||
"rgb( 163, 145, 99 )"},
|
||||
{"border_secondary",
|
||||
"rgb( 193, 175, 129 )"},
|
||||
{"border_tertiary",
|
||||
"rgb( 193, 175, 129 )"},
|
||||
{"buttons_base",
|
||||
"rgb( 94, 118, 70 )"},
|
||||
{"buttons_base_hover",
|
||||
"rgb( 124, 148, 100 )"},
|
||||
{"buttons_base_disabled",
|
||||
"rgb( 54, 78, 30 )"},
|
||||
{"logs_switch_buttons_base_hover",
|
||||
"rgb( 24, 38, 0 )"},
|
||||
{"stats_switch_buttons_frame_base",
|
||||
"rgb( 14, 28, 0 )"},
|
||||
{"stats_switch_buttons_frame_border",
|
||||
"rgb( 24, 48, 0 )"},
|
||||
{"stats_switch_buttons_base",
|
||||
"rgb( 54, 78, 30 )"},
|
||||
{"stats_switch_buttons_base_hover",
|
||||
"rgb( 24, 48, 0 )"},
|
||||
{"stats_switch_buttons_base_border_hover",
|
||||
"rgb( 94, 118, 70 )"},
|
||||
{"globals_frames_base",
|
||||
"rgb( 4, 18, 0 )"},
|
||||
{"globals_frames_border",
|
||||
"rgb( 128, 128, 128 )"},
|
||||
{"globals_frames_lines",
|
||||
"rgb( 124, 148, 100 )"},
|
||||
{"boxes_base_primary",
|
||||
"rgb( 94, 118, 70 )"},
|
||||
{"boxes_base_secondary",
|
||||
"rgb( 104, 128, 80 )"},
|
||||
{"boxes_base_tertiary",
|
||||
"rgb( 124, 148, 100 )"},
|
||||
{"boxes_border_focus",
|
||||
"rgb( 193, 175, 129 )"},
|
||||
{"boxes_base_disabled",
|
||||
"rgb( 54, 78, 30 )"},
|
||||
{"boxes_base_off",
|
||||
"rgb( 74, 98, 50 )"},
|
||||
{"linedit_text",
|
||||
"rgb( 4, 18, 0 )"},
|
||||
{"linedit_base",
|
||||
"rgb( 193, 175, 129 )"},
|
||||
{"linedit_base_focus",
|
||||
"rgb( 223, 215, 159 )"},
|
||||
{"linedit_base_selection",
|
||||
"rgb( 173, 155, 109 )"},
|
||||
{"linedit_base_disabled",
|
||||
"rgb( 54, 78, 30 )"},
|
||||
{"tables_header",
|
||||
"rgb( 63, 65, 19 )"},
|
||||
{"tables_base",
|
||||
"rgb( 33, 35, 0 )"},
|
||||
{"tables_text_selection",
|
||||
"rgb( 33, 35, 0 )"},
|
||||
{"tables_base_selection",
|
||||
"rgb( 133, 135, 89 )"},
|
||||
{"tables_border",
|
||||
"rgb( 133, 135, 89 )"},
|
||||
{"tables_base_disabled",
|
||||
"rgb( 54, 78, 30 )"},
|
||||
{"tables_text_disabled",
|
||||
"rgb( 163, 145, 99 )"},
|
||||
{"tables_border_disabled",
|
||||
"rgb( 83, 85, 39 )"},
|
||||
{"charts_contour",
|
||||
"rgb( 94, 118, 70 )"},
|
||||
{"textbrowser_text",
|
||||
"rgb( 193, 175, 129 )"},
|
||||
{"textbrowser_base",
|
||||
"rgb( 33, 35, 0 )"},
|
||||
{"textbrowser_text_selection",
|
||||
"rgb( 223, 205, 159 )"},
|
||||
{"textbrowser_base_selection",
|
||||
"rgb( 133, 135, 89 )"},
|
||||
{"scrollbar_base",
|
||||
"rgb( 94, 118, 70 )"},
|
||||
{"scrollbar_handler",
|
||||
"rgb( 174, 198, 150 )"},
|
||||
{"slider_handler",
|
||||
"rgb( 94, 118, 70 )"},
|
||||
{"slider_bar_active",
|
||||
"rgb( 163, 145, 99 )"},
|
||||
{"slider_bar_inactive",
|
||||
"rgb( 113, 95, 49 )"},
|
||||
{"slider_bar_active_border",
|
||||
"rgb( 183, 165, 119 )"},
|
||||
{"slider_handler_border",
|
||||
"rgb( 163, 145, 99 )"},
|
||||
{"slider_handler_border_hover",
|
||||
"rgb( 193, 175, 129 )"},
|
||||
{"outer-tabs_base",
|
||||
"rgb( 14, 28, 0 )"},
|
||||
{"inner-tabs_base",
|
||||
"rgb( 24, 48, 0 )"},
|
||||
{"sub-tabs_base",
|
||||
"rgb( 34, 58, 10 )"},
|
||||
{"outer-tabs_tab_text_selected",
|
||||
"rgb( 220, 211, 187 )"},
|
||||
{"outer-tabs_tab_text_unselected",
|
||||
"rgb( 163, 145, 99 )"},
|
||||
{"outer-tabs_tab_text_hover",
|
||||
"rgb( 193, 175, 129 )"},
|
||||
{"outer-tabs_tab_border",
|
||||
"rgb( 220, 211, 187 )"},
|
||||
{"outer-tabs_tab_border_unselected",
|
||||
"rgb( 163, 145, 99 )"},
|
||||
{"inner-tabs_tab_base",
|
||||
"rgb( 24, 48, 0 )"},
|
||||
{"inner-tabs_tab_base_unselected",
|
||||
"rgb( 14, 28, 0 )"},
|
||||
{"inner-tabs_pane_base",
|
||||
"rgb( 24, 48, 0 )"},
|
||||
{"inner-tabs_border",
|
||||
"rgb( 220, 211, 187 )"},
|
||||
{"inner-tabs_lines",
|
||||
"rgb( 124, 148, 100 )"},
|
||||
{"sub-tabs_tab_base",
|
||||
"rgb( 34, 58, 10 )"},
|
||||
{"sub-tabs_tab_base_unselected",
|
||||
"rgb( 24, 48, 0 )"},
|
||||
{"sub-tabs_pane_base",
|
||||
"rgb( 34, 58, 10 )"},
|
||||
{"sub-tabs_border",
|
||||
"rgb( 220, 211, 187 )"},
|
||||
{"sub-tabs_tab_border_unselected",
|
||||
"rgb( 163, 145, 99 )"}
|
||||
};
|
||||
break;
|
||||
case 4:
|
||||
break;
|
||||
|
|
@ -585,7 +743,7 @@ void StyleSec::makeStyleSheet( QString& ss, const std::unordered_map<std::string
|
|||
" background-color: "+style.at("menu_text")+";"
|
||||
"}"
|
||||
"QMenu::item:selected {"
|
||||
" background-color: "+style.at("menu_base_dropdown")+";"
|
||||
" background-color: "+style.at("menu_base_dropdown_selection")+";"
|
||||
"}"
|
||||
//////////////
|
||||
//// MAIN ////
|
||||
|
|
@ -953,13 +1111,13 @@ void StyleSec::makeStyleSheet( QString& ss, const std::unordered_map<std::string
|
|||
"QTabWidget#tabs_ConfApache QTabBar::tab,"
|
||||
"QTabWidget#tabs_ConfNginx QTabBar::tab,"
|
||||
"QTabWidget#tabs_ConfIis QTabBar::tab {"
|
||||
" background-color: "+style.at("sub-tabs_base")+";"
|
||||
" background-color: "+style.at("sub-tabs_tab_base")+";"
|
||||
"}"
|
||||
"QTabWidget#tabs_ConfApache QTabBar::tab:!selected,"
|
||||
"QTabWidget#tabs_ConfNginx QTabBar::tab:!selected,"
|
||||
"QTabWidget#tabs_ConfIis QTabBar::tab:!selected {"
|
||||
" border: 1px solid "+style.at("sub-tabs_tab_border_unselected")+";"
|
||||
" background-color: "+style.at("sub-tabs_base_unselected")+";"
|
||||
" background-color: "+style.at("sub-tabs_tab_base_unselected")+";"
|
||||
"}"
|
||||
"QTabWidget#tabs_ConfApache::pane,"
|
||||
"QTabWidget#tabs_ConfNginx::pane,"
|
||||
|
|
|
|||
Loading…
Reference in New Issue