diff --git a/src/Greenshot.Addon.Box/BoxAutofacModule.cs b/src/Greenshot.Addon.Box/BoxAddonModule.cs similarity index 94% rename from src/Greenshot.Addon.Box/BoxAutofacModule.cs rename to src/Greenshot.Addon.Box/BoxAddonModule.cs index a6ff2c147..080a5ebed 100644 --- a/src/Greenshot.Addon.Box/BoxAutofacModule.cs +++ b/src/Greenshot.Addon.Box/BoxAddonModule.cs @@ -30,7 +30,7 @@ using Greenshot.Addons.Components; namespace Greenshot.Addon.Box { /// - public class BoxAutofacModule : AddonModule + public class BoxAddonModule : AddonModule { protected override void Load(ContainerBuilder builder) { diff --git a/src/Greenshot.Addon.Box/Greenshot.Addon.Box.csproj b/src/Greenshot.Addon.Box/Greenshot.Addon.Box.csproj index 583ced292..57a3dcfa0 100644 --- a/src/Greenshot.Addon.Box/Greenshot.Addon.Box.csproj +++ b/src/Greenshot.Addon.Box/Greenshot.Addon.Box.csproj @@ -46,29 +46,29 @@ ..\packages\CommonServiceLocator.2.0.3\lib\net45\CommonServiceLocator.dll - - ..\packages\Dapplo.Addons.1.0.40-beta\lib\net45\Dapplo.Addons.dll + + ..\packages\Dapplo.Addons.1.0.44\lib\net45\Dapplo.Addons.dll - - ..\packages\Dapplo.Addons.Bootstrapper.1.0.40-beta\lib\net45\Dapplo.Addons.Bootstrapper.dll + + ..\packages\Dapplo.Addons.Bootstrapper.1.0.44\lib\net45\Dapplo.Addons.Bootstrapper.dll - - ..\packages\Dapplo.CaliburnMicro.1.0.41-beta\lib\net45\Dapplo.CaliburnMicro.dll + + ..\packages\Dapplo.CaliburnMicro.1.0.42\lib\net45\Dapplo.CaliburnMicro.dll - - ..\packages\Dapplo.CaliburnMicro.Configuration.1.0.41-beta\lib\net45\Dapplo.CaliburnMicro.Configuration.dll + + ..\packages\Dapplo.CaliburnMicro.Configuration.1.0.42\lib\net45\Dapplo.CaliburnMicro.Configuration.dll - - ..\packages\Dapplo.CaliburnMicro.Dapp.1.0.41-beta\lib\net45\Dapplo.CaliburnMicro.Dapp.dll + + ..\packages\Dapplo.CaliburnMicro.Dapp.1.0.42\lib\net45\Dapplo.CaliburnMicro.Dapp.dll - - ..\packages\Dapplo.CaliburnMicro.Menu.1.0.41-beta\lib\net45\Dapplo.CaliburnMicro.Menu.dll + + ..\packages\Dapplo.CaliburnMicro.Menu.1.0.42\lib\net45\Dapplo.CaliburnMicro.Menu.dll - - ..\packages\Dapplo.CaliburnMicro.Security.1.0.41-beta\lib\net45\Dapplo.CaliburnMicro.Security.dll + + ..\packages\Dapplo.CaliburnMicro.Security.1.0.42\lib\net45\Dapplo.CaliburnMicro.Security.dll - - ..\packages\Dapplo.CaliburnMicro.Translations.1.0.41-beta\lib\net45\Dapplo.CaliburnMicro.Translations.dll + + ..\packages\Dapplo.CaliburnMicro.Translations.1.0.42\lib\net45\Dapplo.CaliburnMicro.Translations.dll ..\packages\Dapplo.HttpExtensions.0.8.35\lib\net45\Dapplo.HttpExtensions.dll @@ -160,7 +160,7 @@ - + diff --git a/src/Greenshot.Addon.Box/packages.config b/src/Greenshot.Addon.Box/packages.config index 1cf55a088..52052b2a6 100644 --- a/src/Greenshot.Addon.Box/packages.config +++ b/src/Greenshot.Addon.Box/packages.config @@ -6,14 +6,14 @@ - - - - - - - - + + + + + + + + diff --git a/src/Greenshot.Addon.Confluence/ConfluenceAutofacModule.cs b/src/Greenshot.Addon.Confluence/ConfluenceAddonModule.cs similarity index 93% rename from src/Greenshot.Addon.Confluence/ConfluenceAutofacModule.cs rename to src/Greenshot.Addon.Confluence/ConfluenceAddonModule.cs index 3b3b5b93d..795969a98 100644 --- a/src/Greenshot.Addon.Confluence/ConfluenceAutofacModule.cs +++ b/src/Greenshot.Addon.Confluence/ConfluenceAddonModule.cs @@ -30,7 +30,7 @@ using Greenshot.Addons.Components; namespace Greenshot.Addon.Confluence { /// - public class ConfluenceAutofacModule : AddonModule + public class ConfluenceAddonModule : AddonModule { protected override void Load(ContainerBuilder builder) { diff --git a/src/Greenshot.Addon.Confluence/Greenshot.Addon.Confluence.csproj b/src/Greenshot.Addon.Confluence/Greenshot.Addon.Confluence.csproj index cdbf9169a..cfabe9bcf 100644 --- a/src/Greenshot.Addon.Confluence/Greenshot.Addon.Confluence.csproj +++ b/src/Greenshot.Addon.Confluence/Greenshot.Addon.Confluence.csproj @@ -65,29 +65,29 @@ ..\packages\Costura.Fody.2.0.1\lib\net452\Costura.dll - - ..\packages\Dapplo.Addons.1.0.40-beta\lib\net45\Dapplo.Addons.dll + + ..\packages\Dapplo.Addons.1.0.44\lib\net45\Dapplo.Addons.dll - - ..\packages\Dapplo.Addons.Bootstrapper.1.0.40-beta\lib\net45\Dapplo.Addons.Bootstrapper.dll + + ..\packages\Dapplo.Addons.Bootstrapper.1.0.44\lib\net45\Dapplo.Addons.Bootstrapper.dll - - ..\packages\Dapplo.CaliburnMicro.1.0.41-beta\lib\net45\Dapplo.CaliburnMicro.dll + + ..\packages\Dapplo.CaliburnMicro.1.0.42\lib\net45\Dapplo.CaliburnMicro.dll - - ..\packages\Dapplo.CaliburnMicro.Configuration.1.0.41-beta\lib\net45\Dapplo.CaliburnMicro.Configuration.dll + + ..\packages\Dapplo.CaliburnMicro.Configuration.1.0.42\lib\net45\Dapplo.CaliburnMicro.Configuration.dll - - ..\packages\Dapplo.CaliburnMicro.Dapp.1.0.41-beta\lib\net45\Dapplo.CaliburnMicro.Dapp.dll + + ..\packages\Dapplo.CaliburnMicro.Dapp.1.0.42\lib\net45\Dapplo.CaliburnMicro.Dapp.dll - - ..\packages\Dapplo.CaliburnMicro.Menu.1.0.41-beta\lib\net45\Dapplo.CaliburnMicro.Menu.dll + + ..\packages\Dapplo.CaliburnMicro.Menu.1.0.42\lib\net45\Dapplo.CaliburnMicro.Menu.dll - - ..\packages\Dapplo.CaliburnMicro.Security.1.0.41-beta\lib\net45\Dapplo.CaliburnMicro.Security.dll + + ..\packages\Dapplo.CaliburnMicro.Security.1.0.42\lib\net45\Dapplo.CaliburnMicro.Security.dll - - ..\packages\Dapplo.CaliburnMicro.Translations.1.0.41-beta\lib\net45\Dapplo.CaliburnMicro.Translations.dll + + ..\packages\Dapplo.CaliburnMicro.Translations.1.0.42\lib\net45\Dapplo.CaliburnMicro.Translations.dll ..\packages\Dapplo.Confluence.0.7.19\lib\net45\Dapplo.Confluence.dll @@ -191,7 +191,7 @@ - + diff --git a/src/Greenshot.Addon.Confluence/packages.config b/src/Greenshot.Addon.Confluence/packages.config index 7b89d10fc..ff0b49ca3 100644 --- a/src/Greenshot.Addon.Confluence/packages.config +++ b/src/Greenshot.Addon.Confluence/packages.config @@ -7,14 +7,14 @@ - - - - - - - - + + + + + + + + diff --git a/src/Greenshot.Addon.Dropbox/DropboxAutofacModule.cs b/src/Greenshot.Addon.Dropbox/DropboxAddonModule.cs similarity index 94% rename from src/Greenshot.Addon.Dropbox/DropboxAutofacModule.cs rename to src/Greenshot.Addon.Dropbox/DropboxAddonModule.cs index cab62e3c1..b5d3951a0 100644 --- a/src/Greenshot.Addon.Dropbox/DropboxAutofacModule.cs +++ b/src/Greenshot.Addon.Dropbox/DropboxAddonModule.cs @@ -30,7 +30,7 @@ using Greenshot.Addons.Components; namespace Greenshot.Addon.Dropbox { /// - public class DropboxAutofacModule : AddonModule + public class DropboxAddonModule : AddonModule { protected override void Load(ContainerBuilder builder) { diff --git a/src/Greenshot.Addon.Dropbox/Greenshot.Addon.Dropbox.csproj b/src/Greenshot.Addon.Dropbox/Greenshot.Addon.Dropbox.csproj index 94a03febc..2b229e251 100644 --- a/src/Greenshot.Addon.Dropbox/Greenshot.Addon.Dropbox.csproj +++ b/src/Greenshot.Addon.Dropbox/Greenshot.Addon.Dropbox.csproj @@ -58,29 +58,29 @@ ..\packages\CommonServiceLocator.2.0.3\lib\net45\CommonServiceLocator.dll - - ..\packages\Dapplo.Addons.1.0.40-beta\lib\net45\Dapplo.Addons.dll + + ..\packages\Dapplo.Addons.1.0.44\lib\net45\Dapplo.Addons.dll - - ..\packages\Dapplo.Addons.Bootstrapper.1.0.40-beta\lib\net45\Dapplo.Addons.Bootstrapper.dll + + ..\packages\Dapplo.Addons.Bootstrapper.1.0.44\lib\net45\Dapplo.Addons.Bootstrapper.dll - - ..\packages\Dapplo.CaliburnMicro.1.0.41-beta\lib\net45\Dapplo.CaliburnMicro.dll + + ..\packages\Dapplo.CaliburnMicro.1.0.42\lib\net45\Dapplo.CaliburnMicro.dll - - ..\packages\Dapplo.CaliburnMicro.Configuration.1.0.41-beta\lib\net45\Dapplo.CaliburnMicro.Configuration.dll + + ..\packages\Dapplo.CaliburnMicro.Configuration.1.0.42\lib\net45\Dapplo.CaliburnMicro.Configuration.dll - - ..\packages\Dapplo.CaliburnMicro.Dapp.1.0.41-beta\lib\net45\Dapplo.CaliburnMicro.Dapp.dll + + ..\packages\Dapplo.CaliburnMicro.Dapp.1.0.42\lib\net45\Dapplo.CaliburnMicro.Dapp.dll - - ..\packages\Dapplo.CaliburnMicro.Menu.1.0.41-beta\lib\net45\Dapplo.CaliburnMicro.Menu.dll + + ..\packages\Dapplo.CaliburnMicro.Menu.1.0.42\lib\net45\Dapplo.CaliburnMicro.Menu.dll - - ..\packages\Dapplo.CaliburnMicro.Security.1.0.41-beta\lib\net45\Dapplo.CaliburnMicro.Security.dll + + ..\packages\Dapplo.CaliburnMicro.Security.1.0.42\lib\net45\Dapplo.CaliburnMicro.Security.dll - - ..\packages\Dapplo.CaliburnMicro.Translations.1.0.41-beta\lib\net45\Dapplo.CaliburnMicro.Translations.dll + + ..\packages\Dapplo.CaliburnMicro.Translations.1.0.42\lib\net45\Dapplo.CaliburnMicro.Translations.dll ..\packages\Dapplo.HttpExtensions.0.8.35\lib\net45\Dapplo.HttpExtensions.dll @@ -171,7 +171,7 @@ - + diff --git a/src/Greenshot.Addon.Dropbox/packages.config b/src/Greenshot.Addon.Dropbox/packages.config index 1cf55a088..52052b2a6 100644 --- a/src/Greenshot.Addon.Dropbox/packages.config +++ b/src/Greenshot.Addon.Dropbox/packages.config @@ -6,14 +6,14 @@ - - - - - - - - + + + + + + + + diff --git a/src/Greenshot.Addon.ExternalCommand/ExternalCommandAutofacModule.cs b/src/Greenshot.Addon.ExternalCommand/ExternalCommandAddonModule.cs similarity index 93% rename from src/Greenshot.Addon.ExternalCommand/ExternalCommandAutofacModule.cs rename to src/Greenshot.Addon.ExternalCommand/ExternalCommandAddonModule.cs index 3d5938f88..c9c2900c8 100644 --- a/src/Greenshot.Addon.ExternalCommand/ExternalCommandAutofacModule.cs +++ b/src/Greenshot.Addon.ExternalCommand/ExternalCommandAddonModule.cs @@ -30,7 +30,7 @@ using Greenshot.Addons.Components; namespace Greenshot.Addon.ExternalCommand { /// - public class ExternalCommandAutofacModule : AddonModule + public class ExternalCommandAddonModule : AddonModule { protected override void Load(ContainerBuilder builder) { diff --git a/src/Greenshot.Addon.ExternalCommand/Greenshot.Addon.ExternalCommand.csproj b/src/Greenshot.Addon.ExternalCommand/Greenshot.Addon.ExternalCommand.csproj index 6fd219bc7..c0312191c 100644 --- a/src/Greenshot.Addon.ExternalCommand/Greenshot.Addon.ExternalCommand.csproj +++ b/src/Greenshot.Addon.ExternalCommand/Greenshot.Addon.ExternalCommand.csproj @@ -58,29 +58,29 @@ ..\packages\CommonServiceLocator.2.0.3\lib\net45\CommonServiceLocator.dll - - ..\packages\Dapplo.Addons.1.0.40-beta\lib\net45\Dapplo.Addons.dll + + ..\packages\Dapplo.Addons.1.0.44\lib\net45\Dapplo.Addons.dll - - ..\packages\Dapplo.Addons.Bootstrapper.1.0.40-beta\lib\net45\Dapplo.Addons.Bootstrapper.dll + + ..\packages\Dapplo.Addons.Bootstrapper.1.0.44\lib\net45\Dapplo.Addons.Bootstrapper.dll - - ..\packages\Dapplo.CaliburnMicro.1.0.41-beta\lib\net45\Dapplo.CaliburnMicro.dll + + ..\packages\Dapplo.CaliburnMicro.1.0.42\lib\net45\Dapplo.CaliburnMicro.dll - - ..\packages\Dapplo.CaliburnMicro.Configuration.1.0.41-beta\lib\net45\Dapplo.CaliburnMicro.Configuration.dll + + ..\packages\Dapplo.CaliburnMicro.Configuration.1.0.42\lib\net45\Dapplo.CaliburnMicro.Configuration.dll - - ..\packages\Dapplo.CaliburnMicro.Dapp.1.0.41-beta\lib\net45\Dapplo.CaliburnMicro.Dapp.dll + + ..\packages\Dapplo.CaliburnMicro.Dapp.1.0.42\lib\net45\Dapplo.CaliburnMicro.Dapp.dll - - ..\packages\Dapplo.CaliburnMicro.Menu.1.0.41-beta\lib\net45\Dapplo.CaliburnMicro.Menu.dll + + ..\packages\Dapplo.CaliburnMicro.Menu.1.0.42\lib\net45\Dapplo.CaliburnMicro.Menu.dll - - ..\packages\Dapplo.CaliburnMicro.Security.1.0.41-beta\lib\net45\Dapplo.CaliburnMicro.Security.dll + + ..\packages\Dapplo.CaliburnMicro.Security.1.0.42\lib\net45\Dapplo.CaliburnMicro.Security.dll - - ..\packages\Dapplo.CaliburnMicro.Translations.1.0.41-beta\lib\net45\Dapplo.CaliburnMicro.Translations.dll + + ..\packages\Dapplo.CaliburnMicro.Translations.1.0.42\lib\net45\Dapplo.CaliburnMicro.Translations.dll ..\packages\Dapplo.Ini.0.5.28\lib\net45\Dapplo.Ini.dll @@ -163,7 +163,7 @@ - + diff --git a/src/Greenshot.Addon.ExternalCommand/packages.config b/src/Greenshot.Addon.ExternalCommand/packages.config index 7f4e15bf5..adcd693f3 100644 --- a/src/Greenshot.Addon.ExternalCommand/packages.config +++ b/src/Greenshot.Addon.ExternalCommand/packages.config @@ -6,14 +6,14 @@ - - - - - - - - + + + + + + + + diff --git a/src/Greenshot.Addon.Flickr/FlickrAutofacModule.cs b/src/Greenshot.Addon.Flickr/FlickrAddonModule.cs similarity index 94% rename from src/Greenshot.Addon.Flickr/FlickrAutofacModule.cs rename to src/Greenshot.Addon.Flickr/FlickrAddonModule.cs index 11da3df93..686ac688a 100644 --- a/src/Greenshot.Addon.Flickr/FlickrAutofacModule.cs +++ b/src/Greenshot.Addon.Flickr/FlickrAddonModule.cs @@ -30,7 +30,7 @@ using Greenshot.Addons.Components; namespace Greenshot.Addon.Flickr { /// - public class FlickrAutofacModule : AddonModule + public class FlickrAddonModule : AddonModule { protected override void Load(ContainerBuilder builder) { diff --git a/src/Greenshot.Addon.Flickr/Greenshot.Addon.Flickr.csproj b/src/Greenshot.Addon.Flickr/Greenshot.Addon.Flickr.csproj index 5ef2f952f..0d1714638 100644 --- a/src/Greenshot.Addon.Flickr/Greenshot.Addon.Flickr.csproj +++ b/src/Greenshot.Addon.Flickr/Greenshot.Addon.Flickr.csproj @@ -58,29 +58,29 @@ ..\packages\CommonServiceLocator.2.0.3\lib\net45\CommonServiceLocator.dll - - ..\packages\Dapplo.Addons.1.0.40-beta\lib\net45\Dapplo.Addons.dll + + ..\packages\Dapplo.Addons.1.0.44\lib\net45\Dapplo.Addons.dll - - ..\packages\Dapplo.Addons.Bootstrapper.1.0.40-beta\lib\net45\Dapplo.Addons.Bootstrapper.dll + + ..\packages\Dapplo.Addons.Bootstrapper.1.0.44\lib\net45\Dapplo.Addons.Bootstrapper.dll - - ..\packages\Dapplo.CaliburnMicro.1.0.41-beta\lib\net45\Dapplo.CaliburnMicro.dll + + ..\packages\Dapplo.CaliburnMicro.1.0.42\lib\net45\Dapplo.CaliburnMicro.dll - - ..\packages\Dapplo.CaliburnMicro.Configuration.1.0.41-beta\lib\net45\Dapplo.CaliburnMicro.Configuration.dll + + ..\packages\Dapplo.CaliburnMicro.Configuration.1.0.42\lib\net45\Dapplo.CaliburnMicro.Configuration.dll - - ..\packages\Dapplo.CaliburnMicro.Dapp.1.0.41-beta\lib\net45\Dapplo.CaliburnMicro.Dapp.dll + + ..\packages\Dapplo.CaliburnMicro.Dapp.1.0.42\lib\net45\Dapplo.CaliburnMicro.Dapp.dll - - ..\packages\Dapplo.CaliburnMicro.Menu.1.0.41-beta\lib\net45\Dapplo.CaliburnMicro.Menu.dll + + ..\packages\Dapplo.CaliburnMicro.Menu.1.0.42\lib\net45\Dapplo.CaliburnMicro.Menu.dll - - ..\packages\Dapplo.CaliburnMicro.Security.1.0.41-beta\lib\net45\Dapplo.CaliburnMicro.Security.dll + + ..\packages\Dapplo.CaliburnMicro.Security.1.0.42\lib\net45\Dapplo.CaliburnMicro.Security.dll - - ..\packages\Dapplo.CaliburnMicro.Translations.1.0.41-beta\lib\net45\Dapplo.CaliburnMicro.Translations.dll + + ..\packages\Dapplo.CaliburnMicro.Translations.1.0.42\lib\net45\Dapplo.CaliburnMicro.Translations.dll ..\packages\Dapplo.HttpExtensions.0.8.35\lib\net45\Dapplo.HttpExtensions.dll @@ -165,7 +165,7 @@ - + diff --git a/src/Greenshot.Addon.Flickr/packages.config b/src/Greenshot.Addon.Flickr/packages.config index a634f0890..4a314dcfd 100644 --- a/src/Greenshot.Addon.Flickr/packages.config +++ b/src/Greenshot.Addon.Flickr/packages.config @@ -6,14 +6,14 @@ - - - - - - - - + + + + + + + + diff --git a/src/Greenshot.Addon.GooglePhotos/GooglePhotosAutofacModule.cs b/src/Greenshot.Addon.GooglePhotos/GooglePhotosAddonModule.cs similarity index 93% rename from src/Greenshot.Addon.GooglePhotos/GooglePhotosAutofacModule.cs rename to src/Greenshot.Addon.GooglePhotos/GooglePhotosAddonModule.cs index 745d5e573..22c9cf143 100644 --- a/src/Greenshot.Addon.GooglePhotos/GooglePhotosAutofacModule.cs +++ b/src/Greenshot.Addon.GooglePhotos/GooglePhotosAddonModule.cs @@ -30,7 +30,7 @@ using Greenshot.Addons.Components; namespace Greenshot.Addon.GooglePhotos { /// - public class GooglePhotosAutofacModule : AddonModule + public class GooglePhotosAddonModule : AddonModule { protected override void Load(ContainerBuilder builder) { diff --git a/src/Greenshot.Addon.GooglePhotos/Greenshot.Addon.GooglePhotos.csproj b/src/Greenshot.Addon.GooglePhotos/Greenshot.Addon.GooglePhotos.csproj index 24d5f7dc3..2b7e10f05 100644 --- a/src/Greenshot.Addon.GooglePhotos/Greenshot.Addon.GooglePhotos.csproj +++ b/src/Greenshot.Addon.GooglePhotos/Greenshot.Addon.GooglePhotos.csproj @@ -44,29 +44,29 @@ ..\packages\CommonServiceLocator.2.0.3\lib\net45\CommonServiceLocator.dll - - ..\packages\Dapplo.Addons.1.0.40-beta\lib\net45\Dapplo.Addons.dll + + ..\packages\Dapplo.Addons.1.0.44\lib\net45\Dapplo.Addons.dll - - ..\packages\Dapplo.Addons.Bootstrapper.1.0.40-beta\lib\net45\Dapplo.Addons.Bootstrapper.dll + + ..\packages\Dapplo.Addons.Bootstrapper.1.0.44\lib\net45\Dapplo.Addons.Bootstrapper.dll - - ..\packages\Dapplo.CaliburnMicro.1.0.41-beta\lib\net45\Dapplo.CaliburnMicro.dll + + ..\packages\Dapplo.CaliburnMicro.1.0.42\lib\net45\Dapplo.CaliburnMicro.dll - - ..\packages\Dapplo.CaliburnMicro.Configuration.1.0.41-beta\lib\net45\Dapplo.CaliburnMicro.Configuration.dll + + ..\packages\Dapplo.CaliburnMicro.Configuration.1.0.42\lib\net45\Dapplo.CaliburnMicro.Configuration.dll - - ..\packages\Dapplo.CaliburnMicro.Dapp.1.0.41-beta\lib\net45\Dapplo.CaliburnMicro.Dapp.dll + + ..\packages\Dapplo.CaliburnMicro.Dapp.1.0.42\lib\net45\Dapplo.CaliburnMicro.Dapp.dll - - ..\packages\Dapplo.CaliburnMicro.Menu.1.0.41-beta\lib\net45\Dapplo.CaliburnMicro.Menu.dll + + ..\packages\Dapplo.CaliburnMicro.Menu.1.0.42\lib\net45\Dapplo.CaliburnMicro.Menu.dll - - ..\packages\Dapplo.CaliburnMicro.Security.1.0.41-beta\lib\net45\Dapplo.CaliburnMicro.Security.dll + + ..\packages\Dapplo.CaliburnMicro.Security.1.0.42\lib\net45\Dapplo.CaliburnMicro.Security.dll - - ..\packages\Dapplo.CaliburnMicro.Translations.1.0.41-beta\lib\net45\Dapplo.CaliburnMicro.Translations.dll + + ..\packages\Dapplo.CaliburnMicro.Translations.1.0.42\lib\net45\Dapplo.CaliburnMicro.Translations.dll ..\packages\Dapplo.HttpExtensions.0.8.35\lib\net45\Dapplo.HttpExtensions.dll @@ -152,7 +152,7 @@ - + diff --git a/src/Greenshot.Addon.GooglePhotos/packages.config b/src/Greenshot.Addon.GooglePhotos/packages.config index a634f0890..4a314dcfd 100644 --- a/src/Greenshot.Addon.GooglePhotos/packages.config +++ b/src/Greenshot.Addon.GooglePhotos/packages.config @@ -6,14 +6,14 @@ - - - - - - - - + + + + + + + + diff --git a/src/Greenshot.Addon.Imgur/Greenshot.Addon.Imgur.csproj b/src/Greenshot.Addon.Imgur/Greenshot.Addon.Imgur.csproj index d724162eb..4eab84b37 100644 --- a/src/Greenshot.Addon.Imgur/Greenshot.Addon.Imgur.csproj +++ b/src/Greenshot.Addon.Imgur/Greenshot.Addon.Imgur.csproj @@ -63,29 +63,29 @@ ..\packages\ControlzEx.3.0.2.4\lib\net45\ControlzEx.dll - - ..\packages\Dapplo.Addons.1.0.40-beta\lib\net45\Dapplo.Addons.dll + + ..\packages\Dapplo.Addons.1.0.44\lib\net45\Dapplo.Addons.dll - - ..\packages\Dapplo.Addons.Bootstrapper.1.0.40-beta\lib\net45\Dapplo.Addons.Bootstrapper.dll + + ..\packages\Dapplo.Addons.Bootstrapper.1.0.44\lib\net45\Dapplo.Addons.Bootstrapper.dll - - ..\packages\Dapplo.CaliburnMicro.1.0.41-beta\lib\net45\Dapplo.CaliburnMicro.dll + + ..\packages\Dapplo.CaliburnMicro.1.0.42\lib\net45\Dapplo.CaliburnMicro.dll - - ..\packages\Dapplo.CaliburnMicro.Configuration.1.0.41-beta\lib\net45\Dapplo.CaliburnMicro.Configuration.dll + + ..\packages\Dapplo.CaliburnMicro.Configuration.1.0.42\lib\net45\Dapplo.CaliburnMicro.Configuration.dll - - ..\packages\Dapplo.CaliburnMicro.Dapp.1.0.41-beta\lib\net45\Dapplo.CaliburnMicro.Dapp.dll + + ..\packages\Dapplo.CaliburnMicro.Dapp.1.0.42\lib\net45\Dapplo.CaliburnMicro.Dapp.dll - - ..\packages\Dapplo.CaliburnMicro.Menu.1.0.41-beta\lib\net45\Dapplo.CaliburnMicro.Menu.dll + + ..\packages\Dapplo.CaliburnMicro.Menu.1.0.42\lib\net45\Dapplo.CaliburnMicro.Menu.dll - - ..\packages\Dapplo.CaliburnMicro.Security.1.0.41-beta\lib\net45\Dapplo.CaliburnMicro.Security.dll + + ..\packages\Dapplo.CaliburnMicro.Security.1.0.42\lib\net45\Dapplo.CaliburnMicro.Security.dll - - ..\packages\Dapplo.CaliburnMicro.Translations.1.0.41-beta\lib\net45\Dapplo.CaliburnMicro.Translations.dll + + ..\packages\Dapplo.CaliburnMicro.Translations.1.0.42\lib\net45\Dapplo.CaliburnMicro.Translations.dll ..\packages\Dapplo.HttpExtensions.0.8.35\lib\net45\Dapplo.HttpExtensions.dll @@ -181,7 +181,7 @@ - + diff --git a/src/Greenshot.Addon.Imgur/ImgurAutofacModule.cs b/src/Greenshot.Addon.Imgur/ImgurAddonModule.cs similarity index 94% rename from src/Greenshot.Addon.Imgur/ImgurAutofacModule.cs rename to src/Greenshot.Addon.Imgur/ImgurAddonModule.cs index d8e49a260..e6fecc118 100644 --- a/src/Greenshot.Addon.Imgur/ImgurAutofacModule.cs +++ b/src/Greenshot.Addon.Imgur/ImgurAddonModule.cs @@ -30,7 +30,7 @@ using Greenshot.Addons.Components; namespace Greenshot.Addon.Imgur { /// - public class ImgurAutofacModule : AddonModule + public class ImgurAddonModule : AddonModule { protected override void Load(ContainerBuilder builder) { diff --git a/src/Greenshot.Addon.Imgur/packages.config b/src/Greenshot.Addon.Imgur/packages.config index ca3a14e5e..bfd889dc7 100644 --- a/src/Greenshot.Addon.Imgur/packages.config +++ b/src/Greenshot.Addon.Imgur/packages.config @@ -7,14 +7,14 @@ - - - - - - - - + + + + + + + + diff --git a/src/Greenshot.Addon.Jira/Greenshot.Addon.Jira.csproj b/src/Greenshot.Addon.Jira/Greenshot.Addon.Jira.csproj index d84c159d7..c8470eb5f 100644 --- a/src/Greenshot.Addon.Jira/Greenshot.Addon.Jira.csproj +++ b/src/Greenshot.Addon.Jira/Greenshot.Addon.Jira.csproj @@ -63,29 +63,29 @@ ..\packages\Costura.Fody.2.0.1\lib\net452\Costura.dll - - ..\packages\Dapplo.Addons.1.0.40-beta\lib\net45\Dapplo.Addons.dll + + ..\packages\Dapplo.Addons.1.0.44\lib\net45\Dapplo.Addons.dll - - ..\packages\Dapplo.Addons.Bootstrapper.1.0.40-beta\lib\net45\Dapplo.Addons.Bootstrapper.dll + + ..\packages\Dapplo.Addons.Bootstrapper.1.0.44\lib\net45\Dapplo.Addons.Bootstrapper.dll - - ..\packages\Dapplo.CaliburnMicro.1.0.41-beta\lib\net45\Dapplo.CaliburnMicro.dll + + ..\packages\Dapplo.CaliburnMicro.1.0.42\lib\net45\Dapplo.CaliburnMicro.dll - - ..\packages\Dapplo.CaliburnMicro.Configuration.1.0.41-beta\lib\net45\Dapplo.CaliburnMicro.Configuration.dll + + ..\packages\Dapplo.CaliburnMicro.Configuration.1.0.42\lib\net45\Dapplo.CaliburnMicro.Configuration.dll - - ..\packages\Dapplo.CaliburnMicro.Dapp.1.0.41-beta\lib\net45\Dapplo.CaliburnMicro.Dapp.dll + + ..\packages\Dapplo.CaliburnMicro.Dapp.1.0.42\lib\net45\Dapplo.CaliburnMicro.Dapp.dll - - ..\packages\Dapplo.CaliburnMicro.Menu.1.0.41-beta\lib\net45\Dapplo.CaliburnMicro.Menu.dll + + ..\packages\Dapplo.CaliburnMicro.Menu.1.0.42\lib\net45\Dapplo.CaliburnMicro.Menu.dll - - ..\packages\Dapplo.CaliburnMicro.Security.1.0.41-beta\lib\net45\Dapplo.CaliburnMicro.Security.dll + + ..\packages\Dapplo.CaliburnMicro.Security.1.0.42\lib\net45\Dapplo.CaliburnMicro.Security.dll - - ..\packages\Dapplo.CaliburnMicro.Translations.1.0.41-beta\lib\net45\Dapplo.CaliburnMicro.Translations.dll + + ..\packages\Dapplo.CaliburnMicro.Translations.1.0.42\lib\net45\Dapplo.CaliburnMicro.Translations.dll ..\packages\Dapplo.HttpExtensions.0.8.35\lib\net45\Dapplo.HttpExtensions.dll @@ -186,7 +186,7 @@ - + diff --git a/src/Greenshot.Addon.Jira/JiraAutofacModule.cs b/src/Greenshot.Addon.Jira/JiraAddonModule.cs similarity index 94% rename from src/Greenshot.Addon.Jira/JiraAutofacModule.cs rename to src/Greenshot.Addon.Jira/JiraAddonModule.cs index e7400e45f..1af741a92 100644 --- a/src/Greenshot.Addon.Jira/JiraAutofacModule.cs +++ b/src/Greenshot.Addon.Jira/JiraAddonModule.cs @@ -31,7 +31,7 @@ using Greenshot.Addons.Components; namespace Greenshot.Addon.Jira { /// - public class JiraAutofacModule : AddonModule + public class JiraAddonModule : AddonModule { protected override void Load(ContainerBuilder builder) { diff --git a/src/Greenshot.Addon.Jira/packages.config b/src/Greenshot.Addon.Jira/packages.config index f7b994640..e68d85567 100644 --- a/src/Greenshot.Addon.Jira/packages.config +++ b/src/Greenshot.Addon.Jira/packages.config @@ -7,14 +7,14 @@ - - - - - - - - + + + + + + + + diff --git a/src/Greenshot.Addon.LegacyEditor/EditorAutofacModule.cs b/src/Greenshot.Addon.LegacyEditor/EditorAddonModule.cs similarity index 95% rename from src/Greenshot.Addon.LegacyEditor/EditorAutofacModule.cs rename to src/Greenshot.Addon.LegacyEditor/EditorAddonModule.cs index 72cd99e1e..6e49d6ece 100644 --- a/src/Greenshot.Addon.LegacyEditor/EditorAutofacModule.cs +++ b/src/Greenshot.Addon.LegacyEditor/EditorAddonModule.cs @@ -33,7 +33,7 @@ using Greenshot.Addons.Interfaces; namespace Greenshot.Addon.LegacyEditor { /// - public class EditorAutofacModule : AddonModule + public class EditorAddonModule : AddonModule { protected override void Load(ContainerBuilder builder) { diff --git a/src/Greenshot.Addon.LegacyEditor/Greenshot.Addon.LegacyEditor.csproj b/src/Greenshot.Addon.LegacyEditor/Greenshot.Addon.LegacyEditor.csproj index 3f004a05b..1001ed1cc 100644 --- a/src/Greenshot.Addon.LegacyEditor/Greenshot.Addon.LegacyEditor.csproj +++ b/src/Greenshot.Addon.LegacyEditor/Greenshot.Addon.LegacyEditor.csproj @@ -36,29 +36,29 @@ ..\packages\CommonServiceLocator.2.0.3\lib\net45\CommonServiceLocator.dll - - ..\packages\Dapplo.Addons.1.0.40-beta\lib\net45\Dapplo.Addons.dll + + ..\packages\Dapplo.Addons.1.0.44\lib\net45\Dapplo.Addons.dll - - ..\packages\Dapplo.Addons.Bootstrapper.1.0.40-beta\lib\net45\Dapplo.Addons.Bootstrapper.dll + + ..\packages\Dapplo.Addons.Bootstrapper.1.0.44\lib\net45\Dapplo.Addons.Bootstrapper.dll - - ..\packages\Dapplo.CaliburnMicro.1.0.41-beta\lib\net45\Dapplo.CaliburnMicro.dll + + ..\packages\Dapplo.CaliburnMicro.1.0.42\lib\net45\Dapplo.CaliburnMicro.dll - - ..\packages\Dapplo.CaliburnMicro.Configuration.1.0.41-beta\lib\net45\Dapplo.CaliburnMicro.Configuration.dll + + ..\packages\Dapplo.CaliburnMicro.Configuration.1.0.42\lib\net45\Dapplo.CaliburnMicro.Configuration.dll - - ..\packages\Dapplo.CaliburnMicro.Dapp.1.0.41-beta\lib\net45\Dapplo.CaliburnMicro.Dapp.dll + + ..\packages\Dapplo.CaliburnMicro.Dapp.1.0.42\lib\net45\Dapplo.CaliburnMicro.Dapp.dll - - ..\packages\Dapplo.CaliburnMicro.Menu.1.0.41-beta\lib\net45\Dapplo.CaliburnMicro.Menu.dll + + ..\packages\Dapplo.CaliburnMicro.Menu.1.0.42\lib\net45\Dapplo.CaliburnMicro.Menu.dll - - ..\packages\Dapplo.CaliburnMicro.Security.1.0.41-beta\lib\net45\Dapplo.CaliburnMicro.Security.dll + + ..\packages\Dapplo.CaliburnMicro.Security.1.0.42\lib\net45\Dapplo.CaliburnMicro.Security.dll - - ..\packages\Dapplo.CaliburnMicro.Translations.1.0.41-beta\lib\net45\Dapplo.CaliburnMicro.Translations.dll + + ..\packages\Dapplo.CaliburnMicro.Translations.1.0.42\lib\net45\Dapplo.CaliburnMicro.Translations.dll ..\packages\Dapplo.Ini.0.5.28\lib\net45\Dapplo.Ini.dll @@ -217,7 +217,7 @@ - + Form diff --git a/src/Greenshot.Addon.LegacyEditor/packages.config b/src/Greenshot.Addon.LegacyEditor/packages.config index 32fc8a97d..b2cc34855 100644 --- a/src/Greenshot.Addon.LegacyEditor/packages.config +++ b/src/Greenshot.Addon.LegacyEditor/packages.config @@ -6,14 +6,14 @@ - - - - - - - - + + + + + + + + diff --git a/src/Greenshot.Addon.Lutim/Greenshot.Addon.Lutim.csproj b/src/Greenshot.Addon.Lutim/Greenshot.Addon.Lutim.csproj index ecacf0f05..d45440a16 100644 --- a/src/Greenshot.Addon.Lutim/Greenshot.Addon.Lutim.csproj +++ b/src/Greenshot.Addon.Lutim/Greenshot.Addon.Lutim.csproj @@ -61,29 +61,29 @@ ..\packages\ControlzEx.3.0.2.4\lib\net45\ControlzEx.dll - - ..\packages\Dapplo.Addons.1.0.40-beta\lib\net45\Dapplo.Addons.dll + + ..\packages\Dapplo.Addons.1.0.44\lib\net45\Dapplo.Addons.dll - - ..\packages\Dapplo.Addons.Bootstrapper.1.0.40-beta\lib\net45\Dapplo.Addons.Bootstrapper.dll + + ..\packages\Dapplo.Addons.Bootstrapper.1.0.44\lib\net45\Dapplo.Addons.Bootstrapper.dll - - ..\packages\Dapplo.CaliburnMicro.1.0.41-beta\lib\net45\Dapplo.CaliburnMicro.dll + + ..\packages\Dapplo.CaliburnMicro.1.0.42\lib\net45\Dapplo.CaliburnMicro.dll - - ..\packages\Dapplo.CaliburnMicro.Configuration.1.0.41-beta\lib\net45\Dapplo.CaliburnMicro.Configuration.dll + + ..\packages\Dapplo.CaliburnMicro.Configuration.1.0.42\lib\net45\Dapplo.CaliburnMicro.Configuration.dll - - ..\packages\Dapplo.CaliburnMicro.Dapp.1.0.41-beta\lib\net45\Dapplo.CaliburnMicro.Dapp.dll + + ..\packages\Dapplo.CaliburnMicro.Dapp.1.0.42\lib\net45\Dapplo.CaliburnMicro.Dapp.dll - - ..\packages\Dapplo.CaliburnMicro.Menu.1.0.41-beta\lib\net45\Dapplo.CaliburnMicro.Menu.dll + + ..\packages\Dapplo.CaliburnMicro.Menu.1.0.42\lib\net45\Dapplo.CaliburnMicro.Menu.dll - - ..\packages\Dapplo.CaliburnMicro.Security.1.0.41-beta\lib\net45\Dapplo.CaliburnMicro.Security.dll + + ..\packages\Dapplo.CaliburnMicro.Security.1.0.42\lib\net45\Dapplo.CaliburnMicro.Security.dll - - ..\packages\Dapplo.CaliburnMicro.Translations.1.0.41-beta\lib\net45\Dapplo.CaliburnMicro.Translations.dll + + ..\packages\Dapplo.CaliburnMicro.Translations.1.0.42\lib\net45\Dapplo.CaliburnMicro.Translations.dll ..\packages\Dapplo.HttpExtensions.0.8.35\lib\net45\Dapplo.HttpExtensions.dll @@ -176,7 +176,7 @@ - + diff --git a/src/Greenshot.Addon.Lutim/LutimAutofacModule.cs b/src/Greenshot.Addon.Lutim/LutimAddonModule.cs similarity index 94% rename from src/Greenshot.Addon.Lutim/LutimAutofacModule.cs rename to src/Greenshot.Addon.Lutim/LutimAddonModule.cs index 3bcdb07d3..ea605bbb1 100644 --- a/src/Greenshot.Addon.Lutim/LutimAutofacModule.cs +++ b/src/Greenshot.Addon.Lutim/LutimAddonModule.cs @@ -30,7 +30,7 @@ using Greenshot.Addons.Components; namespace Greenshot.Addon.Lutim { /// - public class LutimAutofacModule : AddonModule + public class LutimAddonModule : AddonModule { protected override void Load(ContainerBuilder builder) { diff --git a/src/Greenshot.Addon.Lutim/packages.config b/src/Greenshot.Addon.Lutim/packages.config index c959ae980..536926bf5 100644 --- a/src/Greenshot.Addon.Lutim/packages.config +++ b/src/Greenshot.Addon.Lutim/packages.config @@ -7,14 +7,14 @@ - - - - - - - - + + + + + + + + diff --git a/src/Greenshot.Addon.OCR/Greenshot.Addon.OCR.csproj b/src/Greenshot.Addon.OCR/Greenshot.Addon.OCR.csproj index 7e15a13b4..2bbfe8b71 100644 --- a/src/Greenshot.Addon.OCR/Greenshot.Addon.OCR.csproj +++ b/src/Greenshot.Addon.OCR/Greenshot.Addon.OCR.csproj @@ -58,29 +58,29 @@ ..\packages\CommonServiceLocator.2.0.3\lib\net45\CommonServiceLocator.dll - - ..\packages\Dapplo.Addons.1.0.40-beta\lib\net45\Dapplo.Addons.dll + + ..\packages\Dapplo.Addons.1.0.44\lib\net45\Dapplo.Addons.dll - - ..\packages\Dapplo.Addons.Bootstrapper.1.0.40-beta\lib\net45\Dapplo.Addons.Bootstrapper.dll + + ..\packages\Dapplo.Addons.Bootstrapper.1.0.44\lib\net45\Dapplo.Addons.Bootstrapper.dll - - ..\packages\Dapplo.CaliburnMicro.1.0.41-beta\lib\net45\Dapplo.CaliburnMicro.dll + + ..\packages\Dapplo.CaliburnMicro.1.0.42\lib\net45\Dapplo.CaliburnMicro.dll - - ..\packages\Dapplo.CaliburnMicro.Configuration.1.0.41-beta\lib\net45\Dapplo.CaliburnMicro.Configuration.dll + + ..\packages\Dapplo.CaliburnMicro.Configuration.1.0.42\lib\net45\Dapplo.CaliburnMicro.Configuration.dll - - ..\packages\Dapplo.CaliburnMicro.Dapp.1.0.41-beta\lib\net45\Dapplo.CaliburnMicro.Dapp.dll + + ..\packages\Dapplo.CaliburnMicro.Dapp.1.0.42\lib\net45\Dapplo.CaliburnMicro.Dapp.dll - - ..\packages\Dapplo.CaliburnMicro.Menu.1.0.41-beta\lib\net45\Dapplo.CaliburnMicro.Menu.dll + + ..\packages\Dapplo.CaliburnMicro.Menu.1.0.42\lib\net45\Dapplo.CaliburnMicro.Menu.dll - - ..\packages\Dapplo.CaliburnMicro.Security.1.0.41-beta\lib\net45\Dapplo.CaliburnMicro.Security.dll + + ..\packages\Dapplo.CaliburnMicro.Security.1.0.42\lib\net45\Dapplo.CaliburnMicro.Security.dll - - ..\packages\Dapplo.CaliburnMicro.Translations.1.0.41-beta\lib\net45\Dapplo.CaliburnMicro.Translations.dll + + ..\packages\Dapplo.CaliburnMicro.Translations.1.0.42\lib\net45\Dapplo.CaliburnMicro.Translations.dll ..\packages\Dapplo.Ini.0.5.28\lib\net45\Dapplo.Ini.dll @@ -160,7 +160,7 @@ Form - + Form diff --git a/src/Greenshot.Addon.OCR/OcrAutofacModule.cs b/src/Greenshot.Addon.OCR/OcrAddonModule.cs similarity index 54% rename from src/Greenshot.Addon.OCR/OcrAutofacModule.cs rename to src/Greenshot.Addon.OCR/OcrAddonModule.cs index a6679f16c..3b7907aec 100644 --- a/src/Greenshot.Addon.OCR/OcrAutofacModule.cs +++ b/src/Greenshot.Addon.OCR/OcrAddonModule.cs @@ -21,23 +21,50 @@ #endregion +using System.Diagnostics; +using System.IO; using Autofac; using Dapplo.Addons; +using Dapplo.Addons.Bootstrapper.Resolving; using Greenshot.Addons.Components; namespace Greenshot.Addon.OCR { /// - public class PhotobucketAutofacModule : AddonModule + public class OcrAddonModule : AddonModule { + private bool HasModi() + { + var ocrCommand = Path.Combine(FileTools.NormalizeDirectory("."), "greenshotocrcommand.exe"); + try + { + using (var process = Process.Start(ocrCommand, "-c")) + { + if (process != null) + { + process.WaitForExit(); + return process.ExitCode == 0; + } + } + } + catch + { + // ignored + } + + return false; + } + + /// protected override void Load(ContainerBuilder builder) { - // TODO: Check for MODI - builder - .RegisterType() - .As() - .SingleInstance(); - + if (HasModi()) + { + builder + .RegisterType() + .As() + .SingleInstance(); + } base.Load(builder); } } diff --git a/src/Greenshot.Addon.OCR/packages.config b/src/Greenshot.Addon.OCR/packages.config index 7f4e15bf5..adcd693f3 100644 --- a/src/Greenshot.Addon.OCR/packages.config +++ b/src/Greenshot.Addon.OCR/packages.config @@ -6,14 +6,14 @@ - - - - - - - - + + + + + + + + diff --git a/src/Greenshot.Addon.Office/Destinations/WordDestination.cs b/src/Greenshot.Addon.Office/Destinations/WordDestination.cs index 7d77fdb7b..757561599 100644 --- a/src/Greenshot.Addon.Office/Destinations/WordDestination.cs +++ b/src/Greenshot.Addon.Office/Destinations/WordDestination.cs @@ -65,7 +65,7 @@ namespace Greenshot.Addon.Office.Destinations } } - public WordDestination(string wordCaption, + protected WordDestination(string wordCaption, ICoreConfiguration coreConfiguration, IGreenshotLanguage greenshotLanguage) : this(coreConfiguration, greenshotLanguage) { diff --git a/src/Greenshot.Addon.Office/Greenshot.Addon.Office.csproj b/src/Greenshot.Addon.Office/Greenshot.Addon.Office.csproj index 275e2c1c7..2382a4191 100644 --- a/src/Greenshot.Addon.Office/Greenshot.Addon.Office.csproj +++ b/src/Greenshot.Addon.Office/Greenshot.Addon.Office.csproj @@ -44,29 +44,29 @@ ..\packages\Costura.Fody.2.0.1\lib\net452\Costura.dll - - ..\packages\Dapplo.Addons.1.0.40-beta\lib\net45\Dapplo.Addons.dll + + ..\packages\Dapplo.Addons.1.0.44\lib\net45\Dapplo.Addons.dll - - ..\packages\Dapplo.Addons.Bootstrapper.1.0.40-beta\lib\net45\Dapplo.Addons.Bootstrapper.dll + + ..\packages\Dapplo.Addons.Bootstrapper.1.0.44\lib\net45\Dapplo.Addons.Bootstrapper.dll - - ..\packages\Dapplo.CaliburnMicro.1.0.41-beta\lib\net45\Dapplo.CaliburnMicro.dll + + ..\packages\Dapplo.CaliburnMicro.1.0.42\lib\net45\Dapplo.CaliburnMicro.dll - - ..\packages\Dapplo.CaliburnMicro.Configuration.1.0.41-beta\lib\net45\Dapplo.CaliburnMicro.Configuration.dll + + ..\packages\Dapplo.CaliburnMicro.Configuration.1.0.42\lib\net45\Dapplo.CaliburnMicro.Configuration.dll - - ..\packages\Dapplo.CaliburnMicro.Dapp.1.0.41-beta\lib\net45\Dapplo.CaliburnMicro.Dapp.dll + + ..\packages\Dapplo.CaliburnMicro.Dapp.1.0.42\lib\net45\Dapplo.CaliburnMicro.Dapp.dll - - ..\packages\Dapplo.CaliburnMicro.Menu.1.0.41-beta\lib\net45\Dapplo.CaliburnMicro.Menu.dll + + ..\packages\Dapplo.CaliburnMicro.Menu.1.0.42\lib\net45\Dapplo.CaliburnMicro.Menu.dll - - ..\packages\Dapplo.CaliburnMicro.Security.1.0.41-beta\lib\net45\Dapplo.CaliburnMicro.Security.dll + + ..\packages\Dapplo.CaliburnMicro.Security.1.0.42\lib\net45\Dapplo.CaliburnMicro.Security.dll - - ..\packages\Dapplo.CaliburnMicro.Translations.1.0.41-beta\lib\net45\Dapplo.CaliburnMicro.Translations.dll + + ..\packages\Dapplo.CaliburnMicro.Translations.1.0.42\lib\net45\Dapplo.CaliburnMicro.Translations.dll ..\packages\Dapplo.Ini.0.5.28\lib\net45\Dapplo.Ini.dll @@ -211,6 +211,7 @@ + diff --git a/src/Greenshot.Addon.Office/OfficeAddonModule.cs b/src/Greenshot.Addon.Office/OfficeAddonModule.cs new file mode 100644 index 000000000..89efa7e56 --- /dev/null +++ b/src/Greenshot.Addon.Office/OfficeAddonModule.cs @@ -0,0 +1,70 @@ +#region Greenshot GNU General Public License + +// Greenshot - a free and open source screenshot tool +// Copyright (C) 2007-2018 Thomas Braun, Jens Klingen, Robin Krom +// +// For more information see: http://getgreenshot.org/ +// The Greenshot project is hosted on GitHub https://github.com/greenshot/greenshot +// +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 1 of the License, or +// (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this program. If not, see . + +#endregion + +using Autofac; +using Dapplo.Addons; +using Dapplo.CaliburnMicro.Configuration; +using Greenshot.Addon.Office.Destinations; +using Greenshot.Addon.Office.ViewModels; +using Greenshot.Addons.Components; + +namespace Greenshot.Addon.Office +{ + /// + public class OfficeAddonModule : AddonModule + { + protected override void Load(ContainerBuilder builder) + { + builder + .RegisterType() + .As() + .SingleInstance(); + + builder + .RegisterType() + .As() + .SingleInstance(); + + builder + .RegisterType() + .As() + .SingleInstance(); + + builder + .RegisterType() + .As() + .SingleInstance(); + + builder + .RegisterType() + .As() + .SingleInstance(); + builder + .RegisterType() + .As() + .SingleInstance(); + + base.Load(builder); + } + } +} diff --git a/src/Greenshot.Addon.Office/packages.config b/src/Greenshot.Addon.Office/packages.config index 703145783..27870aa6d 100644 --- a/src/Greenshot.Addon.Office/packages.config +++ b/src/Greenshot.Addon.Office/packages.config @@ -7,14 +7,14 @@ - - - - - - - - + + + + + + + + diff --git a/src/Greenshot.Addon.OneDrive/Greenshot.Addon.OneDrive.csproj b/src/Greenshot.Addon.OneDrive/Greenshot.Addon.OneDrive.csproj index 6d02607f4..a24cad2e5 100644 --- a/src/Greenshot.Addon.OneDrive/Greenshot.Addon.OneDrive.csproj +++ b/src/Greenshot.Addon.OneDrive/Greenshot.Addon.OneDrive.csproj @@ -57,29 +57,29 @@ ..\packages\ControlzEx.3.0.2.4\lib\net45\ControlzEx.dll - - ..\packages\Dapplo.Addons.1.0.40-beta\lib\net45\Dapplo.Addons.dll + + ..\packages\Dapplo.Addons.1.0.44\lib\net45\Dapplo.Addons.dll - - ..\packages\Dapplo.Addons.Bootstrapper.1.0.40-beta\lib\net45\Dapplo.Addons.Bootstrapper.dll + + ..\packages\Dapplo.Addons.Bootstrapper.1.0.44\lib\net45\Dapplo.Addons.Bootstrapper.dll - - ..\packages\Dapplo.CaliburnMicro.1.0.41-beta\lib\net45\Dapplo.CaliburnMicro.dll + + ..\packages\Dapplo.CaliburnMicro.1.0.42\lib\net45\Dapplo.CaliburnMicro.dll - - ..\packages\Dapplo.CaliburnMicro.Configuration.1.0.41-beta\lib\net45\Dapplo.CaliburnMicro.Configuration.dll + + ..\packages\Dapplo.CaliburnMicro.Configuration.1.0.42\lib\net45\Dapplo.CaliburnMicro.Configuration.dll - - ..\packages\Dapplo.CaliburnMicro.Dapp.1.0.41-beta\lib\net45\Dapplo.CaliburnMicro.Dapp.dll + + ..\packages\Dapplo.CaliburnMicro.Dapp.1.0.42\lib\net45\Dapplo.CaliburnMicro.Dapp.dll - - ..\packages\Dapplo.CaliburnMicro.Menu.1.0.41-beta\lib\net45\Dapplo.CaliburnMicro.Menu.dll + + ..\packages\Dapplo.CaliburnMicro.Menu.1.0.42\lib\net45\Dapplo.CaliburnMicro.Menu.dll - - ..\packages\Dapplo.CaliburnMicro.Security.1.0.41-beta\lib\net45\Dapplo.CaliburnMicro.Security.dll + + ..\packages\Dapplo.CaliburnMicro.Security.1.0.42\lib\net45\Dapplo.CaliburnMicro.Security.dll - - ..\packages\Dapplo.CaliburnMicro.Translations.1.0.41-beta\lib\net45\Dapplo.CaliburnMicro.Translations.dll + + ..\packages\Dapplo.CaliburnMicro.Translations.1.0.42\lib\net45\Dapplo.CaliburnMicro.Translations.dll ..\packages\Dapplo.HttpExtensions.0.8.35\lib\net45\Dapplo.HttpExtensions.dll @@ -178,7 +178,7 @@ - + diff --git a/src/Greenshot.Addon.OneDrive/OneDriveAutofacModule.cs b/src/Greenshot.Addon.OneDrive/OneDriveAddonModule.cs similarity index 94% rename from src/Greenshot.Addon.OneDrive/OneDriveAutofacModule.cs rename to src/Greenshot.Addon.OneDrive/OneDriveAddonModule.cs index 05809d401..b80313c12 100644 --- a/src/Greenshot.Addon.OneDrive/OneDriveAutofacModule.cs +++ b/src/Greenshot.Addon.OneDrive/OneDriveAddonModule.cs @@ -30,7 +30,7 @@ using Greenshot.Addons.Components; namespace Greenshot.Addon.OneDrive { /// - public class OneDriveAutofacModule : AddonModule + public class OneDriveAddonModule : AddonModule { protected override void Load(ContainerBuilder builder) { diff --git a/src/Greenshot.Addon.OneDrive/packages.config b/src/Greenshot.Addon.OneDrive/packages.config index ca3a14e5e..bfd889dc7 100644 --- a/src/Greenshot.Addon.OneDrive/packages.config +++ b/src/Greenshot.Addon.OneDrive/packages.config @@ -7,14 +7,14 @@ - - - - - - - - + + + + + + + + diff --git a/src/Greenshot.Addon.Photobucket/Greenshot.Addon.Photobucket.csproj b/src/Greenshot.Addon.Photobucket/Greenshot.Addon.Photobucket.csproj index f458afe62..6d80e800c 100644 --- a/src/Greenshot.Addon.Photobucket/Greenshot.Addon.Photobucket.csproj +++ b/src/Greenshot.Addon.Photobucket/Greenshot.Addon.Photobucket.csproj @@ -58,29 +58,29 @@ ..\packages\CommonServiceLocator.2.0.3\lib\net45\CommonServiceLocator.dll - - ..\packages\Dapplo.Addons.1.0.40-beta\lib\net45\Dapplo.Addons.dll + + ..\packages\Dapplo.Addons.1.0.44\lib\net45\Dapplo.Addons.dll - - ..\packages\Dapplo.Addons.Bootstrapper.1.0.40-beta\lib\net45\Dapplo.Addons.Bootstrapper.dll + + ..\packages\Dapplo.Addons.Bootstrapper.1.0.44\lib\net45\Dapplo.Addons.Bootstrapper.dll - - ..\packages\Dapplo.CaliburnMicro.1.0.41-beta\lib\net45\Dapplo.CaliburnMicro.dll + + ..\packages\Dapplo.CaliburnMicro.1.0.42\lib\net45\Dapplo.CaliburnMicro.dll - - ..\packages\Dapplo.CaliburnMicro.Configuration.1.0.41-beta\lib\net45\Dapplo.CaliburnMicro.Configuration.dll + + ..\packages\Dapplo.CaliburnMicro.Configuration.1.0.42\lib\net45\Dapplo.CaliburnMicro.Configuration.dll - - ..\packages\Dapplo.CaliburnMicro.Dapp.1.0.41-beta\lib\net45\Dapplo.CaliburnMicro.Dapp.dll + + ..\packages\Dapplo.CaliburnMicro.Dapp.1.0.42\lib\net45\Dapplo.CaliburnMicro.Dapp.dll - - ..\packages\Dapplo.CaliburnMicro.Menu.1.0.41-beta\lib\net45\Dapplo.CaliburnMicro.Menu.dll + + ..\packages\Dapplo.CaliburnMicro.Menu.1.0.42\lib\net45\Dapplo.CaliburnMicro.Menu.dll - - ..\packages\Dapplo.CaliburnMicro.Security.1.0.41-beta\lib\net45\Dapplo.CaliburnMicro.Security.dll + + ..\packages\Dapplo.CaliburnMicro.Security.1.0.42\lib\net45\Dapplo.CaliburnMicro.Security.dll - - ..\packages\Dapplo.CaliburnMicro.Translations.1.0.41-beta\lib\net45\Dapplo.CaliburnMicro.Translations.dll + + ..\packages\Dapplo.CaliburnMicro.Translations.1.0.42\lib\net45\Dapplo.CaliburnMicro.Translations.dll ..\packages\Dapplo.HttpExtensions.0.8.35\lib\net45\Dapplo.HttpExtensions.dll @@ -166,7 +166,7 @@ - + diff --git a/src/Greenshot.Addon.Photobucket/PhotobucketAutofacModule.cs b/src/Greenshot.Addon.Photobucket/PhotobucketAddonModule.cs similarity index 93% rename from src/Greenshot.Addon.Photobucket/PhotobucketAutofacModule.cs rename to src/Greenshot.Addon.Photobucket/PhotobucketAddonModule.cs index 40c978757..b0a4120b4 100644 --- a/src/Greenshot.Addon.Photobucket/PhotobucketAutofacModule.cs +++ b/src/Greenshot.Addon.Photobucket/PhotobucketAddonModule.cs @@ -30,7 +30,7 @@ using Greenshot.Addons.Components; namespace Greenshot.Addon.Photobucket { /// - public class PhotobucketAutofacModule : AddonModule + public class PhotobucketAddonModule : AddonModule { protected override void Load(ContainerBuilder builder) { diff --git a/src/Greenshot.Addon.Photobucket/packages.config b/src/Greenshot.Addon.Photobucket/packages.config index a634f0890..4a314dcfd 100644 --- a/src/Greenshot.Addon.Photobucket/packages.config +++ b/src/Greenshot.Addon.Photobucket/packages.config @@ -6,14 +6,14 @@ - - - - - - - - + + + + + + + + diff --git a/src/Greenshot.Addon.Tfs/Greenshot.Addon.Tfs.csproj b/src/Greenshot.Addon.Tfs/Greenshot.Addon.Tfs.csproj index 59cb6a19d..0ce8d107d 100644 --- a/src/Greenshot.Addon.Tfs/Greenshot.Addon.Tfs.csproj +++ b/src/Greenshot.Addon.Tfs/Greenshot.Addon.Tfs.csproj @@ -57,29 +57,29 @@ ..\packages\ControlzEx.3.0.2.4\lib\net45\ControlzEx.dll - - ..\packages\Dapplo.Addons.1.0.40-beta\lib\net45\Dapplo.Addons.dll + + ..\packages\Dapplo.Addons.1.0.44\lib\net45\Dapplo.Addons.dll - - ..\packages\Dapplo.Addons.Bootstrapper.1.0.40-beta\lib\net45\Dapplo.Addons.Bootstrapper.dll + + ..\packages\Dapplo.Addons.Bootstrapper.1.0.44\lib\net45\Dapplo.Addons.Bootstrapper.dll - - ..\packages\Dapplo.CaliburnMicro.1.0.41-beta\lib\net45\Dapplo.CaliburnMicro.dll + + ..\packages\Dapplo.CaliburnMicro.1.0.42\lib\net45\Dapplo.CaliburnMicro.dll - - ..\packages\Dapplo.CaliburnMicro.Configuration.1.0.41-beta\lib\net45\Dapplo.CaliburnMicro.Configuration.dll + + ..\packages\Dapplo.CaliburnMicro.Configuration.1.0.42\lib\net45\Dapplo.CaliburnMicro.Configuration.dll - - ..\packages\Dapplo.CaliburnMicro.Dapp.1.0.41-beta\lib\net45\Dapplo.CaliburnMicro.Dapp.dll + + ..\packages\Dapplo.CaliburnMicro.Dapp.1.0.42\lib\net45\Dapplo.CaliburnMicro.Dapp.dll - - ..\packages\Dapplo.CaliburnMicro.Menu.1.0.41-beta\lib\net45\Dapplo.CaliburnMicro.Menu.dll + + ..\packages\Dapplo.CaliburnMicro.Menu.1.0.42\lib\net45\Dapplo.CaliburnMicro.Menu.dll - - ..\packages\Dapplo.CaliburnMicro.Security.1.0.41-beta\lib\net45\Dapplo.CaliburnMicro.Security.dll + + ..\packages\Dapplo.CaliburnMicro.Security.1.0.42\lib\net45\Dapplo.CaliburnMicro.Security.dll - - ..\packages\Dapplo.CaliburnMicro.Translations.1.0.41-beta\lib\net45\Dapplo.CaliburnMicro.Translations.dll + + ..\packages\Dapplo.CaliburnMicro.Translations.1.0.42\lib\net45\Dapplo.CaliburnMicro.Translations.dll ..\packages\Dapplo.HttpExtensions.0.8.35\lib\net45\Dapplo.HttpExtensions.dll @@ -180,7 +180,7 @@ - + diff --git a/src/Greenshot.Addon.Tfs/TfsAutofacModule.cs b/src/Greenshot.Addon.Tfs/TfsAddonModule.cs similarity index 94% rename from src/Greenshot.Addon.Tfs/TfsAutofacModule.cs rename to src/Greenshot.Addon.Tfs/TfsAddonModule.cs index dc725ce70..6bb11363f 100644 --- a/src/Greenshot.Addon.Tfs/TfsAutofacModule.cs +++ b/src/Greenshot.Addon.Tfs/TfsAddonModule.cs @@ -30,7 +30,7 @@ using Greenshot.Addons.Components; namespace Greenshot.Addon.Tfs { /// - public class TfsAutofacModule : AddonModule + public class TfsAddonModule : AddonModule { protected override void Load(ContainerBuilder builder) { diff --git a/src/Greenshot.Addon.Tfs/packages.config b/src/Greenshot.Addon.Tfs/packages.config index c959ae980..536926bf5 100644 --- a/src/Greenshot.Addon.Tfs/packages.config +++ b/src/Greenshot.Addon.Tfs/packages.config @@ -7,14 +7,14 @@ - - - - - - - - + + + + + + + + diff --git a/src/Greenshot.Addon.Win10/Greenshot.Addon.Win10.csproj b/src/Greenshot.Addon.Win10/Greenshot.Addon.Win10.csproj index 7fccb23e3..ad1395812 100644 --- a/src/Greenshot.Addon.Win10/Greenshot.Addon.Win10.csproj +++ b/src/Greenshot.Addon.Win10/Greenshot.Addon.Win10.csproj @@ -54,17 +54,17 @@ ..\packages\CommonServiceLocator.2.0.3\lib\net45\CommonServiceLocator.dll - - ..\packages\Dapplo.Addons.1.0.38-beta\lib\net45\Dapplo.Addons.dll + + ..\packages\Dapplo.Addons.1.0.44\lib\net45\Dapplo.Addons.dll - - ..\packages\Dapplo.Addons.Bootstrapper.1.0.38-beta\lib\net45\Dapplo.Addons.Bootstrapper.dll + + ..\packages\Dapplo.Addons.Bootstrapper.1.0.44\lib\net45\Dapplo.Addons.Bootstrapper.dll - - ..\packages\Dapplo.CaliburnMicro.1.0.38-beta\lib\net45\Dapplo.CaliburnMicro.dll + + ..\packages\Dapplo.CaliburnMicro.1.0.42\lib\net45\Dapplo.CaliburnMicro.dll - - ..\packages\Dapplo.CaliburnMicro.Translations.1.0.38-beta\lib\net45\Dapplo.CaliburnMicro.Translations.dll + + ..\packages\Dapplo.CaliburnMicro.Translations.1.0.42\lib\net45\Dapplo.CaliburnMicro.Translations.dll ..\packages\Dapplo.Ini.0.5.28\lib\net45\Dapplo.Ini.dll @@ -146,7 +146,7 @@ - + diff --git a/src/Greenshot.Addon.Win10/packages.config b/src/Greenshot.Addon.Win10/packages.config index 979bb9344..eb0650aeb 100644 --- a/src/Greenshot.Addon.Win10/packages.config +++ b/src/Greenshot.Addon.Win10/packages.config @@ -6,10 +6,10 @@ - - - - + + + + diff --git a/src/Greenshot.Addons/AddonsAutofacModule.cs b/src/Greenshot.Addons/AddonsModule.cs similarity index 93% rename from src/Greenshot.Addons/AddonsAutofacModule.cs rename to src/Greenshot.Addons/AddonsModule.cs index d1c6c4eb2..4f2653def 100644 --- a/src/Greenshot.Addons/AddonsAutofacModule.cs +++ b/src/Greenshot.Addons/AddonsModule.cs @@ -29,7 +29,7 @@ using Greenshot.Addons.ViewModels; namespace Greenshot.Addons { /// - public class AddonsAutofacModule : AddonModule + public class AddonsModule : AddonModule { protected override void Load(ContainerBuilder builder) { diff --git a/src/Greenshot.Addons/Controls/GreenshotComboBox.cs b/src/Greenshot.Addons/Controls/GreenshotComboBox.cs index a822464a8..4575a6a44 100644 --- a/src/Greenshot.Addons/Controls/GreenshotComboBox.cs +++ b/src/Greenshot.Addons/Controls/GreenshotComboBox.cs @@ -102,13 +102,12 @@ namespace Greenshot.Addons.Controls foreach (Enum enumValue in availableValues) { - var enumKey = enumTypeName + "." + enumValue; - if (!Language.HasKey(enumKey)) + if (!Language.HasKey(enumTypeName, enumValue)) { continue; } - var translation = Language.GetString(enumTypeName + "." + enumValue); + var translation = Language.GetString(enumTypeName,enumValue); if (translation.Equals(selectedValue)) { returnValue = enumValue; diff --git a/src/Greenshot.Addons/Controls/GreenshotForm.cs b/src/Greenshot.Addons/Controls/GreenshotForm.cs index e0ef9cd9f..1e9e9ad08 100644 --- a/src/Greenshot.Addons/Controls/GreenshotForm.cs +++ b/src/Greenshot.Addons/Controls/GreenshotForm.cs @@ -27,7 +27,6 @@ using System; using System.Collections.Generic; using System.ComponentModel; using System.ComponentModel.Design; -using System.IO; using System.Reflection; using System.Windows.Forms; using Dapplo.Ini; @@ -122,41 +121,6 @@ namespace Greenshot.Addons.Controls /// /// Code to initialize the language etc during design time /// - protected void InitializeForDesigner() - { - if (DesignMode) - { - _designTimeControls = new Dictionary(); - _designTimeToolStripItems = new Dictionary(); - try - { - var typeResService = GetService(typeof(ITypeResolutionService)) as ITypeResolutionService; - - // Add a hard-path if you are using SharpDevelop - // Language.AddLanguageFilePath(@"C:\Greenshot\Greenshot\Languages"); - - // this "type" - var currentAssembly = GetType().Assembly; - if (typeResService != null) - { - var assemblyPath = typeResService.GetPathOfAssembly(currentAssembly.GetName()); - var assemblyDirectory = Path.GetDirectoryName(assemblyPath); - if (assemblyDirectory != null && !Language.AddLanguageFilePath(Path.Combine(assemblyDirectory, @"..\..\Greenshot\Languages\"))) - { - Language.AddLanguageFilePath(Path.Combine(assemblyDirectory, @"..\..\..\Greenshot\Languages\")); - } - if (assemblyDirectory != null && !Language.AddLanguageFilePath(Path.Combine(assemblyDirectory, @"..\..\Languages\"))) - { - Language.AddLanguageFilePath(Path.Combine(assemblyDirectory, @"..\..\..\Languages\")); - } - } - } - catch (Exception ex) - { - MessageBox.Show(ex.Message); - } - } - } /// /// This override is only for the design-time of the form @@ -196,13 +160,6 @@ namespace Greenshot.Addons.Controls FillFields(); base.OnLoad(e); } - else - { - Log.Info().WriteLine("OnLoad called from designer."); - InitializeForDesigner(); - base.OnLoad(e); - ApplyLanguage(); - } } /// diff --git a/src/Greenshot.Addons/Core/ClipboardHelper.cs b/src/Greenshot.Addons/Core/ClipboardHelper.cs index 74854c1d3..de20b3f7c 100644 --- a/src/Greenshot.Addons/Core/ClipboardHelper.cs +++ b/src/Greenshot.Addons/Core/ClipboardHelper.cs @@ -194,7 +194,7 @@ EndSelection:<<<<<<<4 } else { - messageText = Language.GetString("clipboard_error"); + messageText = Language.GetString("Core","clipboard_error"); } Log.Error().WriteLine(clipboardSetException, messageText); } @@ -227,7 +227,7 @@ EndSelection:<<<<<<<4 } else { - messageText = Language.GetString("clipboard_error"); + messageText = Language.GetString("Core", "clipboard_error"); } Log.Error().WriteLine(ee, messageText); } diff --git a/src/Greenshot.Addons/Core/Language.cs b/src/Greenshot.Addons/Core/Language.cs index 3cc25764f..a9e0bce23 100644 --- a/src/Greenshot.Addons/Core/Language.cs +++ b/src/Greenshot.Addons/Core/Language.cs @@ -25,13 +25,8 @@ using System; using System.Collections.Generic; -using System.IO; -using System.Reflection; -using System.Text.RegularExpressions; -using System.Xml; -using Dapplo.Ini; -using Dapplo.Log; -using Microsoft.Win32; +using System.Linq; +using Dapplo.Language; #endregion @@ -45,545 +40,31 @@ namespace Greenshot.Addons.Core /// public class Language { - private const string DefaultLanguage = "en-US"; - private const string HelpFilenamePattern = @"help-*.html"; - private const string LanguageFilenamePattern = @"language*.xml"; - private const string LanguageGroupsKey = @"SYSTEM\CurrentControlSet\Control\Nls\Language Groups"; - private static readonly LogSource Log = new LogSource(); - private static readonly IList LanguagePaths = new List(); - private static readonly IDictionary> LanguageFiles = new Dictionary>(); - private static readonly IDictionary HelpFiles = new Dictionary(); - private static readonly Regex PrefixRegexp = new Regex(@"language_([a-zA-Z0-9]+).*"); - private static readonly Regex IetfCleanRegexp = new Regex(@"[^a-zA-Z]+"); - private static readonly Regex IetfRegexp = new Regex(@"^.*([a-zA-Z]{2,3}-[a-zA-Z]{1,2})\.xml$"); - private static readonly IList UnsupportedLanguageGroups = new List(); - private static readonly IDictionary Resources = new Dictionary(); - private static string _currentLanguage; - - /// - /// Static initializer for the language code - /// - static Language() - { - try - { - var location = string.IsNullOrEmpty(Assembly.GetExecutingAssembly().Location) ? new Uri(Assembly.GetExecutingAssembly().CodeBase).LocalPath : Assembly.GetExecutingAssembly().Location; - - var applicationFolder = Path.GetDirectoryName(location); - - // PAF Path - if (applicationFolder != null) - { - AddPath(Path.Combine(applicationFolder, @"App\Greenshot\Languages")); - } - // Application data path - var applicationDataFolder = Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData); - AddPath(Path.Combine(applicationDataFolder, @"Greenshot\Languages\")); - - // Startup path - if (applicationFolder != null) - { - AddPath(Path.Combine(applicationFolder, @"Languages")); - } - } - catch (Exception pathException) - { - Log.Error().WriteLine(pathException); - } - - try - { - using (var languageGroupsKey = Registry.LocalMachine.OpenSubKey(LanguageGroupsKey, false)) - { - if (languageGroupsKey != null) - { - var groups = languageGroupsKey.GetValueNames(); - foreach (var group in groups) - { - var groupValue = (string) languageGroupsKey.GetValue(group); - var isGroupNotInstalled = "0".Equals(groupValue); - if (isGroupNotInstalled) - { - UnsupportedLanguageGroups.Add(group.ToLower()); - } - } - } - } - } - catch (Exception e) - { - Log.Warn().WriteLine(e, "Couldn't read the installed language groups."); - } - - var coreConfig = IniConfig.Current.Get(); - ScanFiles(); - if (!string.IsNullOrEmpty(coreConfig.Language)) - { - CurrentLanguage = coreConfig.Language; - if (CurrentLanguage != null && CurrentLanguage != coreConfig.Language) - { - coreConfig.Language = CurrentLanguage; - } - } - - if (CurrentLanguage == null) - { - Log.Warn().WriteLine("Couldn't set language from configuration, changing to default. Installation problem?"); - CurrentLanguage = DefaultLanguage; - if (CurrentLanguage != null) - { - coreConfig.Language = CurrentLanguage; - } - } - - if (CurrentLanguage == null) - { - Log.Error().WriteLine(null, "Couldn't set language, installation problem?"); - } - } - + private static LanguageLoader languageLoader = LanguageLoader.Current; /// /// Get or set the current language /// public static string CurrentLanguage { - get { return _currentLanguage; } - set - { - var ietf = FindBestIETFMatch(value); - if (!LanguageFiles.ContainsKey(ietf)) - { - Log.Warn().WriteLine("No match for language {0} found!", ietf); - } - else - { - if (_currentLanguage == null || !_currentLanguage.Equals(ietf)) - { - _currentLanguage = ietf; - Reload(); - if (LanguageChanged == null) - { - return; - } - try - { - LanguageChanged(null, null); - } - catch - { - // ignored - } - return; - } - } - Log.Debug().WriteLine("CurrentLanguage not changed!"); - } + get => languageLoader.CurrentLanguage; + set { languageLoader.ChangeLanguageAsync(value); } } /// /// Return a list of all the supported languages /// - public static IList SupportedLanguages - { - get - { - IList languages = new List(); - // Loop over all languages with all the files in there - foreach (var langs in LanguageFiles.Values) - { - // Loop over all the files for a language - foreach (var langFile in langs) - { - // Only take the ones without prefix, these are the "base" language files - if (langFile.Prefix == null) - { - languages.Add(langFile); - break; - } - } - } - return languages; - } - } + public static IDictionary SupportedLanguages => languageLoader.AvailableLanguages; + /// - /// Return the path to the help-file + /// Check if a resource with prefix.key exists /// - public static string HelpFilePath + /// + /// + /// true if available + public static bool HasKey(string prefix, string key) { - get - { - if (HelpFiles.ContainsKey(_currentLanguage)) - { - return HelpFiles[_currentLanguage]; - } - return HelpFiles[DefaultLanguage]; - } - } - - public static event LanguageChangedHandler LanguageChanged; - - /// - /// Internal method to add a path to the paths that will be scanned for language files! - /// - /// - /// true if the path exists and is added - private static bool AddPath(string path) - { - if (!LanguagePaths.Contains(path)) - { - if (Directory.Exists(path)) - { - Log.Debug().WriteLine("Adding language path {0}", path); - LanguagePaths.Add(path); - return true; - } - Log.Info().WriteLine("Not adding non existing language path {0}", path); - } - return false; - } - - /// - /// Add a new path to the paths that will be scanned for language files! - /// - /// - /// true if the path exists and is added - public static bool AddLanguageFilePath(string path) - { - if (!LanguagePaths.Contains(path)) - { - Log.Debug().WriteLine("New language path {0}", path); - if (AddPath(path)) - { - ScanFiles(); - Reload(); - } - else - { - return false; - } - } - return true; - } - - /// - /// Load the files for the specified ietf - /// - /// - private static void LoadFiles(string ietf) - { - ietf = ReformatIETF(ietf); - if (!LanguageFiles.ContainsKey(ietf)) - { - Log.Error().WriteLine("No language {0} available.", ietf); - return; - } - var filesToLoad = LanguageFiles[ietf]; - foreach (var fileToLoad in filesToLoad) - { - LoadResources(fileToLoad); - } - } - - /// - /// Load the language resources from the scanned files - /// - private static void Reload() - { - Resources.Clear(); - LoadFiles(DefaultLanguage); - if (_currentLanguage != null && !_currentLanguage.Equals(DefaultLanguage)) - { - LoadFiles(_currentLanguage); - } - } - - /// - /// Try to find the best match for the supplied IETF - /// - /// - /// IETF - private static string FindBestIETFMatch(string inputIETF) - { - var returnIETF = inputIETF; - if (string.IsNullOrEmpty(returnIETF)) - { - returnIETF = DefaultLanguage; - } - returnIETF = ReformatIETF(returnIETF); - if (!LanguageFiles.ContainsKey(returnIETF)) - { - Log.Warn().WriteLine("Unknown language {0}, trying best match!", returnIETF); - if (returnIETF.Length == 5) - { - returnIETF = returnIETF.Substring(0, 2); - } - foreach (var availableIETF in LanguageFiles.Keys) - { - if (availableIETF.StartsWith(returnIETF)) - { - Log.Info().WriteLine("Found language {0}, best match for {1}!", availableIETF, returnIETF); - returnIETF = availableIETF; - break; - } - } - } - return returnIETF; - } - - /// - /// This helper method clears all non alpha characters from the IETF, and does a reformatting. - /// This prevents problems with multiple formats or typos. - /// - /// string - /// - private static string ReformatIETF(string inputIETF) - { - if (string.IsNullOrEmpty(inputIETF)) - { - return null; - } - - string returnIETF = inputIETF.ToLower(); - returnIETF = IetfCleanRegexp.Replace(returnIETF, ""); - if (returnIETF.Length == 4) - { - returnIETF = returnIETF.Substring(0, 2) + "-" + returnIETF.Substring(2, 2).ToUpper(); - } - return returnIETF; - } - - /// - /// Load the resources from the language file - /// - /// File to load from - private static void LoadResources(LanguageFile languageFile) - { - Log.Info().WriteLine("Loading language file {0}", languageFile.Filepath); - try - { - var xmlDocument = new XmlDocument(); - xmlDocument.Load(languageFile.Filepath); - var resourceNodes = xmlDocument.GetElementsByTagName("resource"); - foreach (XmlNode resourceNode in resourceNodes) - { - var key = resourceNode.Attributes["name"].Value; - if (!string.IsNullOrEmpty(languageFile.Prefix)) - { - key = languageFile.Prefix + "." + key; - } - var text = resourceNode.InnerText; - if (!string.IsNullOrEmpty(text)) - { - text = text.Trim(); - } - if (!Resources.ContainsKey(key)) - { - Resources.Add(key, text); - } - else - { - Resources[key] = text; - } - } - } - catch (Exception e) - { - Log.Error().WriteLine(e, "Could not load language file " + languageFile.Filepath); - } - } - - /// - /// Load the language file information - /// - /// - /// - private static LanguageFile LoadFileInfo(string languageFilePath) - { - try - { - var xmlDocument = new XmlDocument(); - xmlDocument.Load(languageFilePath); - var nodes = xmlDocument.GetElementsByTagName("language"); - if (nodes.Count <= 0) - { - throw new XmlException("Root element is missing"); - } - - var languageFile = new LanguageFile - { - Filepath = languageFilePath - }; - var node = nodes.Item(0); - if (node?.Attributes == null) - { - return languageFile; - } - - languageFile.Description = node.Attributes["description"]?.Value; - languageFile.Ietf = ReformatIETF(node.Attributes["ietf"]?.Value); - if (node.Attributes["version"]?.Value != null) - { - languageFile.Version = new Version(node.Attributes["version"].Value); - } - languageFile.Prefix = node.Attributes["prefix"]?.Value.ToLower(); - languageFile.LanguageGroup = node.Attributes["languagegroup"]?.Value.ToLower(); - return languageFile; - } - catch (Exception e) - { - Log.Error().WriteLine(e, "Could not load language file " + languageFilePath); - } - return null; - } - - /// - /// Scan the files in all directories - /// - private static void ScanFiles() - { - LanguageFiles.Clear(); - HelpFiles.Clear(); - foreach (var languagePath in LanguagePaths) - { - if (!Directory.Exists(languagePath)) - { - Log.Info().WriteLine("Skipping non existing language path {0}", languagePath); - continue; - } - Log.Info().WriteLine("Searching language directory '{0}' for language files with pattern '{1}'", languagePath, LanguageFilenamePattern); - try - { - foreach (var languageFilepath in Directory.GetFiles(languagePath, LanguageFilenamePattern, SearchOption.AllDirectories)) - { - //Log.Debug().WriteLine("Found language file: {0}", languageFilepath); - var languageFile = LoadFileInfo(languageFilepath); - if (languageFile == null) - { - continue; - } - if (string.IsNullOrEmpty(languageFile.Ietf)) - { - Log.Warn().WriteLine("Fixing missing ietf in language-file {0}", languageFilepath); - var languageFilename = Path.GetFileName(languageFilepath); - if (IetfRegexp.IsMatch(languageFilename)) - { - var replacementIETF = IetfRegexp.Replace(languageFilename, "$1"); - languageFile.Ietf = ReformatIETF(replacementIETF); - Log.Info().WriteLine("Fixed IETF to {0}", languageFile.Ietf); - } - else - { - Log.Error().WriteLine("Missing ietf , no recover possible... skipping language-file {0}!", languageFilepath); - continue; - } - } - - // Check if we can display the file - if (!string.IsNullOrEmpty(languageFile.LanguageGroup) && UnsupportedLanguageGroups.Contains(languageFile.LanguageGroup)) - { - Log.Info().WriteLine("Skipping unsuported (not able to display) language {0} from file {1}", languageFile.Description, languageFilepath); - continue; - } - - // build prefix, based on the filename, but only if it's not set in the file itself. - if (string.IsNullOrEmpty(languageFile.Prefix)) - { - var languageFilename = Path.GetFileNameWithoutExtension(languageFilepath); - if (PrefixRegexp.IsMatch(languageFilename)) - { - languageFile.Prefix = PrefixRegexp.Replace(languageFilename, "$1"); - if (!string.IsNullOrEmpty(languageFile.Prefix)) - { - languageFile.Prefix = languageFile.Prefix.Replace("plugin", "").ToLower(); - } - } - } - List currentFiles = null; - if (LanguageFiles.ContainsKey(languageFile.Ietf)) - { - currentFiles = LanguageFiles[languageFile.Ietf]; - var needToAdd = true; - var deleteList = new List(); - foreach (var compareWithLangfile in currentFiles) - { - if ((languageFile.Prefix != null || compareWithLangfile.Prefix != null) && - (languageFile.Prefix == null || - !languageFile.Prefix.Equals(compareWithLangfile.Prefix))) - { - continue; - } - - if (compareWithLangfile.Version == null || languageFile.Version == null) - { - continue; - } - if (compareWithLangfile.Version > languageFile.Version) - { - Log.Warn().WriteLine("Skipping {0}:{1}:{2} as {3}:{4}:{5} is newer", languageFile.Filepath, languageFile.Prefix, languageFile.Version, compareWithLangfile.Filepath, - compareWithLangfile.Prefix, compareWithLangfile.Version); - needToAdd = false; - break; - } - Log.Warn().WriteLine("Found {0}:{1}:{2} and deleting {3}:{4}:{5}", languageFile.Filepath, languageFile.Prefix, languageFile.Version, compareWithLangfile.Filepath, - compareWithLangfile.Prefix, compareWithLangfile.Version); - deleteList.Add(compareWithLangfile); - } - if (needToAdd) - { - foreach (var deleteFile in deleteList) - { - currentFiles.Remove(deleteFile); - } - Log.Info().WriteLine("Added language definition {0} from: {1}", languageFile.Description, languageFile.Filepath); - currentFiles.Add(languageFile); - } - } - else - { - currentFiles = new List {languageFile}; - LanguageFiles.Add(languageFile.Ietf, currentFiles); - Log.Info().WriteLine("Added language definition {0} from: {1}", languageFile.Description, languageFile.Filepath); - } - } - } - catch (DirectoryNotFoundException) - { - Log.Info().WriteLine("Non existing language directory: {0}", languagePath); - } - catch (Exception e) - { - Log.Error().WriteLine(e, "Error trying for read directory " + languagePath); - } - - // Now find the help files - Log.Info().WriteLine("Searching language directory '{0}' for help files with pattern '{1}'", languagePath, HelpFilenamePattern); - try - { - foreach (var helpFilepath in Directory.GetFiles(languagePath, HelpFilenamePattern, SearchOption.AllDirectories)) - { - Log.Debug().WriteLine("Found help file: {0}", helpFilepath); - var helpFilename = Path.GetFileName(helpFilepath); - var ietf = ReformatIETF(helpFilename.Replace(".html", "").Replace("help-", "")); - if (!HelpFiles.ContainsKey(ietf)) - { - HelpFiles.Add(ietf, helpFilepath); - } - else - { - Log.Warn().WriteLine("skipping help file {0}, already a file with the same IETF {1} found!", helpFilepath, ietf); - } - } - } - catch (DirectoryNotFoundException) - { - Log.Info().WriteLine("Non existing language directory: {0}", languagePath); - } - catch (Exception e) - { - Log.Error().WriteLine(e, "Error trying for read directory " + languagePath); - } - } + return languageLoader[prefix].Keys().Contains(key); } /// @@ -594,61 +75,18 @@ namespace Greenshot.Addons.Core /// true if available public static bool HasKey(string prefix, Enum key) { - if (key == null) + return languageLoader[prefix].Keys().Contains(key.ToString()); + } + + public static string Translate(object key) + { + var typename = key.GetType().Name; + var enumKey = typename + "." + key; + if (HasKey("Core", enumKey)) { - return false; + return GetString("Core", enumKey); } - return HasKey(prefix + "." + key); - } - - /// - /// Check if a resource with key exists - /// - /// - /// true if available - public static bool HasKey(Enum key) - { - if (key == null) - { - return false; - } - return HasKey(key.ToString()); - } - - /// - /// Check if a resource with prefix.key exists - /// - /// - /// - /// true if available - public static bool HasKey(string prefix, string key) - { - return HasKey(prefix + "." + key); - } - - /// - /// Check if a resource with key exists - /// - /// - /// true if available - public static bool HasKey(string key) - { - if (key == null) - { - return false; - } - return Resources.ContainsKey(key); - } - - /// - /// TryGet method which combines HasKey & GetString - /// - /// - /// out string - /// - public static bool TryGetString(string key, out string languageString) - { - return Resources.TryGetValue(key, out languageString); + return key.ToString(); } /// @@ -657,48 +95,71 @@ namespace Greenshot.Addons.Core /// string with prefix /// string with key /// out string - /// + /// bool public static bool TryGetString(string prefix, string key, out string languageString) { - return Resources.TryGetValue(prefix + "." + key, out languageString); + if (languageLoader.Any(l => l.PrefixName() == prefix) && languageLoader[prefix].Keys().Contains(key)) + { + languageString = languageLoader[prefix][key]; + return true; + } + + languageString = null; + return false; } /// /// TryGet method which combines HasKey & GetString /// - /// string with prefix - /// Enum with key + /// string with key /// out string - /// - public static bool TryGetString(string prefix, Enum key, out string languageString) + /// bool + public static bool TryGetString(string key, out string languageString) { - return Resources.TryGetValue(prefix + "." + key, out languageString); + return TryGetString("Core", key, out languageString); } - - public static string Translate(object key) + /// + /// Get the resource for prefix.key + /// + /// + /// + /// resource or a "string ###prefix.key### not found" + public static string GetString(string prefix, string key) { - var typename = key.GetType().Name; - var enumKey = typename + "." + key; - if (HasKey(enumKey)) + if (key == null) { - return GetString(enumKey); + return null; } - return key.ToString(); + return languageLoader[prefix][key]; } /// /// Get the resource for key /// /// - /// resource or a "string ###key### not found" + /// resource or a "string ###prefix.key### not found" + public static string GetString(string key) + { + if (key == null) + { + return null; + } + return languageLoader["Core"][key]; + } + + /// + /// Get the resource for key + /// + /// Enum + /// resource or a "string ###prefix.key### not found" public static string GetString(Enum key) { if (key == null) { return null; } - return GetString(key.ToString()); + return languageLoader["Core"][key.ToString()]; } /// @@ -713,37 +174,7 @@ namespace Greenshot.Addons.Core { return null; } - return GetString(prefix + "." + key); - } - - /// - /// Get the resource for prefix.key - /// - /// - /// - /// resource or a "string ###prefix.key### not found" - public static string GetString(string prefix, string key) - { - return GetString(prefix + "." + key); - } - - /// - /// Get the resource for key - /// - /// - /// resource or a "string ###key### not found" - public static string GetString(string key) - { - if (key == null) - { - return null; - } - - if (!Resources.TryGetValue(key, out var returnValue)) - { - return "string ###" + key + "### not found"; - } - return returnValue; + return GetString(prefix, key.ToString()); } /// @@ -778,7 +209,12 @@ namespace Greenshot.Addons.Core /// formatted resource or a "string ###prefix.key### not found" public static string GetFormattedString(string prefix, string key, object param) { - return GetFormattedString(prefix + "." + key, param); + if (TryGetString(prefix, key, out var value)) + { + return string.Format(value, param); + } + + return $"string ###{prefix}.{key}### not found"; } /// @@ -789,83 +225,7 @@ namespace Greenshot.Addons.Core /// formatted resource or a "string ###key### not found" public static string GetFormattedString(string key, object param) { - if (!Resources.TryGetValue(key, out var returnValue)) - { - return "string ###" + key + "### not found"; - } - return string.Format(returnValue, param); - } - } - - /// - /// This class contains the information about a language file - /// - public class LanguageFile : IEquatable - { - public string Description { get; set; } - - public string Ietf { get; set; } - - public Version Version { get; set; } - - public string LanguageGroup { get; set; } - - public string Filepath { get; set; } - - public string Prefix { get; set; } - - /// - /// Overload equals so we can delete a entry from a collection - /// - /// - /// - public bool Equals(LanguageFile other) - { - if (Prefix != null) - { - if (other != null && !Prefix.Equals(other.Prefix)) - { - return false; - } - } - else if (other?.Prefix != null) - { - return false; - } - if (Ietf != null) - { - if (other != null && !Ietf.Equals(other.Ietf)) - { - return false; - } - } - else if (other?.Ietf != null) - { - return false; - } - if (Version != null) - { - if (other != null && !Version.Equals(other.Version)) - { - return false; - } - } - else if (other != null && other.Version != null) - { - return false; - } - if (Filepath != null) - { - if (other != null && !Filepath.Equals(other.Filepath)) - { - return false; - } - } - else if (other?.Filepath != null) - { - return false; - } - return true; + return GetFormattedString("Core", key, param); } } } \ No newline at end of file diff --git a/src/Greenshot.Addons/Greenshot.Addons.csproj b/src/Greenshot.Addons/Greenshot.Addons.csproj index 1586e65ef..284aeb809 100644 --- a/src/Greenshot.Addons/Greenshot.Addons.csproj +++ b/src/Greenshot.Addons/Greenshot.Addons.csproj @@ -40,29 +40,29 @@ ..\packages\CommonServiceLocator.2.0.3\lib\net45\CommonServiceLocator.dll - - ..\packages\Dapplo.Addons.1.0.40-beta\lib\net45\Dapplo.Addons.dll + + ..\packages\Dapplo.Addons.1.0.44\lib\net45\Dapplo.Addons.dll - - ..\packages\Dapplo.Addons.Bootstrapper.1.0.40-beta\lib\net45\Dapplo.Addons.Bootstrapper.dll + + ..\packages\Dapplo.Addons.Bootstrapper.1.0.44\lib\net45\Dapplo.Addons.Bootstrapper.dll - - ..\packages\Dapplo.CaliburnMicro.1.0.41-beta\lib\net45\Dapplo.CaliburnMicro.dll + + ..\packages\Dapplo.CaliburnMicro.1.0.42\lib\net45\Dapplo.CaliburnMicro.dll - - ..\packages\Dapplo.CaliburnMicro.Configuration.1.0.41-beta\lib\net45\Dapplo.CaliburnMicro.Configuration.dll + + ..\packages\Dapplo.CaliburnMicro.Configuration.1.0.42\lib\net45\Dapplo.CaliburnMicro.Configuration.dll - - ..\packages\Dapplo.CaliburnMicro.Dapp.1.0.41-beta\lib\net45\Dapplo.CaliburnMicro.Dapp.dll + + ..\packages\Dapplo.CaliburnMicro.Dapp.1.0.42\lib\net45\Dapplo.CaliburnMicro.Dapp.dll - - ..\packages\Dapplo.CaliburnMicro.Menu.1.0.41-beta\lib\net45\Dapplo.CaliburnMicro.Menu.dll + + ..\packages\Dapplo.CaliburnMicro.Menu.1.0.42\lib\net45\Dapplo.CaliburnMicro.Menu.dll - - ..\packages\Dapplo.CaliburnMicro.Security.1.0.41-beta\lib\net45\Dapplo.CaliburnMicro.Security.dll + + ..\packages\Dapplo.CaliburnMicro.Security.1.0.42\lib\net45\Dapplo.CaliburnMicro.Security.dll - - ..\packages\Dapplo.CaliburnMicro.Translations.1.0.41-beta\lib\net45\Dapplo.CaliburnMicro.Translations.dll + + ..\packages\Dapplo.CaliburnMicro.Translations.1.0.42\lib\net45\Dapplo.CaliburnMicro.Translations.dll ..\packages\Dapplo.HttpExtensions.0.8.35\lib\net45\Dapplo.HttpExtensions.dll @@ -235,7 +235,7 @@ - + diff --git a/src/Greenshot.Addons/packages.config b/src/Greenshot.Addons/packages.config index e051271e3..3d26a9c1b 100644 --- a/src/Greenshot.Addons/packages.config +++ b/src/Greenshot.Addons/packages.config @@ -6,14 +6,14 @@ - - - - - - - - + + + + + + + + diff --git a/src/Greenshot.Gfx/Greenshot.Gfx.csproj b/src/Greenshot.Gfx/Greenshot.Gfx.csproj index 96360d9fb..c983db796 100644 --- a/src/Greenshot.Gfx/Greenshot.Gfx.csproj +++ b/src/Greenshot.Gfx/Greenshot.Gfx.csproj @@ -36,17 +36,17 @@ ..\packages\CommonServiceLocator.2.0.3\lib\net45\CommonServiceLocator.dll - - ..\packages\Dapplo.Addons.1.0.40-beta\lib\net45\Dapplo.Addons.dll + + ..\packages\Dapplo.Addons.1.0.44\lib\net45\Dapplo.Addons.dll - - ..\packages\Dapplo.Addons.Bootstrapper.1.0.40-beta\lib\net45\Dapplo.Addons.Bootstrapper.dll + + ..\packages\Dapplo.Addons.Bootstrapper.1.0.44\lib\net45\Dapplo.Addons.Bootstrapper.dll - - ..\packages\Dapplo.CaliburnMicro.1.0.41-beta\lib\net45\Dapplo.CaliburnMicro.dll + + ..\packages\Dapplo.CaliburnMicro.1.0.42\lib\net45\Dapplo.CaliburnMicro.dll - - ..\packages\Dapplo.CaliburnMicro.Translations.1.0.41-beta\lib\net45\Dapplo.CaliburnMicro.Translations.dll + + ..\packages\Dapplo.CaliburnMicro.Translations.1.0.42\lib\net45\Dapplo.CaliburnMicro.Translations.dll ..\packages\Dapplo.Ini.0.5.28\lib\net45\Dapplo.Ini.dll diff --git a/src/Greenshot.Gfx/packages.config b/src/Greenshot.Gfx/packages.config index 751a3c51a..09c8ee0ae 100644 --- a/src/Greenshot.Gfx/packages.config +++ b/src/Greenshot.Gfx/packages.config @@ -6,10 +6,10 @@ - - - - + + + + diff --git a/src/Greenshot.PerformanceTests/App.config b/src/Greenshot.PerformanceTests/App.config index c8fe5a279..219c43ebe 100644 --- a/src/Greenshot.PerformanceTests/App.config +++ b/src/Greenshot.PerformanceTests/App.config @@ -47,11 +47,11 @@ - + - + diff --git a/src/Greenshot.PerformanceTests/Greenshot.PerformanceTests.csproj b/src/Greenshot.PerformanceTests/Greenshot.PerformanceTests.csproj index 2f652e4d2..d2d4fdeea 100644 --- a/src/Greenshot.PerformanceTests/Greenshot.PerformanceTests.csproj +++ b/src/Greenshot.PerformanceTests/Greenshot.PerformanceTests.csproj @@ -42,17 +42,17 @@ ..\packages\CommonServiceLocator.2.0.3\lib\net45\CommonServiceLocator.dll - - ..\packages\Dapplo.Addons.1.0.40-beta\lib\net45\Dapplo.Addons.dll + + ..\packages\Dapplo.Addons.1.0.44\lib\net45\Dapplo.Addons.dll - - ..\packages\Dapplo.Addons.Bootstrapper.1.0.40-beta\lib\net45\Dapplo.Addons.Bootstrapper.dll + + ..\packages\Dapplo.Addons.Bootstrapper.1.0.44\lib\net45\Dapplo.Addons.Bootstrapper.dll - - ..\packages\Dapplo.CaliburnMicro.1.0.41-beta\lib\net45\Dapplo.CaliburnMicro.dll + + ..\packages\Dapplo.CaliburnMicro.1.0.42\lib\net45\Dapplo.CaliburnMicro.dll - - ..\packages\Dapplo.CaliburnMicro.Translations.1.0.41-beta\lib\net45\Dapplo.CaliburnMicro.Translations.dll + + ..\packages\Dapplo.CaliburnMicro.Translations.1.0.42\lib\net45\Dapplo.CaliburnMicro.Translations.dll ..\packages\Dapplo.Ini.0.5.28\lib\net45\Dapplo.Ini.dll @@ -99,11 +99,11 @@ ..\packages\JeremyAnsel.ColorQuant.1.0.55\lib\net40\JeremyAnsel.ColorQuant.dll - - ..\packages\Microsoft.CodeAnalysis.Common.2.7.0\lib\netstandard1.3\Microsoft.CodeAnalysis.dll + + ..\packages\Microsoft.CodeAnalysis.Common.2.8.2\lib\netstandard1.3\Microsoft.CodeAnalysis.dll - - ..\packages\Microsoft.CodeAnalysis.CSharp.2.7.0\lib\netstandard1.3\Microsoft.CodeAnalysis.CSharp.dll + + ..\packages\Microsoft.CodeAnalysis.CSharp.2.8.2\lib\netstandard1.3\Microsoft.CodeAnalysis.CSharp.dll ..\packages\Microsoft.DotNet.InternalAbstractions.1.0.0\lib\net451\Microsoft.DotNet.InternalAbstractions.dll diff --git a/src/Greenshot.PerformanceTests/packages.config b/src/Greenshot.PerformanceTests/packages.config index 8a334c0e2..47a7226c3 100644 --- a/src/Greenshot.PerformanceTests/packages.config +++ b/src/Greenshot.PerformanceTests/packages.config @@ -9,10 +9,10 @@ - - - - + + + + @@ -29,8 +29,8 @@ - - + + diff --git a/src/Greenshot.Tests/Greenshot.Tests.csproj b/src/Greenshot.Tests/Greenshot.Tests.csproj index 154ea8eb8..b6573da54 100644 --- a/src/Greenshot.Tests/Greenshot.Tests.csproj +++ b/src/Greenshot.Tests/Greenshot.Tests.csproj @@ -71,17 +71,17 @@ ..\packages\CommonServiceLocator.2.0.3\lib\net45\CommonServiceLocator.dll - - ..\packages\Dapplo.Addons.1.0.40-beta\lib\net45\Dapplo.Addons.dll + + ..\packages\Dapplo.Addons.1.0.44\lib\net45\Dapplo.Addons.dll - - ..\packages\Dapplo.Addons.Bootstrapper.1.0.40-beta\lib\net45\Dapplo.Addons.Bootstrapper.dll + + ..\packages\Dapplo.Addons.Bootstrapper.1.0.44\lib\net45\Dapplo.Addons.Bootstrapper.dll - - ..\packages\Dapplo.CaliburnMicro.1.0.41-beta\lib\net45\Dapplo.CaliburnMicro.dll + + ..\packages\Dapplo.CaliburnMicro.1.0.42\lib\net45\Dapplo.CaliburnMicro.dll - - ..\packages\Dapplo.CaliburnMicro.Translations.1.0.41-beta\lib\net45\Dapplo.CaliburnMicro.Translations.dll + + ..\packages\Dapplo.CaliburnMicro.Translations.1.0.42\lib\net45\Dapplo.CaliburnMicro.Translations.dll ..\packages\Dapplo.Ini.0.5.28\lib\net45\Dapplo.Ini.dll @@ -125,11 +125,11 @@ ..\packages\Dapplo.Windows.User32.0.5.56\lib\net45\Dapplo.Windows.User32.dll - - ..\packages\Microsoft.CodeAnalysis.Common.2.7.0\lib\netstandard1.3\Microsoft.CodeAnalysis.dll + + ..\packages\Microsoft.CodeAnalysis.Common.2.8.2\lib\netstandard1.3\Microsoft.CodeAnalysis.dll - - ..\packages\Microsoft.CodeAnalysis.CSharp.2.7.0\lib\netstandard1.3\Microsoft.CodeAnalysis.CSharp.dll + + ..\packages\Microsoft.CodeAnalysis.CSharp.2.8.2\lib\netstandard1.3\Microsoft.CodeAnalysis.CSharp.dll ..\packages\Microsoft.DotNet.InternalAbstractions.1.0.0\lib\net451\Microsoft.DotNet.InternalAbstractions.dll @@ -308,6 +308,7 @@ + diff --git a/src/Greenshot.Tests/app.config b/src/Greenshot.Tests/app.config index 985bbb980..129b46a54 100644 --- a/src/Greenshot.Tests/app.config +++ b/src/Greenshot.Tests/app.config @@ -44,11 +44,11 @@ - + - + diff --git a/src/Greenshot.Tests/packages.config b/src/Greenshot.Tests/packages.config index 4cf9e0324..ed3ce59cf 100644 --- a/src/Greenshot.Tests/packages.config +++ b/src/Greenshot.Tests/packages.config @@ -10,10 +10,10 @@ - - - - + + + + @@ -29,8 +29,8 @@ - - + + @@ -82,7 +82,7 @@ - + diff --git a/src/Greenshot/Destinations/ClipboardDestination.cs b/src/Greenshot/Destinations/ClipboardDestination.cs index ea3669493..ceca392f3 100644 --- a/src/Greenshot/Destinations/ClipboardDestination.cs +++ b/src/Greenshot/Destinations/ClipboardDestination.cs @@ -66,7 +66,7 @@ namespace Greenshot.Destinations catch (Exception) { // TODO: Change to general logic in ProcessExport - surface.SendMessageEvent(this, SurfaceMessageTyp.Error, Language.GetString(LangKey.editor_clipboardfailed)); + surface.SendMessageEvent(this, SurfaceMessageTyp.Error, "Error"); //GreenshotLanguage.editorclipboardfailed); } ProcessExport(exportInformation, surface); return exportInformation; diff --git a/src/Greenshot/Forms/LanguageDialog.cs b/src/Greenshot/Forms/LanguageDialog.cs index 28dcb55fd..7f311948b 100644 --- a/src/Greenshot/Forms/LanguageDialog.cs +++ b/src/Greenshot/Forms/LanguageDialog.cs @@ -24,6 +24,7 @@ #region Usings using System; +using System.Linq; using System.Threading; using System.Windows.Forms; using Dapplo.Log; @@ -90,7 +91,7 @@ namespace Greenshot.Forms return; } - comboBoxLanguage.SelectedValue = Language.SupportedLanguages[0].Ietf; + comboBoxLanguage.SelectedValue = Language.SupportedLanguages.Keys.FirstOrDefault(); Language.CurrentLanguage = SelectedLanguage; _properOkPressed = true; Close(); diff --git a/src/Greenshot/Greenshot.csproj b/src/Greenshot/Greenshot.csproj index 33991e5cf..25576fad8 100644 --- a/src/Greenshot/Greenshot.csproj +++ b/src/Greenshot/Greenshot.csproj @@ -57,35 +57,35 @@ ..\packages\Costura.Fody.2.0.1\lib\net452\Costura.dll - - ..\packages\Dapplo.Addons.1.0.40-beta\lib\net45\Dapplo.Addons.dll + + ..\packages\Dapplo.Addons.1.0.44\lib\net45\Dapplo.Addons.dll - - ..\packages\Dapplo.Addons.Bootstrapper.1.0.40-beta\lib\net45\Dapplo.Addons.Bootstrapper.dll + + ..\packages\Dapplo.Addons.Bootstrapper.1.0.44\lib\net45\Dapplo.Addons.Bootstrapper.dll - - ..\packages\Dapplo.Addons.Config.1.0.38-beta\lib\net45\Dapplo.Addons.Config.dll + + ..\packages\Dapplo.Addons.Config.1.0.44\lib\net45\Dapplo.Addons.Config.dll - - ..\packages\Dapplo.CaliburnMicro.1.0.41-beta\lib\net45\Dapplo.CaliburnMicro.dll + + ..\packages\Dapplo.CaliburnMicro.1.0.42\lib\net45\Dapplo.CaliburnMicro.dll - - ..\packages\Dapplo.CaliburnMicro.Configuration.1.0.41-beta\lib\net45\Dapplo.CaliburnMicro.Configuration.dll + + ..\packages\Dapplo.CaliburnMicro.Configuration.1.0.42\lib\net45\Dapplo.CaliburnMicro.Configuration.dll - - ..\packages\Dapplo.CaliburnMicro.Dapp.1.0.41-beta\lib\net45\Dapplo.CaliburnMicro.Dapp.dll + + ..\packages\Dapplo.CaliburnMicro.Dapp.1.0.42\lib\net45\Dapplo.CaliburnMicro.Dapp.dll - - ..\packages\Dapplo.CaliburnMicro.Menu.1.0.41-beta\lib\net45\Dapplo.CaliburnMicro.Menu.dll + + ..\packages\Dapplo.CaliburnMicro.Menu.1.0.42\lib\net45\Dapplo.CaliburnMicro.Menu.dll - - ..\packages\Dapplo.CaliburnMicro.Metro.1.0.41-beta\lib\net45\Dapplo.CaliburnMicro.Metro.dll + + ..\packages\Dapplo.CaliburnMicro.Metro.1.0.42\lib\net45\Dapplo.CaliburnMicro.Metro.dll - - ..\packages\Dapplo.CaliburnMicro.Security.1.0.41-beta\lib\net45\Dapplo.CaliburnMicro.Security.dll + + ..\packages\Dapplo.CaliburnMicro.Security.1.0.42\lib\net45\Dapplo.CaliburnMicro.Security.dll - - ..\packages\Dapplo.CaliburnMicro.Translations.1.0.41-beta\lib\net45\Dapplo.CaliburnMicro.Translations.dll + + ..\packages\Dapplo.CaliburnMicro.Translations.1.0.42\lib\net45\Dapplo.CaliburnMicro.Translations.dll ..\packages\Dapplo.HttpExtensions.0.8.35\lib\net45\Dapplo.HttpExtensions.dll diff --git a/src/Greenshot/Help/HelpFileLoader.cs b/src/Greenshot/Help/HelpFileLoader.cs index 49b2ff7de..9c1b48ec6 100644 --- a/src/Greenshot/Help/HelpFileLoader.cs +++ b/src/Greenshot/Help/HelpFileLoader.cs @@ -42,7 +42,7 @@ namespace Greenshot.Help public static void LoadHelp() { - var uri = FindOnlineHelpUrl(Language.CurrentLanguage) ?? Language.HelpFilePath; + var uri = FindOnlineHelpUrl(Language.CurrentLanguage);// ?? Language.HelpFilePath; Process.Start(uri); } diff --git a/src/Greenshot/packages.config b/src/Greenshot/packages.config index 6eadd241b..df62fa510 100644 --- a/src/Greenshot/packages.config +++ b/src/Greenshot/packages.config @@ -11,16 +11,16 @@ - - - - - - - - - - + + + + + + + + + +