diff --git a/.gitignore b/.gitignore index b49ed6c69..3575b07cb 100644 --- a/.gitignore +++ b/.gitignore @@ -26,6 +26,7 @@ win-linux/package/linux/urpmi/builddir win-linux/package/linux/suse-rpm/builddir win-linux/package/linux/tar +common/loginpage/build/plugins/* common/loginpage/build/node_modules/* common/loginpage/deploy/* common/loginpage/src/dlglogin.min.js diff --git a/win-linux/res/icons/tabbar/scroll_left_disabled.svg b/win-linux/res/icons/tabbar/scroll_left_disabled.svg new file mode 100644 index 000000000..f16f77ca9 --- /dev/null +++ b/win-linux/res/icons/tabbar/scroll_left_disabled.svg @@ -0,0 +1,45 @@ + + diff --git a/win-linux/res/icons/tabbar/scroll_left_disabled_light.svg b/win-linux/res/icons/tabbar/scroll_left_disabled_light.svg new file mode 100644 index 000000000..1de9c6968 --- /dev/null +++ b/win-linux/res/icons/tabbar/scroll_left_disabled_light.svg @@ -0,0 +1,47 @@ + + diff --git a/win-linux/res/icons/tabbar/scroll_left_hover.svg b/win-linux/res/icons/tabbar/scroll_left_hover.svg new file mode 100644 index 000000000..a3d3c2fac --- /dev/null +++ b/win-linux/res/icons/tabbar/scroll_left_hover.svg @@ -0,0 +1,45 @@ + + diff --git a/win-linux/res/icons/tabbar/scroll_left_hover_light.svg b/win-linux/res/icons/tabbar/scroll_left_hover_light.svg new file mode 100644 index 000000000..27af9b0be --- /dev/null +++ b/win-linux/res/icons/tabbar/scroll_left_hover_light.svg @@ -0,0 +1,47 @@ + + diff --git a/win-linux/res/icons/tabbar/scroll_left_normal.svg b/win-linux/res/icons/tabbar/scroll_left_normal.svg new file mode 100644 index 000000000..87a4ed7fc --- /dev/null +++ b/win-linux/res/icons/tabbar/scroll_left_normal.svg @@ -0,0 +1,46 @@ + + diff --git a/win-linux/res/icons/tabbar/scroll_left_normal_light.svg b/win-linux/res/icons/tabbar/scroll_left_normal_light.svg new file mode 100644 index 000000000..f9dcc83c7 --- /dev/null +++ b/win-linux/res/icons/tabbar/scroll_left_normal_light.svg @@ -0,0 +1,46 @@ + + diff --git a/win-linux/res/icons/tabbar/scroll_left_pressed_light.svg b/win-linux/res/icons/tabbar/scroll_left_pressed_light.svg new file mode 100644 index 000000000..d6404e2d7 --- /dev/null +++ b/win-linux/res/icons/tabbar/scroll_left_pressed_light.svg @@ -0,0 +1,46 @@ + + diff --git a/win-linux/res/icons/tabbar/scroll_right_disabled.svg b/win-linux/res/icons/tabbar/scroll_right_disabled.svg new file mode 100644 index 000000000..402c7197e --- /dev/null +++ b/win-linux/res/icons/tabbar/scroll_right_disabled.svg @@ -0,0 +1,44 @@ + + diff --git a/win-linux/res/icons/tabbar/scroll_right_disabled_light.svg b/win-linux/res/icons/tabbar/scroll_right_disabled_light.svg new file mode 100644 index 000000000..366254b8d --- /dev/null +++ b/win-linux/res/icons/tabbar/scroll_right_disabled_light.svg @@ -0,0 +1,42 @@ + + diff --git a/win-linux/res/icons/tabbar/scroll_right_hover.svg b/win-linux/res/icons/tabbar/scroll_right_hover.svg new file mode 100644 index 000000000..c6cc6d9c3 --- /dev/null +++ b/win-linux/res/icons/tabbar/scroll_right_hover.svg @@ -0,0 +1,44 @@ + + diff --git a/win-linux/res/icons/tabbar/scroll_right_hover_light.svg b/win-linux/res/icons/tabbar/scroll_right_hover_light.svg new file mode 100644 index 000000000..1cd38a01b --- /dev/null +++ b/win-linux/res/icons/tabbar/scroll_right_hover_light.svg @@ -0,0 +1,42 @@ + + diff --git a/win-linux/res/icons/tabbar/scroll_right_normal.svg b/win-linux/res/icons/tabbar/scroll_right_normal.svg new file mode 100644 index 000000000..fe23c9e52 --- /dev/null +++ b/win-linux/res/icons/tabbar/scroll_right_normal.svg @@ -0,0 +1,45 @@ + + diff --git a/win-linux/res/icons/tabbar/scroll_right_normal_light.svg b/win-linux/res/icons/tabbar/scroll_right_normal_light.svg new file mode 100644 index 000000000..0a04dd6c9 --- /dev/null +++ b/win-linux/res/icons/tabbar/scroll_right_normal_light.svg @@ -0,0 +1,45 @@ + + diff --git a/win-linux/res/icons/tabbar/scroll_right_pressed_light.svg b/win-linux/res/icons/tabbar/scroll_right_pressed_light.svg new file mode 100644 index 000000000..d819e37dc --- /dev/null +++ b/win-linux/res/icons/tabbar/scroll_right_pressed_light.svg @@ -0,0 +1,45 @@ + + diff --git a/win-linux/res/styles/styles.qss b/win-linux/res/styles/styles.qss index 75e09cb46..3782e1a51 100644 --- a/win-linux/res/styles/styles.qss +++ b/win-linux/res/styles/styles.qss @@ -38,37 +38,88 @@ #scrollerFrame>QToolButton:pressed {background-color: #b7b7b7;} #scrollerFrame>QToolButton#leftButton { - image: url(:/tabbar/icons/scrolltab_ln.png) center no-repeat; + image: url(:/tabbar/icons/scrolltab_ln.svg) center no-repeat; } - #scrollerFrame>QToolButton#leftButton:disabled { - image: url(:/tabbar/icons/scrolltab_ld.png) center no-repeat; + image: url(:/tabbar/icons/scrolltab_ld.svg) center no-repeat; } - #scrollerFrame>QToolButton#leftButton:hover { - image: url(:/tabbar/icons/scrolltab_lh.png) center no-repeat; + image: url(:/tabbar/icons/scrolltab_lh.svg) center no-repeat; } - #scrollerFrame>QToolButton#leftButton:pressed { image: url(:/tabbar/icons/scrolltab_lp.png) center no-repeat; } #scrollerFrame>QToolButton#rightButton { - image: url(:/tabbar/icons/scrolltab_rn.png) center no-repeat; + image: url(:/tabbar/icons/scrolltab_rn.svg) center no-repeat; } - #scrollerFrame>QToolButton#rightButton:disabled { - image: url(:/tabbar/icons/scrolltab_rd.png) center no-repeat; + image: url(:/tabbar/icons/scrolltab_rd.svg) center no-repeat; } - #scrollerFrame>QToolButton#rightButton:hover { - image: url(:/tabbar/icons/scrolltab_rh.png) center no-repeat; + image: url(:/tabbar/icons/scrolltab_rh.svg) center no-repeat; } - #scrollerFrame>QToolButton#rightButton:pressed { image: url(:/tabbar/icons/scrolltab_rp.png) center no-repeat; } +/* Dark */ +#mainPanel[uitheme=theme-dark] #scrollerFrame>QToolButton#leftButton { + image: url(:/tabbar/icons/scrolltab_ln_light.svg) center no-repeat; +} +#mainPanel[uitheme=theme-dark] #scrollerFrame>QToolButton#leftButton:disabled { + image: url(:/tabbar/icons/scrolltab_ld_light.svg) center no-repeat; +} +#mainPanel[uitheme=theme-dark] #scrollerFrame>QToolButton#leftButton:hover { + image: url(:/tabbar/icons/scrolltab_lh_light.svg) center no-repeat; +} +#mainPanel[uitheme=theme-dark] #scrollerFrame>QToolButton#leftButton:pressed { + image: url(:/tabbar/icons/scrolltab_lp_light.svg) center no-repeat; +} + + +#mainPanel[uitheme=theme-dark] #scrollerFrame>QToolButton#rightButton { + image: url(:/tabbar/icons/scrolltab_rn_light.svg) center no-repeat; +} +#mainPanel[uitheme=theme-dark] #scrollerFrame>QToolButton#rightButton:disabled { + image: url(:/tabbar/icons/scrolltab_rd_light.svg) center no-repeat; +} +#mainPanel[uitheme=theme-dark] #scrollerFrame>QToolButton#rightButton:hover { + image: url(:/tabbar/icons/scrolltab_rh_light.svg) center no-repeat; +} +#mainPanel[uitheme=theme-dark] #scrollerFrame>QToolButton#rightButton:pressed { + image: url(:/tabbar/icons/scrolltab_rp_light.svg) center no-repeat; +} + +/* Contrast-dark*/ +#mainPanel[uitheme=theme-contrast-dark] #scrollerFrame>QToolButton#leftButton { + image: url(:/tabbar/icons/scrolltab_ln_light.svg) center no-repeat; +} +#mainPanel[uitheme=theme-contrast-dark] #scrollerFrame>QToolButton#leftButton:disabled { + image: url(:/tabbar/icons/scrolltab_ld_light.svg) center no-repeat; +} +#mainPanel[uitheme=theme-contrast-dark] #scrollerFrame>QToolButton#leftButton:hover { + image: url(:/tabbar/icons/scrolltab_lh_light.svg) center no-repeat; +} +#mainPanel[uitheme=theme-contrast-dark] #scrollerFrame>QToolButton#leftButton:pressed { + image: url(:/tabbar/icons/scrolltab_lp_light.svg) center no-repeat; +} + + +#mainPanel[uitheme=theme-contrast-dark] #scrollerFrame>QToolButton#rightButton { + image: url(:/tabbar/icons/scrolltab_rn_light.svg) center no-repeat; +} +#mainPanel[uitheme=theme-contrast-dark] #scrollerFrame>QToolButton#rightButton:disabled { + image: url(:/tabbar/icons/scrolltab_rd_light.svg) center no-repeat; +} +#mainPanel[uitheme=theme-contrast-dark] #scrollerFrame>QToolButton#rightButton:hover { + image: url(:/tabbar/icons/scrolltab_rh_light.png) center no-repeat; +} +#mainPanel[uitheme=theme-contrast-dark] #scrollerFrame>QToolButton#rightButton:pressed { + image: url(:/tabbar/icons/scrolltab_rp_light.svg) center no-repeat; +} + + QPushButton#toolButtonMaximize, QPushButton#toolButtonMain, QPushButton#toolButtonMinimize, QPushButton#toolButtonClose, QPushButton#toolButtonDownload { diff --git a/win-linux/res/styles/styles@1.25x.qss b/win-linux/res/styles/styles@1.25x.qss index 9d63e2a7e..ce8a6cd6a 100644 --- a/win-linux/res/styles/styles@1.25x.qss +++ b/win-linux/res/styles/styles@1.25x.qss @@ -17,44 +17,16 @@ max-width: 48px; } -#scrollerFrame>QToolButton { - margin: 0px; - border: none; background-color: #f1f1f1; -} -#scrollerFrame>QToolButton:hover {background-color: #cecece;} -#scrollerFrame>QToolButton:pressed {background-color: #b7b7b7;} - -#scrollerFrame>QToolButton#leftButton { - image: url(:/tabbar/icons/scrolltab_ln_1.25x.png) center no-repeat; -} - -#scrollerFrame>QToolButton#leftButton:disabled { - image: url(:/tabbar/icons/scrolltab_ld_1.25x.png) center no-repeat; -} - -#scrollerFrame>QToolButton#leftButton:hover { - image: url(:/tabbar/icons/scrolltab_lh_1.25x.png) center no-repeat; -} #scrollerFrame>QToolButton#leftButton:pressed { image: url(:/tabbar/icons/scrolltab_lp_1.25x.png) center no-repeat; } -#scrollerFrame>QToolButton#rightButton { - image: url(:/tabbar/icons/scrolltab_rn_1.25x.png) center no-repeat; -} - -#scrollerFrame>QToolButton#rightButton:disabled { - image: url(:/tabbar/icons/scrolltab_rd_1.25x.png) center no-repeat; -} - -#scrollerFrame>QToolButton#rightButton:hover { - image: url(:/tabbar/icons/scrolltab_rh_1.25x.png) center no-repeat; -} #scrollerFrame>QToolButton#rightButton:pressed { image: url(:/tabbar/icons/scrolltab_rp_1.25x.png) center no-repeat; } + QPushButton#toolButtonDownload { padding: 7px; } diff --git a/win-linux/res/styles/styles@1.5x.qss b/win-linux/res/styles/styles@1.5x.qss index d6701dede..e34ea08cb 100644 --- a/win-linux/res/styles/styles@1.5x.qss +++ b/win-linux/res/styles/styles@1.5x.qss @@ -17,44 +17,16 @@ max-width: 48px; } -#scrollerFrame>QToolButton { - margin: 0px; - border: none; background-color: #f1f1f1; -} -#scrollerFrame>QToolButton:hover {background-color: #cecece;} -#scrollerFrame>QToolButton:pressed {background-color: #b7b7b7;} - -#scrollerFrame>QToolButton#leftButton { - image: url(:/tabbar/icons/scrolltab_ln_1.5x.png) center no-repeat; -} - -#scrollerFrame>QToolButton#leftButton:disabled { - image: url(:/tabbar/icons/scrolltab_ld_1.5x.png) center no-repeat; -} - -#scrollerFrame>QToolButton#leftButton:hover { - image: url(:/tabbar/icons/scrolltab_lh_1.5x.png) center no-repeat; -} #scrollerFrame>QToolButton#leftButton:pressed { image: url(:/tabbar/icons/scrolltab_lp_1.5x.png) center no-repeat; } -#scrollerFrame>QToolButton#rightButton { - image: url(:/tabbar/icons/scrolltab_rn_1.5x.png) center no-repeat; -} - -#scrollerFrame>QToolButton#rightButton:disabled { - image: url(:/tabbar/icons/scrolltab_rd_1.5x.png) center no-repeat; -} - -#scrollerFrame>QToolButton#rightButton:hover { - image: url(:/tabbar/icons/scrolltab_rh_1.5x.png) center no-repeat; -} #scrollerFrame>QToolButton#rightButton:pressed { image: url(:/tabbar/icons/scrolltab_rp_1.5x.png) center no-repeat; } + QPushButton#toolButtonDownload { padding: 9px; } diff --git a/win-linux/res/styles/styles@1.75x.qss b/win-linux/res/styles/styles@1.75x.qss index ed23f4600..3980e3b90 100644 --- a/win-linux/res/styles/styles@1.75x.qss +++ b/win-linux/res/styles/styles@1.75x.qss @@ -2,7 +2,6 @@ min-width: 350px; } - #labelAppTitle { margin-top: -4px; font-size: 20px; @@ -18,40 +17,12 @@ max-width: 64px; } -#scrollerFrame>QToolButton { - margin: 0px; - border: none; background-color: #f1f1f1; -} -#scrollerFrame>QToolButton:hover {background-color: #cecece;} -#scrollerFrame>QToolButton:pressed {background-color: #b7b7b7;} -#scrollerFrame>QToolButton#leftButton { - image: url(:/tabbar/icons/scrolltab_ln_1.75x.png) center no-repeat; -} - -#scrollerFrame>QToolButton#leftButton:disabled { - image: url(:/tabbar/icons/scrolltab_ld_1.75x.png) center no-repeat; -} - -#scrollerFrame>QToolButton#leftButton:hover { - image: url(:/tabbar/icons/scrolltab_lh_1.75x.png) center no-repeat; -} #scrollerFrame>QToolButton#leftButton:pressed { image: url(:/tabbar/icons/scrolltab_lp_1.75x.png) center no-repeat; } -#scrollerFrame>QToolButton#rightButton { - image: url(:/tabbar/icons/scrolltab_rn_1.75x.png) center no-repeat; -} - -#scrollerFrame>QToolButton#rightButton:disabled { - image: url(:/tabbar/icons/scrolltab_rd_1.75x.png) center no-repeat; -} - -#scrollerFrame>QToolButton#rightButton:hover { - image: url(:/tabbar/icons/scrolltab_rh_1.75x.png) center no-repeat; -} #scrollerFrame>QToolButton#rightButton:pressed { image: url(:/tabbar/icons/scrolltab_rp_1.75x.png) center no-repeat; diff --git a/win-linux/res/styles/styles@2x.qss b/win-linux/res/styles/styles@2x.qss index 4ef33a89d..48ff497aa 100644 --- a/win-linux/res/styles/styles@2x.qss +++ b/win-linux/res/styles/styles@2x.qss @@ -17,44 +17,16 @@ max-width: 64px; } -#scrollerFrame>QToolButton { - margin: 0px; - border: none; background-color: #f1f1f1; -} -#scrollerFrame>QToolButton:hover {background-color: #cecece;} -#scrollerFrame>QToolButton:pressed {background-color: #b7b7b7;} - -#scrollerFrame>QToolButton#leftButton { - image: url(:/tabbar/icons/scrolltab_ln_2x.png) center no-repeat; -} - -#scrollerFrame>QToolButton#leftButton:disabled { - image: url(:/tabbar/icons/scrolltab_ld_2x.png) center no-repeat; -} - -#scrollerFrame>QToolButton#leftButton:hover { - image: url(:/tabbar/icons/scrolltab_lh_2x.png) center no-repeat; -} #scrollerFrame>QToolButton#leftButton:pressed { image: url(:/tabbar/icons/scrolltab_lp_2x.png) center no-repeat; } -#scrollerFrame>QToolButton#rightButton { - image: url(:/tabbar/icons/scrolltab_rn_2x.png) center no-repeat; -} - -#scrollerFrame>QToolButton#rightButton:disabled { - image: url(:/tabbar/icons/scrolltab_rd_2x.png) center no-repeat; -} - -#scrollerFrame>QToolButton#rightButton:hover { - image: url(:/tabbar/icons/scrolltab_rh_2x.png) center no-repeat; -} #scrollerFrame>QToolButton#rightButton:pressed { image: url(:/tabbar/icons/scrolltab_rp_2x.png) center no-repeat; } + QPushButton#toolButtonDownload { padding: 12px; } diff --git a/win-linux/res/styles/tabbar@1.25x.qss b/win-linux/res/styles/tabbar@1.25x.qss index 6255b0a29..1d61b0d67 100644 --- a/win-linux/res/styles/tabbar@1.25x.qss +++ b/win-linux/res/styles/tabbar@1.25x.qss @@ -22,55 +22,3 @@ QTabBar[active=false]::tab:selected:hover {background-color: #cecece;} #mainPanel[uitheme=theme-dark] #scrollerFrame>QToolButton {background-color: #404040;} #mainPanel[uitheme=theme-dark] #scrollerFrame>QToolButton:hover {background-color: #555;} #mainPanel[uitheme=theme-dark] #scrollerFrame>QToolButton:pressed {background-color: #606060;} - -#mainPanel[uitheme=theme-dark] #scrollerFrame>QToolButton#leftButton { - image: url(:/tabbar/icons/scrolltab_ln_light_1.25x.png) center no-repeat; -} -#mainPanel[uitheme=theme-dark] #scrollerFrame>QToolButton#leftButton:disabled { - image: url(:/tabbar/icons/scrolltab_ld_light_1.25x.png) center no-repeat; -} -#mainPanel[uitheme=theme-dark] #scrollerFrame>QToolButton#leftButton:hover { - image: url(:/tabbar/icons/scrolltab_lh_light_1.25x.png) center no-repeat; -} -#mainPanel[uitheme=theme-dark] #scrollerFrame>QToolButton#leftButton:pressed { - image: url(:/tabbar/icons/scrolltab_lp_light_1.25x.png) center no-repeat; -} -#mainPanel[uitheme=theme-dark] #scrollerFrame>QToolButton#rightButton { - image: url(:/tabbar/icons/scrolltab_rn_light_1.25x.png) center no-repeat; -} -#mainPanel[uitheme=theme-dark] #scrollerFrame>QToolButton#rightButton:disabled { - image: url(:/tabbar/icons/scrolltab_rd_light_1.25x.png) center no-repeat; -} -#mainPanel[uitheme=theme-dark] #scrollerFrame>QToolButton#rightButton:hover { - image: url(:/tabbar/icons/scrolltab_rh_light_1.25x.png) center no-repeat; -} -#mainPanel[uitheme=theme-dark] #scrollerFrame>QToolButton#rightButton:pressed { - image: url(:/tabbar/icons/scrolltab_rp_light_1.25x.png) center no-repeat; -} - -/* Contrast-dark*/ - -#mainPanel[uitheme=theme-contrast-dark] #scrollerFrame>QToolButton#leftButton { - image: url(:/tabbar/icons/scrolltab_ln_light_1.25x.png) center no-repeat; -} -#mainPanel[uitheme=theme-contrast-dark] #scrollerFrame>QToolButton#leftButton:disabled { - image: url(:/tabbar/icons/scrolltab_ld_light_1.25x.png) center no-repeat; -} -#mainPanel[uitheme=theme-contrast-dark] #scrollerFrame>QToolButton#leftButton:hover { - image: url(:/tabbar/icons/scrolltab_lh_light_1.25x.png) center no-repeat; -} -#mainPanel[uitheme=theme-contrast-dark] #scrollerFrame>QToolButton#leftButton:pressed { - image: url(:/tabbar/icons/scrolltab_lp_light_1.25x.png) center no-repeat; -} -#mainPanel[uitheme=theme-contrast-dark] #scrollerFrame>QToolButton#rightButton { - image: url(:/tabbar/icons/scrolltab_rn_light_1.25x.png) center no-repeat; -} -#mainPanel[uitheme=theme-contrast-dark] #scrollerFrame>QToolButton#rightButton:disabled { - image: url(:/tabbar/icons/scrolltab_rd_light_1.25x.png) center no-repeat; -} -#mainPanel[uitheme=theme-contrast-dark] #scrollerFrame>QToolButton#rightButton:hover { - image: url(:/tabbar/icons/scrolltab_rh_light_1.25x.png) center no-repeat; -} -#mainPanel[uitheme=theme-contrast-dark] #scrollerFrame>QToolButton#rightButton:pressed { - image: url(:/tabbar/icons/scrolltab_rp_light_1.25x.png) center no-repeat; -} diff --git a/win-linux/res/styles/tabbar@1.5x.qss b/win-linux/res/styles/tabbar@1.5x.qss index 27854fd76..b929f7b37 100644 --- a/win-linux/res/styles/tabbar@1.5x.qss +++ b/win-linux/res/styles/tabbar@1.5x.qss @@ -22,55 +22,3 @@ QTabBar[active=false]::tab:selected:hover {background-color: #cecece;} #mainPanel[uitheme=theme-dark] #scrollerFrame>QToolButton {background-color: #404040;} #mainPanel[uitheme=theme-dark] #scrollerFrame>QToolButton:hover {background-color: #555;} #mainPanel[uitheme=theme-dark] #scrollerFrame>QToolButton:pressed {background-color: #606060;} - -#mainPanel[uitheme=theme-dark] #scrollerFrame>QToolButton#leftButton { - image: url(:/tabbar/icons/scrolltab_ln_light_1.5x.png) center no-repeat; -} -#mainPanel[uitheme=theme-dark] #scrollerFrame>QToolButton#leftButton:disabled { - image: url(:/tabbar/icons/scrolltab_ld_light_1.5x.png) center no-repeat; -} -#mainPanel[uitheme=theme-dark] #scrollerFrame>QToolButton#leftButton:hover { - image: url(:/tabbar/icons/scrolltab_lh_light_1.5x.png) center no-repeat; -} -#mainPanel[uitheme=theme-dark] #scrollerFrame>QToolButton#leftButton:pressed { - image: url(:/tabbar/icons/scrolltab_lp_light_1.5x.png) center no-repeat; -} -#mainPanel[uitheme=theme-dark] #scrollerFrame>QToolButton#rightButton { - image: url(:/tabbar/icons/scrolltab_rn_light_1.5x.png) center no-repeat; -} -#mainPanel[uitheme=theme-dark] #scrollerFrame>QToolButton#rightButton:disabled { - image: url(:/tabbar/icons/scrolltab_rd_light_1.5x.png) center no-repeat; -} -#mainPanel[uitheme=theme-dark] #scrollerFrame>QToolButton#rightButton:hover { - image: url(:/tabbar/icons/scrolltab_rh_light_1.5x.png) center no-repeat; -} -#mainPanel[uitheme=theme-dark] #scrollerFrame>QToolButton#rightButton:pressed { - image: url(:/tabbar/icons/scrolltab_rp_light_1.5x.png) center no-repeat; -} - -/* Contrast-dark*/ - -#mainPanel[uitheme=theme-contrast-dark] #scrollerFrame>QToolButton#leftButton { - image: url(:/tabbar/icons/scrolltab_ln_light_1.5x.png) center no-repeat; -} -#mainPanel[uitheme=theme-contrast-dark] #scrollerFrame>QToolButton#leftButton:disabled { - image: url(:/tabbar/icons/scrolltab_ld_light_1.5x.png) center no-repeat; -} -#mainPanel[uitheme=theme-contrast-dark] #scrollerFrame>QToolButton#leftButton:hover { - image: url(:/tabbar/icons/scrolltab_lh_light_1.5x.png) center no-repeat; -} -#mainPanel[uitheme=theme-contrast-dark] #scrollerFrame>QToolButton#leftButton:pressed { - image: url(:/tabbar/icons/scrolltab_lp_light_1.5x.png) center no-repeat; -} -#mainPanel[uitheme=theme-contrast-dark] #scrollerFrame>QToolButton#rightButton { - image: url(:/tabbar/icons/scrolltab_rn_light_1.5x.png) center no-repeat; -} -#mainPanel[uitheme=theme-contrast-dark] #scrollerFrame>QToolButton#rightButton:disabled { - image: url(:/tabbar/icons/scrolltab_rd_light_1.5x.png) center no-repeat; -} -#mainPanel[uitheme=theme-contrast-dark] #scrollerFrame>QToolButton#rightButton:hover { - image: url(:/tabbar/icons/scrolltab_rh_light_1.5x.png) center no-repeat; -} -#mainPanel[uitheme=theme-contrast-dark] #scrollerFrame>QToolButton#rightButton:pressed { - image: url(:/tabbar/icons/scrolltab_rp_light_1.5x.png) center no-repeat; -} diff --git a/win-linux/res/styles/tabbar@1.75x.qss b/win-linux/res/styles/tabbar@1.75x.qss index cb1fe82b1..9d9b7748d 100644 --- a/win-linux/res/styles/tabbar@1.75x.qss +++ b/win-linux/res/styles/tabbar@1.75x.qss @@ -22,55 +22,3 @@ QTabBar[active=false]::tab:selected:hover {background-color: #cecece;} #mainPanel[uitheme=theme-dark] #scrollerFrame>QToolButton {background-color: #404040;} #mainPanel[uitheme=theme-dark] #scrollerFrame>QToolButton:hover {background-color: #555;} #mainPanel[uitheme=theme-dark] #scrollerFrame>QToolButton:pressed {background-color: #606060;} - -#mainPanel[uitheme=theme-dark] #scrollerFrame>QToolButton#leftButton { - image: url(:/tabbar/icons/scrolltab_ln_light_1.75x.png) center no-repeat; -} -#mainPanel[uitheme=theme-dark] #scrollerFrame>QToolButton#leftButton:disabled { - image: url(:/tabbar/icons/scrolltab_ld_light_1.75x.png) center no-repeat; -} -#mainPanel[uitheme=theme-dark] #scrollerFrame>QToolButton#leftButton:hover { - image: url(:/tabbar/icons/scrolltab_lh_light_1.75x.png) center no-repeat; -} -#mainPanel[uitheme=theme-dark] #scrollerFrame>QToolButton#leftButton:pressed { - image: url(:/tabbar/icons/scrolltab_lp_light_1.75x.png) center no-repeat; -} -#mainPanel[uitheme=theme-dark] #scrollerFrame>QToolButton#rightButton { - image: url(:/tabbar/icons/scrolltab_rn_light_1.75x.png) center no-repeat; -} -#mainPanel[uitheme=theme-dark] #scrollerFrame>QToolButton#rightButton:disabled { - image: url(:/tabbar/icons/scrolltab_rd_light_1.75x.png) center no-repeat; -} -#mainPanel[uitheme=theme-dark] #scrollerFrame>QToolButton#rightButton:hover { - image: url(:/tabbar/icons/scrolltab_rh_light_1.75x.png) center no-repeat; -} -#mainPanel[uitheme=theme-dark] #scrollerFrame>QToolButton#rightButton:pressed { - image: url(:/tabbar/icons/scrolltab_rp_light_1.75x.png) center no-repeat; -} - -/* Contrast-dark*/ - -#mainPanel[uitheme=theme-contrast-dark] #scrollerFrame>QToolButton#leftButton { - image: url(:/tabbar/icons/scrolltab_ln_light_1.75x.png) center no-repeat; -} -#mainPanel[uitheme=theme-contrast-dark] #scrollerFrame>QToolButton#leftButton:disabled { - image: url(:/tabbar/icons/scrolltab_ld_light_1.75x.png) center no-repeat; -} -#mainPanel[uitheme=theme-contrast-dark] #scrollerFrame>QToolButton#leftButton:hover { - image: url(:/tabbar/icons/scrolltab_lh_light_1.75x.png) center no-repeat; -} -#mainPanel[uitheme=theme-contrast-dark] #scrollerFrame>QToolButton#leftButton:pressed { - image: url(:/tabbar/icons/scrolltab_lp_light_1.75x.png) center no-repeat; -} -#mainPanel[uitheme=theme-contrast-dark] #scrollerFrame>QToolButton#rightButton { - image: url(:/tabbar/icons/scrolltab_rn_light_1.75x.png) center no-repeat; -} -#mainPanel[uitheme=theme-contrast-dark] #scrollerFrame>QToolButton#rightButton:disabled { - image: url(:/tabbar/icons/scrolltab_rd_light_1.75x.png) center no-repeat; -} -#mainPanel[uitheme=theme-contrast-dark] #scrollerFrame>QToolButton#rightButton:hover { - image: url(:/tabbar/icons/scrolltab_rh_light_1.75x.png) center no-repeat; -} -#mainPanel[uitheme=theme-contrast-dark] #scrollerFrame>QToolButton#rightButton:pressed { - image: url(:/tabbar/icons/scrolltab_rp_light_1.75x.png) center no-repeat; -} diff --git a/win-linux/res/styles/tabbar@1x.qss b/win-linux/res/styles/tabbar@1x.qss index 160fa6bab..908043582 100644 --- a/win-linux/res/styles/tabbar@1x.qss +++ b/win-linux/res/styles/tabbar@1x.qss @@ -22,55 +22,3 @@ QTabBar[active=false]::tab:selected:hover {background-color: #cecece;} #mainPanel[uitheme=theme-dark] #scrollerFrame>QToolButton {background-color: #404040;} #mainPanel[uitheme=theme-dark] #scrollerFrame>QToolButton:hover {background-color: #555;} #mainPanel[uitheme=theme-dark] #scrollerFrame>QToolButton:pressed {background-color: #606060;} - -#mainPanel[uitheme=theme-dark] #scrollerFrame>QToolButton#leftButton { - image: url(:/tabbar/icons/scrolltab_ln_light.png) center no-repeat; -} -#mainPanel[uitheme=theme-dark] #scrollerFrame>QToolButton#leftButton:disabled { - image: url(:/tabbar/icons/scrolltab_ld_light.png) center no-repeat; -} -#mainPanel[uitheme=theme-dark] #scrollerFrame>QToolButton#leftButton:hover { - image: url(:/tabbar/icons/scrolltab_lh_light.png) center no-repeat; -} -#mainPanel[uitheme=theme-dark] #scrollerFrame>QToolButton#leftButton:pressed { - image: url(:/tabbar/icons/scrolltab_lp_light.png) center no-repeat; -} -#mainPanel[uitheme=theme-dark] #scrollerFrame>QToolButton#rightButton { - image: url(:/tabbar/icons/scrolltab_rn_light.png) center no-repeat; -} -#mainPanel[uitheme=theme-dark] #scrollerFrame>QToolButton#rightButton:disabled { - image: url(:/tabbar/icons/scrolltab_rd_light.png) center no-repeat; -} -#mainPanel[uitheme=theme-dark] #scrollerFrame>QToolButton#rightButton:hover { - image: url(:/tabbar/icons/scrolltab_rh_light.png) center no-repeat; -} -#mainPanel[uitheme=theme-dark] #scrollerFrame>QToolButton#rightButton:pressed { - image: url(:/tabbar/icons/scrolltab_rp_light.png) center no-repeat; -} - -/* Contrast-dark*/ - -#mainPanel[uitheme=theme-contrast-dark] #scrollerFrame>QToolButton#leftButton { - image: url(:/tabbar/icons/scrolltab_ln_light.png) center no-repeat; -} -#mainPanel[uitheme=theme-contrast-dark] #scrollerFrame>QToolButton#leftButton:disabled { - image: url(:/tabbar/icons/scrolltab_ld_light.png) center no-repeat; -} -#mainPanel[uitheme=theme-contrast-dark] #scrollerFrame>QToolButton#leftButton:hover { - image: url(:/tabbar/icons/scrolltab_lh_light.png) center no-repeat; -} -#mainPanel[uitheme=theme-contrast-dark] #scrollerFrame>QToolButton#leftButton:pressed { - image: url(:/tabbar/icons/scrolltab_lp_light.png) center no-repeat; -} -#mainPanel[uitheme=theme-contrast-dark] #scrollerFrame>QToolButton#rightButton { - image: url(:/tabbar/icons/scrolltab_rn_light.png) center no-repeat; -} -#mainPanel[uitheme=theme-contrast-dark] #scrollerFrame>QToolButton#rightButton:disabled { - image: url(:/tabbar/icons/scrolltab_rd_light.png) center no-repeat; -} -#mainPanel[uitheme=theme-contrast-dark] #scrollerFrame>QToolButton#rightButton:hover { - image: url(:/tabbar/icons/scrolltab_rh_light.png) center no-repeat; -} -#mainPanel[uitheme=theme-contrast-dark] #scrollerFrame>QToolButton#rightButton:pressed { - image: url(:/tabbar/icons/scrolltab_rp_light.png) center no-repeat; -} diff --git a/win-linux/res/styles/tabbar@2.5x.qss b/win-linux/res/styles/tabbar@2.5x.qss new file mode 100644 index 000000000..a1d3b8dd8 --- /dev/null +++ b/win-linux/res/styles/tabbar@2.5x.qss @@ -0,0 +1,24 @@ + +QTabWidget::pane {background-color: #f1f1f1; border: none;} +QTabBar::tab {width: 270px; background-color: #f1f1f1; border: 0 none; border-right: 2px solid #a5a5a5; min-width: 82px; max-width: 270px; +height: 56px; margin: 0 0 0 0;} +QTabBar::tab:hover {background-color: #cecece;} +QTabBar::tab-label {active: #fff; normal: #444;} +QTabBar::tab-icon {width: 15; height: 15;} +QTabBar[active=false]::tab:selected {background-color: #f1f1f1;} +QTabBar[active=true]::tab:selected {background-color: #f1f1f1;} +QTabBar[active=false]::tab:selected:hover {background-color: #cecece;} + +#mainPanel[uitheme=theme-light] QTabBar::tab {border-right-color:#dfdfdf;} + +#mainPanel[uitheme=theme-classic-light] QTabBar::tab {border-right-color:#cbcbcb;} + +#mainPanel[uitheme=theme-dark] QTabWidget::pane {background-color: #404040;} +#mainPanel[uitheme=theme-dark] QTabBar::tab {background-color: #404040; border-right-color: #505050;} +#mainPanel[uitheme=theme-dark] QTabBar::tab:hover {background-color: #555;} +#mainPanel[uitheme=theme-dark] QTabBar::tab:selected {background-color: #404040;} +#mainPanel[uitheme=theme-dark] QTabBar[active=false]::tab:selected:hover {background-color: #555;} + +#mainPanel[uitheme=theme-dark] #scrollerFrame>QToolButton {background-color: #404040;} +#mainPanel[uitheme=theme-dark] #scrollerFrame>QToolButton:hover {background-color: #555;} +#mainPanel[uitheme=theme-dark] #scrollerFrame>QToolButton:pressed {background-color: #606060;} diff --git a/win-linux/res/styles/tabbar@2x.qss b/win-linux/res/styles/tabbar@2x.qss index fee931377..a1d3b8dd8 100644 --- a/win-linux/res/styles/tabbar@2x.qss +++ b/win-linux/res/styles/tabbar@2x.qss @@ -22,55 +22,3 @@ QTabBar[active=false]::tab:selected:hover {background-color: #cecece;} #mainPanel[uitheme=theme-dark] #scrollerFrame>QToolButton {background-color: #404040;} #mainPanel[uitheme=theme-dark] #scrollerFrame>QToolButton:hover {background-color: #555;} #mainPanel[uitheme=theme-dark] #scrollerFrame>QToolButton:pressed {background-color: #606060;} - -#mainPanel[uitheme=theme-dark] #scrollerFrame>QToolButton#leftButton { - image: url(:/tabbar/icons/scrolltab_ln_light_2x.png) center no-repeat; -} -#mainPanel[uitheme=theme-dark] #scrollerFrame>QToolButton#leftButton:disabled { - image: url(:/tabbar/icons/scrolltab_ld_light_2x.png) center no-repeat; -} -#mainPanel[uitheme=theme-dark] #scrollerFrame>QToolButton#leftButton:hover { - image: url(:/tabbar/icons/scrolltab_lh_light_2x.png) center no-repeat; -} -#mainPanel[uitheme=theme-dark] #scrollerFrame>QToolButton#leftButton:pressed { - image: url(:/tabbar/icons/scrolltab_lp_light_2x.png) center no-repeat; -} -#mainPanel[uitheme=theme-dark] #scrollerFrame>QToolButton#rightButton { - image: url(:/tabbar/icons/scrolltab_rn_light_2x.png) center no-repeat; -} -#mainPanel[uitheme=theme-dark] #scrollerFrame>QToolButton#rightButton:disabled { - image: url(:/tabbar/icons/scrolltab_rd_light_2x.png) center no-repeat; -} -#mainPanel[uitheme=theme-dark] #scrollerFrame>QToolButton#rightButton:hover { - image: url(:/tabbar/icons/scrolltab_rh_light_2x.png) center no-repeat; -} -#mainPanel[uitheme=theme-dark] #scrollerFrame>QToolButton#rightButton:pressed { - image: url(:/tabbar/icons/scrolltab_rp_light_2x.png) center no-repeat; -} - -/* Contrast-dark*/ - -#mainPanel[uitheme=theme-contrast-dark] #scrollerFrame>QToolButton#leftButton { - image: url(:/tabbar/icons/scrolltab_ln_light_2x.png) center no-repeat; -} -#mainPanel[uitheme=theme-contrast-dark] #scrollerFrame>QToolButton#leftButton:disabled { - image: url(:/tabbar/icons/scrolltab_ld_light_2x.png) center no-repeat; -} -#mainPanel[uitheme=theme-contrast-dark] #scrollerFrame>QToolButton#leftButton:hover { - image: url(:/tabbar/icons/scrolltab_lh_light_2x.png) center no-repeat; -} -#mainPanel[uitheme=theme-contrast-dark] #scrollerFrame>QToolButton#leftButton:pressed { - image: url(:/tabbar/icons/scrolltab_lp_light_2x.png) center no-repeat; -} -#mainPanel[uitheme=theme-contrast-dark] #scrollerFrame>QToolButton#rightButton { - image: url(:/tabbar/icons/scrolltab_rn_light_2x.png) center no-repeat; -} -#mainPanel[uitheme=theme-contrast-dark] #scrollerFrame>QToolButton#rightButton:disabled { - image: url(:/tabbar/icons/scrolltab_rd_light_2x.png) center no-repeat; -} -#mainPanel[uitheme=theme-contrast-dark] #scrollerFrame>QToolButton#rightButton:hover { - image: url(:/tabbar/icons/scrolltab_rh_light_2x.png) center no-repeat; -} -#mainPanel[uitheme=theme-contrast-dark] #scrollerFrame>QToolButton#rightButton:pressed { - image: url(:/tabbar/icons/scrolltab_rp_light_2x.png) center no-repeat; -} diff --git a/win-linux/resources.qrc b/win-linux/resources.qrc index 1e6bd8455..16d96e4be 100644 --- a/win-linux/resources.qrc +++ b/win-linux/resources.qrc @@ -183,13 +183,27 @@ res/icons/tabbar/tab_close_light@1.5x.png res/icons/tabbar/tab_close_light@1.25x.png res/icons/tabbar/tab_close_light@2x.png + res/icons/tabbar/scroll_left_normal_light.svg + res/icons/tabbar/scroll_left_disabled_light.svg + res/icons/tabbar/scroll_left_hover_light.svg + res/icons/tabbar/scroll_left_pressed_light.svg + res/icons/tabbar/scroll_right_normal_light.svg + res/icons/tabbar/scroll_right_disabled_light.svg + res/icons/tabbar/scroll_right_hover_light.svg + res/icons/tabbar/scroll_right_pressed_light.svg + res/icons/tabbar/scroll_left_normal.svg + res/icons/tabbar/scroll_left_disabled.svg + res/icons/tabbar/scroll_left_hover.svg + res/icons/tabbar/scroll_right_normal.svg + res/icons/tabbar/scroll_right_disabled.svg + res/icons/tabbar/scroll_right_hover.svg res/icons/webeditor/buttons.svg res/icons/webeditor/secureicon.svg - res/styles/styles.qss + res/styles/styles.qss res/styles/message.qss @@ -256,6 +270,7 @@ res/styles/tabbar@1.75x.qss res/styles/tabbar@2x.qss res/styles/tabbar_nix@2x.qss + res/styles/tabbar@2.5x.qss res/styles/theme-light.json diff --git a/win-linux/src/cascapplicationmanagerwrapper.cpp b/win-linux/src/cascapplicationmanagerwrapper.cpp index 8eed8a568..35a51a2bf 100644 --- a/win-linux/src/cascapplicationmanagerwrapper.cpp +++ b/win-linux/src/cascapplicationmanagerwrapper.cpp @@ -1112,7 +1112,7 @@ void CAscApplicationManagerWrapper::initializeApp() } } - _app.addStylesheets(CScalingFactor::SCALING_FACTOR_1, ":styles/res/styles/styles.qss"); + _app.addStylesheets(CScalingFactor::SCALING_FACTOR_1, ":styles/styles.qss"); _app.addStylesheets(CScalingFactor::SCALING_FACTOR_1_25, ":styles@1.25x/styles.qss"); _app.addStylesheets(CScalingFactor::SCALING_FACTOR_1_5, ":styles@1.5x/styles.qss"); _app.addStylesheets(CScalingFactor::SCALING_FACTOR_1_75, ":styles@1.75x/styles.qss"); @@ -1121,7 +1121,7 @@ void CAscApplicationManagerWrapper::initializeApp() _app.m_private->applyStylesheets(); // TODO: merge stylesheets and apply for the whole app - qApp->setStyleSheet( Utils::readStylesheets(":styles/res/styles/styles.qss") ); + qApp->setStyleSheet( Utils::readStylesheets(":styles/styles.qss") ); // Font QFont mainFont = QApplication::font();