Make v2.6.13 release

evpobr · Jul 27, 2017 · e3aa82d · e3aa82d
1 parent 2d59078
commit e3aa82d
Show file tree

Hide file tree

Showing 8 changed files with 40 additions and 11 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,12 @@
 # FictionBook Editor Changelog
 
+## v.2.6.13
+
+* Fix v2.6.12 bug then document cannot be loaded and new images cannot be 
+  inserted (issue https://github.com/evpobr/fictionbookeditor/issues/212)
+* Source files converted to UTF8 to avoid various problems
+
+
 ## v.2.6.12
 
 * File dialogs now are styled and look native under Windows XP and higher

diff --git a/FBE/FBE.rc b/FBE/FBE.rc
@@ -674,7 +674,7 @@ IDB_TEXT                BITMAP                  "res\\text.bmp"
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 2,6,12,0
+ FILEVERSION 2,6,13,0
  PRODUCTVERSION 2,6,0,0
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
@@ -692,7 +692,7 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "FBE Team"
             VALUE "FileDescription", "FictionBook Editor"
-            VALUE "FileVersion", "2.6.12.0"
+            VALUE "FileVersion", "2.6.13.0"
             VALUE "InternalName", "FBE"
             VALUE "LegalCopyright", "Copyright 2017 � FBE Team, 2008 � LitRes, 2003 � Mike Matsnev"
             VALUE "OriginalFilename", "FBE.exe"

diff --git a/FBE/locales/res_rus/FBE.rc b/FBE/locales/res_rus/FBE.rc
@@ -776,7 +776,7 @@ IDR_MAINFRAME           ICON                    "res\\FBE2.ico"
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 2,6,12,0
+ FILEVERSION 2,6,13,0
  PRODUCTVERSION 2,6,0,0
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
@@ -794,7 +794,7 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "FBE Team"
             VALUE "FileDescription", "FictionBook russian language support"
-            VALUE "FileVersion", "2.6.12.0"
+            VALUE "FileVersion", "2.6.13.0"
             VALUE "InternalName", "res_rus"
             VALUE "LegalCopyright", "Copyright 2017 � FBE Team, 2008 � LitRes, 2003 � Mike Matsnev"
             VALUE "OriginalFilename", "res_rus.dll"

diff --git a/FBE/locales/res_ukr/FBE.rc b/FBE/locales/res_ukr/FBE.rc
@@ -25,7 +25,7 @@ LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 2,6,12,0
+ FILEVERSION 2,6,13,0
  PRODUCTVERSION 2,6,0,0
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
@@ -43,7 +43,7 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "FBE Team"
             VALUE "FileDescription", "FictionBook ukrainian language support"
-            VALUE "FileVersion", "2.6.12.0"
+            VALUE "FileVersion", "2.6.13.0"
             VALUE "InternalName", "res_ukr"
             VALUE "LegalCopyright", "Copyright 2017 � FBE Team, 2008 � LitRes, 2003 � Mike Matsnev"
             VALUE "OriginalFilename", "res_ukr.dll"

diff --git a/FBSHell/resource.h b/FBSHell/resource.h
@@ -0,0 +1,22 @@
+//{{NO_DEPENDENCIES}}
+// Microsoft Visual C++ generated include file.
+// Used by FBSHell.rc
+//
+#define IDR_COLUMNPROVIDER              101
+#define IDR_ICONEXTRACTOR               102
+#define IDI_FB2                         103
+#define IDR_CONTEXTMENU                 104
+#define IDR_NSFOLDER                    105
+#define IDR_FBSHELL                     106
+#define IDR_THUMBNAILHANDLER            107
+
+// Next default values for new objects
+// 
+#ifdef APSTUDIO_INVOKED
+#ifndef APSTUDIO_READONLY_SYMBOLS
+#define _APS_NEXT_RESOURCE_VALUE        107
+#define _APS_NEXT_COMMAND_VALUE         40001
+#define _APS_NEXT_CONTROL_VALUE         1000
+#define _APS_NEXT_SYMED_VALUE           108
+#endif
+#endif
diff --git a/FBShell/FBSHell.rc b/FBShell/FBSHell.rc
@@ -83,7 +83,7 @@ IDR_FBSHELL             REGISTRY                "FBShell.rgs"
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 2,6,12,0
+ FILEVERSION 2,6,13,0
  PRODUCTVERSION 2,6,0,0
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
@@ -101,7 +101,7 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "evpobr"
             VALUE "FileDescription", "FictionBook shell extension"
-            VALUE "FileVersion", "2.6.12.0"
+            VALUE "FileVersion", "2.6.13.0"
             VALUE "InternalName", "FBShell"
             VALUE "LegalCopyright", "Copyright 2017 � FBE Team, 2008 � LitRes, 2003 � Mike Matsnev"
             VALUE "OriginalFilename", "FBShell.dll"

diff --git a/FBV/FBV.rc b/FBV/FBV.rc
@@ -51,7 +51,7 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 2,6,12,0
+ FILEVERSION 2,6,13,0
  PRODUCTVERSION 2,6,0,0
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
@@ -69,7 +69,7 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "FBE Team"
             VALUE "FileDescription", "FictionBook Validator"
-            VALUE "FileVersion", "2.6.12.0"
+            VALUE "FileVersion", "2.6.13.0"
             VALUE "InternalName", "FBV"
             VALUE "LegalCopyright", "Copyright 2017 � FBE Team, 2008 � LitRes, 2003 � Mike Matsnev"
             VALUE "OriginalFilename", "FBV.exe"

diff --git a/Installer/MakeInstaller.nsi b/Installer/MakeInstaller.nsi
@@ -5,7 +5,7 @@ Unicode true
 !define PRODUCT_NAME "FictionBook Editor"
 !define PRODUCT_STAGE "Release"
 !define PRODUCT_BUILD "build ${BUILDNUM}"
-!define PRODUCT_VERSION "${PRODUCT_STAGE} v2.6.12 (${PRODUCT_BUILD})"
+!define PRODUCT_VERSION "${PRODUCT_STAGE} v2.6.13 (${PRODUCT_BUILD})"
 !define PRODUCT_VENDOR "FBE Team"
 !define PRODUCT_NAME_VERSION "${PRODUCT_NAME} ${PRODUCT_VERSION}"
 !define PRODUCT_URL "http://code.google.com/p/fictionbookeditor/"