From 96a86d9e5d1c2a595c31af274cbd7bec810a5810 Mon Sep 17 00:00:00 2001 From: shun-iwasawa Date: Mar 21 2021 00:14:08 +0000 Subject: v1.5.0 (#3754) --- diff --git a/appveyor.yml b/appveyor.yml index 73b2829..a65df59 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -1,4 +1,4 @@ -version: 1.4.0.{build} +version: 1.5.0.{build} pull_requests: do_not_increment_build_number: true skip_tags: true diff --git a/toonz/cmake/BundleInfo.plist.in b/toonz/cmake/BundleInfo.plist.in index 0f50b98..c3bdadd 100644 --- a/toonz/cmake/BundleInfo.plist.in +++ b/toonz/cmake/BundleInfo.plist.in @@ -19,11 +19,11 @@ CFBundlePackageType APPL CFBundleShortVersionString - 1.4.0 + 1.5.0 CFBundleSignature ???? CFBundleVersion - 1.4 + 1.5 CSResourcesFileMapped LSRequiresCarbon diff --git a/toonz/sources/include/toonzqt/dvdialog.h b/toonz/sources/include/toonzqt/dvdialog.h index f745ca6..fbd0f2e 100644 --- a/toonz/sources/include/toonzqt/dvdialog.h +++ b/toonz/sources/include/toonzqt/dvdialog.h @@ -49,12 +49,6 @@ class MessageAndCheckboxDialog; //============================================================================= -//----------------------------------------------------------------------------- - -void DVAPI setDialogTitle(const QString &dialogTitle); - -//----------------------------------------------------------------------------- - void DVAPI MsgBoxInPopup(MsgType type, const QString &text); // ATTENZIONE: Valore di ritorno diff --git a/toonz/sources/include/tversion.h b/toonz/sources/include/tversion.h index d22470b..cdbaad0 100644 --- a/toonz/sources/include/tversion.h +++ b/toonz/sources/include/tversion.h @@ -18,7 +18,7 @@ public: private: const char *applicationName = "OpenToonz"; - const float applicationVersion = 1.4; + const float applicationVersion = 1.5; const float applicationRevision = 0; const char *applicationNote = ""; }; @@ -39,9 +39,7 @@ std::string ToonzVersion::getAppNote(void) { std::string appnote = applicationNote; return appnote; } -bool ToonzVersion::hasAppNote(void) { - return *applicationNote != 0; -} +bool ToonzVersion::hasAppNote(void) { return *applicationNote != 0; } std::string ToonzVersion::getAppVersionString(void) { char buffer[50]; snprintf(buffer, sizeof(buffer), "%.1f", applicationVersion); @@ -59,8 +57,7 @@ std::string ToonzVersion::getAppVersionInfo(std::string msg) { appinfo += " " + msg + " v"; appinfo += getAppVersionString(); appinfo += "." + getAppRevisionString(); - if (hasAppNote()) - appinfo += " " + std::string(applicationNote); + if (hasAppNote()) appinfo += " " + std::string(applicationNote); return appinfo; } diff --git a/toonz/sources/toonz/CMakeLists.txt b/toonz/sources/toonz/CMakeLists.txt index a338383..5d9ebac 100644 --- a/toonz/sources/toonz/CMakeLists.txt +++ b/toonz/sources/toonz/CMakeLists.txt @@ -1,4 +1,4 @@ -set(VERSION 1.4) +set(VERSION 1.5) set(MOC_HEADERS addfilmstripframespopup.h diff --git a/toonz/sources/toonzqt/dvdialog.cpp b/toonz/sources/toonzqt/dvdialog.cpp index 03a7b07..d65d6ff 100644 --- a/toonz/sources/toonzqt/dvdialog.cpp +++ b/toonz/sources/toonzqt/dvdialog.cpp @@ -14,6 +14,9 @@ #include "toonz/preferences.h" #include "toonz/toonzfolders.h" +// TnzCore includes +#include "tversion.h" + // Qt includes #include #include @@ -32,8 +35,6 @@ using namespace DVGui; -QString DialogTitle = "OpenToonz 1.4"; - //============================================================================= namespace { QPixmap getMsgBoxPixmap(MsgType type) { @@ -69,7 +70,9 @@ QPixmap getMsgBoxPixmap(MsgType type) { //----------------------------------------------------------------------------- QString getMsgBoxTitle(MsgType type) { - QString title = DialogTitle + " - "; + TVER::ToonzVersion tver; + QString title = QString::fromStdString(tver.getAppName() + " " + + tver.getAppVersionString() + " - "); switch (type) { case DVGui::INFORMATION: @@ -314,10 +317,10 @@ Dialog::Dialog(QWidget *parent, bool hasButton, bool hasFixedSize, // on another monitor by default, but this is better than // a user thinking the program is broken because they didn't notice // the popup on another monitor - if (x > screen.right() - 50) x = screen.right() - 50; - if (x < screen.left()) x = screen.left(); + if (x > screen.right() - 50) x = screen.right() - 50; + if (x < screen.left()) x = screen.left(); if (y > screen.bottom() - 90) y = screen.bottom() - 90; - if (y < screen.top()) y = screen.top(); + if (y < screen.top()) y = screen.top(); setGeometry(x, y, values.at(2).toInt(), values.at(3).toInt()); settings.setValue(m_name, QString::number(x) + " " + QString::number(y) + " " + QString::number(values.at(2).toInt()) + @@ -370,10 +373,10 @@ void Dialog::hideEvent(QHideEvent *event) { } QRect screen = QApplication::desktop()->availableGeometry(currentScreen); - if (x > screen.right() - 50) x = screen.right() - 50; - if (x < screen.left()) x = screen.left(); + if (x > screen.right() - 50) x = screen.right() - 50; + if (x < screen.left()) x = screen.left(); if (y > screen.bottom() - 90) y = screen.bottom() - 90; - if (y < screen.top()) y = screen.top(); + if (y < screen.top()) y = screen.top(); move(QPoint(x, y)); resize(size()); QRect r = geometry(); @@ -1347,7 +1350,7 @@ QString DVGui::getText(const QString &title, const QString &labelText, dialog.addButtonBarWidget(okBtn, cancelBtn); - int ret = dialog.exec(); + int ret = dialog.exec(); if (ok) *ok = (ret == QDialog::Accepted); return nameFld->text(); @@ -1451,10 +1454,4 @@ int DVGui::eraseStylesInDemand(TPalette *palette, std::vector styleIds, return (assert(ret == 2), ret); // return 2 ? :D } -//----------------------------------------------------------------------------- - -void DVGui::setDialogTitle(const QString &dialogTitle) { - DialogTitle = dialogTitle; -} - -//----------------------------------------------------------------------------- +//----------------------------------------------------------------------------- \ No newline at end of file diff --git a/toonz/sources/xdg-data/io.github.OpenToonz.appdata.xml b/toonz/sources/xdg-data/io.github.OpenToonz.appdata.xml index 7b2cba1..0b7ddda 100644 --- a/toonz/sources/xdg-data/io.github.OpenToonz.appdata.xml +++ b/toonz/sources/xdg-data/io.github.OpenToonz.appdata.xml @@ -28,6 +28,6 @@ - +