diff --git a/toonz/sources/toonz/Resources/splash.svg b/toonz/sources/toonz/Resources/splash.svg deleted file mode 100644 index 3fbded50..00000000 --- a/toonz/sources/toonz/Resources/splash.svg +++ /dev/null @@ -1,113 +0,0 @@ - - - - - - - Tahoma - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/toonz/sources/toonz/Resources/startup.png b/toonz/sources/toonz/Resources/tahoma2d_about.png similarity index 100% rename from toonz/sources/toonz/Resources/startup.png rename to toonz/sources/toonz/Resources/tahoma2d_about.png diff --git a/toonz/sources/toonz/Resources/splash2.svg b/toonz/sources/toonz/Resources/tahoma2d_splash.svg similarity index 100% rename from toonz/sources/toonz/Resources/splash2.svg rename to toonz/sources/toonz/Resources/tahoma2d_splash.svg diff --git a/toonz/sources/toonz/Resources/startup.svg b/toonz/sources/toonz/Resources/tahoma2d_startup.svg similarity index 100% rename from toonz/sources/toonz/Resources/startup.svg rename to toonz/sources/toonz/Resources/tahoma2d_startup.svg diff --git a/toonz/sources/toonz/Tahoma2D.icns b/toonz/sources/toonz/Tahoma2D.icns index c2a2ca74..40a5b255 100644 Binary files a/toonz/sources/toonz/Tahoma2D.icns and b/toonz/sources/toonz/Tahoma2D.icns differ diff --git a/toonz/sources/toonz/toonz.ico b/toonz/sources/toonz/Tahoma2D.ico similarity index 100% rename from toonz/sources/toonz/toonz.ico rename to toonz/sources/toonz/Tahoma2D.ico diff --git a/toonz/sources/toonz/aboutpopup.cpp b/toonz/sources/toonz/aboutpopup.cpp index d4138546..887f1718 100644 --- a/toonz/sources/toonz/aboutpopup.cpp +++ b/toonz/sources/toonz/aboutpopup.cpp @@ -35,7 +35,7 @@ AboutPopup::AboutPopup(QWidget* parent) QLabel* logo = new QLabel(this); - logo->setPixmap(QPixmap::fromImage(QImage(":Resources/startup.png"))); + logo->setPixmap(QPixmap::fromImage(QImage(":Resources/tahoma2d_about.png"))); mainLayout->addWidget(logo); QString name = QString::fromStdString(TEnv::getApplicationFullName()); diff --git a/toonz/sources/toonz/icons/dark/misc/startup.png b/toonz/sources/toonz/icons/dark/misc/startup.png deleted file mode 100644 index 9a541267..00000000 Binary files a/toonz/sources/toonz/icons/dark/misc/startup.png and /dev/null differ diff --git a/toonz/sources/toonz/icons/light/misc/startup.png b/toonz/sources/toonz/icons/light/misc/startup.png deleted file mode 100644 index 8a5e6022..00000000 Binary files a/toonz/sources/toonz/icons/light/misc/startup.png and /dev/null differ diff --git a/toonz/sources/toonz/main.cpp b/toonz/sources/toonz/main.cpp index 544d1c43..134c37e9 100644 --- a/toonz/sources/toonz/main.cpp +++ b/toonz/sources/toonz/main.cpp @@ -459,7 +459,7 @@ int main(int argc, char *argv[]) { // splash screen QPixmap splashPixmap = - QIcon(":Resources/splash2.svg").pixmap(QSize(344, 344)); + QIcon(":Resources/tahoma2d_splash.svg").pixmap(QSize(344, 344)); #ifdef _WIN32 QFont font("Segoe UI", -1); diff --git a/toonz/sources/toonz/startuppopup.cpp b/toonz/sources/toonz/startuppopup.cpp index 4aee83da..79d9927b 100644 --- a/toonz/sources/toonz/startuppopup.cpp +++ b/toonz/sources/toonz/startuppopup.cpp @@ -169,7 +169,7 @@ StartupPopup::StartupPopup() m_removePresetBtn->setStyleSheet( "QPushButton { padding-left: 4px; padding-right: 4px;}"); QLabel *label = new QLabel(); - QPixmap splashPixmap = QIcon(":Resources/startup.svg").pixmap(QSize(200, 24)); + QPixmap splashPixmap = QIcon(":Resources/tahoma2d_startup.svg").pixmap(QSize(200, 24)); label->setPixmap(splashPixmap); m_projectBox->setObjectName("SolidLineFrame"); diff --git a/toonz/sources/toonz/toonz.icns b/toonz/sources/toonz/toonz.icns deleted file mode 100644 index 67186ba6..00000000 Binary files a/toonz/sources/toonz/toonz.icns and /dev/null differ diff --git a/toonz/sources/toonz/toonz.qrc b/toonz/sources/toonz/toonz.qrc index 64726a0f..38c3e453 100644 --- a/toonz/sources/toonz/toonz.qrc +++ b/toonz/sources/toonz/toonz.qrc @@ -541,7 +541,6 @@ icons/dark/actions/48/colorchiporder_leftup.svg icons/dark/actions/48/colorchiporder_lowleft.svg icons/dark/actions/48/colorchiporder_upleft.svg - icons/dark/misc/startup.png icons/dark/actions/20/touch.svg icons/dark/actions/16/quit.svg icons/dark/actions/16/clear_cache.svg @@ -567,7 +566,6 @@ - icons/light/misc/startup.png icons/light/misc/footermemo.svg @@ -640,10 +638,9 @@ Resources/selection_add.png Resources/selection_convert.png Resources/shear.png - Resources/splash.svg - Resources/splash2.svg - Resources/startup.png - Resources/startup.svg + Resources/tahoma2d_splash.svg + Resources/tahoma2d_about.png + Resources/tahoma2d_startup.svg Resources/stroke_select.png Resources/tape.png Resources/type_in.png diff --git a/toonz/sources/toonz/toonz.rc b/toonz/sources/toonz/toonz.rc index c105c01b..958042c0 100644 --- a/toonz/sources/toonz/toonz.rc +++ b/toonz/sources/toonz/toonz.rc @@ -1,5 +1,5 @@ // Icon #if defined(APSTUDIO_INVOKED) -ICON "toonz.ico" +ICON "Tahoma2D.ico" #endif -IDI_ICON1 ICON "toonz.ico" +IDI_ICON1 ICON "Tahoma2D.ico" diff --git a/toonz/sources/xdg-data/CMakeLists.txt b/toonz/sources/xdg-data/CMakeLists.txt index 6e309deb..076a975f 100644 --- a/toonz/sources/xdg-data/CMakeLists.txt +++ b/toonz/sources/xdg-data/CMakeLists.txt @@ -1,3 +1,3 @@ install(FILES org.tahoma2d.Tahoma2D.metainfo.xml DESTINATION share/metainfo) install(FILES org.tahoma2d.Tahoma2D.desktop DESTINATION share/applications) -install(FILES tahoma2d_128.png DESTINATION share/icons/hicolor/128x128/apps RENAME org.tahoma2d.Tahoma2D.png) +install(FILES tahoma2d_logo_128.png DESTINATION share/icons/hicolor/128x128/apps RENAME org.tahoma2d.Tahoma2D.png) diff --git a/toonz/sources/xdg-data/tahoma2d_128.png b/toonz/sources/xdg-data/tahoma2d_logo_128.png similarity index 100% rename from toonz/sources/xdg-data/tahoma2d_128.png rename to toonz/sources/xdg-data/tahoma2d_logo_128.png