razzaline/tahoma2d
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases 1 Wiki Activity

Konero tweaks (#42)

Browse source 
* Fix build with Clang 10

* System depend code deduplication

* Improve multi-layer style picker.

Allows clicking anywhere on a stroke in another layer to pick it -
not just the center.

Fixes #2843.

* Get actual pixel size instead of hard-coding to 1.0.

* Rehide features

* fix pegbar restoring

* gui tweaks

tweaks the gui, makes tpaneltitlebarbutton color states changable in stylesheets

* fix styleeditor chandle mouse event

allow handle to be grabbed properly without slipping

Co-authored-by: Rodney <rodney.baker@gmail.com>
Co-authored-by: Rozhuk Ivan <rozhuk.im@gmail.com>
Co-authored-by: Martin van Zijl <martin.vanzijl@gmail.com>
Co-authored-by: shun-iwasawa <shun.iwasawa@ghibli.jp>
Co-authored-by: Kite <konero@users.noreply.github.com>
This commit is contained in:
Jeremy Bullock 2020-06-04 01:48:08 -06:00 committed by GitHub
parent 1d744ad16d
commit 4566353fe5
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
68 changed files with 1324 additions and 1991 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
.vscode/settings.json vendored Normal file
View file

@ -0,0 +1,21 @@
{
"files.associations": {
"array": "cpp",
"bitset": "cpp",
"deque": "cpp",
"initializer_list": "cpp",
"list": "cpp",
"queue": "cpp",
"random": "cpp",
"regex": "cpp",
"stack": "cpp",
"type_traits": "cpp",
"valarray": "cpp",
"vector": "cpp",
"xhash": "cpp",
"xstring": "cpp",
"xtree": "cpp",
"xutility": "cpp",
"*.ipp": "cpp"
}
}

332
stuff/config/qss/Blue/Blue.qss
View file

@ -120,7 +120,7 @@ PaletteViewer QToolBar QToolButton:hover {
} }
.button-flat:pressed, .button-flat:pressed,
PaletteViewer QToolBar QToolButton:pressed { PaletteViewer QToolBar QToolButton:pressed {
background-color: #212223; background-color: #1c1d1e;
} }
/* ----------------------------------------------------------------------------- /* -----------------------------------------------------------------------------
Component: Frames Component: Frames
@ -129,96 +129,19 @@ PaletteViewer QToolBar QToolButton:pressed {
.GroupBox, .GroupBox,
#LoadLevelFrame, #LoadLevelFrame,
#PsdSettingsGroupBox, #PsdSettingsGroupBox,
#CleanupSettingsFrame, #CleanupSettings #CleanupSettingsFrame,
#CleanupSettings QScrollArea,
#OutputSettingsBox, #OutputSettingsBox,
#OutputSettingsCameraBox, #OutputSettingsCameraBox,
#SolidLineFrame, #SolidLineFrame,
#FunctionParametersPanel, #FunctionParametersPanel,
QGroupBox { QGroupBox {
border: 1 solid #212223; border: 1 solid #1c1d1e;
border-radius: 2; border-radius: 2;
} }
/* ----------------------------------------------------------------------------- /* -----------------------------------------------------------------------------
Component: Icons Component: Icons
----------------------------------------------------------------------------- */ ----------------------------------------------------------------------------- */
/* -----------------------------------------------------------------------------
Component: Tabs
----------------------------------------------------------------------------- */
.tab-container,
#TabBarContainer {
background-color: transparent;
qproperty-BottomAboveLineColor: #323435;
qproperty-BottomBelowLineColor: #212223;
}
.tab-flat,
#StopMotionTabBar::tab,
#StyleEditorTabBar::tab,
#PaletteTabBar::tab,
#FxSettingsTabBar::tab {
background-color: #323435;
border-right: 1 solid #212223;
border-bottom: 1 solid #212223;
color: #94969a;
padding: 3 4 3 4;
}
.tab-flat:hover,
#StopMotionTabBar::tab:hover,
#StyleEditorTabBar::tab:hover,
#PaletteTabBar::tab:hover,
#FxSettingsTabBar::tab:hover {
background-color: #414345;
color: #94969a;
}
.tab-flat:selected,
#StopMotionTabBar::tab:selected,
#StyleEditorTabBar::tab:selected,
#PaletteTabBar::tab:selected,
#FxSettingsTabBar::tab:selected {
background-color: #414345;
color: #ffffff;
border-bottom-color: #414345;
}
.tab-flat:only-one,
#StopMotionTabBar::tab:only-one,
#StyleEditorTabBar::tab:only-one,
#PaletteTabBar::tab:only-one,
#FxSettingsTabBar::tab:only-one {
margin: 0;
}
.tab-round {
background-color: #323435;
border-top: 1 solid #212223;
border-right: 1 solid #212223;
border-left: 1 solid #212223;
border-bottom: 1 solid #212223;
color: #94969a;
margin: 3 -1 0 0;
padding: 2 7 1 7;
}
.tab-round:hover {
background-color: #414345;
color: #94969a;
}
.tab-round:selected {
background-color: #414345;
border-top-right-radius: 2;
border-top-left-radius: 2;
border-bottom-color: #414345;
color: #ffffff;
margin: 1 -1 -1 0;
padding: 2 7 2 7;
}
.tab-round:only-one {
margin: 1 0 0 0;
padding: 3 7 3 7;
}
.tab-round:last {
margin-right: 0;
border-top-right-radius: 2;
}
.tab-round:first {
border-top-left-radius: 2;
}
/* ----------------------------------------------------------------------------- /* -----------------------------------------------------------------------------
Main Main
----------------------------------------------------------------------------- */ ----------------------------------------------------------------------------- */
@ -249,7 +172,7 @@ QSplitter::handle {
width: 4; width: 4;
} }
#TDockPlaceholder { #TDockPlaceholder {
background-color: #F77272; background-color: rgba(0, 0, 0, 0.5);
} }
TPanel { TPanel {
background-color: #141516; background-color: #141516;
@ -260,7 +183,7 @@ TPanel {
#TopBar { #TopBar {
background: #414345; background: #414345;
border: 0; border: 0;
border-bottom: 1 solid #212223; border-bottom: 1 solid #1c1d1e;
height: 21; height: 21;
} }
#TopBar #EditToolLockButton { #TopBar #EditToolLockButton {
@ -292,7 +215,7 @@ QMenuBar::item {
background-color: #414345; background-color: #414345;
border-left: 1 solid #414345; border-left: 1 solid #414345;
margin: 0; margin: 0;
padding: 3 5; padding: 3 5 3 5;
} }
QMenuBar::item:selected { QMenuBar::item:selected {
background-color: rgba(255, 255, 255, 0.15); background-color: rgba(255, 255, 255, 0.15);
@ -305,38 +228,33 @@ QMenuBar::item:pressed {
/* ----------------------------------------------------------------------------- /* -----------------------------------------------------------------------------
Workspaces Workspaces
----------------------------------------------------------------------------- */ ----------------------------------------------------------------------------- */
#TopBarTab {
margin: 0;
padding: 0;
}
#TopBarTab::tab { #TopBarTab::tab {
background-color: #323435; margin: 0;
border-top: 1 solid #212223; padding: 2 7 3 8;
border-right: 1 solid #212223; border-bottom: 0;
color: #94969a;
margin: 0 0 0 0;
padding: 2 8 3 8;
} }
#TopBarTab::tab:hover { #TopBarTab::tab:hover,
background-color: #414345; #TopBarTab::tab:selected {
color: #94969a; border-bottom: 0;
} }
#TopBarTab::tab:selected { #TopBarTab::tab:selected {
background-color: #414345;
color: #ffffff; color: #ffffff;
background-color: #5385a6;
} }
#TopBarTab::tab:first { #TopBarTab QToolButton {
border-left: 1 solid #212223; border-left: 2 solid #1c1d1e;
} border-top: 1 solid #1c1d1e;
#TopBarTab::tab:last { border-right: 1 solid #1c1d1e;
border-right: 1 solid #212223; border-bottom: 0;
margin-left: -1;
margin-top: 0;
} }
/* ----------------------------------------------------------------------------- /* -----------------------------------------------------------------------------
Menu Menu
----------------------------------------------------------------------------- */ ----------------------------------------------------------------------------- */
QMenu { QMenu {
background-color: #414345; background-color: #414345;
border: 1 solid #212223; border: 1 solid #1c1d1e;
color: #d6d8dd; color: #d6d8dd;
padding: 2 0; padding: 2 0;
} }
@ -365,14 +283,14 @@ QMenu::item:disabled:selected {
/* fix for disabled indicator */ /* fix for disabled indicator */
} }
QMenu::separator { QMenu::separator {
border-top: 1 solid #212223; border-top: 1 solid #1c1d1e;
height: 0; height: 0;
margin: 2 0; margin: 2 0;
} }
QMenu::icon { QMenu::icon {
border-radius: 2; border-radius: 2;
margin: 0 0 0 3; margin: 0 0 0 3;
padding: 1; padding: 0;
} }
QMenu::icon:checked { QMenu::icon:checked {
background-color: #5385a6; background-color: #5385a6;
@ -385,7 +303,7 @@ QMenu::indicator {
----------------------------------------------------------------------------- */ ----------------------------------------------------------------------------- */
TPanelTitleBar { TPanelTitleBar {
background-color: #323435; background-color: #323435;
border-color: #212223; border-color: #1c1d1e;
border-style: solid; border-style: solid;
border-width: 0 0 1 0; border-width: 0 0 1 0;
height: 20; height: 20;
@ -397,14 +315,20 @@ TPanelTitleBar {
qproperty-FloatBorderPixmap: url('none'); qproperty-FloatBorderPixmap: url('none');
qproperty-FloatActiveBorderPixmap: url('../Medium/imgs/white/none'); qproperty-FloatActiveBorderPixmap: url('../Medium/imgs/white/none');
} }
TPanelTitleBarButton {
qproperty-RolloverColor: #6e7174;
qproperty-PressedColor: #5385a6;
qproperty-FreezeColor: #C34040;
qproperty-PreviewColor: #00ff9d;
}
/* ----------------------------------------------------------------------------- /* -----------------------------------------------------------------------------
Scrollbars Scrollbars
----------------------------------------------------------------------------- */ ----------------------------------------------------------------------------- */
QAbstractScrollArea::corner { QAbstractScrollArea::corner {
background-color: #2d2f30; background-color: #28292b;
} }
QScrollBar { QScrollBar {
background-color: #2d2f30; background-color: #28292b;
border: 0; border: 0;
} }
QScrollBar:horizontal { QScrollBar:horizontal {
@ -445,13 +369,13 @@ QScrollBar::add-line {
} }
QScrollBar::add-line:horizontal { QScrollBar::add-line:horizontal {
subcontrol-position: right; subcontrol-position: right;
background-color: #2d2f30; background-color: #28292b;
margin: 0; margin: 0;
width: 16; width: 16;
} }
QScrollBar::add-line:vertical { QScrollBar::add-line:vertical {
subcontrol-position: bottom; subcontrol-position: bottom;
background-color: #2d2f30; background-color: #28292b;
margin: 0; margin: 0;
height: 16; height: 16;
} }
@ -461,13 +385,13 @@ QScrollBar::sub-line {
} }
QScrollBar::sub-line:horizontal { QScrollBar::sub-line:horizontal {
subcontrol-position: left; subcontrol-position: left;
background-color: #2d2f30; background-color: #28292b;
margin: 0; margin: 0;
width: 16; width: 16;
} }
QScrollBar::sub-line:vertical { QScrollBar::sub-line:vertical {
subcontrol-position: top; subcontrol-position: top;
background-color: #2d2f30; background-color: #28292b;
margin: 0; margin: 0;
height: 16; height: 16;
} }
@ -512,12 +436,12 @@ QToolBar {
padding: 0; padding: 0;
} }
QToolBar::separator:horizontal { QToolBar::separator:horizontal {
border-left: 1 solid #212223; border-left: 1 solid #1c1d1e;
margin: 0 1; margin: 0 1;
width: 0; width: 0;
} }
QToolBar::separator:vertical { QToolBar::separator:vertical {
border-top: 1 solid #212223; border-top: 1 solid #1c1d1e;
height: 0; height: 0;
margin: 1 0; margin: 1 0;
} }
@ -542,8 +466,8 @@ DvScrollWidget QPushButton,
#ScrollRightButton QPushButton, #ScrollRightButton QPushButton,
#ScrollUpButton QPushButton, #ScrollUpButton QPushButton,
#ScrollDownButton QPushButton { #ScrollDownButton QPushButton {
background-color: #616467; background-color: #414345;
border: 0 solid red; border: 0 solid #1c1d1e;
border-radius: 0; border-radius: 0;
padding: 0; padding: 0;
max-width: 16; max-width: 16;
@ -572,11 +496,11 @@ DvScrollWidget QPushButton:pressed,
min-width: 16; min-width: 16;
} }
#ScrollLeftButton { #ScrollLeftButton {
border-right: 1 solid #212223; border-right: 1 solid #1c1d1e;
image: url('../Medium/imgs/white/scroll-left.svg'); image: url('../Medium/imgs/white/scroll-left.svg');
} }
#ScrollRightButton { #ScrollRightButton {
border-left: 1 solid #212223; border-left: 1 solid #1c1d1e;
margin-left: 3; margin-left: 3;
image: url('../Medium/imgs/white/scroll-right.svg'); image: url('../Medium/imgs/white/scroll-right.svg');
} }
@ -614,14 +538,14 @@ DvScrollWidget QPushButton:pressed,
image: url('../Medium/imgs/white/nextkey_disabled.svg'); image: url('../Medium/imgs/white/nextkey_disabled.svg');
} }
/* ----------------------------------------------------------------------------- /* -----------------------------------------------------------------------------
Trees Item Tree
----------------------------------------------------------------------------- */ ----------------------------------------------------------------------------- */
.treeview, .treeview,
QTreeWidget, QTreeWidget,
QTreeView, QTreeView,
#FunctionEditorTree { #FunctionEditorTree {
background-color: #2d2f30; background-color: #28292b;
alternate-background-color: #323435; alternate-background-color: #303133;
border: 0; border: 0;
margin: 0; margin: 0;
outline: 0; outline: 0;
@ -688,14 +612,58 @@ QTreeView::branch:has-children:has-siblings:open,
} }
QListView { QListView {
outline: 0; outline: 0;
background: #2d2f30; background: #28292b;
alternate-background-color: #323435; alternate-background-color: #303133;
} }
/* ----------------------------------------------------------------------------- /* -----------------------------------------------------------------------------
Tab Systems Tabs
----------------------------------------------------------------------------- */ ----------------------------------------------------------------------------- */
#TabBarContainer { #TabBarContainer {
background-color: #323435; background-color: #323435;
qproperty-BottomAboveLineColor: #323435;
qproperty-BottomBelowLineColor: #1c1d1e;
}
QTabBar {
background-color: #323435;
margin-bottom: 1;
}
QTabBar QToolButton {
background-color: #414345;
border-radius: 0;
margin-right: 0;
margin-top: -1;
margin-bottom: 0;
border-bottom: 1 solid #1c1d1e;
border-left: 1 solid #1c1d1e;
padding: 3 2 2 2;
}
QTabBar QToolButton:hover {
border-bottom: 1 solid #1c1d1e;
border-left: 1 solid #1c1d1e;
}
QTabBar QToolButton:disabled {
color: rgba(230, 230, 230, 0.4);
}
QTabBar::tab {
margin-top: -1;
background-color: #323435;
border: 1 solid #1c1d1e;
border-right: 0;
color: #94969a;
min-width: 8ex;
padding: 3 4 4 4;
}
QTabBar::tab:selected {
background-color: #414345;
border-bottom-color: #414345;
color: #d6d8dd;
}
QTabBar::tab:hover {
background-color: #414345;
}
QTabBar::tab:last,
QTabBar::tab:only-one {
border-right: 1 solid #1c1d1e;
} }
/* ----------------------------------------------------------------------------- /* -----------------------------------------------------------------------------
Tool Options - Override DvScroll Widget Tool Options - Override DvScroll Widget
@ -861,7 +829,7 @@ QComboBox::drop-down:disabled:editable {
.ComboBox QAbstractItemView, .ComboBox QAbstractItemView,
QComboBox QAbstractItemView { QComboBox QAbstractItemView {
background-color: #414345; background-color: #414345;
border: 1 solid #212223; border: 1 solid #1c1d1e;
selection-background-color: #5385a6; selection-background-color: #5385a6;
selection-color: #ffffff; selection-color: #ffffff;
} }
@ -1158,7 +1126,7 @@ QSlider::handle:horizontal:disabled {
QProgressBar { QProgressBar {
text-align: center; text-align: center;
background-color: #28292b; background-color: #28292b;
border: 1 solid #212223; border: 1 solid #1c1d1e;
border-radius: 3; border-radius: 3;
/* 2 fits inside 3 */ /* 2 fits inside 3 */
padding: 0; padding: 0;
@ -1167,7 +1135,7 @@ QProgressBar::chunk {
margin: -1; margin: -1;
/* hide border of chunk except for right side */ /* hide border of chunk except for right side */
background-color: #15a136; background-color: #15a136;
border: 1 solid #212223; border: 1 solid #1c1d1e;
border-radius: 2; border-radius: 2;
} }
/* ----------------------------------------------------------------------------- /* -----------------------------------------------------------------------------
@ -1176,29 +1144,36 @@ QProgressBar::chunk {
/* Left Pane /* Left Pane
----------------------------------------------------------------------------- */ ----------------------------------------------------------------------------- */
#DirTreeView { #DirTreeView {
background-color: #2d2f30; background-color: #28292b;
alternate-background-color: #2d2f30; alternate-background-color: #28292b;
border: 1 solid #212223; border: 1 solid #1c1d1e;
border-right: 0; border-right: 0;
} }
/* Right Pane /* Right Pane
----------------------------------------------------------------------------- */ ----------------------------------------------------------------------------- */
DvItemViewerPanel { DvItemViewerPanel {
qproperty-TextColor: #d6d8dd; qproperty-TextColor: #d6d8dd;
qproperty-AlternateBackground: #3a3b3d; qproperty-AlternateBackground: #303133;
qproperty-SelectedTextColor: #ffffff; qproperty-SelectedTextColor: #ffffff;
qproperty-FolderTextColor: #9fdaff; qproperty-FolderTextColor: #9fdaff;
qproperty-SelectedItemBackground: #5385a6; qproperty-SelectedItemBackground: #5385a6;
} }
DvItemViewerTitleBar {
qproperty-ColColor: #414345;
qproperty-ColSortedColor: #414345;
qproperty-ColTextColor: #d6d8dd;
qproperty-ColBorderColor: #1c1d1e;
qproperty-ColReliefColor: #414345;
}
#FileBrowser DvItemViewerPanel, #FileBrowser DvItemViewerPanel,
#SceneCast DvItemViewerPanel { #SceneCast DvItemViewerPanel {
background-color: #414345; background-color: #28292b;
} }
#FileBrowser #castFrame, #FileBrowser #castFrame,
#SceneCast #castFrame { #SceneCast #castFrame {
border-top: 1 solid #212223; border-top: 1 solid #1c1d1e;
border-right: 1 solid #212223; border-right: 1 solid #1c1d1e;
border-bottom: 1 solid #212223; border-bottom: 1 solid #1c1d1e;
margin: 0; margin: 0;
} }
#FileBrowser QToolButton, #FileBrowser QToolButton,
@ -1211,9 +1186,9 @@ StyledTreeView {
qproperty-SelectedItemBackground: #5385a6; qproperty-SelectedItemBackground: #5385a6;
qproperty-FolderTextColor: #9fdaff; qproperty-FolderTextColor: #9fdaff;
qproperty-SelectedFolderTextColor: #ffffff; qproperty-SelectedFolderTextColor: #ffffff;
alternate-background-color: #323435; alternate-background-color: #303133;
background-color: #2d2f30; background-color: #28292b;
border: 1 solid #212223; border: 1 solid #1c1d1e;
} }
#FileDoesNotExistLabel { #FileDoesNotExistLabel {
color: #ff0000; color: #ff0000;
@ -1222,7 +1197,7 @@ StyledTreeView {
Scene Cast Scene Cast
----------------------------------------------------------------------------- */ ----------------------------------------------------------------------------- */
#SceneCast QToolBar { #SceneCast QToolBar {
border-top: 1 solid #212223; border-top: 1 solid #1c1d1e;
} }
#SceneCast QToolButton { #SceneCast QToolButton {
margin: 3 1 2 1; margin: 3 1 2 1;
@ -1232,6 +1207,12 @@ StyledTreeView {
border: 0; border: 0;
margin: 0; margin: 0;
} }
#CastBrowser QSplitter::handle {
height: 4;
}
#CastBrowserFolderName {
border-bottom: 1px solid #1c1d1e;
}
/* ----------------------------------------------------------------------------- /* -----------------------------------------------------------------------------
Level Strip Level Strip
----------------------------------------------------------------------------- */ ----------------------------------------------------------------------------- */
@ -1347,14 +1328,14 @@ PencilTestPopup {
margin-left: -4; margin-left: -4;
} }
#StopMotionController #bottomWidget { #StopMotionController #bottomWidget {
border-top: 1 solid #212223; border-top: 1 solid #1c1d1e;
padding: 3 2 8 3; padding: 3 2 8 3;
} }
#StopMotionController #bottomWidget QPushButton { #StopMotionController #bottomWidget QPushButton {
padding: 3 5; padding: 3 5;
} }
#StopMotionTabBar::tab::first { #StopMotionTabBar::tab::first {
border-left: 1 solid #212223; border-left: 1 solid #1c1d1e;
} }
/* ----------------------------------------------------------------------------- /* -----------------------------------------------------------------------------
Unknowns + Legacy Unknowns + Legacy
@ -1385,21 +1366,18 @@ QStatusBar #StatusBarLabel {
Style Editor Style Editor
----------------------------------------------------------------------------- */ ----------------------------------------------------------------------------- */
#StyleEditor #TabBarContainer { #StyleEditor #TabBarContainer {
margin-left: -5; margin-left: -5px;
} }
#StyleEditor #bottomWidget { #StyleEditor #bottomWidget {
border-top: 1 solid #212223; border-top: 1 solid #1c1d1e;
padding: 3 2 8 3; padding: 3 2 8 3;
} }
#StyleEditor #bottomWidget QPushButton { #StyleEditor #bottomWidget QPushButton {
padding: 3 5; padding: 3 5;
} }
#StyleEditorTabBar { #StyleEditorTabBar::tab:first,
padding: 0; #StyleEditorTabBar::tab:only-one {
margin: 0; border-left: 0;
}
#StyleEditorTabBar::tab:first {
border-left: 1 solid #212223;
} }
#HexagonalColorWheel { #HexagonalColorWheel {
qproperty-BGColor: #414345; qproperty-BGColor: #414345;
@ -1421,7 +1399,7 @@ QStatusBar #StatusBarLabel {
image-position: center center; image-position: center center;
min-height: 16; min-height: 16;
padding: 0; padding: 0;
min-width: 18; min-width: 10;
} }
#colorSliderAddButton { #colorSliderAddButton {
image: url('../Medium/imgs/white/scroll-right.svg'); image: url('../Medium/imgs/white/scroll-right.svg');
@ -1430,7 +1408,7 @@ QStatusBar #StatusBarLabel {
image: url('../Medium/imgs/white/scroll-left.svg'); image: url('../Medium/imgs/white/scroll-left.svg');
} }
#PlainColorPageParts { #PlainColorPageParts {
border-bottom: 1 solid #212223; border-bottom: 1 solid #1c1d1e;
} }
#PlainColorPageParts QLineEdit { #PlainColorPageParts QLineEdit {
max-width: 35; max-width: 35;
@ -1464,11 +1442,16 @@ PaletteViewer QToolBar QToolButton {
margin: 0; margin: 0;
padding: 2 0 2 0; padding: 2 0 2 0;
} }
#PaletteTabBar::tab { #PaletteTabBar::tab:first,
padding-bottom: 4; #PaletteTabBar::tab:only-one {
border-left: 0;
}
#PaletteTabBar::tab:only-one {
border-right: 1 solid #1c1d1e;
} }
#PageViewer { #PageViewer {
qproperty-TextColor: #d6d8dd; qproperty-TextColor: #d6d8dd;
qproperty-ListLineColor: #1c1d1e;
} }
#PaletteLockButton { #PaletteLockButton {
border-radius: 0; border-radius: 0;
@ -1496,7 +1479,7 @@ QDialog {
} }
QDialog #dialogButtonFrame { QDialog #dialogButtonFrame {
background-color: #37393a; background-color: #37393a;
border-top: 1 solid #212223; border-top: 1 solid #1c1d1e;
} }
QDialog #dialogButtonFrame QPushButton { QDialog #dialogButtonFrame QPushButton {
border-color: #37393a; border-color: #37393a;
@ -1525,9 +1508,9 @@ QDialog #dialogButtonFrame QPushButton:focus:pressed {
Preferences Preferences
----------------------------------------------------------------------------- */ ----------------------------------------------------------------------------- */
#PreferencesPopup QListWidget { #PreferencesPopup QListWidget {
background-color: #2d2f30; background-color: #28292b;
alternate-background-color: #2d2f30; alternate-background-color: #28292b;
border: 1 solid #212223; border: 1 solid #1c1d1e;
font-size: 13px; font-size: 13px;
} }
#PreferencesPopup QListWidget::item { #PreferencesPopup QListWidget::item {
@ -1546,7 +1529,7 @@ QDialog #dialogButtonFrame QPushButton:focus:pressed {
Keyboard Shortcuts Keyboard Shortcuts
----------------------------------------------------------------------------- */ ----------------------------------------------------------------------------- */
#ShortcutTree { #ShortcutTree {
border: 1 solid #212223; border: 1 solid #1c1d1e;
} }
#ShortcutTree::item { #ShortcutTree::item {
padding: 1 0; padding: 1 0;
@ -1642,22 +1625,13 @@ SchematicViewer {
} }
#SchematicSceneViewer { #SchematicSceneViewer {
background-color: #353638; background-color: #353638;
border-bottom: 1 solid #212223; border-bottom: 1 solid #1c1d1e;
} }
/* ----------------------------------------------------------------------------- /* -----------------------------------------------------------------------------
FX Settings FX Settings
----------------------------------------------------------------------------- */ ----------------------------------------------------------------------------- */
#FxSettingsTabBar::tab {
border-top: 1 solid #212223;
}
#FxSettingsTabBar::tab::first,
#FxSettingsTabBar::tab::only-one {
border-left: 1 solid #212223;
}
FxSettings QToolBar { FxSettings QToolBar {
border-top: 1 solid #212223; border: 1 1 0 1 solid #1c1d1e;
border-right: 1 solid #212223;
border-left: 1 solid #212223;
min-height: 23; min-height: 23;
padding: 3 0; padding: 3 0;
} }
@ -1701,7 +1675,7 @@ ChannelBar {
color: #d6d8dd; color: #d6d8dd;
} }
#Tasks QToolBar { #Tasks QToolBar {
border-bottom: 1 solid #212223; border-bottom: 1 solid #1c1d1e;
margin: 0; margin: 0;
padding: 0; padding: 0;
} }
@ -1718,11 +1692,11 @@ ChannelBar {
Tool Options Tool Options
----------------------------------------------------------------------------- */ ----------------------------------------------------------------------------- */
#ToolOptions TPanelTitleBar { #ToolOptions TPanelTitleBar {
border-right: 1 solid #212223; border-right: 1 solid #1c1d1e;
border-bottom: 0; border-bottom: 0;
} }
#CommandBar TPanelTitleBar { #CommandBar TPanelTitleBar {
border-right: 1 solid #212223; border-right: 1 solid #1c1d1e;
border-bottom: 0; border-bottom: 0;
} }
IconViewField { IconViewField {
@ -1815,7 +1789,7 @@ QToolBar#WidePaddingToolBar QToolButton {
ComboViewer / Viewer / FlipBook ComboViewer / Viewer / FlipBook
----------------------------------------------------------------------------- */ ----------------------------------------------------------------------------- */
#ComboViewerPanel Toolbar { #ComboViewerPanel Toolbar {
border-bottom: 1 solid #212223; border-bottom: 1 solid #1c1d1e;
} }
#ComboViewerPanel Toolbar::separator:horizontal { #ComboViewerPanel Toolbar::separator:horizontal {
margin: 0 0 0 2; margin: 0 0 0 2;
@ -1824,14 +1798,14 @@ QToolBar#WidePaddingToolBar QToolButton {
margin: 2 0 3 2; margin: 2 0 3 2;
} }
#ComboViewerToolOptions { #ComboViewerToolOptions {
border-bottom: 1 solid #212223; border-bottom: 1 solid #1c1d1e;
} }
#ComboViewer #ToolBarContainer, #ComboViewer #ToolBarContainer,
#ViewerPanel #ToolBarContainer, #ViewerPanel #ToolBarContainer,
FlipBook #ToolBarContainer { FlipBook #ToolBarContainer {
background-color: transparent; background-color: transparent;
border-top: 2 solid #212223; border-top: 2 solid #1c1d1e;
border-bottom: 1 solid #212223; border-bottom: 1 solid #1c1d1e;
padding-right: -1; padding-right: -1;
} }
#flipCustomize { #flipCustomize {
@ -2069,7 +2043,7 @@ XsheetViewer {
Function Editor Function Editor
----------------------------------------------------------------------------- */ ----------------------------------------------------------------------------- */
#FunctionEditor QToolBar { #FunctionEditor QToolBar {
border-bottom: 1 solid #212223; border-bottom: 1 solid #1c1d1e;
} }
#FunctionEditor QToolBar QToolBar { #FunctionEditor QToolBar QToolBar {
border: 0; border: 0;
@ -2081,7 +2055,7 @@ XsheetViewer {
height: 18; height: 18;
} }
#FunctionEditorTree { #FunctionEditorTree {
border-top: 1 solid #212223; border-top: 1 solid #1c1d1e;
} }
FunctionTreeView { FunctionTreeView {
qproperty-TextColor: #d6d8dd; qproperty-TextColor: #d6d8dd;

452
stuff/config/qss/Dark/Dark.qss
View file

@ -18,8 +18,8 @@
#CleanupSettingsShowButton:checked, #CleanupSettingsShowButton:checked,
#OutputSettingsShowButton:checked, #OutputSettingsShowButton:checked,
#FxSettingsPreviewShowButton:checked { #FxSettingsPreviewShowButton:checked {
background-color: #1e1e1e; background-color: #191919;
border-color: #191919; border-color: #141414;
image: url('../Medium/imgs/white/minus.svg'); image: url('../Medium/imgs/white/minus.svg');
} }
.button-show:checked:pressed, .button-show:checked:pressed,
@ -27,15 +27,15 @@
#CleanupSettingsShowButton:checked:pressed, #CleanupSettingsShowButton:checked:pressed,
#OutputSettingsShowButton:checked:pressed, #OutputSettingsShowButton:checked:pressed,
#FxSettingsPreviewShowButton:checked:pressed { #FxSettingsPreviewShowButton:checked:pressed {
background-color: #1e1e1e; background-color: #191919;
border-color: #191919; border-color: #141414;
} }
.button-show:checked:hover, .button-show:checked:hover,
#LoadLevelShowButton:checked:hover, #LoadLevelShowButton:checked:hover,
#CleanupSettingsShowButton:checked:hover, #CleanupSettingsShowButton:checked:hover,
#OutputSettingsShowButton:checked:hover, #OutputSettingsShowButton:checked:hover,
#FxSettingsPreviewShowButton:checked:hover { #FxSettingsPreviewShowButton:checked:hover {
background-color: #232323; background-color: #1e1e1e;
} }
.button-tool, .button-tool,
QToolButton, QToolButton,
@ -47,7 +47,7 @@ QToolButton,
background-color: rgba(255, 255, 255, 0); background-color: rgba(255, 255, 255, 0);
border: 1 solid rgba(255, 255, 255, 0); border: 1 solid rgba(255, 255, 255, 0);
border-radius: 2; border-radius: 2;
color: #f6f6f6; color: #f3f3f3;
margin: 1; margin: 1;
padding: 0; padding: 0;
} }
@ -60,9 +60,9 @@ QToolButton:hover,
#SchematicBottomFrame QToolBar QToolButton:hover, #SchematicBottomFrame QToolBar QToolButton:hover,
#EditToolLockButton::indicator:hover, #EditToolLockButton::indicator:hover,
#flipCustomize:hover { #flipCustomize:hover {
background-color: #636363; background-color: #5e5e5e;
border-color: #636363; border-color: #5e5e5e;
color: #f6f6f6; color: #f3f3f3;
} }
.button-tool:pressed, .button-tool:pressed,
QToolButton:pressed, QToolButton:pressed,
@ -73,9 +73,9 @@ QToolButton:pressed,
#SchematicBottomFrame QToolBar QToolButton:pressed, #SchematicBottomFrame QToolBar QToolButton:pressed,
#EditToolLockButton::indicator:pressed, #EditToolLockButton::indicator:pressed,
#flipCustomize:pressed { #flipCustomize:pressed {
background-color: #1e1e1e; background-color: #191919;
border-color: #191919; border-color: #141414;
color: #f6f6f6; color: #f3f3f3;
} }
.button-tool:checked, .button-tool:checked,
QToolButton:checked, QToolButton:checked,
@ -105,7 +105,7 @@ QToolButton:disabled,
#SchematicBottomFrame QToolBar QToolButton:disabled, #SchematicBottomFrame QToolBar QToolButton:disabled,
#EditToolLockButton::indicator:disabled, #EditToolLockButton::indicator:disabled,
#flipCustomize:disabled { #flipCustomize:disabled {
color: rgba(233, 233, 233, 0.4); color: rgba(230, 230, 230, 0.4);
} }
.button-flat, .button-flat,
PaletteViewer QToolBar QToolButton { PaletteViewer QToolBar QToolButton {
@ -116,7 +116,7 @@ PaletteViewer QToolBar QToolButton {
} }
.button-flat:hover, .button-flat:hover,
PaletteViewer QToolBar QToolButton:hover { PaletteViewer QToolBar QToolButton:hover {
background-color: #636363; background-color: #5e5e5e;
} }
.button-flat:pressed, .button-flat:pressed,
PaletteViewer QToolBar QToolButton:pressed { PaletteViewer QToolBar QToolButton:pressed {
@ -129,7 +129,8 @@ PaletteViewer QToolBar QToolButton:pressed {
.GroupBox, .GroupBox,
#LoadLevelFrame, #LoadLevelFrame,
#PsdSettingsGroupBox, #PsdSettingsGroupBox,
#CleanupSettingsFrame, #CleanupSettings #CleanupSettingsFrame,
#CleanupSettings QScrollArea,
#OutputSettingsBox, #OutputSettingsBox,
#OutputSettingsCameraBox, #OutputSettingsCameraBox,
#SolidLineFrame, #SolidLineFrame,
@ -141,93 +142,15 @@ QGroupBox {
/* ----------------------------------------------------------------------------- /* -----------------------------------------------------------------------------
Component: Icons Component: Icons
----------------------------------------------------------------------------- */ ----------------------------------------------------------------------------- */
/* -----------------------------------------------------------------------------
Component: Tabs
----------------------------------------------------------------------------- */
.tab-container,
#TabBarContainer {
background-color: transparent;
qproperty-BottomAboveLineColor: #262626;
qproperty-BottomBelowLineColor: #161616;
}
.tab-flat,
#StopMotionTabBar::tab,
#StyleEditorTabBar::tab,
#PaletteTabBar::tab,
#FxSettingsTabBar::tab {
background-color: #262626;
border-right: 1 solid #161616;
border-bottom: 1 solid #161616;
color: #9b9b9b;
padding: 3 4 3 4;
}
.tab-flat:hover,
#StopMotionTabBar::tab:hover,
#StyleEditorTabBar::tab:hover,
#PaletteTabBar::tab:hover,
#FxSettingsTabBar::tab:hover {
background-color: #303030;
color: #9b9b9b;
}
.tab-flat:selected,
#StopMotionTabBar::tab:selected,
#StyleEditorTabBar::tab:selected,
#PaletteTabBar::tab:selected,
#FxSettingsTabBar::tab:selected {
background-color: #303030;
color: #ffffff;
border-bottom-color: #303030;
}
.tab-flat:only-one,
#StopMotionTabBar::tab:only-one,
#StyleEditorTabBar::tab:only-one,
#PaletteTabBar::tab:only-one,
#FxSettingsTabBar::tab:only-one {
margin: 0;
}
.tab-round {
background-color: #262626;
border-top: 1 solid #161616;
border-right: 1 solid #161616;
border-left: 1 solid #161616;
border-bottom: 1 solid #161616;
color: #9b9b9b;
margin: 3 -1 0 0;
padding: 2 7 1 7;
}
.tab-round:hover {
background-color: #303030;
color: #9b9b9b;
}
.tab-round:selected {
background-color: #303030;
border-top-right-radius: 2;
border-top-left-radius: 2;
border-bottom-color: #303030;
color: #ffffff;
margin: 1 -1 -1 0;
padding: 2 7 2 7;
}
.tab-round:only-one {
margin: 1 0 0 0;
padding: 3 7 3 7;
}
.tab-round:last {
margin-right: 0;
border-top-right-radius: 2;
}
.tab-round:first {
border-top-left-radius: 2;
}
/* ----------------------------------------------------------------------------- /* -----------------------------------------------------------------------------
Main Main
----------------------------------------------------------------------------- */ ----------------------------------------------------------------------------- */
QWidget { QWidget {
background-color: #303030; background-color: #303030;
color: #e9e9e9; color: #e6e6e6;
} }
QWidget:disabled { QWidget:disabled {
color: rgba(233, 233, 233, 0.4); color: rgba(230, 230, 230, 0.4);
} }
QFrame { QFrame {
border: 0; border: 0;
@ -244,15 +167,15 @@ QToolTip,
#DockSeparator, #DockSeparator,
QMainWindow::separator, QMainWindow::separator,
QSplitter::handle { QSplitter::handle {
background-color: #0c0c0c; background-color: #020202;
height: 4; height: 4;
width: 4; width: 4;
} }
#TDockPlaceholder { #TDockPlaceholder {
background-color: #F77272; background-color: rgba(0, 0, 0, 0.5);
} }
TPanel { TPanel {
background-color: #0c0c0c; background-color: #020202;
} }
/* ----------------------------------------------------------------------------- /* -----------------------------------------------------------------------------
Topbar Topbar
@ -292,11 +215,11 @@ QMenuBar::item {
background-color: #303030; background-color: #303030;
border-left: 1 solid #303030; border-left: 1 solid #303030;
margin: 0; margin: 0;
padding: 3 5; padding: 3 5 3 5;
} }
QMenuBar::item:selected { QMenuBar::item:selected {
background-color: rgba(255, 255, 255, 0.15); background-color: rgba(255, 255, 255, 0.15);
color: #e9e9e9; color: #e6e6e6;
} }
QMenuBar::item:pressed { QMenuBar::item:pressed {
background-color: #5385a6; background-color: #5385a6;
@ -305,31 +228,26 @@ QMenuBar::item:pressed {
/* ----------------------------------------------------------------------------- /* -----------------------------------------------------------------------------
Workspaces Workspaces
----------------------------------------------------------------------------- */ ----------------------------------------------------------------------------- */
#TopBarTab {
margin: 0;
padding: 0;
}
#TopBarTab::tab { #TopBarTab::tab {
background-color: #262626; margin: 0;
border-top: 1 solid #161616; padding: 2 7 3 8;
border-right: 1 solid #161616; border-bottom: 0;
color: #9b9b9b;
margin: 0 0 0 0;
padding: 2 8 3 8;
} }
#TopBarTab::tab:hover { #TopBarTab::tab:hover,
background-color: #303030; #TopBarTab::tab:selected {
color: #9b9b9b; border-bottom: 0;
} }
#TopBarTab::tab:selected { #TopBarTab::tab:selected {
background-color: #303030;
color: #ffffff; color: #ffffff;
background-color: #5385a6;
} }
#TopBarTab::tab:first { #TopBarTab QToolButton {
border-left: 1 solid #161616; border-left: 2 solid #161616;
} border-top: 1 solid #161616;
#TopBarTab::tab:last {
border-right: 1 solid #161616; border-right: 1 solid #161616;
border-bottom: 0;
margin-left: -1;
margin-top: 0;
} }
/* ----------------------------------------------------------------------------- /* -----------------------------------------------------------------------------
Menu Menu
@ -337,7 +255,7 @@ QMenuBar::item:pressed {
QMenu { QMenu {
background-color: #262626; background-color: #262626;
border: 1 solid #4c4c4c; border: 1 solid #4c4c4c;
color: #e9e9e9; color: #e6e6e6;
padding: 2 0; padding: 2 0;
} }
QMenu::item { QMenu::item {
@ -348,7 +266,7 @@ QMenu::item:selected {
color: #ffffff; color: #ffffff;
} }
QMenu::item:checked { QMenu::item:checked {
color: #e9e9e9; color: #e6e6e6;
} }
QMenu::item:checked:selected { QMenu::item:checked:selected {
background-color: #5385a6; background-color: #5385a6;
@ -356,12 +274,12 @@ QMenu::item:checked:selected {
} }
QMenu::item:disabled { QMenu::item:disabled {
background: none; background: none;
color: rgba(233, 233, 233, 0.4); color: rgba(230, 230, 230, 0.4);
} }
QMenu::item:disabled:selected { QMenu::item:disabled:selected {
background-color: #3a3a3a; background-color: #3a3a3a;
border-color: transparent; border-color: transparent;
color: rgba(233, 233, 233, 0.4); color: rgba(230, 230, 230, 0.4);
/* fix for disabled indicator */ /* fix for disabled indicator */
} }
QMenu::separator { QMenu::separator {
@ -372,7 +290,7 @@ QMenu::separator {
QMenu::icon { QMenu::icon {
border-radius: 2; border-radius: 2;
margin: 0 0 0 3; margin: 0 0 0 3;
padding: 1; padding: 0;
} }
QMenu::icon:checked { QMenu::icon:checked {
background-color: #5385a6; background-color: #5385a6;
@ -384,7 +302,7 @@ QMenu::indicator {
Titlebars Titlebars
----------------------------------------------------------------------------- */ ----------------------------------------------------------------------------- */
TPanelTitleBar { TPanelTitleBar {
background-color: #262626; background-color: #212121;
border-color: #161616; border-color: #161616;
border-style: solid; border-style: solid;
border-width: 0 0 1 0; border-width: 0 0 1 0;
@ -397,14 +315,20 @@ TPanelTitleBar {
qproperty-FloatBorderPixmap: url('none'); qproperty-FloatBorderPixmap: url('none');
qproperty-FloatActiveBorderPixmap: url('../Medium/imgs/white/none'); qproperty-FloatActiveBorderPixmap: url('../Medium/imgs/white/none');
} }
TPanelTitleBarButton {
qproperty-RolloverColor: #5e5e5e;
qproperty-PressedColor: #5385a6;
qproperty-FreezeColor: #C34040;
qproperty-PreviewColor: #00ff9d;
}
/* ----------------------------------------------------------------------------- /* -----------------------------------------------------------------------------
Scrollbars Scrollbars
----------------------------------------------------------------------------- */ ----------------------------------------------------------------------------- */
QAbstractScrollArea::corner { QAbstractScrollArea::corner {
background-color: #262626; background-color: #161616;
} }
QScrollBar { QScrollBar {
background-color: #262626; background-color: #161616;
border: 0; border: 0;
} }
QScrollBar:horizontal { QScrollBar:horizontal {
@ -445,13 +369,13 @@ QScrollBar::add-line {
} }
QScrollBar::add-line:horizontal { QScrollBar::add-line:horizontal {
subcontrol-position: right; subcontrol-position: right;
background-color: #262626; background-color: #161616;
margin: 0; margin: 0;
width: 16; width: 16;
} }
QScrollBar::add-line:vertical { QScrollBar::add-line:vertical {
subcontrol-position: bottom; subcontrol-position: bottom;
background-color: #262626; background-color: #161616;
margin: 0; margin: 0;
height: 16; height: 16;
} }
@ -461,13 +385,13 @@ QScrollBar::sub-line {
} }
QScrollBar::sub-line:horizontal { QScrollBar::sub-line:horizontal {
subcontrol-position: left; subcontrol-position: left;
background-color: #262626; background-color: #161616;
margin: 0; margin: 0;
width: 16; width: 16;
} }
QScrollBar::sub-line:vertical { QScrollBar::sub-line:vertical {
subcontrol-position: top; subcontrol-position: top;
background-color: #262626; background-color: #161616;
margin: 0; margin: 0;
height: 16; height: 16;
} }
@ -542,8 +466,8 @@ DvScrollWidget QPushButton,
#ScrollRightButton QPushButton, #ScrollRightButton QPushButton,
#ScrollUpButton QPushButton, #ScrollUpButton QPushButton,
#ScrollDownButton QPushButton { #ScrollDownButton QPushButton {
background-color: #565656; background-color: #303030;
border: 0 solid red; border: 0 solid #161616;
border-radius: 0; border-radius: 0;
padding: 0; padding: 0;
max-width: 16; max-width: 16;
@ -554,7 +478,7 @@ DvScrollWidget QPushButton:hover,
#ScrollRightButton QPushButton:hover, #ScrollRightButton QPushButton:hover,
#ScrollUpButton QPushButton:hover, #ScrollUpButton QPushButton:hover,
#ScrollDownButton QPushButton:hover { #ScrollDownButton QPushButton:hover {
background-color: #636363; background-color: #5e5e5e;
} }
.DvScrollWidget QPushButton:pressed, .DvScrollWidget QPushButton:pressed,
DvScrollWidget QPushButton:pressed, DvScrollWidget QPushButton:pressed,
@ -562,7 +486,7 @@ DvScrollWidget QPushButton:pressed,
#ScrollRightButton QPushButton:pressed, #ScrollRightButton QPushButton:pressed,
#ScrollUpButton QPushButton:pressed, #ScrollUpButton QPushButton:pressed,
#ScrollDownButton QPushButton:pressed { #ScrollDownButton QPushButton:pressed {
background-color: #1e1e1e; background-color: #191919;
} }
#ScrollLeftButton, #ScrollLeftButton,
#ScrollRightButton, #ScrollRightButton,
@ -614,14 +538,14 @@ DvScrollWidget QPushButton:pressed,
image: url('../Medium/imgs/white/nextkey_disabled.svg'); image: url('../Medium/imgs/white/nextkey_disabled.svg');
} }
/* ----------------------------------------------------------------------------- /* -----------------------------------------------------------------------------
Trees Item Tree
----------------------------------------------------------------------------- */ ----------------------------------------------------------------------------- */
.treeview, .treeview,
QTreeWidget, QTreeWidget,
QTreeView, QTreeView,
#FunctionEditorTree { #FunctionEditorTree {
background-color: #262626; background-color: #212121;
alternate-background-color: #2b2b2b; alternate-background-color: #282828;
border: 0; border: 0;
margin: 0; margin: 0;
outline: 0; outline: 0;
@ -688,51 +612,95 @@ QTreeView::branch:has-children:has-siblings:open,
} }
QListView { QListView {
outline: 0; outline: 0;
background: #262626; background: #212121;
alternate-background-color: #2b2b2b; alternate-background-color: #282828;
} }
/* ----------------------------------------------------------------------------- /* -----------------------------------------------------------------------------
Tab Systems Tabs
----------------------------------------------------------------------------- */ ----------------------------------------------------------------------------- */
#TabBarContainer { #TabBarContainer {
background-color: #262626; background-color: #212121;
qproperty-BottomAboveLineColor: #212121;
qproperty-BottomBelowLineColor: #161616;
}
QTabBar {
background-color: #212121;
margin-bottom: 1;
}
QTabBar QToolButton {
background-color: #303030;
border-radius: 0;
margin-right: 0;
margin-top: -1;
margin-bottom: 0;
border-bottom: 1 solid #161616;
border-left: 1 solid #161616;
padding: 3 2 2 2;
}
QTabBar QToolButton:hover {
border-bottom: 1 solid #161616;
border-left: 1 solid #161616;
}
QTabBar QToolButton:disabled {
color: rgba(230, 230, 230, 0.4);
}
QTabBar::tab {
margin-top: -1;
background-color: #212121;
border: 1 solid #161616;
border-right: 0;
color: #979797;
min-width: 8ex;
padding: 3 4 4 4;
}
QTabBar::tab:selected {
background-color: #303030;
border-bottom-color: #303030;
color: #e6e6e6;
}
QTabBar::tab:hover {
background-color: #303030;
}
QTabBar::tab:last,
QTabBar::tab:only-one {
border-right: 1 solid #161616;
} }
/* ----------------------------------------------------------------------------- /* -----------------------------------------------------------------------------
Tool Options - Override DvScroll Widget Tool Options - Override DvScroll Widget
----------------------------------------------------------------------------- */ ----------------------------------------------------------------------------- */
#toolOptionsPanel QPushButton { #toolOptionsPanel QPushButton {
background-color: #565656; background-color: #515151;
border: 1 solid #303030; border: 1 solid #303030;
border-radius: 2; border-radius: 2;
color: #f6f6f6; color: #f3f3f3;
margin: 0; margin: 0;
padding: 0; padding: 0;
} }
#toolOptionsPanel QPushButton:hover { #toolOptionsPanel QPushButton:hover {
background-color: #636363; background-color: #5e5e5e;
border-color: #303030; border-color: #303030;
color: #f6f6f6; color: #f3f3f3;
} }
#toolOptionsPanel QPushButton:pressed { #toolOptionsPanel QPushButton:pressed {
background-color: #1e1e1e; background-color: #191919;
border-color: #191919; border-color: #141414;
color: #f6f6f6; color: #f3f3f3;
} }
#toolOptionsPanel QPushButton:checked { #toolOptionsPanel QPushButton:checked {
background-color: #1e1e1e; background-color: #191919;
border-color: #191919; border-color: #141414;
color: #f6f6f6; color: #f3f3f3;
} }
#toolOptionsPanel QPushButton:checked:hover { #toolOptionsPanel QPushButton:checked:hover {
background-color: #232323; background-color: #1e1e1e;
} }
#toolOptionsPanel QPushButton:checked:hover:pressed { #toolOptionsPanel QPushButton:checked:hover:pressed {
background: #1e1e1e; background: #191919;
} }
#toolOptionsPanel QPushButton:disabled { #toolOptionsPanel QPushButton:disabled {
background-color: #3d3d3d; background-color: #3d3d3d;
border-color: #303030; border-color: #303030;
color: rgba(233, 233, 233, 0.4); color: rgba(230, 230, 230, 0.4);
} }
/* ----------------------------------------------------------------------------- /* -----------------------------------------------------------------------------
Push Button Push Button
@ -743,10 +711,10 @@ QPushButton,
.ComboBox:checked, .ComboBox:checked,
QComboBox, QComboBox,
QComboBox:checked { QComboBox:checked {
background-color: #565656; background-color: #515151;
border: 1 solid #303030; border: 1 solid #303030;
border-radius: 2; border-radius: 2;
color: #f6f6f6; color: #f3f3f3;
margin: 0; margin: 0;
padding: 3 15; padding: 3 15;
} }
@ -754,31 +722,31 @@ QComboBox:checked {
QPushButton:hover, QPushButton:hover,
#ViewerFpsSlider::sub-line:horizontal:hover, #ViewerFpsSlider::sub-line:horizontal:hover,
#ViewerFpsSlider::add-line:horizontal:hover { #ViewerFpsSlider::add-line:horizontal:hover {
background-color: #636363; background-color: #5e5e5e;
border-color: #303030; border-color: #303030;
color: #f6f6f6; color: #f3f3f3;
} }
.Button:pressed, .Button:pressed,
QPushButton:pressed, QPushButton:pressed,
#ViewerFpsSlider::sub-line:horizontal:pressed, #ViewerFpsSlider::sub-line:horizontal:pressed,
#ViewerFpsSlider::add-line:horizontal:pressed { #ViewerFpsSlider::add-line:horizontal:pressed {
background-color: #1e1e1e; background-color: #191919;
border-color: #191919; border-color: #141414;
color: #f6f6f6; color: #f3f3f3;
} }
.Button:checked, .Button:checked,
QPushButton:checked { QPushButton:checked {
background-color: #1e1e1e; background-color: #191919;
border-color: #191919; border-color: #141414;
color: #f6f6f6; color: #f3f3f3;
} }
.Button:checked:hover, .Button:checked:hover,
QPushButton:checked:hover { QPushButton:checked:hover {
background-color: #232323; background-color: #1e1e1e;
} }
.Button:checked:hover:pressed, .Button:checked:hover:pressed,
QPushButton:checked:hover:pressed { QPushButton:checked:hover:pressed {
background: #1e1e1e; background: #191919;
} }
.Button:disabled, .Button:disabled,
QPushButton:disabled, QPushButton:disabled,
@ -788,7 +756,7 @@ QPushButton:disabled,
QComboBox:disabled { QComboBox:disabled {
background-color: #3d3d3d; background-color: #3d3d3d;
border-color: #303030; border-color: #303030;
color: rgba(233, 233, 233, 0.4); color: rgba(230, 230, 230, 0.4);
} }
#PushButton_NoPadding { #PushButton_NoPadding {
padding: 3; padding: 3;
@ -806,14 +774,14 @@ QComboBox:checked {
.ComboBox:editable, .ComboBox:editable,
QComboBox:editable { QComboBox:editable {
/* for editable ComboBox */ /* for editable ComboBox */
color: #e9e9e9; color: #e6e6e6;
background-color: #1c1c1c; background-color: #1c1c1c;
border-color: #4a4a4a; border-color: #4a4a4a;
padding: 1 0 1 3; padding: 1 0 1 3;
} }
.ComboBox:hover, .ComboBox:hover,
QComboBox:hover { QComboBox:hover {
background-color: #636363; background-color: #5e5e5e;
} }
.ComboBox:hover:editable, .ComboBox:hover:editable,
QComboBox:hover:editable { QComboBox:hover:editable {
@ -836,18 +804,18 @@ QComboBox::drop-down {
} }
.ComboBox::drop-down:editable, .ComboBox::drop-down:editable,
QComboBox::drop-down:editable { QComboBox::drop-down:editable {
background-color: #565656; background-color: #515151;
border-left: 0 solid #303030; border-left: 0 solid #303030;
border-top-right-radius: 1; border-top-right-radius: 1;
border-bottom-right-radius: 1; border-bottom-right-radius: 1;
} }
.ComboBox::drop-down:hover, .ComboBox::drop-down:hover,
QComboBox::drop-down:hover { QComboBox::drop-down:hover {
border-color: #636363; border-color: #5e5e5e;
} }
.ComboBox::drop-down:hover:editable, .ComboBox::drop-down:hover:editable,
QComboBox::drop-down:hover:editable { QComboBox::drop-down:hover:editable {
background-color: #636363; background-color: #5e5e5e;
border-color: #303030; border-color: #303030;
} }
.ComboBox::drop-down:disabled, .ComboBox::drop-down:disabled,
@ -877,7 +845,7 @@ QLineEdit,
background-color: #1c1c1c; background-color: #1c1c1c;
border: 1 solid #4a4a4a; border: 1 solid #4a4a4a;
border-radius: 2; border-radius: 2;
color: #e9e9e9; color: #e6e6e6;
selection-background-color: #5385a6; selection-background-color: #5385a6;
selection-color: #ffffff; selection-color: #ffffff;
padding: 0 0 0 1; padding: 0 0 0 1;
@ -890,7 +858,7 @@ QLineEdit:focus,
#tasksAddBox:focus { #tasksAddBox:focus {
background-color: #1c1c1c; background-color: #1c1c1c;
border-color: #5385a6; border-color: #5385a6;
color: #e9e9e9; color: #e6e6e6;
} }
.LineEdit:disabled, .LineEdit:disabled,
QPlainTextEdit:disabled, QPlainTextEdit:disabled,
@ -900,14 +868,14 @@ QLineEdit:disabled,
#tasksAddBox:disabled { #tasksAddBox:disabled {
background-color: #262626; background-color: #262626;
border-color: #3d3d3d; border-color: #3d3d3d;
color: rgba(233, 233, 233, 0.4); color: rgba(230, 230, 230, 0.4);
} }
/* ----------------------------------------------------------------------------- /* -----------------------------------------------------------------------------
CheckBox CheckBox
----------------------------------------------------------------------------- */ ----------------------------------------------------------------------------- */
.CheckBox, .CheckBox,
QCheckBox { QCheckBox {
color: #e9e9e9; color: #e6e6e6;
} }
.CheckBox:hover, .CheckBox:hover,
QCheckBox:hover { QCheckBox:hover {
@ -915,7 +883,7 @@ QCheckBox:hover {
} }
.CheckBox:disabled, .CheckBox:disabled,
QCheckBox:disabled { QCheckBox:disabled {
color: rgba(233, 233, 233, 0.4); color: rgba(230, 230, 230, 0.4);
} }
.CheckBox::indicator, .CheckBox::indicator,
QMenu::indicator:non-exclusive, QMenu::indicator:non-exclusive,
@ -924,7 +892,7 @@ QCheckBox::indicator,
.GroupBox::indicator, .GroupBox::indicator,
QGroupBox::indicator { QGroupBox::indicator {
background-color: #1c1c1c; background-color: #1c1c1c;
border: 1 solid #636363; border: 1 solid #4a4a4a;
border-radius: 2; border-radius: 2;
height: 9; height: 9;
/* fix for QGroupBox */ /* fix for QGroupBox */
@ -1016,7 +984,7 @@ QGroupBox::indicator:disabled {
----------------------------------------------------------------------------- */ ----------------------------------------------------------------------------- */
.RadioButton, .RadioButton,
QRadioButton { QRadioButton {
color: #e9e9e9; color: #e6e6e6;
padding: 0; padding: 0;
margin: 0; margin: 0;
} }
@ -1026,11 +994,11 @@ QRadioButton:hover {
} }
.RadioButton:checked, .RadioButton:checked,
QRadioButton:checked { QRadioButton:checked {
color: #e9e9e9; color: #e6e6e6;
} }
.RadioButton:disabled, .RadioButton:disabled,
QRadioButton:disabled { QRadioButton:disabled {
color: rgba(233, 233, 233, 0.4); color: rgba(230, 230, 230, 0.4);
} }
.RadioButton::indicator, .RadioButton::indicator,
QMenu::indicator:exclusive, QMenu::indicator:exclusive,
@ -1100,7 +1068,7 @@ QGroupBox::title:hover {
} }
.GroupBox::title:disabled, .GroupBox::title:disabled,
QGroupBox::title:disabled { QGroupBox::title:disabled {
color: rgba(233, 233, 233, 0.4); color: rgba(230, 230, 230, 0.4);
} }
.GroupBox::indicator, .GroupBox::indicator,
QGroupBox::indicator { QGroupBox::indicator {
@ -1109,7 +1077,7 @@ QGroupBox::indicator {
} }
.GroupBox:disabled, .GroupBox:disabled,
QGroupBox:disabled { QGroupBox:disabled {
color: rgba(233, 233, 233, 0.4); color: rgba(230, 230, 230, 0.4);
} }
/* ----------------------------------------------------------------------------- /* -----------------------------------------------------------------------------
Slider Slider
@ -1176,23 +1144,30 @@ QProgressBar::chunk {
/* Left Pane /* Left Pane
----------------------------------------------------------------------------- */ ----------------------------------------------------------------------------- */
#DirTreeView { #DirTreeView {
background-color: #262626; background-color: #212121;
alternate-background-color: #262626; alternate-background-color: #212121;
border: 1 solid #161616; border: 1 solid #161616;
border-right: 0; border-right: 0;
} }
/* Right Pane /* Right Pane
----------------------------------------------------------------------------- */ ----------------------------------------------------------------------------- */
DvItemViewerPanel { DvItemViewerPanel {
qproperty-TextColor: #e9e9e9; qproperty-TextColor: #e6e6e6;
qproperty-AlternateBackground: #282828; qproperty-AlternateBackground: #282828;
qproperty-SelectedTextColor: #ffffff; qproperty-SelectedTextColor: #ffffff;
qproperty-FolderTextColor: #9fdaff; qproperty-FolderTextColor: #9fdaff;
qproperty-SelectedItemBackground: #5385a6; qproperty-SelectedItemBackground: #5385a6;
} }
DvItemViewerTitleBar {
qproperty-ColColor: #303030;
qproperty-ColSortedColor: #303030;
qproperty-ColTextColor: #e6e6e6;
qproperty-ColBorderColor: #161616;
qproperty-ColReliefColor: #303030;
}
#FileBrowser DvItemViewerPanel, #FileBrowser DvItemViewerPanel,
#SceneCast DvItemViewerPanel { #SceneCast DvItemViewerPanel {
background-color: #303030; background-color: #212121;
} }
#FileBrowser #castFrame, #FileBrowser #castFrame,
#SceneCast #castFrame { #SceneCast #castFrame {
@ -1206,13 +1181,13 @@ DvItemViewerPanel {
padding: 1; padding: 1;
} }
StyledTreeView { StyledTreeView {
qproperty-TextColor: #e9e9e9; qproperty-TextColor: #e6e6e6;
qproperty-SelectedTextColor: #ffffff; qproperty-SelectedTextColor: #ffffff;
qproperty-SelectedItemBackground: #5385a6; qproperty-SelectedItemBackground: #5385a6;
qproperty-FolderTextColor: #9fdaff; qproperty-FolderTextColor: #9fdaff;
qproperty-SelectedFolderTextColor: #ffffff; qproperty-SelectedFolderTextColor: #ffffff;
alternate-background-color: #2b2b2b; alternate-background-color: #282828;
background-color: #262626; background-color: #212121;
border: 1 solid #161616; border: 1 solid #161616;
} }
#FileDoesNotExistLabel { #FileDoesNotExistLabel {
@ -1232,6 +1207,12 @@ StyledTreeView {
border: 0; border: 0;
margin: 0; margin: 0;
} }
#CastBrowser QSplitter::handle {
height: 4;
}
#CastBrowserFolderName {
border-bottom: 1px solid #161616;
}
/* ----------------------------------------------------------------------------- /* -----------------------------------------------------------------------------
Level Strip Level Strip
----------------------------------------------------------------------------- */ ----------------------------------------------------------------------------- */
@ -1253,7 +1234,7 @@ StyledTreeView {
margin-bottom: 3; margin-bottom: 3;
} }
ParamsPage { ParamsPage {
qproperty-TextColor: #e9e9e9; qproperty-TextColor: #e6e6e6;
} }
/* ----------------------------------------------------------------------------- /* -----------------------------------------------------------------------------
Camera Settings Camera Settings
@ -1385,7 +1366,7 @@ QStatusBar #StatusBarLabel {
Style Editor Style Editor
----------------------------------------------------------------------------- */ ----------------------------------------------------------------------------- */
#StyleEditor #TabBarContainer { #StyleEditor #TabBarContainer {
margin-left: -5; margin-left: -5px;
} }
#StyleEditor #bottomWidget { #StyleEditor #bottomWidget {
border-top: 1 solid #161616; border-top: 1 solid #161616;
@ -1394,12 +1375,9 @@ QStatusBar #StatusBarLabel {
#StyleEditor #bottomWidget QPushButton { #StyleEditor #bottomWidget QPushButton {
padding: 3 5; padding: 3 5;
} }
#StyleEditorTabBar { #StyleEditorTabBar::tab:first,
padding: 0; #StyleEditorTabBar::tab:only-one {
margin: 0; border-left: 0;
}
#StyleEditorTabBar::tab:first {
border-left: 1 solid #161616;
} }
#HexagonalColorWheel { #HexagonalColorWheel {
qproperty-BGColor: #303030; qproperty-BGColor: #303030;
@ -1421,7 +1399,7 @@ QStatusBar #StatusBarLabel {
image-position: center center; image-position: center center;
min-height: 16; min-height: 16;
padding: 0; padding: 0;
min-width: 18; min-width: 10;
} }
#colorSliderAddButton { #colorSliderAddButton {
image: url('../Medium/imgs/white/scroll-right.svg'); image: url('../Medium/imgs/white/scroll-right.svg');
@ -1464,11 +1442,16 @@ PaletteViewer QToolBar QToolButton {
margin: 0; margin: 0;
padding: 2 0 2 0; padding: 2 0 2 0;
} }
#PaletteTabBar::tab { #PaletteTabBar::tab:first,
padding-bottom: 4; #PaletteTabBar::tab:only-one {
border-left: 0;
}
#PaletteTabBar::tab:only-one {
border-right: 1 solid #161616;
} }
#PageViewer { #PageViewer {
qproperty-TextColor: #e9e9e9; qproperty-TextColor: #e6e6e6;
qproperty-ListLineColor: #161616;
} }
#PaletteLockButton { #PaletteLockButton {
border-radius: 0; border-radius: 0;
@ -1495,25 +1478,25 @@ QDialog {
background-color: #303030; background-color: #303030;
} }
QDialog #dialogButtonFrame { QDialog #dialogButtonFrame {
background-color: #282828; background-color: #262626;
border-top: 1 solid #161616; border-top: 1 solid #161616;
} }
QDialog #dialogButtonFrame QPushButton { QDialog #dialogButtonFrame QPushButton {
border-color: #282828; border-color: #262626;
outline: 0; outline: 0;
} }
QDialog #dialogButtonFrame QPushButton:focus { QDialog #dialogButtonFrame QPushButton:focus {
background-color: #5385a6; background-color: #5385a6;
border-color: #282828; border-color: #262626;
color: #ffffff; color: #ffffff;
} }
QDialog #dialogButtonFrame QPushButton:focus:hover { QDialog #dialogButtonFrame QPushButton:focus:hover {
background-color: #6c98b6; background-color: #6c98b6;
} }
QDialog #dialogButtonFrame QPushButton:focus:pressed { QDialog #dialogButtonFrame QPushButton:focus:pressed {
background-color: #1e1e1e; background-color: #191919;
border-color: #191919; border-color: #141414;
color: #f6f6f6; color: #f3f3f3;
} }
/* ----------------------------------------------------------------------------- /* -----------------------------------------------------------------------------
Scene Settings Scene Settings
@ -1525,8 +1508,8 @@ QDialog #dialogButtonFrame QPushButton:focus:pressed {
Preferences Preferences
----------------------------------------------------------------------------- */ ----------------------------------------------------------------------------- */
#PreferencesPopup QListWidget { #PreferencesPopup QListWidget {
background-color: #262626; background-color: #212121;
alternate-background-color: #262626; alternate-background-color: #212121;
border: 1 solid #161616; border: 1 solid #161616;
font-size: 13px; font-size: 13px;
} }
@ -1535,7 +1518,7 @@ QDialog #dialogButtonFrame QPushButton:focus:pressed {
padding: 3; padding: 3;
} }
#PreferencesPopup QListWidget::item:hover { #PreferencesPopup QListWidget::item:hover {
color: #e9e9e9; color: #e6e6e6;
background-color: rgba(255, 255, 255, 0.15); background-color: rgba(255, 255, 255, 0.15);
} }
#PreferencesPopup QListWidget::item:selected { #PreferencesPopup QListWidget::item:selected {
@ -1590,7 +1573,7 @@ ProjectPopup QLabel {
Schematic Viewer Schematic Viewer
----------------------------------------------------------------------------- */ ----------------------------------------------------------------------------- */
SchematicViewer { SchematicViewer {
qproperty-TextColor: #e9e9e9; qproperty-TextColor: #e6e6e6;
qproperty-VerticalLineColor: rgba(0, 0, 0, 0.6); qproperty-VerticalLineColor: rgba(0, 0, 0, 0.6);
qproperty-LevelColumnColor: #4C6E4C; qproperty-LevelColumnColor: #4C6E4C;
qproperty-VectorColumnColor: #7B7B4C; qproperty-VectorColumnColor: #7B7B4C;
@ -1647,17 +1630,8 @@ SchematicViewer {
/* ----------------------------------------------------------------------------- /* -----------------------------------------------------------------------------
FX Settings FX Settings
----------------------------------------------------------------------------- */ ----------------------------------------------------------------------------- */
#FxSettingsTabBar::tab {
border-top: 1 solid #161616;
}
#FxSettingsTabBar::tab::first,
#FxSettingsTabBar::tab::only-one {
border-left: 1 solid #161616;
}
FxSettings QToolBar { FxSettings QToolBar {
border-top: 1 solid #161616; border: 1 1 0 1 solid #161616;
border-right: 1 solid #161616;
border-left: 1 solid #161616;
min-height: 23; min-height: 23;
padding: 3 0; padding: 3 0;
} }
@ -1677,7 +1651,7 @@ FxSettings QToolBar QToolBar {
background-color: #a8bee7; background-color: #a8bee7;
} }
ChannelBar { ChannelBar {
qproperty-TextColor: #e9e9e9; qproperty-TextColor: #e6e6e6;
} }
/* ----------------------------------------------------------------------------- /* -----------------------------------------------------------------------------
Script Console Script Console
@ -1692,13 +1666,13 @@ ChannelBar {
background-color: #dcdcdc; background-color: #dcdcdc;
} }
#ScriptConsole TPanelTitleBar { #ScriptConsole TPanelTitleBar {
background-color: #262626; background-color: #212121;
} }
/* ----------------------------------------------------------------------------- /* -----------------------------------------------------------------------------
Task Viewer Task Viewer
----------------------------------------------------------------------------- */ ----------------------------------------------------------------------------- */
#TaskSheetItemLabel { #TaskSheetItemLabel {
color: #e9e9e9; color: #e6e6e6;
} }
#Tasks QToolBar { #Tasks QToolBar {
border-bottom: 1 solid #161616; border-bottom: 1 solid #161616;
@ -1801,15 +1775,15 @@ QToolBar#WidePaddingToolBar QToolButton {
#expandButton:checked { #expandButton:checked {
background-color: transparent; background-color: transparent;
border-color: transparent; border-color: transparent;
color: #e9e9e9; color: #e6e6e6;
} }
#expandButton:checked:hover { #expandButton:checked:hover {
background-color: #636363; background-color: #5e5e5e;
border-color: #636363; border-color: #5e5e5e;
} }
#expandButton:checked:pressed { #expandButton:checked:pressed {
background-color: #1e1e1e; background-color: #191919;
border-color: #191919; border-color: #141414;
} }
/* ----------------------------------------------------------------------------- /* -----------------------------------------------------------------------------
ComboViewer / Viewer / FlipBook ComboViewer / Viewer / FlipBook
@ -1867,7 +1841,7 @@ QToolBar#FlipConsolePlayToolBar QToolButton {
} }
#ViewerFpsSlider::sub-line:horizontal { #ViewerFpsSlider::sub-line:horizontal {
subcontrol-origin: absolute; subcontrol-origin: absolute;
background-color: #565656; background-color: #515151;
border: 1 solid #303030; border: 1 solid #303030;
border-top-left-radius: 2; border-top-left-radius: 2;
border-bottom-left-radius: 2; border-bottom-left-radius: 2;
@ -1877,7 +1851,7 @@ QToolBar#FlipConsolePlayToolBar QToolButton {
} }
#ViewerFpsSlider::add-line:horizontal { #ViewerFpsSlider::add-line:horizontal {
subcontrol-position: left; subcontrol-position: left;
background-color: #565656; background-color: #515151;
border: 1 solid #303030; border: 1 solid #303030;
border-top-right-radius: 2; border-top-right-radius: 2;
border-bottom-right-radius: 2; border-bottom-right-radius: 2;
@ -1907,12 +1881,12 @@ FlipSlider {
qproperty-PBMarkerMarginRight: 3; qproperty-PBMarkerMarginRight: 3;
qproperty-notStartedColor: rgba(205, 101, 101, 0.78); qproperty-notStartedColor: rgba(205, 101, 101, 0.78);
qproperty-startedColor: #1abc3f; qproperty-startedColor: #1abc3f;
qproperty-baseColor: #1c1c1c; qproperty-baseColor: #161616;
qproperty-finishedColor: #1c1c1c; qproperty-finishedColor: #161616;
} }
Ruler { Ruler {
qproperty-ParentBGColor: #303030; qproperty-ParentBGColor: #303030;
qproperty-ScaleColor: #e9e9e9; qproperty-ScaleColor: #e6e6e6;
} }
#RulerToolOptionValues { #RulerToolOptionValues {
color: #000000; color: #000000;
@ -1955,7 +1929,7 @@ Ruler {
/* XSheet Spreadsheet /* XSheet Spreadsheet
----------------------------------------------------------------------------- */ ----------------------------------------------------------------------------- */
XsheetViewer { XsheetViewer {
qproperty-TextColor: #e9e9e9; qproperty-TextColor: #e6e6e6;
qproperty-BGColor: #2b2b2b; qproperty-BGColor: #2b2b2b;
qproperty-LightLineColor: rgba(0, 0, 0, 0.25); qproperty-LightLineColor: rgba(0, 0, 0, 0.25);
qproperty-MarkerLineColor: #1E96C4; qproperty-MarkerLineColor: #1E96C4;
@ -2084,7 +2058,7 @@ XsheetViewer {
border-top: 1 solid #161616; border-top: 1 solid #161616;
} }
FunctionTreeView { FunctionTreeView {
qproperty-TextColor: #e9e9e9; qproperty-TextColor: #e6e6e6;
} }
/* Function Editor Spreadsheet /* Function Editor Spreadsheet
----------------------------------------------------------------------------- */ ----------------------------------------------------------------------------- */
@ -2094,7 +2068,7 @@ FunctionPanel {
qproperty-FrameLineColor: #161616; qproperty-FrameLineColor: #161616;
qproperty-OtherCurvesColor: #707070; qproperty-OtherCurvesColor: #707070;
qproperty-RulerBackground: #1b1b1b; qproperty-RulerBackground: #1b1b1b;
qproperty-TextColor: #e9e9e9; qproperty-TextColor: #e6e6e6;
qproperty-SubColor: #000; qproperty-SubColor: #000;
qproperty-SelectedColor: #FFA500; qproperty-SelectedColor: #FFA500;
} }
@ -2113,7 +2087,7 @@ SpreadsheetViewer {
qproperty-SelectedInBetweenColor: #7d7a6c; qproperty-SelectedInBetweenColor: #7d7a6c;
qproperty-SelectedEmptyColor: #545454; qproperty-SelectedEmptyColor: #545454;
qproperty-SelectedSceneRangeEmptyColor: #5d5d5d; qproperty-SelectedSceneRangeEmptyColor: #5d5d5d;
qproperty-TextColor: #e9e9e9; qproperty-TextColor: #e6e6e6;
qproperty-ColumnHeaderBorderColor: #686868; qproperty-ColumnHeaderBorderColor: #686868;
} }
#ExpressionField { #ExpressionField {

694
stuff/config/qss/Light/Light.qss
View file

File diff suppressed because it is too large Load diff

332
stuff/config/qss/Medium/Medium.qss
View file

@ -120,7 +120,7 @@ PaletteViewer QToolBar QToolButton:hover {
} }
.button-flat:pressed, .button-flat:pressed,
PaletteViewer QToolBar QToolButton:pressed { PaletteViewer QToolBar QToolButton:pressed {
background-color: #272727; background-color: #222222;
} }
/* ----------------------------------------------------------------------------- /* -----------------------------------------------------------------------------
Component: Frames Component: Frames
@ -129,96 +129,19 @@ PaletteViewer QToolBar QToolButton:pressed {
.GroupBox, .GroupBox,
#LoadLevelFrame, #LoadLevelFrame,
#PsdSettingsGroupBox, #PsdSettingsGroupBox,
#CleanupSettingsFrame, #CleanupSettings #CleanupSettingsFrame,
#CleanupSettings QScrollArea,
#OutputSettingsBox, #OutputSettingsBox,
#OutputSettingsCameraBox, #OutputSettingsCameraBox,
#SolidLineFrame, #SolidLineFrame,
#FunctionParametersPanel, #FunctionParametersPanel,
QGroupBox { QGroupBox {
border: 1 solid #272727; border: 1 solid #222222;
border-radius: 2; border-radius: 2;
} }
/* ----------------------------------------------------------------------------- /* -----------------------------------------------------------------------------
Component: Icons Component: Icons
----------------------------------------------------------------------------- */ ----------------------------------------------------------------------------- */
/* -----------------------------------------------------------------------------
Component: Tabs
----------------------------------------------------------------------------- */
.tab-container,
#TabBarContainer {
background-color: transparent;
qproperty-BottomAboveLineColor: #393939;
qproperty-BottomBelowLineColor: #272727;
}
.tab-flat,
#StopMotionTabBar::tab,
#StyleEditorTabBar::tab,
#PaletteTabBar::tab,
#FxSettingsTabBar::tab {
background-color: #393939;
border-right: 1 solid #272727;
border-bottom: 1 solid #272727;
color: #a1a1a1;
padding: 3 4 3 4;
}
.tab-flat:hover,
#StopMotionTabBar::tab:hover,
#StyleEditorTabBar::tab:hover,
#PaletteTabBar::tab:hover,
#FxSettingsTabBar::tab:hover {
background-color: #484848;
color: #a1a1a1;
}
.tab-flat:selected,
#StopMotionTabBar::tab:selected,
#StyleEditorTabBar::tab:selected,
#PaletteTabBar::tab:selected,
#FxSettingsTabBar::tab:selected {
background-color: #484848;
color: #ffffff;
border-bottom-color: #484848;
}
.tab-flat:only-one,
#StopMotionTabBar::tab:only-one,
#StyleEditorTabBar::tab:only-one,
#PaletteTabBar::tab:only-one,
#FxSettingsTabBar::tab:only-one {
margin: 0;
}
.tab-round {
background-color: #393939;
border-top: 1 solid #272727;
border-right: 1 solid #272727;
border-left: 1 solid #272727;
border-bottom: 1 solid #272727;
color: #a1a1a1;
margin: 3 -1 0 0;
padding: 2 7 1 7;
}
.tab-round:hover {
background-color: #484848;
color: #a1a1a1;
}
.tab-round:selected {
background-color: #484848;
border-top-right-radius: 2;
border-top-left-radius: 2;
border-bottom-color: #484848;
color: #ffffff;
margin: 1 -1 -1 0;
padding: 2 7 2 7;
}
.tab-round:only-one {
margin: 1 0 0 0;
padding: 3 7 3 7;
}
.tab-round:last {
margin-right: 0;
border-top-right-radius: 2;
}
.tab-round:first {
border-top-left-radius: 2;
}
/* ----------------------------------------------------------------------------- /* -----------------------------------------------------------------------------
Main Main
----------------------------------------------------------------------------- */ ----------------------------------------------------------------------------- */
@ -249,7 +172,7 @@ QSplitter::handle {
width: 4; width: 4;
} }
#TDockPlaceholder { #TDockPlaceholder {
background-color: #F77272; background-color: rgba(0, 0, 0, 0.5);
} }
TPanel { TPanel {
background-color: #1a1a1a; background-color: #1a1a1a;
@ -260,7 +183,7 @@ TPanel {
#TopBar { #TopBar {
background: #484848; background: #484848;
border: 0; border: 0;
border-bottom: 1 solid #272727; border-bottom: 1 solid #222222;
height: 21; height: 21;
} }
#TopBar #EditToolLockButton { #TopBar #EditToolLockButton {
@ -292,7 +215,7 @@ QMenuBar::item {
background-color: #484848; background-color: #484848;
border-left: 1 solid #484848; border-left: 1 solid #484848;
margin: 0; margin: 0;
padding: 3 5; padding: 3 5 3 5;
} }
QMenuBar::item:selected { QMenuBar::item:selected {
background-color: rgba(255, 255, 255, 0.15); background-color: rgba(255, 255, 255, 0.15);
@ -305,38 +228,33 @@ QMenuBar::item:pressed {
/* ----------------------------------------------------------------------------- /* -----------------------------------------------------------------------------
Workspaces Workspaces
----------------------------------------------------------------------------- */ ----------------------------------------------------------------------------- */
#TopBarTab {
margin: 0;
padding: 0;
}
#TopBarTab::tab { #TopBarTab::tab {
background-color: #393939; margin: 0;
border-top: 1 solid #272727; padding: 2 7 3 8;
border-right: 1 solid #272727; border-bottom: 0;
color: #a1a1a1;
margin: 0 0 0 0;
padding: 2 8 3 8;
} }
#TopBarTab::tab:hover { #TopBarTab::tab:hover,
background-color: #484848; #TopBarTab::tab:selected {
color: #a1a1a1; border-bottom: 0;
} }
#TopBarTab::tab:selected { #TopBarTab::tab:selected {
background-color: #484848;
color: #ffffff; color: #ffffff;
background-color: #5385a6;
} }
#TopBarTab::tab:first { #TopBarTab QToolButton {
border-left: 1 solid #272727; border-left: 2 solid #222222;
} border-top: 1 solid #222222;
#TopBarTab::tab:last { border-right: 1 solid #222222;
border-right: 1 solid #272727; border-bottom: 0;
margin-left: -1;
margin-top: 0;
} }
/* ----------------------------------------------------------------------------- /* -----------------------------------------------------------------------------
Menu Menu
----------------------------------------------------------------------------- */ ----------------------------------------------------------------------------- */
QMenu { QMenu {
background-color: #484848; background-color: #484848;
border: 1 solid #272727; border: 1 solid #222222;
color: #e6e6e6; color: #e6e6e6;
padding: 2 0; padding: 2 0;
} }
@ -365,14 +283,14 @@ QMenu::item:disabled:selected {
/* fix for disabled indicator */ /* fix for disabled indicator */
} }
QMenu::separator { QMenu::separator {
border-top: 1 solid #272727; border-top: 1 solid #222222;
height: 0; height: 0;
margin: 2 0; margin: 2 0;
} }
QMenu::icon { QMenu::icon {
border-radius: 2; border-radius: 2;
margin: 0 0 0 3; margin: 0 0 0 3;
padding: 1; padding: 0;
} }
QMenu::icon:checked { QMenu::icon:checked {
background-color: #5385a6; background-color: #5385a6;
@ -385,7 +303,7 @@ QMenu::indicator {
----------------------------------------------------------------------------- */ ----------------------------------------------------------------------------- */
TPanelTitleBar { TPanelTitleBar {
background-color: #393939; background-color: #393939;
border-color: #272727; border-color: #222222;
border-style: solid; border-style: solid;
border-width: 0 0 1 0; border-width: 0 0 1 0;
height: 20; height: 20;
@ -397,14 +315,20 @@ TPanelTitleBar {
qproperty-FloatBorderPixmap: url('none'); qproperty-FloatBorderPixmap: url('none');
qproperty-FloatActiveBorderPixmap: url('imgs/white/none'); qproperty-FloatActiveBorderPixmap: url('imgs/white/none');
} }
TPanelTitleBarButton {
qproperty-RolloverColor: #767676;
qproperty-PressedColor: #5385a6;
qproperty-FreezeColor: #C34040;
qproperty-PreviewColor: #00ff9d;
}
/* ----------------------------------------------------------------------------- /* -----------------------------------------------------------------------------
Scrollbars Scrollbars
----------------------------------------------------------------------------- */ ----------------------------------------------------------------------------- */
QAbstractScrollArea::corner { QAbstractScrollArea::corner {
background-color: #343434; background-color: #2f2f2f;
} }
QScrollBar { QScrollBar {
background-color: #343434; background-color: #2f2f2f;
border: 0; border: 0;
} }
QScrollBar:horizontal { QScrollBar:horizontal {
@ -445,13 +369,13 @@ QScrollBar::add-line {
} }
QScrollBar::add-line:horizontal { QScrollBar::add-line:horizontal {
subcontrol-position: right; subcontrol-position: right;
background-color: #343434; background-color: #2f2f2f;
margin: 0; margin: 0;
width: 16; width: 16;
} }
QScrollBar::add-line:vertical { QScrollBar::add-line:vertical {
subcontrol-position: bottom; subcontrol-position: bottom;
background-color: #343434; background-color: #2f2f2f;
margin: 0; margin: 0;
height: 16; height: 16;
} }
@ -461,13 +385,13 @@ QScrollBar::sub-line {
} }
QScrollBar::sub-line:horizontal { QScrollBar::sub-line:horizontal {
subcontrol-position: left; subcontrol-position: left;
background-color: #343434; background-color: #2f2f2f;
margin: 0; margin: 0;
width: 16; width: 16;
} }
QScrollBar::sub-line:vertical { QScrollBar::sub-line:vertical {
subcontrol-position: top; subcontrol-position: top;
background-color: #343434; background-color: #2f2f2f;
margin: 0; margin: 0;
height: 16; height: 16;
} }
@ -512,12 +436,12 @@ QToolBar {
padding: 0; padding: 0;
} }
QToolBar::separator:horizontal { QToolBar::separator:horizontal {
border-left: 1 solid #272727; border-left: 1 solid #222222;
margin: 0 1; margin: 0 1;
width: 0; width: 0;
} }
QToolBar::separator:vertical { QToolBar::separator:vertical {
border-top: 1 solid #272727; border-top: 1 solid #222222;
height: 0; height: 0;
margin: 1 0; margin: 1 0;
} }
@ -542,8 +466,8 @@ DvScrollWidget QPushButton,
#ScrollRightButton QPushButton, #ScrollRightButton QPushButton,
#ScrollUpButton QPushButton, #ScrollUpButton QPushButton,
#ScrollDownButton QPushButton { #ScrollDownButton QPushButton {
background-color: #696969; background-color: #484848;
border: 0 solid red; border: 0 solid #222222;
border-radius: 0; border-radius: 0;
padding: 0; padding: 0;
max-width: 16; max-width: 16;
@ -572,11 +496,11 @@ DvScrollWidget QPushButton:pressed,
min-width: 16; min-width: 16;
} }
#ScrollLeftButton { #ScrollLeftButton {
border-right: 1 solid #272727; border-right: 1 solid #222222;
image: url('imgs/white/scroll-left.svg'); image: url('imgs/white/scroll-left.svg');
} }
#ScrollRightButton { #ScrollRightButton {
border-left: 1 solid #272727; border-left: 1 solid #222222;
margin-left: 3; margin-left: 3;
image: url('imgs/white/scroll-right.svg'); image: url('imgs/white/scroll-right.svg');
} }
@ -614,14 +538,14 @@ DvScrollWidget QPushButton:pressed,
image: url('imgs/white/nextkey_disabled.svg'); image: url('imgs/white/nextkey_disabled.svg');
} }
/* ----------------------------------------------------------------------------- /* -----------------------------------------------------------------------------
Trees Item Tree
----------------------------------------------------------------------------- */ ----------------------------------------------------------------------------- */
.treeview, .treeview,
QTreeWidget, QTreeWidget,
QTreeView, QTreeView,
#FunctionEditorTree { #FunctionEditorTree {
background-color: #343434; background-color: #2f2f2f;
alternate-background-color: #393939; alternate-background-color: #363636;
border: 0; border: 0;
margin: 0; margin: 0;
outline: 0; outline: 0;
@ -688,14 +612,58 @@ QTreeView::branch:has-children:has-siblings:open,
} }
QListView { QListView {
outline: 0; outline: 0;
background: #343434; background: #2f2f2f;
alternate-background-color: #393939; alternate-background-color: #363636;
} }
/* ----------------------------------------------------------------------------- /* -----------------------------------------------------------------------------
Tab Systems Tabs
----------------------------------------------------------------------------- */ ----------------------------------------------------------------------------- */
#TabBarContainer { #TabBarContainer {
background-color: #393939; background-color: #393939;
qproperty-BottomAboveLineColor: #393939;
qproperty-BottomBelowLineColor: #222222;
}
QTabBar {
background-color: #393939;
margin-bottom: 1;
}
QTabBar QToolButton {
background-color: #484848;
border-radius: 0;
margin-right: 0;
margin-top: -1;
margin-bottom: 0;
border-bottom: 1 solid #222222;
border-left: 1 solid #222222;
padding: 3 2 2 2;
}
QTabBar QToolButton:hover {
border-bottom: 1 solid #222222;
border-left: 1 solid #222222;
}
QTabBar QToolButton:disabled {
color: rgba(230, 230, 230, 0.4);
}
QTabBar::tab {
margin-top: -1;
background-color: #393939;
border: 1 solid #222222;
border-right: 0;
color: #a1a1a1;
min-width: 8ex;
padding: 3 4 4 4;
}
QTabBar::tab:selected {
background-color: #484848;
border-bottom-color: #484848;
color: #e6e6e6;
}
QTabBar::tab:hover {
background-color: #484848;
}
QTabBar::tab:last,
QTabBar::tab:only-one {
border-right: 1 solid #222222;
} }
/* ----------------------------------------------------------------------------- /* -----------------------------------------------------------------------------
Tool Options - Override DvScroll Widget Tool Options - Override DvScroll Widget
@ -861,7 +829,7 @@ QComboBox::drop-down:disabled:editable {
.ComboBox QAbstractItemView, .ComboBox QAbstractItemView,
QComboBox QAbstractItemView { QComboBox QAbstractItemView {
background-color: #484848; background-color: #484848;
border: 1 solid #272727; border: 1 solid #222222;
selection-background-color: #5385a6; selection-background-color: #5385a6;
selection-color: #ffffff; selection-color: #ffffff;
} }
@ -1158,7 +1126,7 @@ QSlider::handle:horizontal:disabled {
QProgressBar { QProgressBar {
text-align: center; text-align: center;
background-color: #2f2f2f; background-color: #2f2f2f;
border: 1 solid #272727; border: 1 solid #222222;
border-radius: 3; border-radius: 3;
/* 2 fits inside 3 */ /* 2 fits inside 3 */
padding: 0; padding: 0;
@ -1167,7 +1135,7 @@ QProgressBar::chunk {
margin: -1; margin: -1;
/* hide border of chunk except for right side */ /* hide border of chunk except for right side */
background-color: #15a136; background-color: #15a136;
border: 1 solid #272727; border: 1 solid #222222;
border-radius: 2; border-radius: 2;
} }
/* ----------------------------------------------------------------------------- /* -----------------------------------------------------------------------------
@ -1176,29 +1144,36 @@ QProgressBar::chunk {
/* Left Pane /* Left Pane
----------------------------------------------------------------------------- */ ----------------------------------------------------------------------------- */
#DirTreeView { #DirTreeView {
background-color: #343434; background-color: #2f2f2f;
alternate-background-color: #343434; alternate-background-color: #2f2f2f;
border: 1 solid #272727; border: 1 solid #222222;
border-right: 0; border-right: 0;
} }
/* Right Pane /* Right Pane
----------------------------------------------------------------------------- */ ----------------------------------------------------------------------------- */
DvItemViewerPanel { DvItemViewerPanel {
qproperty-TextColor: #e6e6e6; qproperty-TextColor: #e6e6e6;
qproperty-AlternateBackground: #404040; qproperty-AlternateBackground: #363636;
qproperty-SelectedTextColor: #ffffff; qproperty-SelectedTextColor: #ffffff;
qproperty-FolderTextColor: #9fdaff; qproperty-FolderTextColor: #9fdaff;
qproperty-SelectedItemBackground: #5385a6; qproperty-SelectedItemBackground: #5385a6;
} }
DvItemViewerTitleBar {
qproperty-ColColor: #484848;
qproperty-ColSortedColor: #484848;
qproperty-ColTextColor: #e6e6e6;
qproperty-ColBorderColor: #222222;
qproperty-ColReliefColor: #484848;
}
#FileBrowser DvItemViewerPanel, #FileBrowser DvItemViewerPanel,
#SceneCast DvItemViewerPanel { #SceneCast DvItemViewerPanel {
background-color: #484848; background-color: #2f2f2f;
} }
#FileBrowser #castFrame, #FileBrowser #castFrame,
#SceneCast #castFrame { #SceneCast #castFrame {
border-top: 1 solid #272727; border-top: 1 solid #222222;
border-right: 1 solid #272727; border-right: 1 solid #222222;
border-bottom: 1 solid #272727; border-bottom: 1 solid #222222;
margin: 0; margin: 0;
} }
#FileBrowser QToolButton, #FileBrowser QToolButton,
@ -1211,9 +1186,9 @@ StyledTreeView {
qproperty-SelectedItemBackground: #5385a6; qproperty-SelectedItemBackground: #5385a6;
qproperty-FolderTextColor: #9fdaff; qproperty-FolderTextColor: #9fdaff;
qproperty-SelectedFolderTextColor: #ffffff; qproperty-SelectedFolderTextColor: #ffffff;
alternate-background-color: #393939; alternate-background-color: #363636;
background-color: #343434; background-color: #2f2f2f;
border: 1 solid #272727; border: 1 solid #222222;
} }
#FileDoesNotExistLabel { #FileDoesNotExistLabel {
color: #ff0000; color: #ff0000;
@ -1222,7 +1197,7 @@ StyledTreeView {
Scene Cast Scene Cast
----------------------------------------------------------------------------- */ ----------------------------------------------------------------------------- */
#SceneCast QToolBar { #SceneCast QToolBar {
border-top: 1 solid #272727; border-top: 1 solid #222222;
} }
#SceneCast QToolButton { #SceneCast QToolButton {
margin: 3 1 2 1; margin: 3 1 2 1;
@ -1232,6 +1207,12 @@ StyledTreeView {
border: 0; border: 0;
margin: 0; margin: 0;
} }
#CastBrowser QSplitter::handle {
height: 4;
}
#CastBrowserFolderName {
border-bottom: 1px solid #222222;
}
/* ----------------------------------------------------------------------------- /* -----------------------------------------------------------------------------
Level Strip Level Strip
----------------------------------------------------------------------------- */ ----------------------------------------------------------------------------- */
@ -1347,14 +1328,14 @@ PencilTestPopup {
margin-left: -4; margin-left: -4;
} }
#StopMotionController #bottomWidget { #StopMotionController #bottomWidget {
border-top: 1 solid #272727; border-top: 1 solid #222222;
padding: 3 2 8 3; padding: 3 2 8 3;
} }
#StopMotionController #bottomWidget QPushButton { #StopMotionController #bottomWidget QPushButton {
padding: 3 5; padding: 3 5;
} }
#StopMotionTabBar::tab::first { #StopMotionTabBar::tab::first {
border-left: 1 solid #272727; border-left: 1 solid #222222;
} }
/* ----------------------------------------------------------------------------- /* -----------------------------------------------------------------------------
Unknowns + Legacy Unknowns + Legacy
@ -1385,21 +1366,18 @@ QStatusBar #StatusBarLabel {
Style Editor Style Editor
----------------------------------------------------------------------------- */ ----------------------------------------------------------------------------- */
#StyleEditor #TabBarContainer { #StyleEditor #TabBarContainer {
margin-left: -5; margin-left: -5px;
} }
#StyleEditor #bottomWidget { #StyleEditor #bottomWidget {
border-top: 1 solid #272727; border-top: 1 solid #222222;
padding: 3 2 8 3; padding: 3 2 8 3;
} }
#StyleEditor #bottomWidget QPushButton { #StyleEditor #bottomWidget QPushButton {
padding: 3 5; padding: 3 5;
} }
#StyleEditorTabBar { #StyleEditorTabBar::tab:first,
padding: 0; #StyleEditorTabBar::tab:only-one {
margin: 0; border-left: 0;
}
#StyleEditorTabBar::tab:first {
border-left: 1 solid #272727;
} }
#HexagonalColorWheel { #HexagonalColorWheel {
qproperty-BGColor: #484848; qproperty-BGColor: #484848;
@ -1421,7 +1399,7 @@ QStatusBar #StatusBarLabel {
image-position: center center; image-position: center center;
min-height: 16; min-height: 16;
padding: 0; padding: 0;
min-width: 18; min-width: 10;
} }
#colorSliderAddButton { #colorSliderAddButton {
image: url('imgs/white/scroll-right.svg'); image: url('imgs/white/scroll-right.svg');
@ -1430,7 +1408,7 @@ QStatusBar #StatusBarLabel {
image: url('imgs/white/scroll-left.svg'); image: url('imgs/white/scroll-left.svg');
} }
#PlainColorPageParts { #PlainColorPageParts {
border-bottom: 1 solid #272727; border-bottom: 1 solid #222222;
} }
#PlainColorPageParts QLineEdit { #PlainColorPageParts QLineEdit {
max-width: 35; max-width: 35;
@ -1464,11 +1442,16 @@ PaletteViewer QToolBar QToolButton {
margin: 0; margin: 0;
padding: 2 0 2 0; padding: 2 0 2 0;
} }
#PaletteTabBar::tab { #PaletteTabBar::tab:first,
padding-bottom: 4; #PaletteTabBar::tab:only-one {
border-left: 0;
}
#PaletteTabBar::tab:only-one {
border-right: 1 solid #222222;
} }
#PageViewer { #PageViewer {
qproperty-TextColor: #e6e6e6; qproperty-TextColor: #e6e6e6;
qproperty-ListLineColor: #222222;
} }
#PaletteLockButton { #PaletteLockButton {
border-radius: 0; border-radius: 0;
@ -1496,7 +1479,7 @@ QDialog {
} }
QDialog #dialogButtonFrame { QDialog #dialogButtonFrame {
background-color: #3e3e3e; background-color: #3e3e3e;
border-top: 1 solid #272727; border-top: 1 solid #222222;
} }
QDialog #dialogButtonFrame QPushButton { QDialog #dialogButtonFrame QPushButton {
border-color: #3e3e3e; border-color: #3e3e3e;
@ -1525,9 +1508,9 @@ QDialog #dialogButtonFrame QPushButton:focus:pressed {
Preferences Preferences
----------------------------------------------------------------------------- */ ----------------------------------------------------------------------------- */
#PreferencesPopup QListWidget { #PreferencesPopup QListWidget {
background-color: #343434; background-color: #2f2f2f;
alternate-background-color: #343434; alternate-background-color: #2f2f2f;
border: 1 solid #272727; border: 1 solid #222222;
font-size: 13px; font-size: 13px;
} }
#PreferencesPopup QListWidget::item { #PreferencesPopup QListWidget::item {
@ -1546,7 +1529,7 @@ QDialog #dialogButtonFrame QPushButton:focus:pressed {
Keyboard Shortcuts Keyboard Shortcuts
----------------------------------------------------------------------------- */ ----------------------------------------------------------------------------- */
#ShortcutTree { #ShortcutTree {
border: 1 solid #272727; border: 1 solid #222222;
} }
#ShortcutTree::item { #ShortcutTree::item {
padding: 1 0; padding: 1 0;
@ -1642,22 +1625,13 @@ SchematicViewer {
} }
#SchematicSceneViewer { #SchematicSceneViewer {
background-color: #3b3b3b; background-color: #3b3b3b;
border-bottom: 1 solid #272727; border-bottom: 1 solid #222222;
} }
/* ----------------------------------------------------------------------------- /* -----------------------------------------------------------------------------
FX Settings FX Settings
----------------------------------------------------------------------------- */ ----------------------------------------------------------------------------- */
#FxSettingsTabBar::tab {
border-top: 1 solid #272727;
}
#FxSettingsTabBar::tab::first,
#FxSettingsTabBar::tab::only-one {
border-left: 1 solid #272727;
}
FxSettings QToolBar { FxSettings QToolBar {
border-top: 1 solid #272727; border: 1 1 0 1 solid #222222;
border-right: 1 solid #272727;
border-left: 1 solid #272727;
min-height: 23; min-height: 23;
padding: 3 0; padding: 3 0;
} }
@ -1701,7 +1675,7 @@ ChannelBar {
color: #e6e6e6; color: #e6e6e6;
} }
#Tasks QToolBar { #Tasks QToolBar {
border-bottom: 1 solid #272727; border-bottom: 1 solid #222222;
margin: 0; margin: 0;
padding: 0; padding: 0;
} }
@ -1718,11 +1692,11 @@ ChannelBar {
Tool Options Tool Options
----------------------------------------------------------------------------- */ ----------------------------------------------------------------------------- */
#ToolOptions TPanelTitleBar { #ToolOptions TPanelTitleBar {
border-right: 1 solid #272727; border-right: 1 solid #222222;
border-bottom: 0; border-bottom: 0;
} }
#CommandBar TPanelTitleBar { #CommandBar TPanelTitleBar {
border-right: 1 solid #272727; border-right: 1 solid #222222;
border-bottom: 0; border-bottom: 0;
} }
IconViewField { IconViewField {
@ -1815,7 +1789,7 @@ QToolBar#WidePaddingToolBar QToolButton {
ComboViewer / Viewer / FlipBook ComboViewer / Viewer / FlipBook
----------------------------------------------------------------------------- */ ----------------------------------------------------------------------------- */
#ComboViewerPanel Toolbar { #ComboViewerPanel Toolbar {
border-bottom: 1 solid #272727; border-bottom: 1 solid #222222;
} }
#ComboViewerPanel Toolbar::separator:horizontal { #ComboViewerPanel Toolbar::separator:horizontal {
margin: 0 0 0 2; margin: 0 0 0 2;
@ -1824,14 +1798,14 @@ QToolBar#WidePaddingToolBar QToolButton {
margin: 2 0 3 2; margin: 2 0 3 2;
} }
#ComboViewerToolOptions { #ComboViewerToolOptions {
border-bottom: 1 solid #272727; border-bottom: 1 solid #222222;
} }
#ComboViewer #ToolBarContainer, #ComboViewer #ToolBarContainer,
#ViewerPanel #ToolBarContainer, #ViewerPanel #ToolBarContainer,
FlipBook #ToolBarContainer { FlipBook #ToolBarContainer {
background-color: transparent; background-color: transparent;
border-top: 2 solid #272727; border-top: 2 solid #222222;
border-bottom: 1 solid #272727; border-bottom: 1 solid #222222;
padding-right: -1; padding-right: -1;
} }
#flipCustomize { #flipCustomize {
@ -2069,7 +2043,7 @@ XsheetViewer {
Function Editor Function Editor
----------------------------------------------------------------------------- */ ----------------------------------------------------------------------------- */
#FunctionEditor QToolBar { #FunctionEditor QToolBar {
border-bottom: 1 solid #272727; border-bottom: 1 solid #222222;
} }
#FunctionEditor QToolBar QToolBar { #FunctionEditor QToolBar QToolBar {
border: 0; border: 0;
@ -2081,7 +2055,7 @@ XsheetViewer {
height: 18; height: 18;
} }
#FunctionEditorTree { #FunctionEditorTree {
border-top: 1 solid #272727; border-top: 1 solid #222222;
} }
FunctionTreeView { FunctionTreeView {
qproperty-TextColor: #e6e6e6; qproperty-TextColor: #e6e6e6;

2
stuff/config/qss/Medium/less/.vscode/settings.json vendored
View file

@ -4,7 +4,7 @@
// [EasyLess Extension] Compile Config // [EasyLess Extension] Compile Config
"less.compile": { "less.compile": {
"compress": true, "compress": false,
"sourceMap": false, "sourceMap": false,
"out": false "out": false
}, },

73
stuff/config/qss/Medium/less/Medium.less
View file

@ -5,15 +5,15 @@
// ----------------------------------------------------------------------------- // -----------------------------------------------------------------------------
// This is the default theme. All other themes derive from this. // This is the default theme. All other themes derive from this.
// ----------------------------------------------------------------------------- // -----------------------------------------------------------------------------
// Include All // Include All
@import 'main'; @import 'main';
// Resource Location // Resource Location
@img-url: 'imgs/white'; @img-url: 'imgs/white';
@bg: #484848; @bg: #484848; // normal
@accent: darken(@bg, 13); @bg-dark: darken(@bg, 10); // dark
@accent: darken(@bg, 15); // darkest
@text-color: rgb(230, 230, 230); @text-color: rgb(230, 230, 230);
@text-color-disabled: rgba(230, 230, 230, 0.4); @text-color-disabled: rgba(230, 230, 230, 0.4);
@ -25,7 +25,7 @@
@hl-text-color-secondary: @text-color; @hl-text-color-secondary: @text-color;
@dock-bg-color: darken(@bg, 18); @dock-bg-color: darken(@bg, 18);
@dock-placeholder-color: #F77272; @dock-placeholder-color: rgba(0, 0, 0, 0.5);
@dialogButtonFrame-bg-color: darken(@bg, 4); @dialogButtonFrame-bg-color: darken(@bg, 4);
@dialogButtonFrame-border-color: @accent; @dialogButtonFrame-border-color: @accent;
@ -41,18 +41,18 @@
// Tabs // Tabs
// ----------------------------------------------------------------------------- // -----------------------------------------------------------------------------
// Container
@tabbar-bg-color: darken(@bg, 6); @tabbar-bg-color: darken(@bg, 6);
// Tabs // Tabs
@tab-bg-color: @tabbar-bg-color; @tab-bg-color: @tabbar-bg-color;
@tab-text-color: mix(@tab-bg-color, @text-color, 40); @tab-text-color: mix(@tab-bg-color, @text-color, 40);
@tab-border-color: @accent;
@tab-bg-color-hover: @tab-bg-color-selected; @tab-bg-color-hover: @tab-bg-color-selected;
@tab-text-color-hover: @tab-text-color; @tab-text-color-hover: @tab-text-color;
@tab-bg-color-selected: @bg; @tab-bg-color-selected: @bg;
@tab-text-color-selected: lighten(@text-color, 15); @tab-text-color-selected: @text-color;
// ----------------------------------------------------------------------------- // -----------------------------------------------------------------------------
// Topbar & Workspaces // Topbar & Workspaces
@ -68,8 +68,8 @@
@rooms-tab-bg-color-hover: @tab-bg-color-hover; @rooms-tab-bg-color-hover: @tab-bg-color-hover;
@rooms-text-color-hover: @rooms-tab-text-color; @rooms-text-color-hover: @rooms-tab-text-color;
@rooms-tab-bg-color-selected: @bg; @rooms-tab-bg-color-selected: @hl-bg-color;
@rooms-tab-text-color-selected: @tab-text-color-selected; @rooms-tab-text-color-selected: @hl-text-color;
// ----------------------------------------------------------------------------- // -----------------------------------------------------------------------------
// Menu // Menu
@ -82,22 +82,12 @@
@menu-checkbox-text-color-selected: @text-color; @menu-checkbox-text-color-selected: @text-color;
@menu-item-bg-color-disabled-hover: lighten(@menu-bg-color, 8); @menu-item-bg-color-disabled-hover: lighten(@menu-bg-color, 8);
// -----------------------------------------------------------------------------
// Titlebars
// -----------------------------------------------------------------------------
@title-bg-color: darken(@bg, 6);
@title-text-color: lighten(@bg, 30);
@title-text-color-active: #fff;
@title-active-border-pixmap: 'none';
// ----------------------------------------------------------------------------- // -----------------------------------------------------------------------------
// Scrollbars // Scrollbars
// ----------------------------------------------------------------------------- // -----------------------------------------------------------------------------
// Container // Container
@scrollbar-bg-color: darken(@bg, 8); @scrollbar-bg-color: @bg-dark;
// Handle // Handle
@scrollbar-handle-border-size: 1; @scrollbar-handle-border-size: 1;
@ -153,8 +143,7 @@
@scrollable-button-bg-color: @button-bg-color; @scrollable-button-bg-color: @button-bg-color;
@scrollable-button-bg-color-hover: @button-bg-color-hover; @scrollable-button-bg-color-hover: @button-bg-color-hover;
@scrollable-button-bg-color-pressed: @button-bg-color-pressed; @scrollable-button-bg-color-pressed: @button-bg-color-pressed;
@scrollable-button-border-color: @button-border-color;
@scrollable-button-border-color: red;
// ----------------------------------------------------------------------------- // -----------------------------------------------------------------------------
// Tool Buttons // Tool Buttons
@ -208,6 +197,7 @@
@input-bg-color: darken(@bg, 10); @input-bg-color: darken(@bg, 10);
@input-border-color: darken(@input-bg-color, 1); @input-border-color: darken(@input-bg-color, 1);
@input-border-radius: 2;
@input-text-color: @text-color; @input-text-color: @text-color;
@input-bg-color-focus: @input-bg-color; @input-bg-color-focus: @input-bg-color;
@ -277,13 +267,28 @@
@slider-left-handle-disabled: @slider-handle-img-disabled; @slider-left-handle-disabled: @slider-handle-img-disabled;
@slider-right-handle-disabled: @slider-handle-img-disabled; @slider-right-handle-disabled: @slider-handle-img-disabled;
// -----------------------------------------------------------------------------
// Titlebars
// -----------------------------------------------------------------------------
@title-bg-color: darken(@bg, 6);
@title-text-color: lighten(@bg, 30);
@title-text-color-active: #fff;
@title-active-border-pixmap: 'none';
@title-button-rollover-color: @button-bg-color-hover;
@title-button-pressed-color: @hl-bg-color;
@title-button-freeze-color: @toolbutton-lock-bg-color-checked;
@title-button-preview-color: rgb(0, 255, 157);
// ----------------------------------------------------------------------------- // -----------------------------------------------------------------------------
// File Browser / Trees // File Browser / Trees
// ----------------------------------------------------------------------------- // -----------------------------------------------------------------------------
// Trees // Trees
@tree-bg-color: darken(@bg, 8); @tree-bg-color: darken(@bg, 10);
@tree-bg-color-alt: lighten(@tree-bg-color, 2); @tree-bg-color-alt: lighten(@tree-bg-color, 3);
@prefs-tree-bg-color: @tree-bg-color; @prefs-tree-bg-color: @tree-bg-color;
@prefs-tree-hl-color: @hl-bg-color-secondary; @prefs-tree-hl-color: @hl-bg-color-secondary;
@ -295,9 +300,16 @@
@browser-listview-bg-color: @tree-bg-color; @browser-listview-bg-color: @tree-bg-color;
@browser-listview-bg-color-alt: @browser-listview-bg-color; @browser-listview-bg-color-alt: @browser-listview-bg-color;
// Right Pane // Right Pane: Order Column
@browser-itemview-bg-color: @bg; @browser-itemview-col-color: @bg;
@browser-itemview-bg-color-alt: darken(@browser-itemview-bg-color, 3); @browser-itemview-col-color-sorted: @browser-itemview-col-color;
@browser-itemview-col-text-color: @text-color;
@browser-itemview-col-border-color: @accent;
@browser-itemview-col-relief-color: @browser-itemview-col-color;
// Right Pane: BG
@browser-itemview-bg-color: @tree-bg-color;
@browser-itemview-bg-color-alt: @tree-bg-color-alt;
// ----------------------------------------------------------------------------- // -----------------------------------------------------------------------------
// Viewer Window // Viewer Window
@ -493,15 +505,6 @@
@schematic-text-color: @xsheet-text-color; @schematic-text-color: @xsheet-text-color;
@schematic-VerticalLine-color: @xsheet-VerticalLine-color; @schematic-VerticalLine-color: @xsheet-VerticalLine-color;
@schematic-LevelColumn-color: @xsheet-LevelColumn-color;
@schematic-VectorColumn-color: @xsheet-VectorColumn-color;
@schematic-ChildColumn-color: @xsheet-ChildColumn-color;
@schematic-FullColorColumn-color: @xsheet-FullColorColumn-color;
@schematic-FxColumn-color: @xsheet-FxColumn-color;
@schematic-PaletteColumn-color: @xsheet-PaletteColumn-color;
@schematic-MeshColumn-color: @xsheet-MeshColumn-color;
@schematic-ReferenceColumn-color: @xsheet-ReferenceColumn-color;
@schematic-PreviewButtonBgOn-color: @xsheet-PreviewButtonBgOn-color; @schematic-PreviewButtonBgOn-color: @xsheet-PreviewButtonBgOn-color;
@schematic-PreviewButtonOnImage: @xsheet-PreviewButtonOnImage; @schematic-PreviewButtonOnImage: @xsheet-PreviewButtonOnImage;
@schematic-PreviewButtonBgOff-color: @xsheet-ReferenceColumn-color; @schematic-PreviewButtonBgOff-color: @xsheet-ReferenceColumn-color;

1
stuff/config/qss/Medium/less/components/all.less
View file

@ -5,4 +5,3 @@
@import 'buttons'; @import 'buttons';
@import 'frames'; @import 'frames';
@import 'icons'; @import 'icons';
@import 'tabs';

2
stuff/config/qss/Medium/less/layouts/controls.less
View file

@ -123,7 +123,7 @@ QComboBox {
.LineEdit { .LineEdit {
background-color: @input-bg-color; background-color: @input-bg-color;
border: 1 solid @input-border-color; border: 1 solid @input-border-color;
border-radius: 2; border-radius: @input-border-radius;
color: @input-text-color; color: @input-text-color;
selection-background-color: @input-selection-bg-color; selection-background-color: @input-selection-bg-color;
selection-color: @input-selection-text-color; selection-color: @input-selection-text-color;

17
stuff/config/qss/Medium/less/layouts/filebrowser.less
View file

@ -7,7 +7,7 @@
#DirTreeView { #DirTreeView {
background-color: @browser-listview-bg-color; background-color: @browser-listview-bg-color;
alternate-background-color: @browser-listview-bg-color-alt; alternate-background-color: @browser-listview-bg-color;
border: 1 solid @accent; border: 1 solid @accent;
border-right: 0; border-right: 0;
} }
@ -22,7 +22,13 @@ DvItemViewerPanel {
qproperty-FolderTextColor: @browser-folder-text-color; qproperty-FolderTextColor: @browser-folder-text-color;
qproperty-SelectedItemBackground: @hl-bg-color; qproperty-SelectedItemBackground: @hl-bg-color;
} }
DvItemViewerTitleBar {
qproperty-ColColor: @browser-itemview-col-color;
qproperty-ColSortedColor: @browser-itemview-col-color-sorted;
qproperty-ColTextColor: @browser-itemview-col-text-color;
qproperty-ColBorderColor: @browser-itemview-col-border-color;
qproperty-ColReliefColor: @browser-itemview-col-relief-color;
}
#FileBrowser { #FileBrowser {
& DvItemViewerPanel { & DvItemViewerPanel {
background-color: @browser-itemview-bg-color; background-color: @browser-itemview-bg-color;
@ -84,8 +90,13 @@ StyledTreeView {
} }
} }
// PR #1104
#CastBrowser { #CastBrowser {
border: 0; border: 0;
margin: 0; margin: 0;
& QSplitter::handle {
height: 4;
}
}
#CastBrowserFolderName {
border-bottom: 1px solid @accent;
} }

8
stuff/config/qss/Medium/less/layouts/format.less
View file

@ -7,16 +7,16 @@
& #CleanupSettingsFrame { & #CleanupSettingsFrame {
// space out the boxes vertically // space out the boxes vertically
// needs margin for good placement // needs margin for good placement
&:extend(.frame all);
margin-top: 2; margin-top: 2;
margin-bottom: 4; margin-bottom: 4;
} }
& QGroupBox { & QGroupBox {
margin-bottom: 3; margin-bottom: 3;
} }
} & QScrollArea {
&:extend(.frame all);
#CleanupSettingsFrame { }
&:extend(.frame all);
} }
#CleanupSettingsShowButton { #CleanupSettingsShowButton {

171
stuff/config/qss/Medium/less/layouts/mainwindow.less
View file

@ -10,15 +10,7 @@ QWidget {
} }
} }
TPanel { QFrame { border: 0; margin: 0; padding: 0; }
// Placeholder
}
QFrame {
border: 0;
margin: 0;
padding: 0;
}
QToolTip, QToolTip,
#helpToolTip { #helpToolTip {
@ -42,7 +34,7 @@ QSplitter::handle {
TPanel { TPanel {
background-color: @dock-bg-color; background-color: @dock-bg-color;
} }
/* ----------------------------------------------------------------------------- /* -----------------------------------------------------------------------------
Topbar Topbar
@ -86,7 +78,7 @@ QMenuBar {
background-color: @topbar-bg-color; background-color: @topbar-bg-color;
border-left: 1 solid @topbar-bg-color; // Helps to align with QMenu border-left: 1 solid @topbar-bg-color; // Helps to align with QMenu
margin: 0; margin: 0;
padding: 3 5; padding: 3 5 3 5;
&:selected { &:selected {
.hl-color-secondary; .hl-color-secondary;
} }
@ -101,29 +93,25 @@ QMenuBar {
----------------------------------------------------------------------------- */ ----------------------------------------------------------------------------- */
#TopBarTab { #TopBarTab {
margin: 0;
padding: 0;
&::tab { &::tab {
background-color: @rooms-tab-bg-color; margin: 0;
border-top: 1 solid @accent; padding: 2 7 3 8;
border-right: 1 solid @accent; border-bottom: 0;
color: @rooms-tab-text-color; &:hover, &:selected {
margin: 0 0 0 0; border-bottom: 0;
padding: 2 8 3 8;
&:hover {
background-color: @rooms-tab-bg-color-hover;
color: @rooms-text-color-hover;
} }
&:selected { &:selected {
background-color: @rooms-tab-bg-color-selected;
color: @rooms-tab-text-color-selected; color: @rooms-tab-text-color-selected;
background-color: @rooms-tab-bg-color-selected;
} }
&:first { }
border-left: 1 solid @accent; & QToolButton {
} border-left: 2 solid @accent;
&:last { border-top: 1 solid @accent;
border-right: 1 solid @accent; border-right: 1 solid @accent;
} border-bottom: 0;
margin-left: -1;
margin-top: 0;
} }
} }
@ -165,7 +153,7 @@ QMenu {
&::icon { &::icon {
border-radius: 2; border-radius: 2;
margin: 0 0 0 3; margin: 0 0 0 3;
padding: 1; padding: 0;
&:checked { &:checked {
background-color: @hl-bg-color; background-color: @hl-bg-color;
} }
@ -207,6 +195,13 @@ TPanelTitleBar {
qproperty-FloatActiveBorderPixmap: url('@{img-url}/@{title-active-border-pixmap}'); qproperty-FloatActiveBorderPixmap: url('@{img-url}/@{title-active-border-pixmap}');
} }
TPanelTitleBarButton {
qproperty-RolloverColor: @title-button-rollover-color;
qproperty-PressedColor: @title-button-pressed-color;
qproperty-FreezeColor: @title-button-freeze-color;
qproperty-PreviewColor: @title-button-preview-color;
}
/* ----------------------------------------------------------------------------- /* -----------------------------------------------------------------------------
Scrollbars Scrollbars
----------------------------------------------------------------------------- */ ----------------------------------------------------------------------------- */
@ -377,16 +372,16 @@ QToolButton {
.DvScrollWidget { .DvScrollWidget {
& QPushButton { & QPushButton {
background-color: @scrollable-button-bg-color; background-color: @bg;
border: 0 solid @scrollable-button-border-color; border: 0 solid @accent;
border-radius: 0; border-radius: 0;
padding: 0; padding: 0;
max-width: 16; max-width: 16;
&:hover { &:hover {
background-color: @scrollable-button-bg-color-hover; background-color: @button-bg-color-hover;
} }
&:pressed { &:pressed {
background-color: @scrollable-button-bg-color-pressed; background-color: @button-bg-color-pressed;
} }
} }
} }
@ -452,7 +447,7 @@ DvScrollWidget {
} }
/* ----------------------------------------------------------------------------- /* -----------------------------------------------------------------------------
Trees Item Tree
----------------------------------------------------------------------------- */ ----------------------------------------------------------------------------- */
.treeview { .treeview {
@ -522,14 +517,56 @@ QListView {
} }
/* ----------------------------------------------------------------------------- /* -----------------------------------------------------------------------------
Tab Systems Tabs
----------------------------------------------------------------------------- */ ----------------------------------------------------------------------------- */
#TabBarContainer { #TabBarContainer {
&:extend(.tab-container);
background-color: @tabbar-bg-color; background-color: @tabbar-bg-color;
qproperty-BottomAboveLineColor: @tabbar-bg-color;
qproperty-BottomBelowLineColor: @accent;
}
QTabBar {
background-color: @tabbar-bg-color;
margin-bottom: 1;
&::tear {}
& QToolButton {
background-color: @bg;
border-radius: 0;
margin-right: 0;
margin-top: -1;
margin-bottom: 0;
border-bottom: 1 solid @accent;
border-left: 1 solid @accent;
padding: 3 2 2 2;
&:hover {
border-bottom: 1 solid @accent;
border-left: 1 solid @accent;
}
&:disabled {
color: @text-color-disabled;
}
}
&::tab {
margin-top: -1; // hide top border
background-color: @tabbar-bg-color;
border: 1 solid @tab-border-color;
border-right: 0;
color: @tab-text-color;
min-width: 8ex;
padding: 3 4 4 4; // y = helps borders to show for the TabBar
&:selected {
background-color: @tab-bg-color-selected;
border-bottom-color: @bg;
color: @tab-text-color-selected;
}
&:hover {
background-color: @tab-bg-color-hover;
}
&:last, &:only-one {
border-right: 1 solid @tab-border-color;
}
}
} }
/* ----------------------------------------------------------------------------- /* -----------------------------------------------------------------------------
Tool Options - Override DvScroll Widget Tool Options - Override DvScroll Widget
@ -538,36 +575,36 @@ QListView {
#toolOptionsPanel { #toolOptionsPanel {
QPushButton { QPushButton {
background-color: @button-bg-color; background-color: @button-bg-color;
border: 1 solid @button-border-color; border: 1 solid @button-border-color;
border-radius: 2; border-radius: 2;
color: @button-text-color; color: @button-text-color;
margin: 0; margin: 0;
padding: 0; padding: 0;
&:hover {
background-color: @button-bg-color-hover;
border-color: @button-border-color-hover;
color: @button-text-color-hover;
}
&:pressed {
background-color: @button-bg-color-pressed;
border-color: @button-border-color-pressed;
color: @button-text-color-pressed;
}
&:checked {
background-color: @button-bg-color-checked;
border-color: @button-border-color-checked;
color: @button-text-color-checked;
&:hover { &:hover {
background-color: @button-bg-color-checked-hover; background-color: @button-bg-color-hover;
&:pressed { border-color: @button-border-color-hover;
background: @button-bg-color-checked-hover-pressed; color: @button-text-color-hover;
}
&:pressed {
background-color: @button-bg-color-pressed;
border-color: @button-border-color-pressed;
color: @button-text-color-pressed;
}
&:checked {
background-color: @button-bg-color-checked;
border-color: @button-border-color-checked;
color: @button-text-color-checked;
&:hover {
background-color: @button-bg-color-checked-hover;
&:pressed {
background: @button-bg-color-checked-hover-pressed;
}
} }
} }
&:disabled {
background-color: @button-bg-color-disabled;
border-color: @button-border-color-disabled;
color: @button-text-color-disabled;
}
} }
&:disabled { }
background-color: @button-bg-color-disabled;
border-color: @button-border-color-disabled;
color: @button-text-color-disabled;
}
}
}

37
stuff/config/qss/Medium/less/layouts/palette.less
View file

@ -4,25 +4,21 @@
#StyleEditor { #StyleEditor {
& #TabBarContainer { & #TabBarContainer {
margin-left: -5; // reset left edge margin margin-left: -5px;
} }
& #bottomWidget { & #bottomWidget {
border-top: 1 solid @accent; border-top: 1 solid @accent;
padding: 3 2 8 3; padding: 3 2 8 3;
& QPushButton { & QPushButton {
// override above margin reset
padding: 3 5; padding: 3 5;
} }
} }
} }
#StyleEditorTabBar { #StyleEditorTabBar {
padding: 0;
margin: 0;
&::tab { &::tab {
&:extend(.tab-flat all); &:first, &:only-one {
&:first { border-left: 0;
border-left: 1 solid @accent;
} }
} }
} }
@ -34,7 +30,6 @@
/* -------------------------------------------------------------------------- */ /* -------------------------------------------------------------------------- */
/* Horizontal QSlider */ /* Horizontal QSlider */
#colorSlider { #colorSlider {
&::groove:horizontal { &::groove:horizontal {
height: 1; height: 1;
@ -53,7 +48,7 @@
image-position: center center; image-position: center center;
min-height: 16; min-height: 16;
padding: 0; padding: 0;
min-width: 18; min-width: 10;
&:hover { &:hover {
&:extend(.button-tool:hover); &:extend(.button-tool:hover);
} }
@ -78,9 +73,7 @@
} }
#colorSliderLabel, #colorSliderLabel,
#colorSliderField { #colorSliderField {}
// Placeholder
}
/* ----------------------------------------------------------------------------- /* -----------------------------------------------------------------------------
Palette Viewer / Studio Palette Palette Viewer / Studio Palette
@ -113,29 +106,29 @@ PaletteViewer {
margin: 0; // very compact space so we remove margin margin: 0; // very compact space so we remove margin
} }
& QToolButton { & QToolButton {
&:extend(.button-flat all); &:extend(.button-flat all); // use flat style for button
margin: 0; margin: 0;
padding: 2 0 2 0; padding: 2 0 2 0;
} }
} }
} }
#StudioPalette { #StudioPalette {}
// placeholder
}
#PaletteTabBar { #PaletteTabBar {
&::tab { &::tab {
&:extend(.tab-flat all); &:first, &:only-one {
padding-bottom: 4; // allow QToolBar's bottom border to show border-left: 0;
// since default tab padding is 3 (vert) }
// this adds 1 extra (3+1) &:only-one {
border-right: 1 solid @tab-border-color;
}
} }
} }
#PageViewer { #PageViewer {
qproperty-TextColor: @text-color; qproperty-TextColor: @text-color;
qproperty-ListLineColor: @accent;
} }
#PaletteLockButton { #PaletteLockButton {

33
stuff/config/qss/Medium/less/layouts/schematic.less
View file

@ -6,14 +6,14 @@ SchematicViewer {
qproperty-TextColor: @schematic-text-color; qproperty-TextColor: @schematic-text-color;
qproperty-VerticalLineColor: @schematic-VerticalLine-color; qproperty-VerticalLineColor: @schematic-VerticalLine-color;
qproperty-LevelColumnColor: @schematic-LevelColumn-color; qproperty-LevelColumnColor: @xsheet-LevelColumn-color;
qproperty-VectorColumnColor: @schematic-VectorColumn-color; qproperty-VectorColumnColor: @xsheet-VectorColumn-color;
qproperty-ChildColumnColor: @schematic-ChildColumn-color; qproperty-ChildColumnColor: @xsheet-ChildColumn-color;
qproperty-FullcolorColumnColor: @schematic-FullColorColumn-color; qproperty-FullcolorColumnColor: @xsheet-FullColorColumn-color;
qproperty-FxColumnColor: @schematic-FxColumn-color; qproperty-FxColumnColor: @xsheet-FxColumn-color;
qproperty-PaletteColumnColor: @schematic-PaletteColumn-color; qproperty-PaletteColumnColor: @xsheet-PaletteColumn-color;
qproperty-MeshColumnColor: @schematic-MeshColumn-color; qproperty-MeshColumnColor: @xsheet-MeshColumn-color;
qproperty-ReferenceColumnColor: @schematic-ReferenceColumn-color; qproperty-ReferenceColumnColor: @xsheet-ReferenceColumn-color;
qproperty-TableColor: @schematic-TableColor; qproperty-TableColor: @schematic-TableColor;
qproperty-ActiveCameraColor: @schematic-ActiveCameraColor; qproperty-ActiveCameraColor: @schematic-ActiveCameraColor;
@ -72,22 +72,11 @@ SchematicViewer {
FX Settings FX Settings
----------------------------------------------------------------------------- */ ----------------------------------------------------------------------------- */
#FxSettingsTabBar { #FxSettingsTabBar {}
&::tab {
&:extend(.tab-flat all);
border-top: 1 solid @accent;
&::first,
&::only-one {
border-left: 1 solid @accent;
}
}
}
FxSettings { FxSettings {
& QToolBar { & QToolBar {
border-top: 1 solid @accent; border: 1 1 0 1 solid @accent;
border-right: 1 solid @accent;
border-left: 1 solid @accent;
min-height: 23; // prevent shrinking min-height: 23; // prevent shrinking
padding: 3 0; padding: 3 0;
& QToolBar { & QToolBar {
@ -118,4 +107,4 @@ FxSettings {
ChannelBar { ChannelBar {
qproperty-TextColor: @text-color; qproperty-TextColor: @text-color;
} }

46
stuff/config/qss/Medium/less/themes/Dark.less
View file

@ -12,51 +12,20 @@
@bg: #303030; @bg: #303030;
@accent: darken(@bg, 10); @accent: darken(@bg, 10);
@text-color: rgb(233, 233, 233);
@text-color-disabled: rgba(233, 233, 233, 0.4);
@dock-bg-color: darken(@bg, 14);
@dialogButtonFrame-bg-color: darken(@bg, 3);
// ----------------------------------------------------------------------------- // -----------------------------------------------------------------------------
// Menu // Menu
// ----------------------------------------------------------------------------- // -----------------------------------------------------------------------------
@menu-text-color: @text-color;
@menu-bg-color: darken(@bg, 4); @menu-bg-color: darken(@bg, 4);
@menu-border-color: lighten(@menu-bg-color, 15); @menu-border-color: lighten(@menu-bg-color, 15);
@menu-separator-color: lighten(@menu-bg-color, 15); @menu-separator-color: @menu-border-color;
// ----------------------------------------------------------------------------- // -----------------------------------------------------------------------------
// Trees // Trees
// ----------------------------------------------------------------------------- // -----------------------------------------------------------------------------
@tree-bg-color: darken(@bg, 4); @tree-bg-color: darken(@bg, 6);
// -----------------------------------------------------------------------------
// Tabs
// -----------------------------------------------------------------------------
// Container
@tabbar-bg-color: darken(@bg, 4);
// -----------------------------------------------------------------------------
// Titlebars
// -----------------------------------------------------------------------------
@title-bg-color: darken(@bg, 4);
// -----------------------------------------------------------------------------
// Scroll Bars
// -----------------------------------------------------------------------------
// Frame
@scrollbar-bg-color: darken(@bg, 4);
// -----------------------------------------------------------------------------
// Button
// -----------------------------------------------------------------------------
@button-bg-color: lighten(@bg, 15);
// ----------------------------------------------------------------------------- // -----------------------------------------------------------------------------
// Textfield // Textfield
@ -69,12 +38,10 @@
// CheckBox // CheckBox
// ----------------------------------------------------------------------------- // -----------------------------------------------------------------------------
@checkbox-border-color: lighten(@input-border-color, 10); @checkbox-border-color: @input-border-color;
@checkbox-border-color-disabled: @input-border-color-disabled; @checkbox-border-color-disabled: @input-border-color-disabled;
@checkbox-border-color-hover: lighten(@bg, 70); @checkbox-border-color-hover: lighten(@bg, 70);
@checkbox-border-color-checked: @checkbox-bg-color-checked;
@checkbox-border-color-checked: darken(@checkbox-bg-color-checked, 0);
// For RadioButton // For RadioButton
@radiobutton-img-unchecked: 'radiobutton-dark_unchecked.svg'; @radiobutton-img-unchecked: 'radiobutton-dark_unchecked.svg';
@ -99,7 +66,6 @@
// Flip Slider // Flip Slider
@flipmarker-img: 'flipmarker_dark.svg'; @flipmarker-img: 'flipmarker_dark.svg';
@flipslider-img: 'flipslider_dark.svg'; @flipslider-img: 'flipslider_dark.svg';
@flipslider-base-color: darken(@bg, 8);
// ----------------------------------------------------------------------------- // -----------------------------------------------------------------------------
// Progress Bar // Progress Bar
@ -112,14 +78,10 @@
// ----------------------------------------------------------------------------- // -----------------------------------------------------------------------------
@xsheet-bg-color: darken(@bg, 2); @xsheet-bg-color: darken(@bg, 2);
@xsheet-OnionSkinAreaBG-color: darken(@bg, 4); @xsheet-OnionSkinAreaBG-color: darken(@bg, 4);
@xsheet-EmptyColumnHead-color: lighten(@bg, 8); @xsheet-EmptyColumnHead-color: lighten(@bg, 8);
@xsheet-EmptyCell-color: @bg; @xsheet-EmptyCell-color: @bg;
@xsheet-NotEmptyColumn-color: lighten(@bg, 3); @xsheet-NotEmptyColumn-color: lighten(@bg, 3);
@xsheet-LightLightBG-color: @xsheet-EmptyCell-color; @xsheet-LightLightBG-color: @xsheet-EmptyCell-color;
// ----------------------------------------------------------------------------- // -----------------------------------------------------------------------------

19
stuff/config/qss/Medium/less/themes/Light.less
View file

@ -10,15 +10,15 @@
// Resource Location // Resource Location
@img-url: '../Medium/imgs/black'; @img-url: '../Medium/imgs/black';
@bg: #808080; @bg: #DBDBDB;
@accent: darken(@bg, 25); @accent: darken(@bg, 25);
@text-color: #000; @text-color: #000;
@text-color-disabled: rgba(0, 0, 0, 0.466); @text-color-disabled: rgba(43, 20, 20, 0.466);
@dock-bg-color: darken(@bg, 35); @dock-bg-color: darken(@bg, 35);
@hl-bg-color: rgb(34, 91, 175); @hl-bg-color: #F19A86;
@hl-text-color: #FFFFFF; @hl-text-color: rgb(0, 0, 0);
@hl-bg-color-secondary: lighten(@bg, 12); @hl-bg-color-secondary: lighten(@bg, 12);
@label-title: rgb(0, 0, 0); @label-title: rgb(0, 0, 0);
@ -90,7 +90,7 @@
// ----------------------------------------------------------------------------- // -----------------------------------------------------------------------------
// Trees // Trees
@tree-bg-color: darken(@bg, 5); @tree-bg-color: lighten(@bg, 0);
@tree-bg-color-alt: lighten(@tree-bg-color, 3); @tree-bg-color-alt: lighten(@tree-bg-color, 3);
@prefs-tree-bg-color: @tree-bg-color; @prefs-tree-bg-color: @tree-bg-color;
@prefs-tree-hl-color: lighten(@prefs-tree-bg-color, 8); @prefs-tree-hl-color: lighten(@prefs-tree-bg-color, 8);
@ -104,7 +104,7 @@
@browser-listview-bg-color-alt: @browser-listview-bg-color; @browser-listview-bg-color-alt: @browser-listview-bg-color;
// Right Pane // Right Pane
@browser-itemview-bg-color: @bg; @browser-itemview-bg-color: @tree-bg-color;
@browser-itemview-bg-color-alt: darken(@browser-itemview-bg-color, 3); @browser-itemview-bg-color-alt: darken(@browser-itemview-bg-color, 3);
// ----------------------------------------------------------------------------- // -----------------------------------------------------------------------------
@ -161,9 +161,10 @@
// Textfield // Textfield
// ----------------------------------------------------------------------------- // -----------------------------------------------------------------------------
@input-bg-color: lighten(@bg, 40); @input-bg-color: darken(@bg, 30);
@input-text-color: @text-color; @input-text-color: rgb(255, 255, 255);
@input-border-color: darken(@bg, 18); @input-border-color: darken(@input-bg-color, 5);
@input-border-radius: 2;
@input-border-color-focus: rgb(1, 89, 253); @input-border-color-focus: rgb(1, 89, 253);

0
toonz/sources/toonz/Resources/pane_3d_off.svg → toonz/sources/toonz/Resources/pane_3d.svg
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.2 KiB

After

Width:  |  Height:  |  Size: 1.2 KiB

30
toonz/sources/toonz/Resources/pane_3d_on.svg
View file

@ -1,30 +0,0 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<svg
xmlns:dc="http://purl.org/dc/elements/1.1/"
xmlns:cc="http://creativecommons.org/ns#"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:svg="http://www.w3.org/2000/svg"
xmlns="http://www.w3.org/2000/svg"
id="svg4"
style="clip-rule:evenodd;fill-rule:evenodd;stroke-linejoin:round;stroke-miterlimit:1.41420996"
xml:space="preserve"
version="1.1"
viewBox="0 0 20 20"
height="20"
width="20"><metadata
id="metadata10"><rdf:RDF><cc:Work
rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title></dc:title></cc:Work></rdf:RDF></metadata><defs
id="defs8" /><rect
y="0"
x="0"
height="20"
width="20"
id="rect824"
style="fill:#5385a6;fill-opacity:1;stroke:none;stroke-width:2;stroke-miterlimit:1.41420996;stroke-dasharray:none;stroke-opacity:0.76470588" /><path
d="m 17,8 -5,3 v 6 l 5,-3 z M 13,6 8,9 v 6 L 11,13 10.996,10.202 13,9 Z M 9,4 4,7 v 6 L 7,11 6.996,8.202 9,7 Z"
id="path822"
style="fill:#e6e6e6;fill-opacity:1;stroke:#2c2c2c;stroke-opacity:0.7647059;stroke-width:2;stroke-miterlimit:1.41420996;stroke-dasharray:none" /><path
style="fill:#e6e6e6;fill-opacity:1"
id="path2"
d="m 17,8 -5,3 v 6 l 5,-3 z M 13,6 8,9 v 6 L 11,13 10.996,10.202 13,9 Z M 9,4 4,7 v 6 L 7,11 6.996,8.202 9,7 Z" /></svg>
Side by side

Before

Width:  |  Height:  |  Size: 1.4 KiB

30
toonz/sources/toonz/Resources/pane_3d_over.svg
View file

@ -1,30 +0,0 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<svg
xmlns:dc="http://purl.org/dc/elements/1.1/"
xmlns:cc="http://creativecommons.org/ns#"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:svg="http://www.w3.org/2000/svg"
xmlns="http://www.w3.org/2000/svg"
id="svg4"
style="clip-rule:evenodd;fill-rule:evenodd;stroke-linejoin:round;stroke-miterlimit:1.41420996"
xml:space="preserve"
version="1.1"
viewBox="0 0 20 20"
height="20"
width="20"><metadata
id="metadata10"><rdf:RDF><cc:Work
rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title></dc:title></cc:Work></rdf:RDF></metadata><defs
id="defs8" /><rect
y="0"
x="0"
height="20"
width="20"
id="rect824"
style="fill:#e6e6e6;fill-opacity:0.29019609;stroke:none;stroke-width:2;stroke-miterlimit:1.41420996;stroke-dasharray:none;stroke-opacity:0.76470588" /><path
d="m 17,8 -5,3 v 6 l 5,-3 z M 13,6 8,9 v 6 L 11,13 10.996,10.202 13,9 Z M 9,4 4,7 v 6 L 7,11 6.996,8.202 9,7 Z"
id="path822"
style="fill:#e6e6e6;fill-opacity:1;stroke:#2c2c2c;stroke-opacity:0.7647059;stroke-width:2;stroke-miterlimit:1.41420996;stroke-dasharray:none" /><path
style="fill:#e6e6e6;fill-opacity:1"
id="path2"
d="m 17,8 -5,3 v 6 l 5,-3 z M 13,6 8,9 v 6 L 11,13 10.996,10.202 13,9 Z M 9,4 4,7 v 6 L 7,11 6.996,8.202 9,7 Z" /></svg>
Side by side

Before

Width:  |  Height:  |  Size: 1.4 KiB

0
toonz/sources/toonz/Resources/pane_cam_off.svg → toonz/sources/toonz/Resources/pane_cam.svg
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.9 KiB

After

Width:  |  Height:  |  Size: 1.9 KiB

7
toonz/sources/toonz/Resources/pane_cam_on.svg
View file

@ -1,7 +0,0 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
<svg width="20px" height="20px" viewBox="0 0 20 20" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xml:space="preserve" xmlns:serif="http://www.serif.com/" style="fill-rule:evenodd;clip-rule:evenodd;stroke-linejoin:round;stroke-miterlimit:2;">
<rect id="rect826" x="0" y="0" width="20" height="20" style="fill:rgb(83,133,166);"/>
<path d="M12.487,16L5.513,16C5.23,16 5,15.715 5,15.364L5,14L3,14L3,12L5,12L5,11.636C5,11.285 5.23,11 5.513,11L8,11L8,10L6,10L5.99,10C4.339,9.995 3,8.653 3,7C3,5.344 4.344,4 6,4C7.656,4 9,5.344 9,7L10.036,7C10.012,6.837 10,6.67 10,6.5C10,4.568 11.568,3 13.5,3C15.432,3 17,4.568 17,6.5C17,8.432 15.432,10 13.5,10L11,10L11,11L12.487,11C12.77,11 13,11.285 13,11.636L13,13L16,11L17,11L17,16L16,16L13,14L13,15.364C13,15.715 12.77,16 12.487,16ZM13.5,5C14.328,5 15,5.672 15,6.5C15,7.328 14.328,8 13.5,8C12.672,8 12,7.328 12,6.5C12,5.672 12.672,5 13.5,5ZM6,6C6.552,6 7,6.448 7,7C7,7.552 6.552,8 6,8C5.448,8 5,7.552 5,7C5,6.448 5.448,6 6,6Z" style="fill:none;stroke:rgb(44,44,44);stroke-opacity:0.76;stroke-width:2px;"/>
<path d="M12.487,16L5.513,16C5.23,16 5,15.715 5,15.364L5,14L3,14L3,12L5,12L5,11.636C5,11.285 5.23,11 5.513,11L8,11L8,10L6,10L5.99,10C4.339,9.995 3,8.653 3,7C3,5.344 4.344,4 6,4C7.656,4 9,5.344 9,7L10.036,7C10.012,6.837 10,6.67 10,6.5C10,4.568 11.568,3 13.5,3C15.432,3 17,4.568 17,6.5C17,8.432 15.432,10 13.5,10L11,10L11,11L12.487,11C12.77,11 13,11.285 13,11.636L13,13L16,11L17,11L17,16L16,16L13,14L13,15.364C13,15.715 12.77,16 12.487,16ZM13.5,5C14.328,5 15,5.672 15,6.5C15,7.328 14.328,8 13.5,8C12.672,8 12,7.328 12,6.5C12,5.672 12.672,5 13.5,5ZM6,6C6.552,6 7,6.448 7,7C7,7.552 6.552,8 6,8C5.448,8 5,7.552 5,7C5,6.448 5.448,6 6,6Z" style="fill:rgb(230,230,230);"/>
</svg>
Side by side

Before

Width:  |  Height:  |  Size: 1.9 KiB

7
toonz/sources/toonz/Resources/pane_cam_over.svg
View file

@ -1,7 +0,0 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
<svg width="20px" height="20px" viewBox="0 0 20 20" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xml:space="preserve" xmlns:serif="http://www.serif.com/" style="fill-rule:evenodd;clip-rule:evenodd;stroke-linejoin:round;stroke-miterlimit:2;">
<rect id="rect826" x="0" y="0" width="20" height="20" style="fill:rgb(230,230,230);fill-opacity:0.29;"/>
<path d="M12.487,16L5.513,16C5.23,16 5,15.715 5,15.364L5,14L3,14L3,12L5,12L5,11.636C5,11.285 5.23,11 5.513,11L8,11L8,10L6,10L5.99,10C4.339,9.995 3,8.653 3,7C3,5.344 4.344,4 6,4C7.656,4 9,5.344 9,7L10.036,7C10.012,6.837 10,6.67 10,6.5C10,4.568 11.568,3 13.5,3C15.432,3 17,4.568 17,6.5C17,8.432 15.432,10 13.5,10L11,10L11,11L12.487,11C12.77,11 13,11.285 13,11.636L13,13L16,11L17,11L17,16L16,16L13,14L13,15.364C13,15.715 12.77,16 12.487,16ZM13.5,5C14.328,5 15,5.672 15,6.5C15,7.328 14.328,8 13.5,8C12.672,8 12,7.328 12,6.5C12,5.672 12.672,5 13.5,5ZM6,6C6.552,6 7,6.448 7,7C7,7.552 6.552,8 6,8C5.448,8 5,7.552 5,7C5,6.448 5.448,6 6,6Z" style="fill:none;stroke:rgb(44,44,44);stroke-opacity:0.76;stroke-width:2px;"/>
<path d="M12.487,16L5.513,16C5.23,16 5,15.715 5,15.364L5,14L3,14L3,12L5,12L5,11.636C5,11.285 5.23,11 5.513,11L8,11L8,10L6,10L5.99,10C4.339,9.995 3,8.653 3,7C3,5.344 4.344,4 6,4C7.656,4 9,5.344 9,7L10.036,7C10.012,6.837 10,6.67 10,6.5C10,4.568 11.568,3 13.5,3C15.432,3 17,4.568 17,6.5C17,8.432 15.432,10 13.5,10L11,10L11,11L12.487,11C12.77,11 13,11.285 13,11.636L13,13L16,11L17,11L17,16L16,16L13,14L13,15.364C13,15.715 12.77,16 12.487,16ZM13.5,5C14.328,5 15,5.672 15,6.5C15,7.328 14.328,8 13.5,8C12.672,8 12,7.328 12,6.5C12,5.672 12.672,5 13.5,5ZM6,6C6.552,6 7,6.448 7,7C7,7.552 6.552,8 6,8C5.448,8 5,7.552 5,7C5,6.448 5.448,6 6,6Z" style="fill:rgb(230,230,230);"/>
</svg>
Side by side

Before

Width:  |  Height:  |  Size: 1.9 KiB

0
toonz/sources/toonz/Resources/pane_freeze_off.svg → toonz/sources/toonz/Resources/pane_freeze.svg
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.2 KiB

After

Width:  |  Height:  |  Size: 1.2 KiB

33
toonz/sources/toonz/Resources/pane_freeze_on.svg
View file

@ -1,33 +0,0 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<svg
xmlns:dc="http://purl.org/dc/elements/1.1/"
xmlns:cc="http://creativecommons.org/ns#"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:svg="http://www.w3.org/2000/svg"
xmlns="http://www.w3.org/2000/svg"
width="20"
height="20"
viewBox="0 0 20 20"
version="1.1"
xml:space="preserve"
style="clip-rule:evenodd;fill-rule:evenodd;stroke-linejoin:round;stroke-miterlimit:1.41420996"
id="svg4"><metadata
id="metadata10"><rdf:RDF><cc:Work
rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title></dc:title></cc:Work></rdf:RDF></metadata><defs
id="defs8" /><rect
y="0"
x="0"
height="20"
width="20"
id="rect829"
style="fill:#c34040;fill-opacity:1;stroke:none;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:1.41420996;stroke-dasharray:none;stroke-opacity:1" /><rect
y="4"
x="5"
height="12"
width="10"
id="rect827"
style="fill:#2c2c2c;fill-opacity:0.7647059;stroke:none;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:1.41420996;stroke-dasharray:none;stroke-opacity:1" /><path
id="path2"
d="M 9,5 V 15 H 6 V 5 Z m 5,0 V 15 H 11 V 5 Z"
style="clip-rule:evenodd;fill-rule:evenodd;stroke-linejoin:round;stroke-miterlimit:1.41420996;fill:#e6e6e6;fill-opacity:1" /></svg>
Side by side

Before

Width:  |  Height:  |  Size: 1.5 KiB

33
toonz/sources/toonz/Resources/pane_freeze_over.svg
View file

@ -1,33 +0,0 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<svg
xmlns:dc="http://purl.org/dc/elements/1.1/"
xmlns:cc="http://creativecommons.org/ns#"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:svg="http://www.w3.org/2000/svg"
xmlns="http://www.w3.org/2000/svg"
width="20"
height="20"
viewBox="0 0 20 20"
version="1.1"
xml:space="preserve"
style="clip-rule:evenodd;fill-rule:evenodd;stroke-linejoin:round;stroke-miterlimit:1.41420996"
id="svg4"><metadata
id="metadata10"><rdf:RDF><cc:Work
rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title></dc:title></cc:Work></rdf:RDF></metadata><defs
id="defs8" /><rect
y="0"
x="0"
height="20"
width="20"
id="rect829"
style="fill:#e6e6e6;fill-opacity:0.29019609;stroke:none;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:1.41420996;stroke-dasharray:none;stroke-opacity:1" /><rect
y="4"
x="5"
height="12"
width="10"
id="rect827"
style="fill:#2c2c2c;fill-opacity:0.7647059;stroke:none;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:1.41420996;stroke-dasharray:none;stroke-opacity:1" /><path
id="path2"
d="M 9,5 V 15 H 6 V 5 Z m 5,0 V 15 H 11 V 5 Z"
style="clip-rule:evenodd;fill-rule:evenodd;stroke-linejoin:round;stroke-miterlimit:1.41420996;fill:#e6e6e6;fill-opacity:1" /></svg>
Side by side

Before

Width:  |  Height:  |  Size: 1.5 KiB

0
toonz/sources/toonz/Resources/pane_grid_off.svg → toonz/sources/toonz/Resources/pane_grid.svg
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.3 KiB

After

Width:  |  Height:  |  Size: 1.3 KiB

17
toonz/sources/toonz/Resources/pane_grid_on.svg
View file

@ -1,17 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Generator: Adobe Illustrator 21.0.2, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
<svg version="1.1"
id="svg4" inkscape:version="0.91 r13725" sodipodi:docname="pane_grid_on.svg" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:svg="http://www.w3.org/2000/svg"
xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" viewBox="0 0 20 20"
style="enable-background:new 0 0 20 20;" xml:space="preserve">
<style type="text/css">
.st0{fill:#5385A6;}
.st1{fill:#E6E6E6;stroke:#2C2C2C;stroke-width:2;stroke-linejoin:round;stroke-miterlimit:1.4142;stroke-opacity:0.7647;}
.st2{fill:#E6E6E6;}
</style>
<rect id="rect819" y="0" class="st0" width="20" height="20"/>
<path id="path2" inkscape:connector-curvature="0" class="st1" d="M5,5h10v10H5V5z M8,14v-2H6v2H8z M11,14v-2H9v2H11z M14,12h-2v2h2
V12z M9,9v2h2V9H9z M12,9v2h2V9H12z M6,11h2V9H6V11z M9,6v2h2V6H9z M12,6v2h2V6H12z M8,8V6H6v2H8z"/>
<path id="path9" inkscape:connector-curvature="0" class="st2" d="M5,5h10v10H5V5z M8,14v-2H6v2H8z M11,14v-2H9v2H11z M14,12h-2v2h2
V12z M9,9v2h2V9H9z M12,9v2h2V9H12z M6,11h2V9H6V11z M9,6v2h2V6H9z M12,6v2h2V6H12z M8,8V6H6v2H8z"/>
</svg>
Side by side

Before

Width:  |  Height:  |  Size: 1.4 KiB

17
toonz/sources/toonz/Resources/pane_grid_over.svg
View file

@ -1,17 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Generator: Adobe Illustrator 21.0.2, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
<svg version="1.1"
id="svg4" inkscape:version="0.91 r13725" sodipodi:docname="pane_grid_over.svg" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:svg="http://www.w3.org/2000/svg"
xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" viewBox="0 0 20 20"
style="enable-background:new 0 0 20 20;" xml:space="preserve">
<style type="text/css">
.st0{fill:#E6E6E6;fill-opacity:0.2915;}
.st1{fill:#E6E6E6;stroke:#2C2C2C;stroke-width:2;stroke-linejoin:round;stroke-miterlimit:1.4142;stroke-opacity:0.7647;}
.st2{fill:#E6E6E6;}
</style>
<rect id="rect819" y="0" class="st0" width="20" height="20"/>
<path id="path2" inkscape:connector-curvature="0" class="st1" d="M5,5h10v10H5V5z M8,14v-2H6v2H8z M11,14v-2H9v2H11z M14,12h-2v2h2
V12z M9,9v2h2V9H9z M12,9v2h2V9H12z M6,11h2V9H6V11z M9,6v2h2V6H9z M12,6v2h2V6H12z M8,8V6H6v2H8z"/>
<path id="path814" inkscape:connector-curvature="0" class="st2" d="M5,5h10v10H5V5z M8,14v-2H6v2H8z M11,14v-2H9v2H11z M14,12h-2v2
h2V12z M9,9v2h2V9H9z M12,9v2h2V9H12z M6,11h2V9H6V11z M9,6v2h2V6H9z M12,6v2h2V6H12z M8,8V6H6v2H8z"/>
</svg>
Side by side

Before

Width:  |  Height:  |  Size: 1.4 KiB

32
toonz/sources/toonz/Resources/pane_minimize_on.svg
View file

@ -1,32 +0,0 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<svg
xmlns:ns2="http://ns.adobe.com/AdobeIllustrator/10.0/"
xmlns:dc="http://purl.org/dc/elements/1.1/"
xmlns:cc="http://creativecommons.org/ns#"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:svg="http://www.w3.org/2000/svg"
xmlns="http://www.w3.org/2000/svg"
height="18"
width="18"
xml:space="preserve"
viewBox="0 0 18 18"
y="0px"
x="0px"
ns2:viewOrigin="393.7725 305.4199"
ns2:rulerOrigin="0 0"
ns2:pageBounds="0 600 800 0"
id="svg2"
version="1.1"><metadata
id="metadata34"><rdf:RDF><cc:Work
rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title></dc:title></cc:Work></rdf:RDF></metadata><defs
id="defs32" /><style
id="style2"
type="text/css">
.st0{fill:url(#path14_1_);}
.st1{fill:url(#path29_1_);}
.st2{fill:none;stroke:#6C767A;stroke-linecap:round;stroke-miterlimit:10;}
</style><path
id="path819"
d="M 9,2 A 7,7 0 0 0 2,9 7,7 0 0 0 9,16 7,7 0 0 0 16,9 7,7 0 0 0 9,2 Z M 4.625,8.125 h 8.75 v 1.75 h -8.75 z"
style="fill:#8bca86;fill-opacity:1;stroke:none;stroke-width:1.75;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.76470588" /></svg>
Side by side

Before

Width:  |  Height:  |  Size: 1.3 KiB

32
toonz/sources/toonz/Resources/pane_minimize_over.svg
View file

@ -1,32 +0,0 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<svg
xmlns:ns2="http://ns.adobe.com/AdobeIllustrator/10.0/"
xmlns:dc="http://purl.org/dc/elements/1.1/"
xmlns:cc="http://creativecommons.org/ns#"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:svg="http://www.w3.org/2000/svg"
xmlns="http://www.w3.org/2000/svg"
version="1.1"
id="svg2"
ns2:pageBounds="0 600 800 0"
ns2:rulerOrigin="0 0"
ns2:viewOrigin="393.7725 305.4199"
x="0px"
y="0px"
viewBox="0 0 18 18"
xml:space="preserve"
width="18"
height="18"><metadata
id="metadata34"><rdf:RDF><cc:Work
rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title></dc:title></cc:Work></rdf:RDF></metadata><defs
id="defs32" /><style
type="text/css"
id="style2">
.st0{fill:url(#path14_1_);}
.st1{fill:url(#path29_1_);}
.st2{fill:none;stroke:#6C767A;stroke-linecap:round;stroke-miterlimit:10;}
</style><path
style="fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1.75;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.76470588"
d="M 9,2 A 7,7 0 0 0 2,9 7,7 0 0 0 9,16 7,7 0 0 0 16,9 7,7 0 0 0 9,2 Z M 4.625,8.125 h 8.75 v 1.75 h -8.75 z"
id="path819" /></svg>
Side by side

Before

Width:  |  Height:  |  Size: 1.3 KiB

0
toonz/sources/toonz/Resources/pane_preview_off.svg → toonz/sources/toonz/Resources/pane_preview.svg
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.7 KiB

After

Width:  |  Height:  |  Size: 1.7 KiB

41
toonz/sources/toonz/Resources/pane_preview_on.svg
View file

@ -1,41 +0,0 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<svg
xmlns:dc="http://purl.org/dc/elements/1.1/"
xmlns:cc="http://creativecommons.org/ns#"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:svg="http://www.w3.org/2000/svg"
xmlns="http://www.w3.org/2000/svg"
id="svg4"
style="clip-rule:evenodd;fill-rule:evenodd;stroke-linejoin:round;stroke-miterlimit:1.41420996"
xml:space="preserve"
version="1.1"
viewBox="0 0 25 20"
height="20"
width="25"><metadata
id="metadata10"><rdf:RDF><cc:Work
rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title></dc:title></cc:Work></rdf:RDF></metadata><defs
id="defs8" /><rect
y="0.0099999998"
x="-8.8817842e-016"
height="20"
width="25"
id="rect830"
style="fill:#68dda5;fill-opacity:1;stroke-width:1.11803389" /><path
id="path1617"
d="M 5,10 C 5,10 7.81,5.51 12.5,5.51 17.19,5.51 20,10 20,10 20,10 17.201,14.51 12.5,14.51 7.799,14.51 5,10 5,10 Z"
style="clip-rule:evenodd;fill:#e6e6e6;fill-opacity:1;fill-rule:evenodd;stroke:#2c2c2c;stroke-width:2;stroke-linejoin:round;stroke-miterlimit:1.41420996;stroke-dasharray:none;stroke-opacity:0.76470588;paint-order:stroke fill markers" /><path
style="clip-rule:evenodd;fill:#e6e6e6;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:2;stroke-linejoin:round;stroke-miterlimit:1.41420996;stroke-dasharray:none;stroke-opacity:0.76470588;paint-order:stroke fill markers"
d="M 5,10 C 5,10 7.81,5.51 12.5,5.51 17.19,5.51 20,10 20,10 20,10 17.201,14.51 12.5,14.51 7.799,14.51 5,10 5,10 Z"
id="path832" /><ellipse
style="fill:#3a3a3a;fill-opacity:1"
ry="3.6207628"
rx="3.5"
cy="10.01"
cx="12.5"
id="path21" /><circle
r="1.5"
cy="9.0100002"
cx="11.5"
id="path1450"
style="fill:#e6e6e6;fill-opacity:1" /></svg>
Side by side

Before

Width:  |  Height:  |  Size: 1.9 KiB

41
toonz/sources/toonz/Resources/pane_preview_over.svg
View file

@ -1,41 +0,0 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<svg
xmlns:dc="http://purl.org/dc/elements/1.1/"
xmlns:cc="http://creativecommons.org/ns#"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:svg="http://www.w3.org/2000/svg"
xmlns="http://www.w3.org/2000/svg"
width="25"
height="20"
viewBox="0 0 25 20"
version="1.1"
xml:space="preserve"
style="clip-rule:evenodd;fill-rule:evenodd;stroke-linejoin:round;stroke-miterlimit:1.41420996"
id="svg4"><metadata
id="metadata10"><rdf:RDF><cc:Work
rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title></dc:title></cc:Work></rdf:RDF></metadata><defs
id="defs8" /><rect
style="fill:#e6e6e6;fill-opacity:0.29019608;stroke-width:1.11803389"
id="rect830"
width="25"
height="20"
x="-8.8817842e-016"
y="0.0099999998" /><path
style="clip-rule:evenodd;fill:#e6e6e6;fill-opacity:1;fill-rule:evenodd;stroke:#2c2c2c;stroke-width:2;stroke-linejoin:round;stroke-miterlimit:1.41420996;stroke-dasharray:none;stroke-opacity:0.76470588;paint-order:stroke fill markers"
d="M 5,10 C 5,10 7.81,5.51 12.5,5.51 17.19,5.51 20,10 20,10 20,10 17.201,14.51 12.5,14.51 7.799,14.51 5,10 5,10 Z"
id="path1617" /><path
id="path832"
d="M 5,10 C 5,10 7.81,5.51 12.5,5.51 17.19,5.51 20,10 20,10 20,10 17.201,14.51 12.5,14.51 7.799,14.51 5,10 5,10 Z"
style="clip-rule:evenodd;fill:#e6e6e6;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:2;stroke-linejoin:round;stroke-miterlimit:1.41420996;stroke-dasharray:none;stroke-opacity:0.76470588;paint-order:stroke fill markers" /><ellipse
id="path21"
cx="12.5"
cy="10.01"
rx="3.5"
ry="3.6207628"
style="fill:#3a3a3a;fill-opacity:1" /><circle
style="fill:#e6e6e6;fill-opacity:1"
id="path1450"
cx="11.5"
cy="9.0100002"
r="1.5" /></svg>
Side by side

Before

Width:  |  Height:  |  Size: 1.9 KiB

0
toonz/sources/toonz/Resources/pane_safe_off.svg → toonz/sources/toonz/Resources/pane_safe.svg
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.2 KiB

After

Width:  |  Height:  |  Size: 1.2 KiB

17
toonz/sources/toonz/Resources/pane_safe_on.svg
View file

@ -1,17 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Generator: Adobe Illustrator 21.0.2, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
<svg version="1.1"
id="svg4" inkscape:version="0.91 r13725" sodipodi:docname="pane_safe_on.svg" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:svg="http://www.w3.org/2000/svg"
xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" viewBox="0 0 20 20"
style="enable-background:new 0 0 20 20;" xml:space="preserve">
<style type="text/css">
.st0{fill:#5385A6;}
.st1{fill:none;stroke:#2C2C2C;stroke-width:2;stroke-linejoin:round;stroke-miterlimit:1.4142;stroke-opacity:0.7647;}
.st2{fill:#E6E6E6;}
</style>
<rect id="rect824" y="0" class="st0" width="20" height="20"/>
<path id="path2" inkscape:connector-curvature="0" class="st1" d="M17,15H3V5h14V15z M16,6H4v8h12V6z M15,13H5V7h10V13z M14,8H6v4h8
V8z"/>
<path id="path822" inkscape:connector-curvature="0" class="st2" d="M17,15H3V5h14V15z M16,6H4v8h12V6z M15,13H5V7h10V13z M14,8H6v4
h8V8z"/>
</svg>
Side by side

Before

Width:  |  Height:  |  Size: 1.2 KiB

17
toonz/sources/toonz/Resources/pane_safe_over.svg
View file

@ -1,17 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Generator: Adobe Illustrator 21.0.2, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
<svg version="1.1"
id="svg4" inkscape:version="0.91 r13725" sodipodi:docname="pane_safe_over.svg" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:svg="http://www.w3.org/2000/svg"
xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" viewBox="0 0 20 20"
style="enable-background:new 0 0 20 20;" xml:space="preserve">
<style type="text/css">
.st0{fill:#E6E6E6;fill-opacity:0.2902;}
.st1{fill:none;stroke:#2C2C2C;stroke-width:2;stroke-linejoin:round;stroke-miterlimit:1.4142;stroke-opacity:0.7647;}
.st2{fill:#E6E6E6;}
</style>
<rect id="rect824" y="0" class="st0" width="20" height="20"/>
<path id="path2" inkscape:connector-curvature="0" class="st1" d="M17,15H3V5h14V15z M16,6H4v8h12V6z M15,13H5V7h10V13z M14,8H6v4h8
V8z"/>
<path id="path822" inkscape:connector-curvature="0" class="st2" d="M17,15H3V5h14V15z M16,6H4v8h12V6z M15,13H5V7h10V13z M14,8H6v4
h8V8z"/>
</svg>
Side by side

Before

Width:  |  Height:  |  Size: 1.3 KiB

0
toonz/sources/toonz/Resources/pane_subpreview_off.svg → toonz/sources/toonz/Resources/pane_subpreview.svg
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 3.1 KiB

After

Width:  |  Height:  |  Size: 3.1 KiB

64
toonz/sources/toonz/Resources/pane_subpreview_on.svg
View file

@ -1,64 +0,0 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<svg
xmlns:dc="http://purl.org/dc/elements/1.1/"
xmlns:cc="http://creativecommons.org/ns#"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:svg="http://www.w3.org/2000/svg"
xmlns="http://www.w3.org/2000/svg"
id="svg4"
style="clip-rule:evenodd;fill-rule:evenodd;stroke-linejoin:round;stroke-miterlimit:1.41420996"
xml:space="preserve"
version="1.1"
viewBox="0 0 25 20"
height="20"
width="25"><metadata
id="metadata10"><rdf:RDF><cc:Work
rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title></dc:title></cc:Work></rdf:RDF></metadata><defs
id="defs8"><marker
orient="auto"
refY="0"
refX="0"
id="marker1098"
style="overflow:visible"><path
id="path1096"
d="M 0,0 5,-5 -12.5,0 5,5 Z"
style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1.00000003pt;stroke-opacity:1"
transform="matrix(0.8,0,0,0.8,10,0)" /></marker><marker
orient="auto"
refY="0"
refX="0"
id="Arrow1Lstart"
style="overflow:visible"><path
id="path820"
d="M 0,0 5,-5 -12.5,0 5,5 Z"
style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1.00000003pt;stroke-opacity:1"
transform="matrix(0.8,0,0,0.8,10,0)" /></marker></defs><rect
id="rect855"
width="25"
height="20"
x="-2.6645353e-015"
y="0"
style="fill:#c76cbb;fill-opacity:1;stroke-width:1.09108937" /><g
id="g1244"
transform="translate(2.5000178)"><path
id="path1236"
d="m 2.5,9.99 c 0,0 2.81,-4.49 7.5,-4.49 4.69,0 7.5,4.49 7.5,4.49 0,0 -2.799,4.51 -7.5,4.51 -4.701,0 -7.5,-4.51 -7.5,-4.51 z"
style="clip-rule:evenodd;fill:#e6e6e6;fill-opacity:1;fill-rule:evenodd;stroke:#2c2c2c;stroke-width:2;stroke-linejoin:round;stroke-miterlimit:1.41420996;stroke-dasharray:none;stroke-opacity:0.76470588;paint-order:stroke fill markers" /><path
style="clip-rule:evenodd;fill:#e6e6e6;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:2;stroke-linejoin:round;stroke-miterlimit:1.41420996;stroke-dasharray:none;stroke-opacity:0.76470588;paint-order:stroke fill markers"
d="m 2.5,9.99 c 0,0 2.81,-4.49 7.5,-4.49 4.69,0 7.5,4.49 7.5,4.49 0,0 -2.799,4.51 -7.5,4.51 -4.701,0 -7.5,-4.51 -7.5,-4.51 z"
id="path1238" /><ellipse
style="fill:#3a3a3a;fill-opacity:1"
ry="3.6207628"
rx="3.5"
cy="10"
cx="10"
id="ellipse1240" /><circle
r="1.5"
cy="9"
cx="9"
id="circle1242"
style="fill:#e6e6e6;fill-opacity:1" /></g><path
style="fill:#000000;fill-opacity:1"
d="M 3,2 V 3 H 5 V 2 Z M 6,3 H 8 V 2 H 6 Z m 3,0 h 2 V 2 H 9 Z m 3,0 h 2 V 2 h -2 z m 3,0 h 2 V 2 h -2 z m 3,0 h 2 V 2 h -2 z m 3,1 h 1 V 2 H 21 Z M 3,6 H 4 V 4 H 3 Z m 18,1 h 1 V 5 H 21 Z M 3,9 H 4 V 7 H 3 Z m 18,1 h 1 V 8 H 21 Z M 3,12 H 4 V 9.9999996 H 3 Z m 18,1 h 1 V 11 H 21 Z M 3,15 H 4 V 13 H 3 Z m 18,1 h 1 V 14 H 21 Z M 3,18 H 4 V 16 H 3 Z m 2,0 H 7 V 17 H 5 Z m 3,0 h 2 V 17 H 8 Z m 3,0 h 2 v -1 h -2 z m 3,0 h 2 v -1 h -2 z m 3,0 h 2 v -1 h -2 z m 3,0 h 2 v -1 h -2 z"
id="path1434" /></svg>
Side by side

Before

Width:  |  Height:  |  Size: 3.3 KiB

64
toonz/sources/toonz/Resources/pane_subpreview_over.svg
View file

@ -1,64 +0,0 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<svg
xmlns:dc="http://purl.org/dc/elements/1.1/"
xmlns:cc="http://creativecommons.org/ns#"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:svg="http://www.w3.org/2000/svg"
xmlns="http://www.w3.org/2000/svg"
width="25"
height="20"
viewBox="0 0 25 20"
version="1.1"
xml:space="preserve"
style="clip-rule:evenodd;fill-rule:evenodd;stroke-linejoin:round;stroke-miterlimit:1.41420996"
id="svg4"><metadata
id="metadata10"><rdf:RDF><cc:Work
rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title></dc:title></cc:Work></rdf:RDF></metadata><defs
id="defs8"><marker
style="overflow:visible"
id="marker1098"
refX="0"
refY="0"
orient="auto"><path
transform="matrix(0.8,0,0,0.8,10,0)"
style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1.00000003pt;stroke-opacity:1"
d="M 0,0 5,-5 -12.5,0 5,5 Z"
id="path1096" /></marker><marker
style="overflow:visible"
id="Arrow1Lstart"
refX="0"
refY="0"
orient="auto"><path
transform="matrix(0.8,0,0,0.8,10,0)"
style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1.00000003pt;stroke-opacity:1"
d="M 0,0 5,-5 -12.5,0 5,5 Z"
id="path820" /></marker></defs><rect
style="fill:#e6e6e6;fill-opacity:0.29019608;stroke-width:1.09108937"
y="0"
x="2.6645353e-015"
height="20"
width="25"
id="rect855" /><g
transform="translate(2.5000178)"
id="g1244"><path
style="clip-rule:evenodd;fill:#e6e6e6;fill-opacity:1;fill-rule:evenodd;stroke:#2c2c2c;stroke-width:2;stroke-linejoin:round;stroke-miterlimit:1.41420996;stroke-dasharray:none;stroke-opacity:0.76470588;paint-order:stroke fill markers"
d="m 2.5,9.99 c 0,0 2.81,-4.49 7.5,-4.49 4.69,0 7.5,4.49 7.5,4.49 0,0 -2.799,4.51 -7.5,4.51 -4.701,0 -7.5,-4.51 -7.5,-4.51 z"
id="path1236" /><path
id="path1238"
d="m 2.5,9.99 c 0,0 2.81,-4.49 7.5,-4.49 4.69,0 7.5,4.49 7.5,4.49 0,0 -2.799,4.51 -7.5,4.51 -4.701,0 -7.5,-4.51 -7.5,-4.51 z"
style="clip-rule:evenodd;fill:#e6e6e6;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:2;stroke-linejoin:round;stroke-miterlimit:1.41420996;stroke-dasharray:none;stroke-opacity:0.76470588;paint-order:stroke fill markers" /><ellipse
id="ellipse1240"
cx="10"
cy="10"
rx="3.5"
ry="3.6207628"
style="fill:#3a3a3a;fill-opacity:1" /><circle
style="fill:#e6e6e6;fill-opacity:1"
id="circle1242"
cx="9"
cy="9"
r="1.5" /></g><path
id="path1434"
d="M 3,2 V 3 H 5 V 2 Z M 6,3 H 8 V 2 H 6 Z m 3,0 h 2 V 2 H 9 Z m 3,0 h 2 V 2 h -2 z m 3,0 h 2 V 2 h -2 z m 3,0 h 2 V 2 h -2 z m 3,1 h 1 V 2 H 21 Z M 3,6 H 4 V 4 H 3 Z m 18,1 h 1 V 5 H 21 Z M 3,9 H 4 V 7 H 3 Z m 18,1 h 1 V 8 H 21 Z M 3,12 H 4 V 9.9999996 H 3 Z m 18,1 h 1 V 11 H 21 Z M 3,15 H 4 V 13 H 3 Z m 18,1 h 1 V 14 H 21 Z M 3,18 H 4 V 16 H 3 Z m 2,0 H 7 V 17 H 5 Z m 3,0 h 2 V 17 H 8 Z m 3,0 h 2 v -1 h -2 z m 3,0 h 2 v -1 h -2 z m 3,0 h 2 v -1 h -2 z m 3,0 h 2 v -1 h -2 z"
style="fill-rule:evenodd;fill:#b2b2b2;fill-opacity:1" /></svg>
Side by side

Before

Width:  |  Height:  |  Size: 3.3 KiB

0
toonz/sources/toonz/Resources/pane_table_off.svg → toonz/sources/toonz/Resources/pane_table.svg
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.7 KiB

After

Width:  |  Height:  |  Size: 1.7 KiB

42
toonz/sources/toonz/Resources/pane_table_on.svg
View file

@ -1,42 +0,0 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<svg
xmlns:dc="http://purl.org/dc/elements/1.1/"
xmlns:cc="http://creativecommons.org/ns#"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:svg="http://www.w3.org/2000/svg"
xmlns="http://www.w3.org/2000/svg"
width="20"
height="20"
viewBox="0 0 20 20"
version="1.1"
xml:space="preserve"
style="clip-rule:evenodd;fill-rule:evenodd;stroke-linejoin:round;stroke-miterlimit:1.41420996"
id="svg4"><metadata
id="metadata10"><rdf:RDF><cc:Work
rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title></dc:title></cc:Work></rdf:RDF></metadata><defs
id="defs8" /><rect
style="stroke:none;stroke-opacity:0.76470588;fill:#5385a6;fill-opacity:1"
id="rect894"
width="20"
height="20"
x="0"
y="0" /><ellipse
style="fill:#e6e6e6;fill-opacity:1;stroke:#2c2c2c;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:1.41420996;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.7647059;paint-order:stroke fill markers"
id="path1869"
cx="9.999939"
cy="10.000015"
rx="6.9999909"
ry="6.999999" /><ellipse
ry="6.999999"
rx="6.9999909"
cy="10.000015"
cx="9.999939"
id="ellipse10"
style="fill:#e6e6e6;fill-opacity:1;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:1.41420996;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.7647059;paint-order:stroke fill markers" /><rect
style="fill:#3a3a3a;fill-opacity:1;stroke:none;stroke-width:1.99999988;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:1.41420996;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:stroke fill markers"
id="rect1871"
width="10"
height="7.9999995"
x="5"
y="6" /></svg>
Side by side

Before

Width:  |  Height:  |  Size: 1.9 KiB

42
toonz/sources/toonz/Resources/pane_table_over.svg
View file

@ -1,42 +0,0 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<svg
xmlns:dc="http://purl.org/dc/elements/1.1/"
xmlns:cc="http://creativecommons.org/ns#"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:svg="http://www.w3.org/2000/svg"
xmlns="http://www.w3.org/2000/svg"
id="svg4"
style="clip-rule:evenodd;fill-rule:evenodd;stroke-linejoin:round;stroke-miterlimit:1.41420996"
xml:space="preserve"
version="1.1"
viewBox="0 0 20 20"
height="20"
width="20"><metadata
id="metadata10"><rdf:RDF><cc:Work
rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title></dc:title></cc:Work></rdf:RDF></metadata><defs
id="defs8" /><rect
y="0"
x="0"
height="20"
width="20"
id="rect894"
style="stroke:none;stroke-opacity:0.76470588;fill:#e6e6e6;fill-opacity:0.29019609" /><ellipse
ry="6.999999"
rx="6.9999909"
cy="10.000015"
cx="9.999939"
id="path1869"
style="fill:#e6e6e6;fill-opacity:1;stroke:#2c2c2c;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:1.41420996;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.7647059;paint-order:stroke fill markers" /><ellipse
style="fill:#e6e6e6;fill-opacity:1;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:1.41420996;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.7647059;paint-order:stroke fill markers"
id="ellipse896"
cx="9.999939"
cy="10.000015"
rx="6.9999909"
ry="6.999999" /><rect
y="6"
x="5"
height="7.9999995"
width="10"
id="rect1871"
style="fill:#3a3a3a;fill-opacity:1;stroke:none;stroke-width:1.99999988;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:1.41420996;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:stroke fill markers" /></svg>
Side by side

Before

Width:  |  Height:  |  Size: 1.9 KiB

33
toonz/sources/toonz/Resources/switch.svg
View file

@ -1,25 +1,10 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!-- Generator: Adobe Illustrator 21.0.2, SVG Export Plug-In . SVG Version: 6.00 Build 0) --> <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
<svg version="1.1" <svg width="20px" height="20px" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xml:space="preserve" xmlns:serif="http://www.serif.com/" style="fill-rule:evenodd;clip-rule:evenodd;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:1.5;">
id="svg2" inkscape:version="0.91 r13725" sodipodi:docname="switch.svg" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:svg="http://www.w3.org/2000/svg" <g transform="matrix(0.857143,0,0,0.866667,1.42857,1.26667)">
xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" viewBox="0 0 17 16" <path d="M14.424,4.576C15.996,5.86 17,7.814 17,10C17,13.863 13.863,17 10,17C6.137,17 3,13.863 3,10C3,7.814 4.004,5.86 5.576,4.576L6.822,5.822C5.563,6.781 4.75,8.297 4.75,10C4.75,12.898 7.102,15.25 10,15.25C12.898,15.25 15.25,12.898 15.25,10C15.25,8.297 14.437,6.781 13.178,5.822L14.424,4.576ZM11,2L11,9L9,9L9,2L11,2Z" style="fill:rgb(235,235,235);stroke:black;stroke-opacity:0.7;stroke-width:2.32px;"/>
style="enable-background:new 0 0 17 16;" xml:space="preserve"> </g>
<style type="text/css"> <g transform="matrix(0.857143,0,0,0.866667,1.42857,1.26667)">
.st0{fill:none;} <path d="M14.424,4.576C15.996,5.86 17,7.814 17,10C17,13.863 13.863,17 10,17C6.137,17 3,13.863 3,10C3,7.814 4.004,5.86 5.576,4.576L6.822,5.822C5.563,6.781 4.75,8.297 4.75,10C4.75,12.898 7.102,15.25 10,15.25C12.898,15.25 15.25,12.898 15.25,10C15.25,8.297 14.437,6.781 13.178,5.822L14.424,4.576ZM11,2L11,9L9,9L9,2L11,2Z" style="fill:rgb(235,235,235);"/>
.st1{fill:#FFFFFF;stroke:#A5A5A5;stroke-linecap:square;stroke-miterlimit:1.5;} </g>
.st2{fill:#292929;stroke:#292929;stroke-width:0.35;stroke-linecap:square;stroke-miterlimit:1.5;}
.st3{fill:none;stroke:#292929;stroke-width:1.2;stroke-miterlimit:1.5;}
</style>
<g>
<sodipodi:namedview bordercolor="#666666" borderopacity="1" gridtolerance="10" guidetolerance="10" id="namedview13" inkscape:current-layer="svg2" inkscape:cx="8.5" inkscape:cy="8" inkscape:pageopacity="0" inkscape:pageshadow="2" inkscape:window-height="500" inkscape:window-maximized="0" inkscape:window-width="1109" inkscape:window-x="0" inkscape:window-y="0" inkscape:zoom="14.75" objecttolerance="10" pagecolor="#ffffff" showgrid="false">
</sodipodi:namedview>
<g id="Layer1">
<rect id="rect5" y="0" class="st0" width="17" height="16"/>
<rect id="rect7" x="0.5" y="0.5" class="st1" width="16" height="15"/>
<rect id="rect9" x="8" y="3" class="st2" width="1" height="5"/>
<path id="path11" inkscape:connector-curvature="0" class="st3" d="M11,4.5c1.2,0.8,2,2.3,2,3.9c0,2.6-2,4.6-4.5,4.6S4,10.9,4,8.4
c0-1.6,0.8-3,2-3.9"/>
</g>
</g>
</svg> </svg>

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.8 KiB

After

Width:  |  Height:  |  Size: 1.3 KiB

25
toonz/sources/toonz/Resources/switch_on.svg
View file

@ -1,25 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Generator: Adobe Illustrator 21.0.2, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
<svg version="1.1"
id="svg2" inkscape:version="0.91 r13725" sodipodi:docname="switch_on.svg" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:svg="http://www.w3.org/2000/svg"
xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" viewBox="0 0 17 16"
style="enable-background:new 0 0 17 16;" xml:space="preserve">
<style type="text/css">
.st0{fill:none;}
.st1{fill:#FFDC00;stroke:#E3C400;stroke-linecap:square;stroke-miterlimit:1.5;}
.st2{fill:#292929;stroke:#292929;stroke-width:0.35;stroke-linecap:square;stroke-miterlimit:1.5;}
.st3{fill:none;stroke:#292929;stroke-width:1.2;stroke-miterlimit:1.5;}
</style>
<g>
<sodipodi:namedview bordercolor="#666666" borderopacity="1" gridtolerance="10" guidetolerance="10" id="namedview13" inkscape:current-layer="svg2" inkscape:cx="8.5" inkscape:cy="8" inkscape:pageopacity="0" inkscape:pageshadow="2" inkscape:window-height="500" inkscape:window-maximized="0" inkscape:window-width="1109" inkscape:window-x="0" inkscape:window-y="0" inkscape:zoom="14.75" objecttolerance="10" pagecolor="#ffffff" showgrid="false">
</sodipodi:namedview>
<g id="Layer1">
<rect id="rect5" y="0" class="st0" width="17" height="16"/>
<rect id="rect7" x="0.5" y="0.5" class="st1" width="16" height="15"/>
<rect id="rect9" x="8" y="3" class="st2" width="1" height="5"/>
<path id="path11" inkscape:connector-curvature="0" class="st3" d="M11,4.5c1.2,0.8,2,2.3,2,3.9c0,2.6-2,4.6-4.5,4.6S4,10.9,4,8.4
c0-1.6,0.8-3,2-3.9"/>
</g>
</g>
</svg>
Side by side

Before

Width:  |  Height:  |  Size: 1.8 KiB

20
toonz/sources/toonz/Resources/switch_over.svg
View file

@ -1,20 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Generator: Adobe Illustrator 21.0.2, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
<svg version="1.1"
id="svg2" inkscape:version="0.91 r13725" sodipodi:docname="switch_over.svg" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:svg="http://www.w3.org/2000/svg"
xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" viewBox="0 0 17 16"
style="enable-background:new 0 0 17 16;" xml:space="preserve">
<style type="text/css">
.st0{fill:none;}
.st1{fill:#FFFFFF;stroke:#E3C400;stroke-linecap:square;stroke-miterlimit:1.5;}
.st2{fill:none;stroke:#EDDD77;stroke-miterlimit:1.5;}
.st3{fill:#292929;stroke:#292929;stroke-width:0.35;stroke-linecap:square;stroke-miterlimit:1.5;}
.st4{fill:none;stroke:#292929;stroke-width:1.2;stroke-miterlimit:1.5;}
</style>
<rect id="rect5" y="0" class="st0" width="17" height="16"/>
<rect id="rect7" x="0.5" y="0.5" class="st1" width="16" height="15"/>
<rect id="rect9" x="1.5" y="1.5" class="st2" width="14" height="13"/>
<rect id="rect11" x="8" y="3" class="st3" width="1" height="5"/>
<path id="path13" inkscape:connector-curvature="0" class="st4" d="M11,4.5c1.2,0.8,2,2.3,2,3.9c0,2.6-2,4.6-4.5,4.6S4,10.9,4,8.4
c0-1.6,0.8-3,2-3.9"/>
</svg>
Side by side

Before

Width:  |  Height:  |  Size: 1.5 KiB

6
toonz/sources/toonz/castviewer.cpp
View file

@ -465,8 +465,6 @@ CastBrowser::CastBrowser(QWidget *parent, Qt::WFlags flags)
// style sheet // style sheet
setObjectName("CastBrowser"); setObjectName("CastBrowser");
setFrameStyle(QFrame::StyledPanel); setFrameStyle(QFrame::StyledPanel);
setStyleSheet("QSplitter::handle {height:4px;}");
setStyleSheet("#CastBrowser { margin:1px;border:0px }");
m_treeViewer = new CastTreeViewer(this); m_treeViewer = new CastTreeViewer(this);
m_treeViewer->resize(300, m_treeViewer->size().height()); m_treeViewer->resize(300, m_treeViewer->size().height());
@ -478,8 +476,8 @@ CastBrowser::CastBrowser(QWidget *parent, Qt::WFlags flags)
boxLayout->setSpacing(0); boxLayout->setSpacing(0);
m_folderName = new QLabel("", box); m_folderName = new QLabel("", box);
m_folderName->setFrameStyle(QFrame::StyledPanel); m_folderName->setObjectName("CastBrowserFolderName");
m_folderName->setStyleSheet("border-bottom: 1px solid black"); m_folderName->setFrameStyle(QFrame::Box);
m_itemViewer = new DvItemViewer(box, false, true, DvItemViewer::Cast); m_itemViewer = new DvItemViewer(box, false, true, DvItemViewer::Cast);
DvItemViewerPanel *viewerPanel = m_itemViewer->getPanel(); DvItemViewerPanel *viewerPanel = m_itemViewer->getPanel();
viewerPanel->setMissingTextColor(QColor(200, 0, 0)); viewerPanel->setMissingTextColor(QColor(200, 0, 0));

39
toonz/sources/toonz/comboviewerpane.cpp
View file

@ -431,9 +431,7 @@ void ComboViewerPanel::initializeTitleBar(TPanelTitleBar *titleBar) {
// buttons for show / hide toggle for the field guide and the safe area // buttons for show / hide toggle for the field guide and the safe area
TPanelTitleBarButtonForSafeArea *safeAreaButton = TPanelTitleBarButtonForSafeArea *safeAreaButton =
new TPanelTitleBarButtonForSafeArea( new TPanelTitleBarButtonForSafeArea(titleBar, ":Resources/pane_safe.svg");
titleBar, ":Resources/pane_safe_off.svg",
":Resources/pane_safe_over.svg", ":Resources/pane_safe_on.svg");
safeAreaButton->setToolTip(tr("Safe Area (Right Click to Select)")); safeAreaButton->setToolTip(tr("Safe Area (Right Click to Select)"));
titleBar->add(QPoint(x, 0), safeAreaButton); titleBar->add(QPoint(x, 0), safeAreaButton);
ret = ret && connect(safeAreaButton, SIGNAL(toggled(bool)), ret = ret && connect(safeAreaButton, SIGNAL(toggled(bool)),
@ -446,9 +444,7 @@ void ComboViewerPanel::initializeTitleBar(TPanelTitleBar *titleBar) {
safeAreaButton->setPressed( safeAreaButton->setPressed(
CommandManager::instance()->getAction(MI_SafeArea)->isChecked()); CommandManager::instance()->getAction(MI_SafeArea)->isChecked());
button = new TPanelTitleBarButton(titleBar, ":Resources/pane_grid_off.svg", button = new TPanelTitleBarButton(titleBar, ":Resources/pane_grid.svg");
":Resources/pane_grid_over.svg",
":Resources/pane_grid_on.svg");
button->setToolTip(tr("Field Guide")); button->setToolTip(tr("Field Guide"));
x += 1 + iconWidth; x += 1 + iconWidth;
titleBar->add(QPoint(x, 0), button); titleBar->add(QPoint(x, 0), button);
@ -462,26 +458,20 @@ void ComboViewerPanel::initializeTitleBar(TPanelTitleBar *titleBar) {
CommandManager::instance()->getAction(MI_FieldGuide)->isChecked()); CommandManager::instance()->getAction(MI_FieldGuide)->isChecked());
// view mode toggles // view mode toggles
button = new TPanelTitleBarButton(titleBar, ":Resources/pane_table_off.svg", button = new TPanelTitleBarButton(titleBar, ":Resources/pane_table.svg");
":Resources/pane_table_over.svg",
":Resources/pane_table_on.svg");
button->setToolTip(tr("Camera Stand View")); button->setToolTip(tr("Camera Stand View"));
x += 10 + iconWidth; x += 10 + iconWidth;
titleBar->add(QPoint(x, 0), button); titleBar->add(QPoint(x, 0), button);
button->setButtonSet(viewModeButtonSet, SceneViewer::NORMAL_REFERENCE); button->setButtonSet(viewModeButtonSet, SceneViewer::NORMAL_REFERENCE);
button->setPressed(true); button->setPressed(true);
button = new TPanelTitleBarButton(titleBar, ":Resources/pane_3d_off.svg", button = new TPanelTitleBarButton(titleBar, ":Resources/pane_3d.svg");
":Resources/pane_3d_over.svg",
":Resources/pane_3d_on.svg");
button->setToolTip(tr("3D View")); button->setToolTip(tr("3D View"));
x += 21; // width of pane_table_off.svg = 20px x += 21; // width of pane_table_off.svg = 20px
titleBar->add(QPoint(x, 0), button); titleBar->add(QPoint(x, 0), button);
button->setButtonSet(viewModeButtonSet, SceneViewer::CAMERA3D_REFERENCE); button->setButtonSet(viewModeButtonSet, SceneViewer::CAMERA3D_REFERENCE);
button = new TPanelTitleBarButton(titleBar, ":Resources/pane_cam_off.svg", button = new TPanelTitleBarButton(titleBar, ":Resources/pane_cam.svg");
":Resources/pane_cam_over.svg",
":Resources/pane_cam_on.svg");
button->setToolTip(tr("Camera View")); button->setToolTip(tr("Camera View"));
x += 21; // width of pane_3d_off.svg = 20px x += 21; // width of pane_3d_off.svg = 20px
titleBar->add(QPoint(x, 0), button); titleBar->add(QPoint(x, 0), button);
@ -490,9 +480,7 @@ void ComboViewerPanel::initializeTitleBar(TPanelTitleBar *titleBar) {
SLOT(setReferenceMode(int))); SLOT(setReferenceMode(int)));
// freeze button // freeze button
button = new TPanelTitleBarButton(titleBar, ":Resources/pane_freeze_off.svg", button = new TPanelTitleBarButton(titleBar, ":Resources/pane_freeze.svg");
":Resources/pane_freeze_over.svg",
":Resources/pane_freeze_on.svg");
x += 10 + 20; // width of pane_cam_off.svg = 20px x += 10 + 20; // width of pane_cam_off.svg = 20px
button->setToolTip(tr("Freeze")); // RC1 button->setToolTip(tr("Freeze")); // RC1
@ -501,9 +489,8 @@ void ComboViewerPanel::initializeTitleBar(TPanelTitleBar *titleBar) {
SLOT(freeze(bool))); SLOT(freeze(bool)));
// preview toggles // preview toggles
m_previewButton = new TPanelTitleBarButton( m_previewButton =
titleBar, ":Resources/pane_preview_off.svg", new TPanelTitleBarButton(titleBar, ":Resources/pane_preview.svg");
":Resources/pane_preview_over.svg", ":Resources/pane_preview_on.svg");
x += 10 + iconWidth; x += 10 + iconWidth;
titleBar->add(QPoint(x, 0), m_previewButton); titleBar->add(QPoint(x, 0), m_previewButton);
m_previewButton->setToolTip(tr("Preview")); m_previewButton->setToolTip(tr("Preview"));
@ -511,9 +498,7 @@ void ComboViewerPanel::initializeTitleBar(TPanelTitleBar *titleBar) {
SLOT(enableFullPreview(bool))); SLOT(enableFullPreview(bool)));
m_subcameraPreviewButton = m_subcameraPreviewButton =
new TPanelTitleBarButton(titleBar, ":Resources/pane_subpreview_off.svg", new TPanelTitleBarButton(titleBar, ":Resources/pane_subpreview.svg");
":Resources/pane_subpreview_over.svg",
":Resources/pane_subpreview_on.svg");
x += 26; // width of pane_preview_off.svg = 25px x += 26; // width of pane_preview_off.svg = 25px
titleBar->add(QPoint(x, 0), m_subcameraPreviewButton); titleBar->add(QPoint(x, 0), m_subcameraPreviewButton);
@ -569,10 +554,8 @@ void ComboViewerPanel::enableFlipConsoleForCamerastand(bool on) {
void ComboViewerPanel::onXshLevelSwitched(TXshLevel *) { void ComboViewerPanel::onXshLevelSwitched(TXshLevel *) {
changeWindowTitle(); changeWindowTitle();
m_sceneViewer->update(); m_sceneViewer->update();
// If the level switched by using the level choose combo box in the film // If the level is switched by using the combobox in the film strip, the
// strip, // current level switches without change in the frame type (level or scene).
// the current level switches without change in the frame type (level or
// scene).
// For such case, update the frame range of the console here. // For such case, update the frame range of the console here.
if (TApp::instance()->getCurrentFrame()->isEditingLevel()) updateFrameRange(); if (TApp::instance()->getCurrentFrame()->isEditingLevel()) updateFrameRange();
} }

13
toonz/sources/toonz/convertpopup.cpp
View file

@ -826,10 +826,10 @@ void ConvertPopup::setFiles(const std::vector<TFilePath> &fps) {
if (m_srcFilePaths.size() == 1) { if (m_srcFilePaths.size() == 1) {
setWindowTitle(tr("Convert 1 Level")); setWindowTitle(tr("Convert 1 Level"));
m_fromFld->setEnabled(true);
m_toFld->setEnabled(true);
m_fileNameFld->setEnabled(true); m_fileNameFld->setEnabled(true);
m_fromFld->setEnabled(false);
m_toFld->setEnabled(false);
m_fromFld->setText(""); m_fromFld->setText("");
m_toFld->setText(""); m_toFld->setText("");
TLevelP levelTmp; TLevelP levelTmp;
@ -840,10 +840,12 @@ void ConvertPopup::setFiles(const std::vector<TFilePath> &fps) {
if (!t->empty()) { if (!t->empty()) {
TFrameId start = t->begin()->first; TFrameId start = t->begin()->first;
TFrameId end = t->rbegin()->first; TFrameId end = t->rbegin()->first;
if (start.getNumber() > 0) if (start.getNumber() >= 0 && end.getNumber() >= 0) {
m_fromFld->setEnabled(true);
m_toFld->setEnabled(true);
m_fromFld->setText(QString::number(start.getNumber())); m_fromFld->setText(QString::number(start.getNumber()));
if (end.getNumber() > 0)
m_toFld->setText(QString::number(end.getNumber())); m_toFld->setText(QString::number(end.getNumber()));
}
} }
// use the image dpi for the converted tlv // use the image dpi for the converted tlv
@ -895,7 +897,8 @@ Convert2Tlv *ConvertPopup::makeTlvConverter(const TFilePath &sourceFilePath) {
sourceFilePath.withParentDir(unpaintedFolder).withName(basename)); sourceFilePath.withParentDir(unpaintedFolder).withName(basename));
} }
int from = -1, to = -1; int from = -1, to = -1;
if (m_srcFilePaths.size() == 1) { if (m_srcFilePaths.size() == 1 && m_fromFld->isEnabled() &&
m_toFld->isEnabled()) {
from = m_fromFld->getValue(); from = m_fromFld->getValue();
to = m_toFld->getValue(); to = m_toFld->getValue();
} }

29
toonz/sources/toonz/dvitemview.cpp
View file

@ -412,7 +412,7 @@ void ItemViewPlayWidget::PlayManager::setInfo(DvItemListModel *model,
m_pixmap = m_pixmap =
model->getItemData(index, DvItemListModel::Thumbnail).value<QPixmap>(); model->getItemData(index, DvItemListModel::Thumbnail).value<QPixmap>();
if (!m_pixmap.isNull()) m_iconSize = m_pixmap.size(); if (!m_pixmap.isNull()) m_iconSize = m_pixmap.size();
m_path = path; m_path = path;
getFileFids(m_path, m_fids); getFileFids(m_path, m_fids);
} }
@ -1141,8 +1141,9 @@ void DvItemViewerPanel::paintTableItem(QPainter &p, int index) {
// Version Control status pixmap // Version Control status pixmap
QPixmap statusPixmap = getStatusPixmap(status); QPixmap statusPixmap = getStatusPixmap(status);
if (!statusPixmap.isNull()) { if (!statusPixmap.isNull()) {
p.drawPixmap(x + 1, y + 1, statusPixmap.scaled(15, 15, Qt::KeepAspectRatio, p.drawPixmap(x + 1, y + 1,
Qt::SmoothTransformation)); statusPixmap.scaled(15, 15, Qt::KeepAspectRatio,
Qt::SmoothTransformation));
x += 15; x += 15;
} }
@ -1232,7 +1233,7 @@ void DvItemViewerPanel::mousePressEvent(QMouseEvent *event) {
int a = index, b = index; int a = index, b = index;
while (a > 0 && !m_selection->isSelected(a - 1)) a--; while (a > 0 && !m_selection->isSelected(a - 1)) a--;
if (a == 0) a = index; if (a == 0) a = index;
int k = getItemCount(); int k = getItemCount();
while (b < k && !m_selection->isSelected(b + 1)) b++; while (b < k && !m_selection->isSelected(b + 1)) b++;
if (b == k) b = index; if (b == k) b = index;
int i; int i;
@ -1489,9 +1490,9 @@ void DvItemViewer::setModel(DvItemListModel *model) {
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
void DvItemViewer::updateContentSize() { void DvItemViewer::updateContentSize() {
int w = m_panel->getContentMinimumWidth(); int w = m_panel->getContentMinimumWidth();
if (w < width()) w = width(); if (w < width()) w = width();
int h = m_panel->getContentHeight(w) + int h = m_panel->getContentHeight(w) +
20; // 20 is margin for showing the empty area 20; // 20 is margin for showing the empty area
if (h < height()) h = height(); if (h < height()) h = height();
m_panel->resize(w, h); m_panel->resize(w, h);
@ -1755,14 +1756,14 @@ void DvItemViewerTitleBar::paintEvent(QPaintEvent *) {
QRect rect(0, 0, width(), height()); QRect rect(0, 0, width(), height());
QBrush nb = QBrush(Qt::NoBrush); QBrush nb = QBrush(Qt::NoBrush);
QPalette pal = QPalette(nb, nb, QBrush(QColor(255, 255, 255, 30)), QPalette pal = QPalette(nb, nb, QBrush(QColor(getColBorderColor())),
QBrush(QColor(0, 0, 0, 110)), QBrush(QColor(getColBorderColor())),
QBrush(QColor(Qt::gray)), nb, nb, nb, nb); QBrush(QColor(Qt::gray)), nb, nb, nb, nb);
p.fillRect(rect, QColor(0, 0, 0, 90)); // bg color p.fillRect(rect, getColColor());
p.setPen(QColor(200, 200, 200, 255)); // text color p.setPen(getColTextColor());
int h = 0; // fontMetrics().descent(); int h = 0; // fontMetrics().descent();
int y = rect.top(); int y = rect.top();
int ly = rect.height(); int ly = rect.height();
int lx = rect.width(); int lx = rect.width();
@ -1778,11 +1779,11 @@ void DvItemViewerTitleBar::paintEvent(QPaintEvent *) {
// paint background // paint background
QColor bgColor; QColor bgColor;
if (dataType == model->getCurrentOrderType()) if (dataType == model->getCurrentOrderType())
bgColor = QColor(255, 255, 255, 30); bgColor = QColor(getColSortedColor());
else else
bgColor = QColor(0, 0, 0, 0); bgColor = QColor(0, 0, 0, 0);
QRect typeRect(x, y, columnLx, ly); QRect typeRect(x - 1, y - 1, columnLx + 1, ly + 1);
QBrush brush(bgColor); QBrush brush(bgColor);
qDrawShadePanel(&p, typeRect, pal, false, 1, &brush); qDrawShadePanel(&p, typeRect, pal, false, 1, &brush);
@ -1793,7 +1794,7 @@ void DvItemViewerTitleBar::paintEvent(QPaintEvent *) {
arrowIcon = createQIconPNG("arrow_up"); arrowIcon = createQIconPNG("arrow_up");
else else
arrowIcon = createQIconPNG("arrow_down"); arrowIcon = createQIconPNG("arrow_down");
p.drawPixmap(QRect(x + columnLx - 10, y + 6, 8, 8), p.drawPixmap(QRect(x + columnLx - 11, y + 6, 8, 8),
arrowIcon.pixmap(8, 8)); arrowIcon.pixmap(8, 8));
} }

25
toonz/sources/toonz/dvitemview.h
View file

@ -444,6 +444,17 @@ class DvItemViewerTitleBar final : public QWidget {
QPoint m_pos; QPoint m_pos;
public: public:
void setColColor(const QColor &color) { m_colColor = color; }
QColor getColColor() const { return m_colColor; }
void setColSortedColor(const QColor &color) { m_colSortedColor = color; }
QColor getColSortedColor() const { return m_colSortedColor; }
void setColTextColor(const QColor &color) { m_colTextColor = color; }
QColor getColTextColor() const { return m_colTextColor; }
void setColBorderColor(const QColor &color) { m_colBorderColor = color; }
QColor getColBorderColor() const { return m_colBorderColor; }
void setColRaisedColor(const QColor &color) { m_colRaisedColor = color; }
QColor getColRaisedColor() const { return m_colRaisedColor; }
DvItemViewerTitleBar(DvItemViewer *itemViewer, QWidget *parent = 0, DvItemViewerTitleBar(DvItemViewer *itemViewer, QWidget *parent = 0,
bool isInteractive = true); bool isInteractive = true);
@ -455,6 +466,20 @@ protected:
void openContextMenu(QMouseEvent *); void openContextMenu(QMouseEvent *);
void mousePressEvent(QMouseEvent *) override; void mousePressEvent(QMouseEvent *) override;
void paintEvent(QPaintEvent *) override; void paintEvent(QPaintEvent *) override;
private:
QColor m_colColor;
QColor m_colSortedColor;
QColor m_colTextColor;
QColor m_colBorderColor;
QColor m_colRaisedColor;
Q_PROPERTY(QColor ColColor READ getColColor WRITE setColColor);
Q_PROPERTY(QColor ColSortedColor READ getColColor WRITE setColSortedColor);
Q_PROPERTY(QColor ColTextColor READ getColColor WRITE setColTextColor);
Q_PROPERTY(QColor ColBorderColor READ getColColor WRITE setColBorderColor);
Q_PROPERTY(
QColor ColRaisedColor READ getColRaisedColor WRITE setColRaisedColor);
}; };
//============================================================================= //=============================================================================

7
toonz/sources/toonz/flipbook.cpp
View file

@ -265,9 +265,8 @@ void FlipBook::addFreezeButtonToTitleBar() {
TPanel *panel = qobject_cast<TPanel *>(parentWidget()); TPanel *panel = qobject_cast<TPanel *>(parentWidget());
if (panel) { if (panel) {
TPanelTitleBar *titleBar = panel->getTitleBar(); TPanelTitleBar *titleBar = panel->getTitleBar();
m_freezeButton = new TPanelTitleBarButton( m_freezeButton =
titleBar, ":Resources/pane_freeze_off.svg", new TPanelTitleBarButton(titleBar, ":Resources/pane_freeze.svg");
":Resources/pane_freeze_over.svg", ":Resources/pane_freeze_on.svg");
m_freezeButton->setToolTip("Freeze"); m_freezeButton->setToolTip("Freeze");
titleBar->add(QPoint(-64, 0), m_freezeButton); titleBar->add(QPoint(-64, 0), m_freezeButton);
connect(m_freezeButton, SIGNAL(toggled(bool)), this, SLOT(freeze(bool))); connect(m_freezeButton, SIGNAL(toggled(bool)), this, SLOT(freeze(bool)));
@ -503,7 +502,7 @@ void LoadImagesPopup::onFilePathClicked(const TFilePath &fp) {
if (!level || level->getFrameCount() == 0) goto clear; if (!level || level->getFrameCount() == 0) goto clear;
it = level->begin(); it = level->begin();
m_to = m_from = it->first.getNumber(); m_to = m_from = it->first.getNumber();
for (; it != level->end(); ++it) m_to = it->first.getNumber(); for (; it != level->end(); ++it) m_to = it->first.getNumber();

34
toonz/sources/toonz/layerheaderpanel.cpp
View file

@ -27,9 +27,7 @@ LayerHeaderPanel::LayerHeaderPanel(XsheetViewer *viewer, QWidget *parent,
QRect rect = o->rect(PredefinedRect::LAYER_HEADER_PANEL); QRect rect = o->rect(PredefinedRect::LAYER_HEADER_PANEL);
setObjectName("layerHeaderPanel"); setObjectName("layerHeaderPanel");
setFixedSize(rect.size()); setFixedSize(rect.size());
setMouseTracking(true); setMouseTracking(true);
} }
@ -62,10 +60,11 @@ void LayerHeaderPanel::paintEvent(QPaintEvent *event) {
const Orientation *o = Orientations::leftToRight(); const Orientation *o = Orientations::leftToRight();
QColor background = m_viewer->getBGColor(); // removed by konero 6/3/20
QColor slightlyLighter = {mix(background, Qt::white, 0.95)}; //QColor background = m_viewer->getBGColor();
QRect rect = QRect(QPoint(0, 0), size()); //QColor slightlyLighter = {mix(background, Qt::white, 0.95)};
p.fillRect(rect.adjusted(0, 0, -3, 0), slightlyLighter); //QRect rect = QRect(QPoint(0, 0), size());
//p.fillRect(rect.adjusted(0, 0, -3, 0), slightlyLighter);
QImage preview = (m_buttonHighlighted == PreviewButton QImage preview = (m_buttonHighlighted == PreviewButton
? m_viewer->getLayerHeaderPreviewOverImage() ? m_viewer->getLayerHeaderPreviewOverImage()
@ -81,21 +80,22 @@ void LayerHeaderPanel::paintEvent(QPaintEvent *event) {
drawIcon(p, PredefinedRect::PANEL_PREVIEW_LAYER, boost::none, camstand); drawIcon(p, PredefinedRect::PANEL_PREVIEW_LAYER, boost::none, camstand);
drawIcon(p, PredefinedRect::PANEL_LOCK, boost::none, lock); drawIcon(p, PredefinedRect::PANEL_LOCK, boost::none, lock);
QRect numberRect = o->rect(PredefinedRect::LAYER_NUMBER); // removed by konero 6/3/20
//QRect numberRect = o->rect(PredefinedRect::LAYER_NUMBER);
int leftadj = 2; //int leftadj = 2;
if (Preferences::instance()->isShowColumnNumbersEnabled()) { //if (Preferences::instance()->isShowColumnNumbersEnabled()) {
p.drawText(numberRect, Qt::AlignCenter | Qt::TextSingleLine, "#"); // p.drawText(numberRect, Qt::AlignCenter | Qt::TextSingleLine, "#");
leftadj += 20; // leftadj += 20;
} //}
QRect nameRect = //QRect nameRect =
o->rect(PredefinedRect::PANEL_LAYER_NAME).adjusted(leftadj, 0, -1, 0); // o->rect(PredefinedRect::PANEL_LAYER_NAME).adjusted(leftadj, 0, -1, 0);
p.drawText(nameRect, Qt::AlignLeft | Qt::AlignVCenter | Qt::TextSingleLine, //p.drawText(nameRect, Qt::AlignLeft | Qt::AlignVCenter | Qt::TextSingleLine,
QObject::tr("Layer name")); // QObject::tr("Layer name"));
drawLines(p, numberRect, nameRect); //drawLines(p, numberRect, nameRect);
} }
void LayerHeaderPanel::drawIcon(QPainter &p, PredefinedRect rect, void LayerHeaderPanel::drawIcon(QPainter &p, PredefinedRect rect,

37
toonz/sources/toonz/pane.cpp
View file

@ -197,13 +197,10 @@ void TPanel::restoreFloatingPanelState() {
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
TPanelTitleBarButton::TPanelTitleBarButton(QWidget *parent, TPanelTitleBarButton::TPanelTitleBarButton(QWidget *parent,
const QString &standardPixmapName, const QString &standardPixmapName)
const QString &rolloverPixmapName,
const QString &pressedPixmapName)
: QWidget(parent) : QWidget(parent)
, m_standardPixmap(standardPixmapName) , m_standardPixmap(standardPixmapName)
, m_rolloverPixmap(rolloverPixmapName) , m_standardPixmapName(standardPixmapName)
, m_pressedPixmap(pressedPixmapName)
, m_rollover(false) , m_rollover(false)
, m_pressed(false) , m_pressed(false)
, m_buttonSet(0) , m_buttonSet(0)
@ -214,13 +211,9 @@ TPanelTitleBarButton::TPanelTitleBarButton(QWidget *parent,
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
TPanelTitleBarButton::TPanelTitleBarButton(QWidget *parent, TPanelTitleBarButton::TPanelTitleBarButton(QWidget *parent,
const QPixmap &standardPixmap, const QPixmap &standardPixmap)
const QPixmap &rolloverPixmap,
const QPixmap &pressedPixmap)
: QWidget(parent) : QWidget(parent)
, m_standardPixmap(standardPixmap) , m_standardPixmap(standardPixmap)
, m_rolloverPixmap(rolloverPixmap)
, m_pressedPixmap(pressedPixmap)
, m_rollover(false) , m_rollover(false)
, m_pressed(false) , m_pressed(false)
, m_buttonSet(0) , m_buttonSet(0)
@ -250,9 +243,29 @@ void TPanelTitleBarButton::setPressed(bool pressed) {
void TPanelTitleBarButton::paintEvent(QPaintEvent *event) { void TPanelTitleBarButton::paintEvent(QPaintEvent *event) {
QPainter painter(this); QPainter painter(this);
// create color states for the button
QPixmap standard_pm(m_standardPixmap.size());
QPixmap rollover_pm(m_standardPixmap.size());
QPixmap pressed_pm(m_standardPixmap.size());
standard_pm.fill(Qt::transparent);
rollover_pm.fill(QColor(getRolloverColor()));
pressed_pm.fill(QColor(getPressedColor()));
// set unique colors if filename contains string
if (m_standardPixmapName.contains("freeze", Qt::CaseInsensitive)) {
pressed_pm.fill(QColor(getFreezeColor()));
}
if (m_standardPixmapName.contains("preview", Qt::CaseInsensitive)) {
pressed_pm.fill(QColor(getPreviewColor()));
}
// compose the state colors
painter.drawPixmap( painter.drawPixmap(
0, 0, m_pressed ? m_pressedPixmap : m_rollover ? m_rolloverPixmap 0, 0, m_pressed ? pressed_pm : m_rollover ? rollover_pm : standard_pm);
: m_standardPixmap); // compose the icon
painter.drawPixmap(0, 0, m_standardPixmap);
painter.end(); painter.end();
} }

38
toonz/sources/toonz/pane.h
View file

@ -14,7 +14,13 @@ class Room;
//! icon buttons placed on the panel titlebar (cfr. viewerpane.h) //! icon buttons placed on the panel titlebar (cfr. viewerpane.h)
class TPanelTitleBarButton : public QWidget { class TPanelTitleBarButton : public QWidget {
Q_OBJECT Q_OBJECT
QPixmap m_standardPixmap, m_rolloverPixmap, m_pressedPixmap; QString m_standardPixmapName;
QPixmap m_standardPixmap;
QColor m_rolloverColor;
QColor m_pressedColor;
QColor m_freezeColor;
QColor m_previewColor;
bool m_rollover; bool m_rollover;
TPanelTitleBarButtonSet *m_buttonSet; TPanelTitleBarButtonSet *m_buttonSet;
int m_id; int m_id;
@ -23,18 +29,22 @@ protected:
bool m_pressed; bool m_pressed;
public: public:
TPanelTitleBarButton(QWidget *parent, const QString &standardPixmapName, TPanelTitleBarButton(QWidget *parent, const QString &standardPixmapName);
const QString &rolloverPixmapName, TPanelTitleBarButton(QWidget *parent, const QPixmap &standardPixmap);
const QString &pressedPixmapName);
TPanelTitleBarButton(QWidget *parent, const QPixmap &standardPixmap,
const QPixmap &rolloverPixmap,
const QPixmap &pressedPixmap);
//! call this method to make a radio button. id is the button identifier //! call this method to make a radio button. id is the button identifier
void setButtonSet(TPanelTitleBarButtonSet *buttonSet, int id); void setButtonSet(TPanelTitleBarButtonSet *buttonSet, int id);
int getId() const { return m_id; } int getId() const { return m_id; }
void setRolloverColor(const QColor &color) { m_rolloverColor = color; }
QColor getRolloverColor() const { return m_rolloverColor; }
void setPressedColor(const QColor &color) { m_pressedColor = color; }
QColor getPressedColor() const { return m_pressedColor; }
void setFreezeColor(const QColor &color) { m_freezeColor = color; }
QColor getFreezeColor() const { return m_freezeColor; }
void setPreviewColor(const QColor &color) { m_previewColor = color; }
QColor getPreviewColor() const { return m_previewColor; }
public slots: public slots:
void setPressed(bool pressed); // n.b. doesn't emit signals. calls update() void setPressed(bool pressed); // n.b. doesn't emit signals. calls update()
@ -46,6 +56,11 @@ protected:
void leaveEvent(QEvent *) override; void leaveEvent(QEvent *) override;
void mousePressEvent(QMouseEvent *event) override; void mousePressEvent(QMouseEvent *event) override;
Q_PROPERTY(QColor RolloverColor READ getRolloverColor WRITE setRolloverColor);
Q_PROPERTY(QColor PressedColor READ getPressedColor WRITE setPressedColor);
Q_PROPERTY(QColor FreezeColor READ getFreezeColor WRITE setFreezeColor);
Q_PROPERTY(QColor PreviewColor READ getPreviewColor WRITE setPreviewColor);
signals: signals:
//! emitted when the user press the button //! emitted when the user press the button
//! n.b. the signal is not emitted if the button is part of a buttonset //! n.b. the signal is not emitted if the button is part of a buttonset
@ -61,11 +76,8 @@ class TPanelTitleBarButtonForSafeArea final : public TPanelTitleBarButton {
Q_OBJECT Q_OBJECT
public: public:
TPanelTitleBarButtonForSafeArea(QWidget *parent, TPanelTitleBarButtonForSafeArea(QWidget *parent,
const QString &standardPixmapName, const QString &standardPixmapName)
const QString &rolloverPixmapName, : TPanelTitleBarButton(parent, standardPixmapName) {}
const QString &pressedPixmapName)
: TPanelTitleBarButton(parent, standardPixmapName, rolloverPixmapName,
pressedPixmapName) {}
void getSafeAreaNameList(QList<QString> &nameList); void getSafeAreaNameList(QList<QString> &nameList);
protected: protected:

36
toonz/sources/toonz/toonz.qrc
View file

@ -1,8 +1,6 @@
<RCC> <RCC>
<qresource prefix="/"> <qresource prefix="/">
<file>Resources/pane_3d_off.svg</file> <file>Resources/pane_3d.svg</file>
<file>Resources/pane_3d_on.svg</file>
<file>Resources/pane_3d_over.svg</file>
<file>Resources/3Dside_l.svg</file> <file>Resources/3Dside_l.svg</file>
<file>Resources/3Dside_r.svg</file> <file>Resources/3Dside_r.svg</file>
<file>Resources/3Dtop.svg</file> <file>Resources/3Dtop.svg</file>
@ -103,9 +101,7 @@
<file>Resources/frameprev.svg</file> <file>Resources/frameprev.svg</file>
<file>Resources/frameprev_click.svg</file> <file>Resources/frameprev_click.svg</file>
<file>Resources/frameprev_over.svg</file> <file>Resources/frameprev_over.svg</file>
<file>Resources/pane_freeze_off.svg</file> <file>Resources/pane_freeze.svg</file>
<file>Resources/pane_freeze_on.svg</file>
<file>Resources/pane_freeze_over.svg</file>
<file>Resources/fx.svg</file> <file>Resources/fx.svg</file>
<file>Resources/geometric.svg</file> <file>Resources/geometric.svg</file>
<file>Resources/geometric_rollover.svg</file> <file>Resources/geometric_rollover.svg</file>
@ -260,9 +256,7 @@
<file>Resources/special_off.svg</file> <file>Resources/special_off.svg</file>
<file>Resources/special_on.svg</file> <file>Resources/special_on.svg</file>
<file>Resources/splash.svg</file> <file>Resources/splash.svg</file>
<file>Resources/pane_table_off.svg</file> <file>Resources/pane_table.svg</file>
<file>Resources/pane_table_on.svg</file>
<file>Resources/pane_table_over.svg</file>
<file>Resources/startup.png</file> <file>Resources/startup.png</file>
<file>Resources/start_off.svg</file> <file>Resources/start_off.svg</file>
<file>Resources/start_on.svg</file> <file>Resources/start_on.svg</file>
@ -285,8 +279,6 @@
<file>Resources/swap_on.svg</file> <file>Resources/swap_on.svg</file>
<file>Resources/svg.svg</file> <file>Resources/svg.svg</file>
<file>Resources/switch.svg</file> <file>Resources/switch.svg</file>
<file>Resources/switch_on.svg</file>
<file>Resources/switch_over.svg</file>
<file>Resources/table_view_act.png</file> <file>Resources/table_view_act.png</file>
<file>Resources/tape.png</file> <file>Resources/tape.png</file>
<file>Resources/tape.svg</file> <file>Resources/tape.svg</file>
@ -311,18 +303,14 @@
<file>Resources/unknown.svg</file> <file>Resources/unknown.svg</file>
<file>Resources/upTitle.png</file> <file>Resources/upTitle.png</file>
<file>Resources/v_chandle.png</file> <file>Resources/v_chandle.png</file>
<file>Resources/pane_cam_off.svg</file> <file>Resources/pane_cam.svg</file>
<file>Resources/pane_cam_on.svg</file>
<file>Resources/pane_cam_over.svg</file>
<file>Resources/viewicon_off.svg</file> <file>Resources/viewicon_off.svg</file>
<file>Resources/viewicon_on.svg</file> <file>Resources/viewicon_on.svg</file>
<file>Resources/viewicon_over.svg</file> <file>Resources/viewicon_over.svg</file>
<file>Resources/viewlist_off.svg</file> <file>Resources/viewlist_off.svg</file>
<file>Resources/viewlist_on.svg</file> <file>Resources/viewlist_on.svg</file>
<file>Resources/viewlist_over.svg</file> <file>Resources/viewlist_over.svg</file>
<file>Resources/pane_preview_off.svg</file> <file>Resources/pane_preview.svg</file>
<file>Resources/pane_preview_on.svg</file>
<file>Resources/pane_preview_over.svg</file>
<file>Resources/undo.svg</file> <file>Resources/undo.svg</file>
<file>Resources/viewtable_off.svg</file> <file>Resources/viewtable_off.svg</file>
<file>Resources/viewtable_on.svg</file> <file>Resources/viewtable_on.svg</file>
@ -389,9 +377,7 @@
<file>Resources/use_subcamera_preview.svg</file> <file>Resources/use_subcamera_preview.svg</file>
<file>Resources/use_subcamera_preview_over.svg</file> <file>Resources/use_subcamera_preview_over.svg</file>
<file>Resources/use_subcamera_preview_click.svg</file> <file>Resources/use_subcamera_preview_click.svg</file>
<file>Resources/pane_subpreview_off.svg</file> <file>Resources/pane_subpreview.svg</file>
<file>Resources/pane_subpreview_over.svg</file>
<file>Resources/pane_subpreview_on.svg</file>
<file>Resources/round_cap.svg</file> <file>Resources/round_cap.svg</file>
<file>Resources/butt_cap.svg</file> <file>Resources/butt_cap.svg</file>
<file>Resources/projecting_cap.svg</file> <file>Resources/projecting_cap.svg</file>
@ -400,15 +386,9 @@
<file>Resources/miter_join.svg</file> <file>Resources/miter_join.svg</file>
<file>Resources/init.js</file> <file>Resources/init.js</file>
<file>Resources/scripticon.png</file> <file>Resources/scripticon.png</file>
<file>Resources/pane_safe_off.svg</file> <file>Resources/pane_safe.svg</file>
<file>Resources/pane_safe_over.svg</file>
<file>Resources/pane_safe_on.svg</file>
<file>Resources/pane_minimize.svg</file> <file>Resources/pane_minimize.svg</file>
<file>Resources/pane_minimize_over.svg</file> <file>Resources/pane_grid.svg</file>
<file>Resources/pane_minimize_on.svg</file>
<file>Resources/pane_grid_off.svg</file>
<file>Resources/pane_grid_over.svg</file>
<file>Resources/pane_grid_on.svg</file>
<file>Resources/folderup_icon.svg</file> <file>Resources/folderup_icon.svg</file>
<file>Resources/link_icon.svg</file> <file>Resources/link_icon.svg</file>
<file>Resources/folder_icon.svg</file> <file>Resources/folder_icon.svg</file>

15
toonz/sources/toonz/tpanels.cpp
View file

@ -478,10 +478,8 @@ void PaletteViewerPanel::reset() {
void PaletteViewerPanel::initializeTitleBar() { void PaletteViewerPanel::initializeTitleBar() {
m_isCurrentButton = new TPanelTitleBarButton( m_isCurrentButton = new TPanelTitleBarButton(
getTitleBar(), svgToPixmap(":Resources/switch.svg"), getTitleBar(), svgToPixmap(":Resources/switch.svg"));
svgToPixmap(":Resources/switch_over.svg"), getTitleBar()->add(QPoint(-54, 0), m_isCurrentButton);
svgToPixmap(":Resources/switch_on.svg"));
getTitleBar()->add(QPoint(-54, 2), m_isCurrentButton);
m_isCurrentButton->setPressed(true); m_isCurrentButton->setPressed(true);
connect(m_isCurrentButton, SIGNAL(toggled(bool)), connect(m_isCurrentButton, SIGNAL(toggled(bool)),
SLOT(onCurrentButtonToggled(bool))); SLOT(onCurrentButtonToggled(bool)));
@ -987,9 +985,8 @@ void FlipbookPanel::initializeTitleBar(TPanelTitleBar *titleBar) {
int iconWidth = 20; int iconWidth = 20;
// safe area button // safe area button
TPanelTitleBarButtonForSafeArea *safeAreaButton = TPanelTitleBarButtonForSafeArea *safeAreaButton =
new TPanelTitleBarButtonForSafeArea( new TPanelTitleBarButtonForSafeArea(titleBar,
titleBar, ":Resources/pane_safe_off.svg", ":Resources/pane_safe_off.svg");
":Resources/pane_safe_over.svg", ":Resources/pane_safe_on.svg");
safeAreaButton->setToolTip(tr("Safe Area (Right Click to Select)")); safeAreaButton->setToolTip(tr("Safe Area (Right Click to Select)"));
titleBar->add(QPoint(x, 0), safeAreaButton); titleBar->add(QPoint(x, 0), safeAreaButton);
ret = ret && connect(safeAreaButton, SIGNAL(toggled(bool)), ret = ret && connect(safeAreaButton, SIGNAL(toggled(bool)),
@ -1004,9 +1001,7 @@ void FlipbookPanel::initializeTitleBar(TPanelTitleBar *titleBar) {
x += 33 + iconWidth; x += 33 + iconWidth;
// minimize button // minimize button
m_button = new TPanelTitleBarButton(titleBar, ":Resources/pane_minimize.svg", m_button = new TPanelTitleBarButton(titleBar, ":Resources/pane_minimize.svg");
":Resources/pane_minimize_over.svg",
":Resources/pane_minimize_on.svg");
m_button->setToolTip(tr("Minimize")); m_button->setToolTip(tr("Minimize"));
m_button->setPressed(false); m_button->setPressed(false);

37
toonz/sources/toonz/viewerpane.cpp
View file

@ -431,9 +431,7 @@ void SceneViewerPanel::initializeTitleBar(TPanelTitleBar *titleBar) {
// buttons for show / hide toggle for the field guide and the safe area // buttons for show / hide toggle for the field guide and the safe area
TPanelTitleBarButtonForSafeArea *safeAreaButton = TPanelTitleBarButtonForSafeArea *safeAreaButton =
new TPanelTitleBarButtonForSafeArea( new TPanelTitleBarButtonForSafeArea(titleBar, ":Resources/pane_safe.svg");
titleBar, ":Resources/pane_safe_off.svg",
":Resources/pane_safe_over.svg", ":Resources/pane_safe_on.svg");
safeAreaButton->setToolTip(tr("Safe Area (Right Click to Select)")); safeAreaButton->setToolTip(tr("Safe Area (Right Click to Select)"));
titleBar->add(QPoint(x, 0), safeAreaButton); titleBar->add(QPoint(x, 0), safeAreaButton);
ret = ret && connect(safeAreaButton, SIGNAL(toggled(bool)), ret = ret && connect(safeAreaButton, SIGNAL(toggled(bool)),
@ -446,9 +444,7 @@ void SceneViewerPanel::initializeTitleBar(TPanelTitleBar *titleBar) {
safeAreaButton->setPressed( safeAreaButton->setPressed(
CommandManager::instance()->getAction(MI_SafeArea)->isChecked()); CommandManager::instance()->getAction(MI_SafeArea)->isChecked());
button = new TPanelTitleBarButton(titleBar, ":Resources/pane_grid_off.svg", button = new TPanelTitleBarButton(titleBar, ":Resources/pane_grid.svg");
":Resources/pane_grid_over.svg",
":Resources/pane_grid_on.svg");
button->setToolTip(tr("Field Guide")); button->setToolTip(tr("Field Guide"));
x += 1 + iconWidth; x += 1 + iconWidth;
titleBar->add(QPoint(x, 0), button); titleBar->add(QPoint(x, 0), button);
@ -462,26 +458,20 @@ void SceneViewerPanel::initializeTitleBar(TPanelTitleBar *titleBar) {
CommandManager::instance()->getAction(MI_FieldGuide)->isChecked()); CommandManager::instance()->getAction(MI_FieldGuide)->isChecked());
// view mode toggles // view mode toggles
button = new TPanelTitleBarButton(titleBar, ":Resources/pane_table_off.svg", button = new TPanelTitleBarButton(titleBar, ":Resources/pane_table.svg");
":Resources/pane_table_over.svg",
":Resources/pane_table_on.svg");
button->setToolTip(tr("Camera Stand View")); button->setToolTip(tr("Camera Stand View"));
x += 10 + iconWidth; x += 10 + iconWidth;
titleBar->add(QPoint(x, 0), button); titleBar->add(QPoint(x, 0), button);
button->setButtonSet(viewModeButtonSet, SceneViewer::NORMAL_REFERENCE); button->setButtonSet(viewModeButtonSet, SceneViewer::NORMAL_REFERENCE);
button->setPressed(true); button->setPressed(true);
button = new TPanelTitleBarButton(titleBar, ":Resources/pane_3d_off.svg", button = new TPanelTitleBarButton(titleBar, ":Resources/pane_3d.svg");
":Resources/pane_3d_over.svg",
":Resources/pane_3d_on.svg");
button->setToolTip(tr("3D View")); button->setToolTip(tr("3D View"));
x += 21; // width of pane_table_off.svg = 20px x += 21; // width of pane_table_off.svg = 20px
titleBar->add(QPoint(x, 0), button); titleBar->add(QPoint(x, 0), button);
button->setButtonSet(viewModeButtonSet, SceneViewer::CAMERA3D_REFERENCE); button->setButtonSet(viewModeButtonSet, SceneViewer::CAMERA3D_REFERENCE);
button = new TPanelTitleBarButton(titleBar, ":Resources/pane_cam_off.svg", button = new TPanelTitleBarButton(titleBar, ":Resources/pane_cam.svg");
":Resources/pane_cam_over.svg",
":Resources/pane_cam_on.svg");
button->setToolTip(tr("Camera View")); button->setToolTip(tr("Camera View"));
x += 21; // width of pane_3d_off.svg = 20px x += 21; // width of pane_3d_off.svg = 20px
titleBar->add(QPoint(x, 0), button); titleBar->add(QPoint(x, 0), button);
@ -490,9 +480,7 @@ void SceneViewerPanel::initializeTitleBar(TPanelTitleBar *titleBar) {
SLOT(setReferenceMode(int))); SLOT(setReferenceMode(int)));
// freeze button // freeze button
button = new TPanelTitleBarButton(titleBar, ":Resources/pane_freeze_off.svg", button = new TPanelTitleBarButton(titleBar, ":Resources/pane_freeze.svg");
":Resources/pane_freeze_over.svg",
":Resources/pane_freeze_on.svg");
x += 10 + 20; // width of pane_cam_off.svg = 20px x += 10 + 20; // width of pane_cam_off.svg = 20px
button->setToolTip(tr("Freeze")); // RC1 button->setToolTip(tr("Freeze")); // RC1
@ -501,9 +489,8 @@ void SceneViewerPanel::initializeTitleBar(TPanelTitleBar *titleBar) {
SLOT(freeze(bool))); SLOT(freeze(bool)));
// preview toggles // preview toggles
m_previewButton = new TPanelTitleBarButton( m_previewButton =
titleBar, ":Resources/pane_preview_off.svg", new TPanelTitleBarButton(titleBar, ":Resources/pane_preview.svg");
":Resources/pane_preview_over.svg", ":Resources/pane_preview_on.svg");
x += 10 + iconWidth; x += 10 + iconWidth;
titleBar->add(QPoint(x, 0), m_previewButton); titleBar->add(QPoint(x, 0), m_previewButton);
m_previewButton->setToolTip(tr("Preview")); m_previewButton->setToolTip(tr("Preview"));
@ -511,9 +498,7 @@ void SceneViewerPanel::initializeTitleBar(TPanelTitleBar *titleBar) {
SLOT(enableFullPreview(bool))); SLOT(enableFullPreview(bool)));
m_subcameraPreviewButton = m_subcameraPreviewButton =
new TPanelTitleBarButton(titleBar, ":Resources/pane_subpreview_off.svg", new TPanelTitleBarButton(titleBar, ":Resources/pane_subpreview.svg");
":Resources/pane_subpreview_over.svg",
":Resources/pane_subpreview_on.svg");
x += 26; // width of pane_preview_off.svg = 25px x += 26; // width of pane_preview_off.svg = 25px
titleBar->add(QPoint(x, 0), m_subcameraPreviewButton); titleBar->add(QPoint(x, 0), m_subcameraPreviewButton);
@ -640,7 +625,7 @@ void SceneViewerPanel::changeWindowTitle() {
m_sceneViewer->getNormalZoomScale().inv(); m_sceneViewer->getNormalZoomScale().inv();
if (m_sceneViewer->getIsFlippedX()) aff = aff * TScale(-1, 1); if (m_sceneViewer->getIsFlippedX()) aff = aff * TScale(-1, 1);
if (m_sceneViewer->getIsFlippedY()) aff = aff * TScale(1, -1); if (m_sceneViewer->getIsFlippedY()) aff = aff * TScale(1, -1);
name = name + tr(" :: Zoom : ") + name = name + tr(" :: Zoom : ") +
QString::number(tround(100.0 * sqrt(aff.det()))) + "%"; QString::number(tround(100.0 * sqrt(aff.det()))) + "%";
if (m_sceneViewer->getIsFlippedX() || m_sceneViewer->getIsFlippedY()) { if (m_sceneViewer->getIsFlippedX() || m_sceneViewer->getIsFlippedY()) {
name = name + tr(" (Flipped)"); name = name + tr(" (Flipped)");
@ -668,7 +653,7 @@ void SceneViewerPanel::changeWindowTitle() {
m_sceneViewer->getNormalZoomScale().inv(); m_sceneViewer->getNormalZoomScale().inv();
if (m_sceneViewer->getIsFlippedX()) aff = aff * TScale(-1, 1); if (m_sceneViewer->getIsFlippedX()) aff = aff * TScale(-1, 1);
if (m_sceneViewer->getIsFlippedY()) aff = aff * TScale(1, -1); if (m_sceneViewer->getIsFlippedY()) aff = aff * TScale(1, -1);
name = name + tr(" :: Zoom : ") + name = name + tr(" :: Zoom : ") +
QString::number(tround(100.0 * sqrt(aff.det()))) + "%"; QString::number(tround(100.0 * sqrt(aff.det()))) + "%";
if (m_sceneViewer->getIsFlippedX() || m_sceneViewer->getIsFlippedY()) { if (m_sceneViewer->getIsFlippedX() || m_sceneViewer->getIsFlippedY()) {
name = name + tr(" (Flipped)"); name = name + tr(" (Flipped)");

6
toonz/sources/toonz/xshcolumnviewer.cpp
View file

@ -1701,12 +1701,12 @@ void ColumnArea::paintEvent(QPaintEvent *event) { // AREA
} }
} }
p.setPen(grey150); p.setPen(m_viewer->getVerticalLineColor());
p.setBrush(Qt::NoBrush); p.setBrush(Qt::NoBrush);
if (m_viewer->orientation()->isVerticalTimeline()) if (m_viewer->orientation()->isVerticalTimeline())
p.drawRect(toBeUpdated.adjusted(0, 0, -1, -3)); p.drawRect(toBeUpdated.adjusted(0, -1, -1, -3));
else else
p.drawRect(toBeUpdated.adjusted(0, 0, -3, -1)); p.drawRect(toBeUpdated.adjusted(-1, 0, -3, -1));
if (getDragTool()) getDragTool()->drawColumnsArea(p); if (getDragTool()) getDragTool()->drawColumnsArea(p);
} }

4
toonz/sources/toonz/xshrowviewer.cpp
View file

@ -876,9 +876,9 @@ void RowArea::paintEvent(QPaintEvent *event) {
p.setPen(m_viewer->getVerticalLineColor()); p.setPen(m_viewer->getVerticalLineColor());
p.setBrush(Qt::NoBrush); p.setBrush(Qt::NoBrush);
if (m_viewer->orientation()->isVerticalTimeline()) if (m_viewer->orientation()->isVerticalTimeline())
p.drawRect(toBeUpdated.adjusted(0, -1, -1, 0)); p.drawRect(toBeUpdated.adjusted(-1, -1, -1, 0));
else else
p.drawRect(toBeUpdated.adjusted(-1, 0, 0, -1)); p.drawRect(toBeUpdated.adjusted(-1, -1, 0, -1));
} }
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------

BIN
toonz/sources/toonzqt/Resources/h_chandleCenter.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 71 B

BIN
toonz/sources/toonzqt/Resources/h_chandleDown.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 86 B

BIN
toonz/sources/toonzqt/Resources/h_chandleUp.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 76 B

4
toonz/sources/toonzqt/Resources/h_chandle_center.svg Normal file
View file

@ -0,0 +1,4 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
<svg width="11px" height="5px" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xml:space="preserve" xmlns:serif="http://www.serif.com/" style="fill-rule:evenodd;clip-rule:evenodd;stroke-linejoin:round;stroke-miterlimit:2;">
</svg>
Side by side

After

Width:  |  Height:  |  Size: 429 B

20
toonz/sources/toonzqt/Resources/h_chandle_down.svg Normal file
View file

@ -0,0 +1,20 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
<svg width="11px" height="10px" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xml:space="preserve" xmlns:serif="http://www.serif.com/" style="fill-rule:evenodd;clip-rule:evenodd;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:1.5;">
<g transform="matrix(0.909091,0,0,1,-350,-299.5)">
<g transform="matrix(0.825,0,0,0.875,69.3,39.5)">
<path d="M390.667,298.286L396,304L384,304L389.333,298.286L390.667,298.286Z" style="fill:rgb(235,235,235);stroke:black;stroke-width:2.45px;"/>
</g>
<g transform="matrix(0.825,0,0,1,69.3,0.5)">
<rect x="384" y="305" width="12" height="3" style="fill:rgb(235,235,235);stroke:black;stroke-width:2.26px;"/>
</g>
</g>
<g transform="matrix(0.909091,0,0,1,-350,-299.5)">
<g transform="matrix(0.825,0,0,0.875,69.3,39.5)">
<path d="M390.667,298.286L396,304L384,304L389.333,298.286L390.667,298.286Z" style="fill:rgb(235,235,235);"/>
</g>
<g transform="matrix(0.825,0,0,1,69.3,0.5)">
<rect x="384" y="305" width="12" height="3" style="fill:rgb(235,235,235);"/>
</g>
</g>
</svg>
Side by side

After

Width:  |  Height:  |  Size: 1.3 KiB

4
toonz/sources/toonzqt/Resources/h_chandle_top.svg Normal file
View file

@ -0,0 +1,4 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
<svg width="11px" height="1px" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xml:space="preserve" xmlns:serif="http://www.serif.com/" style="fill-rule:evenodd;clip-rule:evenodd;stroke-linejoin:round;stroke-miterlimit:2;">
</svg>
Side by side

After

Width:  |  Height:  |  Size: 429 B

20
toonz/sources/toonzqt/Resources/v_chandle_down.svg Normal file
View file

@ -0,0 +1,20 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
<svg width="10px" height="11px" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xml:space="preserve" xmlns:serif="http://www.serif.com/" style="fill-rule:evenodd;clip-rule:evenodd;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:1.5;">
<g transform="matrix(5.56658e-17,-0.909091,1,6.12323e-17,-299.5,361)">
<g transform="matrix(0.825,0,0,0.875,69.3,39.5)">
<path d="M390.667,298.286L396,304L384,304L389.333,298.286L390.667,298.286Z" style="fill:rgb(235,235,235);stroke:black;stroke-width:2.45px;"/>
</g>
<g transform="matrix(0.825,0,0,1,69.3,0.5)">
<rect x="384" y="305" width="12" height="3" style="fill:rgb(235,235,235);stroke:black;stroke-width:2.26px;"/>
</g>
</g>
<g transform="matrix(5.56658e-17,-0.909091,1,6.12323e-17,-299.5,361)">
<g transform="matrix(0.825,0,0,0.875,69.3,39.5)">
<path d="M390.667,298.286L396,304L384,304L389.333,298.286L390.667,298.286Z" style="fill:rgb(235,235,235);"/>
</g>
<g transform="matrix(0.825,0,0,1,69.3,0.5)">
<rect x="384" y="305" width="12" height="3" style="fill:rgb(235,235,235);"/>
</g>
</g>
</svg>
Side by side

After

Width:  |  Height:  |  Size: 1.3 KiB

50
toonz/sources/toonzqt/styleeditor.cpp
View file

@ -984,10 +984,11 @@ void ColorSlider::setColor(const ColorModel &color) { m_color = color; }
void ColorSlider::paintEvent(QPaintEvent *event) { void ColorSlider::paintEvent(QPaintEvent *event) {
QPainter p(this); QPainter p(this);
int x = rect().x(); int x = rect().x();
int y = rect().y(); int y = rect().y();
int w = width(); int w = width();
int h = height(); int h = height();
int handleSize = svgToPixmap(":Resources/h_chandle_center.svg").width();
bool isVertical = orientation() == Qt::Vertical; bool isVertical = orientation() == Qt::Vertical;
@ -998,13 +999,14 @@ void ColorSlider::paintEvent(QPaintEvent *event) {
if (m_channel == eAlpha) { if (m_channel == eAlpha) {
static QPixmap checkboard(":Resources/backg.png"); static QPixmap checkboard(":Resources/backg.png");
p.drawTiledPixmap(x, y, w, h, checkboard); p.drawTiledPixmap(x + (handleSize / 2), y + 1, w - handleSize, h,
checkboard);
} }
if (!bgPixmap.isNull()) { if (!bgPixmap.isNull()) {
p.drawTiledPixmap(x, y, w, h, bgPixmap); p.drawTiledPixmap(x + (handleSize / 2), y + 1, w - handleSize, h, bgPixmap);
p.setPen(Qt::white); p.setPen(Qt::black);
p.drawLine(x, y + h, x + w, y + h); p.drawRect(x + (handleSize / 2), y + 1, x + w - handleSize, y + h);
} }
/*! /*!
@ -1017,9 +1019,9 @@ void ColorSlider::paintEvent(QPaintEvent *event) {
static QPixmap vHandlePixmap(":Resources/v_chandle.png"); static QPixmap vHandlePixmap(":Resources/v_chandle.png");
p.drawPixmap(0, pos, vHandlePixmap); p.drawPixmap(0, pos, vHandlePixmap);
} else { } else {
static QPixmap hHandleUpPm(":Resources/h_chandleUp.png"); static QPixmap hHandleUpPm(":Resources/h_chandle_up.svg");
static QPixmap hHandleDownPm(":Resources/h_chandleDown.png"); static QPixmap hHandleDownPm(":Resources/h_chandle_down.svg");
static QPixmap hHandleCenterPm(":Resources/h_chandleCenter.png"); static QPixmap hHandleCenterPm(":Resources/h_chandle_center.svg");
int pos = QStyle::sliderPositionFromValue( int pos = QStyle::sliderPositionFromValue(
0, maximum(), value(), width() - hHandleCenterPm.width(), false); 0, maximum(), value(), width() - hHandleCenterPm.width(), false);
p.drawPixmap(pos, 0, hHandleUpPm); p.drawPixmap(pos, 0, hHandleUpPm);
@ -1053,12 +1055,12 @@ void ColorSlider::mousePressEvent(QMouseEvent *event) {
if (opt.orientation == Qt::Vertical) { if (opt.orientation == Qt::Vertical) {
upsideDown = true; upsideDown = true;
int handleSize = handleRect.height(); int handleSize = handleRect.height();
pos = event->pos().y() - handleSize / 2; pos = event->pos().y();
span = grooveRect.height() - handleSize; span = grooveRect.height();
} else { } else {
int handleSize = QPixmap(":Resources/h_chandleCenter.png").width(); int handleSize = QPixmap(":Resources/h_chandle_center.svg").width();
pos = event->pos().x() - handleSize / 2; pos = event->pos().x();
span = grooveRect.width() - handleSize; span = grooveRect.width();
} }
int value = QStyle::sliderValueFromPosition(minimum(), maximum(), pos, span, int value = QStyle::sliderValueFromPosition(minimum(), maximum(), pos, span,
upsideDown); upsideDown);
@ -1222,12 +1224,14 @@ void ChannelLineEdit::focusOutEvent(QFocusEvent *e) {
void ChannelLineEdit::paintEvent(QPaintEvent *e) { void ChannelLineEdit::paintEvent(QPaintEvent *e) {
IntLineEdit::paintEvent(e); IntLineEdit::paintEvent(e);
/* commenting out instead of deleting in-case this was for a specific reason
but since we now have QLineEdit focus it is perhaps redundant
if (m_isEditing) { if (m_isEditing) {
QPainter p(this); QPainter p(this);
p.setPen(Qt::yellow); p.setPen(Qt::yellow);
p.drawRect(rect().adjusted(0, 0, -1, -1)); p.drawRect(rect().adjusted(0, 0, -1, -1));
} }
*/
} }
//***************************************************************************** //*****************************************************************************
@ -1276,7 +1280,7 @@ ColorChannelControl::ColorChannelControl(ColorChannel channel, QWidget *parent)
m_label->setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Preferred); m_label->setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Preferred);
m_field->setObjectName("colorSliderField"); m_field->setObjectName("colorSliderField");
m_field->setFixedWidth(fontMetrics().width('0') * 6 + 5); m_field->setFixedWidth(fontMetrics().width('0') * 4);
m_field->setMinimumHeight(7); m_field->setMinimumHeight(7);
addButton->setObjectName("colorSliderAddButton"); addButton->setObjectName("colorSliderAddButton");
@ -1301,12 +1305,12 @@ ColorChannelControl::ColorChannelControl(ColorChannel channel, QWidget *parent)
mainLayout->setSpacing(1); mainLayout->setSpacing(1);
{ {
mainLayout->addWidget(m_label, 0); mainLayout->addWidget(m_label, 0);
mainLayout->addSpacing(2);
mainLayout->addWidget(m_field, 0);
mainLayout->addSpacing(2);
mainLayout->addWidget(subButton, 0); mainLayout->addWidget(subButton, 0);
mainLayout->addWidget(m_slider, 1); mainLayout->addSpacing(1);
mainLayout->addWidget(m_field, 0);
mainLayout->addSpacing(1);
mainLayout->addWidget(addButton, 0); mainLayout->addWidget(addButton, 0);
mainLayout->addWidget(m_slider, 1);
} }
setLayout(mainLayout); setLayout(mainLayout);
@ -3017,7 +3021,7 @@ StyleEditor::StyleEditor(PaletteController *paletteController, QWidget *parent)
QHBoxLayout *hLayout = new QHBoxLayout; QHBoxLayout *hLayout = new QHBoxLayout;
hLayout->setMargin(0); hLayout->setMargin(0);
{ {
hLayout->addSpacing(4); hLayout->addSpacing(0);
hLayout->addWidget(m_styleBar); hLayout->addWidget(m_styleBar);
hLayout->addStretch(); hLayout->addStretch();
} }

7
toonz/sources/toonzqt/toonzqt.qrc
View file

@ -166,9 +166,10 @@
<file>Resources/grad_g.png</file> <file>Resources/grad_g.png</file>
<file>Resources/grad_b.png</file> <file>Resources/grad_b.png</file>
<file>Resources/grad_m.png</file> <file>Resources/grad_m.png</file>
<file>Resources/h_chandleUp.png</file> <file>Resources/h_chandle_down.svg</file>
<file>Resources/h_chandleDown.png</file> <file>Resources/h_chandle_center.svg</file>
<file>Resources/h_chandleCenter.png</file> <file>Resources/h_chandle_top.svg</file>
<file>Resources/v_chandle_down.svg</file>
<file>Resources/schematic_palette.png</file> <file>Resources/schematic_palette.png</file>
<file>Resources/schematic_tablenode.png</file> <file>Resources/schematic_tablenode.png</file>
<file>Resources/port_red.svg</file> <file>Resources/port_red.svg</file>