diff --git a/MtApi/MtApi.csproj b/MtApi/MtApi.csproj index d3ef620f..0b3993a9 100755 --- a/MtApi/MtApi.csproj +++ b/MtApi/MtApi.csproj @@ -58,6 +58,7 @@ + diff --git a/MtApi/MtApiClient.cs b/MtApi/MtApiClient.cs index f87fcaab..f31c57eb 100755 --- a/MtApi/MtApiClient.cs +++ b/MtApi/MtApiClient.cs @@ -1208,6 +1208,20 @@ namespace MtApi #endregion + #region Checkup + public string TerminalInfoString(ENUM_TERMINAL_INFO_STRING property_id) + { + var commandParameters = new ArrayList { (int)property_id }; + return sendCommand(MtCommandType.TerminalInfoString, commandParameters); + } + + public string SymbolInfoString(string name, ENUM_SYMBOL_INFO_STRING prop_id) + { + var commandParameters = new ArrayList { name, (int)prop_id }; + return sendCommand(MtCommandType.SymbolInfoString, commandParameters); ; + } + #endregion + #region Private Methods private void Connect(string host, int port) { diff --git a/MtApi/MtTypes.cs b/MtApi/MtTypes.cs index 0b015dc6..3e12f783 100755 --- a/MtApi/MtTypes.cs +++ b/MtApi/MtTypes.cs @@ -11,6 +11,20 @@ namespace MtApi public enum ENUM_TERMINAL_INFO_STRING { + TERMINAL_LANGUAGE = 13, + TERMINAL_COMPANY = 0, + TERMINAL_NAME = 1, + TERMINAL_PATH = 2, + TERMINAL_DATA_PATH = 3, + TERMINAL_COMMONDATA_PATH = 4 + } + public enum ENUM_SYMBOL_INFO_STRING + { + SYMBOL_CURRENCY_BASE = 22, + SYMBOL_CURRENCY_PROFIT = 23, + SYMBOL_CURRENCY_MARGIN = 24, + SYMBOL_DESCRIPTION = 20, + SYMBOL_PATH = 21 } } diff --git a/MtApi/Properties/AssemblyInfo.cs b/MtApi/Properties/AssemblyInfo.cs index 47ddfe8b..67888fbc 100755 --- a/MtApi/Properties/AssemblyInfo.cs +++ b/MtApi/Properties/AssemblyInfo.cs @@ -32,5 +32,5 @@ using System.Runtime.InteropServices; // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.0.23.0")] -[assembly: AssemblyFileVersion("1.0.23.0")] +[assembly: AssemblyVersion("1.0.24.0")] +[assembly: AssemblyFileVersion("1.0.24.0")] diff --git a/MtApiInstaller/Product.wxs b/MtApiInstaller/Product.wxs index 3cc4732e..eae44785 100755 --- a/MtApiInstaller/Product.wxs +++ b/MtApiInstaller/Product.wxs @@ -1,7 +1,7 @@ - + diff --git a/mq4/MtApi.ex4 b/mq4/MtApi.ex4 index 14186771..88e06867 100755 Binary files a/mq4/MtApi.ex4 and b/mq4/MtApi.ex4 differ diff --git a/mq4/MtApi.mq4 b/mq4/MtApi.mq4 index 4e430e20..ed19954d 100755 --- a/mq4/MtApi.mq4 +++ b/mq4/MtApi.mq4 @@ -3469,6 +3469,35 @@ int executeCommand() } break; + case 153: //TerminalInfoString + if (getIntValue(ExpertHandle, 0, typeValue)) + { + PrintParamError("property_id"); + } + + if (!sendStringResponse(ExpertHandle, TerminalInfoString(typeValue))) + { + PrintResponseError("TerminalInfoString"); + } + break; + + case 154: //SymbolInfoString + if (!getStringValue(ExpertHandle, 0, symbolValue)) + { + PrintParamError("symbol"); + } + + if (getIntValue(ExpertHandle, 1, typeValue)) + { + PrintParamError("prop_id"); + } + + if (!sendStringResponse(ExpertHandle, SymbolInfoString(symbolValue, typeValue))) + { + PrintResponseError("SymbolInfoString"); + } + break; + default: Print("Unknown command type = ", commandType); sendVoidResponse(ExpertHandle);