Merge pull request #28 from DynamicTranslator/dev

master to dev
DynamicTranslator · Jun 26, 2017 · cda2f66 · cda2f66
2 parents f473e01 + b890ce6
commit cda2f66
Show file tree

Hide file tree

Showing 18 changed files with 6 additions and 105 deletions.
diff --git a/README.md b/README.md
@@ -13,7 +13,7 @@ Dynamically catches selected texts where any window you on(pdf/browser/word etc.
 |<a href="#" > <img src="http://icons.iconarchive.com/icons/custom-icon-design/flag-2/256/Italy-Flag-icon.png" height="50" width="50"> <img src="https://lh3.googleusercontent.com/onVq9d6BGegHAQWjx7FJdKLfB_HjaaYHsVv_wCP_XJeLpx3ucoZxZz-eje5Y9YN2rg=w170" height="50" width="50"> </a>| [Italian post about DynamicTranslator](http://www.softandapps.info/2016/08/12/dynamictranslator-software-traduce-textos-windows/)
 | <a href="#" > <img src="https://cdn3.iconfinder.com/data/icons/finalflags/256/France-Flag.png" height="50" width="50"> <img src="http://static.ccm2.net/www.commentcamarche.net/sites/images/jetelecharge.com-4a1e99c1.jpg" height="50" width="50"> </a> | [French post about DynamicTranslator](http://www.jetelecharge.com/Bureautique/8757.php) |
 <a href="#" > <img src="http://img.freeflagicons.com/thumb/square_icon/bulgaria/bulgaria_640.png" height="50" width="50"> <img src="http://www.download.bg/img/logos/dbg.gif" height="50" width="50"> </a> |  [Bulgarian post about DynamicTranslator](http://www.download.bg/index.php?cls=program&mtd=default&id=696239)
-|<a href="#" ><img src="http://icons.iconarchive.com/icons/custom-icon-design/flat-europe-flag/512/Turkey-icon.png" height="50" width="50"> <img src="https://image.winudf.com/1227/01908acbdfd0b241/screen-0.jpg" height="50" width="50">    </a>| [Ekşi Sözlük - DynamicTranslator](https://eksisozluk.com/dynamictranslator--5230125) |
+|<a href="#" ><img src="http://icons.iconarchive.com/icons/custom-icon-design/flat-europe-flag/512/Turkey-icon.png" height="50" width="50"> <img src="https://avatars3.githubusercontent.com/u/23709737?v=3&s=280" height="50" width="50">    </a>| [Ekşi Sözlük - DynamicTranslator](https://eksisozluk.com/dynamictranslator--5230125) |
 
 ## Country Based Usage
 ![usings](https://raw.githubusercontent.com/osoykan/DynamicTranslator/master/usings.PNG)

diff --git a/src/DynamicTranslator.Application.Bing/DynamicTranslatorBingModule.cs b/src/DynamicTranslator.Application.Bing/DynamicTranslatorBingModule.cs
@@ -1,6 +1,5 @@
 using System.Reflection;
 
-using Abp.Dependency;
 using Abp.Modules;
 
 using DynamicTranslator.Application.Bing.Configuration;

diff --git a/src/DynamicTranslator.Application.Prompt/Properties/AssemblyInfo.cs b/src/DynamicTranslator.Application.Prompt/Properties/AssemblyInfo.cs
@@ -1,5 +1,4 @@
 using System.Reflection;
-using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 
 // General Information about an assembly is controlled through the following 

diff --git a/src/DynamicTranslator.Application.SesliSozluk/DynamicTranslatorSesliSozlukModule.cs b/src/DynamicTranslator.Application.SesliSozluk/DynamicTranslatorSesliSozlukModule.cs
@@ -1,6 +1,5 @@
 using System.Reflection;
 
-using Abp.Dependency;
 using Abp.Modules;
 
 using DynamicTranslator.Application.SesliSozluk.Configuration;

diff --git a/src/DynamicTranslator.Application.Tests/Properties/AssemblyInfo.cs b/src/DynamicTranslator.Application.Tests/Properties/AssemblyInfo.cs
@@ -1,5 +1,4 @@
 using System.Reflection;
-using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 
 // General Information about an assembly is controlled through the following 

diff --git a/src/DynamicTranslator.Application.WordReference/Properties/AssemblyInfo.cs b/src/DynamicTranslator.Application.WordReference/Properties/AssemblyInfo.cs
@@ -1,5 +1,4 @@
 using System.Reflection;
-using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 
 // General Information about an assembly is controlled through the following

diff --git a/src/DynamicTranslator.Application/DynamicTranslator.Application.csproj b/src/DynamicTranslator.Application/DynamicTranslator.Application.csproj
@@ -116,8 +116,6 @@
     <Compile Include="Orchestrators\Organizers\IResultOrganizer.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="Orchestrators\Organizers\ResultOrganizer.cs" />
-    <Compile Include="Result\IResultService.cs" />
-    <Compile Include="Result\ResultService.cs" />
     <Compile Include="Requests\TranslateRequest.cs" />
     <Compile Include="Interceptors\TextGuardInterceptor.cs" />
   </ItemGroup>

diff --git a/src/DynamicTranslator.Application/Result/IResultService.cs b/src/DynamicTranslator.Application/Result/IResultService.cs
diff --git a/src/DynamicTranslator.Application/Result/ResultService.cs b/src/DynamicTranslator.Application/Result/ResultService.cs
diff --git a/src/DynamicTranslator.Domain/DynamicTranslator.Domain.csproj b/src/DynamicTranslator.Domain/DynamicTranslator.Domain.csproj
@@ -108,7 +108,6 @@
     <Compile Include="Events\WhenClipboardContainsTextEventArgs.cs" />
     <Compile Include="Events\WhenNotificationAddEventArgs.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="Repository\ITranslateResultRepository.cs" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\DynamicTranslator\DynamicTranslator.csproj">

diff --git a/src/DynamicTranslator.Domain/Repository/ITranslateResultRepository.cs b/src/DynamicTranslator.Domain/Repository/ITranslateResultRepository.cs
diff --git a/src/DynamicTranslator.TestBase/Properties/AssemblyInfo.cs b/src/DynamicTranslator.TestBase/Properties/AssemblyInfo.cs
@@ -1,5 +1,4 @@
 using System.Reflection;
-using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 
 // General Information about an assembly is controlled through the following 

diff --git a/src/DynamicTranslator.Tests/Properties/AssemblyInfo.cs b/src/DynamicTranslator.Tests/Properties/AssemblyInfo.cs
@@ -1,5 +1,4 @@
 using System.Reflection;
-using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 
 // General Information about an assembly is controlled through the following 

diff --git a/src/DynamicTranslator.Wpf/DynamicTranslatorWpfModule.cs b/src/DynamicTranslator.Wpf/DynamicTranslatorWpfModule.cs
@@ -3,12 +3,10 @@
 using Abp.Dependency;
 using Abp.Modules;
 
-using DynamicTranslator.Application.Bing;
 using DynamicTranslator.Application.Google;
 using DynamicTranslator.Application.Prompt;
 using DynamicTranslator.Application.SesliSozluk;
 using DynamicTranslator.Application.Tureng;
-using DynamicTranslator.Application.WordReference;
 using DynamicTranslator.Application.Yandex;
 using DynamicTranslator.Extensions;
 
@@ -19,11 +17,9 @@ namespace DynamicTranslator.Wpf
     [DependsOn(
         typeof(DynamicTranslatorGoogleModule),
         typeof(DynamicTranslatorYandexModule),
-        typeof(DynamicTranslatorBingModule),
         typeof(DynamicTranslatorTurengModule),
         typeof(DynamicTranslatorSesliSozlukModule),
-        typeof(DynamicTranslatorPromptModule),
-        typeof(DynamicTranslatorWordReferenceModule)
+        typeof(DynamicTranslatorPromptModule)
     )]
     public class DynamicTranslatorWpfModule : DynamicTranslatorModule
     {

diff --git a/src/DynamicTranslator.Wpf/ViewModel/MainWindow.xaml b/src/DynamicTranslator.Wpf/ViewModel/MainWindow.xaml
@@ -54,12 +54,8 @@
                           Margin="205,33,0,0" VerticalAlignment="Top" IsChecked="True" />
                 <CheckBox x:Name="_checkBoxTureng" Content="Tureng Translate" HorizontalAlignment="Left"
                           Margin="23,33,0,0" VerticalAlignment="Top" IsChecked="True" />
-                <CheckBox x:Name="_checkBoxBing" Content="Microsft Bing Translate" HorizontalAlignment="Left"
-                          Margin="23,58,0,0" VerticalAlignment="Top" IsChecked="True" />
                 <CheckBox x:Name="_checkBoxPrompt" Content="Prompt Translate" HorizontalAlignment="Left"
                     Margin="205,56,0,0" VerticalAlignment="Top" IsChecked="True" />
-                <CheckBox x:Name="_checkBoxWordReference" Visibility="Hidden" Content="WordReference Translate" HorizontalAlignment="Left"
-                    Margin="23,81,0,-13" IsChecked="True" />
             </Grid>
             <Button x:Name="_newVersionButton" Content="Button" HorizontalAlignment="Left" Margin="10,237,0,0"
                     VerticalAlignment="Top" Width="363" Height="27" Click="NewVersionButtonClick" />

diff --git a/src/DynamicTranslator.Wpf/ViewModel/MainWindow.xaml.cs b/src/DynamicTranslator.Wpf/ViewModel/MainWindow.xaml.cs
@@ -147,9 +147,7 @@ private void LockUiElements()
             _checkBoxTureng.IsHitTestVisible = false;
             _checkBoxYandexTranslate.IsHitTestVisible = false;
             _checkBoxSesliSozluk.IsHitTestVisible = false;
-            _checkBoxBing.IsHitTestVisible = false;
             _checkBoxPrompt.IsHitTestVisible = false;
-            _checkBoxWordReference.IsHitTestVisible = false;
         }
 
         private void NewVersionButtonClick(object sender, RoutedEventArgs e)
@@ -185,21 +183,11 @@ private void PrepareTranslators()
                 _configurations.ActiveTranslatorConfiguration.Activate(TranslatorType.SesliSozluk);
             }
 
-            if (_checkBoxBing.IsChecked != null && _checkBoxBing.IsChecked.Value)
-            {
-                _configurations.ActiveTranslatorConfiguration.Activate(TranslatorType.Bing);
-            }
-
             if (_checkBoxPrompt.IsChecked != null && _checkBoxPrompt.IsChecked.Value)
             {
                 _configurations.ActiveTranslatorConfiguration.Activate(TranslatorType.Prompt);
             }
 
-            //if (_checkBoxWordReference.IsChecked != null && _checkBoxWordReference.IsChecked.Value)
-            //{
-            //    _configurations.ActiveTranslatorConfiguration.Activate(TranslatorType.WordReference);
-            //}
-
             if (!_configurations.ActiveTranslatorConfiguration.ActiveTranslators.Any())
             {
                 foreach (object value in Enum.GetValues(typeof(TranslatorType)))
@@ -217,9 +205,7 @@ private void UnlockUiElements()
             _checkBoxTureng.IsHitTestVisible = true;
             _checkBoxYandexTranslate.IsHitTestVisible = true;
             _checkBoxSesliSozluk.IsHitTestVisible = true;
-            _checkBoxBing.IsHitTestVisible = true;
             _checkBoxPrompt.IsHitTestVisible = true;
-            _checkBoxWordReference.IsHitTestVisible = true;
         }
     }
 }
diff --git a/src/DynamicTranslator/ApplicationVersion.cs b/src/DynamicTranslator/ApplicationVersion.cs
@@ -2,7 +2,7 @@
 {
     public static class ApplicationVersion
     {
-        public const string CurrentVersion = "3.4.2";
+        public const string CurrentVersion = "3.5.0";
 
         public static string GetCurrentVersion()
         {

diff --git a/src/DynamicTranslator/Configuration/UniqueIdentifier/HddBasedIdentifierProvider.cs b/src/DynamicTranslator/Configuration/UniqueIdentifier/HddBasedIdentifierProvider.cs
@@ -1,7 +1,9 @@
-using System.Management;
+using System.Diagnostics.CodeAnalysis;
+using System.Management;
 
 namespace DynamicTranslator.Configuration.UniqueIdentifier
 {
+    [SuppressMessage("ReSharper", "ComplexConditionExpression")]
     public class HddBasedIdentifierProvider : IUniqueIdentifierProvider
     {
         public string Get()