razzaline/tahoma2d
1
0
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity

Merge pull request #945 from manongjohn/v1.3

Browse source 
Version update: 1.3 (beta)
This commit is contained in:
manongjohn 2022-04-05 22:43:29 -04:00 committed by GitHub
commit dce821346f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
7 changed files with 17 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
appveyor.yml
View file

@ -1,4 +1,4 @@
version: 1.2.0{build} version: 1.3.0{build}
pull_requests: pull_requests:
do_not_increment_build_number: true do_not_increment_build_number: true
skip_tags: true skip_tags: true

4
toonz/cmake/BundleInfo.plist.in
View file

@ -23,11 +23,11 @@
<key>CFBundlePackageType</key> <key>CFBundlePackageType</key>
<string>APPL</string> <string>APPL</string>
<key>CFBundleShortVersionString</key> <key>CFBundleShortVersionString</key>
<string>1.2.0</string> <string>1.3.0</string>
<key>CFBundleSignature</key> <key>CFBundleSignature</key>
<string>????</string> <string>????</string>
<key>CFBundleVersion</key> <key>CFBundleVersion</key>
<string>1.2</string> <string>1.3</string>
<key>CSResourcesFileMapped</key> <key>CSResourcesFileMapped</key>
<true/> <true/>
<key>LSRequiresCarbon</key> <key>LSRequiresCarbon</key>

4
toonz/sources/include/toonzqt/dvdialog.h
View file

@ -51,10 +51,6 @@ class MessageAndCheckboxDialog;
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
void DVAPI setDialogTitle(const QString &dialogTitle);
//-----------------------------------------------------------------------------
void DVAPI MsgBoxInPopup(MsgType type, const QString &text); void DVAPI MsgBoxInPopup(MsgType type, const QString &text);
// ATTENZIONE: Valore di ritorno // ATTENZIONE: Valore di ritorno

4
toonz/sources/include/tversion.h
View file

@ -18,9 +18,9 @@ public:
private: private:
const char *applicationName = "Tahoma2D"; const char *applicationName = "Tahoma2D";
const float applicationVersion = 1.2; const float applicationVersion = 1.3;
const float applicationRevision = 0; const float applicationRevision = 0;
const char *applicationNote = ""; const char *applicationNote = "(beta)";
}; };
std::string ToonzVersion::getAppName(void) { std::string ToonzVersion::getAppName(void) {

2
toonz/sources/toonz/CMakeLists.txt
View file

@ -1,4 +1,4 @@
set(VERSION 1.2) set(VERSION 1.3)
set(MOC_HEADERS set(MOC_HEADERS
aboutpopup.h aboutpopup.h

16
toonz/sources/toonzqt/dvdialog.cpp
View file

@ -14,6 +14,9 @@
#include "toonz/preferences.h" #include "toonz/preferences.h"
#include "toonz/toonzfolders.h" #include "toonz/toonzfolders.h"
// TnzCore includes
#include "tversion.h"
// Qt includes // Qt includes
#include <QFrame> #include <QFrame>
#include <QLayout> #include <QLayout>
@ -32,8 +35,6 @@
using namespace DVGui; using namespace DVGui;
QString DialogTitle = "Tahoma2D 1.2";
//============================================================================= //=============================================================================
namespace { namespace {
QPixmap getMsgBoxPixmap(MsgType type) { QPixmap getMsgBoxPixmap(MsgType type) {
@ -69,7 +70,10 @@ QPixmap getMsgBoxPixmap(MsgType type) {
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
QString getMsgBoxTitle(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) { switch (type) {
case DVGui::INFORMATION: case DVGui::INFORMATION:
@ -1454,9 +1458,3 @@ int DVGui::eraseStylesInDemand(TPalette *palette, std::vector<int> styleIds,
} }
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
void DVGui::setDialogTitle(const QString &dialogTitle) {
DialogTitle = dialogTitle;
}
//-----------------------------------------------------------------------------

1
toonz/sources/xdg-data/org.tahoma2d.Tahoma2D.metainfo.xml
View file

@ -26,6 +26,7 @@
</screenshots> </screenshots>
<content_rating type="oars-1.1"/> <content_rating type="oars-1.1"/>
<releases> <releases>
<release version="1.3.0" type="development" date="2022-04-01"/>
<release version="1.2.0" date="2021-05-03"/> <release version="1.2.0" date="2021-05-03"/>
<release version="1.1.0" date="2020-10-30"/> <release version="1.1.0" date="2020-10-30"/>
<release version="1.0.1" date="2020-09-04"/> <release version="1.0.1" date="2020-09-04"/>