From 9c1e9210c3b502061683efc1dada2deaefeed17f Mon Sep 17 00:00:00 2001 From: SimplestStudio Date: Thu, 11 Jul 2024 14:32:08 +0300 Subject: [PATCH] [win-linux] css: refactoring --- win-linux/res/styles/download.qss | 44 +++++++++---------- win-linux/res/styles/styles@1.25x.qss | 8 ++-- win-linux/res/styles/styles@1.5x.qss | 8 ++-- win-linux/res/styles/styles@1.75x.qss | 8 ++-- win-linux/res/styles/styles@2.25x.qss | 8 ++-- win-linux/res/styles/styles@2.5x.qss | 8 ++-- win-linux/res/styles/styles@2.75x.qss | 8 ++-- win-linux/res/styles/styles@2x.qss | 8 ++-- win-linux/res/styles/styles@3.5x.qss | 8 ++-- win-linux/res/styles/styles@3x.qss | 8 ++-- win-linux/res/styles/styles@4.5x.qss | 8 ++-- win-linux/res/styles/styles@4x.qss | 8 ++-- win-linux/res/styles/styles@5x.qss | 8 ++-- .../src/cascapplicationmanagerwrapper.cpp | 2 +- 14 files changed, 71 insertions(+), 71 deletions(-) diff --git a/win-linux/res/styles/download.qss b/win-linux/res/styles/download.qss index 2826a2aee..e40adb1b5 100644 --- a/win-linux/res/styles/download.qss +++ b/win-linux/res/styles/download.qss @@ -137,8 +137,8 @@ CDownloadWidget[zoom="1.25x"] QLabel {font-size: 14px; max-height: 18px; min-hei CDownloadWidget[zoom="1.25x"] QLabel#labelTitle {font-size: 18px; max-height: 28px;} CDownloadWidget[zoom="1.25x"] QScrollBar:vertical {width: 10px;} CDownloadWidget[zoom="1.25x"] QScrollBar::handle:vertical {min-height: 31px; border-radius: 4px;} -CDownloadWidget[zoom="1.25x"] QFrame#mainFrame {border: 1px solid #d1d1d1; border-radius: 4px;} -CDownloadWidget[zoom="1.25x"] QFrame#titleFrame {border-bottom: 1px solid #d1d1d1; min-height: 38px;} +CDownloadWidget[zoom="1.25x"] QFrame#mainFrame {border-width: 1px; border-radius: 4px;} +CDownloadWidget[zoom="1.25x"] QFrame#titleFrame {border-bottom-width: 1px; min-height: 38px;} /* 1.5x */ CDownloadWidget[zoom="1.5x"] QPushButton {height: 21px; font-size: 17px; icon-size: 18px;} @@ -151,8 +151,8 @@ CDownloadWidget[zoom="1.5x"] QLabel {font-size: 17px; max-height: 21px; min-heig CDownloadWidget[zoom="1.5x"] QLabel#labelTitle {font-size: 21px; max-height: 33px;} CDownloadWidget[zoom="1.5x"] QScrollBar:vertical {width: 12px;} CDownloadWidget[zoom="1.5x"] QScrollBar::handle:vertical {min-height: 38px; border-radius: 5px;} -CDownloadWidget[zoom="1.5x"] QFrame#mainFrame {border: 2px solid #d1d1d1; border-radius: 5px;} -CDownloadWidget[zoom="1.5x"] QFrame#titleFrame {border-bottom: 2px solid #d1d1d1; min-height: 45px;} +CDownloadWidget[zoom="1.5x"] QFrame#mainFrame {border-width: 2px; border-radius: 5px;} +CDownloadWidget[zoom="1.5x"] QFrame#titleFrame {border-bottom-width: 2px; min-height: 45px;} /* 1.75x */ CDownloadWidget[zoom="1.75x"] QPushButton {height: 25px; font-size: 19px; icon-size: 21px;} @@ -165,8 +165,8 @@ CDownloadWidget[zoom="1.75x"] QLabel {font-size: 19px; max-height: 25px; min-hei CDownloadWidget[zoom="1.75x"] QLabel#labelTitle {font-size: 25px; max-height: 39px;} CDownloadWidget[zoom="1.75x"] QScrollBar:vertical {width: 14px;} CDownloadWidget[zoom="1.75x"] QScrollBar::handle:vertical {min-height: 44px; border-radius: 5px;} -CDownloadWidget[zoom="1.75x"] QFrame#mainFrame {border: 2px solid #d1d1d1; border-radius: 5px;} -CDownloadWidget[zoom="1.75x"] QFrame#titleFrame {border-bottom: 2px solid #d1d1d1; min-height: 53px;} +CDownloadWidget[zoom="1.75x"] QFrame#mainFrame {border-width: 2px; border-radius: 5px;} +CDownloadWidget[zoom="1.75x"] QFrame#titleFrame {border-bottom-width: 2px; min-height: 53px;} /* 2.0x */ CDownloadWidget[zoom="2x"] QPushButton {height: 28px; font-size: 22px; icon-size: 24px;} @@ -193,8 +193,8 @@ CDownloadWidget[zoom="2.25x"] QLabel {font-size: 25px; max-height: 32px; min-hei CDownloadWidget[zoom="2.25x"] QLabel#labelTitle {font-size: 32px; max-height: 50px;} CDownloadWidget[zoom="2.25x"] QScrollBar:vertical {width: 18px;} CDownloadWidget[zoom="2.25x"] QScrollBar::handle:vertical {min-height: 56px; border-radius: 7px;} -CDownloadWidget[zoom="2.25x"] QFrame#mainFrame {border: 2px solid #d1d1d1; border-radius: 7px;} -CDownloadWidget[zoom="2.25x"] QFrame#titleFrame {border-bottom: 2px solid #d1d1d1; min-height: 68px;} +CDownloadWidget[zoom="2.25x"] QFrame#mainFrame {border-width: 2px; border-radius: 7px;} +CDownloadWidget[zoom="2.25x"] QFrame#titleFrame {border-bottom-width: 2px; min-height: 68px;} /* 2.5x */ CDownloadWidget[zoom="2.5x"] QPushButton {height: 35px; font-size: 28px; icon-size: 30px;} @@ -207,8 +207,8 @@ CDownloadWidget[zoom="2.5x"] QLabel {font-size: 28px; max-height: 35px; min-heig CDownloadWidget[zoom="2.5x"] QLabel#labelTitle {font-size: 35px; max-height: 55px;} CDownloadWidget[zoom="2.5x"] QScrollBar:vertical {width: 20px;} CDownloadWidget[zoom="2.5x"] QScrollBar::handle:vertical {min-height: 63px; border-radius: 8px;} -CDownloadWidget[zoom="2.5x"] QFrame#mainFrame {border: 3px solid #d1d1d1; border-radius: 8px;} -CDownloadWidget[zoom="2.5x"] QFrame#titleFrame {border-bottom: 3px solid #d1d1d1; min-height: 75px;} +CDownloadWidget[zoom="2.5x"] QFrame#mainFrame {border-width: 3px; border-radius: 8px;} +CDownloadWidget[zoom="2.5x"] QFrame#titleFrame {border-bottom-width: 3px; min-height: 75px;} /* 2.75x */ CDownloadWidget[zoom="2.75x"] QPushButton {height: 39px; font-size: 30px; icon-size: 33px;} @@ -221,8 +221,8 @@ CDownloadWidget[zoom="2.75x"] QLabel {font-size: 30px; max-height: 39px; min-hei CDownloadWidget[zoom="2.75x"] QLabel#labelTitle {font-size: 39px; max-height: 61px;} CDownloadWidget[zoom="2.75x"] QScrollBar:vertical {width: 22px;} CDownloadWidget[zoom="2.75x"] QScrollBar::handle:vertical {min-height: 69px; border-radius: 8px;} -CDownloadWidget[zoom="2.75x"] QFrame#mainFrame {border: 3px solid #d1d1d1; border-radius: 8px;} -CDownloadWidget[zoom="2.75x"] QFrame#titleFrame {border-bottom: 3px solid #d1d1d1; min-height: 83px;} +CDownloadWidget[zoom="2.75x"] QFrame#mainFrame {border-width: 3px; border-radius: 8px;} +CDownloadWidget[zoom="2.75x"] QFrame#titleFrame {border-bottom-width: 3px; min-height: 83px;} /* 3.0x */ CDownloadWidget[zoom="3x"] QPushButton {height: 42px; font-size: 33px; icon-size: 36px;} @@ -235,8 +235,8 @@ CDownloadWidget[zoom="3x"] QLabel {font-size: 33px; max-height: 42px; min-height CDownloadWidget[zoom="3x"] QLabel#labelTitle {font-size: 42px; max-height: 66px;} CDownloadWidget[zoom="3x"] QScrollBar:vertical {width: 24px;} CDownloadWidget[zoom="3x"] QScrollBar::handle:vertical {min-height: 75px; border-radius: 9px;} -CDownloadWidget[zoom="3x"] QFrame#mainFrame {border: 3px solid #d1d1d1; border-radius: 9px;} -CDownloadWidget[zoom="3x"] QFrame#titleFrame {border-bottom: 3px solid #d1d1d1; min-height: 90px;} +CDownloadWidget[zoom="3x"] QFrame#mainFrame {border-width: 3px; border-radius: 9px;} +CDownloadWidget[zoom="3x"] QFrame#titleFrame {border-bottom-width: 3px; min-height: 90px;} /* 3.5x */ CDownloadWidget[zoom="3.5x"] QPushButton {height: 49px; font-size: 39px; icon-size: 42px;} @@ -249,8 +249,8 @@ CDownloadWidget[zoom="3.5x"] QLabel {font-size: 39px; max-height: 49px; min-heig CDownloadWidget[zoom="3.5x"] QLabel#labelTitle {font-size: 49px; max-height: 77px;} CDownloadWidget[zoom="3.5x"] QScrollBar:vertical {width: 28px;} CDownloadWidget[zoom="3.5x"] QScrollBar::handle:vertical {min-height: 88px; border-radius: 11px;} -CDownloadWidget[zoom="3.5x"] QFrame#mainFrame {border: 4px solid #d1d1d1; border-radius: 11px;} -CDownloadWidget[zoom="3.5x"] QFrame#titleFrame {border-bottom: 4px solid #d1d1d1; min-height: 105px;} +CDownloadWidget[zoom="3.5x"] QFrame#mainFrame {border-width: 4px; border-radius: 11px;} +CDownloadWidget[zoom="3.5x"] QFrame#titleFrame {border-bottom-width: 4px; min-height: 105px;} /* 4.0x */ CDownloadWidget[zoom="4x"] QPushButton {height: 56px; font-size: 44px; icon-size: 48px;} @@ -263,8 +263,8 @@ CDownloadWidget[zoom="4x"] QLabel {font-size: 44px; max-height: 56px; min-height CDownloadWidget[zoom="4x"] QLabel#labelTitle {font-size: 56px; max-height: 88px;} CDownloadWidget[zoom="4x"] QScrollBar:vertical {width: 32px;} CDownloadWidget[zoom="4x"] QScrollBar::handle:vertical {min-height: 100px; border-radius: 12px;} -CDownloadWidget[zoom="4x"] QFrame#mainFrame {border: 4px solid #d1d1d1; border-radius: 12px;} -CDownloadWidget[zoom="4x"] QFrame#titleFrame {border-bottom: 4px solid #d1d1d1; min-height: 120px;} +CDownloadWidget[zoom="4x"] QFrame#mainFrame {border-width: 4px; border-radius: 12px;} +CDownloadWidget[zoom="4x"] QFrame#titleFrame {border-bottom-width: 4px; min-height: 120px;} /* 4.5x */ CDownloadWidget[zoom="4.5x"] QPushButton {height: 63px; font-size: 50px; icon-size: 54px;} @@ -277,8 +277,8 @@ CDownloadWidget[zoom="4.5x"] QLabel {font-size: 50px; max-height: 63px; min-heig CDownloadWidget[zoom="4.5x"] QLabel#labelTitle {font-size: 63px; max-height: 99px;} CDownloadWidget[zoom="4.5x"] QScrollBar:vertical {width: 36px;} CDownloadWidget[zoom="4.5x"] QScrollBar::handle:vertical {min-height: 113px; border-radius: 14px;} -CDownloadWidget[zoom="4.5x"] QFrame#mainFrame {border: 5px solid #d1d1d1; border-radius: 14px;} -CDownloadWidget[zoom="4.5x"] QFrame#titleFrame {border-bottom: 5px solid #d1d1d1; min-height: 135px;} +CDownloadWidget[zoom="4.5x"] QFrame#mainFrame {border-width: 5px; border-radius: 14px;} +CDownloadWidget[zoom="4.5x"] QFrame#titleFrame {border-bottom-width: 5px; min-height: 135px;} /* 5.0x */ CDownloadWidget[zoom="5x"] QPushButton {height: 70px; font-size: 55px; icon-size: 60px;} @@ -291,5 +291,5 @@ CDownloadWidget[zoom="5x"] QLabel {font-size: 55px; max-height: 70px; min-height CDownloadWidget[zoom="5x"] QLabel#labelTitle {font-size: 70px; max-height: 110px;} CDownloadWidget[zoom="5x"] QScrollBar:vertical {width: 40px;} CDownloadWidget[zoom="5x"] QScrollBar::handle:vertical {min-height: 125px; border-radius: 15px;} -CDownloadWidget[zoom="5x"] QFrame#mainFrame {border: 5px solid #d1d1d1; border-radius: 15px;} -CDownloadWidget[zoom="5x"] QFrame#titleFrame {border-bottom: 5px solid #d1d1d1; min-height: 150px;} +CDownloadWidget[zoom="5x"] QFrame#mainFrame {border-width: 5px; border-radius: 15px;} +CDownloadWidget[zoom="5x"] QFrame#titleFrame {border-bottom-width: 5px; min-height: 150px;} diff --git a/win-linux/res/styles/styles@1.25x.qss b/win-linux/res/styles/styles@1.25x.qss index df2e2e9d7..bd36af0a7 100644 --- a/win-linux/res/styles/styles@1.25x.qss +++ b/win-linux/res/styles/styles@1.25x.qss @@ -1,7 +1,7 @@ #CX11Caption {min-width: 250px;} #labelAppTitle {margin-top: -2px; font-size: 14px;} -QPushButton {border: 1px solid #cbcbcb; padding:0 25px; height: 28px; border-radius: 2px; font-size: 14px;} +QPushButton {border-width: 1px; padding:0 25px; height: 28px; border-radius: 2px; font-size: 14px;} QPushButton#toolButtonMaximize, QPushButton#toolButtonMinimize, QPushButton#toolButtonClose {padding: 6px 0px 9px;} @@ -26,7 +26,7 @@ QPushButton#toolButtonDownload {border-right-width: 1px; max-width: 50px; width: margin: 0px; padding-left: 12px; padding-right: 12px; font-size: 14px; - border: 1px solid #c0c0c0; border-radius: 5px; + border-width: 1px; border-radius: 5px; } -#mainPanel[uitheme=theme-dark] #CToolTip>QLabel {border: 1px solid #666666;} -#mainPanel[uitheme=theme-contrast-dark] #CToolTip>QLabel {border: 1px solid #696969;} +#mainPanel[uitheme=theme-dark] #CToolTip>QLabel {border-width: 1px;} +#mainPanel[uitheme=theme-contrast-dark] #CToolTip>QLabel {border-width: 1px;} diff --git a/win-linux/res/styles/styles@1.5x.qss b/win-linux/res/styles/styles@1.5x.qss index 048f874ad..e712c5354 100644 --- a/win-linux/res/styles/styles@1.5x.qss +++ b/win-linux/res/styles/styles@1.5x.qss @@ -1,7 +1,7 @@ #CX11Caption {min-width: 300px;} #labelAppTitle {margin-top: -3px; font-size: 17px;} -QPushButton {border: 2px solid #cbcbcb; padding:0 30px; height: 33px; border-radius: 3px; font-size: 17px;} +QPushButton {border-width: 2px; padding:0 30px; height: 33px; border-radius: 3px; font-size: 17px;} QPushButton#toolButtonMaximize, QPushButton#toolButtonMinimize, QPushButton#toolButtonClose {padding: 8px 0px 11px;} @@ -26,7 +26,7 @@ QPushButton#toolButtonDownload {border-right-width: 2px; max-width: 60px; width: margin: 0px; padding-left: 16px; padding-right: 16px; font-size: 16px; - border: 1px solid #c0c0c0; border-radius: 7px; + border-width: 1px; border-radius: 7px; } -#mainPanel[uitheme=theme-dark] #CToolTip>QLabel {border: 1px solid #666666;} -#mainPanel[uitheme=theme-contrast-dark] #CToolTip>QLabel {border: 1px solid #696969;} +#mainPanel[uitheme=theme-dark] #CToolTip>QLabel {border-width: 1px;} +#mainPanel[uitheme=theme-contrast-dark] #CToolTip>QLabel {border-width: 1px;} diff --git a/win-linux/res/styles/styles@1.75x.qss b/win-linux/res/styles/styles@1.75x.qss index 3c5bf6494..f79e63e76 100644 --- a/win-linux/res/styles/styles@1.75x.qss +++ b/win-linux/res/styles/styles@1.75x.qss @@ -1,7 +1,7 @@ #CX11Caption {min-width: 350px;} #labelAppTitle {margin-top: -4px; font-size: 20px;} -QPushButton {border: 2px solid #cbcbcb; padding: 0 35px; height: 39px; border-radius: 4px; font-size: 20px;} +QPushButton {border-width: 2px; padding: 0 35px; height: 39px; border-radius: 4px; font-size: 20px;} QPushButton#toolButtonMaximize, QPushButton#toolButtonMinimize, QPushButton#toolButtonClose {padding: 9px 0px 13px;} @@ -26,7 +26,7 @@ QPushButton#toolButtonDownload {border-right-width: 2px; max-width: 70px; width: margin: 0px; padding-left: 20px; padding-right: 20px; font-size: 19px; - border: 1px solid #c0c0c0; border-radius: 8px; + border-width: 1px; border-radius: 8px; } -#mainPanel[uitheme=theme-dark] #CToolTip>QLabel {border: 1px solid #666666;} -#mainPanel[uitheme=theme-contrast-dark] #CToolTip>QLabel {border: 1px solid #696969;} +#mainPanel[uitheme=theme-dark] #CToolTip>QLabel {border-width: 1px;} +#mainPanel[uitheme=theme-contrast-dark] #CToolTip>QLabel {border-width: 1px;} diff --git a/win-linux/res/styles/styles@2.25x.qss b/win-linux/res/styles/styles@2.25x.qss index 8ca9a8636..27ee2438d 100644 --- a/win-linux/res/styles/styles@2.25x.qss +++ b/win-linux/res/styles/styles@2.25x.qss @@ -1,7 +1,7 @@ #CX11Caption {min-width: 394px;} #labelAppTitle {margin-top: -5px; font-size: 25px;} -QPushButton {border: 2px solid #cbcbcb; padding: 0 45px; height: 50px; border-radius: 5px; font-size: 25px;} +QPushButton {border-width: 2px; padding: 0 45px; height: 50px; border-radius: 5px; font-size: 25px;} QPushButton#toolButtonMaximize, QPushButton#toolButtonMinimize, QPushButton#toolButtonClose {padding: 11px 0px 16px;} @@ -27,7 +27,7 @@ QPushButton#toolButtonDownload {border-right-width: 2px; max-width: 90px; width: margin: 0px; padding-left: 23px; padding-right: 23px; font-size: 25px; - border: 2px solid #c0c0c0; border-radius: 10px; + border-width: 2px; border-radius: 10px; } -#mainPanel[uitheme=theme-dark] #CToolTip>QLabel {border: 2px solid #666666;} -#mainPanel[uitheme=theme-contrast-dark] #CToolTip>QLabel {border: 2px solid #696969;} +#mainPanel[uitheme=theme-dark] #CToolTip>QLabel {border-width: 2px;} +#mainPanel[uitheme=theme-contrast-dark] #CToolTip>QLabel {border-width: 2px;} diff --git a/win-linux/res/styles/styles@2.5x.qss b/win-linux/res/styles/styles@2.5x.qss index 360fbd647..70e5b7425 100644 --- a/win-linux/res/styles/styles@2.5x.qss +++ b/win-linux/res/styles/styles@2.5x.qss @@ -1,7 +1,7 @@ #CX11Caption {min-width: 438px;} #labelAppTitle {margin-top: -5px; font-size: 28px;} -QPushButton {border: 3px solid #cbcbcb; padding: 0 50px; height: 55px; border-radius: 5px; font-size: 28px;} +QPushButton {border-width: 3px; padding: 0 50px; height: 55px; border-radius: 5px; font-size: 28px;} QPushButton#toolButtonMaximize, QPushButton#toolButtonMinimize, QPushButton#toolButtonClose {padding: 13px 0px 18px;} @@ -26,7 +26,7 @@ QPushButton#toolButtonDownload {border-right-width: 3px; max-width: 100px; width margin: 0px; padding-left: 25px; padding-right: 25px; font-size: 28px; - border: 3px solid #c0c0c0; border-radius: 11px; + border-width: 3px; border-radius: 11px; } -#mainPanel[uitheme=theme-dark] #CToolTip>QLabel {border: 3px solid #666666;} -#mainPanel[uitheme=theme-contrast-dark] #CToolTip>QLabel {border: 3px solid #696969;} +#mainPanel[uitheme=theme-dark] #CToolTip>QLabel {border-width: 3px;} +#mainPanel[uitheme=theme-contrast-dark] #CToolTip>QLabel {border-width: 3px;} diff --git a/win-linux/res/styles/styles@2.75x.qss b/win-linux/res/styles/styles@2.75x.qss index a90d57645..246f8db1f 100644 --- a/win-linux/res/styles/styles@2.75x.qss +++ b/win-linux/res/styles/styles@2.75x.qss @@ -1,7 +1,7 @@ #CX11Caption {min-width: 481px;} #labelAppTitle {margin-top: -6px; font-size: 30px;} -QPushButton {border: 3px solid #cbcbcb; padding: 0 55px; height: 61px; border-radius: 6px; font-size: 30px;} +QPushButton {border-width: 3px; padding: 0 55px; height: 61px; border-radius: 6px; font-size: 30px;} QPushButton#toolButtonMaximize, QPushButton#toolButtonMinimize, QPushButton#toolButtonClose {padding: 14px 0px 19px;} @@ -26,7 +26,7 @@ QPushButton#toolButtonDownload {border-right-width: 3px; max-width: 110px; width margin: 0px; padding-left: 28px; padding-right: 28px; font-size: 30px; - border: 3px solid #c0c0c0; border-radius: 12px; + border-width: 3px; border-radius: 12px; } -#mainPanel[uitheme=theme-dark] #CToolTip>QLabel {border: 3px solid #666666;} -#mainPanel[uitheme=theme-contrast-dark] #CToolTip>QLabel {border: 3px solid #696969;} +#mainPanel[uitheme=theme-dark] #CToolTip>QLabel {border-width: 3px;} +#mainPanel[uitheme=theme-contrast-dark] #CToolTip>QLabel {border-width: 3px;} diff --git a/win-linux/res/styles/styles@2x.qss b/win-linux/res/styles/styles@2x.qss index e911fd7eb..08607cb30 100644 --- a/win-linux/res/styles/styles@2x.qss +++ b/win-linux/res/styles/styles@2x.qss @@ -1,7 +1,7 @@ #CX11Caption {min-width: 350px;} #labelAppTitle {margin-top: -4px; font-size: 22px;} -QPushButton {border: 2px solid #cbcbcb; padding:0 40px; height: 44px; border-radius:4px; font-size: 22px;} +QPushButton {border-width: 2px; padding:0 40px; height: 44px; border-radius:4px; font-size: 22px;} QPushButton#toolButtonMaximize, QPushButton#toolButtonMinimize, QPushButton#toolButtonClose {padding: 10px 0px 14px;} @@ -26,7 +26,7 @@ QPushButton#toolButtonDownload {border-right-width: 2px; max-width: 80px; width: margin: 0px; padding-left: 20px; padding-right: 20px; font-size: 22px; - border: 2px solid #c0c0c0; border-radius: 9px; + border-width: 2px; border-radius: 9px; } -#mainPanel[uitheme=theme-dark] #CToolTip>QLabel {border: 2px solid #666666;} -#mainPanel[uitheme=theme-contrast-dark] #CToolTip>QLabel {border: 2px solid #696969;} +#mainPanel[uitheme=theme-dark] #CToolTip>QLabel {border-width: 2px;} +#mainPanel[uitheme=theme-contrast-dark] #CToolTip>QLabel {border-width: 2px;} diff --git a/win-linux/res/styles/styles@3.5x.qss b/win-linux/res/styles/styles@3.5x.qss index f8a45c3b3..f3c97527a 100644 --- a/win-linux/res/styles/styles@3.5x.qss +++ b/win-linux/res/styles/styles@3.5x.qss @@ -1,7 +1,7 @@ #CX11Caption {min-width: 613px;} #labelAppTitle {margin-top: -7px; font-size: 39px;} -QPushButton {border: 4px solid #cbcbcb; padding: 0 70px; height: 77px; border-radius: 7px; font-size: 39px;} +QPushButton {border-width: 4px; padding: 0 70px; height: 77px; border-radius: 7px; font-size: 39px;} QPushButton#toolButtonMaximize, QPushButton#toolButtonMinimize, QPushButton#toolButtonClose {padding: 18px 0px 25px;} @@ -26,7 +26,7 @@ QPushButton#toolButtonDownload {border-right-width: 4px; max-width: 140px; width margin: 0px; padding-left: 35px; padding-right: 35px; font-size: 39px; - border: 4px solid #c0c0c0; border-radius: 16px; + border-width: 4px; border-radius: 16px; } -#mainPanel[uitheme=theme-dark] #CToolTip>QLabel {border: 4px solid #666666;} -#mainPanel[uitheme=theme-contrast-dark] #CToolTip>QLabel {border: 4px solid #696969;} +#mainPanel[uitheme=theme-dark] #CToolTip>QLabel {border-width: 4px;} +#mainPanel[uitheme=theme-contrast-dark] #CToolTip>QLabel {border-width: 4px;} diff --git a/win-linux/res/styles/styles@3x.qss b/win-linux/res/styles/styles@3x.qss index 80a515bf6..2f9ab7d80 100644 --- a/win-linux/res/styles/styles@3x.qss +++ b/win-linux/res/styles/styles@3x.qss @@ -1,7 +1,7 @@ #CX11Caption {min-width: 525px;} #labelAppTitle {margin-top: -6px; font-size: 33px;} -QPushButton {border: 3px solid #cbcbcb; padding: 0 60px; height: 66px; border-radius: 6px; font-size: 33px;} +QPushButton {border-width: 3px; padding: 0 60px; height: 66px; border-radius: 6px; font-size: 33px;} QPushButton#toolButtonMaximize, QPushButton#toolButtonMinimize, QPushButton#toolButtonClose {padding: 15px 0px 21px;} @@ -26,7 +26,7 @@ QPushButton#toolButtonDownload {border-right-width: 3px; max-width: 120px; width margin: 0px; padding-left: 30px; padding-right: 30px; font-size: 33px; - border: 3px solid #c0c0c0; border-radius: 14px; + border-width: 3px; border-radius: 14px; } -#mainPanel[uitheme=theme-dark] #CToolTip>QLabel {border: 3px solid #666666;} -#mainPanel[uitheme=theme-contrast-dark] #CToolTip>QLabel {border: 3px solid #696969;} +#mainPanel[uitheme=theme-dark] #CToolTip>QLabel {border-width: 3px;} +#mainPanel[uitheme=theme-contrast-dark] #CToolTip>QLabel {border-width: 3px;} diff --git a/win-linux/res/styles/styles@4.5x.qss b/win-linux/res/styles/styles@4.5x.qss index ef7a52041..e04d361f0 100644 --- a/win-linux/res/styles/styles@4.5x.qss +++ b/win-linux/res/styles/styles@4.5x.qss @@ -1,7 +1,7 @@ #CX11Caption {min-width: 788px;} #labelAppTitle {margin-top: -9px; font-size: 50px;} -QPushButton {border: 5px solid #cbcbcb; padding: 0 90px; height: 99px; border-radius:9px; font-size: 50px;} +QPushButton {border-width: 5px; padding: 0 90px; height: 99px; border-radius:9px; font-size: 50px;} QPushButton#toolButtonMaximize, QPushButton#toolButtonMinimize, QPushButton#toolButtonClose {padding: 23px 0px 32px;} @@ -26,7 +26,7 @@ QPushButton#toolButtonDownload {border-right-width: 5px; max-width: 180px; width margin: 0px; padding-left: 45px; padding-right: 45px; font-size: 50px; - border: 5px solid #c0c0c0; border-radius: 20px; + border-width: 5px; border-radius: 20px; } -#mainPanel[uitheme=theme-dark] #CToolTip>QLabel {border: 5px solid #666666;} -#mainPanel[uitheme=theme-contrast-dark] #CToolTip>QLabel {border: 5px solid #696969;} +#mainPanel[uitheme=theme-dark] #CToolTip>QLabel {border-width: 5px;} +#mainPanel[uitheme=theme-contrast-dark] #CToolTip>QLabel {border-width: 5px;} diff --git a/win-linux/res/styles/styles@4x.qss b/win-linux/res/styles/styles@4x.qss index 85d929cf4..548ff4fec 100644 --- a/win-linux/res/styles/styles@4x.qss +++ b/win-linux/res/styles/styles@4x.qss @@ -1,7 +1,7 @@ #CX11Caption {min-width: 700px;} #labelAppTitle {margin-top: -8px; font-size: 44px;} -QPushButton {border: 4px solid #cbcbcb; padding: 0 80px; height: 88px; border-radius: 8px; font-size: 44px;} +QPushButton {border-width: 4px; padding: 0 80px; height: 88px; border-radius: 8px; font-size: 44px;} QPushButton#toolButtonMaximize, QPushButton#toolButtonMinimize, QPushButton#toolButtonClose {padding: 20px 0px 28px;} @@ -26,7 +26,7 @@ QPushButton#toolButtonDownload {border-right-width: 4px; max-width: 160px; width margin: 0px; padding-left: 40px; padding-right: 40px; font-size: 44px; - border: 4px solid #c0c0c0; border-radius: 18px; + border-width: 4px; border-radius: 18px; } -#mainPanel[uitheme=theme-dark] #CToolTip>QLabel {border: 4px solid #666666;} -#mainPanel[uitheme=theme-contrast-dark] #CToolTip>QLabel {border: 4px solid #696969;} +#mainPanel[uitheme=theme-dark] #CToolTip>QLabel {border-width: 4px;} +#mainPanel[uitheme=theme-contrast-dark] #CToolTip>QLabel {border-width: 4px;} diff --git a/win-linux/res/styles/styles@5x.qss b/win-linux/res/styles/styles@5x.qss index bedc044f7..6ac22a2f2 100644 --- a/win-linux/res/styles/styles@5x.qss +++ b/win-linux/res/styles/styles@5x.qss @@ -1,7 +1,7 @@ #CX11Caption {min-width: 875px;} #labelAppTitle {margin-top: -10px; font-size: 55px;} -QPushButton {border: 5px solid #cbcbcb; padding: 0 100px; height: 110px; border-radius: 10px; font-size: 55px;} +QPushButton {border-width: 5px; padding: 0 100px; height: 110px; border-radius: 10px; font-size: 55px;} QPushButton#toolButtonMaximize, QPushButton#toolButtonMinimize, QPushButton#toolButtonClose {padding: 25px 0px 35px;} @@ -26,7 +26,7 @@ QPushButton#toolButtonDownload {border-right-width: 5px; max-width: 200px; width margin: 0px; padding-left: 50px; padding-right: 50px; font-size: 55px; - border: 5px solid #c0c0c0; border-radius: 23px; + border-width: 5px; border-radius: 23px; } -#mainPanel[uitheme=theme-dark] #CToolTip>QLabel {border: 5px solid #666666;} -#mainPanel[uitheme=theme-contrast-dark] #CToolTip>QLabel {border: 5px solid #696969;} +#mainPanel[uitheme=theme-dark] #CToolTip>QLabel {border-width: 5px;} +#mainPanel[uitheme=theme-contrast-dark] #CToolTip>QLabel {border-width: 5px;} diff --git a/win-linux/src/cascapplicationmanagerwrapper.cpp b/win-linux/src/cascapplicationmanagerwrapper.cpp index d10008371..7558839e5 100644 --- a/win-linux/src/cascapplicationmanagerwrapper.cpp +++ b/win-linux/src/cascapplicationmanagerwrapper.cpp @@ -1685,7 +1685,7 @@ QString CAscApplicationManagerWrapper::getWindowStylesheets(CScalingFactor facto APP_CAST(_app); QByteArray _out = Utils::readStylesheets(&_app.m_mapStyles[CScalingFactor::SCALING_FACTOR_1]); - _out.append(Utils::readStylesheets(":/themes/theme-contrast-dark.qss")); +// _out.append(Utils::readStylesheets(":/themes/theme-contrast-dark.qss")); if ( factor != CScalingFactor::SCALING_FACTOR_1 ) _out.append(Utils::readStylesheets(&_app.m_mapStyles[factor]));