diff --git a/PortableApps/App/AppInfo/appinfo.ini b/PortableApps/App/AppInfo/appinfo.ini index 8bbcf9659b..77324e3a64 100644 --- a/PortableApps/App/AppInfo/appinfo.ini +++ b/PortableApps/App/AppInfo/appinfo.ini @@ -1,6 +1,6 @@ [Version] -PackageVersion=14.9.23.0 -DisplayVersion=140923 +PackageVersion=14.10.1.0 +DisplayVersion=141001 [Format] Type=PortableApps.comFormat diff --git a/Release/ConEmu/WhatsNew-ConEmu.txt b/Release/ConEmu/WhatsNew-ConEmu.txt index 55cc886df3..7946a968d7 100644 --- a/Release/ConEmu/WhatsNew-ConEmu.txt +++ b/Release/ConEmu/WhatsNew-ConEmu.txt @@ -12,6 +12,21 @@ Votes and awards (vote for ConEmu, if you please) http://code.google.com/p/conemu-maximus5/wiki/Awards +2014.10.01 +[*] ConEmuPlugin was rewritten using classes (Far versioning). +[*] Don't activate Far Panels while Ctrl+LClick in Far Editor window. +[*] Issue 1717: Auto save/restore opened tabs renamed labels. +[*] AnsiEscapeCodes: 'ESC [ 90..97 m' high intensity foreground color, 'ESC [ 100..107' high intensity background color. +[*] Issue 1715: 'New window'+'Run as administrator' was created non-elevated window. +[*] Don't autoshow scrollbar on mouse hover while ConEmu is not in foreground. +[*] Far plugin. F11 -> 'ConEmu' -> 'Show all panels list'. Press enter to 'print' selected path into current Far window. + Use macro (ConEmu.PanelsList.lua) to simplify menu call. + Plugin.Call("4b675d80-1d4a-4ea9-8436-fdc23f2fc14b",11) +[*] Issue 1590: (workaround) Parameter 'StartCreateDelay' may be changed via settings (xml/reg). DWORD 10..10000, default 100. +[*] Debug. Some improvement in showing CP and console modes. +[*] Debug. Verbose WM_DEADCHAR warning. + + 2014.09.23 [*] Debug purpose switch: ConEmu.exe -LoadRegistry. [*] Support automatic find/loading of ".ConEmu.xml" (dot prefixed) config file. diff --git a/src/ConEmu/version.h b/src/ConEmu/version.h index 1bad93fdc0..8ce393ae56 100644 --- a/src/ConEmu/version.h +++ b/src/ConEmu/version.h @@ -1,7 +1,7 @@ -// 140923 +// 141001 #define MVV_1 14 -#define MVV_2 9 -#define MVV_3 23 +#define MVV_2 10 +#define MVV_3 1 #define MVV_4 0 #define MVV_4a "" #undef MVV_git diff --git a/src/ConEmuPlugin/ConEmuPluginBase.h b/src/ConEmuPlugin/ConEmuPluginBase.h index 210b4e6730..a80ab2c9be 100644 --- a/src/ConEmuPlugin/ConEmuPluginBase.h +++ b/src/ConEmuPlugin/ConEmuPluginBase.h @@ -213,7 +213,7 @@ class CPluginBase virtual bool GetFarRect(SMALL_RECT& rcFar) = 0; virtual int GetMacroArea() = 0; virtual LPCWSTR GetMsg(int aiMsg, wchar_t* psMsg = NULL, size_t cchMsgMax = 0) = 0; - virtual LPWSTR GetPanelDir(GetPanelDirFlags Flags, wchar_t* pszBuffer = NULL, INT_PTR cchBufferMax = 0) = 0; + virtual LPWSTR GetPanelDir(GetPanelDirFlags Flags, wchar_t* pszBuffer = NULL, int cchBufferMax = 0) = 0; virtual bool GetPanelInfo(GetPanelDirFlags Flags, CEPanelInfo* pInfo) = 0; virtual bool GetPanelItemInfo(const CEPanelInfo& PnlInfo, bool bSelected, INT_PTR iIndex, WIN32_FIND_DATAW& Info, wchar_t** ppszFullPathName) = 0; virtual void GetPluginInfoPtr(void* piv) = 0; // PluginInfo* versioned diff --git a/src/Setup/Setupper/VersionI.h b/src/Setup/Setupper/VersionI.h index acc350c3fc..effef699dd 100644 --- a/src/Setup/Setupper/VersionI.h +++ b/src/Setup/Setupper/VersionI.h @@ -1,5 +1,5 @@ -#define CONEMUVERN 14,9,23,0 -#define CONEMUVERS "140923" -#define CONEMUVERL L"140923" -#define MSI86 "../ConEmu.140923.x86.msi" -#define MSI64 "../ConEmu.140923.x64.msi" +#define CONEMUVERN 14,10,1,0 +#define CONEMUVERS "141001" +#define CONEMUVERL L"141001" +#define MSI86 "../ConEmu.141001.x86.msi" +#define MSI64 "../ConEmu.141001.x64.msi" diff --git a/src/Setup/Version.wxi b/src/Setup/Version.wxi index 2737a56a7c..f78bcac85f 100644 --- a/src/Setup/Version.wxi +++ b/src/Setup/Version.wxi @@ -1,7 +1,7 @@ - - + + \ No newline at end of file