.

sys27 · Nov 2, 2013 · 1c686e6 · 1c686e6
1 parent b7595ff
commit 1c686e6
Show file tree

Hide file tree

Showing 13 changed files with 27 additions and 10 deletions.
diff --git a/xFunc.Maths/Expressions/MathFunctionCollection.cs b/xFunc.Maths/Expressions/MathFunctionCollection.cs
@@ -19,8 +19,8 @@
 #endif
 #if !PORTABLE
 using System.Runtime.Serialization;
-using xFunc.Maths.Resources;
 #endif
+using xFunc.Maths.Resources;
 
 namespace xFunc.Maths.Expressions
 {

diff --git a/xFunc.Maths/xFunc.Maths (.Net 2.0).csproj b/xFunc.Maths/xFunc.Maths (.Net 2.0).csproj
@@ -126,7 +126,7 @@
     <Compile Include="MathParser.cs" />
     <Compile Include="MathProcessor.cs" />
     <Compile Include="MathSimplifier.cs" />
-    <Compile Include="NumberSystem.cs" />
+    <Compile Include="NumeralSystem.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="Resources\Resource.uk.Designer.cs">
       <DependentUpon>Resource.uk.resx</DependentUpon>

diff --git a/xFunc.Maths/xFunc.Maths (.Net 3.0).csproj b/xFunc.Maths/xFunc.Maths (.Net 3.0).csproj
@@ -126,7 +126,7 @@
     <Compile Include="MathParser.cs" />
     <Compile Include="MathProcessor.cs" />
     <Compile Include="MathSimplifier.cs" />
-    <Compile Include="NumberSystem.cs" />
+    <Compile Include="NumeralSystem.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="Resources\Resource.uk.Designer.cs">
       <DependentUpon>Resource.uk.resx</DependentUpon>

diff --git a/xFunc.Maths/xFunc.Maths (.Net 3.5).csproj b/xFunc.Maths/xFunc.Maths (.Net 3.5).csproj
@@ -127,7 +127,7 @@
     <Compile Include="MathParser.cs" />
     <Compile Include="MathProcessor.cs" />
     <Compile Include="MathSimplifier.cs" />
-    <Compile Include="NumberSystem.cs" />
+    <Compile Include="NumeralSystem.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="Resources\Resource.uk.Designer.cs">
       <DependentUpon>Resource.uk.resx</DependentUpon>

diff --git a/xFunc.Maths/xFunc.Maths (.Net 4.5).csproj b/xFunc.Maths/xFunc.Maths (.Net 4.5).csproj
@@ -130,7 +130,7 @@
     <Compile Include="MathParser.cs" />
     <Compile Include="MathProcessor.cs" />
     <Compile Include="MathSimplifier.cs" />
-    <Compile Include="NumberSystem.cs" />
+    <Compile Include="NumeralSystem.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="Resources\Resource.uk.Designer.cs">
       <DependentUpon>Resource.uk.resx</DependentUpon>

diff --git a/xFunc.Maths/xFunc.Maths (.Net 4.5.1).csproj b/xFunc.Maths/xFunc.Maths (.Net 4.5.1).csproj
@@ -130,7 +130,7 @@
     <Compile Include="MathParser.cs" />
     <Compile Include="MathProcessor.cs" />
     <Compile Include="MathSimplifier.cs" />
-    <Compile Include="NumberSystem.cs" />
+    <Compile Include="NumeralSystem.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="Resources\Resource.uk.Designer.cs">
       <DependentUpon>Resource.uk.resx</DependentUpon>

diff --git a/xFunc.Maths/xFunc.Maths (Portable).csproj b/xFunc.Maths/xFunc.Maths (Portable).csproj
@@ -156,7 +156,7 @@
     <Compile Include="MathParserException.cs" />
     <Compile Include="MathProcessor.cs" />
     <Compile Include="MathSimplifier.cs" />
-    <Compile Include="NumberSystem.cs" />
+    <Compile Include="NumeralSystem.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="Resources\Resource.uk.Designer.cs">
       <DependentUpon>Resource.uk.resx</DependentUpon>

diff --git a/xFunc/Presenters/Updater.cs b/xFunc/Presenters/Updater.cs
@@ -26,7 +26,7 @@ internal class Updater
     {
 
         private const string checkUri = "http://xfunc.codeplex.com/releases/";
-        private const int currentRelease = 114030;
+        private const int currentRelease = 114279;
         private string updateUri;
         private bool hasUpdates;
 

diff --git a/xFunc/Resources/Resource.Designer.cs b/xFunc/Resources/Resource.Designer.cs
diff --git a/xFunc/Resources/Resource.resx b/xFunc/Resources/Resource.resx
@@ -630,4 +630,7 @@
   <data name="ErrorHeader" xml:space="preserve">
     <value>Error</value>
   </data>
+  <data name="AddFuncError" xml:space="preserve">
+    <value>The function name is incorrect.</value>
+  </data>
 </root>
diff --git a/xFunc/Resources/Resource.ru.resx b/xFunc/Resources/Resource.ru.resx
@@ -630,4 +630,7 @@
   <data name="ErrorHeader" xml:space="preserve">
     <value>Ошибка</value>
   </data>
+  <data name="AddFuncError" xml:space="preserve">
+    <value>Имя функции является неправильным.</value>
+  </data>
 </root>
diff --git a/xFunc/Resources/Resource.uk.resx b/xFunc/Resources/Resource.uk.resx
@@ -630,4 +630,7 @@
   <data name="ErrorHeader" xml:space="preserve">
     <value>Помилка</value>
   </data>
+  <data name="AddFuncError" xml:space="preserve">
+    <value>Ім'я функції є неправильним.</value>
+  </data>
 </root>
diff --git a/xFunc/Views/FunctionView.xaml.cs b/xFunc/Views/FunctionView.xaml.cs
@@ -77,8 +77,7 @@ private void AddCommand_Executed(object o, ExecutedRoutedEventArgs args)
                     var userFunc = processor.Parse(view.FunctionName) as UserFunction;
                     if (userFunc == null)
                     {
-                        // todo: !!!
-                        MessageBox.Show(this, "", Resource.ErrorHeader, MessageBoxButton.OK, MessageBoxImage.Warning);
+                        MessageBox.Show(this, Resource.AddFuncError, Resource.ErrorHeader, MessageBoxButton.OK, MessageBoxImage.Warning);
 
                         return;
                     }