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

Fix missing icons by Konero (#153)

Browse source 
* Add missing icons for vectorize popup

Signed-off-by: Jeremy Bullock <jcbullock@gmail.com>

* Fix plus icon for style name editor button

Signed-off-by: Jeremy Bullock <jcbullock@gmail.com>

* Fix rename

Co-authored-by: Kite <konero@users.noreply.github.com>
This commit is contained in:
Jeremy Bullock 2020-09-11 09:57:51 -06:00 committed by GitHub
parent dc7abf6de4
commit c88e4b8163
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
7 changed files with 43 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
toonz/sources/toonz/cleanupsettingspopup.cpp
View file

@ -639,7 +639,7 @@ CleanupSettings::CleanupSettings(QWidget *parent)
rightToolBar->addAction(loadAct);
rightToolBar->addSeparator();
QAction *resetAct =
new QAction(createQIcon("resetsize"), tr("Reset Settings"), this);
new QAction(createQIcon("settings_reset"), tr("Reset Settings"), this);
rightToolBar->addAction(resetAct);
// Model-related stuff

9
toonz/sources/toonz/icons/dark/actions/16/centerline.svg Normal file
View file

@ -0,0 +1,9 @@
<?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="16px" height="16px" 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(0.8,0,0,0.8,-2.66454e-15,6.66134e-16)">
<rect x="0" y="0" width="20" height="20" style="fill-opacity:0;"/>
</g>
<path d="M4.98,13.813C4.98,13.813 5.969,5.956 13.809,4.981C15.178,4.81 16.151,3.56 15.981,2.191C15.81,0.822 14.56,-0.151 13.191,0.019C1.499,1.474 0.02,13.187 0.02,13.187C0.02,13.187 0.02,13.187 0.02,13.187C-0.153,14.556 0.818,15.808 2.187,15.98C3.556,16.153 4.808,15.182 4.98,13.813L4.98,13.813ZM1.012,13.312L1.012,13.312L1.012,13.312Z" style="fill-opacity:0.4;"/>
<path d="M2.996,13.563C2.996,13.563 4.181,4.164 13.562,2.996C13.836,2.962 14.03,2.712 13.996,2.438C13.962,2.164 13.712,1.97 13.438,2.004C3.287,3.267 2.004,13.437 2.004,13.437C1.969,13.711 2.164,13.962 2.437,13.996C2.711,14.031 2.962,13.836 2.996,13.563Z"/>
</svg>
Side by side

After

Width:  |  Height:  |  Size: 1.2 KiB

10
toonz/sources/toonz/icons/dark/actions/16/preview.svg Normal file
View file

@ -0,0 +1,10 @@
<?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="16px" height="16px" 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(0.8,0,0,0.8,-2.66454e-15,6.66134e-16)">
<rect x="0" y="0" width="20" height="20" style="fill-opacity:0;"/>
</g>
<g transform="matrix(1,0,0,1,-3,-1)">
<path d="M3.5,8.989C3.5,8.989 6.31,4 11,4C15.69,4 18.5,8.989 18.5,8.989C18.5,8.989 15.701,14 11,14C6.299,14 3.5,8.989 3.5,8.989ZM11,5C13.208,5 15,6.792 15,9C15,11.208 13.208,13 11,13C8.792,13 7,11.208 7,9C7,6.792 8.792,5 11,5ZM11,7C12.104,7 13,7.896 13,9C13,10.104 12.104,11 11,11C9.896,11 9,10.104 9,9C9,7.896 9.896,7 11,7Z"/>
</g>
</svg>
Side by side

After

Width:  |  Height:  |  Size: 966 B

15
toonz/sources/toonz/icons/dark/actions/16/settings_reset.svg Normal file
View file

@ -0,0 +1,15 @@
<?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="16px" height="16px" 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,-2,-2)">
<rect x="0" y="0" width="20" height="20" style="fill-opacity:0;"/>
</g>
<g transform="matrix(1,0,0,1,-5,-5)">
<g transform="matrix(1,0,0,1,5,5)">
<path d="M7.028,11C7.276,8.751 9.185,7 11.5,7C13.984,7 16,9.016 16,11.5C16,13.984 13.984,16 11.5,16C10.724,16 9.994,15.803 9.357,15.457L10.18,14.634C10.586,14.805 11.032,14.9 11.5,14.9C13.377,14.9 14.9,13.377 14.9,11.5C14.9,9.623 13.377,8.1 11.5,8.1C9.793,8.1 8.379,9.36 8.137,11L10,11L7.5,14L5,11L7.028,11ZM11,12L11,9L12,9L12,11L14,11L14,12L11,12Z"/>
</g>
<g transform="matrix(1,0,0,1,5,5)">
<path d="M5.196,12.797C4.798,13.141 4.361,13.429 3.886,13.663C3.291,13.231 2.769,12.709 2.337,12.114C2.618,11.542 2.979,11.026 3.419,10.565C3.218,10.205 3.059,9.822 2.947,9.425C2.31,9.411 1.689,9.301 1.086,9.095C0.971,8.37 0.971,7.63 1.086,6.905C1.689,6.699 2.31,6.589 2.947,6.575C3.059,6.178 3.218,5.795 3.419,5.435C2.979,4.974 2.618,4.458 2.337,3.886C2.769,3.291 3.291,2.769 3.886,2.337C4.458,2.618 4.974,2.979 5.435,3.419C5.795,3.218 6.178,3.059 6.575,2.947C6.589,2.31 6.699,1.689 6.905,1.086C7.63,0.971 8.37,0.971 9.095,1.086C9.301,1.689 9.411,2.31 9.425,2.947C9.822,3.059 10.205,3.218 10.565,3.419C11.026,2.979 11.542,2.618 12.114,2.337C12.709,2.769 13.231,3.291 13.663,3.886C13.382,4.458 13.021,4.974 12.581,5.435C12.716,5.676 12.832,5.928 12.927,6.187C12.472,6.065 11.994,6 11.5,6C11.284,6 11.071,6.012 10.861,6.037C10.235,5.127 9.187,4.53 8,4.53C6.085,4.53 4.53,6.085 4.53,8C4.53,8.744 4.765,9.434 5.165,10L5,10C4.612,10 4.259,10.224 4.094,10.576C3.93,10.927 3.983,11.342 4.232,11.64L5.196,12.797Z"/>
</g>
</g>
</svg>
Side by side

After

Width:  |  Height:  |  Size: 2.1 KiB

4
toonz/sources/toonz/toonz.qrc
View file

@ -72,6 +72,7 @@
<file>icons/dark/actions/16/saveas.svg</file>
<file>icons/dark/actions/16/saveall.svg</file>
<file>icons/dark/actions/16/gear.svg</file>
<file>icons/dark/actions/16/settings_reset.svg</file>
<file>icons/dark/actions/20/clear.svg</file>
<file>icons/dark/actions/16/undo.svg</file>
<file>icons/dark/actions/16/redo.svg</file>
@ -99,7 +100,7 @@
<!-- Scan and Cleanup -->
<file>icons/dark/actions/20/preview_settings.svg</file>
<file>icons/dark/actions/18/preview.svg</file>
<file>icons/dark/actions/16/preview.svg</file>
<file>icons/dark/actions/20/save_previewed_frames.svg</file>
<file>icons/dark/actions/20/cleanup_settings.svg</file>
<file>icons/dark/actions/20/cleanup_preview.svg</file>
@ -108,6 +109,7 @@
<file>icons/dark/actions/20/autocenter.svg</file>
<file>icons/dark/actions/20/camera_capture.svg</file>
<file>icons/dark/actions/16/subcamera.svg</file>
<file>icons/dark/actions/16/centerline.svg</file>
<!-- File Browser -->
<file>icons/dark/actions/16/my_computer.svg</file>

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

@ -760,13 +760,14 @@ paramsLayout->addWidget(m_cThicknessRatio, row++, 1);*/
swatchAct->setCheckable(true);
leftToolBar->addAction(swatchAct);
QAction *centerlineAct = new QAction(createQIcon("opacitycheck"),
QAction *centerlineAct = new QAction(createQIcon("centerline"),
tr("Toggle Centerlines Check"), this);
centerlineAct->setCheckable(true);
leftToolBar->addAction(centerlineAct);
QToolButton *visibilityButton = new QToolButton(this);
visibilityButton->setIcon(createQIcon("options"));
visibilityButton->setIcon(createQIcon("menu"));
visibilityButton->setText(tr("Options"));
visibilityButton->setPopupMode(QToolButton::InstantPopup);
QMenu *visibilityMenu = new QMenu(visibilityButton);
@ -784,7 +785,7 @@ paramsLayout->addWidget(m_cThicknessRatio, row++, 1);*/
rightToolBar->addSeparator();
QAction *resetAct =
new QAction(createQIcon("resetsize"), tr("Reset Settings"), this);
new QAction(createQIcon("settings_reset"), tr("Reset Settings"), this);
rightToolBar->addAction(resetAct);
connect(swatchAct, SIGNAL(triggered(bool)), m_swatchArea,

2
toonz/sources/toonzqt/stylenameeditor.cpp
View file

@ -115,7 +115,7 @@ AddWordButton::AddWordButton(const int col, QWidget* parent)
static QString columnLabel[WORD_COLUMN_AMOUNT] = {tr("Character"), tr("Part"),
tr("Suffix")};
// setFixedSize(23, 23);
setIcon(QIcon(":Resources/plus.svg"));
setIcon(createQIcon("plus"));
setIconSize(QSize(16, 16));
setToolTip(tr("Add New Word for %1").arg(columnLabel[col]));
}