Merge pull request #945 from manongjohn/v1.3
Version update: 1.3 (beta)
This commit is contained in:
commit
dce821346f
7 changed files with 17 additions and 22 deletions
|
@ -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
|
||||
|
|
|
@ -23,11 +23,11 @@
|
|||
<key>CFBundlePackageType</key>
|
||||
<string>APPL</string>
|
||||
<key>CFBundleShortVersionString</key>
|
||||
<string>1.2.0</string>
|
||||
<string>1.3.0</string>
|
||||
<key>CFBundleSignature</key>
|
||||
<string>????</string>
|
||||
<key>CFBundleVersion</key>
|
||||
<string>1.2</string>
|
||||
<string>1.3</string>
|
||||
<key>CSResourcesFileMapped</key>
|
||||
<true/>
|
||||
<key>LSRequiresCarbon</key>
|
||||
|
|
|
@ -51,10 +51,6 @@ class MessageAndCheckboxDialog;
|
|||
|
||||
//-----------------------------------------------------------------------------
|
||||
|
||||
void DVAPI setDialogTitle(const QString &dialogTitle);
|
||||
|
||||
//-----------------------------------------------------------------------------
|
||||
|
||||
void DVAPI MsgBoxInPopup(MsgType type, const QString &text);
|
||||
|
||||
// ATTENZIONE: Valore di ritorno
|
||||
|
|
|
@ -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) {
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
set(VERSION 1.2)
|
||||
set(VERSION 1.3)
|
||||
|
||||
set(MOC_HEADERS
|
||||
aboutpopup.h
|
||||
|
|
|
@ -14,6 +14,9 @@
|
|||
#include "toonz/preferences.h"
|
||||
#include "toonz/toonzfolders.h"
|
||||
|
||||
// TnzCore includes
|
||||
#include "tversion.h"
|
||||
|
||||
// Qt includes
|
||||
#include <QFrame>
|
||||
#include <QLayout>
|
||||
|
@ -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<int> styleIds,
|
|||
}
|
||||
|
||||
//-----------------------------------------------------------------------------
|
||||
|
||||
void DVGui::setDialogTitle(const QString &dialogTitle) {
|
||||
DialogTitle = dialogTitle;
|
||||
}
|
||||
|
||||
//-----------------------------------------------------------------------------
|
||||
|
|
|
@ -26,6 +26,7 @@
|
|||
</screenshots>
|
||||
<content_rating type="oars-1.1"/>
|
||||
<releases>
|
||||
<release version="1.3.0" type="development" date="2022-04-01"/>
|
||||
<release version="1.2.0" date="2021-05-03"/>
|
||||
<release version="1.1.0" date="2020-10-30"/>
|
||||
<release version="1.0.1" date="2020-09-04"/>
|
||||
|
|
Loading…
Reference in a new issue