diff --git a/toonz/sources/toonz/cleanupsettingspopup.cpp b/toonz/sources/toonz/cleanupsettingspopup.cpp index 484dc53e..8927ef61 100644 --- a/toonz/sources/toonz/cleanupsettingspopup.cpp +++ b/toonz/sources/toonz/cleanupsettingspopup.cpp @@ -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 diff --git a/toonz/sources/toonz/icons/dark/actions/16/centerline.svg b/toonz/sources/toonz/icons/dark/actions/16/centerline.svg new file mode 100644 index 00000000..f5c41f27 --- /dev/null +++ b/toonz/sources/toonz/icons/dark/actions/16/centerline.svg @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/toonz/sources/toonz/icons/dark/actions/16/preview.svg b/toonz/sources/toonz/icons/dark/actions/16/preview.svg new file mode 100644 index 00000000..7680eb74 --- /dev/null +++ b/toonz/sources/toonz/icons/dark/actions/16/preview.svg @@ -0,0 +1,10 @@ + + + + + + + + + + diff --git a/toonz/sources/toonz/icons/dark/actions/16/settings_reset.svg b/toonz/sources/toonz/icons/dark/actions/16/settings_reset.svg new file mode 100644 index 00000000..f44b2cab --- /dev/null +++ b/toonz/sources/toonz/icons/dark/actions/16/settings_reset.svg @@ -0,0 +1,15 @@ + + + + + + + + + + + + + + + diff --git a/toonz/sources/toonz/toonz.qrc b/toonz/sources/toonz/toonz.qrc index c56856a3..5f80ff36 100644 --- a/toonz/sources/toonz/toonz.qrc +++ b/toonz/sources/toonz/toonz.qrc @@ -72,6 +72,7 @@ icons/dark/actions/16/saveas.svg icons/dark/actions/16/saveall.svg icons/dark/actions/16/gear.svg + icons/dark/actions/16/settings_reset.svg icons/dark/actions/20/clear.svg icons/dark/actions/16/undo.svg icons/dark/actions/16/redo.svg @@ -99,7 +100,7 @@ icons/dark/actions/20/preview_settings.svg - icons/dark/actions/18/preview.svg + icons/dark/actions/16/preview.svg icons/dark/actions/20/save_previewed_frames.svg icons/dark/actions/20/cleanup_settings.svg icons/dark/actions/20/cleanup_preview.svg @@ -108,6 +109,7 @@ icons/dark/actions/20/autocenter.svg icons/dark/actions/20/camera_capture.svg icons/dark/actions/16/subcamera.svg + icons/dark/actions/16/centerline.svg icons/dark/actions/16/my_computer.svg diff --git a/toonz/sources/toonz/vectorizerpopup.cpp b/toonz/sources/toonz/vectorizerpopup.cpp index e13830a0..edc0f8e3 100644 --- a/toonz/sources/toonz/vectorizerpopup.cpp +++ b/toonz/sources/toonz/vectorizerpopup.cpp @@ -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, diff --git a/toonz/sources/toonzqt/stylenameeditor.cpp b/toonz/sources/toonzqt/stylenameeditor.cpp index 2aa06c80..630a4a97 100644 --- a/toonz/sources/toonzqt/stylenameeditor.cpp +++ b/toonz/sources/toonzqt/stylenameeditor.cpp @@ -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])); }