Setting application info.

--HG--
branch : develop
This commit is contained in:
dismine 2014-04-16 18:32:41 +03:00
parent 4a404a4ab8
commit ba1c9dd4a7
6 changed files with 98 additions and 11 deletions

View File

@ -86,6 +86,7 @@ CONFIG(debug, debug|release){
-Wswitch-default -Wswitch-enum -Wuninitialized -Wvariadic-macros \ -Wswitch-default -Wswitch-enum -Wuninitialized -Wvariadic-macros \
-Wlogical-op -Wnoexcept -Wmissing-noreturn -Wpointer-arith\ -Wlogical-op -Wnoexcept -Wmissing-noreturn -Wpointer-arith\
-Wstrict-null-sentinel -Wstrict-overflow=5 -Wundef -Wno-unused -gdwarf-3 -Wstrict-null-sentinel -Wstrict-overflow=5 -Wundef -Wno-unused -gdwarf-3
-ftrapv
} }
} else { } else {
*-g++{#Don't use additional GCC keys on Windows system. *-g++{#Don't use additional GCC keys on Windows system.

View File

@ -1 +1,31 @@
IDI_ICON1 ICON DISCARDABLE "icon/64x64/icon64x64.ico" IDI_ICON1 ICON DISCARDABLE "icon/64x64/icon64x64.ico"
#include <windows.h>
#include "version.h"
VS_VERSION_INFO VERSIONINFO
FILEVERSION VER_FILEVERSION
PRODUCTVERSION VER_PRODUCTVERSION
BEGIN
BLOCK "StringFileInfo"
BEGIN
BLOCK "040904E4"
BEGIN
VALUE "CompanyName", VER_COMPANYNAME_STR
VALUE "FileDescription", VER_FILEDESCRIPTION_STR
VALUE "FileVersion", VER_FILEVERSION_STR
VALUE "InternalName", VER_INTERNALNAME_STR
VALUE "LegalCopyright", VER_LEGALCOPYRIGHT_STR
VALUE "LegalTrademarks1", VER_LEGALTRADEMARKS1_STR
VALUE "LegalTrademarks2", VER_LEGALTRADEMARKS2_STR
VALUE "OriginalFilename", VER_ORIGINALFILENAME_STR
VALUE "ProductName", VER_PRODUCTNAME_STR
VALUE "ProductVersion", VER_PRODUCTVERSION_STR
END
END
BLOCK "VarFileInfo"
BEGIN
VALUE "Translation", 0x409, 1252
END
END

View File

@ -33,6 +33,7 @@
#include <QMessageBox> #include <QMessageBox>
#include <QThread> #include <QThread>
#include "tablewindow.h" #include "tablewindow.h"
#include "version.h"
void noisyFailureMsgHandler(QtMsgType type, const QMessageLogContext &context, const QString &msg) void noisyFailureMsgHandler(QtMsgType type, const QMessageLogContext &context, const QString &msg)
{ {
@ -130,10 +131,12 @@ int main(int argc, char *argv[])
qInstallMessageHandler(noisyFailureMsgHandler); qInstallMessageHandler(noisyFailureMsgHandler);
} }
#endif #endif
app.setApplicationDisplayName("Valentina"); app.setApplicationDisplayName(VER_PRODUCTNAME_STR);
app.setApplicationName("Valentina"); app.setApplicationName(VER_INTERNALNAME_STR);
app.setOrganizationName("ValentinaTeam"); app.setOrganizationName(VER_COMPANYNAME_STR);
app.setOrganizationDomain("valentinaproject.bitbucket.org"); app.setOrganizationDomain(VER_COMPANYDOMAIN_STR);
// Setting the Application version
app.setApplicationVersion(APP_VERSION);
QSettings settings(QSettings::IniFormat, QSettings::UserScope, QApplication::organizationName(), QSettings settings(QSettings::IniFormat, QSettings::UserScope, QApplication::organizationName(),
QApplication::applicationName()); QApplication::applicationName());

View File

@ -1,7 +1,8 @@
SOURCES += src/main.cpp \ SOURCES += src/main.cpp \
src/mainwindow.cpp \ src/mainwindow.cpp \
src/tablewindow.cpp \ src/tablewindow.cpp \
src/stable.cpp src/stable.cpp \
src/version.cpp
HEADERS += src/mainwindow.h \ HEADERS += src/mainwindow.h \
src/options.h \ src/options.h \

35
src/version.cpp Normal file
View File

@ -0,0 +1,35 @@
/************************************************************************
**
** @file version.cpp
** @author Roman Telezhinsky <dismine@gmail.com>
** @date 16 4, 2014
**
** @brief
** @copyright
** This source code is part of the Valentine project, a pattern making
** program, whose allow create and modeling patterns of clothing.
** Copyright (C) 2013 Valentina project
** <https://bitbucket.org/dismine/valentina> All Rights Reserved.
**
** Valentina is free software: you can redistribute it and/or modify
** it under the terms of the GNU General Public License as published by
** the Free Software Foundation, either version 3 of the License, or
** (at your option) any later version.
**
** Valentina is distributed in the hope that it will be useful,
** but WITHOUT ANY WARRANTY; without even the implied warranty of
** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
** GNU General Public License for more details.
**
** You should have received a copy of the GNU General Public License
** along with Valentina. If not, see <http://www.gnu.org/licenses/>.
**
*************************************************************************/
extern const int MAJOR_VERSION = 0;
extern const int MINOR_VERSION = 2;
extern const int DEBUG_VERSION = 2;
extern const QString APP_VERSION(QStringLiteral("%1.%2.%3").arg(MAJOR_VERSION).arg(MINOR_VERSION).arg(DEBUG_VERSION));
extern const QString WARRANTY("The program is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE "
"WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.");

View File

@ -31,11 +31,28 @@
#include <QtCore/QString> #include <QtCore/QString>
extern const int MAJOR_VERSION = 0; extern const int MAJOR_VERSION;
extern const int MINOR_VERSION = 2; extern const int MINOR_VERSION;
extern const int DEBUG_VERSION = 2; extern const int DEBUG_VERSION;
extern const QString APP_VERSION;
extern const QString WARRANTY;
#define VER_FILEVERSION 0,2,2,0
#define VER_FILEVERSION_STR "0.2.2.0\0"
#define VER_PRODUCTVERSION 0,2,2,0
#define VER_PRODUCTVERSION_STR "0.2\0"
#define VER_COMPANYNAME_STR "ValentinaTeam"
#define VER_FILEDESCRIPTION_STR "Valentina"
#define VER_INTERNALNAME_STR "Valentina"
#define VER_LEGALCOPYRIGHT_STR "Copyright © 2014 Valentina Team"
#define VER_LEGALTRADEMARKS1_STR "All Rights Reserved"
#define VER_LEGALTRADEMARKS2_STR VER_LEGALTRADEMARKS1_STR
#define VER_ORIGINALFILENAME_STR "valentina.exe"
#define VER_PRODUCTNAME_STR "Valentina"
#define VER_COMPANYDOMAIN_STR "www.valentina-project.org"
extern const QString APP_VERSION(QStringLiteral("%1.%2.%3").arg(MAJOR_VERSION).arg(MINOR_VERSION).arg(DEBUG_VERSION));
extern const QString WARRANTY("The program is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE "
"WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.");
#endif // VERSION_H #endif // VERSION_H