diff --git a/src/Greenshot.Plugin.Box/BoxConfiguration.cs b/src/Greenshot.Plugin.Box/BoxConfiguration.cs index b8e9e0965..a940b319e 100644 --- a/src/Greenshot.Plugin.Box/BoxConfiguration.cs +++ b/src/Greenshot.Plugin.Box/BoxConfiguration.cs @@ -19,13 +19,13 @@ * along with this program. If not, see . */ -using System.Windows.Forms; -using GreenshotPlugin.Core; using System; -using GreenshotBoxPlugin.Forms; +using System.Windows.Forms; +using Greenshot.Plugin.Box.Forms; +using GreenshotPlugin.Core; using GreenshotPlugin.IniFile; -namespace GreenshotBoxPlugin { +namespace Greenshot.Plugin.Box { /// /// Description of ImgurConfiguration. /// diff --git a/src/Greenshot.Plugin.Box/BoxDestination.cs b/src/Greenshot.Plugin.Box/BoxDestination.cs index 4283a178c..3c1a0622d 100644 --- a/src/Greenshot.Plugin.Box/BoxDestination.cs +++ b/src/Greenshot.Plugin.Box/BoxDestination.cs @@ -18,12 +18,13 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ + using System.ComponentModel; using System.Drawing; using GreenshotPlugin.Core; using GreenshotPlugin.Interfaces; -namespace GreenshotBoxPlugin { +namespace Greenshot.Plugin.Box { public class BoxDestination : AbstractDestination { private readonly BoxPlugin _plugin; public BoxDestination(BoxPlugin plugin) { diff --git a/src/Greenshot.Plugin.Box/BoxEntities.cs b/src/Greenshot.Plugin.Box/BoxEntities.cs index a1f1a5c61..bf5476f4e 100644 --- a/src/Greenshot.Plugin.Box/BoxEntities.cs +++ b/src/Greenshot.Plugin.Box/BoxEntities.cs @@ -18,10 +18,11 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ + using System.Collections.Generic; using System.Runtime.Serialization; -namespace GreenshotBoxPlugin { +namespace Greenshot.Plugin.Box { [DataContract] public class Authorization { [DataMember(Name = "access_token")] diff --git a/src/Greenshot.Plugin.Box/BoxPlugin.cs b/src/Greenshot.Plugin.Box/BoxPlugin.cs index b15835063..6a01dda9e 100644 --- a/src/Greenshot.Plugin.Box/BoxPlugin.cs +++ b/src/Greenshot.Plugin.Box/BoxPlugin.cs @@ -18,6 +18,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ + using System; using System.ComponentModel; using System.Drawing; @@ -29,7 +30,7 @@ using GreenshotPlugin.IniFile; using GreenshotPlugin.Interfaces; using GreenshotPlugin.Interfaces.Plugin; -namespace GreenshotBoxPlugin { +namespace Greenshot.Plugin.Box { /// /// This is the Box base code /// diff --git a/src/Greenshot.Plugin.Box/BoxUtils.cs b/src/Greenshot.Plugin.Box/BoxUtils.cs index a20447c86..22e8acf49 100644 --- a/src/Greenshot.Plugin.Box/BoxUtils.cs +++ b/src/Greenshot.Plugin.Box/BoxUtils.cs @@ -19,15 +19,15 @@ * along with this program. If not, see . */ -using GreenshotPlugin.Core; using System.Collections.Generic; using System.IO; using System.Runtime.Serialization.Json; using System.Text; +using GreenshotPlugin.Core; using GreenshotPlugin.Core.OAuth; using GreenshotPlugin.IniFile; -namespace GreenshotBoxPlugin { +namespace Greenshot.Plugin.Box { /// /// Description of BoxUtils. diff --git a/src/Greenshot.Plugin.Box/Forms/BoxForm.cs b/src/Greenshot.Plugin.Box/Forms/BoxForm.cs index 1ab7aed75..5bb895823 100644 --- a/src/Greenshot.Plugin.Box/Forms/BoxForm.cs +++ b/src/Greenshot.Plugin.Box/Forms/BoxForm.cs @@ -18,9 +18,10 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ + using GreenshotPlugin.Controls; -namespace GreenshotBoxPlugin.Forms { +namespace Greenshot.Plugin.Box.Forms { public class BoxForm : GreenshotForm { } } \ No newline at end of file diff --git a/src/Greenshot.Plugin.Box/Forms/SettingsForm.Designer.cs b/src/Greenshot.Plugin.Box/Forms/SettingsForm.Designer.cs index 556cfe413..6b8f68242 100644 --- a/src/Greenshot.Plugin.Box/Forms/SettingsForm.Designer.cs +++ b/src/Greenshot.Plugin.Box/Forms/SettingsForm.Designer.cs @@ -18,7 +18,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -namespace GreenshotBoxPlugin.Forms { +namespace Greenshot.Plugin.Box.Forms { partial class SettingsForm { /// /// Designer variable used to keep track of non-visual components. diff --git a/src/Greenshot.Plugin.Box/Forms/SettingsForm.cs b/src/Greenshot.Plugin.Box/Forms/SettingsForm.cs index 49e62fd17..1de1e7b32 100644 --- a/src/Greenshot.Plugin.Box/Forms/SettingsForm.cs +++ b/src/Greenshot.Plugin.Box/Forms/SettingsForm.cs @@ -19,7 +19,7 @@ * along with this program. If not, see . */ -namespace GreenshotBoxPlugin.Forms { +namespace Greenshot.Plugin.Box.Forms { /// /// Description of PasswordRequestForm. /// diff --git a/src/Greenshot.Plugin.Box/Greenshot.Plugin.Box.Credentials.template b/src/Greenshot.Plugin.Box/Greenshot.Plugin.Box.Credentials.template index 72cfa4b79..df6eaa0bd 100644 --- a/src/Greenshot.Plugin.Box/Greenshot.Plugin.Box.Credentials.template +++ b/src/Greenshot.Plugin.Box/Greenshot.Plugin.Box.Credentials.template @@ -19,7 +19,7 @@ * along with this program. If not, see . */ -namespace GreenshotBoxPlugin { +namespace Greenshot.Plugin.Box { /// /// This class is merely a placeholder for the file keeping the API key and secret for Box integration. /// You can set your own values here diff --git a/src/Greenshot.Plugin.Box/Greenshot.Plugin.Box.csproj b/src/Greenshot.Plugin.Box/Greenshot.Plugin.Box.csproj index 47724aa87..990e9ddc4 100644 --- a/src/Greenshot.Plugin.Box/Greenshot.Plugin.Box.csproj +++ b/src/Greenshot.Plugin.Box/Greenshot.Plugin.Box.csproj @@ -1,10 +1,4 @@  - - - GreenshotBoxPlugin - GreenshotBoxPlugin - - PreserveNewest diff --git a/src/Greenshot.Plugin.Box/LanguageKeys.cs b/src/Greenshot.Plugin.Box/LanguageKeys.cs index 5d2491ae3..32230ebd1 100644 --- a/src/Greenshot.Plugin.Box/LanguageKeys.cs +++ b/src/Greenshot.Plugin.Box/LanguageKeys.cs @@ -18,7 +18,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -namespace GreenshotBoxPlugin { +namespace Greenshot.Plugin.Box { public enum LangKey { upload_menu_item, upload_failure, diff --git a/src/Greenshot.Plugin.Confluence/Confluence.cs b/src/Greenshot.Plugin.Confluence/Confluence.cs index bb803602c..13f5d0ab3 100644 --- a/src/Greenshot.Plugin.Confluence/Confluence.cs +++ b/src/Greenshot.Plugin.Confluence/Confluence.cs @@ -26,7 +26,7 @@ using GreenshotConfluencePlugin.confluence; using GreenshotPlugin.Core; using GreenshotPlugin.IniFile; -namespace GreenshotConfluencePlugin { +namespace Greenshot.Plugin.Confluence { public class Page { public Page(RemotePage page) { Id = page.id; diff --git a/src/Greenshot.Plugin.Confluence/ConfluenceConfiguration.cs b/src/Greenshot.Plugin.Confluence/ConfluenceConfiguration.cs index 5a3e7019c..a742fc45b 100644 --- a/src/Greenshot.Plugin.Confluence/ConfluenceConfiguration.cs +++ b/src/Greenshot.Plugin.Confluence/ConfluenceConfiguration.cs @@ -18,11 +18,12 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ + using System; using GreenshotPlugin.Core; using GreenshotPlugin.IniFile; -namespace GreenshotConfluencePlugin { +namespace Greenshot.Plugin.Confluence { /// /// Description of ConfluenceConfiguration. /// diff --git a/src/Greenshot.Plugin.Confluence/ConfluenceDestination.cs b/src/Greenshot.Plugin.Confluence/ConfluenceDestination.cs index d7794989a..d2661d141 100644 --- a/src/Greenshot.Plugin.Confluence/ConfluenceDestination.cs +++ b/src/Greenshot.Plugin.Confluence/ConfluenceDestination.cs @@ -18,6 +18,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ + using System; using System.Collections.Generic; using System.Diagnostics; @@ -31,7 +32,7 @@ using GreenshotPlugin.IniFile; using GreenshotPlugin.Interfaces; using GreenshotPlugin.Interfaces.Plugin; -namespace GreenshotConfluencePlugin { +namespace Greenshot.Plugin.Confluence { /// /// Description of ConfluenceDestination. /// diff --git a/src/Greenshot.Plugin.Confluence/ConfluencePlugin.cs b/src/Greenshot.Plugin.Confluence/ConfluencePlugin.cs index f0014f221..4cca23c8f 100644 --- a/src/Greenshot.Plugin.Confluence/ConfluencePlugin.cs +++ b/src/Greenshot.Plugin.Confluence/ConfluencePlugin.cs @@ -19,16 +19,16 @@ * along with this program. If not, see . */ -using GreenshotPlugin.Core; using System; using System.Windows; -using GreenshotConfluencePlugin.Forms; -using GreenshotConfluencePlugin.Support; +using Greenshot.Plugin.Confluence.Forms; +using Greenshot.Plugin.Confluence.Support; +using GreenshotPlugin.Core; using GreenshotPlugin.IniFile; using GreenshotPlugin.Interfaces; using GreenshotPlugin.Interfaces.Plugin; -namespace GreenshotConfluencePlugin { +namespace Greenshot.Plugin.Confluence { /// /// This is the ConfluencePlugin base code /// diff --git a/src/Greenshot.Plugin.Confluence/ConfluenceUtils.cs b/src/Greenshot.Plugin.Confluence/ConfluenceUtils.cs index ccb808a0f..55a40fa8c 100644 --- a/src/Greenshot.Plugin.Confluence/ConfluenceUtils.cs +++ b/src/Greenshot.Plugin.Confluence/ConfluenceUtils.cs @@ -18,15 +18,15 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ + using System; using System.Collections.Generic; using System.Linq; using System.Text.RegularExpressions; using System.Windows.Automation; - using GreenshotPlugin.Core; -namespace GreenshotConfluencePlugin { +namespace Greenshot.Plugin.Confluence { /// /// Description of ConfluenceUtils. /// diff --git a/src/Greenshot.Plugin.Confluence/EnumDisplayer.cs b/src/Greenshot.Plugin.Confluence/EnumDisplayer.cs index 5358362ef..185593c87 100644 --- a/src/Greenshot.Plugin.Confluence/EnumDisplayer.cs +++ b/src/Greenshot.Plugin.Confluence/EnumDisplayer.cs @@ -18,6 +18,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ + using System; using System.Collections; using System.Collections.Generic; @@ -25,10 +26,9 @@ using System.Collections.ObjectModel; using System.Globalization; using System.Reflection; using System.Windows.Data; - using GreenshotPlugin.Core; -namespace GreenshotConfluencePlugin { +namespace Greenshot.Plugin.Confluence { public class EnumDisplayer : IValueConverter { private Type _type; private IDictionary _displayValues; diff --git a/src/Greenshot.Plugin.Confluence/Forms/ConfluenceConfigurationForm.xaml b/src/Greenshot.Plugin.Confluence/Forms/ConfluenceConfigurationForm.xaml index c6b6b48a6..2b747d831 100644 --- a/src/Greenshot.Plugin.Confluence/Forms/ConfluenceConfigurationForm.xaml +++ b/src/Greenshot.Plugin.Confluence/Forms/ConfluenceConfigurationForm.xaml @@ -1,12 +1,13 @@ - - + diff --git a/src/Greenshot.Plugin.Confluence/Forms/ConfluenceConfigurationForm.xaml.cs b/src/Greenshot.Plugin.Confluence/Forms/ConfluenceConfigurationForm.xaml.cs index 9269072d4..cd31165ba 100644 --- a/src/Greenshot.Plugin.Confluence/Forms/ConfluenceConfigurationForm.xaml.cs +++ b/src/Greenshot.Plugin.Confluence/Forms/ConfluenceConfigurationForm.xaml.cs @@ -21,7 +21,7 @@ using System.Windows; -namespace GreenshotConfluencePlugin.Forms { +namespace Greenshot.Plugin.Confluence.Forms { /// /// Interaction logic for ConfluenceConfigurationForm.xaml /// diff --git a/src/Greenshot.Plugin.Confluence/Forms/ConfluencePagePicker.xaml b/src/Greenshot.Plugin.Confluence/Forms/ConfluencePagePicker.xaml index e9ae3f97b..194d31080 100644 --- a/src/Greenshot.Plugin.Confluence/Forms/ConfluencePagePicker.xaml +++ b/src/Greenshot.Plugin.Confluence/Forms/ConfluencePagePicker.xaml @@ -1,4 +1,4 @@ - diff --git a/src/Greenshot.Plugin.Confluence/Forms/ConfluencePagePicker.xaml.cs b/src/Greenshot.Plugin.Confluence/Forms/ConfluencePagePicker.xaml.cs index 4f2723c89..55ca76659 100644 --- a/src/Greenshot.Plugin.Confluence/Forms/ConfluencePagePicker.xaml.cs +++ b/src/Greenshot.Plugin.Confluence/Forms/ConfluencePagePicker.xaml.cs @@ -21,7 +21,7 @@ using System.Collections.Generic; -namespace GreenshotConfluencePlugin.Forms { +namespace Greenshot.Plugin.Confluence.Forms { /// /// Interaction logic for ConfluencePagePicker.xaml /// diff --git a/src/Greenshot.Plugin.Confluence/Forms/ConfluenceSearch.xaml b/src/Greenshot.Plugin.Confluence/Forms/ConfluenceSearch.xaml index 073a437fe..f63185d34 100644 --- a/src/Greenshot.Plugin.Confluence/Forms/ConfluenceSearch.xaml +++ b/src/Greenshot.Plugin.Confluence/Forms/ConfluenceSearch.xaml @@ -1,8 +1,8 @@  - diff --git a/src/Greenshot.Plugin.Confluence/Forms/ConfluenceSearch.xaml.cs b/src/Greenshot.Plugin.Confluence/Forms/ConfluenceSearch.xaml.cs index 0702ddff7..a39c36a39 100644 --- a/src/Greenshot.Plugin.Confluence/Forms/ConfluenceSearch.xaml.cs +++ b/src/Greenshot.Plugin.Confluence/Forms/ConfluenceSearch.xaml.cs @@ -25,7 +25,7 @@ using System.Linq; using System.Windows; using GreenshotPlugin.IniFile; -namespace GreenshotConfluencePlugin.Forms { +namespace Greenshot.Plugin.Confluence.Forms { public partial class ConfluenceSearch { private static readonly ConfluenceConfiguration ConfluenceConfig = IniConfig.GetIniSection(); diff --git a/src/Greenshot.Plugin.Confluence/Forms/ConfluenceTreePicker.xaml b/src/Greenshot.Plugin.Confluence/Forms/ConfluenceTreePicker.xaml index 4ca2a11ad..27e2a0004 100644 --- a/src/Greenshot.Plugin.Confluence/Forms/ConfluenceTreePicker.xaml +++ b/src/Greenshot.Plugin.Confluence/Forms/ConfluenceTreePicker.xaml @@ -1,8 +1,8 @@  - /// Interaction logic for ConfluenceTreePicker.xaml /// diff --git a/src/Greenshot.Plugin.Confluence/Forms/ConfluenceUpload.xaml b/src/Greenshot.Plugin.Confluence/Forms/ConfluenceUpload.xaml index f6ec6f13a..e53ae07ac 100644 --- a/src/Greenshot.Plugin.Confluence/Forms/ConfluenceUpload.xaml +++ b/src/Greenshot.Plugin.Confluence/Forms/ConfluenceUpload.xaml @@ -1,7 +1,7 @@ - diff --git a/src/Greenshot.Plugin.Confluence/Forms/ConfluenceUpload.xaml.cs b/src/Greenshot.Plugin.Confluence/Forms/ConfluenceUpload.xaml.cs index 291581a2b..276788579 100644 --- a/src/Greenshot.Plugin.Confluence/Forms/ConfluenceUpload.xaml.cs +++ b/src/Greenshot.Plugin.Confluence/Forms/ConfluenceUpload.xaml.cs @@ -25,7 +25,7 @@ using System.Linq; using System.Threading; using System.Windows; -namespace GreenshotConfluencePlugin.Forms { +namespace Greenshot.Plugin.Confluence.Forms { /// /// Interaction logic for ConfluenceUpload.xaml /// diff --git a/src/Greenshot.Plugin.Confluence/Greenshot.Plugin.Confluence.csproj b/src/Greenshot.Plugin.Confluence/Greenshot.Plugin.Confluence.csproj index 259eb96b2..79b55313a 100644 --- a/src/Greenshot.Plugin.Confluence/Greenshot.Plugin.Confluence.csproj +++ b/src/Greenshot.Plugin.Confluence/Greenshot.Plugin.Confluence.csproj @@ -1,10 +1,4 @@  - - - GreenshotConfluencePlugin - GreenshotConfluencePlugin - - PreserveNewest diff --git a/src/Greenshot.Plugin.Confluence/LanguageKeys.cs b/src/Greenshot.Plugin.Confluence/LanguageKeys.cs index 5ba0b2cbe..bdbd039a7 100644 --- a/src/Greenshot.Plugin.Confluence/LanguageKeys.cs +++ b/src/Greenshot.Plugin.Confluence/LanguageKeys.cs @@ -19,7 +19,7 @@ * along with this program. If not, see . */ -namespace GreenshotConfluencePlugin { +namespace Greenshot.Plugin.Confluence { public enum LangKey { login_error, upload_menu_item, diff --git a/src/Greenshot.Plugin.Confluence/Support/ITranslationProvider.cs b/src/Greenshot.Plugin.Confluence/Support/ITranslationProvider.cs index 02180f036..bbabf3a0b 100644 --- a/src/Greenshot.Plugin.Confluence/Support/ITranslationProvider.cs +++ b/src/Greenshot.Plugin.Confluence/Support/ITranslationProvider.cs @@ -1,4 +1,4 @@ -namespace GreenshotConfluencePlugin.Support { +namespace Greenshot.Plugin.Confluence.Support { public interface ITranslationProvider { /// /// Translates the specified key. diff --git a/src/Greenshot.Plugin.Confluence/Support/LanguageChangedEventManager.cs b/src/Greenshot.Plugin.Confluence/Support/LanguageChangedEventManager.cs index c9fb55704..64cc4b0a3 100644 --- a/src/Greenshot.Plugin.Confluence/Support/LanguageChangedEventManager.cs +++ b/src/Greenshot.Plugin.Confluence/Support/LanguageChangedEventManager.cs @@ -1,7 +1,7 @@ using System; using System.Windows; -namespace GreenshotConfluencePlugin.Support +namespace Greenshot.Plugin.Confluence.Support { public class LanguageChangedEventManager : WeakEventManager { diff --git a/src/Greenshot.Plugin.Confluence/Support/LanguageXMLTranslationProvider.cs b/src/Greenshot.Plugin.Confluence/Support/LanguageXMLTranslationProvider.cs index 23dbc4fc1..4c98fd1b9 100644 --- a/src/Greenshot.Plugin.Confluence/Support/LanguageXMLTranslationProvider.cs +++ b/src/Greenshot.Plugin.Confluence/Support/LanguageXMLTranslationProvider.cs @@ -1,6 +1,6 @@ using GreenshotPlugin.Core; -namespace GreenshotConfluencePlugin.Support { +namespace Greenshot.Plugin.Confluence.Support { /// /// /// diff --git a/src/Greenshot.Plugin.Confluence/Support/TranslateExtension.cs b/src/Greenshot.Plugin.Confluence/Support/TranslateExtension.cs index 3730e7baa..8d9a6e230 100644 --- a/src/Greenshot.Plugin.Confluence/Support/TranslateExtension.cs +++ b/src/Greenshot.Plugin.Confluence/Support/TranslateExtension.cs @@ -2,7 +2,7 @@ using System.Windows.Data; using System.Windows.Markup; -namespace GreenshotConfluencePlugin.Support +namespace Greenshot.Plugin.Confluence.Support { /// /// The Translate Markup extension returns a binding to a TranslationData diff --git a/src/Greenshot.Plugin.Confluence/Support/TranslationData.cs b/src/Greenshot.Plugin.Confluence/Support/TranslationData.cs index 0b6371505..0f920efc4 100644 --- a/src/Greenshot.Plugin.Confluence/Support/TranslationData.cs +++ b/src/Greenshot.Plugin.Confluence/Support/TranslationData.cs @@ -2,7 +2,7 @@ using System.ComponentModel; using System.Windows; -namespace GreenshotConfluencePlugin.Support { +namespace Greenshot.Plugin.Confluence.Support { public class TranslationData : IWeakEventListener, INotifyPropertyChanged { private readonly string _key; diff --git a/src/Greenshot.Plugin.Confluence/Support/TranslationManager.cs b/src/Greenshot.Plugin.Confluence/Support/TranslationManager.cs index 472f2e27d..c9af13a4f 100644 --- a/src/Greenshot.Plugin.Confluence/Support/TranslationManager.cs +++ b/src/Greenshot.Plugin.Confluence/Support/TranslationManager.cs @@ -1,6 +1,6 @@ using System; -namespace GreenshotConfluencePlugin.Support { +namespace Greenshot.Plugin.Confluence.Support { public class TranslationManager { private static TranslationManager _translationManager; diff --git a/src/Greenshot.Plugin.Dropbox/DropboxDestination.cs b/src/Greenshot.Plugin.Dropbox/DropboxDestination.cs index 9762652c4..7de974307 100644 --- a/src/Greenshot.Plugin.Dropbox/DropboxDestination.cs +++ b/src/Greenshot.Plugin.Dropbox/DropboxDestination.cs @@ -18,13 +18,14 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ + using System.ComponentModel; using System.Drawing; using GreenshotPlugin.Core; using GreenshotPlugin.IniFile; using GreenshotPlugin.Interfaces; -namespace GreenshotDropboxPlugin { +namespace Greenshot.Plugin.Dropbox { internal class DropboxDestination : AbstractDestination { private static readonly DropboxPluginConfiguration DropboxConfig = IniConfig.GetIniSection(); diff --git a/src/Greenshot.Plugin.Dropbox/DropboxPlugin.cs b/src/Greenshot.Plugin.Dropbox/DropboxPlugin.cs index 2977c2d36..abd83112f 100644 --- a/src/Greenshot.Plugin.Dropbox/DropboxPlugin.cs +++ b/src/Greenshot.Plugin.Dropbox/DropboxPlugin.cs @@ -18,6 +18,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ + using System; using System.ComponentModel; using System.Drawing; @@ -28,7 +29,7 @@ using GreenshotPlugin.IniFile; using GreenshotPlugin.Interfaces; using GreenshotPlugin.Interfaces.Plugin; -namespace GreenshotDropboxPlugin { +namespace Greenshot.Plugin.Dropbox { /// /// This is the Dropbox base code /// diff --git a/src/Greenshot.Plugin.Dropbox/DropboxPluginConfiguration.cs b/src/Greenshot.Plugin.Dropbox/DropboxPluginConfiguration.cs index b13622db2..1b738cdeb 100644 --- a/src/Greenshot.Plugin.Dropbox/DropboxPluginConfiguration.cs +++ b/src/Greenshot.Plugin.Dropbox/DropboxPluginConfiguration.cs @@ -21,12 +21,11 @@ using System; using System.Windows.Forms; -using GreenshotDropboxPlugin.Forms; +using Greenshot.Plugin.Dropbox.Forms; using GreenshotPlugin.Core; using GreenshotPlugin.IniFile; - -namespace GreenshotDropboxPlugin { +namespace Greenshot.Plugin.Dropbox { /// /// Description of ImgurConfiguration. /// diff --git a/src/Greenshot.Plugin.Dropbox/DropboxUtils.cs b/src/Greenshot.Plugin.Dropbox/DropboxUtils.cs index 8bf1d57b5..dd130c9bc 100644 --- a/src/Greenshot.Plugin.Dropbox/DropboxUtils.cs +++ b/src/Greenshot.Plugin.Dropbox/DropboxUtils.cs @@ -18,6 +18,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ + using System; using System.Collections.Generic; using System.IO; @@ -28,7 +29,7 @@ using GreenshotPlugin.Interfaces; using GreenshotPlugin.Interfaces.Plugin; using Newtonsoft.Json; -namespace GreenshotDropboxPlugin { +namespace Greenshot.Plugin.Dropbox { /// /// Description of DropboxUtils. /// diff --git a/src/Greenshot.Plugin.Dropbox/Forms/DropboxForm.cs b/src/Greenshot.Plugin.Dropbox/Forms/DropboxForm.cs index e0a96b5bf..c7aaecb1d 100644 --- a/src/Greenshot.Plugin.Dropbox/Forms/DropboxForm.cs +++ b/src/Greenshot.Plugin.Dropbox/Forms/DropboxForm.cs @@ -21,7 +21,7 @@ using GreenshotPlugin.Controls; -namespace GreenshotDropboxPlugin.Forms { +namespace Greenshot.Plugin.Dropbox.Forms { public class DropboxForm : GreenshotForm { } } diff --git a/src/Greenshot.Plugin.Dropbox/Forms/SettingsForm.Designer.cs b/src/Greenshot.Plugin.Dropbox/Forms/SettingsForm.Designer.cs index 1baae2160..c7f21fd24 100644 --- a/src/Greenshot.Plugin.Dropbox/Forms/SettingsForm.Designer.cs +++ b/src/Greenshot.Plugin.Dropbox/Forms/SettingsForm.Designer.cs @@ -18,7 +18,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -namespace GreenshotDropboxPlugin.Forms { +namespace Greenshot.Plugin.Dropbox.Forms { partial class SettingsForm { /// /// Designer variable used to keep track of non-visual components. diff --git a/src/Greenshot.Plugin.Dropbox/Forms/SettingsForm.cs b/src/Greenshot.Plugin.Dropbox/Forms/SettingsForm.cs index 98e1147ce..9586c9ca7 100644 --- a/src/Greenshot.Plugin.Dropbox/Forms/SettingsForm.cs +++ b/src/Greenshot.Plugin.Dropbox/Forms/SettingsForm.cs @@ -19,7 +19,7 @@ * along with this program. If not, see . */ -namespace GreenshotDropboxPlugin.Forms { +namespace Greenshot.Plugin.Dropbox.Forms { /// /// Description of PasswordRequestForm. /// diff --git a/src/Greenshot.Plugin.Dropbox/Greenshot.Plugin.Dropbox.Credentials.template b/src/Greenshot.Plugin.Dropbox/Greenshot.Plugin.Dropbox.Credentials.template index f674f1bb7..56cde680f 100644 --- a/src/Greenshot.Plugin.Dropbox/Greenshot.Plugin.Dropbox.Credentials.template +++ b/src/Greenshot.Plugin.Dropbox/Greenshot.Plugin.Dropbox.Credentials.template @@ -19,7 +19,7 @@ * along with this program. If not, see . */ -namespace GreenshotDropboxPlugin { +namespace Greenshot.Plugin.Dropbox { /// /// This class is merely a placeholder for the file keeping the API key and secret for dropbox integration. /// You can set your own values here diff --git a/src/Greenshot.Plugin.Dropbox/Greenshot.Plugin.Dropbox.csproj b/src/Greenshot.Plugin.Dropbox/Greenshot.Plugin.Dropbox.csproj index b24217779..0ecbf3fec 100644 --- a/src/Greenshot.Plugin.Dropbox/Greenshot.Plugin.Dropbox.csproj +++ b/src/Greenshot.Plugin.Dropbox/Greenshot.Plugin.Dropbox.csproj @@ -1,10 +1,4 @@  - - - GreenshotDropboxPlugin - GreenshotDropboxPlugin - - PreserveNewest diff --git a/src/Greenshot.Plugin.Dropbox/LanguageKeys.cs b/src/Greenshot.Plugin.Dropbox/LanguageKeys.cs index 0b1ae489e..9b42f6c75 100644 --- a/src/Greenshot.Plugin.Dropbox/LanguageKeys.cs +++ b/src/Greenshot.Plugin.Dropbox/LanguageKeys.cs @@ -18,7 +18,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -namespace GreenshotDropboxPlugin { +namespace Greenshot.Plugin.Dropbox { public enum LangKey { upload_menu_item, upload_failure, diff --git a/src/Greenshot.Plugin.ExternalCommand/ExternalCommandConfiguration.cs b/src/Greenshot.Plugin.ExternalCommand/ExternalCommandConfiguration.cs index f8981b820..e4f345f47 100644 --- a/src/Greenshot.Plugin.ExternalCommand/ExternalCommandConfiguration.cs +++ b/src/Greenshot.Plugin.ExternalCommand/ExternalCommandConfiguration.cs @@ -25,7 +25,7 @@ using System.IO; using GreenshotPlugin.Core; using GreenshotPlugin.IniFile; -namespace GreenshotExternalCommandPlugin { +namespace Greenshot.Plugin.ExternalCommand { /// /// Description of FlickrConfiguration. /// diff --git a/src/Greenshot.Plugin.ExternalCommand/ExternalCommandDestination.cs b/src/Greenshot.Plugin.ExternalCommand/ExternalCommandDestination.cs index 81575c947..df9b25352 100644 --- a/src/Greenshot.Plugin.ExternalCommand/ExternalCommandDestination.cs +++ b/src/Greenshot.Plugin.ExternalCommand/ExternalCommandDestination.cs @@ -31,7 +31,7 @@ using GreenshotPlugin.IniFile; using GreenshotPlugin.Interfaces; using GreenshotPlugin.Interfaces.Plugin; -namespace GreenshotExternalCommandPlugin { +namespace Greenshot.Plugin.ExternalCommand { /// /// Description of OCRDestination. /// diff --git a/src/Greenshot.Plugin.ExternalCommand/ExternalCommandForm.cs b/src/Greenshot.Plugin.ExternalCommand/ExternalCommandForm.cs index 6436fc988..7167b954b 100644 --- a/src/Greenshot.Plugin.ExternalCommand/ExternalCommandForm.cs +++ b/src/Greenshot.Plugin.ExternalCommand/ExternalCommandForm.cs @@ -21,7 +21,7 @@ using GreenshotPlugin.Controls; -namespace GreenshotExternalCommandPlugin { +namespace Greenshot.Plugin.ExternalCommand { /// /// This class is needed for design-time resolving of the language files /// diff --git a/src/Greenshot.Plugin.ExternalCommand/ExternalCommandPlugin.cs b/src/Greenshot.Plugin.ExternalCommand/ExternalCommandPlugin.cs index 9389705b8..eeb99ed41 100644 --- a/src/Greenshot.Plugin.ExternalCommand/ExternalCommandPlugin.cs +++ b/src/Greenshot.Plugin.ExternalCommand/ExternalCommandPlugin.cs @@ -29,7 +29,7 @@ using GreenshotPlugin.IniFile; using GreenshotPlugin.Interfaces; using GreenshotPlugin.Interfaces.Plugin; -namespace GreenshotExternalCommandPlugin +namespace Greenshot.Plugin.ExternalCommand { /// /// An Plugin to run commands after an image was written diff --git a/src/Greenshot.Plugin.ExternalCommand/Greenshot.Plugin.ExternalCommand.csproj b/src/Greenshot.Plugin.ExternalCommand/Greenshot.Plugin.ExternalCommand.csproj index 761d1278f..bb0b57ef0 100644 --- a/src/Greenshot.Plugin.ExternalCommand/Greenshot.Plugin.ExternalCommand.csproj +++ b/src/Greenshot.Plugin.ExternalCommand/Greenshot.Plugin.ExternalCommand.csproj @@ -1,10 +1,4 @@  - - - GreenshotExternalCommandPlugin - GreenshotExternalCommandPlugin - - PreserveNewest diff --git a/src/Greenshot.Plugin.ExternalCommand/IconCache.cs b/src/Greenshot.Plugin.ExternalCommand/IconCache.cs index bf9094c7e..44ea0a84d 100644 --- a/src/Greenshot.Plugin.ExternalCommand/IconCache.cs +++ b/src/Greenshot.Plugin.ExternalCommand/IconCache.cs @@ -25,7 +25,7 @@ using System.IO; using GreenshotPlugin.Core; using GreenshotPlugin.IniFile; -namespace GreenshotExternalCommandPlugin { +namespace Greenshot.Plugin.ExternalCommand { public static class IconCache { private static readonly ExternalCommandConfiguration config = IniConfig.GetIniSection(); private static readonly log4net.ILog LOG = log4net.LogManager.GetLogger(typeof(IconCache)); diff --git a/src/Greenshot.Plugin.ExternalCommand/SettingsForm.Designer.cs b/src/Greenshot.Plugin.ExternalCommand/SettingsForm.Designer.cs index f0a000f9b..9795bd93f 100644 --- a/src/Greenshot.Plugin.ExternalCommand/SettingsForm.Designer.cs +++ b/src/Greenshot.Plugin.ExternalCommand/SettingsForm.Designer.cs @@ -18,7 +18,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -namespace GreenshotExternalCommandPlugin { +namespace Greenshot.Plugin.ExternalCommand { partial class SettingsForm { /// /// Designer variable used to keep track of non-visual components. diff --git a/src/Greenshot.Plugin.ExternalCommand/SettingsForm.cs b/src/Greenshot.Plugin.ExternalCommand/SettingsForm.cs index 01eea89bf..c4cf9ca2b 100644 --- a/src/Greenshot.Plugin.ExternalCommand/SettingsForm.cs +++ b/src/Greenshot.Plugin.ExternalCommand/SettingsForm.cs @@ -24,7 +24,7 @@ using System.Drawing; using System.Windows.Forms; using GreenshotPlugin.IniFile; -namespace GreenshotExternalCommandPlugin { +namespace Greenshot.Plugin.ExternalCommand { /// /// Description of SettingsForm. /// diff --git a/src/Greenshot.Plugin.ExternalCommand/SettingsFormDetail.Designer.cs b/src/Greenshot.Plugin.ExternalCommand/SettingsFormDetail.Designer.cs index dd928449d..11d8dc346 100644 --- a/src/Greenshot.Plugin.ExternalCommand/SettingsFormDetail.Designer.cs +++ b/src/Greenshot.Plugin.ExternalCommand/SettingsFormDetail.Designer.cs @@ -18,7 +18,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -namespace GreenshotExternalCommandPlugin { +namespace Greenshot.Plugin.ExternalCommand { partial class SettingsFormDetail { /// /// Designer variable used to keep track of non-visual components. diff --git a/src/Greenshot.Plugin.ExternalCommand/SettingsFormDetail.cs b/src/Greenshot.Plugin.ExternalCommand/SettingsFormDetail.cs index 8affd6976..9c353b197 100644 --- a/src/Greenshot.Plugin.ExternalCommand/SettingsFormDetail.cs +++ b/src/Greenshot.Plugin.ExternalCommand/SettingsFormDetail.cs @@ -26,7 +26,7 @@ using System.Windows.Forms; using GreenshotPlugin.Core; using GreenshotPlugin.IniFile; -namespace GreenshotExternalCommandPlugin { +namespace Greenshot.Plugin.ExternalCommand { /// /// Description of SettingsFormDetail. /// diff --git a/src/Greenshot.Plugin.Flickr/FlickrConfiguration.cs b/src/Greenshot.Plugin.Flickr/FlickrConfiguration.cs index 06f65c9fd..600e61a47 100644 --- a/src/Greenshot.Plugin.Flickr/FlickrConfiguration.cs +++ b/src/Greenshot.Plugin.Flickr/FlickrConfiguration.cs @@ -18,12 +18,13 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ + using System.Windows.Forms; -using GreenshotFlickrPlugin.Forms; +using Greenshot.Plugin.Flickr.Forms; using GreenshotPlugin.Core; using GreenshotPlugin.IniFile; -namespace GreenshotFlickrPlugin { +namespace Greenshot.Plugin.Flickr { public enum SafetyLevel { Safe = 1, Moderate = 2, diff --git a/src/Greenshot.Plugin.Flickr/FlickrDestination.cs b/src/Greenshot.Plugin.Flickr/FlickrDestination.cs index ccd9392d2..340cf3c09 100644 --- a/src/Greenshot.Plugin.Flickr/FlickrDestination.cs +++ b/src/Greenshot.Plugin.Flickr/FlickrDestination.cs @@ -18,12 +18,13 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ + using System.ComponentModel; using System.Drawing; using GreenshotPlugin.Core; using GreenshotPlugin.Interfaces; -namespace GreenshotFlickrPlugin { +namespace Greenshot.Plugin.Flickr { public class FlickrDestination : AbstractDestination { private readonly FlickrPlugin _plugin; public FlickrDestination(FlickrPlugin plugin) { diff --git a/src/Greenshot.Plugin.Flickr/FlickrPlugin.cs b/src/Greenshot.Plugin.Flickr/FlickrPlugin.cs index abf663625..62f21a509 100644 --- a/src/Greenshot.Plugin.Flickr/FlickrPlugin.cs +++ b/src/Greenshot.Plugin.Flickr/FlickrPlugin.cs @@ -31,7 +31,7 @@ using GreenshotPlugin.Interfaces; using GreenshotPlugin.Interfaces.Plugin; using log4net; -namespace GreenshotFlickrPlugin +namespace Greenshot.Plugin.Flickr { /// /// This is the Flickr base code diff --git a/src/Greenshot.Plugin.Flickr/FlickrUtils.cs b/src/Greenshot.Plugin.Flickr/FlickrUtils.cs index 9337c51f6..c6978a17d 100644 --- a/src/Greenshot.Plugin.Flickr/FlickrUtils.cs +++ b/src/Greenshot.Plugin.Flickr/FlickrUtils.cs @@ -30,7 +30,7 @@ using GreenshotPlugin.Interfaces; using GreenshotPlugin.Interfaces.Plugin; using log4net; -namespace GreenshotFlickrPlugin { +namespace Greenshot.Plugin.Flickr { /// /// Description of FlickrUtils. /// diff --git a/src/Greenshot.Plugin.Flickr/Forms/FlickrForm.cs b/src/Greenshot.Plugin.Flickr/Forms/FlickrForm.cs index 94e161d64..74e032708 100644 --- a/src/Greenshot.Plugin.Flickr/Forms/FlickrForm.cs +++ b/src/Greenshot.Plugin.Flickr/Forms/FlickrForm.cs @@ -21,7 +21,7 @@ using GreenshotPlugin.Controls; -namespace GreenshotFlickrPlugin.Forms { +namespace Greenshot.Plugin.Flickr.Forms { public class FlickrForm : GreenshotForm { } } \ No newline at end of file diff --git a/src/Greenshot.Plugin.Flickr/Forms/SettingsForm.Designer.cs b/src/Greenshot.Plugin.Flickr/Forms/SettingsForm.Designer.cs index 18001eab2..c58fe2720 100644 --- a/src/Greenshot.Plugin.Flickr/Forms/SettingsForm.Designer.cs +++ b/src/Greenshot.Plugin.Flickr/Forms/SettingsForm.Designer.cs @@ -18,7 +18,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -namespace GreenshotFlickrPlugin.Forms { +namespace Greenshot.Plugin.Flickr.Forms { partial class SettingsForm { /// /// Designer variable used to keep track of non-visual components. diff --git a/src/Greenshot.Plugin.Flickr/Forms/SettingsForm.cs b/src/Greenshot.Plugin.Flickr/Forms/SettingsForm.cs index 59d0e3cbf..eba638160 100644 --- a/src/Greenshot.Plugin.Flickr/Forms/SettingsForm.cs +++ b/src/Greenshot.Plugin.Flickr/Forms/SettingsForm.cs @@ -19,7 +19,7 @@ * along with this program. If not, see . */ -namespace GreenshotFlickrPlugin.Forms { +namespace Greenshot.Plugin.Flickr.Forms { /// /// Description of PasswordRequestForm. /// diff --git a/src/Greenshot.Plugin.Flickr/Greenshot.Plugin.Flickr.Credentials.template b/src/Greenshot.Plugin.Flickr/Greenshot.Plugin.Flickr.Credentials.template index fb69e4460..0d7c50529 100644 --- a/src/Greenshot.Plugin.Flickr/Greenshot.Plugin.Flickr.Credentials.template +++ b/src/Greenshot.Plugin.Flickr/Greenshot.Plugin.Flickr.Credentials.template @@ -19,7 +19,7 @@ * along with this program. If not, see . */ -namespace GreenshotFlickrPlugin { +namespace Greenshot.Plugin.Flickr { /// /// This class is merely a placeholder for the file keeping the API key and secret for dropbox integration. /// You can set your own values here diff --git a/src/Greenshot.Plugin.Flickr/Greenshot.Plugin.Flickr.csproj b/src/Greenshot.Plugin.Flickr/Greenshot.Plugin.Flickr.csproj index 9c7a8c597..b0acd56db 100644 --- a/src/Greenshot.Plugin.Flickr/Greenshot.Plugin.Flickr.csproj +++ b/src/Greenshot.Plugin.Flickr/Greenshot.Plugin.Flickr.csproj @@ -1,10 +1,4 @@  - - - GreenshotFlickrPlugin - GreenshotFlickrPlugin - - PreserveNewest diff --git a/src/Greenshot.Plugin.Flickr/LanguageKeys.cs b/src/Greenshot.Plugin.Flickr/LanguageKeys.cs index ae3a6af02..d347faa0a 100644 --- a/src/Greenshot.Plugin.Flickr/LanguageKeys.cs +++ b/src/Greenshot.Plugin.Flickr/LanguageKeys.cs @@ -18,7 +18,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -namespace GreenshotFlickrPlugin { +namespace Greenshot.Plugin.Flickr { public enum LangKey { upload_menu_item, upload_failure, diff --git a/src/Greenshot.Plugin.GooglePhotos/Forms/GooglePhotosForm.cs b/src/Greenshot.Plugin.GooglePhotos/Forms/GooglePhotosForm.cs index 10b18bebe..1b3c76816 100644 --- a/src/Greenshot.Plugin.GooglePhotos/Forms/GooglePhotosForm.cs +++ b/src/Greenshot.Plugin.GooglePhotos/Forms/GooglePhotosForm.cs @@ -20,7 +20,7 @@ using GreenshotPlugin.Controls; -namespace GreenshotGooglePhotosPlugin.Forms { +namespace Greenshot.Plugin.GooglePhotos.Forms { public class GooglePhotosForm : GreenshotForm { } } diff --git a/src/Greenshot.Plugin.GooglePhotos/Forms/SettingsForm.Designer.cs b/src/Greenshot.Plugin.GooglePhotos/Forms/SettingsForm.Designer.cs index cea2b6acf..6b95cbc46 100644 --- a/src/Greenshot.Plugin.GooglePhotos/Forms/SettingsForm.Designer.cs +++ b/src/Greenshot.Plugin.GooglePhotos/Forms/SettingsForm.Designer.cs @@ -17,7 +17,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -namespace GreenshotGooglePhotosPlugin.Forms { +namespace Greenshot.Plugin.GooglePhotos.Forms { partial class SettingsForm { /// /// Designer variable used to keep track of non-visual components. diff --git a/src/Greenshot.Plugin.GooglePhotos/Forms/SettingsForm.cs b/src/Greenshot.Plugin.GooglePhotos/Forms/SettingsForm.cs index be31f1d44..3946baf1b 100644 --- a/src/Greenshot.Plugin.GooglePhotos/Forms/SettingsForm.cs +++ b/src/Greenshot.Plugin.GooglePhotos/Forms/SettingsForm.cs @@ -18,7 +18,7 @@ * along with this program. If not, see . */ -namespace GreenshotGooglePhotosPlugin.Forms { +namespace Greenshot.Plugin.GooglePhotos.Forms { /// /// Description of PasswordRequestForm. /// diff --git a/src/Greenshot.Plugin.GooglePhotos/GooglePhotosConfiguration.cs b/src/Greenshot.Plugin.GooglePhotos/GooglePhotosConfiguration.cs index 7e1b614b2..d11d797d1 100644 --- a/src/Greenshot.Plugin.GooglePhotos/GooglePhotosConfiguration.cs +++ b/src/Greenshot.Plugin.GooglePhotos/GooglePhotosConfiguration.cs @@ -17,13 +17,14 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -using System.Windows.Forms; -using GreenshotPlugin.Core; + using System; -using GreenshotGooglePhotosPlugin.Forms; +using System.Windows.Forms; +using Greenshot.Plugin.GooglePhotos.Forms; +using GreenshotPlugin.Core; using GreenshotPlugin.IniFile; -namespace GreenshotGooglePhotosPlugin { +namespace Greenshot.Plugin.GooglePhotos { /// /// Description of GooglePhotosConfiguration. /// diff --git a/src/Greenshot.Plugin.GooglePhotos/GooglePhotosDestination.cs b/src/Greenshot.Plugin.GooglePhotos/GooglePhotosDestination.cs index 586a6e842..2948773ce 100644 --- a/src/Greenshot.Plugin.GooglePhotos/GooglePhotosDestination.cs +++ b/src/Greenshot.Plugin.GooglePhotos/GooglePhotosDestination.cs @@ -17,12 +17,13 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ + using System.ComponentModel; using System.Drawing; using GreenshotPlugin.Core; using GreenshotPlugin.Interfaces; -namespace GreenshotGooglePhotosPlugin { +namespace Greenshot.Plugin.GooglePhotos { public class GooglePhotosDestination : AbstractDestination { private readonly GooglePhotosPlugin _plugin; public GooglePhotosDestination(GooglePhotosPlugin plugin) { diff --git a/src/Greenshot.Plugin.GooglePhotos/GooglePhotosPlugin.cs b/src/Greenshot.Plugin.GooglePhotos/GooglePhotosPlugin.cs index b5d37f62c..ed1727c05 100644 --- a/src/Greenshot.Plugin.GooglePhotos/GooglePhotosPlugin.cs +++ b/src/Greenshot.Plugin.GooglePhotos/GooglePhotosPlugin.cs @@ -17,6 +17,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ + using System; using System.ComponentModel; using System.Drawing; @@ -28,7 +29,7 @@ using GreenshotPlugin.IniFile; using GreenshotPlugin.Interfaces; using GreenshotPlugin.Interfaces.Plugin; -namespace GreenshotGooglePhotosPlugin { +namespace Greenshot.Plugin.GooglePhotos { /// /// This is the GooglePhotos base code /// diff --git a/src/Greenshot.Plugin.GooglePhotos/GooglePhotosUtils.cs b/src/Greenshot.Plugin.GooglePhotos/GooglePhotosUtils.cs index 27aa13d8f..a11edf090 100644 --- a/src/Greenshot.Plugin.GooglePhotos/GooglePhotosUtils.cs +++ b/src/Greenshot.Plugin.GooglePhotos/GooglePhotosUtils.cs @@ -18,15 +18,15 @@ * along with this program. If not, see . */ -using GreenshotPlugin.Core; using System; using System.Xml; +using GreenshotPlugin.Core; using GreenshotPlugin.Core.OAuth; using GreenshotPlugin.IniFile; using GreenshotPlugin.Interfaces; using GreenshotPlugin.Interfaces.Plugin; -namespace GreenshotGooglePhotosPlugin { +namespace Greenshot.Plugin.GooglePhotos { /// /// Description of GooglePhotosUtils. /// diff --git a/src/Greenshot.Plugin.GooglePhotos/Greenshot.Plugin.GooglePhotos.Credentials.template b/src/Greenshot.Plugin.GooglePhotos/Greenshot.Plugin.GooglePhotos.Credentials.template index 452922112..c4ff6bfc6 100644 --- a/src/Greenshot.Plugin.GooglePhotos/Greenshot.Plugin.GooglePhotos.Credentials.template +++ b/src/Greenshot.Plugin.GooglePhotos/Greenshot.Plugin.GooglePhotos.Credentials.template @@ -19,7 +19,7 @@ * along with this program. If not, see . */ -namespace GreenshotGooglePhotosPlugin { +namespace Greenshot.Plugin.GooglePhotos { /// /// This class is merely a placeholder for the file keeping the API key and secret for dropbox integration. /// You can set your own values here diff --git a/src/Greenshot.Plugin.GooglePhotos/Greenshot.Plugin.GooglePhotos.csproj b/src/Greenshot.Plugin.GooglePhotos/Greenshot.Plugin.GooglePhotos.csproj index 3fb62aa99..b15368c8e 100644 --- a/src/Greenshot.Plugin.GooglePhotos/Greenshot.Plugin.GooglePhotos.csproj +++ b/src/Greenshot.Plugin.GooglePhotos/Greenshot.Plugin.GooglePhotos.csproj @@ -6,7 +6,7 @@ - + diff --git a/src/Greenshot.Plugin.GooglePhotos/LanguageKeys.cs b/src/Greenshot.Plugin.GooglePhotos/LanguageKeys.cs index 1a7a73996..34feda885 100644 --- a/src/Greenshot.Plugin.GooglePhotos/LanguageKeys.cs +++ b/src/Greenshot.Plugin.GooglePhotos/LanguageKeys.cs @@ -18,7 +18,7 @@ * along with this program. If not, see . */ -namespace GreenshotGooglePhotosPlugin { +namespace Greenshot.Plugin.GooglePhotos { public enum LangKey { upload_menu_item, diff --git a/src/Greenshot.Plugin.Imgur/Forms/ImgurForm.cs b/src/Greenshot.Plugin.Imgur/Forms/ImgurForm.cs index 37316ac99..c4fb88791 100644 --- a/src/Greenshot.Plugin.Imgur/Forms/ImgurForm.cs +++ b/src/Greenshot.Plugin.Imgur/Forms/ImgurForm.cs @@ -21,7 +21,7 @@ using GreenshotPlugin.Controls; -namespace GreenshotImgurPlugin.Forms { +namespace Greenshot.Plugin.Imgur.Forms { /// /// This class is needed for design-time resolving of the language files /// diff --git a/src/Greenshot.Plugin.Imgur/Forms/ImgurHistory.Designer.cs b/src/Greenshot.Plugin.Imgur/Forms/ImgurHistory.Designer.cs index f8fb05dd2..9b0b5d923 100644 --- a/src/Greenshot.Plugin.Imgur/Forms/ImgurHistory.Designer.cs +++ b/src/Greenshot.Plugin.Imgur/Forms/ImgurHistory.Designer.cs @@ -18,7 +18,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -namespace GreenshotImgurPlugin.Forms +namespace Greenshot.Plugin.Imgur.Forms { partial class ImgurHistory { diff --git a/src/Greenshot.Plugin.Imgur/Forms/ImgurHistory.cs b/src/Greenshot.Plugin.Imgur/Forms/ImgurHistory.cs index 359130a90..3b2efcd48 100644 --- a/src/Greenshot.Plugin.Imgur/Forms/ImgurHistory.cs +++ b/src/Greenshot.Plugin.Imgur/Forms/ImgurHistory.cs @@ -27,7 +27,7 @@ using GreenshotPlugin.Controls; using GreenshotPlugin.Core; using GreenshotPlugin.IniFile; -namespace GreenshotImgurPlugin.Forms { +namespace Greenshot.Plugin.Imgur.Forms { /// /// Imgur history form /// diff --git a/src/Greenshot.Plugin.Imgur/Forms/SettingsForm.Designer.cs b/src/Greenshot.Plugin.Imgur/Forms/SettingsForm.Designer.cs index 79192da09..175c55bb4 100644 --- a/src/Greenshot.Plugin.Imgur/Forms/SettingsForm.Designer.cs +++ b/src/Greenshot.Plugin.Imgur/Forms/SettingsForm.Designer.cs @@ -18,7 +18,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -namespace GreenshotImgurPlugin.Forms { +namespace Greenshot.Plugin.Imgur.Forms { partial class SettingsForm { /// /// Designer variable used to keep track of non-visual components. diff --git a/src/Greenshot.Plugin.Imgur/Forms/SettingsForm.cs b/src/Greenshot.Plugin.Imgur/Forms/SettingsForm.cs index 2ce863660..1ece15fb9 100644 --- a/src/Greenshot.Plugin.Imgur/Forms/SettingsForm.cs +++ b/src/Greenshot.Plugin.Imgur/Forms/SettingsForm.cs @@ -21,7 +21,7 @@ using System; -namespace GreenshotImgurPlugin.Forms { +namespace Greenshot.Plugin.Imgur.Forms { /// /// Description of PasswordRequestForm. /// diff --git a/src/Greenshot.Plugin.Imgur/Greenshot.Plugin.Imgur.Credentials.template b/src/Greenshot.Plugin.Imgur/Greenshot.Plugin.Imgur.Credentials.template index 4c6948fea..eaf70d311 100644 --- a/src/Greenshot.Plugin.Imgur/Greenshot.Plugin.Imgur.Credentials.template +++ b/src/Greenshot.Plugin.Imgur/Greenshot.Plugin.Imgur.Credentials.template @@ -19,7 +19,7 @@ * along with this program. If not, see . */ -namespace GreenshotImgurPlugin { +namespace Greenshot.Plugin.Imgur { /// /// This class is merely a placeholder for the file keeping the API key and secret for imgur integration. /// You can set your own values here diff --git a/src/Greenshot.Plugin.Imgur/Greenshot.Plugin.Imgur.csproj b/src/Greenshot.Plugin.Imgur/Greenshot.Plugin.Imgur.csproj index 9e75ecc5b..170d0aedf 100644 --- a/src/Greenshot.Plugin.Imgur/Greenshot.Plugin.Imgur.csproj +++ b/src/Greenshot.Plugin.Imgur/Greenshot.Plugin.Imgur.csproj @@ -1,10 +1,4 @@  - - - GreenshotImgurPlugin - GreenshotImgurPlugin - - PreserveNewest diff --git a/src/Greenshot.Plugin.Imgur/ImgurConfiguration.cs b/src/Greenshot.Plugin.Imgur/ImgurConfiguration.cs index d487c2387..e9725a2d2 100644 --- a/src/Greenshot.Plugin.Imgur/ImgurConfiguration.cs +++ b/src/Greenshot.Plugin.Imgur/ImgurConfiguration.cs @@ -22,11 +22,11 @@ using System; using System.Collections.Generic; using System.Windows.Forms; -using GreenshotImgurPlugin.Forms; +using Greenshot.Plugin.Imgur.Forms; using GreenshotPlugin.Core; using GreenshotPlugin.IniFile; -namespace GreenshotImgurPlugin { +namespace Greenshot.Plugin.Imgur { /// /// Description of ImgurConfiguration. /// diff --git a/src/Greenshot.Plugin.Imgur/ImgurDestination.cs b/src/Greenshot.Plugin.Imgur/ImgurDestination.cs index 5303ac295..aa24ad68c 100644 --- a/src/Greenshot.Plugin.Imgur/ImgurDestination.cs +++ b/src/Greenshot.Plugin.Imgur/ImgurDestination.cs @@ -18,12 +18,13 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ + using System.ComponentModel; using System.Drawing; using GreenshotPlugin.Core; using GreenshotPlugin.Interfaces; -namespace GreenshotImgurPlugin { +namespace Greenshot.Plugin.Imgur { /// /// Description of ImgurDestination. /// diff --git a/src/Greenshot.Plugin.Imgur/ImgurInfo.cs b/src/Greenshot.Plugin.Imgur/ImgurInfo.cs index 85ec5b39e..5dc82ec2a 100644 --- a/src/Greenshot.Plugin.Imgur/ImgurInfo.cs +++ b/src/Greenshot.Plugin.Imgur/ImgurInfo.cs @@ -18,11 +18,12 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ + using System; using System.Drawing; using System.Xml; -namespace GreenshotImgurPlugin +namespace Greenshot.Plugin.Imgur { /// /// Description of ImgurInfo. diff --git a/src/Greenshot.Plugin.Imgur/ImgurPlugin.cs b/src/Greenshot.Plugin.Imgur/ImgurPlugin.cs index d87c91f8e..ef2edfe4b 100644 --- a/src/Greenshot.Plugin.Imgur/ImgurPlugin.cs +++ b/src/Greenshot.Plugin.Imgur/ImgurPlugin.cs @@ -18,20 +18,21 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ + using System; using System.Collections.Generic; using System.ComponentModel; using System.Drawing; using System.IO; using System.Windows.Forms; -using GreenshotImgurPlugin.Forms; +using Greenshot.Plugin.Imgur.Forms; using GreenshotPlugin.Controls; using GreenshotPlugin.Core; using GreenshotPlugin.IniFile; using GreenshotPlugin.Interfaces; using GreenshotPlugin.Interfaces.Plugin; -namespace GreenshotImgurPlugin { +namespace Greenshot.Plugin.Imgur { /// /// This is the ImgurPlugin code /// diff --git a/src/Greenshot.Plugin.Imgur/ImgurUtils.cs b/src/Greenshot.Plugin.Imgur/ImgurUtils.cs index 6c4b06674..e80aa0f49 100644 --- a/src/Greenshot.Plugin.Imgur/ImgurUtils.cs +++ b/src/Greenshot.Plugin.Imgur/ImgurUtils.cs @@ -18,6 +18,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ + using System; using System.Collections.Generic; using System.IO; @@ -29,7 +30,7 @@ using GreenshotPlugin.IniFile; using GreenshotPlugin.Interfaces; using GreenshotPlugin.Interfaces.Plugin; -namespace GreenshotImgurPlugin { +namespace Greenshot.Plugin.Imgur { /// /// A collection of Imgur helper methods /// diff --git a/src/Greenshot.Plugin.Imgur/LanguageKeys.cs b/src/Greenshot.Plugin.Imgur/LanguageKeys.cs index cfde3c940..9643fb92c 100644 --- a/src/Greenshot.Plugin.Imgur/LanguageKeys.cs +++ b/src/Greenshot.Plugin.Imgur/LanguageKeys.cs @@ -19,7 +19,7 @@ * along with this program. If not, see . */ -namespace GreenshotImgurPlugin { +namespace Greenshot.Plugin.Imgur { public enum LangKey { upload_menu_item, upload_failure, diff --git a/src/Greenshot.Plugin.Jira/AsyncMemoryCache.cs b/src/Greenshot.Plugin.Jira/AsyncMemoryCache.cs index af34e769e..382e61c87 100644 --- a/src/Greenshot.Plugin.Jira/AsyncMemoryCache.cs +++ b/src/Greenshot.Plugin.Jira/AsyncMemoryCache.cs @@ -25,8 +25,7 @@ using System.Threading; using System.Threading.Tasks; using Dapplo.Log; - -namespace GreenshotJiraPlugin +namespace Greenshot.Plugin.Jira { /// /// This abstract class builds a base for a simple async memory cache. diff --git a/src/Greenshot.Plugin.Jira/Forms/JiraForm.Designer.cs b/src/Greenshot.Plugin.Jira/Forms/JiraForm.Designer.cs index bcd10427a..d63fea453 100644 --- a/src/Greenshot.Plugin.Jira/Forms/JiraForm.Designer.cs +++ b/src/Greenshot.Plugin.Jira/Forms/JiraForm.Designer.cs @@ -18,7 +18,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -namespace GreenshotJiraPlugin.Forms { +namespace Greenshot.Plugin.Jira.Forms { partial class JiraForm { /// /// Required designer variable. diff --git a/src/Greenshot.Plugin.Jira/Forms/JiraForm.cs b/src/Greenshot.Plugin.Jira/Forms/JiraForm.cs index b9e4c3df8..3c3cad44d 100644 --- a/src/Greenshot.Plugin.Jira/Forms/JiraForm.cs +++ b/src/Greenshot.Plugin.Jira/Forms/JiraForm.cs @@ -20,17 +20,17 @@ */ using System; -using System.Windows.Forms; -using Dapplo.Jira.Entities; -using GreenshotPlugin.Controls; -using GreenshotPlugin.Core; using System.Collections.Generic; using System.Globalization; using System.Linq; using System.Threading.Tasks; +using System.Windows.Forms; +using Dapplo.Jira.Entities; +using GreenshotPlugin.Controls; +using GreenshotPlugin.Core; using GreenshotPlugin.IniFile; -namespace GreenshotJiraPlugin.Forms { +namespace Greenshot.Plugin.Jira.Forms { public partial class JiraForm : Form { private static readonly log4net.ILog Log = log4net.LogManager.GetLogger(typeof(JiraForm)); private readonly JiraConnector _jiraConnector; diff --git a/src/Greenshot.Plugin.Jira/Forms/JiraFormBase.cs b/src/Greenshot.Plugin.Jira/Forms/JiraFormBase.cs index efc4d0201..caf947779 100644 --- a/src/Greenshot.Plugin.Jira/Forms/JiraFormBase.cs +++ b/src/Greenshot.Plugin.Jira/Forms/JiraFormBase.cs @@ -21,7 +21,7 @@ using GreenshotPlugin.Controls; -namespace GreenshotJiraPlugin.Forms { +namespace Greenshot.Plugin.Jira.Forms { public class JiraFormBase : GreenshotForm { } } diff --git a/src/Greenshot.Plugin.Jira/Forms/SettingsForm.Designer.cs b/src/Greenshot.Plugin.Jira/Forms/SettingsForm.Designer.cs index 0b0195cf4..3e18edb8e 100644 --- a/src/Greenshot.Plugin.Jira/Forms/SettingsForm.Designer.cs +++ b/src/Greenshot.Plugin.Jira/Forms/SettingsForm.Designer.cs @@ -18,7 +18,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -namespace GreenshotJiraPlugin.Forms { +namespace Greenshot.Plugin.Jira.Forms { partial class SettingsForm { /// /// Designer variable used to keep track of non-visual components. diff --git a/src/Greenshot.Plugin.Jira/Forms/SettingsForm.cs b/src/Greenshot.Plugin.Jira/Forms/SettingsForm.cs index 043df8f8b..9871fd74f 100644 --- a/src/Greenshot.Plugin.Jira/Forms/SettingsForm.cs +++ b/src/Greenshot.Plugin.Jira/Forms/SettingsForm.cs @@ -19,7 +19,7 @@ * along with this program. If not, see . */ -namespace GreenshotJiraPlugin.Forms { +namespace Greenshot.Plugin.Jira.Forms { /// /// Description of PasswordRequestForm. /// diff --git a/src/Greenshot.Plugin.Jira/Greenshot.Plugin.Jira.csproj b/src/Greenshot.Plugin.Jira/Greenshot.Plugin.Jira.csproj index d37465111..cda65dc2f 100644 --- a/src/Greenshot.Plugin.Jira/Greenshot.Plugin.Jira.csproj +++ b/src/Greenshot.Plugin.Jira/Greenshot.Plugin.Jira.csproj @@ -1,10 +1,4 @@  - - - GreenshotJiraPlugin - GreenshotJiraPlugin - - PreserveNewest diff --git a/src/Greenshot.Plugin.Jira/IssueTypeBitmapCache.cs b/src/Greenshot.Plugin.Jira/IssueTypeBitmapCache.cs index c37cee314..a1eab6112 100644 --- a/src/Greenshot.Plugin.Jira/IssueTypeBitmapCache.cs +++ b/src/Greenshot.Plugin.Jira/IssueTypeBitmapCache.cs @@ -26,7 +26,7 @@ using System.Threading.Tasks; using Dapplo.Jira; using Dapplo.Jira.Entities; -namespace GreenshotJiraPlugin +namespace Greenshot.Plugin.Jira { /// /// This is the bach for the IssueType bitmaps diff --git a/src/Greenshot.Plugin.Jira/JiraConfiguration.cs b/src/Greenshot.Plugin.Jira/JiraConfiguration.cs index f54132b04..50a521bef 100644 --- a/src/Greenshot.Plugin.Jira/JiraConfiguration.cs +++ b/src/Greenshot.Plugin.Jira/JiraConfiguration.cs @@ -22,7 +22,7 @@ using GreenshotPlugin.Core; using GreenshotPlugin.IniFile; -namespace GreenshotJiraPlugin { +namespace Greenshot.Plugin.Jira { /// /// Description of JiraConfiguration. /// diff --git a/src/Greenshot.Plugin.Jira/JiraConnector.cs b/src/Greenshot.Plugin.Jira/JiraConnector.cs index 6bf5739fe..d16a4b235 100644 --- a/src/Greenshot.Plugin.Jira/JiraConnector.cs +++ b/src/Greenshot.Plugin.Jira/JiraConnector.cs @@ -34,7 +34,7 @@ using Dapplo.Jira.SvgWinForms.Converters; using GreenshotPlugin.Core; using GreenshotPlugin.IniFile; -namespace GreenshotJiraPlugin { +namespace Greenshot.Plugin.Jira { /// /// This encapsulates the JiraClient to make it possible to change as less old Greenshot code as needed /// diff --git a/src/Greenshot.Plugin.Jira/JiraDestination.cs b/src/Greenshot.Plugin.Jira/JiraDestination.cs index 080ec8619..9bc66dd1b 100644 --- a/src/Greenshot.Plugin.Jira/JiraDestination.cs +++ b/src/Greenshot.Plugin.Jira/JiraDestination.cs @@ -27,14 +27,14 @@ using System.IO; using System.Windows.Forms; using Dapplo.HttpExtensions; using Dapplo.Jira.Entities; -using GreenshotJiraPlugin.Forms; +using Greenshot.Plugin.Jira.Forms; using GreenshotPlugin.Controls; using GreenshotPlugin.Core; using GreenshotPlugin.IniFile; using GreenshotPlugin.Interfaces; using GreenshotPlugin.Interfaces.Plugin; -namespace GreenshotJiraPlugin { +namespace Greenshot.Plugin.Jira { /// /// Description of JiraDestination. /// diff --git a/src/Greenshot.Plugin.Jira/JiraDetails.cs b/src/Greenshot.Plugin.Jira/JiraDetails.cs index 67bbc0f61..c0ce97a50 100644 --- a/src/Greenshot.Plugin.Jira/JiraDetails.cs +++ b/src/Greenshot.Plugin.Jira/JiraDetails.cs @@ -22,7 +22,7 @@ using System; using Dapplo.Jira.Entities; -namespace GreenshotJiraPlugin +namespace Greenshot.Plugin.Jira { public class JiraDetails : IComparable { diff --git a/src/Greenshot.Plugin.Jira/JiraEventArgs.cs b/src/Greenshot.Plugin.Jira/JiraEventArgs.cs index eb60e5fcf..a3b5bdeb9 100644 --- a/src/Greenshot.Plugin.Jira/JiraEventArgs.cs +++ b/src/Greenshot.Plugin.Jira/JiraEventArgs.cs @@ -21,7 +21,7 @@ using System; -namespace GreenshotJiraPlugin +namespace Greenshot.Plugin.Jira { public class JiraEventArgs : EventArgs { diff --git a/src/Greenshot.Plugin.Jira/JiraEventTypes.cs b/src/Greenshot.Plugin.Jira/JiraEventTypes.cs index 37e62cab1..704fa182a 100644 --- a/src/Greenshot.Plugin.Jira/JiraEventTypes.cs +++ b/src/Greenshot.Plugin.Jira/JiraEventTypes.cs @@ -19,7 +19,7 @@ * along with this program. If not, see . */ -namespace GreenshotJiraPlugin +namespace Greenshot.Plugin.Jira { public enum JiraEventTypes { diff --git a/src/Greenshot.Plugin.Jira/JiraMonitor.cs b/src/Greenshot.Plugin.Jira/JiraMonitor.cs index 65b73924a..9a4ff1c7e 100644 --- a/src/Greenshot.Plugin.Jira/JiraMonitor.cs +++ b/src/Greenshot.Plugin.Jira/JiraMonitor.cs @@ -29,7 +29,7 @@ using Dapplo.Jira; using Dapplo.Log; using GreenshotPlugin.Hooking; -namespace GreenshotJiraPlugin +namespace Greenshot.Plugin.Jira { /// diff --git a/src/Greenshot.Plugin.Jira/JiraPlugin.cs b/src/Greenshot.Plugin.Jira/JiraPlugin.cs index d58978328..8ab273768 100644 --- a/src/Greenshot.Plugin.Jira/JiraPlugin.cs +++ b/src/Greenshot.Plugin.Jira/JiraPlugin.cs @@ -19,18 +19,18 @@ * along with this program. If not, see . */ -using System.Windows.Forms; using System; using System.Threading.Tasks; +using System.Windows.Forms; using Dapplo.Log; -using GreenshotJiraPlugin.Forms; +using Greenshot.Plugin.Jira.Forms; using GreenshotPlugin.Core; using GreenshotPlugin.IniFile; using GreenshotPlugin.Interfaces; using GreenshotPlugin.Interfaces.Plugin; using log4net; -namespace GreenshotJiraPlugin { +namespace Greenshot.Plugin.Jira { /// /// This is the JiraPlugin base code /// diff --git a/src/Greenshot.Plugin.Jira/LanguageKeys.cs b/src/Greenshot.Plugin.Jira/LanguageKeys.cs index 6820d5d50..a387b44d0 100644 --- a/src/Greenshot.Plugin.Jira/LanguageKeys.cs +++ b/src/Greenshot.Plugin.Jira/LanguageKeys.cs @@ -19,7 +19,7 @@ * along with this program. If not, see . */ -namespace GreenshotJiraPlugin { +namespace Greenshot.Plugin.Jira { public enum LangKey { upload_menu_item, column_assignee, diff --git a/src/Greenshot.Plugin.Jira/Log4NetLogger.cs b/src/Greenshot.Plugin.Jira/Log4NetLogger.cs index d7b8d601c..12a4ac01a 100644 --- a/src/Greenshot.Plugin.Jira/Log4NetLogger.cs +++ b/src/Greenshot.Plugin.Jira/Log4NetLogger.cs @@ -22,7 +22,7 @@ using Dapplo.Log; using log4net; -namespace GreenshotJiraPlugin +namespace Greenshot.Plugin.Jira { /// /// Used to make Dapplo.Log, used in Dapplo.Jira, write to Log4net diff --git a/src/Greenshot.Plugin.Office/Com/DisposableCom.cs b/src/Greenshot.Plugin.Office/Com/DisposableCom.cs index 1fc17a78b..5d969d0be 100644 --- a/src/Greenshot.Plugin.Office/Com/DisposableCom.cs +++ b/src/Greenshot.Plugin.Office/Com/DisposableCom.cs @@ -1,6 +1,6 @@ // Copyright (c) Dapplo and contributors. All rights reserved. // Licensed under the MIT license. See LICENSE file in the project root for full license information. -namespace GreenshotOfficePlugin.Com +namespace Greenshot.Plugin.Office.Com { /// /// A factory for IDisposableCom diff --git a/src/Greenshot.Plugin.Office/Com/DisposableComImplementation.cs b/src/Greenshot.Plugin.Office/Com/DisposableComImplementation.cs index e7a52baac..3f721fc38 100644 --- a/src/Greenshot.Plugin.Office/Com/DisposableComImplementation.cs +++ b/src/Greenshot.Plugin.Office/Com/DisposableComImplementation.cs @@ -4,7 +4,7 @@ using System; using System.Runtime.InteropServices; -namespace GreenshotOfficePlugin.Com +namespace Greenshot.Plugin.Office.Com { /// /// Implementation of the IDisposableCom, this is internal to prevent other code to use it directly diff --git a/src/Greenshot.Plugin.Office/Com/IDisposableCom.cs b/src/Greenshot.Plugin.Office/Com/IDisposableCom.cs index 6bf1327c7..d99b6f4c6 100644 --- a/src/Greenshot.Plugin.Office/Com/IDisposableCom.cs +++ b/src/Greenshot.Plugin.Office/Com/IDisposableCom.cs @@ -3,7 +3,7 @@ using System; -namespace GreenshotOfficePlugin.Com +namespace Greenshot.Plugin.Office.Com { /// /// A simple com wrapper which helps with "using" diff --git a/src/Greenshot.Plugin.Office/Com/Ole32Api.cs b/src/Greenshot.Plugin.Office/Com/Ole32Api.cs index d80167022..60167897e 100644 --- a/src/Greenshot.Plugin.Office/Com/Ole32Api.cs +++ b/src/Greenshot.Plugin.Office/Com/Ole32Api.cs @@ -6,7 +6,7 @@ using System.Runtime.InteropServices; using GreenshotPlugin.Core; using GreenshotPlugin.Core.Enums; -namespace GreenshotOfficePlugin.Com +namespace Greenshot.Plugin.Office.Com { /// /// This provides an API for OLE32 diff --git a/src/Greenshot.Plugin.Office/Com/OleAut32Api.cs b/src/Greenshot.Plugin.Office/Com/OleAut32Api.cs index 6a3e4284c..1c38477b9 100644 --- a/src/Greenshot.Plugin.Office/Com/OleAut32Api.cs +++ b/src/Greenshot.Plugin.Office/Com/OleAut32Api.cs @@ -6,7 +6,7 @@ using System.Runtime.InteropServices; using GreenshotPlugin.Core; using GreenshotPlugin.Core.Enums; -namespace GreenshotOfficePlugin.Com +namespace Greenshot.Plugin.Office.Com { /// /// API for OLEAUT32 diff --git a/src/Greenshot.Plugin.Office/Destinations/ExcelDestination.cs b/src/Greenshot.Plugin.Office/Destinations/ExcelDestination.cs index dfd0ed7e0..571ebc7c4 100644 --- a/src/Greenshot.Plugin.Office/Destinations/ExcelDestination.cs +++ b/src/Greenshot.Plugin.Office/Destinations/ExcelDestination.cs @@ -23,12 +23,12 @@ using System.Collections.Generic; using System.Drawing; using System.IO; using System.Text.RegularExpressions; -using GreenshotOfficePlugin.OfficeExport; +using Greenshot.Plugin.Office.OfficeExport; using GreenshotPlugin.Core; using GreenshotPlugin.Interfaces; using GreenshotPlugin.Interfaces.Plugin; -namespace GreenshotOfficePlugin.Destinations { +namespace Greenshot.Plugin.Office.Destinations { /// /// Description of PowerpointDestination. /// diff --git a/src/Greenshot.Plugin.Office/Destinations/OneNoteDestination.cs b/src/Greenshot.Plugin.Office/Destinations/OneNoteDestination.cs index df833c6a1..d638682f7 100644 --- a/src/Greenshot.Plugin.Office/Destinations/OneNoteDestination.cs +++ b/src/Greenshot.Plugin.Office/Destinations/OneNoteDestination.cs @@ -23,12 +23,12 @@ using System; using System.Collections.Generic; using System.Drawing; using System.IO; -using GreenshotOfficePlugin.OfficeExport; -using GreenshotOfficePlugin.OfficeExport.Entities; +using Greenshot.Plugin.Office.OfficeExport; +using Greenshot.Plugin.Office.OfficeExport.Entities; using GreenshotPlugin.Core; using GreenshotPlugin.Interfaces; -namespace GreenshotOfficePlugin.Destinations { +namespace Greenshot.Plugin.Office.Destinations { public class OneNoteDestination : AbstractDestination { private static readonly log4net.ILog LOG = log4net.LogManager.GetLogger(typeof(WordDestination)); private const int ICON_APPLICATION = 0; diff --git a/src/Greenshot.Plugin.Office/Destinations/OutlookDestination.cs b/src/Greenshot.Plugin.Office/Destinations/OutlookDestination.cs index f08269c51..5f5182235 100644 --- a/src/Greenshot.Plugin.Office/Destinations/OutlookDestination.cs +++ b/src/Greenshot.Plugin.Office/Destinations/OutlookDestination.cs @@ -24,7 +24,7 @@ using System.Drawing; using System.IO; using System.Text.RegularExpressions; using System.Windows.Forms; -using GreenshotOfficePlugin.OfficeExport; +using Greenshot.Plugin.Office.OfficeExport; using GreenshotPlugin.Core; using GreenshotPlugin.IniFile; using GreenshotPlugin.Interfaces; @@ -32,7 +32,7 @@ using GreenshotPlugin.Interfaces.Plugin; using Microsoft.Office.Interop.Outlook; using Microsoft.Win32; -namespace GreenshotOfficePlugin.Destinations { +namespace Greenshot.Plugin.Office.Destinations { /// /// Description of OutlookDestination. /// diff --git a/src/Greenshot.Plugin.Office/Destinations/PowerpointDestination.cs b/src/Greenshot.Plugin.Office/Destinations/PowerpointDestination.cs index 3e3700e4c..1382a316a 100644 --- a/src/Greenshot.Plugin.Office/Destinations/PowerpointDestination.cs +++ b/src/Greenshot.Plugin.Office/Destinations/PowerpointDestination.cs @@ -24,12 +24,12 @@ using System.Drawing; using System.IO; using System.Linq; using System.Text.RegularExpressions; -using GreenshotOfficePlugin.OfficeExport; +using Greenshot.Plugin.Office.OfficeExport; using GreenshotPlugin.Core; using GreenshotPlugin.Interfaces; using GreenshotPlugin.Interfaces.Plugin; -namespace GreenshotOfficePlugin.Destinations { +namespace Greenshot.Plugin.Office.Destinations { /// /// Description of PowerpointDestination. /// diff --git a/src/Greenshot.Plugin.Office/Destinations/WordDestination.cs b/src/Greenshot.Plugin.Office/Destinations/WordDestination.cs index a7d630d1d..4f85dd99e 100644 --- a/src/Greenshot.Plugin.Office/Destinations/WordDestination.cs +++ b/src/Greenshot.Plugin.Office/Destinations/WordDestination.cs @@ -25,12 +25,12 @@ using System.Drawing; using System.IO; using System.Linq; using System.Text.RegularExpressions; -using GreenshotOfficePlugin.OfficeExport; +using Greenshot.Plugin.Office.OfficeExport; using GreenshotPlugin.Core; using GreenshotPlugin.Interfaces; using GreenshotPlugin.Interfaces.Plugin; -namespace GreenshotOfficePlugin.Destinations { +namespace Greenshot.Plugin.Office.Destinations { /// /// Description of EmailDestination. /// diff --git a/src/Greenshot.Plugin.Office/Greenshot.Plugin.Office.csproj b/src/Greenshot.Plugin.Office/Greenshot.Plugin.Office.csproj index f6f07e98d..2ca43d6fe 100644 --- a/src/Greenshot.Plugin.Office/Greenshot.Plugin.Office.csproj +++ b/src/Greenshot.Plugin.Office/Greenshot.Plugin.Office.csproj @@ -1,10 +1,4 @@  - - - GreenshotOfficePlugin - GreenshotOfficePlugin - - PreserveNewest diff --git a/src/Greenshot.Plugin.Office/OfficeConfiguration.cs b/src/Greenshot.Plugin.Office/OfficeConfiguration.cs index 7064715fd..eaf118d6a 100644 --- a/src/Greenshot.Plugin.Office/OfficeConfiguration.cs +++ b/src/Greenshot.Plugin.Office/OfficeConfiguration.cs @@ -19,11 +19,11 @@ * along with this program. If not, see . */ -using GreenshotOfficePlugin.OfficeInterop; +using Greenshot.Plugin.Office.OfficeInterop; using GreenshotPlugin.IniFile; using Microsoft.Office.Interop.PowerPoint; -namespace GreenshotOfficePlugin { +namespace Greenshot.Plugin.Office { /// /// Description of CoreConfiguration. diff --git a/src/Greenshot.Plugin.Office/OfficeExport/Entities/OneNoteNotebook.cs b/src/Greenshot.Plugin.Office/OfficeExport/Entities/OneNoteNotebook.cs index 40bf4255e..861ad8927 100644 --- a/src/Greenshot.Plugin.Office/OfficeExport/Entities/OneNoteNotebook.cs +++ b/src/Greenshot.Plugin.Office/OfficeExport/Entities/OneNoteNotebook.cs @@ -17,7 +17,7 @@ // You should have received a copy of the GNU General Public License // along with this program. If not, see . -namespace GreenshotOfficePlugin.OfficeExport.Entities +namespace Greenshot.Plugin.Office.OfficeExport.Entities { /// /// Container for transporting notebook information diff --git a/src/Greenshot.Plugin.Office/OfficeExport/Entities/OneNotePage.cs b/src/Greenshot.Plugin.Office/OfficeExport/Entities/OneNotePage.cs index 6bc67084b..685fc4e18 100644 --- a/src/Greenshot.Plugin.Office/OfficeExport/Entities/OneNotePage.cs +++ b/src/Greenshot.Plugin.Office/OfficeExport/Entities/OneNotePage.cs @@ -17,7 +17,7 @@ // You should have received a copy of the GNU General Public License // along with this program. If not, see . -namespace GreenshotOfficePlugin.OfficeExport.Entities +namespace Greenshot.Plugin.Office.OfficeExport.Entities { /// /// Container for transporting Page information diff --git a/src/Greenshot.Plugin.Office/OfficeExport/Entities/OneNoteSection.cs b/src/Greenshot.Plugin.Office/OfficeExport/Entities/OneNoteSection.cs index 00eafb5ae..6464ee2c4 100644 --- a/src/Greenshot.Plugin.Office/OfficeExport/Entities/OneNoteSection.cs +++ b/src/Greenshot.Plugin.Office/OfficeExport/Entities/OneNoteSection.cs @@ -17,7 +17,7 @@ // You should have received a copy of the GNU General Public License // along with this program. If not, see . -namespace GreenshotOfficePlugin.OfficeExport.Entities +namespace Greenshot.Plugin.Office.OfficeExport.Entities { /// /// Container for transporting section information diff --git a/src/Greenshot.Plugin.Office/OfficeExport/ExcelExporter.cs b/src/Greenshot.Plugin.Office/OfficeExport/ExcelExporter.cs index ad92c6743..f508208f7 100644 --- a/src/Greenshot.Plugin.Office/OfficeExport/ExcelExporter.cs +++ b/src/Greenshot.Plugin.Office/OfficeExport/ExcelExporter.cs @@ -20,14 +20,14 @@ using System; using System.Collections.Generic; using System.Drawing; -using GreenshotOfficePlugin.Com; -using GreenshotOfficePlugin.OfficeInterop; +using Greenshot.Plugin.Office.Com; +using Greenshot.Plugin.Office.OfficeInterop; using GreenshotPlugin.UnmanagedHelpers; using Microsoft.Office.Core; using Microsoft.Office.Interop.Excel; using Version = System.Version; -namespace GreenshotOfficePlugin.OfficeExport +namespace Greenshot.Plugin.Office.OfficeExport { /// /// Excel exporter diff --git a/src/Greenshot.Plugin.Office/OfficeExport/OneNoteExporter.cs b/src/Greenshot.Plugin.Office/OfficeExport/OneNoteExporter.cs index 5b0fcb8c5..4936315bc 100644 --- a/src/Greenshot.Plugin.Office/OfficeExport/OneNoteExporter.cs +++ b/src/Greenshot.Plugin.Office/OfficeExport/OneNoteExporter.cs @@ -22,14 +22,14 @@ using System.Collections.Generic; using System.IO; using System.Runtime.InteropServices; using System.Xml; -using GreenshotOfficePlugin.Com; -using GreenshotOfficePlugin.OfficeExport.Entities; +using Greenshot.Plugin.Office.Com; +using Greenshot.Plugin.Office.OfficeExport.Entities; using GreenshotPlugin.Core; using GreenshotPlugin.Interfaces; using GreenshotPlugin.Interfaces.Plugin; using Microsoft.Office.Interop.OneNote; -namespace GreenshotOfficePlugin.OfficeExport +namespace Greenshot.Plugin.Office.OfficeExport { /// /// OneNote exporter diff --git a/src/Greenshot.Plugin.Office/OfficeExport/OutlookEmailExporter.cs b/src/Greenshot.Plugin.Office/OfficeExport/OutlookEmailExporter.cs index 40306ecf7..93fc68567 100644 --- a/src/Greenshot.Plugin.Office/OfficeExport/OutlookEmailExporter.cs +++ b/src/Greenshot.Plugin.Office/OfficeExport/OutlookEmailExporter.cs @@ -21,8 +21,8 @@ using System; using System.Collections.Generic; using System.IO; using System.Text; -using GreenshotOfficePlugin.Com; -using GreenshotOfficePlugin.OfficeInterop; +using Greenshot.Plugin.Office.Com; +using Greenshot.Plugin.Office.OfficeInterop; using GreenshotPlugin.IniFile; using Microsoft.Office.Interop.Outlook; using Microsoft.Office.Interop.Word; @@ -32,7 +32,7 @@ using Application = Microsoft.Office.Interop.Outlook.Application; using Exception = System.Exception; using Version = System.Version; -namespace GreenshotOfficePlugin.OfficeExport +namespace Greenshot.Plugin.Office.OfficeExport { /// /// Outlook exporter has all the functionality to export to outlook diff --git a/src/Greenshot.Plugin.Office/OfficeExport/PowerpointExporter.cs b/src/Greenshot.Plugin.Office/OfficeExport/PowerpointExporter.cs index 7f87ff111..aaa473ddf 100644 --- a/src/Greenshot.Plugin.Office/OfficeExport/PowerpointExporter.cs +++ b/src/Greenshot.Plugin.Office/OfficeExport/PowerpointExporter.cs @@ -20,14 +20,14 @@ using System; using System.Collections.Generic; using System.Drawing; -using GreenshotOfficePlugin.Com; -using GreenshotOfficePlugin.OfficeInterop; +using Greenshot.Plugin.Office.Com; +using Greenshot.Plugin.Office.OfficeInterop; using GreenshotPlugin.IniFile; using Microsoft.Office.Core; using Microsoft.Office.Interop.PowerPoint; using Shape = Microsoft.Office.Interop.PowerPoint.Shape; -namespace GreenshotOfficePlugin.OfficeExport +namespace Greenshot.Plugin.Office.OfficeExport { /// /// Export logic for powerpoint diff --git a/src/Greenshot.Plugin.Office/OfficeExport/WordExporter.cs b/src/Greenshot.Plugin.Office/OfficeExport/WordExporter.cs index b44f08161..ce4da64d2 100644 --- a/src/Greenshot.Plugin.Office/OfficeExport/WordExporter.cs +++ b/src/Greenshot.Plugin.Office/OfficeExport/WordExporter.cs @@ -19,14 +19,14 @@ using System; using System.Collections.Generic; -using GreenshotOfficePlugin.Com; -using GreenshotOfficePlugin.OfficeInterop; +using Greenshot.Plugin.Office.Com; +using Greenshot.Plugin.Office.OfficeInterop; using GreenshotPlugin.IniFile; using Microsoft.Office.Core; using Microsoft.Office.Interop.Word; using Version = System.Version; -namespace GreenshotOfficePlugin.OfficeExport +namespace Greenshot.Plugin.Office.OfficeExport { /// /// This makes it possible to export to word diff --git a/src/Greenshot.Plugin.Office/OfficeInterop/EmailFormat.cs b/src/Greenshot.Plugin.Office/OfficeInterop/EmailFormat.cs index 2de5cbf71..55c347c5e 100644 --- a/src/Greenshot.Plugin.Office/OfficeInterop/EmailFormat.cs +++ b/src/Greenshot.Plugin.Office/OfficeInterop/EmailFormat.cs @@ -17,7 +17,7 @@ // You should have received a copy of the GNU General Public License // along with this program. If not, see . -namespace GreenshotOfficePlugin.OfficeInterop +namespace Greenshot.Plugin.Office.OfficeInterop { /// /// Specifies which EmailFormat the email needs to use diff --git a/src/Greenshot.Plugin.Office/OfficeInterop/OfficeVersions.cs b/src/Greenshot.Plugin.Office/OfficeInterop/OfficeVersions.cs index 3988148c5..ef74d6f9a 100644 --- a/src/Greenshot.Plugin.Office/OfficeInterop/OfficeVersions.cs +++ b/src/Greenshot.Plugin.Office/OfficeInterop/OfficeVersions.cs @@ -17,7 +17,7 @@ // You should have received a copy of the GNU General Public License // along with this program. If not, see . -namespace GreenshotOfficePlugin.OfficeInterop +namespace Greenshot.Plugin.Office.OfficeInterop { /// /// A mapping between the version and a usable name diff --git a/src/Greenshot.Plugin.Office/OfficePlugin.cs b/src/Greenshot.Plugin.Office/OfficePlugin.cs index 6a17626a8..7abdecf02 100644 --- a/src/Greenshot.Plugin.Office/OfficePlugin.cs +++ b/src/Greenshot.Plugin.Office/OfficePlugin.cs @@ -18,14 +18,15 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ + using System; using System.Collections.Generic; -using GreenshotOfficePlugin.Destinations; +using Greenshot.Plugin.Office.Destinations; using GreenshotPlugin.Core; using GreenshotPlugin.Interfaces; using GreenshotPlugin.Interfaces.Plugin; -namespace GreenshotOfficePlugin { +namespace Greenshot.Plugin.Office { /// /// This is the OfficePlugin base code /// diff --git a/src/Greenshot.Plugin.Photobucket/Forms/PhotobucketForm.cs b/src/Greenshot.Plugin.Photobucket/Forms/PhotobucketForm.cs index 70971ca61..09e3bc3ca 100644 --- a/src/Greenshot.Plugin.Photobucket/Forms/PhotobucketForm.cs +++ b/src/Greenshot.Plugin.Photobucket/Forms/PhotobucketForm.cs @@ -19,7 +19,7 @@ * along with this program. If not, see . */ -namespace GreenshotPhotobucketPlugin.Forms { +namespace Greenshot.Plugin.Photobucket.Forms { /// /// This class is needed for design-time resolving of the language files /// diff --git a/src/Greenshot.Plugin.Photobucket/Forms/SettingsForm.Designer.cs b/src/Greenshot.Plugin.Photobucket/Forms/SettingsForm.Designer.cs index 4a0486dd1..85d3a588b 100644 --- a/src/Greenshot.Plugin.Photobucket/Forms/SettingsForm.Designer.cs +++ b/src/Greenshot.Plugin.Photobucket/Forms/SettingsForm.Designer.cs @@ -18,7 +18,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -namespace GreenshotPhotobucketPlugin.Forms { +namespace Greenshot.Plugin.Photobucket.Forms { partial class SettingsForm { /// /// Designer variable used to keep track of non-visual components. diff --git a/src/Greenshot.Plugin.Photobucket/Forms/SettingsForm.cs b/src/Greenshot.Plugin.Photobucket/Forms/SettingsForm.cs index 1d221b2a9..9d380bdd8 100644 --- a/src/Greenshot.Plugin.Photobucket/Forms/SettingsForm.cs +++ b/src/Greenshot.Plugin.Photobucket/Forms/SettingsForm.cs @@ -19,7 +19,7 @@ * along with this program. If not, see . */ -namespace GreenshotPhotobucketPlugin.Forms { +namespace Greenshot.Plugin.Photobucket.Forms { /// /// Description of PasswordRequestForm. /// diff --git a/src/Greenshot.Plugin.Photobucket/Greenshot.Plugin.Photobucket.Credentials.template b/src/Greenshot.Plugin.Photobucket/Greenshot.Plugin.Photobucket.Credentials.template index 312099888..8895f5a73 100644 --- a/src/Greenshot.Plugin.Photobucket/Greenshot.Plugin.Photobucket.Credentials.template +++ b/src/Greenshot.Plugin.Photobucket/Greenshot.Plugin.Photobucket.Credentials.template @@ -19,7 +19,7 @@ * along with this program. If not, see . */ -namespace GreenshotPhotobucketPlugin { +namespace Greenshot.Plugin.Photobucket { /// /// This class is merely a placeholder for the file keeping the API key and secret for photobucket integration. /// You can set your own values here diff --git a/src/Greenshot.Plugin.Photobucket/Greenshot.Plugin.Photobucket.csproj b/src/Greenshot.Plugin.Photobucket/Greenshot.Plugin.Photobucket.csproj index bab11d46e..bb0b57ef0 100644 --- a/src/Greenshot.Plugin.Photobucket/Greenshot.Plugin.Photobucket.csproj +++ b/src/Greenshot.Plugin.Photobucket/Greenshot.Plugin.Photobucket.csproj @@ -1,10 +1,4 @@  - - - GreenshotPhotobucketPlugin - GreenshotPhotobucketPlugin - - PreserveNewest diff --git a/src/Greenshot.Plugin.Photobucket/LanguageKeys.cs b/src/Greenshot.Plugin.Photobucket/LanguageKeys.cs index 010c4fda0..8795b92f0 100644 --- a/src/Greenshot.Plugin.Photobucket/LanguageKeys.cs +++ b/src/Greenshot.Plugin.Photobucket/LanguageKeys.cs @@ -19,7 +19,7 @@ * along with this program. If not, see . */ -namespace GreenshotPhotobucketPlugin { +namespace Greenshot.Plugin.Photobucket { public enum LangKey { upload_menu_item, upload_failure, diff --git a/src/Greenshot.Plugin.Photobucket/PhotobucketConfiguration.cs b/src/Greenshot.Plugin.Photobucket/PhotobucketConfiguration.cs index c852c0c81..cf2501cd0 100644 --- a/src/Greenshot.Plugin.Photobucket/PhotobucketConfiguration.cs +++ b/src/Greenshot.Plugin.Photobucket/PhotobucketConfiguration.cs @@ -18,13 +18,14 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ + using System.Windows.Forms; -using GreenshotPhotobucketPlugin.Forms; +using Greenshot.Plugin.Photobucket.Forms; using GreenshotPlugin.Controls; using GreenshotPlugin.Core; using GreenshotPlugin.IniFile; -namespace GreenshotPhotobucketPlugin { +namespace Greenshot.Plugin.Photobucket { /// /// Description of PhotobucketConfiguration. /// diff --git a/src/Greenshot.Plugin.Photobucket/PhotobucketDestination.cs b/src/Greenshot.Plugin.Photobucket/PhotobucketDestination.cs index 96dc98926..564e64511 100644 --- a/src/Greenshot.Plugin.Photobucket/PhotobucketDestination.cs +++ b/src/Greenshot.Plugin.Photobucket/PhotobucketDestination.cs @@ -18,13 +18,14 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -using System.ComponentModel; + using System.Collections.Generic; +using System.ComponentModel; using System.Drawing; using GreenshotPlugin.Core; using GreenshotPlugin.Interfaces; -namespace GreenshotPhotobucketPlugin { +namespace Greenshot.Plugin.Photobucket { /// /// Description of PhotobucketDestination. /// diff --git a/src/Greenshot.Plugin.Photobucket/PhotobucketInfo.cs b/src/Greenshot.Plugin.Photobucket/PhotobucketInfo.cs index b9759eb3c..98b3b7517 100644 --- a/src/Greenshot.Plugin.Photobucket/PhotobucketInfo.cs +++ b/src/Greenshot.Plugin.Photobucket/PhotobucketInfo.cs @@ -18,10 +18,11 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ + using System; using System.Xml; -namespace GreenshotPhotobucketPlugin +namespace Greenshot.Plugin.Photobucket { /// /// Description of PhotobucketInfo. diff --git a/src/Greenshot.Plugin.Photobucket/PhotobucketPlugin.cs b/src/Greenshot.Plugin.Photobucket/PhotobucketPlugin.cs index a9670a6a2..b45f563e0 100644 --- a/src/Greenshot.Plugin.Photobucket/PhotobucketPlugin.cs +++ b/src/Greenshot.Plugin.Photobucket/PhotobucketPlugin.cs @@ -18,6 +18,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ + using System; using System.ComponentModel; using System.Drawing; @@ -29,7 +30,7 @@ using GreenshotPlugin.IniFile; using GreenshotPlugin.Interfaces; using GreenshotPlugin.Interfaces.Plugin; -namespace GreenshotPhotobucketPlugin { +namespace Greenshot.Plugin.Photobucket { /// /// This is the GreenshotPhotobucketPlugin base code /// diff --git a/src/Greenshot.Plugin.Photobucket/PhotobucketUtils.cs b/src/Greenshot.Plugin.Photobucket/PhotobucketUtils.cs index bb59ff09a..eeda1ae74 100644 --- a/src/Greenshot.Plugin.Photobucket/PhotobucketUtils.cs +++ b/src/Greenshot.Plugin.Photobucket/PhotobucketUtils.cs @@ -18,6 +18,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ + using System; using System.Collections; using System.Collections.Generic; @@ -29,7 +30,7 @@ using GreenshotPlugin.IniFile; using GreenshotPlugin.Interfaces; using GreenshotPlugin.Interfaces.Plugin; -namespace GreenshotPhotobucketPlugin { +namespace Greenshot.Plugin.Photobucket { /// /// Description of PhotobucketUtils. /// diff --git a/src/Greenshot.Plugin.Win10/Destinations/Win10OcrDestination.cs b/src/Greenshot.Plugin.Win10/Destinations/Win10OcrDestination.cs index 3bcad532d..616960615 100644 --- a/src/Greenshot.Plugin.Win10/Destinations/Win10OcrDestination.cs +++ b/src/Greenshot.Plugin.Win10/Destinations/Win10OcrDestination.cs @@ -27,7 +27,7 @@ using GreenshotPlugin.Core; using GreenshotPlugin.Interfaces; using GreenshotPlugin.Interfaces.Ocr; -namespace GreenshotWin10Plugin.Destinations +namespace Greenshot.Plugin.Win10.Destinations { /// /// This uses the OcrEngine from Windows 10 to perform OCR on the captured image. diff --git a/src/Greenshot.Plugin.Win10/Destinations/Win10ShareDestination.cs b/src/Greenshot.Plugin.Win10/Destinations/Win10ShareDestination.cs index fb52ef925..2581dc586 100644 --- a/src/Greenshot.Plugin.Win10/Destinations/Win10ShareDestination.cs +++ b/src/Greenshot.Plugin.Win10/Destinations/Win10ShareDestination.cs @@ -29,15 +29,15 @@ using System.Windows.Interop; using System.Windows.Media; using Windows.Storage; using Windows.Storage.Streams; +using Greenshot.Plugin.Win10.Internal; +using Greenshot.Plugin.Win10.Native; using GreenshotPlugin.Core; using GreenshotPlugin.Hooking; using GreenshotPlugin.Interfaces; using GreenshotPlugin.Interfaces.Plugin; -using GreenshotWin10Plugin.Internal; -using GreenshotWin10Plugin.Native; using Color = Windows.UI.Color; -namespace GreenshotWin10Plugin.Destinations +namespace Greenshot.Plugin.Win10.Destinations { /// /// This uses the Share from Windows 10 to make the capture available to apps. diff --git a/src/Greenshot.Plugin.Win10/Greenshot.Plugin.Win10.csproj b/src/Greenshot.Plugin.Win10/Greenshot.Plugin.Win10.csproj index 2c8237637..bd79af992 100644 --- a/src/Greenshot.Plugin.Win10/Greenshot.Plugin.Win10.csproj +++ b/src/Greenshot.Plugin.Win10/Greenshot.Plugin.Win10.csproj @@ -1,10 +1,4 @@  - - - GreenshotWin10Plugin - GreenshotWin10Plugin - - PreserveNewest diff --git a/src/Greenshot.Plugin.Win10/Internal/MemoryRandomAccessStream.cs b/src/Greenshot.Plugin.Win10/Internal/MemoryRandomAccessStream.cs index e342f87ae..e4a49c64e 100644 --- a/src/Greenshot.Plugin.Win10/Internal/MemoryRandomAccessStream.cs +++ b/src/Greenshot.Plugin.Win10/Internal/MemoryRandomAccessStream.cs @@ -22,7 +22,7 @@ using System.IO; using Windows.Storage.Streams; -namespace GreenshotWin10Plugin.Internal +namespace Greenshot.Plugin.Win10.Internal { /// /// This is an IRandomAccessStream implementation which uses a MemoryStream diff --git a/src/Greenshot.Plugin.Win10/Internal/ShareInfo.cs b/src/Greenshot.Plugin.Win10/Internal/ShareInfo.cs index 7516de371..44b0d529b 100644 --- a/src/Greenshot.Plugin.Win10/Internal/ShareInfo.cs +++ b/src/Greenshot.Plugin.Win10/Internal/ShareInfo.cs @@ -23,7 +23,7 @@ using System; using System.Threading.Tasks; using Windows.ApplicationModel.DataTransfer; -namespace GreenshotWin10Plugin.Internal +namespace Greenshot.Plugin.Win10.Internal { internal class ShareInfo { diff --git a/src/Greenshot.Plugin.Win10/Native/DataTransferManagerHelper.cs b/src/Greenshot.Plugin.Win10/Native/DataTransferManagerHelper.cs index 2594b4338..192e818ec 100644 --- a/src/Greenshot.Plugin.Win10/Native/DataTransferManagerHelper.cs +++ b/src/Greenshot.Plugin.Win10/Native/DataTransferManagerHelper.cs @@ -19,12 +19,12 @@ * along with this program. If not, see . */ -using GreenshotPlugin.Core; using System; using System.Runtime.InteropServices.WindowsRuntime; using Windows.ApplicationModel.DataTransfer; +using GreenshotPlugin.Core; -namespace GreenshotWin10Plugin.Native +namespace Greenshot.Plugin.Win10.Native { /// /// Wraps the interop for calling the ShareUI diff --git a/src/Greenshot.Plugin.Win10/Native/IDataTransferManagerInterOp.cs b/src/Greenshot.Plugin.Win10/Native/IDataTransferManagerInterOp.cs index 14fb4c8eb..dc477aac8 100644 --- a/src/Greenshot.Plugin.Win10/Native/IDataTransferManagerInterOp.cs +++ b/src/Greenshot.Plugin.Win10/Native/IDataTransferManagerInterOp.cs @@ -17,12 +17,12 @@ // You should have received a copy of the GNU General Public License // along with this program. If not, see . -using GreenshotPlugin.Core.Enums; using System; using System.Runtime.InteropServices; using Windows.ApplicationModel.DataTransfer; +using GreenshotPlugin.Core.Enums; -namespace GreenshotWin10Plugin.Native +namespace Greenshot.Plugin.Win10.Native { /// /// The IDataTransferManagerInterOp is documented here: https://msdn.microsoft.com/en-us/library/windows/desktop/jj542488(v=vs.85).aspx. diff --git a/src/Greenshot.Plugin.Win10/Processors/Win10OcrProcessor.cs b/src/Greenshot.Plugin.Win10/Processors/Win10OcrProcessor.cs index 341153eab..c70c6fb27 100644 --- a/src/Greenshot.Plugin.Win10/Processors/Win10OcrProcessor.cs +++ b/src/Greenshot.Plugin.Win10/Processors/Win10OcrProcessor.cs @@ -25,7 +25,7 @@ using GreenshotPlugin.IniFile; using GreenshotPlugin.Interfaces; using GreenshotPlugin.Interfaces.Ocr; -namespace GreenshotWin10Plugin.Processors { +namespace Greenshot.Plugin.Win10.Processors { /// /// This processor processes a capture to see if there is text on it /// diff --git a/src/Greenshot.Plugin.Win10/ToastNotificationService.cs b/src/Greenshot.Plugin.Win10/ToastNotificationService.cs index e7c932ab7..444d397ef 100644 --- a/src/Greenshot.Plugin.Win10/ToastNotificationService.cs +++ b/src/Greenshot.Plugin.Win10/ToastNotificationService.cs @@ -31,7 +31,7 @@ using GreenshotPlugin.Interfaces; using log4net; using Microsoft.Toolkit.Uwp.Notifications; -namespace GreenshotWin10Plugin +namespace Greenshot.Plugin.Win10 { /// /// This service provides a way to inform (notify) the user. diff --git a/src/Greenshot.Plugin.Win10/Win10Configuration.cs b/src/Greenshot.Plugin.Win10/Win10Configuration.cs index ba3091909..9c24787bf 100644 --- a/src/Greenshot.Plugin.Win10/Win10Configuration.cs +++ b/src/Greenshot.Plugin.Win10/Win10Configuration.cs @@ -21,7 +21,7 @@ using GreenshotPlugin.IniFile; -namespace GreenshotWin10Plugin +namespace Greenshot.Plugin.Win10 { /// /// Description of Win10Configuration. diff --git a/src/Greenshot.Plugin.Win10/Win10OcrProvider.cs b/src/Greenshot.Plugin.Win10/Win10OcrProvider.cs index 81fd442e8..5ade2f329 100644 --- a/src/Greenshot.Plugin.Win10/Win10OcrProvider.cs +++ b/src/Greenshot.Plugin.Win10/Win10OcrProvider.cs @@ -31,7 +31,7 @@ using GreenshotPlugin.Interfaces; using GreenshotPlugin.Interfaces.Ocr; using GreenshotPlugin.Interfaces.Plugin; -namespace GreenshotWin10Plugin +namespace Greenshot.Plugin.Win10 { /// /// This uses the OcrEngine from Windows 10 to perform OCR on the captured image. diff --git a/src/Greenshot.Plugin.Win10/Win10Plugin.cs b/src/Greenshot.Plugin.Win10/Win10Plugin.cs index dc5190bbe..b70a417cb 100644 --- a/src/Greenshot.Plugin.Win10/Win10Plugin.cs +++ b/src/Greenshot.Plugin.Win10/Win10Plugin.cs @@ -20,14 +20,14 @@ */ using System; +using Greenshot.Plugin.Win10.Destinations; +using Greenshot.Plugin.Win10.Processors; using GreenshotPlugin.Core; using GreenshotPlugin.Interfaces; using GreenshotPlugin.Interfaces.Ocr; using GreenshotPlugin.Interfaces.Plugin; -using GreenshotWin10Plugin.Destinations; -using GreenshotWin10Plugin.Processors; -namespace GreenshotWin10Plugin +namespace Greenshot.Plugin.Win10 { /// /// This is the Win10Plugin diff --git a/src/GreenshotPlugin/FileDescriptorReader.cs b/src/GreenshotPlugin/FileDescriptorReader.cs index 93b94f834..7e0f3b9ab 100644 --- a/src/GreenshotPlugin/FileDescriptorReader.cs +++ b/src/GreenshotPlugin/FileDescriptorReader.cs @@ -27,7 +27,7 @@ using System.Runtime.InteropServices.ComTypes; using System.Text; using GreenshotPlugin.UnmanagedHelpers.Structs; -namespace GreenshotPlugin.Interop +namespace GreenshotPlugin { ///