From ad1bd10c2ed82da540fd1caa6f17a5e8beec74c8 Mon Sep 17 00:00:00 2001 From: artisteacher Date: Mon, 5 Mar 2018 01:17:35 -0500 Subject: [PATCH] Make command bar icons consistent (#1827) * Add files via upload * Update mainwindow.cpp * Update toonz.qrc --- toonz/sources/toonz/Resources/new_raster_level.svg | 1 + .../toonz/Resources/new_toonz_raster_level.svg | 1 + toonz/sources/toonz/Resources/new_vector_level.svg | 1 + toonz/sources/toonz/Resources/timestretch.svg | 2 +- toonz/sources/toonz/mainwindow.cpp | 6 +++--- toonz/sources/toonz/toonz.qrc | 12 +++--------- 6 files changed, 10 insertions(+), 13 deletions(-) create mode 100644 toonz/sources/toonz/Resources/new_raster_level.svg create mode 100644 toonz/sources/toonz/Resources/new_toonz_raster_level.svg create mode 100644 toonz/sources/toonz/Resources/new_vector_level.svg diff --git a/toonz/sources/toonz/Resources/new_raster_level.svg b/toonz/sources/toonz/Resources/new_raster_level.svg new file mode 100644 index 00000000..f99ca217 --- /dev/null +++ b/toonz/sources/toonz/Resources/new_raster_level.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/toonz/sources/toonz/Resources/new_toonz_raster_level.svg b/toonz/sources/toonz/Resources/new_toonz_raster_level.svg new file mode 100644 index 00000000..e88a83cd --- /dev/null +++ b/toonz/sources/toonz/Resources/new_toonz_raster_level.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/toonz/sources/toonz/Resources/new_vector_level.svg b/toonz/sources/toonz/Resources/new_vector_level.svg new file mode 100644 index 00000000..d509bc33 --- /dev/null +++ b/toonz/sources/toonz/Resources/new_vector_level.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/toonz/sources/toonz/Resources/timestretch.svg b/toonz/sources/toonz/Resources/timestretch.svg index c95babb9..2ca3efd6 100644 --- a/toonz/sources/toonz/Resources/timestretch.svg +++ b/toonz/sources/toonz/Resources/timestretch.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/toonz/sources/toonz/mainwindow.cpp b/toonz/sources/toonz/mainwindow.cpp index 79387e26..4e3cef99 100644 --- a/toonz/sources/toonz/mainwindow.cpp +++ b/toonz/sources/toonz/mainwindow.cpp @@ -1616,15 +1616,15 @@ void MainWindow::defineActions() { QAction *newVectorLevelAction = createMenuFileAction(MI_NewVectorLevel, tr("&New Vector Level"), ""); newVectorLevelAction->setIconText(tr("New Vector Level")); - newVectorLevelAction->setIcon(createQIconPNG("new_vector_level")); + newVectorLevelAction->setIcon(QIcon(":Resources/new_vector_level.svg")); QAction *newToonzRasterLevelAction = createMenuFileAction( MI_NewToonzRasterLevel, tr("&New Toonz Raster Level"), ""); newToonzRasterLevelAction->setIconText(tr("New Toonz Raster Level")); - newToonzRasterLevelAction->setIcon(createQIconPNG("new_toonz_raster_level")); + newToonzRasterLevelAction->setIcon(QIcon(":Resources/new_toonz_raster_level.svg")); QAction *newRasterLevelAction = createMenuFileAction(MI_NewRasterLevel, tr("&New Raster Level"), ""); newRasterLevelAction->setIconText(tr("New Raster Level")); - newRasterLevelAction->setIcon(createQIconPNG("new_raster_level")); + newRasterLevelAction->setIcon(QIcon(":Resources/new_raster_level.svg")); QAction *loadLevelAction = createMenuFileAction(MI_LoadLevel, tr("&Load Level..."), ""); loadLevelAction->setIcon(QIcon(":Resources/load_level.svg")); diff --git a/toonz/sources/toonz/toonz.qrc b/toonz/sources/toonz/toonz.qrc index ac283de8..5dc80ac8 100644 --- a/toonz/sources/toonz/toonz.qrc +++ b/toonz/sources/toonz/toonz.qrc @@ -148,15 +148,9 @@ Resources/my_computer.svg Resources/my_documents.svg Resources/network.svg - Resources/new_raster_level.png - Resources/new_raster_level_over.png - Resources/new_raster_level_click.png - Resources/new_toonz_raster_level.png - Resources/new_toonz_raster_level_click.png - Resources/new_toonz_raster_level_over.png - Resources/new_vector_level.png - Resources/new_vector_level_click.png - Resources/new_vector_level_over.png + Resources/new_raster_level.svg + Resources/new_toonz_raster_level.svg + Resources/new_vector_level.svg Resources/newmemo.svg Resources/newmemo_disabled.svg Resources/newstyle.png