diff --git a/stuff/config/qss/Astral_048_VeryDark/Astral_048_VeryDark.qss b/stuff/config/qss/Astral_048_VeryDark/Astral_048_VeryDark.qss index b4dcb10..a45a8b5 100644 --- a/stuff/config/qss/Astral_048_VeryDark/Astral_048_VeryDark.qss +++ b/stuff/config/qss/Astral_048_VeryDark/Astral_048_VeryDark.qss @@ -770,6 +770,18 @@ DvScrollWidget QPushButton:pressed { #keyFrameNavigator QToolButton { min-width: 18px; } +#keyFrameNavigator #PreviousKey { + image: url('../Astral_072_Dark/imgs/white/prevkey.png'); +} +#keyFrameNavigator #PreviousKey:disabled { + image: url('../Astral_072_Dark/imgs/white/prevkey_disabled.png'); +} +#keyFrameNavigator #NextKey { + image: url('../Astral_072_Dark/imgs/white/nextkey.png'); +} +#keyFrameNavigator #NextKey:disabled { + image: url('../Astral_072_Dark/imgs/white/nextkey_disabled.png'); +} /* ----------------------------------------------------------------------------- Treeviews (Global) ----------------------------------------------------------------------------- */ diff --git a/stuff/config/qss/Astral_048_VeryDark/Astral_048_VeryDark_mac.qss b/stuff/config/qss/Astral_048_VeryDark/Astral_048_VeryDark_mac.qss index b4dcb10..a45a8b5 100644 --- a/stuff/config/qss/Astral_048_VeryDark/Astral_048_VeryDark_mac.qss +++ b/stuff/config/qss/Astral_048_VeryDark/Astral_048_VeryDark_mac.qss @@ -770,6 +770,18 @@ DvScrollWidget QPushButton:pressed { #keyFrameNavigator QToolButton { min-width: 18px; } +#keyFrameNavigator #PreviousKey { + image: url('../Astral_072_Dark/imgs/white/prevkey.png'); +} +#keyFrameNavigator #PreviousKey:disabled { + image: url('../Astral_072_Dark/imgs/white/prevkey_disabled.png'); +} +#keyFrameNavigator #NextKey { + image: url('../Astral_072_Dark/imgs/white/nextkey.png'); +} +#keyFrameNavigator #NextKey:disabled { + image: url('../Astral_072_Dark/imgs/white/nextkey_disabled.png'); +} /* ----------------------------------------------------------------------------- Treeviews (Global) ----------------------------------------------------------------------------- */ diff --git a/stuff/config/qss/Astral_072_Dark/Astral_072_Dark.qss b/stuff/config/qss/Astral_072_Dark/Astral_072_Dark.qss index e6fc1cc..911816b 100644 --- a/stuff/config/qss/Astral_072_Dark/Astral_072_Dark.qss +++ b/stuff/config/qss/Astral_072_Dark/Astral_072_Dark.qss @@ -770,6 +770,18 @@ DvScrollWidget QPushButton:pressed { #keyFrameNavigator QToolButton { min-width: 18px; } +#keyFrameNavigator #PreviousKey { + image: url('imgs/white/prevkey.png'); +} +#keyFrameNavigator #PreviousKey:disabled { + image: url('imgs/white/prevkey_disabled.png'); +} +#keyFrameNavigator #NextKey { + image: url('imgs/white/nextkey.png'); +} +#keyFrameNavigator #NextKey:disabled { + image: url('imgs/white/nextkey_disabled.png'); +} /* ----------------------------------------------------------------------------- Treeviews (Global) ----------------------------------------------------------------------------- */ diff --git a/stuff/config/qss/Astral_072_Dark/Astral_072_Dark_mac.qss b/stuff/config/qss/Astral_072_Dark/Astral_072_Dark_mac.qss index e6fc1cc..911816b 100644 --- a/stuff/config/qss/Astral_072_Dark/Astral_072_Dark_mac.qss +++ b/stuff/config/qss/Astral_072_Dark/Astral_072_Dark_mac.qss @@ -770,6 +770,18 @@ DvScrollWidget QPushButton:pressed { #keyFrameNavigator QToolButton { min-width: 18px; } +#keyFrameNavigator #PreviousKey { + image: url('imgs/white/prevkey.png'); +} +#keyFrameNavigator #PreviousKey:disabled { + image: url('imgs/white/prevkey_disabled.png'); +} +#keyFrameNavigator #NextKey { + image: url('imgs/white/nextkey.png'); +} +#keyFrameNavigator #NextKey:disabled { + image: url('imgs/white/nextkey_disabled.png'); +} /* ----------------------------------------------------------------------------- Treeviews (Global) ----------------------------------------------------------------------------- */ diff --git a/stuff/config/qss/Astral_072_Dark/imgs/black/nextkey.png b/stuff/config/qss/Astral_072_Dark/imgs/black/nextkey.png new file mode 100644 index 0000000..1f667f2 Binary files /dev/null and b/stuff/config/qss/Astral_072_Dark/imgs/black/nextkey.png differ diff --git a/stuff/config/qss/Astral_072_Dark/imgs/black/nextkey_disabled.png b/stuff/config/qss/Astral_072_Dark/imgs/black/nextkey_disabled.png new file mode 100644 index 0000000..ce8ccb4 Binary files /dev/null and b/stuff/config/qss/Astral_072_Dark/imgs/black/nextkey_disabled.png differ diff --git a/stuff/config/qss/Astral_072_Dark/imgs/black/nextkey_over.png b/stuff/config/qss/Astral_072_Dark/imgs/black/nextkey_over.png new file mode 100644 index 0000000..49b0621 Binary files /dev/null and b/stuff/config/qss/Astral_072_Dark/imgs/black/nextkey_over.png differ diff --git a/stuff/config/qss/Astral_072_Dark/imgs/black/prevkey.png b/stuff/config/qss/Astral_072_Dark/imgs/black/prevkey.png new file mode 100644 index 0000000..fcaaa93 Binary files /dev/null and b/stuff/config/qss/Astral_072_Dark/imgs/black/prevkey.png differ diff --git a/stuff/config/qss/Astral_072_Dark/imgs/black/prevkey_disabled.png b/stuff/config/qss/Astral_072_Dark/imgs/black/prevkey_disabled.png new file mode 100644 index 0000000..d8f71be Binary files /dev/null and b/stuff/config/qss/Astral_072_Dark/imgs/black/prevkey_disabled.png differ diff --git a/stuff/config/qss/Astral_072_Dark/imgs/black/prevkey_over.png b/stuff/config/qss/Astral_072_Dark/imgs/black/prevkey_over.png new file mode 100644 index 0000000..47a67ca Binary files /dev/null and b/stuff/config/qss/Astral_072_Dark/imgs/black/prevkey_over.png differ diff --git a/stuff/config/qss/Astral_072_Dark/imgs/white/nextkey.png b/stuff/config/qss/Astral_072_Dark/imgs/white/nextkey.png new file mode 100644 index 0000000..ce8ccb4 Binary files /dev/null and b/stuff/config/qss/Astral_072_Dark/imgs/white/nextkey.png differ diff --git a/stuff/config/qss/Astral_072_Dark/imgs/white/nextkey_disabled.png b/stuff/config/qss/Astral_072_Dark/imgs/white/nextkey_disabled.png new file mode 100644 index 0000000..1f667f2 Binary files /dev/null and b/stuff/config/qss/Astral_072_Dark/imgs/white/nextkey_disabled.png differ diff --git a/stuff/config/qss/Astral_072_Dark/imgs/white/nextkey_over.png b/stuff/config/qss/Astral_072_Dark/imgs/white/nextkey_over.png new file mode 100644 index 0000000..49b0621 Binary files /dev/null and b/stuff/config/qss/Astral_072_Dark/imgs/white/nextkey_over.png differ diff --git a/stuff/config/qss/Astral_072_Dark/imgs/white/prevkey.png b/stuff/config/qss/Astral_072_Dark/imgs/white/prevkey.png new file mode 100644 index 0000000..d8f71be Binary files /dev/null and b/stuff/config/qss/Astral_072_Dark/imgs/white/prevkey.png differ diff --git a/stuff/config/qss/Astral_072_Dark/imgs/white/prevkey_disabled.png b/stuff/config/qss/Astral_072_Dark/imgs/white/prevkey_disabled.png new file mode 100644 index 0000000..fcaaa93 Binary files /dev/null and b/stuff/config/qss/Astral_072_Dark/imgs/white/prevkey_disabled.png differ diff --git a/stuff/config/qss/Astral_072_Dark/imgs/white/prevkey_over.png b/stuff/config/qss/Astral_072_Dark/imgs/white/prevkey_over.png new file mode 100644 index 0000000..47a67ca Binary files /dev/null and b/stuff/config/qss/Astral_072_Dark/imgs/white/prevkey_over.png differ diff --git a/stuff/config/qss/Astral_072_Dark/less/layouts/mainwindow.less b/stuff/config/qss/Astral_072_Dark/less/layouts/mainwindow.less index 1ffcc3c..01d63f5 100644 --- a/stuff/config/qss/Astral_072_Dark/less/layouts/mainwindow.less +++ b/stuff/config/qss/Astral_072_Dark/less/layouts/mainwindow.less @@ -412,6 +412,18 @@ QToolBar { & QToolButton { min-width: 18px; } + #PreviousKey{ + image: url('@{img-url}/prevkey.png'); + &:disabled{ + image: url('@{img-url}/prevkey_disabled.png'); + } + } + #NextKey{ + image: url('@{img-url}/nextkey.png'); + &:disabled{ + image: url('@{img-url}/nextkey_disabled.png'); + } + } } /* ----------------------------------------------------------------------------- diff --git a/stuff/config/qss/Astral_128_Neutral/Astral_128_Neutral.qss b/stuff/config/qss/Astral_128_Neutral/Astral_128_Neutral.qss index 4db9d08..3995b1f 100644 --- a/stuff/config/qss/Astral_128_Neutral/Astral_128_Neutral.qss +++ b/stuff/config/qss/Astral_128_Neutral/Astral_128_Neutral.qss @@ -770,6 +770,18 @@ DvScrollWidget QPushButton:pressed { #keyFrameNavigator QToolButton { min-width: 18px; } +#keyFrameNavigator #PreviousKey { + image: url('../Astral_072_Dark/imgs/black/prevkey.png'); +} +#keyFrameNavigator #PreviousKey:disabled { + image: url('../Astral_072_Dark/imgs/black/prevkey_disabled.png'); +} +#keyFrameNavigator #NextKey { + image: url('../Astral_072_Dark/imgs/black/nextkey.png'); +} +#keyFrameNavigator #NextKey:disabled { + image: url('../Astral_072_Dark/imgs/black/nextkey_disabled.png'); +} /* ----------------------------------------------------------------------------- Treeviews (Global) ----------------------------------------------------------------------------- */ diff --git a/stuff/config/qss/Astral_128_Neutral/Astral_128_Neutral_mac.qss b/stuff/config/qss/Astral_128_Neutral/Astral_128_Neutral_mac.qss index 4db9d08..3995b1f 100644 --- a/stuff/config/qss/Astral_128_Neutral/Astral_128_Neutral_mac.qss +++ b/stuff/config/qss/Astral_128_Neutral/Astral_128_Neutral_mac.qss @@ -770,6 +770,18 @@ DvScrollWidget QPushButton:pressed { #keyFrameNavigator QToolButton { min-width: 18px; } +#keyFrameNavigator #PreviousKey { + image: url('../Astral_072_Dark/imgs/black/prevkey.png'); +} +#keyFrameNavigator #PreviousKey:disabled { + image: url('../Astral_072_Dark/imgs/black/prevkey_disabled.png'); +} +#keyFrameNavigator #NextKey { + image: url('../Astral_072_Dark/imgs/black/nextkey.png'); +} +#keyFrameNavigator #NextKey:disabled { + image: url('../Astral_072_Dark/imgs/black/nextkey_disabled.png'); +} /* ----------------------------------------------------------------------------- Treeviews (Global) ----------------------------------------------------------------------------- */ diff --git a/stuff/config/qss/dark/dark.less b/stuff/config/qss/dark/dark.less index 7fb7a41..629884e 100644 --- a/stuff/config/qss/dark/dark.less +++ b/stuff/config/qss/dark/dark.less @@ -1191,11 +1191,26 @@ SpreadsheetViewer { qproperty-ColumnHeaderBorderColor: rgb(142,142,142); qproperty-SelectedColumnTextColor: @m_selectedText; } -#keyFrameNavigator -{ - border: 0px; - margin: 0px; - padding: 0px; +#keyFrameNavigator { + background: none; // Fixes BG overflow + margin: 0; + padding: 0; + border: 0; + & QToolButton { + min-width: 18px; + } + #PreviousKey{ + image: url('@{image_url}/prevkey.png'); + &:disabled{ + image: url('@{image_url}/prevkey_disabled.png'); + } + } + #NextKey{ + image: url('@{image_url}/nextkey.png'); + &:disabled{ + image: url('@{image_url}/nextkey_disabled.png'); + } + } } #ExpressionField diff --git a/stuff/config/qss/dark/dark.qss b/stuff/config/qss/dark/dark.qss index 54e4145..945f4db 100644 --- a/stuff/config/qss/dark/dark.qss +++ b/stuff/config/qss/dark/dark.qss @@ -1022,9 +1022,25 @@ SpreadsheetViewer { qproperty-SelectedColumnTextColor: #58e458; } #keyFrameNavigator { - border: 0px; - margin: 0px; - padding: 0px; + background: none; + margin: 0; + padding: 0; + border: 0; +} +#keyFrameNavigator QToolButton { + min-width: 18px; +} +#keyFrameNavigator #PreviousKey { + image: url('imgs/prevkey.png'); +} +#keyFrameNavigator #PreviousKey:disabled { + image: url('imgs/prevkey_disabled.png'); +} +#keyFrameNavigator #NextKey { + image: url('imgs/nextkey.png'); +} +#keyFrameNavigator #NextKey:disabled { + image: url('imgs/nextkey_disabled.png'); } #ExpressionField { background-color: #e3e3e3; diff --git a/stuff/config/qss/dark/dark_mac.qss b/stuff/config/qss/dark/dark_mac.qss index 54e4145..945f4db 100644 --- a/stuff/config/qss/dark/dark_mac.qss +++ b/stuff/config/qss/dark/dark_mac.qss @@ -1022,9 +1022,25 @@ SpreadsheetViewer { qproperty-SelectedColumnTextColor: #58e458; } #keyFrameNavigator { - border: 0px; - margin: 0px; - padding: 0px; + background: none; + margin: 0; + padding: 0; + border: 0; +} +#keyFrameNavigator QToolButton { + min-width: 18px; +} +#keyFrameNavigator #PreviousKey { + image: url('imgs/prevkey.png'); +} +#keyFrameNavigator #PreviousKey:disabled { + image: url('imgs/prevkey_disabled.png'); +} +#keyFrameNavigator #NextKey { + image: url('imgs/nextkey.png'); +} +#keyFrameNavigator #NextKey:disabled { + image: url('imgs/nextkey_disabled.png'); } #ExpressionField { background-color: #e3e3e3; diff --git a/stuff/config/qss/dark/imgs/nextkey.png b/stuff/config/qss/dark/imgs/nextkey.png new file mode 100644 index 0000000..ce8ccb4 Binary files /dev/null and b/stuff/config/qss/dark/imgs/nextkey.png differ diff --git a/stuff/config/qss/dark/imgs/nextkey_disabled.png b/stuff/config/qss/dark/imgs/nextkey_disabled.png new file mode 100644 index 0000000..1f667f2 Binary files /dev/null and b/stuff/config/qss/dark/imgs/nextkey_disabled.png differ diff --git a/stuff/config/qss/dark/imgs/nextkey_over.png b/stuff/config/qss/dark/imgs/nextkey_over.png new file mode 100644 index 0000000..49b0621 Binary files /dev/null and b/stuff/config/qss/dark/imgs/nextkey_over.png differ diff --git a/stuff/config/qss/dark/imgs/prevkey.png b/stuff/config/qss/dark/imgs/prevkey.png new file mode 100644 index 0000000..d8f71be Binary files /dev/null and b/stuff/config/qss/dark/imgs/prevkey.png differ diff --git a/stuff/config/qss/dark/imgs/prevkey_disabled.png b/stuff/config/qss/dark/imgs/prevkey_disabled.png new file mode 100644 index 0000000..fcaaa93 Binary files /dev/null and b/stuff/config/qss/dark/imgs/prevkey_disabled.png differ diff --git a/stuff/config/qss/dark/imgs/prevkey_over.png b/stuff/config/qss/dark/imgs/prevkey_over.png new file mode 100644 index 0000000..47a67ca Binary files /dev/null and b/stuff/config/qss/dark/imgs/prevkey_over.png differ diff --git a/stuff/config/qss/gray_048/gray_048.less b/stuff/config/qss/gray_048/gray_048.less index 0aec3ca..200671e 100644 --- a/stuff/config/qss/gray_048/gray_048.less +++ b/stuff/config/qss/gray_048/gray_048.less @@ -1092,11 +1092,26 @@ SpreadsheetViewer { qproperty-ColumnHeaderBorderColor: rgb(142,142,142); qproperty-SelectedColumnTextColor: rgb(230, 100, 100); } -#keyFrameNavigator -{ - border: 0px; - margin: 0px; - padding: 0px; +#keyFrameNavigator { + background: none; // Fixes BG overflow + margin: 0; + padding: 0; + border: 0; + & QToolButton { + min-width: 18px; + } + #PreviousKey{ + image: url('@{image_url}/prevkey.png'); + &:disabled{ + image: url('@{image_url}/prevkey_disabled.png'); + } + } + #NextKey{ + image: url('@{image_url}/nextkey.png'); + &:disabled{ + image: url('@{image_url}/nextkey_disabled.png'); + } + } } #ExpressionField diff --git a/stuff/config/qss/gray_048/gray_048.qss b/stuff/config/qss/gray_048/gray_048.qss index 12a2493..156340c 100644 --- a/stuff/config/qss/gray_048/gray_048.qss +++ b/stuff/config/qss/gray_048/gray_048.qss @@ -1076,9 +1076,25 @@ SpreadsheetViewer { qproperty-SelectedColumnTextColor: #e66464; } #keyFrameNavigator { - border: 0px; - margin: 0px; - padding: 0px; + background: none; + margin: 0; + padding: 0; + border: 0; +} +#keyFrameNavigator QToolButton { + min-width: 18px; +} +#keyFrameNavigator #PreviousKey { + image: url('../gray_072/imgs/prevkey.png'); +} +#keyFrameNavigator #PreviousKey:disabled { + image: url('../gray_072/imgs/prevkey_disabled.png'); +} +#keyFrameNavigator #NextKey { + image: url('../gray_072/imgs/nextkey.png'); +} +#keyFrameNavigator #NextKey:disabled { + image: url('../gray_072/imgs/nextkey_disabled.png'); } #ExpressionField { background-color: #b0b0b0; diff --git a/stuff/config/qss/gray_048/gray_048_mac.qss b/stuff/config/qss/gray_048/gray_048_mac.qss index 12a2493..156340c 100644 --- a/stuff/config/qss/gray_048/gray_048_mac.qss +++ b/stuff/config/qss/gray_048/gray_048_mac.qss @@ -1076,9 +1076,25 @@ SpreadsheetViewer { qproperty-SelectedColumnTextColor: #e66464; } #keyFrameNavigator { - border: 0px; - margin: 0px; - padding: 0px; + background: none; + margin: 0; + padding: 0; + border: 0; +} +#keyFrameNavigator QToolButton { + min-width: 18px; +} +#keyFrameNavigator #PreviousKey { + image: url('../gray_072/imgs/prevkey.png'); +} +#keyFrameNavigator #PreviousKey:disabled { + image: url('../gray_072/imgs/prevkey_disabled.png'); +} +#keyFrameNavigator #NextKey { + image: url('../gray_072/imgs/nextkey.png'); +} +#keyFrameNavigator #NextKey:disabled { + image: url('../gray_072/imgs/nextkey_disabled.png'); } #ExpressionField { background-color: #b0b0b0; diff --git a/stuff/config/qss/gray_072/gray_072.less b/stuff/config/qss/gray_072/gray_072.less index 3a81760..c2c1a3a 100644 --- a/stuff/config/qss/gray_072/gray_072.less +++ b/stuff/config/qss/gray_072/gray_072.less @@ -1091,11 +1091,26 @@ SpreadsheetViewer { qproperty-ColumnHeaderBorderColor: rgb(142,142,142); qproperty-SelectedColumnTextColor: rgb(230, 100, 100); } -#keyFrameNavigator -{ - border: 0px; - margin: 0px; - padding: 0px; +#keyFrameNavigator { + background: none; // Fixes BG overflow + margin: 0; + padding: 0; + border: 0; + & QToolButton { + min-width: 18px; + } + #PreviousKey{ + image: url('@{image_url}/prevkey.png'); + &:disabled{ + image: url('@{image_url}/prevkey_disabled.png'); + } + } + #NextKey{ + image: url('@{image_url}/nextkey.png'); + &:disabled{ + image: url('@{image_url}/nextkey_disabled.png'); + } + } } #ExpressionField diff --git a/stuff/config/qss/gray_072/gray_072.qss b/stuff/config/qss/gray_072/gray_072.qss index cf65a5d..7c05e39 100644 --- a/stuff/config/qss/gray_072/gray_072.qss +++ b/stuff/config/qss/gray_072/gray_072.qss @@ -1076,9 +1076,25 @@ SpreadsheetViewer { qproperty-SelectedColumnTextColor: #e66464; } #keyFrameNavigator { - border: 0px; - margin: 0px; - padding: 0px; + background: none; + margin: 0; + padding: 0; + border: 0; +} +#keyFrameNavigator QToolButton { + min-width: 18px; +} +#keyFrameNavigator #PreviousKey { + image: url('imgs/prevkey.png'); +} +#keyFrameNavigator #PreviousKey:disabled { + image: url('imgs/prevkey_disabled.png'); +} +#keyFrameNavigator #NextKey { + image: url('imgs/nextkey.png'); +} +#keyFrameNavigator #NextKey:disabled { + image: url('imgs/nextkey_disabled.png'); } #ExpressionField { background-color: #c8c8c8; diff --git a/stuff/config/qss/gray_072/gray_072_mac.qss b/stuff/config/qss/gray_072/gray_072_mac.qss index cf65a5d..7c05e39 100644 --- a/stuff/config/qss/gray_072/gray_072_mac.qss +++ b/stuff/config/qss/gray_072/gray_072_mac.qss @@ -1076,9 +1076,25 @@ SpreadsheetViewer { qproperty-SelectedColumnTextColor: #e66464; } #keyFrameNavigator { - border: 0px; - margin: 0px; - padding: 0px; + background: none; + margin: 0; + padding: 0; + border: 0; +} +#keyFrameNavigator QToolButton { + min-width: 18px; +} +#keyFrameNavigator #PreviousKey { + image: url('imgs/prevkey.png'); +} +#keyFrameNavigator #PreviousKey:disabled { + image: url('imgs/prevkey_disabled.png'); +} +#keyFrameNavigator #NextKey { + image: url('imgs/nextkey.png'); +} +#keyFrameNavigator #NextKey:disabled { + image: url('imgs/nextkey_disabled.png'); } #ExpressionField { background-color: #c8c8c8; diff --git a/stuff/config/qss/gray_072/imgs/nextkey.png b/stuff/config/qss/gray_072/imgs/nextkey.png new file mode 100644 index 0000000..ce8ccb4 Binary files /dev/null and b/stuff/config/qss/gray_072/imgs/nextkey.png differ diff --git a/stuff/config/qss/gray_072/imgs/nextkey_disabled.png b/stuff/config/qss/gray_072/imgs/nextkey_disabled.png new file mode 100644 index 0000000..1f667f2 Binary files /dev/null and b/stuff/config/qss/gray_072/imgs/nextkey_disabled.png differ diff --git a/stuff/config/qss/gray_072/imgs/nextkey_over.png b/stuff/config/qss/gray_072/imgs/nextkey_over.png new file mode 100644 index 0000000..49b0621 Binary files /dev/null and b/stuff/config/qss/gray_072/imgs/nextkey_over.png differ diff --git a/stuff/config/qss/gray_072/imgs/prevkey.png b/stuff/config/qss/gray_072/imgs/prevkey.png new file mode 100644 index 0000000..d8f71be Binary files /dev/null and b/stuff/config/qss/gray_072/imgs/prevkey.png differ diff --git a/stuff/config/qss/gray_072/imgs/prevkey_disabled.png b/stuff/config/qss/gray_072/imgs/prevkey_disabled.png new file mode 100644 index 0000000..fcaaa93 Binary files /dev/null and b/stuff/config/qss/gray_072/imgs/prevkey_disabled.png differ diff --git a/stuff/config/qss/gray_072/imgs/prevkey_over.png b/stuff/config/qss/gray_072/imgs/prevkey_over.png new file mode 100644 index 0000000..47a67ca Binary files /dev/null and b/stuff/config/qss/gray_072/imgs/prevkey_over.png differ diff --git a/stuff/config/qss/gray_128/gray_128.less b/stuff/config/qss/gray_128/gray_128.less index 66541fe..09cf7ec 100644 --- a/stuff/config/qss/gray_128/gray_128.less +++ b/stuff/config/qss/gray_128/gray_128.less @@ -917,9 +917,26 @@ SpreadsheetViewer { qproperty-ColumnHeaderBorderColor: rgb(46,47,46); qproperty-SelectedColumnTextColor: rgb(255, 0, 0); } -#keyFrameNavigator -{ - border: 0px; +#keyFrameNavigator { + background: none; // Fixes BG overflow + margin: 0; + padding: 0; + border: 0; + & QToolButton { + min-width: 18px; + } + #PreviousKey{ + image: url('@{image_url}/prevkey.png'); + &:disabled{ + image: url('@{image_url}/prevkey_disabled.png'); + } + } + #NextKey{ + image: url('@{image_url}/nextkey.png'); + &:disabled{ + image: url('@{image_url}/nextkey_disabled.png'); + } + } } #ExpressionField diff --git a/stuff/config/qss/gray_128/gray_128.qss b/stuff/config/qss/gray_128/gray_128.qss index e9f4abe..0343bb8 100644 --- a/stuff/config/qss/gray_128/gray_128.qss +++ b/stuff/config/qss/gray_128/gray_128.qss @@ -812,7 +812,25 @@ SpreadsheetViewer { qproperty-SelectedColumnTextColor: #ff0000; } #keyFrameNavigator { - border: 0px; + background: none; + margin: 0; + padding: 0; + border: 0; +} +#keyFrameNavigator QToolButton { + min-width: 18px; +} +#keyFrameNavigator #PreviousKey { + image: url('imgs/prevkey.png'); +} +#keyFrameNavigator #PreviousKey:disabled { + image: url('imgs/prevkey_disabled.png'); +} +#keyFrameNavigator #NextKey { + image: url('imgs/nextkey.png'); +} +#keyFrameNavigator #NextKey:disabled { + image: url('imgs/nextkey_disabled.png'); } #ExpressionField { background-color: #808080; diff --git a/stuff/config/qss/gray_128/gray_128_mac.qss b/stuff/config/qss/gray_128/gray_128_mac.qss index e9f4abe..0343bb8 100644 --- a/stuff/config/qss/gray_128/gray_128_mac.qss +++ b/stuff/config/qss/gray_128/gray_128_mac.qss @@ -812,7 +812,25 @@ SpreadsheetViewer { qproperty-SelectedColumnTextColor: #ff0000; } #keyFrameNavigator { - border: 0px; + background: none; + margin: 0; + padding: 0; + border: 0; +} +#keyFrameNavigator QToolButton { + min-width: 18px; +} +#keyFrameNavigator #PreviousKey { + image: url('imgs/prevkey.png'); +} +#keyFrameNavigator #PreviousKey:disabled { + image: url('imgs/prevkey_disabled.png'); +} +#keyFrameNavigator #NextKey { + image: url('imgs/nextkey.png'); +} +#keyFrameNavigator #NextKey:disabled { + image: url('imgs/nextkey_disabled.png'); } #ExpressionField { background-color: #808080; diff --git a/stuff/config/qss/gray_128/imgs/nextkey.png b/stuff/config/qss/gray_128/imgs/nextkey.png new file mode 100644 index 0000000..1f667f2 Binary files /dev/null and b/stuff/config/qss/gray_128/imgs/nextkey.png differ diff --git a/stuff/config/qss/gray_128/imgs/nextkey_disabled.png b/stuff/config/qss/gray_128/imgs/nextkey_disabled.png new file mode 100644 index 0000000..ce8ccb4 Binary files /dev/null and b/stuff/config/qss/gray_128/imgs/nextkey_disabled.png differ diff --git a/stuff/config/qss/gray_128/imgs/nextkey_over.png b/stuff/config/qss/gray_128/imgs/nextkey_over.png new file mode 100644 index 0000000..49b0621 Binary files /dev/null and b/stuff/config/qss/gray_128/imgs/nextkey_over.png differ diff --git a/stuff/config/qss/gray_128/imgs/prevkey.png b/stuff/config/qss/gray_128/imgs/prevkey.png new file mode 100644 index 0000000..fcaaa93 Binary files /dev/null and b/stuff/config/qss/gray_128/imgs/prevkey.png differ diff --git a/stuff/config/qss/gray_128/imgs/prevkey_disabled.png b/stuff/config/qss/gray_128/imgs/prevkey_disabled.png new file mode 100644 index 0000000..d8f71be Binary files /dev/null and b/stuff/config/qss/gray_128/imgs/prevkey_disabled.png differ diff --git a/stuff/config/qss/gray_128/imgs/prevkey_over.png b/stuff/config/qss/gray_128/imgs/prevkey_over.png new file mode 100644 index 0000000..47a67ca Binary files /dev/null and b/stuff/config/qss/gray_128/imgs/prevkey_over.png differ diff --git a/toonz/sources/toonzqt/keyframenavigator.cpp b/toonz/sources/toonzqt/keyframenavigator.cpp index a9dae21..708f0de 100644 --- a/toonz/sources/toonzqt/keyframenavigator.cpp +++ b/toonz/sources/toonzqt/keyframenavigator.cpp @@ -42,12 +42,15 @@ KeyframeNavigator::KeyframeNavigator(QWidget *parent, TFrameHandle *frameHandle) setObjectName("keyFrameNavigator"); - QIcon previewActIcon = createQIconPNG("prevkey"); - previewActIcon.addFile(QString(":Resources/prevkey_disabled.png"), QSize(), - QIcon::Disabled); - m_actPreviewKey = new QAction(previewActIcon, tr("Previous Key"), this); + QPixmap emptyPrevPixmap(23, 23); // set transparent icon to show button's background + emptyPrevPixmap.fill(Qt::transparent); + QIcon emptyPrevIcon(emptyPrevPixmap); + + m_actPreviewKey = new QAction(emptyPrevIcon, tr("Previous Key"), this); connect(m_actPreviewKey, SIGNAL(triggered()), SLOT(togglePrevKeyAct())); addAction(m_actPreviewKey); + QWidget* prevWidget = widgetForAction(m_actPreviewKey); // obtain a widget generated from QAction + prevWidget->setObjectName("PreviousKey"); m_actKeyNo = new QAction(createQIconPNG("key_no"), tr("Set Key"), this); connect(m_actKeyNo, SIGNAL(triggered()), SLOT(toggleKeyAct())); @@ -62,12 +65,15 @@ KeyframeNavigator::KeyframeNavigator(QWidget *parent, TFrameHandle *frameHandle) connect(m_actKeyTotal, SIGNAL(triggered()), SLOT(toggleKeyAct())); addAction(m_actKeyTotal); - QIcon nextActIcon = createQIconPNG("nextkey"); - nextActIcon.addFile(QString(":Resources/nextkey_disabled.png"), QSize(), - QIcon::Disabled); - m_actNextKey = new QAction(nextActIcon, tr("Next Key"), this); + QPixmap emptyNextPixmap(23, 23); // set transparent icon to show button's background + emptyNextPixmap.fill(Qt::transparent); + QIcon emptyNextIcon(emptyNextPixmap); + + m_actNextKey = new QAction(emptyNextIcon, tr("Next Key"), this); connect(m_actNextKey, SIGNAL(triggered()), SLOT(toggleNextKeyAct())); addAction(m_actNextKey); + QWidget* nextWidget = widgetForAction(m_actNextKey); // obtain a widget generated from QAction + nextWidget->setObjectName("NextKey"); } //-----------------------------------------------------------------------------