diff --git a/appveyor.yml b/appveyor.yml
index c966f168..e34581bc 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -1,4 +1,4 @@
-version: 1.2.0{build}
+version: 1.3.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 e6814e9d..e28a044f 100644
--- a/toonz/cmake/BundleInfo.plist.in
+++ b/toonz/cmake/BundleInfo.plist.in
@@ -23,11 +23,11 @@
CFBundlePackageType
APPL
CFBundleShortVersionString
- 1.2.0
+ 1.3.0
CFBundleSignature
????
CFBundleVersion
- 1.2
+ 1.3
CSResourcesFileMapped
LSRequiresCarbon
diff --git a/toonz/sources/include/toonzqt/dvdialog.h b/toonz/sources/include/toonzqt/dvdialog.h
index f745ca6b..30bc9063 100644
--- a/toonz/sources/include/toonzqt/dvdialog.h
+++ b/toonz/sources/include/toonzqt/dvdialog.h
@@ -51,10 +51,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 70b5261d..6a9582b0 100644
--- a/toonz/sources/include/tversion.h
+++ b/toonz/sources/include/tversion.h
@@ -18,9 +18,9 @@ public:
private:
const char *applicationName = "Tahoma2D";
- const float applicationVersion = 1.2;
+ const float applicationVersion = 1.3;
const float applicationRevision = 0;
- const char *applicationNote = "";
+ const char *applicationNote = "(beta)";
};
std::string ToonzVersion::getAppName(void) {
diff --git a/toonz/sources/toonz/CMakeLists.txt b/toonz/sources/toonz/CMakeLists.txt
index 6f6b6a6d..6e2e9fd5 100644
--- a/toonz/sources/toonz/CMakeLists.txt
+++ b/toonz/sources/toonz/CMakeLists.txt
@@ -1,4 +1,4 @@
-set(VERSION 1.2)
+set(VERSION 1.3)
set(MOC_HEADERS
aboutpopup.h
diff --git a/toonz/sources/toonzqt/dvdialog.cpp b/toonz/sources/toonzqt/dvdialog.cpp
index 9676114c..bbe74b6d 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 = "Tahoma2D 1.2";
-
//=============================================================================
namespace {
QPixmap getMsgBoxPixmap(MsgType type) {
@@ -69,7 +70,10 @@ QPixmap getMsgBoxPixmap(MsgType type) {
//-----------------------------------------------------------------------------
QString getMsgBoxTitle(MsgType type) {
- QString title = DialogTitle + " - ";
+ TVER::ToonzVersion tver;
+ QString title = QString::fromStdString(
+ tver.getAppName() + " " + tver.getAppVersionString() +
+ (tver.hasAppNote() ? " " + tver.getAppNote() : "") + " - ");
switch (type) {
case DVGui::INFORMATION:
@@ -380,9 +384,9 @@ void Dialog::hideEvent(QHideEvent *event) {
QRect r = geometry();
QSettings settings(settingsPath, QSettings::IniFormat);
settings.setValue(m_name, QString::number(r.left()) + " " +
- QString::number(r.top()) + " " +
- QString::number(r.width()) + " " +
- QString::number(r.height()));
+ QString::number(r.top()) + " " +
+ QString::number(r.width()) + " " +
+ QString::number(r.height()));
}
emit dialogClosed();
}
@@ -1454,9 +1458,3 @@ int DVGui::eraseStylesInDemand(TPalette *palette, std::vector styleIds,
}
//-----------------------------------------------------------------------------
-
-void DVGui::setDialogTitle(const QString &dialogTitle) {
- DialogTitle = dialogTitle;
-}
-
-//-----------------------------------------------------------------------------
diff --git a/toonz/sources/xdg-data/org.tahoma2d.Tahoma2D.metainfo.xml b/toonz/sources/xdg-data/org.tahoma2d.Tahoma2D.metainfo.xml
index 60d36ef6..c211a60e 100644
--- a/toonz/sources/xdg-data/org.tahoma2d.Tahoma2D.metainfo.xml
+++ b/toonz/sources/xdg-data/org.tahoma2d.Tahoma2D.metainfo.xml
@@ -26,6 +26,7 @@
+