diff --git a/stuff/config/qss/gray_048/gray_048.less b/stuff/config/qss/gray_048/gray_048.less index c170ed2..84eee18 100644 --- a/stuff/config/qss/gray_048/gray_048.less +++ b/stuff/config/qss/gray_048/gray_048.less @@ -1,4 +1,4 @@ - +// out: gray_048.qss /* LESS Definitions */ /*Image URL*/ @@ -821,30 +821,29 @@ ParamsPage { } } /* Customize QScrollBar vertical*/ -#XsheetScrollBar { - .baseBG(light, 10%); +QScrollBar { border: 1px solid black; &:vertical { - width: 18px; - .set_margin( 0px, 20px ); + width: 16px; + .set_margin( 0px, 16px ); } &:horizontal { - height: 18px; - .set_margin( 20px, 0px ); + height: 16px; + .set_margin( 16px, 0px ); } &::handle { - border-width: 4; + border-width: 3; image-position: center center; &:vertical { - border-image: url("@{image_url}/sb_g_vhandle.png")4; + border-image: url("@{image_url}/sb_g_vhandle.png")3; image: url("@{image_url}/sb_g_vline.png"); min-height: 40px; } &:horizontal { - border-image: url("@{image_url}/sb_g_hhandle.png")4; + border-image: url("@{image_url}/sb_g_hhandle.png")3; image: url("@{image_url}/sb_g_hline.png"); min-width: 40px; } @@ -854,7 +853,7 @@ ParamsPage { subcontrol-origin: margin; &:vertical { image: url("@{image_url}/sb_g_downarrow.png"); - height: 20px; + height: 16px; subcontrol-position: bottom; &:pressed { image: url("@{image_url}/sb_g_downarrow_pressed.png"); @@ -862,7 +861,7 @@ ParamsPage { } &:horizontal { image: url("@{image_url}/sb_g_rarrow.png"); - width: 20px; + width: 16px; subcontrol-position: right; &:pressed{ image: url("@{image_url}/sb_g_rarrow_pressed.png"); @@ -874,7 +873,7 @@ ParamsPage { subcontrol-origin: margin; &:vertical { image: url("@{image_url}/sb_g_uparrow.png"); - height: 20px; + height: 16px; subcontrol-position: top; &:pressed { image: url("@{image_url}/sb_g_uparrow_pressed.png"); @@ -882,7 +881,7 @@ ParamsPage { } &:horizontal { image: url("@{image_url}/sb_g_larrow.png"); - width: 20px; + width: 16px; subcontrol-position: left; &:pressed{ image: url("@{image_url}/sb_g_larrow_pressed.png"); @@ -890,8 +889,8 @@ ParamsPage { } } - &::add-page { - background: none; + &::add-page, &::sub-page { + .baseBG(light, 10%); } } diff --git a/stuff/config/qss/gray_048/gray_048.qss b/stuff/config/qss/gray_048/gray_048.qss index 0c17daf..b1a2239 100644 --- a/stuff/config/qss/gray_048/gray_048.qss +++ b/stuff/config/qss/gray_048/gray_048.qss @@ -841,79 +841,79 @@ ParamsPage { background-color: #000080; } /* Customize QScrollBar vertical*/ -#XsheetScrollBar { - background-color: #4a4a4a; +QScrollBar { border: 1px solid black; /* buttons */ } -#XsheetScrollBar:vertical { - width: 18px; +QScrollBar:vertical { + width: 16px; margin-left: 0px; margin-right: 0px; - margin-top: 20px; - margin-bottom: 20px; + margin-top: 16px; + margin-bottom: 16px; } -#XsheetScrollBar:horizontal { - height: 18px; - margin-left: 20px; - margin-right: 20px; +QScrollBar:horizontal { + height: 16px; + margin-left: 16px; + margin-right: 16px; margin-top: 0px; margin-bottom: 0px; } -#XsheetScrollBar::handle { - border-width: 4; +QScrollBar::handle { + border-width: 3; image-position: center center; } -#XsheetScrollBar::handle:vertical { - border-image: url("../gray_072/imgs/sb_g_vhandle.png") 4; +QScrollBar::handle:vertical { + border-image: url("../gray_072/imgs/sb_g_vhandle.png") 3; image: url("../gray_072/imgs/sb_g_vline.png"); min-height: 40px; } -#XsheetScrollBar::handle:horizontal { - border-image: url("../gray_072/imgs/sb_g_hhandle.png") 4; +QScrollBar::handle:horizontal { + border-image: url("../gray_072/imgs/sb_g_hhandle.png") 3; image: url("../gray_072/imgs/sb_g_hline.png"); min-width: 40px; } -#XsheetScrollBar::add-line { +QScrollBar::add-line { subcontrol-origin: margin; } -#XsheetScrollBar::add-line:vertical { +QScrollBar::add-line:vertical { image: url("../gray_072/imgs/sb_g_downarrow.png"); - height: 20px; + height: 16px; subcontrol-position: bottom; } -#XsheetScrollBar::add-line:vertical:pressed { +QScrollBar::add-line:vertical:pressed { image: url("../gray_072/imgs/sb_g_downarrow_pressed.png"); } -#XsheetScrollBar::add-line:horizontal { +QScrollBar::add-line:horizontal { image: url("../gray_072/imgs/sb_g_rarrow.png"); - width: 20px; + width: 16px; subcontrol-position: right; } -#XsheetScrollBar::add-line:horizontal:pressed { +QScrollBar::add-line:horizontal:pressed { image: url("../gray_072/imgs/sb_g_rarrow_pressed.png"); } -#XsheetScrollBar::sub-line { +QScrollBar::sub-line { subcontrol-origin: margin; } -#XsheetScrollBar::sub-line:vertical { +QScrollBar::sub-line:vertical { image: url("../gray_072/imgs/sb_g_uparrow.png"); - height: 20px; + height: 16px; subcontrol-position: top; } -#XsheetScrollBar::sub-line:vertical:pressed { +QScrollBar::sub-line:vertical:pressed { image: url("../gray_072/imgs/sb_g_uparrow_pressed.png"); } -#XsheetScrollBar::sub-line:horizontal { +QScrollBar::sub-line:horizontal { image: url("../gray_072/imgs/sb_g_larrow.png"); - width: 20px; + width: 16px; subcontrol-position: left; } -#XsheetScrollBar::sub-line:horizontal:pressed { +QScrollBar::sub-line:horizontal:pressed { image: url("../gray_072/imgs/sb_g_larrow_pressed.png"); } -#XsheetScrollBar::add-page { - background: none; +QScrollBar::add-page, +QScrollBar::sub-page { + background-color: #4a4a4a; } #noteTextEdit { color: black; diff --git a/stuff/config/qss/gray_048/gray_048_mac.qss b/stuff/config/qss/gray_048/gray_048_mac.qss index 1217245..23babcd 100644 --- a/stuff/config/qss/gray_048/gray_048_mac.qss +++ b/stuff/config/qss/gray_048/gray_048_mac.qss @@ -841,79 +841,79 @@ ParamsPage { background-color: #000080; } /* Customize QScrollBar vertical*/ -#XsheetScrollBar { - background-color: #4a4a4a; +QScrollBar { border: 1px solid black; /* buttons */ } -#XsheetScrollBar:vertical { - width: 18px; +QScrollBar:vertical { + width: 16px; margin-left: 0px; margin-right: 0px; - margin-top: 20px; - margin-bottom: 20px; + margin-top: 16px; + margin-bottom: 16px; } -#XsheetScrollBar:horizontal { - height: 18px; - margin-left: 20px; - margin-right: 20px; +QScrollBar:horizontal { + height: 16px; + margin-left: 16px; + margin-right: 16px; margin-top: 0px; margin-bottom: 0px; } -#XsheetScrollBar::handle { - border-width: 4; +QScrollBar::handle { + border-width: 3; image-position: center center; } -#XsheetScrollBar::handle:vertical { - border-image: url("../gray_072/imgs/sb_g_vhandle.png") 4; +QScrollBar::handle:vertical { + border-image: url("../gray_072/imgs/sb_g_vhandle.png") 3; image: url("../gray_072/imgs/sb_g_vline.png"); min-height: 40px; } -#XsheetScrollBar::handle:horizontal { - border-image: url("../gray_072/imgs/sb_g_hhandle.png") 4; +QScrollBar::handle:horizontal { + border-image: url("../gray_072/imgs/sb_g_hhandle.png") 3; image: url("../gray_072/imgs/sb_g_hline.png"); min-width: 40px; } -#XsheetScrollBar::add-line { +QScrollBar::add-line { subcontrol-origin: margin; } -#XsheetScrollBar::add-line:vertical { +QScrollBar::add-line:vertical { image: url("../gray_072/imgs/sb_g_downarrow.png"); - height: 20px; + height: 16px; subcontrol-position: bottom; } -#XsheetScrollBar::add-line:vertical:pressed { +QScrollBar::add-line:vertical:pressed { image: url("../gray_072/imgs/sb_g_downarrow_pressed.png"); } -#XsheetScrollBar::add-line:horizontal { +QScrollBar::add-line:horizontal { image: url("../gray_072/imgs/sb_g_rarrow.png"); - width: 20px; + width: 16px; subcontrol-position: right; } -#XsheetScrollBar::add-line:horizontal:pressed { +QScrollBar::add-line:horizontal:pressed { image: url("../gray_072/imgs/sb_g_rarrow_pressed.png"); } -#XsheetScrollBar::sub-line { +QScrollBar::sub-line { subcontrol-origin: margin; } -#XsheetScrollBar::sub-line:vertical { +QScrollBar::sub-line:vertical { image: url("../gray_072/imgs/sb_g_uparrow.png"); - height: 20px; + height: 16px; subcontrol-position: top; } -#XsheetScrollBar::sub-line:vertical:pressed { +QScrollBar::sub-line:vertical:pressed { image: url("../gray_072/imgs/sb_g_uparrow_pressed.png"); } -#XsheetScrollBar::sub-line:horizontal { +QScrollBar::sub-line:horizontal { image: url("../gray_072/imgs/sb_g_larrow.png"); - width: 20px; + width: 16px; subcontrol-position: left; } -#XsheetScrollBar::sub-line:horizontal:pressed { +QScrollBar::sub-line:horizontal:pressed { image: url("../gray_072/imgs/sb_g_larrow_pressed.png"); } -#XsheetScrollBar::add-page { - background: none; +QScrollBar::add-page, +QScrollBar::sub-page { + background-color: #4a4a4a; } #noteTextEdit { color: black; diff --git a/stuff/config/qss/gray_072/gray_072.less b/stuff/config/qss/gray_072/gray_072.less index 60044ee..7cb9432 100644 --- a/stuff/config/qss/gray_072/gray_072.less +++ b/stuff/config/qss/gray_072/gray_072.less @@ -821,30 +821,29 @@ ParamsPage { } } /* Customize QScrollBar vertical*/ -#XsheetScrollBar { - .baseBG(light, 10%); +QScrollBar { border: 1px solid black; &:vertical { - width: 18px; - .set_margin( 0px, 20px ); + width: 16px; + .set_margin( 0px, 16px ); } &:horizontal { - height: 18px; - .set_margin( 20px, 0px ); + height: 16px; + .set_margin( 16px, 0px ); } &::handle { - border-width: 4; + border-width: 3; image-position: center center; &:vertical { - border-image: url("@{image_url}/sb_g_vhandle.png")4; + border-image: url("@{image_url}/sb_g_vhandle.png")3; image: url("@{image_url}/sb_g_vline.png"); min-height: 40px; } &:horizontal { - border-image: url("@{image_url}/sb_g_hhandle.png")4; + border-image: url("@{image_url}/sb_g_hhandle.png")3; image: url("@{image_url}/sb_g_hline.png"); min-width: 40px; } @@ -854,7 +853,7 @@ ParamsPage { subcontrol-origin: margin; &:vertical { image: url("@{image_url}/sb_g_downarrow.png"); - height: 20px; + height: 16px; subcontrol-position: bottom; &:pressed { image: url("@{image_url}/sb_g_downarrow_pressed.png"); @@ -862,7 +861,7 @@ ParamsPage { } &:horizontal { image: url("@{image_url}/sb_g_rarrow.png"); - width: 20px; + width: 16px; subcontrol-position: right; &:pressed{ image: url("@{image_url}/sb_g_rarrow_pressed.png"); @@ -874,7 +873,7 @@ ParamsPage { subcontrol-origin: margin; &:vertical { image: url("@{image_url}/sb_g_uparrow.png"); - height: 20px; + height: 16px; subcontrol-position: top; &:pressed { image: url("@{image_url}/sb_g_uparrow_pressed.png"); @@ -882,7 +881,7 @@ ParamsPage { } &:horizontal { image: url("@{image_url}/sb_g_larrow.png"); - width: 20px; + width: 16px; subcontrol-position: left; &:pressed{ image: url("@{image_url}/sb_g_larrow_pressed.png"); @@ -890,8 +889,8 @@ ParamsPage { } } - &::add-page { - background: none; + &::add-page, &::sub-page { + .baseBG(light, 10%); } } diff --git a/stuff/config/qss/gray_072/gray_072.qss b/stuff/config/qss/gray_072/gray_072.qss index 824600c..84bb341 100644 --- a/stuff/config/qss/gray_072/gray_072.qss +++ b/stuff/config/qss/gray_072/gray_072.qss @@ -841,79 +841,79 @@ ParamsPage { background-color: #000080; } /* Customize QScrollBar vertical*/ -#XsheetScrollBar { - background-color: #626262; +QScrollBar { border: 1px solid black; /* buttons */ } -#XsheetScrollBar:vertical { - width: 18px; +QScrollBar:vertical { + width: 16px; margin-left: 0px; margin-right: 0px; - margin-top: 20px; - margin-bottom: 20px; + margin-top: 16px; + margin-bottom: 16px; } -#XsheetScrollBar:horizontal { - height: 18px; - margin-left: 20px; - margin-right: 20px; +QScrollBar:horizontal { + height: 16px; + margin-left: 16px; + margin-right: 16px; margin-top: 0px; margin-bottom: 0px; } -#XsheetScrollBar::handle { - border-width: 4; +QScrollBar::handle { + border-width: 3; image-position: center center; } -#XsheetScrollBar::handle:vertical { - border-image: url("imgs/sb_g_vhandle.png") 4; +QScrollBar::handle:vertical { + border-image: url("imgs/sb_g_vhandle.png") 3; image: url("imgs/sb_g_vline.png"); min-height: 40px; } -#XsheetScrollBar::handle:horizontal { - border-image: url("imgs/sb_g_hhandle.png") 4; +QScrollBar::handle:horizontal { + border-image: url("imgs/sb_g_hhandle.png") 3; image: url("imgs/sb_g_hline.png"); min-width: 40px; } -#XsheetScrollBar::add-line { +QScrollBar::add-line { subcontrol-origin: margin; } -#XsheetScrollBar::add-line:vertical { +QScrollBar::add-line:vertical { image: url("imgs/sb_g_downarrow.png"); - height: 20px; + height: 16px; subcontrol-position: bottom; } -#XsheetScrollBar::add-line:vertical:pressed { +QScrollBar::add-line:vertical:pressed { image: url("imgs/sb_g_downarrow_pressed.png"); } -#XsheetScrollBar::add-line:horizontal { +QScrollBar::add-line:horizontal { image: url("imgs/sb_g_rarrow.png"); - width: 20px; + width: 16px; subcontrol-position: right; } -#XsheetScrollBar::add-line:horizontal:pressed { +QScrollBar::add-line:horizontal:pressed { image: url("imgs/sb_g_rarrow_pressed.png"); } -#XsheetScrollBar::sub-line { +QScrollBar::sub-line { subcontrol-origin: margin; } -#XsheetScrollBar::sub-line:vertical { +QScrollBar::sub-line:vertical { image: url("imgs/sb_g_uparrow.png"); - height: 20px; + height: 16px; subcontrol-position: top; } -#XsheetScrollBar::sub-line:vertical:pressed { +QScrollBar::sub-line:vertical:pressed { image: url("imgs/sb_g_uparrow_pressed.png"); } -#XsheetScrollBar::sub-line:horizontal { +QScrollBar::sub-line:horizontal { image: url("imgs/sb_g_larrow.png"); - width: 20px; + width: 16px; subcontrol-position: left; } -#XsheetScrollBar::sub-line:horizontal:pressed { +QScrollBar::sub-line:horizontal:pressed { image: url("imgs/sb_g_larrow_pressed.png"); } -#XsheetScrollBar::add-page { - background: none; +QScrollBar::add-page, +QScrollBar::sub-page { + background-color: #626262; } #noteTextEdit { color: black; diff --git a/stuff/config/qss/gray_072/gray_072_mac.qss b/stuff/config/qss/gray_072/gray_072_mac.qss index 3c89f26..ec73907 100644 --- a/stuff/config/qss/gray_072/gray_072_mac.qss +++ b/stuff/config/qss/gray_072/gray_072_mac.qss @@ -841,79 +841,79 @@ ParamsPage { background-color: #000080; } /* Customize QScrollBar vertical*/ -#XsheetScrollBar { - background-color: #626262; +QScrollBar { border: 1px solid black; /* buttons */ } -#XsheetScrollBar:vertical { - width: 18px; +QScrollBar:vertical { + width: 16px; margin-left: 0px; margin-right: 0px; - margin-top: 20px; - margin-bottom: 20px; + margin-top: 16px; + margin-bottom: 16px; } -#XsheetScrollBar:horizontal { - height: 18px; - margin-left: 20px; - margin-right: 20px; +QScrollBar:horizontal { + height: 16px; + margin-left: 16px; + margin-right: 16px; margin-top: 0px; margin-bottom: 0px; } -#XsheetScrollBar::handle { - border-width: 4; +QScrollBar::handle { + border-width: 3; image-position: center center; } -#XsheetScrollBar::handle:vertical { - border-image: url("imgs/sb_g_vhandle.png") 4; +QScrollBar::handle:vertical { + border-image: url("imgs/sb_g_vhandle.png") 3; image: url("imgs/sb_g_vline.png"); min-height: 40px; } -#XsheetScrollBar::handle:horizontal { - border-image: url("imgs/sb_g_hhandle.png") 4; +QScrollBar::handle:horizontal { + border-image: url("imgs/sb_g_hhandle.png") 3; image: url("imgs/sb_g_hline.png"); min-width: 40px; } -#XsheetScrollBar::add-line { +QScrollBar::add-line { subcontrol-origin: margin; } -#XsheetScrollBar::add-line:vertical { +QScrollBar::add-line:vertical { image: url("imgs/sb_g_downarrow.png"); - height: 20px; + height: 16px; subcontrol-position: bottom; } -#XsheetScrollBar::add-line:vertical:pressed { +QScrollBar::add-line:vertical:pressed { image: url("imgs/sb_g_downarrow_pressed.png"); } -#XsheetScrollBar::add-line:horizontal { +QScrollBar::add-line:horizontal { image: url("imgs/sb_g_rarrow.png"); - width: 20px; + width: 16px; subcontrol-position: right; } -#XsheetScrollBar::add-line:horizontal:pressed { +QScrollBar::add-line:horizontal:pressed { image: url("imgs/sb_g_rarrow_pressed.png"); } -#XsheetScrollBar::sub-line { +QScrollBar::sub-line { subcontrol-origin: margin; } -#XsheetScrollBar::sub-line:vertical { +QScrollBar::sub-line:vertical { image: url("imgs/sb_g_uparrow.png"); - height: 20px; + height: 16px; subcontrol-position: top; } -#XsheetScrollBar::sub-line:vertical:pressed { +QScrollBar::sub-line:vertical:pressed { image: url("imgs/sb_g_uparrow_pressed.png"); } -#XsheetScrollBar::sub-line:horizontal { +QScrollBar::sub-line:horizontal { image: url("imgs/sb_g_larrow.png"); - width: 20px; + width: 16px; subcontrol-position: left; } -#XsheetScrollBar::sub-line:horizontal:pressed { +QScrollBar::sub-line:horizontal:pressed { image: url("imgs/sb_g_larrow_pressed.png"); } -#XsheetScrollBar::add-page { - background: none; +QScrollBar::add-page, +QScrollBar::sub-page { + background-color: #626262; } #noteTextEdit { color: black; diff --git a/stuff/config/qss/gray_072/imgs/sb_g_downarrow.png b/stuff/config/qss/gray_072/imgs/sb_g_downarrow.png index cb7c0de..406effb 100644 Binary files a/stuff/config/qss/gray_072/imgs/sb_g_downarrow.png and b/stuff/config/qss/gray_072/imgs/sb_g_downarrow.png differ diff --git a/stuff/config/qss/gray_072/imgs/sb_g_downarrow_pressed.png b/stuff/config/qss/gray_072/imgs/sb_g_downarrow_pressed.png index 04fe449..70df3a6 100644 Binary files a/stuff/config/qss/gray_072/imgs/sb_g_downarrow_pressed.png and b/stuff/config/qss/gray_072/imgs/sb_g_downarrow_pressed.png differ diff --git a/stuff/config/qss/gray_072/imgs/sb_g_larrow.png b/stuff/config/qss/gray_072/imgs/sb_g_larrow.png index 686f566..01d4162 100644 Binary files a/stuff/config/qss/gray_072/imgs/sb_g_larrow.png and b/stuff/config/qss/gray_072/imgs/sb_g_larrow.png differ diff --git a/stuff/config/qss/gray_072/imgs/sb_g_larrow_pressed.png b/stuff/config/qss/gray_072/imgs/sb_g_larrow_pressed.png index 1450404..0f83f2a 100644 Binary files a/stuff/config/qss/gray_072/imgs/sb_g_larrow_pressed.png and b/stuff/config/qss/gray_072/imgs/sb_g_larrow_pressed.png differ diff --git a/stuff/config/qss/gray_072/imgs/sb_g_ls_downarrow.png b/stuff/config/qss/gray_072/imgs/sb_g_ls_downarrow.png deleted file mode 100644 index 406effb..0000000 Binary files a/stuff/config/qss/gray_072/imgs/sb_g_ls_downarrow.png and /dev/null differ diff --git a/stuff/config/qss/gray_072/imgs/sb_g_ls_downarrow_pressed.png b/stuff/config/qss/gray_072/imgs/sb_g_ls_downarrow_pressed.png deleted file mode 100644 index 70df3a6..0000000 Binary files a/stuff/config/qss/gray_072/imgs/sb_g_ls_downarrow_pressed.png and /dev/null differ diff --git a/stuff/config/qss/gray_072/imgs/sb_g_ls_uparrow.png b/stuff/config/qss/gray_072/imgs/sb_g_ls_uparrow.png deleted file mode 100644 index 5979c72..0000000 Binary files a/stuff/config/qss/gray_072/imgs/sb_g_ls_uparrow.png and /dev/null differ diff --git a/stuff/config/qss/gray_072/imgs/sb_g_ls_uparrow_pressed.png b/stuff/config/qss/gray_072/imgs/sb_g_ls_uparrow_pressed.png deleted file mode 100644 index eb84176..0000000 Binary files a/stuff/config/qss/gray_072/imgs/sb_g_ls_uparrow_pressed.png and /dev/null differ diff --git a/stuff/config/qss/gray_072/imgs/sb_g_rarrow.png b/stuff/config/qss/gray_072/imgs/sb_g_rarrow.png index 29f6518..4c997fc 100644 Binary files a/stuff/config/qss/gray_072/imgs/sb_g_rarrow.png and b/stuff/config/qss/gray_072/imgs/sb_g_rarrow.png differ diff --git a/stuff/config/qss/gray_072/imgs/sb_g_rarrow_pressed.png b/stuff/config/qss/gray_072/imgs/sb_g_rarrow_pressed.png index 2fa0aef..579f8f9 100644 Binary files a/stuff/config/qss/gray_072/imgs/sb_g_rarrow_pressed.png and b/stuff/config/qss/gray_072/imgs/sb_g_rarrow_pressed.png differ diff --git a/stuff/config/qss/gray_072/imgs/sb_g_uparrow.png b/stuff/config/qss/gray_072/imgs/sb_g_uparrow.png index 16c8136..5979c72 100644 Binary files a/stuff/config/qss/gray_072/imgs/sb_g_uparrow.png and b/stuff/config/qss/gray_072/imgs/sb_g_uparrow.png differ diff --git a/stuff/config/qss/gray_072/imgs/sb_g_uparrow_pressed.png b/stuff/config/qss/gray_072/imgs/sb_g_uparrow_pressed.png index 95224d9..eb84176 100644 Binary files a/stuff/config/qss/gray_072/imgs/sb_g_uparrow_pressed.png and b/stuff/config/qss/gray_072/imgs/sb_g_uparrow_pressed.png differ diff --git a/stuff/config/qss/gray_128/gray_128.less b/stuff/config/qss/gray_128/gray_128.less index 168a281..31fa3db 100644 --- a/stuff/config/qss/gray_128/gray_128.less +++ b/stuff/config/qss/gray_128/gray_128.less @@ -1,3 +1,4 @@ +// out: gray_128.qss /* LESS Definitions */ /*Image URL*/ @@ -661,30 +662,29 @@ ParamsPage { } } /* Customize QScrollBar vertical*/ -#XsheetScrollBar { - background-color: rgb(160,160,160); +QScrollBar { border: 1px solid black; &:vertical { - width: 18px; - .set_margin( 0px, 20px ); + width: 16px; + .set_margin( 0px, 16px ); } &:horizontal { - height: 18px; - .set_margin( 20px, 0px ); + height: 16px; + .set_margin( 16px, 0px ); } &::handle { - border-width: 4; + border-width: 3; image-position: center center; &:vertical { - border-image: url("@{image_url}/sb_g_vhandle.png")4; + border-image: url("@{image_url}/sb_g_vhandle.png")3; image: url("@{image_url}/sb_g_vline.png"); min-height: 40px; } &:horizontal { - border-image: url("@{image_url}/sb_g_hhandle.png")4; + border-image: url("@{image_url}/sb_g_hhandle.png")3; image: url("@{image_url}/sb_g_hline.png"); min-width: 40px; } @@ -694,7 +694,7 @@ ParamsPage { subcontrol-origin: margin; &:vertical { image: url("@{image_url}/sb_g_downarrow.png"); - height: 20px; + height: 16px; subcontrol-position: bottom; &:pressed { image: url("@{image_url}/sb_g_downarrow_pressed.png"); @@ -702,7 +702,7 @@ ParamsPage { } &:horizontal { image: url("@{image_url}/sb_g_rarrow.png"); - width: 20px; + width: 16px; subcontrol-position: right; &:pressed{ image: url("@{image_url}/sb_g_rarrow_pressed.png"); @@ -714,7 +714,7 @@ ParamsPage { subcontrol-origin: margin; &:vertical { image: url("@{image_url}/sb_g_uparrow.png"); - height: 20px; + height: 16px; subcontrol-position: top; &:pressed { image: url("@{image_url}/sb_g_uparrow_pressed.png"); @@ -722,7 +722,7 @@ ParamsPage { } &:horizontal { image: url("@{image_url}/sb_g_larrow.png"); - width: 20px; + width: 16px; subcontrol-position: left; &:pressed{ image: url("@{image_url}/sb_g_larrow_pressed.png"); @@ -730,8 +730,8 @@ ParamsPage { } } - &::add-page { - background: none; + &::add-page, &::sub-page { + background-color: rgb(160,160,160); } } diff --git a/stuff/config/qss/gray_128/gray_128.qss b/stuff/config/qss/gray_128/gray_128.qss index ee88456..c8f42cd 100644 --- a/stuff/config/qss/gray_128/gray_128.qss +++ b/stuff/config/qss/gray_128/gray_128.qss @@ -591,79 +591,79 @@ ParamsPage { background-color: #000080; } /* Customize QScrollBar vertical*/ -#XsheetScrollBar { - background-color: #a0a0a0; +QScrollBar { border: 1px solid black; /* buttons */ } -#XsheetScrollBar:vertical { - width: 18px; +QScrollBar:vertical { + width: 16px; margin-left: 0px; margin-right: 0px; - margin-top: 20px; - margin-bottom: 20px; + margin-top: 16px; + margin-bottom: 16px; } -#XsheetScrollBar:horizontal { - height: 18px; - margin-left: 20px; - margin-right: 20px; +QScrollBar:horizontal { + height: 16px; + margin-left: 16px; + margin-right: 16px; margin-top: 0px; margin-bottom: 0px; } -#XsheetScrollBar::handle { - border-width: 4; +QScrollBar::handle { + border-width: 3; image-position: center center; } -#XsheetScrollBar::handle:vertical { - border-image: url("imgs/sb_g_vhandle.png") 4; +QScrollBar::handle:vertical { + border-image: url("imgs/sb_g_vhandle.png") 3; image: url("imgs/sb_g_vline.png"); min-height: 40px; } -#XsheetScrollBar::handle:horizontal { - border-image: url("imgs/sb_g_hhandle.png") 4; +QScrollBar::handle:horizontal { + border-image: url("imgs/sb_g_hhandle.png") 3; image: url("imgs/sb_g_hline.png"); min-width: 40px; } -#XsheetScrollBar::add-line { +QScrollBar::add-line { subcontrol-origin: margin; } -#XsheetScrollBar::add-line:vertical { +QScrollBar::add-line:vertical { image: url("imgs/sb_g_downarrow.png"); - height: 20px; + height: 16px; subcontrol-position: bottom; } -#XsheetScrollBar::add-line:vertical:pressed { +QScrollBar::add-line:vertical:pressed { image: url("imgs/sb_g_downarrow_pressed.png"); } -#XsheetScrollBar::add-line:horizontal { +QScrollBar::add-line:horizontal { image: url("imgs/sb_g_rarrow.png"); - width: 20px; + width: 16px; subcontrol-position: right; } -#XsheetScrollBar::add-line:horizontal:pressed { +QScrollBar::add-line:horizontal:pressed { image: url("imgs/sb_g_rarrow_pressed.png"); } -#XsheetScrollBar::sub-line { +QScrollBar::sub-line { subcontrol-origin: margin; } -#XsheetScrollBar::sub-line:vertical { +QScrollBar::sub-line:vertical { image: url("imgs/sb_g_uparrow.png"); - height: 20px; + height: 16px; subcontrol-position: top; } -#XsheetScrollBar::sub-line:vertical:pressed { +QScrollBar::sub-line:vertical:pressed { image: url("imgs/sb_g_uparrow_pressed.png"); } -#XsheetScrollBar::sub-line:horizontal { +QScrollBar::sub-line:horizontal { image: url("imgs/sb_g_larrow.png"); - width: 20px; + width: 16px; subcontrol-position: left; } -#XsheetScrollBar::sub-line:horizontal:pressed { +QScrollBar::sub-line:horizontal:pressed { image: url("imgs/sb_g_larrow_pressed.png"); } -#XsheetScrollBar::add-page { - background: none; +QScrollBar::add-page, +QScrollBar::sub-page { + background-color: #a0a0a0; } XsheetViewer { qproperty-TextColor: black; diff --git a/stuff/config/qss/gray_128/gray_128_mac.qss b/stuff/config/qss/gray_128/gray_128_mac.qss index a7b90c2..8f53904 100644 --- a/stuff/config/qss/gray_128/gray_128_mac.qss +++ b/stuff/config/qss/gray_128/gray_128_mac.qss @@ -591,79 +591,79 @@ ParamsPage { background-color: #000080; } /* Customize QScrollBar vertical*/ -#XsheetScrollBar { - background-color: #a0a0a0; +QScrollBar { border: 1px solid black; /* buttons */ } -#XsheetScrollBar:vertical { - width: 18px; +QScrollBar:vertical { + width: 16px; margin-left: 0px; margin-right: 0px; - margin-top: 20px; - margin-bottom: 20px; + margin-top: 16px; + margin-bottom: 16px; } -#XsheetScrollBar:horizontal { - height: 18px; - margin-left: 20px; - margin-right: 20px; +QScrollBar:horizontal { + height: 16px; + margin-left: 16px; + margin-right: 16px; margin-top: 0px; margin-bottom: 0px; } -#XsheetScrollBar::handle { - border-width: 4; +QScrollBar::handle { + border-width: 3; image-position: center center; } -#XsheetScrollBar::handle:vertical { - border-image: url("imgs/sb_g_vhandle.png") 4; +QScrollBar::handle:vertical { + border-image: url("imgs/sb_g_vhandle.png") 3; image: url("imgs/sb_g_vline.png"); min-height: 40px; } -#XsheetScrollBar::handle:horizontal { - border-image: url("imgs/sb_g_hhandle.png") 4; +QScrollBar::handle:horizontal { + border-image: url("imgs/sb_g_hhandle.png") 3; image: url("imgs/sb_g_hline.png"); min-width: 40px; } -#XsheetScrollBar::add-line { +QScrollBar::add-line { subcontrol-origin: margin; } -#XsheetScrollBar::add-line:vertical { +QScrollBar::add-line:vertical { image: url("imgs/sb_g_downarrow.png"); - height: 20px; + height: 16px; subcontrol-position: bottom; } -#XsheetScrollBar::add-line:vertical:pressed { +QScrollBar::add-line:vertical:pressed { image: url("imgs/sb_g_downarrow_pressed.png"); } -#XsheetScrollBar::add-line:horizontal { +QScrollBar::add-line:horizontal { image: url("imgs/sb_g_rarrow.png"); - width: 20px; + width: 16px; subcontrol-position: right; } -#XsheetScrollBar::add-line:horizontal:pressed { +QScrollBar::add-line:horizontal:pressed { image: url("imgs/sb_g_rarrow_pressed.png"); } -#XsheetScrollBar::sub-line { +QScrollBar::sub-line { subcontrol-origin: margin; } -#XsheetScrollBar::sub-line:vertical { +QScrollBar::sub-line:vertical { image: url("imgs/sb_g_uparrow.png"); - height: 20px; + height: 16px; subcontrol-position: top; } -#XsheetScrollBar::sub-line:vertical:pressed { +QScrollBar::sub-line:vertical:pressed { image: url("imgs/sb_g_uparrow_pressed.png"); } -#XsheetScrollBar::sub-line:horizontal { +QScrollBar::sub-line:horizontal { image: url("imgs/sb_g_larrow.png"); - width: 20px; + width: 16px; subcontrol-position: left; } -#XsheetScrollBar::sub-line:horizontal:pressed { +QScrollBar::sub-line:horizontal:pressed { image: url("imgs/sb_g_larrow_pressed.png"); } -#XsheetScrollBar::add-page { - background: none; +QScrollBar::add-page, +QScrollBar::sub-page { + background-color: #a0a0a0; } XsheetViewer { qproperty-TextColor: black; diff --git a/stuff/config/qss/gray_128/imgs/sb_g_downarrow.png b/stuff/config/qss/gray_128/imgs/sb_g_downarrow.png index f5e678c..4747674 100644 Binary files a/stuff/config/qss/gray_128/imgs/sb_g_downarrow.png and b/stuff/config/qss/gray_128/imgs/sb_g_downarrow.png differ diff --git a/stuff/config/qss/gray_128/imgs/sb_g_downarrow_pressed.png b/stuff/config/qss/gray_128/imgs/sb_g_downarrow_pressed.png index ca150f6..0e10442 100644 Binary files a/stuff/config/qss/gray_128/imgs/sb_g_downarrow_pressed.png and b/stuff/config/qss/gray_128/imgs/sb_g_downarrow_pressed.png differ diff --git a/stuff/config/qss/gray_128/imgs/sb_g_larrow.png b/stuff/config/qss/gray_128/imgs/sb_g_larrow.png index db68d6d..44e406e 100644 Binary files a/stuff/config/qss/gray_128/imgs/sb_g_larrow.png and b/stuff/config/qss/gray_128/imgs/sb_g_larrow.png differ diff --git a/stuff/config/qss/gray_128/imgs/sb_g_larrow_pressed.png b/stuff/config/qss/gray_128/imgs/sb_g_larrow_pressed.png index 23acd01..c3b6701 100644 Binary files a/stuff/config/qss/gray_128/imgs/sb_g_larrow_pressed.png and b/stuff/config/qss/gray_128/imgs/sb_g_larrow_pressed.png differ diff --git a/stuff/config/qss/gray_128/imgs/sb_g_rarrow.png b/stuff/config/qss/gray_128/imgs/sb_g_rarrow.png index 17c8865..92b1e59 100644 Binary files a/stuff/config/qss/gray_128/imgs/sb_g_rarrow.png and b/stuff/config/qss/gray_128/imgs/sb_g_rarrow.png differ diff --git a/stuff/config/qss/gray_128/imgs/sb_g_rarrow_pressed.png b/stuff/config/qss/gray_128/imgs/sb_g_rarrow_pressed.png index 873e91b..cc9c423 100644 Binary files a/stuff/config/qss/gray_128/imgs/sb_g_rarrow_pressed.png and b/stuff/config/qss/gray_128/imgs/sb_g_rarrow_pressed.png differ diff --git a/stuff/config/qss/gray_128/imgs/sb_g_uparrow.png b/stuff/config/qss/gray_128/imgs/sb_g_uparrow.png index 3fd43db..e0c71f9 100644 Binary files a/stuff/config/qss/gray_128/imgs/sb_g_uparrow.png and b/stuff/config/qss/gray_128/imgs/sb_g_uparrow.png differ diff --git a/stuff/config/qss/gray_128/imgs/sb_g_uparrow_pressed.png b/stuff/config/qss/gray_128/imgs/sb_g_uparrow_pressed.png index 37b4e73..74d514b 100644 Binary files a/stuff/config/qss/gray_128/imgs/sb_g_uparrow_pressed.png and b/stuff/config/qss/gray_128/imgs/sb_g_uparrow_pressed.png differ diff --git a/toonz/sources/toonz/xsheetviewer.cpp b/toonz/sources/toonz/xsheetviewer.cpp index 6c243fd..6e45023 100644 --- a/toonz/sources/toonz/xsheetviewer.cpp +++ b/toonz/sources/toonz/xsheetviewer.cpp @@ -184,8 +184,8 @@ XsheetViewer::XsheetViewer(QWidget *parent, Qt::WFlags flags) m_cellScrollArea->setWidget(m_cellArea); m_cellScrollArea->setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOn); m_cellScrollArea->setVerticalScrollBarPolicy(Qt::ScrollBarAlwaysOn); - m_cellScrollArea->horizontalScrollBar()->setObjectName("XsheetScrollBar"); - m_cellScrollArea->verticalScrollBar()->setObjectName("XsheetScrollBar"); + // m_cellScrollArea->horizontalScrollBar()->setObjectName("XsheetScrollBar"); + // m_cellScrollArea->verticalScrollBar()->setObjectName("XsheetScrollBar"); m_columnArea = new XsheetGUI::ColumnArea(this); m_columnScrollArea = new XsheetScrollArea(this); @@ -694,13 +694,13 @@ void XsheetViewer::paintEvent(QPaintEvent*) //----------------------------------------------------------------------------- void XsheetViewer::resizeEvent(QResizeEvent *event) { - int w = width(); - int h = height(); - + int w = width(); + int h = height(); + int scrollBarWidth = 16; m_noteScrollArea->setGeometry(3, 1, m_x0 - 4, m_y0 - 3); m_cellScrollArea->setGeometry(m_x0, m_y0, w - m_x0, h - m_y0); - m_columnScrollArea->setGeometry(m_x0, 1, w - m_x0 - 20, m_y0 - 3); - m_rowScrollArea->setGeometry(1, m_y0, m_x0 - 1, h - m_y0 - 20); + m_columnScrollArea->setGeometry(m_x0, 1, w - m_x0 - scrollBarWidth, m_y0 - 3); + m_rowScrollArea->setGeometry(1, m_y0, m_x0 - 1, h - m_y0 - scrollBarWidth); //(Nuovo Layout Manager) Reintrodotto per il refresh automatico refreshContentSize( diff --git a/toonz/sources/toonzqt/spreadsheetviewer.cpp b/toonz/sources/toonzqt/spreadsheetviewer.cpp index 353a0b5..8c375e9 100644 --- a/toonz/sources/toonzqt/spreadsheetviewer.cpp +++ b/toonz/sources/toonzqt/spreadsheetviewer.cpp @@ -413,8 +413,8 @@ SpreadsheetViewer::SpreadsheetViewer(QWidget *parent) m_cellScrollArea->setObjectName("ScrollArea"); m_cellScrollArea->setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOn); m_cellScrollArea->setVerticalScrollBarPolicy(Qt::ScrollBarAlwaysOn); - m_cellScrollArea->horizontalScrollBar()->setObjectName("XsheetScrollBar"); - m_cellScrollArea->verticalScrollBar()->setObjectName("XsheetScrollBar"); + // m_cellScrollArea->horizontalScrollBar()->setObjectName("XsheetScrollBar"); + // m_cellScrollArea->verticalScrollBar()->setObjectName("XsheetScrollBar"); m_cellScrollArea->setFocusPolicy(Qt::NoFocus); m_columnScrollArea->setSizePolicy( @@ -435,14 +435,15 @@ SpreadsheetViewer::SpreadsheetViewer(QWidget *parent) layout->addWidget(m_rowScrollArea, 1, 0); layout->addWidget(m_cellScrollArea, 1, 1, 2, 2); + int scrollBarWidth = 16; // upper-right QWidget *w = new QWidget(this); - w->setFixedSize(QSize(20, m_rowHeight * 3 + 60 - 63)); + w->setFixedSize(QSize(scrollBarWidth, m_rowHeight * 3 + 60 - 63)); layout->addWidget(w, 0, 2); // lower-left w = new QWidget(this); - w->setFixedSize(QSize(30, 20)); + w->setFixedSize(QSize(30, scrollBarWidth)); layout->addWidget(w, 2, 0); layout->setColumnStretch(0, 0);