diff --git a/README.md b/README.md
index 6be096a5..c0be98f3 100644
--- a/README.md
+++ b/README.md
@@ -13,7 +13,7 @@ Dynamically catches selected texts where any window you on(pdf/browser/word etc.
| 
| [Italian post about DynamicTranslator](http://www.softandapps.info/2016/08/12/dynamictranslator-software-traduce-textos-windows/)
| 
| [French post about DynamicTranslator](http://www.jetelecharge.com/Bureautique/8757.php) |
| [Bulgarian post about DynamicTranslator](http://www.download.bg/index.php?cls=program&mtd=default&id=696239)
-|
| [Ekşi Sözlük - DynamicTranslator](https://eksisozluk.com/dynamictranslator--5230125) |
+| 
| [Ekşi Sözlük - DynamicTranslator](https://eksisozluk.com/dynamictranslator--5230125) |
## Country Based Usage
diff --git a/src/DynamicTranslator.Application.Bing/DynamicTranslatorBingModule.cs b/src/DynamicTranslator.Application.Bing/DynamicTranslatorBingModule.cs
index b787d838..cd040a8e 100644
--- 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
index 5890bf17..b9ea3c66 100644
--- 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
index 6cb1e89a..ba4d1e92 100644
--- 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
index 0b665264..2728ca0e 100644
--- 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
index 477228bf..fd5a949e 100644
--- 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
index efa48671..0112c79a 100644
--- a/src/DynamicTranslator.Application/DynamicTranslator.Application.csproj
+++ b/src/DynamicTranslator.Application/DynamicTranslator.Application.csproj
@@ -116,8 +116,6 @@
-
-
diff --git a/src/DynamicTranslator.Application/Result/IResultService.cs b/src/DynamicTranslator.Application/Result/IResultService.cs
deleted file mode 100644
index 29a244da..00000000
--- a/src/DynamicTranslator.Application/Result/IResultService.cs
+++ /dev/null
@@ -1,15 +0,0 @@
-using System.Threading.Tasks;
-
-using Abp.Application.Services;
-
-using DynamicTranslator.Domain.Model;
-
-namespace DynamicTranslator.Application.Result
-{
- public interface IResultService : IApplicationService
- {
- Task GetAsync(string key);
-
- Task SaveOrUpdateAsync(CompositeTranslateResult translateResult);
- }
-}
diff --git a/src/DynamicTranslator.Application/Result/ResultService.cs b/src/DynamicTranslator.Application/Result/ResultService.cs
deleted file mode 100644
index 523c8ed7..00000000
--- a/src/DynamicTranslator.Application/Result/ResultService.cs
+++ /dev/null
@@ -1,46 +0,0 @@
-using System;
-using System.Threading.Tasks;
-
-using Abp.Application.Services;
-using Abp.Domain.Uow;
-
-using DynamicTranslator.Domain.Model;
-using DynamicTranslator.Domain.Repository;
-
-namespace DynamicTranslator.Application.Result
-{
- public class ResultService : ApplicationService, IResultService
- {
- private readonly ITranslateResultRepository _resultRepository;
-
- public ResultService(ITranslateResultRepository resultRepository)
- {
- _resultRepository = resultRepository;
- }
-
- [UnitOfWork]
- public Task GetAsync(string key)
- {
- return _resultRepository.GetAsync(key);
- }
-
- [UnitOfWork]
- public Task SaveOrUpdateAsync(CompositeTranslateResult translateResult)
- {
- CompositeTranslateResult lastResult = _resultRepository.FirstOrDefault(translateResult.Id);
-
- if (lastResult != null)
- {
- lastResult = translateResult
- .SetResults(translateResult.Results)
- .SetCreateDate(DateTime.Now)
- .IncreaseFrequency();
-
- return _resultRepository.UpdateAsync(lastResult);
- }
-
- lastResult = translateResult;
- return _resultRepository.InsertAsync(lastResult);
- }
- }
-}
diff --git a/src/DynamicTranslator.Domain/DynamicTranslator.Domain.csproj b/src/DynamicTranslator.Domain/DynamicTranslator.Domain.csproj
index b5f5830a..d7767a1c 100644
--- a/src/DynamicTranslator.Domain/DynamicTranslator.Domain.csproj
+++ b/src/DynamicTranslator.Domain/DynamicTranslator.Domain.csproj
@@ -108,7 +108,6 @@
-
diff --git a/src/DynamicTranslator.Domain/Repository/ITranslateResultRepository.cs b/src/DynamicTranslator.Domain/Repository/ITranslateResultRepository.cs
deleted file mode 100644
index 5cafb194..00000000
--- a/src/DynamicTranslator.Domain/Repository/ITranslateResultRepository.cs
+++ /dev/null
@@ -1,8 +0,0 @@
-using Abp.Domain.Repositories;
-
-using DynamicTranslator.Domain.Model;
-
-namespace DynamicTranslator.Domain.Repository
-{
- public interface ITranslateResultRepository : IRepository {}
-}
diff --git a/src/DynamicTranslator.TestBase/Properties/AssemblyInfo.cs b/src/DynamicTranslator.TestBase/Properties/AssemblyInfo.cs
index 4b9a26cd..187e7cfa 100644
--- 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
index f1236321..df3656c9 100644
--- 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
index 17a02262..50bcc4e9 100644
--- 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
index f4abeb51..e650a073 100644
--- 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" />
-
-
diff --git a/src/DynamicTranslator.Wpf/ViewModel/MainWindow.xaml.cs b/src/DynamicTranslator.Wpf/ViewModel/MainWindow.xaml.cs
index 010fd335..e0cf0d94 100644
--- 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
index 4100301c..3234a06a 100644
--- 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
index f4bbdbfc..6cf38b0a 100644
--- 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()