Commit 77f7030e authored by Peter Zhigalov's avatar Peter Zhigalov

Сменил версию на 1.8

parent 0b3d7d46
...@@ -19,9 +19,9 @@ ...@@ -19,9 +19,9 @@
<key>CFBundlePackageType</key> <key>CFBundlePackageType</key>
<string>APPL</string> <string>APPL</string>
<key>CFBundleVersion</key> <key>CFBundleVersion</key>
<string>1.7</string> <string>1.8</string>
<key>CFBundleShortVersionString</key> <key>CFBundleShortVersionString</key>
<string>1.7</string> <string>1.8</string>
<key>CFBundleSignature</key> <key>CFBundleSignature</key>
<string>????</string> <string>????</string>
<key>NSPrincipalClass</key> <key>NSPrincipalClass</key>
......
...@@ -17,7 +17,7 @@ int main(int argc, char *argv[]) ...@@ -17,7 +17,7 @@ int main(int argc, char *argv[])
a.setOrganizationDomain("fami.codefreak.ru"); a.setOrganizationDomain("fami.codefreak.ru");
a.setOrganizationName("fami_net_team"); a.setOrganizationName("fami_net_team");
a.setApplicationName("fem_draw"); a.setApplicationName("fem_draw");
a.setApplicationVersion("1.7"); a.setApplicationVersion("1.8");
MainWindow w; MainWindow w;
w.update_translations(); w.update_translations();
if(argc > 1) if(argc > 1)
......
...@@ -751,7 +751,7 @@ void MainWindow::on_actionAbout_FEM_Draw_triggered() ...@@ -751,7 +751,7 @@ void MainWindow::on_actionAbout_FEM_Draw_triggered()
msgBox.setStandardButtons(QMessageBox::Ok); msgBox.setStandardButtons(QMessageBox::Ok);
msgBox.setDefaultButton(QMessageBox::Ok); msgBox.setDefaultButton(QMessageBox::Ok);
msgBox.setWindowTitle(trUtf8("About")); msgBox.setWindowTitle(trUtf8("About"));
msgBox.setText(QString("<b>%1 v1.7 (Qt)</b>").arg(trUtf8("FEM Draw")).replace(" ", "&nbsp;")); msgBox.setText(QString("<b>%1 v1.8 (Qt)</b>").arg(trUtf8("FEM Draw")).replace(" ", "&nbsp;"));
msgBox.setInformativeText(QString( msgBox.setInformativeText(QString(
"<a href=\"https://fami.codefreak.ru/osp/fem_draw/\">https://fami.codefreak.ru/osp/fem_draw/</a><br>" "<a href=\"https://fami.codefreak.ru/osp/fem_draw/\">https://fami.codefreak.ru/osp/fem_draw/</a><br>"
"%1: <a href=\"http://www.gnu.org/copyleft/gpl.html\">GNU GPL v3</a><br><br>" "%1: <a href=\"http://www.gnu.org/copyleft/gpl.html\">GNU GPL v3</a><br><br>"
......
...@@ -2,10 +2,10 @@ IDI_ICON1 ICON DISCARDABLE "../resources/icon.ico" ...@@ -2,10 +2,10 @@ IDI_ICON1 ICON DISCARDABLE "../resources/icon.ico"
#include <windows.h> #include <windows.h>
#define VER_FILEVERSION 1,7,0,0 #define VER_FILEVERSION 1,8,0,0
#define VER_FILEVERSION_STR "1.7.0.0\0" #define VER_FILEVERSION_STR "1.8.0.0\0"
#define VER_PRODUCTVERSION 1,7,0,0 #define VER_PRODUCTVERSION 1,8,0,0
#define VER_PRODUCTVERSION_STR "1.7\0" #define VER_PRODUCTVERSION_STR "1.8\0"
#define VER_FILEDESCRIPTION_STR "Tool for plot scalar and vector fields" #define VER_FILEDESCRIPTION_STR "Tool for plot scalar and vector fields"
#define VER_INTERNALNAME_STR "fem_draw_qt" #define VER_INTERNALNAME_STR "fem_draw_qt"
#define VER_LEGALCOPYRIGHT_STR "(c) Peter Zhigalov, 2014-2016" #define VER_LEGALCOPYRIGHT_STR "(c) Peter Zhigalov, 2014-2016"
......
...@@ -828,7 +828,7 @@ void on_actionAbout_FEM_Draw_triggered() ...@@ -828,7 +828,7 @@ void on_actionAbout_FEM_Draw_triggered()
// Надпись "FEM Draw <version_name> (WinAPI)" // Надпись "FEM Draw <version_name> (WinAPI)"
CreateWindow( CreateWindow(
WC_STATIC, TEXT("FEM Draw v1.7 (WinAPI)"), WC_STATIC, TEXT("FEM Draw v1.8 (WinAPI)"),
WS_CHILD | WS_VISIBLE | SS_CENTERIMAGE, WS_CHILD | WS_VISIBLE | SS_CENTERIMAGE,
92, 10, 205, 15, 92, 10, 205, 15,
hwnd_about, (HMENU)ABOUT_LABEL_VERSION, hInstance, NULL hwnd_about, (HMENU)ABOUT_LABEL_VERSION, hInstance, NULL
......
...@@ -19,10 +19,10 @@ END ...@@ -19,10 +19,10 @@ END
#define RT_MANIFEST 24 #define RT_MANIFEST 24
1 RT_MANIFEST manifest.manifest 1 RT_MANIFEST manifest.manifest
#define VER_FILEVERSION 1,7,0,0 #define VER_FILEVERSION 1,8,0,0
#define VER_FILEVERSION_STR "1.7.0.0\0" #define VER_FILEVERSION_STR "1.8.0.0\0"
#define VER_PRODUCTVERSION 1,7,0,0 #define VER_PRODUCTVERSION 1,8,0,0
#define VER_PRODUCTVERSION_STR "1.7\0" #define VER_PRODUCTVERSION_STR "1.8\0"
#define VER_FILEDESCRIPTION_STR "Tool for plot scalar and vector fields" #define VER_FILEDESCRIPTION_STR "Tool for plot scalar and vector fields"
#define VER_INTERNALNAME_STR "fem_draw_winapi" #define VER_INTERNALNAME_STR "fem_draw_winapi"
#define VER_LEGALCOPYRIGHT_STR "(c) Peter Zhigalov, 2014-2016" #define VER_LEGALCOPYRIGHT_STR "(c) Peter Zhigalov, 2014-2016"
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment