diff --git a/win-linux/res/styles/editor.qss b/win-linux/res/styles/editor.qss index cf6accba1..5497ddf4a 100644 --- a/win-linux/res/styles/editor.qss +++ b/win-linux/res/styles/editor.qss @@ -8,7 +8,7 @@ QPushButton#toolButtonClose:hover {background-color: #d42b2b;} QPushButton#toolButtonClose:pressed {background-color: #d75050;} /* pretty */ -#mainPanel[window=pretty] QPushButton[act=tool]:hover +#mainPanel[window=pretty] QPushButton[act=tool][unix=false]:hover { background-color: rgba(255,255,255,20%); } @@ -20,7 +20,7 @@ QPushButton#toolButtonClose:pressed {background-color: #d75050;} { image: url(:/close_light.svg); } -#mainPanel[window=pretty] QPushButton#toolButtonClose:hover +#mainPanel[window=pretty] QPushButton#toolButtonClose[unix=false]:hover { background-color: #d42b2b; } @@ -52,7 +52,7 @@ QPushButton#toolButtonClose:pressed {background-color: #d75050;} #mainPanel[zoom="1.25x"] #toolButtonClose, #mainPanel[zoom="1.25x"] #toolButtonMaximize { - padding: 6px 15px 9px; + padding: 6px 0px 9px; } #mainPanel[zoom="1.25x"] #iconuser {font-size: 13px;} #mainPanel[zoom="1.25x"] #labelTitle @@ -65,7 +65,7 @@ QPushButton#toolButtonClose:pressed {background-color: #d75050;} #mainPanel[zoom="1.5x"] #toolButtonClose, #mainPanel[zoom="1.5x"] #toolButtonMaximize { - padding: 8px 18px 11px; + padding: 8px 0px 11px; } #mainPanel[zoom="1.5x"] #iconuser {font-size: 15px;} #mainPanel[zoom="1.5x"] #labelTitle @@ -78,7 +78,7 @@ QPushButton#toolButtonClose:pressed {background-color: #d75050;} #mainPanel[zoom="1.75x"] #toolButtonClose, #mainPanel[zoom="1.75x"] #toolButtonMaximize { - padding: 9px 21px 12px; + padding: 9px 0px 12px; } #mainPanel[zoom="1.75x"] #iconuser {font-size: 18px;} #mainPanel[zoom="1.75x"] #labelTitle @@ -91,7 +91,7 @@ QPushButton#toolButtonClose:pressed {background-color: #d75050;} #mainPanel[zoom="2x"] #toolButtonClose, #mainPanel[zoom="2x"] #toolButtonMaximize { - padding: 10px 24px 14px; + padding: 10px 0px 14px; } #mainPanel[zoom="2x"] #iconuser {font-size: 21px;} #mainPanel[zoom="2x"] #labelTitle @@ -104,7 +104,7 @@ QPushButton#toolButtonClose:pressed {background-color: #d75050;} #mainPanel[zoom="2.25x"] #toolButtonClose, #mainPanel[zoom="2.25x"] #toolButtonMaximize { - padding: 11px 27px 16px; + padding: 11px 0px 16px; } #mainPanel[zoom="2.25x"] #iconuser {font-size: 23px;} #mainPanel[zoom="2.25x"] #labelTitle @@ -117,7 +117,7 @@ QPushButton#toolButtonClose:pressed {background-color: #d75050;} #mainPanel[zoom="2.5x"] #toolButtonClose, #mainPanel[zoom="2.5x"] #toolButtonMaximize { - padding: 13px 30px 18px; + padding: 13px 0px 18px; } #mainPanel[zoom="2.5x"] #iconuser {font-size: 25px;} #mainPanel[zoom="2.5x"] #labelTitle @@ -130,7 +130,7 @@ QPushButton#toolButtonClose:pressed {background-color: #d75050;} #mainPanel[zoom="2.75x"] #toolButtonClose, #mainPanel[zoom="2.75x"] #toolButtonMaximize { - padding: 14px 33px 19px; + padding: 14px 0px 19px; } #mainPanel[zoom="2.75x"] #iconuser {font-size: 28px;} #mainPanel[zoom="2.75x"] #labelTitle @@ -143,7 +143,7 @@ QPushButton#toolButtonClose:pressed {background-color: #d75050;} #mainPanel[zoom="3x"] #toolButtonClose, #mainPanel[zoom="3x"] #toolButtonMaximize { - padding: 15px 36px 21px; + padding: 15px 0px 21px; } #mainPanel[zoom="3x"] #iconuser {font-size: 30px;} #mainPanel[zoom="3x"] #labelTitle @@ -156,7 +156,7 @@ QPushButton#toolButtonClose:pressed {background-color: #d75050;} #mainPanel[zoom="3.5x"] #toolButtonClose, #mainPanel[zoom="3.5x"] #toolButtonMaximize { - padding: 18px 42px 25px; + padding: 18px 0px 25px; } #mainPanel[zoom="3.5x"] #iconuser {font-size: 35px;} #mainPanel[zoom="3.5x"] #labelTitle @@ -169,7 +169,7 @@ QPushButton#toolButtonClose:pressed {background-color: #d75050;} #mainPanel[zoom="4x"] #toolButtonClose, #mainPanel[zoom="4x"] #toolButtonMaximize { - padding: 20px 48px 28px; + padding: 20px 0px 28px; } #mainPanel[zoom="4x"] #iconuser {font-size: 40px;} #mainPanel[zoom="4x"] #labelTitle @@ -182,7 +182,7 @@ QPushButton#toolButtonClose:pressed {background-color: #d75050;} #mainPanel[zoom="4.5x"] #toolButtonClose, #mainPanel[zoom="4.5x"] #toolButtonMaximize { - padding: 23px 54px 32px; + padding: 23px 0px 32px; } #mainPanel[zoom="4.5x"] #iconuser {font-size: 45px;} #mainPanel[zoom="4.5x"] #labelTitle @@ -195,7 +195,7 @@ QPushButton#toolButtonClose:pressed {background-color: #d75050;} #mainPanel[zoom="5x"] #toolButtonClose, #mainPanel[zoom="5x"] #toolButtonMaximize { - padding: 25px 60px 35px; + padding: 25px 0px 35px; } #mainPanel[zoom="5x"] #iconuser {font-size: 50px;} #mainPanel[zoom="5x"] #labelTitle diff --git a/win-linux/res/styles/editor_unix.qss b/win-linux/res/styles/editor_unix.qss new file mode 100644 index 000000000..b221996c4 --- /dev/null +++ b/win-linux/res/styles/editor_unix.qss @@ -0,0 +1,96 @@ +#mainPanel[window=pretty] QPushButton#toolButtonMinimize[unix=true] {image: url(:/minimize_unix_normal_light.svg);} +#mainPanel[window=pretty] QPushButton#toolButtonMinimize[unix=true]:hover {image: url(:/minimize_unix_hover_light.svg);} +#mainPanel[window=pretty] QPushButton#toolButtonMinimize[unix=true]:pressed {image: url(:/minimize_unix_pressed_light.svg);} + +#mainPanel[window=pretty] QPushButton#toolButtonMinimize[unix=true][kde=true] {image: url(:/minimize_kde_normal_light.svg);} +#mainPanel[window=pretty] QPushButton#toolButtonMinimize[unix=true][kde=true]:hover {image: url(:/minimize_kde_hover_light.svg);} +#mainPanel[window=pretty] QPushButton#toolButtonMinimize[unix=true][kde=true]:pressed {image: url(:/minimize_kde_pressed_light.svg);} + +#mainPanel[window=pretty] QPushButton#toolButtonClose[unix=true] {image: url(:/close_unix_normal_light.svg);} +#mainPanel[window=pretty] QPushButton#toolButtonClose[unix=true]:hover {image: url(:/close_unix_hover_light.svg);} +#mainPanel[window=pretty] QPushButton#toolButtonClose[unix=true]:pressed {image: url(:/close_unix_pressed_light.svg);} + +#mainPanel[window=pretty] QPushButton#toolButtonClose[unix=true][kde=true] {image: url(:/close_kde_normal_light.svg);} +#mainPanel[window=pretty] QPushButton#toolButtonClose[unix=true][kde=true]:hover {image: url(:/close_kde_hover_light.svg);} +#mainPanel[window=pretty] QPushButton#toolButtonClose[unix=true][kde=true]:pressed {image: url(:/close_kde_pressed_light.svg);} + +#mainPanel[window=pretty] QPushButton#toolButtonMaximize[unix=true] {image: url(:/restore_unix_normal_light.svg);} +#mainPanel[window=pretty] QPushButton#toolButtonMaximize[unix=true]:hover {image: url(:/restore_unix_hover_light.svg);} +#mainPanel[window=pretty] QPushButton#toolButtonMaximize[unix=true]:pressed {image: url(:/restore_unix_pressed_light.svg);} + +#mainPanel[window=pretty] QPushButton#toolButtonMaximize[unix=true][kde=true] {image: url(:/restore_kde_normal_light.svg);} +#mainPanel[window=pretty] QPushButton#toolButtonMaximize[unix=true][kde=true]:hover {image: url(:/restore_kde_hover_light.svg);} +#mainPanel[window=pretty] QPushButton#toolButtonMaximize[unix=true][kde=true]:pressed {image: url(:/restore_kde_pressed_light.svg);} + +#mainPanel[window=pretty] QPushButton#toolButtonMaximize[class=min][unix=true] {image: url(:/maximize_unix_normal_light.svg);} +#mainPanel[window=pretty] QPushButton#toolButtonMaximize[class=min][unix=true]:hover {image: url(:/maximize_unix_hover_light.svg);} +#mainPanel[window=pretty] QPushButton#toolButtonMaximize[class=min][unix=true]:pressed {image: url(:/maximize_unix_pressed_light.svg);} + +#mainPanel[window=pretty] QPushButton#toolButtonMaximize[class=min][unix=true][kde=true] {image: url(:/maximize_kde_normal_light.svg);} +#mainPanel[window=pretty] QPushButton#toolButtonMaximize[class=min][unix=true][kde=true]:hover {image: url(:/maximize_kde_hover_light.svg);} +#mainPanel[window=pretty] QPushButton#toolButtonMaximize[class=min][unix=true][kde=true]:pressed {image: url(:/maximize_kde_pressed_light.svg);} + +/* 1.0x */ +#toolButtonMinimize[kde=true], +#toolButtonClose[kde=true], +#toolButtonMaximize[kde=true] {padding: 2px 0px 7px;} + +/* 1.25x */ +#mainPanel[zoom="1.25x"] #toolButtonMinimize[kde=true], +#mainPanel[zoom="1.25x"] #toolButtonClose[kde=true], +#mainPanel[zoom="1.25x"] #toolButtonMaximize[kde=true] {padding: 3px 0px 8px;} + +/* 1.5x */ +#mainPanel[zoom="1.5x"] #toolButtonMinimize[kde=true], +#mainPanel[zoom="1.5x"] #toolButtonClose[kde=true], +#mainPanel[zoom="1.5x"] #toolButtonMaximize[kde=true] {padding: 3px 0px 10px;} + +/* 1.75x */ +#mainPanel[zoom="1.75x"] #toolButtonMinimize[kde=true], +#mainPanel[zoom="1.75x"] #toolButtonClose[kde=true], +#mainPanel[zoom="1.75x"] #toolButtonMaximize[kde=true] {padding: 4px 0px 12px;} + +/* 2x */ +#mainPanel[zoom="2x"] #toolButtonMinimize[kde=true], +#mainPanel[zoom="2x"] #toolButtonClose[kde=true], +#mainPanel[zoom="2x"] #toolButtonMaximize[kde=true] {padding: 4px 0px 14px;} + +/* 2.25x */ +#mainPanel[zoom="2.25x"] #toolButtonMinimize[kde=true], +#mainPanel[zoom="2.25x"] #toolButtonClose[kde=true], +#mainPanel[zoom="2.25x"] #toolButtonMaximize[kde=true] {padding: 5px 0px 15px;} + +/* 2.5x */ +#mainPanel[zoom="2.5x"] #toolButtonMinimize[kde=true], +#mainPanel[zoom="2.5x"] #toolButtonClose[kde=true], +#mainPanel[zoom="2.5x"] #toolButtonMaximize[kde=true] {padding: 5px 0px 17px;} + +/* 2.75x */ +#mainPanel[zoom="2.75x"] #toolButtonMinimize[kde=true], +#mainPanel[zoom="2.75x"] #toolButtonClose[kde=true], +#mainPanel[zoom="2.75x"] #toolButtonMaximize[kde=true] {padding: 6px 0px 19px;} + +/* 3x */ +#mainPanel[zoom="3x"] #toolButtonMinimize[kde=true], +#mainPanel[zoom="3x"] #toolButtonClose[kde=true], +#mainPanel[zoom="3x"] #toolButtonMaximize[kde=true] {padding: 6px 0px 21px;} + +/* 3.5x */ +#mainPanel[zoom="3.5x"] #toolButtonMinimize[kde=true], +#mainPanel[zoom="3.5x"] #toolButtonClose[kde=true], +#mainPanel[zoom="3.5x"] #toolButtonMaximize[kde=true] {padding: 7px 0px 24px;} + +/* 4x */ +#mainPanel[zoom="4x"] #toolButtonMinimize[kde=true], +#mainPanel[zoom="4x"] #toolButtonClose[kde=true], +#mainPanel[zoom="4x"] #toolButtonMaximize[kde=true] {padding: 8px 0px 28px;} + +/* 4.5x */ +#mainPanel[zoom="4.5x"] #toolButtonMinimize[kde=true], +#mainPanel[zoom="4.5x"] #toolButtonClose[kde=true], +#mainPanel[zoom="4.5x"] #toolButtonMaximize[kde=true] {padding: 9px 0px 31px;} + +/* 5x */ +#mainPanel[zoom="5x"] #toolButtonMinimize[kde=true], +#mainPanel[zoom="5x"] #toolButtonClose[kde=true], +#mainPanel[zoom="5x"] #toolButtonMaximize[kde=true] {padding: 10px 0px 35px;} diff --git a/win-linux/res/styles/styles.qss b/win-linux/res/styles/styles.qss index ef9bbcc48..67bbfe108 100644 --- a/win-linux/res/styles/styles.qss +++ b/win-linux/res/styles/styles.qss @@ -54,8 +54,10 @@ QPushButton#toolButtonMaximize, QPushButton#toolButtonMain, QPushButton#toolButtonMaximize,QPushButton#toolButtonMinimize, QPushButton#toolButtonClose { background-origin: content; - padding: 5px 12px 7px; + padding: 5px 0px 7px; } +QPushButton#toolButtonMaximize[kde=true], QPushButton#toolButtonMinimize[kde=true], + QPushButton#toolButtonClose[kde=true] {padding: 2px 0px 7px;} QPushButton#toolButtonClose:hover { background-color:#d42b2b; @@ -81,8 +83,8 @@ QPushButton#toolButtonClose { image: url(:/close.svg) center no-repeat; } -QPushButton#toolButtonClose[class=normal]:hover, - QPushButton#toolButtonClose[class=normal]:pressed { +QPushButton#toolButtonClose[class=normal][unix=false]:hover, + QPushButton#toolButtonClose[class=normal][unix=false]:pressed { image: url(:/close_light.svg) center no-repeat; } diff --git a/win-linux/res/styles/styles@1.25x.qss b/win-linux/res/styles/styles@1.25x.qss index a50f718a1..816339b8a 100644 --- a/win-linux/res/styles/styles@1.25x.qss +++ b/win-linux/res/styles/styles@1.25x.qss @@ -17,8 +17,11 @@ QPushButton { QPushButton#toolButtonMaximize,QPushButton#toolButtonMinimize, QPushButton#toolButtonClose { - padding: 6px 15px 9px; + padding: 6px 0px 9px; } +QPushButton#toolButtonMaximize[kde=true], QPushButton#toolButtonMinimize[kde=true], + QPushButton#toolButtonClose[kde=true] {padding: 3px 0px 8px;} + QPushButton#toolButtonMain { border-right-width: 1px; } diff --git a/win-linux/res/styles/styles@1.5x.qss b/win-linux/res/styles/styles@1.5x.qss index 7395675ae..536028f41 100644 --- a/win-linux/res/styles/styles@1.5x.qss +++ b/win-linux/res/styles/styles@1.5x.qss @@ -17,8 +17,11 @@ QPushButton { QPushButton#toolButtonMaximize,QPushButton#toolButtonMinimize, QPushButton#toolButtonClose { - padding: 8px 18px 11px; + padding: 8px 0px 11px; } +QPushButton#toolButtonMaximize[kde=true], QPushButton#toolButtonMinimize[kde=true], + QPushButton#toolButtonClose[kde=true] {padding: 3px 0px 10px;} + QPushButton#toolButtonMain { /*font-size: 20px;*/ border-right-width: 2px; diff --git a/win-linux/res/styles/styles@1.75x.qss b/win-linux/res/styles/styles@1.75x.qss index 75caea111..683e72afb 100644 --- a/win-linux/res/styles/styles@1.75x.qss +++ b/win-linux/res/styles/styles@1.75x.qss @@ -17,8 +17,11 @@ QPushButton { QPushButton#toolButtonMaximize,QPushButton#toolButtonMinimize, QPushButton#toolButtonClose { - padding: 9px 21px 13px; + padding: 9px 0px 13px; } +QPushButton#toolButtonMaximize[kde=true], QPushButton#toolButtonMinimize[kde=true], + QPushButton#toolButtonClose[kde=true] {padding: 4px 0px 12px;} + QPushButton#toolButtonMain { /*font-size: 20px;*/ border-right-width: 2px; diff --git a/win-linux/res/styles/styles@2.25x.qss b/win-linux/res/styles/styles@2.25x.qss index 40d69e067..d0e351a0c 100644 --- a/win-linux/res/styles/styles@2.25x.qss +++ b/win-linux/res/styles/styles@2.25x.qss @@ -5,7 +5,10 @@ QPushButton {border: 2px solid #cbcbcb; padding: 0 45px; height: 50px; border-ra QPushButton#toolButtonMaximize, QPushButton#toolButtonMinimize, - QPushButton#toolButtonClose {padding: 11px 27px 16px;} + QPushButton#toolButtonClose {padding: 11px 0px 16px;} + +QPushButton#toolButtonMaximize[kde=true], QPushButton#toolButtonMinimize[kde=true], + QPushButton#toolButtonClose[kde=true] {padding: 5px 0px 15px;} QPushButton#toolButtonMain {font-size: 23px; border-right-width: 2px;} QPushButton#toolButtonMain[theme=light] {border-width: 2px; border-bottom: 0 none;} diff --git a/win-linux/res/styles/styles@2.5x.qss b/win-linux/res/styles/styles@2.5x.qss index 478af4844..297905c01 100644 --- a/win-linux/res/styles/styles@2.5x.qss +++ b/win-linux/res/styles/styles@2.5x.qss @@ -17,8 +17,10 @@ QPushButton { QPushButton#toolButtonMaximize,QPushButton#toolButtonMinimize, QPushButton#toolButtonClose { - padding: 13px 30px 18px; + padding: 13px 0px 18px; } +QPushButton#toolButtonMaximize[kde=true], QPushButton#toolButtonMinimize[kde=true], + QPushButton#toolButtonClose[kde=true] {padding: 5px 0px 17px;} QPushButton#toolButtonMain { font-size: 25px; diff --git a/win-linux/res/styles/styles@2.75x.qss b/win-linux/res/styles/styles@2.75x.qss index c03f393b4..2293167c3 100644 --- a/win-linux/res/styles/styles@2.75x.qss +++ b/win-linux/res/styles/styles@2.75x.qss @@ -17,8 +17,10 @@ QPushButton { QPushButton#toolButtonMaximize,QPushButton#toolButtonMinimize, QPushButton#toolButtonClose { - padding: 14px 33px 19px; + padding: 14px 0px 19px; } +QPushButton#toolButtonMaximize[kde=true], QPushButton#toolButtonMinimize[kde=true], + QPushButton#toolButtonClose[kde=true] {padding: 6px 0px 19px;} QPushButton#toolButtonMain { font-size: 28px; diff --git a/win-linux/res/styles/styles@2x.qss b/win-linux/res/styles/styles@2x.qss index ccfdf15fd..65bd57e53 100644 --- a/win-linux/res/styles/styles@2x.qss +++ b/win-linux/res/styles/styles@2x.qss @@ -17,8 +17,10 @@ QPushButton { QPushButton#toolButtonMaximize,QPushButton#toolButtonMinimize, QPushButton#toolButtonClose { - padding: 10px 24px 14px; + padding: 10px 0px 14px; } +QPushButton#toolButtonMaximize[kde=true], QPushButton#toolButtonMinimize[kde=true], + QPushButton#toolButtonClose[kde=true] {padding: 4px 0px 14px;} QPushButton#toolButtonMain { font-size: 20px; diff --git a/win-linux/res/styles/styles@3.5x.qss b/win-linux/res/styles/styles@3.5x.qss index 94ae90f5e..4ab095259 100644 --- a/win-linux/res/styles/styles@3.5x.qss +++ b/win-linux/res/styles/styles@3.5x.qss @@ -17,8 +17,10 @@ QPushButton { QPushButton#toolButtonMaximize,QPushButton#toolButtonMinimize, QPushButton#toolButtonClose { - padding: 18px 42px 25px; + padding: 18px 0px 25px; } +QPushButton#toolButtonMaximize[kde=true], QPushButton#toolButtonMinimize[kde=true], + QPushButton#toolButtonClose[kde=true] {padding: 7px 0px 24px;} QPushButton#toolButtonMain { font-size: 35px; diff --git a/win-linux/res/styles/styles@3x.qss b/win-linux/res/styles/styles@3x.qss index f3d46c9d5..413e6b50f 100644 --- a/win-linux/res/styles/styles@3x.qss +++ b/win-linux/res/styles/styles@3x.qss @@ -17,8 +17,10 @@ QPushButton { QPushButton#toolButtonMaximize,QPushButton#toolButtonMinimize, QPushButton#toolButtonClose { - padding: 15px 36px 21px; + padding: 15px 0px 21px; } +QPushButton#toolButtonMaximize[kde=true], QPushButton#toolButtonMinimize[kde=true], + QPushButton#toolButtonClose[kde=true] {padding: 6px 0px 21px;} QPushButton#toolButtonMain { font-size: 30px; diff --git a/win-linux/res/styles/styles@4.5x.qss b/win-linux/res/styles/styles@4.5x.qss index a004fbeb5..477d0bdb5 100644 --- a/win-linux/res/styles/styles@4.5x.qss +++ b/win-linux/res/styles/styles@4.5x.qss @@ -17,8 +17,10 @@ QPushButton { QPushButton#toolButtonMaximize,QPushButton#toolButtonMinimize, QPushButton#toolButtonClose { - padding: 23px 54px 32px; + padding: 23px 0px 32px; } +QPushButton#toolButtonMaximize[kde=true], QPushButton#toolButtonMinimize[kde=true], + QPushButton#toolButtonClose[kde=true] {padding: 9px 0px 31px;} QPushButton#toolButtonMain { font-size: 45px; diff --git a/win-linux/res/styles/styles@4x.qss b/win-linux/res/styles/styles@4x.qss index 1a5a938ba..3f48a237d 100644 --- a/win-linux/res/styles/styles@4x.qss +++ b/win-linux/res/styles/styles@4x.qss @@ -17,8 +17,10 @@ QPushButton { QPushButton#toolButtonMaximize,QPushButton#toolButtonMinimize, QPushButton#toolButtonClose { - padding: 20px 48px 28px; + padding: 20px 0px 28px; } +QPushButton#toolButtonMaximize[kde=true], QPushButton#toolButtonMinimize[kde=true], + QPushButton#toolButtonClose[kde=true] {padding: 8px 0px 28px;} QPushButton#toolButtonMain { font-size: 40px; diff --git a/win-linux/res/styles/styles@5x.qss b/win-linux/res/styles/styles@5x.qss index c92019bd9..38402b01b 100644 --- a/win-linux/res/styles/styles@5x.qss +++ b/win-linux/res/styles/styles@5x.qss @@ -17,8 +17,10 @@ QPushButton { QPushButton#toolButtonMaximize,QPushButton#toolButtonMinimize, QPushButton#toolButtonClose { - padding: 25px 60px 35px; + padding: 25px 0px 35px; } +QPushButton#toolButtonMaximize[kde=true], QPushButton#toolButtonMinimize[kde=true], + QPushButton#toolButtonClose[kde=true] {padding: 10px 0px 35px;} QPushButton#toolButtonMain { font-size: 50px; diff --git a/win-linux/res/styles/styles_unix.qss b/win-linux/res/styles/styles_unix.qss new file mode 100644 index 000000000..d3d6156a8 --- /dev/null +++ b/win-linux/res/styles/styles_unix.qss @@ -0,0 +1,65 @@ +QPushButton#toolButtonClose[unix=true]:hover {background-color: transparent; image: url(:/close_unix_hover.svg) center no-repeat;} +QPushButton#toolButtonClose[unix=true]:pressed {background-color: transparent; image: url(:/close_unix_pressed.svg) center no-repeat;} + +QPushButton#toolButtonClose[unix=true][kde=true]:hover {image: url(:/close_kde_hover.svg) center no-repeat;} +QPushButton#toolButtonClose[unix=true][kde=true]:pressed {image: url(:/close_kde_pressed.svg) center no-repeat;} + +QPushButton#toolButtonMaximize[unix=true] {image: url(:/restore_unix_normal.svg) center no-repeat;} +QPushButton#toolButtonMaximize[unix=true]:hover {background-color: transparent; image: url(:/restore_unix_hover.svg) center no-repeat;} +QPushButton#toolButtonMaximize[unix=true]:pressed {background-color: transparent; image: url(:/restore_unix_pressed.svg) center no-repeat;} + +QPushButton#toolButtonMaximize[unix=true][kde=true] {image: url(:/restore_kde_normal.svg) center no-repeat;} +QPushButton#toolButtonMaximize[unix=true][kde=true]:hover {image: url(:/restore_kde_hover.svg) center no-repeat;} +QPushButton#toolButtonMaximize[unix=true][kde=true]:pressed {image: url(:/restore_kde_pressed.svg) center no-repeat;} + +QPushButton#toolButtonMaximize[class=min][unix=true] {image: url(:/maximize_unix_normal.svg) center no-repeat;} +QPushButton#toolButtonMaximize[class=min][unix=true]:hover {background-color: transparent; image: url(:/maximize_unix_hover.svg) center no-repeat;} +QPushButton#toolButtonMaximize[class=min][unix=true]:pressed {background-color: transparent; image: url(:/maximize_unix_pressed.svg) center no-repeat;} + +QPushButton#toolButtonMaximize[class=min][unix=true][kde=true] {image: url(:/maximize_kde_normal.svg) center no-repeat;} +QPushButton#toolButtonMaximize[class=min][unix=true][kde=true]:hover {image: url(:/maximize_kde_hover.svg) center no-repeat;} +QPushButton#toolButtonMaximize[class=min][unix=true][kde=true]:pressed {image: url(:/maximize_kde_pressed.svg) center no-repeat;} + +QPushButton#toolButtonMinimize[unix=true] {image: url(:/minimize_unix_normal.svg) center no-repeat;} +QPushButton#toolButtonMinimize[unix=true]:hover {background-color: transparent; image: url(:/minimize_unix_hover.svg) center no-repeat;} +QPushButton#toolButtonMinimize[unix=true]:pressed {background-color: transparent; image: url(:/minimize_unix_pressed.svg) center no-repeat;} + +QPushButton#toolButtonMinimize[unix=true][kde=true] {image: url(:/minimize_kde_normal.svg) center no-repeat;} +QPushButton#toolButtonMinimize[unix=true][kde=true]:hover {image: url(:/minimize_kde_hover.svg) center no-repeat;} +QPushButton#toolButtonMinimize[unix=true][kde=true]:pressed {image: url(:/minimize_kde_pressed.svg) center no-repeat;} + +QPushButton#toolButtonClose[unix=true] {image: url(:/close_unix_normal.svg) center no-repeat;} +QPushButton#toolButtonClose[unix=true][kde=true] {image: url(:/close_kde_normal.svg) center no-repeat;} + + +#mainPanel[uithemetype=dark] QPushButton#toolButtonMaximize[unix=true] {image: url(:/restore_unix_normal_light.svg) center no-repeat;} +#mainPanel[uithemetype=dark] QPushButton#toolButtonMaximize[unix=true]:hover {background-color: transparent; image: url(:/restore_unix_hover_light.svg) center no-repeat;} +#mainPanel[uithemetype=dark] QPushButton#toolButtonMaximize[unix=true]:pressed {background-color: transparent; image: url(:/restore_unix_pressed_light.svg) center no-repeat;} + +#mainPanel[uithemetype=dark] QPushButton#toolButtonMaximize[unix=true][kde=true] {image: url(:/restore_kde_normal_light.svg) center no-repeat;} +#mainPanel[uithemetype=dark] QPushButton#toolButtonMaximize[unix=true][kde=true]:hover {image: url(:/restore_kde_hover_light.svg) center no-repeat;} +#mainPanel[uithemetype=dark] QPushButton#toolButtonMaximize[unix=true][kde=true]:pressed {image: url(:/restore_kde_pressed_light.svg) center no-repeat;} + +#mainPanel[uithemetype=dark] QPushButton#toolButtonMaximize[class=min][unix=true] {image: url(:/maximize_unix_normal_light.svg) center no-repeat;} +#mainPanel[uithemetype=dark] QPushButton#toolButtonMaximize[class=min][unix=true]:hover {background-color: transparent; image: url(:/maximize_unix_hover_light.svg) center no-repeat;} +#mainPanel[uithemetype=dark] QPushButton#toolButtonMaximize[class=min][unix=true]:pressed {background-color: transparent; image: url(:/maximize_unix_pressed_light.svg) center no-repeat;} + +#mainPanel[uithemetype=dark] QPushButton#toolButtonMaximize[class=min][unix=true][kde=true] {image: url(:/maximize_kde_normal_light.svg) center no-repeat;} +#mainPanel[uithemetype=dark] QPushButton#toolButtonMaximize[class=min][unix=true][kde=true]:hover {image: url(:/maximize_kde_hover_light.svg) center no-repeat;} +#mainPanel[uithemetype=dark] QPushButton#toolButtonMaximize[class=min][unix=true][kde=true]:pressed {image: url(:/maximize_kde_pressed_light.svg) center no-repeat;} + +#mainPanel[uithemetype=dark] QPushButton#toolButtonMinimize[unix=true] {image: url(:/minimize_unix_normal_light.svg) center no-repeat;} +#mainPanel[uithemetype=dark] QPushButton#toolButtonMinimize[unix=true]:hover {background-color: transparent; image: url(:/minimize_unix_hover_light.svg) center no-repeat;} +#mainPanel[uithemetype=dark] QPushButton#toolButtonMinimize[unix=true]:pressed {background-color: transparent; image: url(:/minimize_unix_pressed_light.svg) center no-repeat;} + +#mainPanel[uithemetype=dark] QPushButton#toolButtonMinimize[unix=true][kde=true] {image: url(:/minimize_kde_normal_light.svg) center no-repeat;} +#mainPanel[uithemetype=dark] QPushButton#toolButtonMinimize[unix=true][kde=true]:hover {image: url(:/minimize_kde_hover_light.svg) center no-repeat;} +#mainPanel[uithemetype=dark] QPushButton#toolButtonMinimize[unix=true][kde=true]:pressed {image: url(:/minimize_kde_pressed_light.svg) center no-repeat;} + +#mainPanel[uithemetype=dark] QPushButton#toolButtonClose[unix=true] {image: url(:/close_unix_normal_light.svg) center no-repeat;} +#mainPanel[uithemetype=dark] QPushButton#toolButtonClose[unix=true]:hover {background-color: transparent; image: url(:/close_unix_hover_light.svg) center no-repeat;} +#mainPanel[uithemetype=dark] QPushButton#toolButtonClose[unix=true]:pressed {background-color: transparent; image: url(:/close_unix_pressed_light.svg) center no-repeat;} + +#mainPanel[uithemetype=dark] QPushButton#toolButtonClose[unix=true][kde=true] {image: url(:/close_kde_normal_light.svg) center no-repeat;} +#mainPanel[uithemetype=dark] QPushButton#toolButtonClose[unix=true][kde=true]:hover {image: url(:/close_kde_hover_light.svg) center no-repeat;} +#mainPanel[uithemetype=dark] QPushButton#toolButtonClose[unix=true][kde=true]:pressed {image: url(:/close_kde_pressed_light.svg) center no-repeat;} diff --git a/win-linux/resources.qrc b/win-linux/resources.qrc index 7607a7514..3416f880c 100644 --- a/win-linux/resources.qrc +++ b/win-linux/resources.qrc @@ -130,7 +130,9 @@ res/styles/styles.qss + res/styles/styles_unix.qss res/styles/editor.qss + res/styles/editor_unix.qss res/styles/message.qss res/styles/tabbar.qss res/styles/download.qss diff --git a/win-linux/src/cascapplicationmanagerwrapper.cpp b/win-linux/src/cascapplicationmanagerwrapper.cpp index 7f3550a97..b57b53ddd 100644 --- a/win-linux/src/cascapplicationmanagerwrapper.cpp +++ b/win-linux/src/cascapplicationmanagerwrapper.cpp @@ -1093,7 +1093,11 @@ void CAscApplicationManagerWrapper::initializeApp() _app.m_private->applyStylesheets(); // TODO: merge stylesheets and apply for the whole app - qApp->setStyleSheet( Utils::readStylesheets(":styles/styles.qss") ); + QString css{Utils::readStylesheets(":styles/styles.qss")}; +#ifdef __linux__ + css.append(Utils::readStylesheets(":styles/styles_unix.qss")); +#endif + qApp->setStyleSheet(css); // Font QFont mainFont = QApplication::font(); diff --git a/win-linux/src/windows/ceditorwindow.cpp b/win-linux/src/windows/ceditorwindow.cpp index b79206a3e..402d64d59 100644 --- a/win-linux/src/windows/ceditorwindow.cpp +++ b/win-linux/src/windows/ceditorwindow.cpp @@ -241,7 +241,11 @@ QWidget * CEditorWindow::createMainPanel(QWidget * parent, const QString& title) mainPanel->setProperty("zoom", QString::number(m_dpiRatio) + "x"); mainPanel->setProperty("uitheme", QString::fromStdWString(GetCurrentTheme().id())); - mainPanel->setStyleSheet(AscAppManager::getWindowStylesheets(m_dpiRatio) + m_css); + QString css(AscAppManager::getWindowStylesheets(m_dpiRatio) + m_css); +#ifdef __linux__ + css.append(Utils::readStylesheets(":styles/styles_unix.qss")); +#endif + mainPanel->setStyleSheet(css); if ( !d_ptr->panel() ) { // QCefView * pMainWidget = AscAppManager::createViewer(centralWidget); @@ -435,6 +439,9 @@ void CEditorWindow::setScreenScalingFactor(double factor, bool resize) QString css(AscAppManager::getWindowStylesheets(factor)); css.append(m_css); +#ifdef __linux__ + css.append(Utils::readStylesheets(":styles/styles_unix.qss")); +#endif m_pMainPanel->setStyleSheet(css); d_ptr.get()->onScreenScalingFactor(factor); diff --git a/win-linux/src/windows/ceditorwindow_p.h b/win-linux/src/windows/ceditorwindow_p.h index fdd50c356..ea5edb8d2 100644 --- a/win-linux/src/windows/ceditorwindow_p.h +++ b/win-linux/src/windows/ceditorwindow_p.h @@ -79,6 +79,9 @@ auto prepare_editor_css(AscEditorType type, const CTheme& theme) -> QString { case AscEditorType::etPdf: c = theme.value(CTheme::ColorRole::ecrTabViewerActive); break; } QString g_css(Utils::readStylesheets(":/styles/editor.qss")); +#ifdef __linux__ + g_css.append(Utils::readStylesheets(":styles/editor_unix.qss")); +#endif return g_css.arg(QString::fromStdWString(c)); } @@ -394,6 +397,9 @@ public: window->m_css = prepare_editor_css(editor_type, GetCurrentTheme()); QString css(AscAppManager::getWindowStylesheets(window->m_dpiRatio)); css.append(window->m_css); +#ifdef __linux__ + css.append(Utils::readStylesheets(":styles/styles_unix.qss")); +#endif window->m_pMainPanel->setStyleSheet(css); } setWindowColors(); diff --git a/win-linux/src/windows/cmainwindow.cpp b/win-linux/src/windows/cmainwindow.cpp index eb0664e83..5cf38d226 100644 --- a/win-linux/src/windows/cmainwindow.cpp +++ b/win-linux/src/windows/cmainwindow.cpp @@ -72,6 +72,7 @@ CMainWindow::CMainWindow(const QRect &rect) : setObjectName("MainWindow"); m_pMainPanel = createMainPanel(this); setCentralWidget(m_pMainPanel); + QString css{AscAppManager::getWindowStylesheets(m_dpiRatio)}; #ifdef __linux__ setAcceptDrops(true); if (isCustomWindowStyle()) { @@ -80,8 +81,9 @@ CMainWindow::CMainWindow(const QRect &rect) : setMouseTracking(true); } QMetaObject::connectSlotsByName(this); -#endif - m_pMainPanel->setStyleSheet(AscAppManager::getWindowStylesheets(m_dpiRatio)); + css.append(Utils::readStylesheets(":styles/styles_unix.qss")); +#endif + m_pMainPanel->setStyleSheet(css); updateScalingFactor(m_dpiRatio); goStart(); } @@ -1399,6 +1401,9 @@ void CMainWindow::setScreenScalingFactor(double factor, bool resize) { CWindowPlatform::setScreenScalingFactor(factor, resize); QString css(AscAppManager::getWindowStylesheets(factor)); +#ifdef __linux__ + css.append(Utils::readStylesheets(":styles/styles_unix.qss")); +#endif if (!css.isEmpty()) { m_pMainPanel->setStyleSheet(css); } diff --git a/win-linux/src/windows/cpresenterwindow.cpp b/win-linux/src/windows/cpresenterwindow.cpp index 4bd8ca4b9..449fbb640 100644 --- a/win-linux/src/windows/cpresenterwindow.cpp +++ b/win-linux/src/windows/cpresenterwindow.cpp @@ -106,7 +106,11 @@ QWidget * CPresenterWindow::createMainPanel(QWidget * parent, const QString& tit QWidget * mainPanel = new QWidget(parent); mainPanel->setObjectName("mainPanel"); mainPanel->setProperty("uitheme", QString::fromStdWString(GetCurrentTheme().id())); - mainPanel->setStyleSheet(AscAppManager::getWindowStylesheets(m_dpiRatio)); + QString css(AscAppManager::getWindowStylesheets(m_dpiRatio)); +#ifdef __linux__ + css.append(Utils::readStylesheets(":styles/styles_unix.qss")); +#endif + mainPanel->setStyleSheet(css); QGridLayout * mainGridLayout = new QGridLayout(mainPanel); mainGridLayout->setSpacing(0); @@ -172,6 +176,9 @@ void CPresenterWindow::setScreenScalingFactor(double factor, bool resize) { CWindowPlatform::setScreenScalingFactor(factor, resize); QString css(AscAppManager::getWindowStylesheets(factor)); +#ifdef __linux__ + css.append(Utils::readStylesheets(":styles/styles_unix.qss")); +#endif if (!css.isEmpty()) { m_pMainPanel->setStyleSheet(css); } diff --git a/win-linux/src/windows/cwindowbase.cpp b/win-linux/src/windows/cwindowbase.cpp index f3497baa0..a56236bcb 100644 --- a/win-linux/src/windows/cwindowbase.cpp +++ b/win-linux/src/windows/cwindowbase.cpp @@ -151,6 +151,11 @@ QPushButton* CWindowBase::createToolButton(QWidget * parent, const QString& name btn->setFixedSize(int(TOOLBTN_WIDTH*m_dpiRatio), int(TOOLBTN_HEIGHT*m_dpiRatio)); #ifdef __linux__ btn->setMouseTracking(true); + btn->setProperty("unix", true); + if (WindowHelper::getEnvInfo() == WindowHelper::KDE) + btn->setProperty("kde", true); +#else + btn->setProperty("unix", false); #endif return btn; }