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

Make overlow icons for toolbar and command bar easier to see in all themes. (#65)

Browse source
This commit is contained in:
Jeremy Bullock 2020-06-30 23:57:20 -06:00 committed by GitHub
parent 83aa41ce21
commit d95096068c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 25 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
toonz/sources/toonz/Resources/more.svg Normal file
View file

@ -0,0 +1,8 @@
<?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="100%" height="100%" viewBox="0 0 20 32" 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;">
<g transform="matrix(1,0,0,1,3.54139,1.22184)">
<path d="M4.552,0.922L-0.952,0.922L7.368,14.778L-0.822,28.634L4.552,28.634L12.869,14.778L4.552,0.922Z" style="fill:rgb(224,224,224);"/>
<path d="M4.552,30.718L-0.822,30.718C-1.57,30.718 -2.26,30.317 -2.631,29.667C-3.002,29.017 -2.996,28.218 -2.615,27.574L4.943,14.787L-2.738,1.994C-3.493,0.635 -2.64,-1.001 -1.092,-1.157L-0.952,-1.161L4.552,-1.161C5.284,-1.161 5.962,-0.778 6.339,-0.15L14.655,13.706C15.051,14.366 15.051,15.19 14.655,15.85L6.339,29.706C5.962,30.334 5.284,30.718 4.552,30.718ZM4.552,0.922L-0.952,0.922L7.368,14.778L-0.822,28.634L4.552,28.634L12.869,14.778L4.552,0.922Z"/>
</g>
</svg>
Side by side

After

Width:  |  Height:  |  Size: 1.1 KiB

8
toonz/sources/toonz/Resources/moredown.svg Normal file
View file

@ -0,0 +1,8 @@
<?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="100%" height="100%" viewBox="0 0 32 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;">
<g transform="matrix(6.12323e-17,1,-1,6.12323e-17,30.7782,4.04139)">
<path d="M4.552,0.922L-0.952,0.922L7.368,14.778L-0.822,28.634L4.552,28.634L12.869,14.778L4.552,0.922Z" style="fill:rgb(224,224,224);"/>
<path d="M4.943,14.787L-2.738,1.994C-3.124,1.351 -3.135,0.549 -2.765,-0.104C-2.395,-0.758 -1.702,-1.161 -0.952,-1.161L4.552,-1.161C5.284,-1.161 5.962,-0.778 6.339,-0.15L14.655,13.706C15.051,14.366 15.051,15.19 14.655,15.85L6.339,29.706C5.962,30.334 5.284,30.718 4.552,30.718L-0.822,30.718C-1.57,30.718 -2.26,30.317 -2.631,29.667C-3.002,29.017 -2.996,28.218 -2.615,27.574L4.943,14.787ZM4.552,0.922L-0.952,0.922L7.368,14.778L-0.822,28.634L4.552,28.634L12.869,14.778L4.552,0.922Z"/>
</g>
</svg>
Side by side

After

Width:  |  Height:  |  Size: 1.1 KiB

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

@ -23,6 +23,7 @@
#include <QtDebug> #include <QtDebug>
#include <QMenuBar> #include <QMenuBar>
#include <QContextMenuEvent> #include <QContextMenuEvent>
#include <QToolButton>
//============================================================================= //=============================================================================
// Toolbar // Toolbar
@ -38,6 +39,9 @@ CommandBar::CommandBar(QWidget *parent, Qt::WFlags flags)
setObjectName("cornerWidget"); setObjectName("cornerWidget");
setObjectName("CommandBar"); setObjectName("CommandBar");
fillToolbar(this, isXsheetToolbar); fillToolbar(this, isXsheetToolbar);
QIcon moreIcon(":Resources/more.svg");
QToolButton *more = findChild<QToolButton *>("qt_toolbar_ext_button");
more->setIcon(moreIcon);
} }
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------

3
toonz/sources/toonz/toolbar.cpp
View file

@ -84,6 +84,9 @@ Toolbar::Toolbar(QWidget *parent, bool isVertical)
SLOT(setIsExpanded(bool))); SLOT(setIsExpanded(bool)));
updateToolbar(); updateToolbar();
QIcon moreIcon(":Resources/moredown.svg");
QToolButton *more = findChild<QToolButton *>("qt_toolbar_ext_button");
more->setIcon(moreIcon);
} }
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------

2
toonz/sources/toonz/toonz.qrc
View file

@ -140,6 +140,8 @@
<file>Resources/magnet_rollover.svg</file> <file>Resources/magnet_rollover.svg</file>
<file>Resources/menu.svg</file> <file>Resources/menu.svg</file>
<file>Resources/merge.svg</file> <file>Resources/merge.svg</file>
<file>Resources/more.svg</file>
<file>Resources/moredown.svg</file>
<file>Resources/motionpath_fileicon.svg</file> <file>Resources/motionpath_fileicon.svg</file>
<file>Resources/motionpath.svg</file> <file>Resources/motionpath.svg</file>
<file>Resources/motionpath_delete.svg</file> <file>Resources/motionpath_delete.svg</file>