diff --git a/Configuration/Arguments.cs b/Configuration/Arguments.cs index 2c51a8ab..1583774c 100644 --- a/Configuration/Arguments.cs +++ b/Configuration/Arguments.cs @@ -1,7 +1,7 @@ using System; -using TweetDck.Core.Utils; +using TweetDuck.Core.Utils; -namespace TweetDck.Configuration{ +namespace TweetDuck.Configuration{ static class Arguments{ // public args public const string ArgDataFolder = "-datafolder"; diff --git a/Configuration/LockManager.cs b/Configuration/LockManager.cs index f61cf71a..6f61312c 100644 --- a/Configuration/LockManager.cs +++ b/Configuration/LockManager.cs @@ -2,9 +2,9 @@ using System.ComponentModel; using System.Diagnostics; using System.IO; -using TweetDck.Core.Utils; +using TweetDuck.Core.Utils; -namespace TweetDck.Configuration{ +namespace TweetDuck.Configuration{ sealed class LockManager{ public enum Result{ Success, HasProcess, Fail diff --git a/Configuration/UserConfig.cs b/Configuration/UserConfig.cs index 6bdc0533..c2033ea5 100644 --- a/Configuration/UserConfig.cs +++ b/Configuration/UserConfig.cs @@ -3,16 +3,22 @@ using System.IO; using System.Runtime.Serialization; using System.Runtime.Serialization.Formatters.Binary; -using TweetDck.Core; -using TweetDck.Core.Controls; -using TweetDck.Core.Notification; -using TweetDck.Core.Utils; -using TweetDck.Plugins; +using TweetDuck.Core; +using TweetDuck.Core.Controls; +using TweetDuck.Core.Notification; +using TweetDuck.Core.Utils; +using TweetDuck.Plugins; -namespace TweetDck.Configuration{ +namespace TweetDuck.Configuration{ [Serializable] sealed class UserConfig{ - private static readonly IFormatter Formatter = new BinaryFormatter(); + private static readonly IFormatter Formatter = new BinaryFormatter{ Binder = new LegacyBinder() }; + + private class LegacyBinder : SerializationBinder{ + public override Type BindToType(string assemblyName, string typeName){ + return Type.GetType(string.Format("{0}, {1}", typeName.Replace("TweetDck", "TweetDuck"), assemblyName.Replace("TweetDck", "TweetDuck"))); + } + } private const int CurrentFileVersion = 9; diff --git a/Core/Bridge/CallbackBridge.cs b/Core/Bridge/CallbackBridge.cs index 4c0cbfba..804e11ff 100644 --- a/Core/Bridge/CallbackBridge.cs +++ b/Core/Bridge/CallbackBridge.cs @@ -1,8 +1,8 @@ using System; using System.Windows.Forms; -using TweetDck.Core.Controls; +using TweetDuck.Core.Controls; -namespace TweetDck.Core.Bridge{ +namespace TweetDuck.Core.Bridge{ sealed class CallbackBridge{ private readonly Control owner; private readonly Action safeCallback; diff --git a/Core/Bridge/PropertyBridge.cs b/Core/Bridge/PropertyBridge.cs index 5510d41f..fab66dc5 100644 --- a/Core/Bridge/PropertyBridge.cs +++ b/Core/Bridge/PropertyBridge.cs @@ -1,7 +1,7 @@ using System; using System.Text; -namespace TweetDck.Core.Bridge{ +namespace TweetDuck.Core.Bridge{ static class PropertyBridge{ [Flags] public enum Properties{ diff --git a/Core/Bridge/TweetDeckBridge.cs b/Core/Bridge/TweetDeckBridge.cs index a0ac0d7b..4aacfea6 100644 --- a/Core/Bridge/TweetDeckBridge.cs +++ b/Core/Bridge/TweetDeckBridge.cs @@ -1,9 +1,9 @@ using System.Windows.Forms; -using TweetDck.Core.Controls; -using TweetDck.Core.Notification; -using TweetDck.Core.Utils; +using TweetDuck.Core.Controls; +using TweetDuck.Core.Notification; +using TweetDuck.Core.Utils; -namespace TweetDck.Core.Bridge{ +namespace TweetDuck.Core.Bridge{ sealed class TweetDeckBridge{ public static string LastRightClickedLink = string.Empty; public static string LastHighlightedTweet = string.Empty; diff --git a/Core/Controls/ControlExtensions.cs b/Core/Controls/ControlExtensions.cs index cee09882..0907e8f7 100644 --- a/Core/Controls/ControlExtensions.cs +++ b/Core/Controls/ControlExtensions.cs @@ -2,9 +2,9 @@ using System.Drawing; using System.Linq; using System.Windows.Forms; -using TweetDck.Core.Utils; +using TweetDuck.Core.Utils; -namespace TweetDck.Core.Controls{ +namespace TweetDuck.Core.Controls{ static class ControlExtensions{ public static readonly Point InvisibleLocation = new Point(-32000, -32000); diff --git a/Core/Controls/FlatButton.cs b/Core/Controls/FlatButton.cs index 52e0d7bd..6695de85 100644 --- a/Core/Controls/FlatButton.cs +++ b/Core/Controls/FlatButton.cs @@ -1,7 +1,7 @@ using System; using System.Windows.Forms; -namespace TweetDck.Core.Controls{ +namespace TweetDuck.Core.Controls{ class FlatButton : Button{ protected override bool ShowFocusCues => false; diff --git a/Core/Controls/FlatProgressBar.cs b/Core/Controls/FlatProgressBar.cs index 37aff6ca..c7931334 100644 --- a/Core/Controls/FlatProgressBar.cs +++ b/Core/Controls/FlatProgressBar.cs @@ -1,7 +1,7 @@ using System.Drawing; using System.Windows.Forms; -namespace TweetDck.Core.Controls{ +namespace TweetDuck.Core.Controls{ sealed class FlatProgressBar : ProgressBar{ private readonly SolidBrush brush; diff --git a/Core/Controls/TabButton.cs b/Core/Controls/TabButton.cs index 5d060db0..1ae716e5 100644 --- a/Core/Controls/TabButton.cs +++ b/Core/Controls/TabButton.cs @@ -2,7 +2,7 @@ using System.Drawing; using System.Windows.Forms; -namespace TweetDck.Core.Controls{ +namespace TweetDuck.Core.Controls{ sealed class TabButton : FlatButton{ public Action Callback { get; private set; } diff --git a/Core/Controls/TabPanel.Designer.cs b/Core/Controls/TabPanel.Designer.cs index ff2e9ac5..73478188 100644 --- a/Core/Controls/TabPanel.Designer.cs +++ b/Core/Controls/TabPanel.Designer.cs @@ -1,4 +1,4 @@ -namespace TweetDck.Core.Controls { +namespace TweetDuck.Core.Controls { partial class TabPanel { /// <summary> /// Required designer variable. diff --git a/Core/Controls/TabPanel.cs b/Core/Controls/TabPanel.cs index 4ad89565..d08573e4 100644 --- a/Core/Controls/TabPanel.cs +++ b/Core/Controls/TabPanel.cs @@ -4,7 +4,7 @@ using System.Linq; using System.Windows.Forms; -namespace TweetDck.Core.Controls{ +namespace TweetDuck.Core.Controls{ sealed partial class TabPanel : UserControl{ public Panel Content => panelContent; public IEnumerable<TabButton> Buttons => panelButtons.Controls.Cast<TabButton>(); diff --git a/Core/FormBrowser.Designer.cs b/Core/FormBrowser.Designer.cs index cfe3ab4a..bf011ef2 100644 --- a/Core/FormBrowser.Designer.cs +++ b/Core/FormBrowser.Designer.cs @@ -1,4 +1,4 @@ -namespace TweetDck.Core { +namespace TweetDuck.Core { sealed partial class FormBrowser { /// <summary> /// Required designer variable. @@ -24,7 +24,7 @@ protected override void Dispose(bool disposing) { /// </summary> private void InitializeComponent() { this.components = new System.ComponentModel.Container(); - this.trayIcon = new TweetDck.Core.TrayIcon(this.components); + this.trayIcon = new TweetDuck.Core.TrayIcon(this.components); this.toolTip = new System.Windows.Forms.ToolTip(this.components); this.SuspendLayout(); // @@ -32,10 +32,10 @@ private void InitializeComponent() { // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.BackColor = TweetDck.Core.Utils.BrowserUtils.BackgroundColor; + this.BackColor = TweetDuck.Core.Utils.BrowserUtils.BackgroundColor; this.ClientSize = new System.Drawing.Size(324, 386); this.Icon = Properties.Resources.icon; - this.Location = TweetDck.Core.Controls.ControlExtensions.InvisibleLocation; + this.Location = TweetDuck.Core.Controls.ControlExtensions.InvisibleLocation; this.MinimumSize = new System.Drawing.Size(340, 424); this.Name = "FormBrowser"; this.StartPosition = System.Windows.Forms.FormStartPosition.Manual; diff --git a/Core/FormBrowser.cs b/Core/FormBrowser.cs index 9ea622e1..394f0543 100644 --- a/Core/FormBrowser.cs +++ b/Core/FormBrowser.cs @@ -5,23 +5,23 @@ using System.Drawing; using System.Linq; using System.Windows.Forms; -using TweetDck.Configuration; -using TweetDck.Core.Bridge; -using TweetDck.Core.Controls; -using TweetDck.Core.Handling; -using TweetDck.Core.Notification; -using TweetDck.Core.Notification.Screenshot; -using TweetDck.Core.Notification.Sound; -using TweetDck.Core.Other; -using TweetDck.Core.Utils; -using TweetDck.Plugins; -using TweetDck.Plugins.Enums; -using TweetDck.Plugins.Events; -using TweetDck.Resources; -using TweetDck.Updates; -using TweetDck.Updates.Events; +using TweetDuck.Configuration; +using TweetDuck.Core.Bridge; +using TweetDuck.Core.Controls; +using TweetDuck.Core.Handling; +using TweetDuck.Core.Notification; +using TweetDuck.Core.Notification.Screenshot; +using TweetDuck.Core.Notification.Sound; +using TweetDuck.Core.Other; +using TweetDuck.Core.Utils; +using TweetDuck.Plugins; +using TweetDuck.Plugins.Enums; +using TweetDuck.Plugins.Events; +using TweetDuck.Resources; +using TweetDuck.Updates; +using TweetDuck.Updates.Events; -namespace TweetDck.Core{ +namespace TweetDuck.Core{ sealed partial class FormBrowser : Form{ private static UserConfig Config => Program.UserConfig; diff --git a/Core/Handling/BrowserProcessHandler.cs b/Core/Handling/BrowserProcessHandler.cs index 3ee09812..517ea526 100644 --- a/Core/Handling/BrowserProcessHandler.cs +++ b/Core/Handling/BrowserProcessHandler.cs @@ -1,7 +1,7 @@ using CefSharp; using System; -namespace TweetDck.Core.Handling{ +namespace TweetDuck.Core.Handling{ class BrowserProcessHandler : IBrowserProcessHandler{ void IBrowserProcessHandler.OnContextInitialized(){ using(IRequestContext ctx = Cef.GetGlobalRequestContext()){ diff --git a/Core/Handling/ContextMenuBase.cs b/Core/Handling/ContextMenuBase.cs index 1b364054..8f93e57f 100644 --- a/Core/Handling/ContextMenuBase.cs +++ b/Core/Handling/ContextMenuBase.cs @@ -3,11 +3,11 @@ using System.IO; using System.Text.RegularExpressions; using System.Windows.Forms; -using TweetDck.Core.Bridge; -using TweetDck.Core.Controls; -using TweetDck.Core.Utils; +using TweetDuck.Core.Bridge; +using TweetDuck.Core.Controls; +using TweetDuck.Core.Utils; -namespace TweetDck.Core.Handling{ +namespace TweetDuck.Core.Handling{ abstract class ContextMenuBase : IContextMenuHandler{ private static readonly Regex RegexTwitterAccount = new Regex(@"^https?://twitter\.com/([^/]+)/?$", RegexOptions.Compiled); diff --git a/Core/Handling/ContextMenuBrowser.cs b/Core/Handling/ContextMenuBrowser.cs index f79eb6df..ba70244d 100644 --- a/Core/Handling/ContextMenuBrowser.cs +++ b/Core/Handling/ContextMenuBrowser.cs @@ -1,10 +1,10 @@ using CefSharp; using System.Windows.Forms; -using TweetDck.Core.Bridge; -using TweetDck.Core.Controls; -using TweetDck.Core.Utils; +using TweetDuck.Core.Bridge; +using TweetDuck.Core.Controls; +using TweetDuck.Core.Utils; -namespace TweetDck.Core.Handling{ +namespace TweetDuck.Core.Handling{ class ContextMenuBrowser : ContextMenuBase{ private const int MenuGlobal = 26600; private const int MenuMute = 26601; diff --git a/Core/Handling/ContextMenuNotification.cs b/Core/Handling/ContextMenuNotification.cs index d9f287f9..e4a5e3d8 100644 --- a/Core/Handling/ContextMenuNotification.cs +++ b/Core/Handling/ContextMenuNotification.cs @@ -1,8 +1,8 @@ using CefSharp; -using TweetDck.Core.Controls; -using TweetDck.Core.Notification; +using TweetDuck.Core.Controls; +using TweetDuck.Core.Notification; -namespace TweetDck.Core.Handling{ +namespace TweetDuck.Core.Handling{ class ContextMenuNotification : ContextMenuBase{ private const int MenuSkipTweet = 26600; private const int MenuFreeze = 26601; diff --git a/Core/Handling/JavaScriptDialogHandler.cs b/Core/Handling/JavaScriptDialogHandler.cs index d602c0bd..887bff83 100644 --- a/Core/Handling/JavaScriptDialogHandler.cs +++ b/Core/Handling/JavaScriptDialogHandler.cs @@ -2,10 +2,10 @@ using CefSharp.WinForms; using System.Drawing; using System.Windows.Forms; -using TweetDck.Core.Controls; -using TweetDck.Core.Other; +using TweetDuck.Core.Controls; +using TweetDuck.Core.Other; -namespace TweetDck.Core.Handling { +namespace TweetDuck.Core.Handling { class JavaScriptDialogHandler : IJsDialogHandler{ bool IJsDialogHandler.OnJSDialog(IWebBrowser browserControl, IBrowser browser, string originUrl, CefJsDialogType dialogType, string messageText, string defaultPromptText, IJsDialogCallback callback, ref bool suppressMessage){ ((ChromiumWebBrowser)browserControl).InvokeSafe(() => { diff --git a/Core/Handling/LifeSpanHandler.cs b/Core/Handling/LifeSpanHandler.cs index f7e90d82..99d6891b 100644 --- a/Core/Handling/LifeSpanHandler.cs +++ b/Core/Handling/LifeSpanHandler.cs @@ -1,7 +1,7 @@ using CefSharp; -using TweetDck.Core.Utils; +using TweetDuck.Core.Utils; -namespace TweetDck.Core.Handling{ +namespace TweetDuck.Core.Handling{ class LifeSpanHandler : ILifeSpanHandler{ public bool OnBeforePopup(IWebBrowser browserControl, IBrowser browser, IFrame frame, string targetUrl, string targetFrameName, WindowOpenDisposition targetDisposition, bool userGesture, IPopupFeatures popupFeatures, IWindowInfo windowInfo, IBrowserSettings browserSettings, ref bool noJavascriptAccess, out IWebBrowser newBrowser){ newBrowser = null; diff --git a/Core/Handling/ResourceHandlerNotification.cs b/Core/Handling/ResourceHandlerNotification.cs index a6094a24..029dc19b 100644 --- a/Core/Handling/ResourceHandlerNotification.cs +++ b/Core/Handling/ResourceHandlerNotification.cs @@ -3,7 +3,7 @@ using System.IO; using System.Text; -namespace TweetDck.Core.Handling{ +namespace TweetDuck.Core.Handling{ class ResourceHandlerNotification : IResourceHandler{ private readonly NameValueCollection headers = new NameValueCollection(0); private MemoryStream dataIn; diff --git a/Core/Notification/FormNotificationBase.Designer.cs b/Core/Notification/FormNotificationBase.Designer.cs index 75cfa14d..4dda868a 100644 --- a/Core/Notification/FormNotificationBase.Designer.cs +++ b/Core/Notification/FormNotificationBase.Designer.cs @@ -1,4 +1,4 @@ -namespace TweetDck.Core.Notification { +namespace TweetDuck.Core.Notification { partial class FormNotificationBase { /// <summary> /// Required designer variable. @@ -34,7 +34,7 @@ private void InitializeComponent() { this.BackColor = System.Drawing.SystemColors.Control; this.ClientSize = new System.Drawing.Size(284, 122); this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow; - this.Location = TweetDck.Core.Controls.ControlExtensions.InvisibleLocation; + this.Location = TweetDuck.Core.Controls.ControlExtensions.InvisibleLocation; this.MaximizeBox = false; this.MinimizeBox = false; this.Name = "FormNotification"; diff --git a/Core/Notification/FormNotificationBase.cs b/Core/Notification/FormNotificationBase.cs index 31384091..ce94c2ef 100644 --- a/Core/Notification/FormNotificationBase.cs +++ b/Core/Notification/FormNotificationBase.cs @@ -3,12 +3,12 @@ using System; using System.Drawing; using System.Windows.Forms; -using TweetDck.Configuration; -using TweetDck.Core.Controls; -using TweetDck.Core.Handling; -using TweetDck.Core.Utils; +using TweetDuck.Configuration; +using TweetDuck.Core.Controls; +using TweetDuck.Core.Handling; +using TweetDuck.Core.Utils; -namespace TweetDck.Core.Notification{ +namespace TweetDuck.Core.Notification{ partial class FormNotificationBase : Form{ protected Point PrimaryLocation{ get{ diff --git a/Core/Notification/FormNotificationMain.Designer.cs b/Core/Notification/FormNotificationMain.Designer.cs index 1b718ec8..5e101b44 100644 --- a/Core/Notification/FormNotificationMain.Designer.cs +++ b/Core/Notification/FormNotificationMain.Designer.cs @@ -1,4 +1,4 @@ -namespace TweetDck.Core.Notification { +namespace TweetDuck.Core.Notification { partial class FormNotificationMain { /// <summary> /// Required designer variable. @@ -26,7 +26,7 @@ private void InitializeComponent() { this.components = new System.ComponentModel.Container(); this.timerDisplayDelay = new System.Windows.Forms.Timer(this.components); this.timerProgress = new System.Windows.Forms.Timer(this.components); - this.progressBarTimer = new TweetDck.Core.Controls.FlatProgressBar(); + this.progressBarTimer = new TweetDuck.Core.Controls.FlatProgressBar(); this.SuspendLayout(); // // timerDisplayDelay diff --git a/Core/Notification/FormNotificationMain.cs b/Core/Notification/FormNotificationMain.cs index 07853edc..c32f2bf5 100644 --- a/Core/Notification/FormNotificationMain.cs +++ b/Core/Notification/FormNotificationMain.cs @@ -2,14 +2,14 @@ using System; using System.Drawing; using System.Windows.Forms; -using TweetDck.Core.Bridge; -using TweetDck.Core.Controls; -using TweetDck.Core.Utils; -using TweetDck.Plugins; -using TweetDck.Plugins.Enums; -using TweetDck.Resources; +using TweetDuck.Core.Bridge; +using TweetDuck.Core.Controls; +using TweetDuck.Core.Utils; +using TweetDuck.Plugins; +using TweetDuck.Plugins.Enums; +using TweetDuck.Resources; -namespace TweetDck.Core.Notification{ +namespace TweetDuck.Core.Notification{ partial class FormNotificationMain : FormNotificationBase{ private const string NotificationScriptFile = "notification.js"; diff --git a/Core/Notification/FormNotificationTweet.Designer.cs b/Core/Notification/FormNotificationTweet.Designer.cs index 435bee3f..4d062fcd 100644 --- a/Core/Notification/FormNotificationTweet.Designer.cs +++ b/Core/Notification/FormNotificationTweet.Designer.cs @@ -1,4 +1,4 @@ -namespace TweetDck.Core.Notification { +namespace TweetDuck.Core.Notification { partial class FormNotificationTweet { /// <summary> /// Required designer variable. diff --git a/Core/Notification/FormNotificationTweet.cs b/Core/Notification/FormNotificationTweet.cs index f2e89c7d..77192067 100644 --- a/Core/Notification/FormNotificationTweet.cs +++ b/Core/Notification/FormNotificationTweet.cs @@ -1,11 +1,11 @@ using System; using System.Collections.Generic; using System.Drawing; -using TweetDck.Plugins; +using TweetDuck.Plugins; using System.Windows.Forms; -using TweetDck.Core.Utils; +using TweetDuck.Core.Utils; -namespace TweetDck.Core.Notification{ +namespace TweetDuck.Core.Notification{ sealed partial class FormNotificationTweet : FormNotificationMain{ private const int NonIntrusiveIdleLimit = 30; private const int TrimMinimum = 32; diff --git a/Core/Notification/Screenshot/FormNotificationScreenshotable.cs b/Core/Notification/Screenshot/FormNotificationScreenshotable.cs index 9a5ca10d..e1e427b8 100644 --- a/Core/Notification/Screenshot/FormNotificationScreenshotable.cs +++ b/Core/Notification/Screenshot/FormNotificationScreenshotable.cs @@ -2,11 +2,11 @@ using System.Drawing; using System.Drawing.Imaging; using System.Windows.Forms; -using TweetDck.Core.Bridge; -using TweetDck.Core.Utils; -using TweetDck.Resources; +using TweetDuck.Core.Bridge; +using TweetDuck.Core.Utils; +using TweetDuck.Resources; -namespace TweetDck.Core.Notification.Screenshot{ +namespace TweetDuck.Core.Notification.Screenshot{ sealed class FormNotificationScreenshotable : FormNotificationBase{ public FormNotificationScreenshotable(Action callback, Form owner) : base(owner, false){ browser.RegisterAsyncJsObject("$TD_NotificationScreenshot", new CallbackBridge(this, callback)); diff --git a/Core/Notification/Screenshot/TweetScreenshotManager.cs b/Core/Notification/Screenshot/TweetScreenshotManager.cs index 43f513f8..27e4885f 100644 --- a/Core/Notification/Screenshot/TweetScreenshotManager.cs +++ b/Core/Notification/Screenshot/TweetScreenshotManager.cs @@ -3,9 +3,9 @@ using System; using System.Windows.Forms; -using TweetDck.Core.Controls; +using TweetDuck.Core.Controls; -namespace TweetDck.Core.Notification.Screenshot{ +namespace TweetDuck.Core.Notification.Screenshot{ sealed class TweetScreenshotManager : IDisposable{ private readonly Form owner; private readonly Timer timeout; diff --git a/Core/Notification/Sound/ISoundNotificationPlayer.cs b/Core/Notification/Sound/ISoundNotificationPlayer.cs index 121a2ed4..87a220e0 100644 --- a/Core/Notification/Sound/ISoundNotificationPlayer.cs +++ b/Core/Notification/Sound/ISoundNotificationPlayer.cs @@ -1,6 +1,6 @@ using System; -namespace TweetDck.Core.Notification.Sound{ +namespace TweetDuck.Core.Notification.Sound{ interface ISoundNotificationPlayer : IDisposable{ string SupportedFormats { get; } diff --git a/Core/Notification/Sound/PlaybackErrorEventArgs.cs b/Core/Notification/Sound/PlaybackErrorEventArgs.cs index 4c2e13c3..1a35be26 100644 --- a/Core/Notification/Sound/PlaybackErrorEventArgs.cs +++ b/Core/Notification/Sound/PlaybackErrorEventArgs.cs @@ -1,6 +1,6 @@ using System; -namespace TweetDck.Core.Notification.Sound{ +namespace TweetDuck.Core.Notification.Sound{ sealed class PlaybackErrorEventArgs : EventArgs{ public string Message { get; } public bool Ignore { get; set; } diff --git a/Core/Notification/Sound/SoundPlayerImplFallback.cs b/Core/Notification/Sound/SoundPlayerImplFallback.cs index e08fabcf..d33ca666 100644 --- a/Core/Notification/Sound/SoundPlayerImplFallback.cs +++ b/Core/Notification/Sound/SoundPlayerImplFallback.cs @@ -2,7 +2,7 @@ using System.IO; using System.Media; -namespace TweetDck.Core.Notification.Sound{ +namespace TweetDuck.Core.Notification.Sound{ sealed class SoundPlayerImplFallback : ISoundNotificationPlayer{ string ISoundNotificationPlayer.SupportedFormats => "*.wav"; diff --git a/Core/Notification/Sound/SoundPlayerImplWMP.cs b/Core/Notification/Sound/SoundPlayerImplWMP.cs index 7c10118a..c36022db 100644 --- a/Core/Notification/Sound/SoundPlayerImplWMP.cs +++ b/Core/Notification/Sound/SoundPlayerImplWMP.cs @@ -1,9 +1,9 @@ using System; using System.Runtime.InteropServices; -using TweetDck.Core.Utils; +using TweetDuck.Core.Utils; using WMPLib; -namespace TweetDck.Core.Notification.Sound{ +namespace TweetDuck.Core.Notification.Sound{ sealed class SoundPlayerImplWMP : ISoundNotificationPlayer{ string ISoundNotificationPlayer.SupportedFormats => "*.wav;*.mp3;*.mp2;*.m4a;*.mid;*.midi;*.rmi;*.wma;*.aif;*.aifc;*.aiff;*.snd;*.au"; diff --git a/Core/Notification/SoundNotification.cs b/Core/Notification/SoundNotification.cs index 8b9fafec..5345cee4 100644 --- a/Core/Notification/SoundNotification.cs +++ b/Core/Notification/SoundNotification.cs @@ -1,7 +1,7 @@ using System.Runtime.InteropServices; -using TweetDck.Core.Notification.Sound; +using TweetDuck.Core.Notification.Sound; -namespace TweetDck.Core.Notification{ +namespace TweetDuck.Core.Notification{ static class SoundNotification{ private static bool? IsWMPAvailable; diff --git a/Core/Notification/TweetNotification.cs b/Core/Notification/TweetNotification.cs index 512e839d..177267a7 100644 --- a/Core/Notification/TweetNotification.cs +++ b/Core/Notification/TweetNotification.cs @@ -1,8 +1,8 @@ using System; using System.Text; -using TweetDck.Resources; +using TweetDuck.Resources; -namespace TweetDck.Core.Notification{ +namespace TweetDuck.Core.Notification{ sealed class TweetNotification{ private static string FontSizeClass { get; set; } private static string HeadTag { get; set; } diff --git a/Core/Other/FormAbout.Designer.cs b/Core/Other/FormAbout.Designer.cs index eeeb2db8..a6202aef 100644 --- a/Core/Other/FormAbout.Designer.cs +++ b/Core/Other/FormAbout.Designer.cs @@ -1,4 +1,4 @@ -namespace TweetDck.Core.Other { +namespace TweetDuck.Core.Other { sealed partial class FormAbout { /// <summary> /// Required designer variable. diff --git a/Core/Other/FormAbout.cs b/Core/Other/FormAbout.cs index 90e3093b..d669aa22 100644 --- a/Core/Other/FormAbout.cs +++ b/Core/Other/FormAbout.cs @@ -1,7 +1,7 @@ using System.Windows.Forms; -using TweetDck.Core.Utils; +using TweetDuck.Core.Utils; -namespace TweetDck.Core.Other{ +namespace TweetDuck.Core.Other{ sealed partial class FormAbout : Form{ private const string TipsLink = "https://github.com/chylex/TweetDuck/wiki"; private const string IssuesLink = "https://github.com/chylex/TweetDuck/issues"; diff --git a/Core/Other/FormMessage.Designer.cs b/Core/Other/FormMessage.Designer.cs index f6e5e841..ff238249 100644 --- a/Core/Other/FormMessage.Designer.cs +++ b/Core/Other/FormMessage.Designer.cs @@ -1,4 +1,4 @@ -namespace TweetDck.Core.Other { +namespace TweetDuck.Core.Other { partial class FormMessage { /// <summary> /// Required designer variable. diff --git a/Core/Other/FormMessage.cs b/Core/Other/FormMessage.cs index 70ffdec5..baa88351 100644 --- a/Core/Other/FormMessage.cs +++ b/Core/Other/FormMessage.cs @@ -2,7 +2,7 @@ using System.Drawing; using System.Windows.Forms; -namespace TweetDck.Core.Other{ +namespace TweetDuck.Core.Other{ sealed partial class FormMessage : Form{ public Button ClickedButton { get; private set; } diff --git a/Core/Other/FormPlugins.Designer.cs b/Core/Other/FormPlugins.Designer.cs index c452846f..dba4581e 100644 --- a/Core/Other/FormPlugins.Designer.cs +++ b/Core/Other/FormPlugins.Designer.cs @@ -1,4 +1,4 @@ -namespace TweetDck.Core.Other { +namespace TweetDuck.Core.Other { partial class FormPlugins { /// <summary> /// Required designer variable. @@ -26,7 +26,7 @@ private void InitializeComponent() { this.btnClose = new System.Windows.Forms.Button(); this.btnReload = new System.Windows.Forms.Button(); this.btnOpenFolder = new System.Windows.Forms.Button(); - this.tabPanelPlugins = new TweetDck.Core.Controls.TabPanel(); + this.tabPanelPlugins = new TweetDuck.Core.Controls.TabPanel(); this.SuspendLayout(); // // btnClose @@ -87,7 +87,7 @@ private void InitializeComponent() { this.Controls.Add(this.btnOpenFolder); this.Controls.Add(this.btnReload); this.Controls.Add(this.btnClose); - this.Icon = global::TweetDck.Properties.Resources.icon; + this.Icon = global::TweetDuck.Properties.Resources.icon; this.MinimumSize = new System.Drawing.Size(480, 320); this.Name = "FormPlugins"; this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent; @@ -101,6 +101,6 @@ private void InitializeComponent() { private System.Windows.Forms.Button btnClose; private System.Windows.Forms.Button btnReload; private System.Windows.Forms.Button btnOpenFolder; - private TweetDck.Core.Controls.TabPanel tabPanelPlugins; + private TweetDuck.Core.Controls.TabPanel tabPanelPlugins; } } \ No newline at end of file diff --git a/Core/Other/FormPlugins.cs b/Core/Other/FormPlugins.cs index 0408b13f..bbedf32e 100644 --- a/Core/Other/FormPlugins.cs +++ b/Core/Other/FormPlugins.cs @@ -3,13 +3,13 @@ using System.Drawing; using System.Linq; using System.Windows.Forms; -using TweetDck.Core.Controls; -using TweetDck.Plugins; -using TweetDck.Plugins.Controls; -using TweetDck.Plugins.Enums; -using TweetDck.Plugins.Events; +using TweetDuck.Core.Controls; +using TweetDuck.Plugins; +using TweetDuck.Plugins.Controls; +using TweetDuck.Plugins.Enums; +using TweetDuck.Plugins.Events; -namespace TweetDck.Core.Other{ +namespace TweetDuck.Core.Other{ sealed partial class FormPlugins : Form{ private readonly PluginManager pluginManager; private readonly TabButton tabBtnOfficial, tabBtnCustom; diff --git a/Core/Other/FormSettings.Designer.cs b/Core/Other/FormSettings.Designer.cs index ab9df662..0bd777cf 100644 --- a/Core/Other/FormSettings.Designer.cs +++ b/Core/Other/FormSettings.Designer.cs @@ -1,4 +1,4 @@ -namespace TweetDck.Core.Other { +namespace TweetDuck.Core.Other { sealed partial class FormSettings { /// <summary> /// Required designer variable. @@ -25,7 +25,7 @@ protected override void Dispose(bool disposing) { private void InitializeComponent() { this.btnClose = new System.Windows.Forms.Button(); this.labelTip = new System.Windows.Forms.Label(); - this.tabPanel = new TweetDck.Core.Controls.TabPanel(); + this.tabPanel = new TweetDuck.Core.Controls.TabPanel(); this.SuspendLayout(); // // btnClose @@ -70,7 +70,7 @@ private void InitializeComponent() { this.Controls.Add(this.btnClose); this.Controls.Add(this.tabPanel); this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedSingle; - this.Icon = global::TweetDck.Properties.Resources.icon; + this.Icon = global::TweetDuck.Properties.Resources.icon; this.MaximizeBox = false; this.MinimizeBox = false; this.Name = "FormSettings"; diff --git a/Core/Other/FormSettings.cs b/Core/Other/FormSettings.cs index 11b3c921..b94e1d26 100644 --- a/Core/Other/FormSettings.cs +++ b/Core/Other/FormSettings.cs @@ -2,11 +2,11 @@ using System.Collections.Generic; using System.Linq; using System.Windows.Forms; -using TweetDck.Core.Other.Settings; -using TweetDck.Plugins; -using TweetDck.Updates; +using TweetDuck.Core.Other.Settings; +using TweetDuck.Plugins; +using TweetDuck.Updates; -namespace TweetDck.Core.Other{ +namespace TweetDuck.Core.Other{ sealed partial class FormSettings : Form{ public const int TabIndexNotification = 1; diff --git a/Core/Other/Settings/BaseTabSettings.cs b/Core/Other/Settings/BaseTabSettings.cs index 4ceab565..79e43970 100644 --- a/Core/Other/Settings/BaseTabSettings.cs +++ b/Core/Other/Settings/BaseTabSettings.cs @@ -1,7 +1,7 @@ using System.Windows.Forms; -using TweetDck.Configuration; +using TweetDuck.Configuration; -namespace TweetDck.Core.Other.Settings{ +namespace TweetDuck.Core.Other.Settings{ class BaseTabSettings : UserControl{ protected static UserConfig Config => Program.UserConfig; diff --git a/Core/Other/Settings/Dialogs/DialogSettingsCSS.Designer.cs b/Core/Other/Settings/Dialogs/DialogSettingsCSS.Designer.cs index f8a0b0ff..8dbb02b4 100644 --- a/Core/Other/Settings/Dialogs/DialogSettingsCSS.Designer.cs +++ b/Core/Other/Settings/Dialogs/DialogSettingsCSS.Designer.cs @@ -1,4 +1,4 @@ -namespace TweetDck.Core.Other.Settings.Dialogs { +namespace TweetDuck.Core.Other.Settings.Dialogs { partial class DialogSettingsCSS { /// <summary> /// Required designer variable. diff --git a/Core/Other/Settings/Dialogs/DialogSettingsCSS.cs b/Core/Other/Settings/Dialogs/DialogSettingsCSS.cs index ed5aac19..7bf05d7c 100644 --- a/Core/Other/Settings/Dialogs/DialogSettingsCSS.cs +++ b/Core/Other/Settings/Dialogs/DialogSettingsCSS.cs @@ -1,9 +1,9 @@ using System; using System.Windows.Forms; -using TweetDck.Core.Controls; -using TweetDck.Core.Utils; +using TweetDuck.Core.Controls; +using TweetDuck.Core.Utils; -namespace TweetDck.Core.Other.Settings.Dialogs{ +namespace TweetDuck.Core.Other.Settings.Dialogs{ sealed partial class DialogSettingsCSS : Form{ public string BrowserCSS => textBoxBrowserCSS.Text; public string NotificationCSS => textBoxNotificationCSS.Text; diff --git a/Core/Other/Settings/Dialogs/DialogSettingsCefArgs.Designer.cs b/Core/Other/Settings/Dialogs/DialogSettingsCefArgs.Designer.cs index b367cf00..f0537160 100644 --- a/Core/Other/Settings/Dialogs/DialogSettingsCefArgs.Designer.cs +++ b/Core/Other/Settings/Dialogs/DialogSettingsCefArgs.Designer.cs @@ -1,4 +1,4 @@ -namespace TweetDck.Core.Other.Settings.Dialogs { +namespace TweetDuck.Core.Other.Settings.Dialogs { partial class DialogSettingsCefArgs { /// <summary> /// Required designer variable. diff --git a/Core/Other/Settings/Dialogs/DialogSettingsCefArgs.cs b/Core/Other/Settings/Dialogs/DialogSettingsCefArgs.cs index c35ccd35..3790d6fc 100644 --- a/Core/Other/Settings/Dialogs/DialogSettingsCefArgs.cs +++ b/Core/Other/Settings/Dialogs/DialogSettingsCefArgs.cs @@ -1,9 +1,9 @@ using System; using System.Windows.Forms; -using TweetDck.Core.Controls; -using TweetDck.Core.Utils; +using TweetDuck.Core.Controls; +using TweetDuck.Core.Utils; -namespace TweetDck.Core.Other.Settings.Dialogs{ +namespace TweetDuck.Core.Other.Settings.Dialogs{ sealed partial class DialogSettingsCefArgs : Form{ public string CefArgs => textBoxArgs.Text; diff --git a/Core/Other/Settings/Dialogs/DialogSettingsExport.Designer.cs b/Core/Other/Settings/Dialogs/DialogSettingsExport.Designer.cs index 7b6e1f30..72133781 100644 --- a/Core/Other/Settings/Dialogs/DialogSettingsExport.Designer.cs +++ b/Core/Other/Settings/Dialogs/DialogSettingsExport.Designer.cs @@ -1,4 +1,4 @@ -namespace TweetDck.Core.Other.Settings.Dialogs { +namespace TweetDuck.Core.Other.Settings.Dialogs { partial class DialogSettingsExport { /// <summary> /// Required designer variable. diff --git a/Core/Other/Settings/Dialogs/DialogSettingsExport.cs b/Core/Other/Settings/Dialogs/DialogSettingsExport.cs index fd65ceef..dc1880dd 100644 --- a/Core/Other/Settings/Dialogs/DialogSettingsExport.cs +++ b/Core/Other/Settings/Dialogs/DialogSettingsExport.cs @@ -1,8 +1,8 @@ using System; using System.Windows.Forms; -using TweetDck.Core.Other.Settings.Export; +using TweetDuck.Core.Other.Settings.Export; -namespace TweetDck.Core.Other.Settings.Dialogs{ +namespace TweetDuck.Core.Other.Settings.Dialogs{ sealed partial class DialogSettingsExport : Form{ public static DialogSettingsExport Import(ExportFileFlags flags){ return new DialogSettingsExport(flags); diff --git a/Core/Other/Settings/Dialogs/DialogSettingsRestart.Designer.cs b/Core/Other/Settings/Dialogs/DialogSettingsRestart.Designer.cs index 0dc459bb..3f225745 100644 --- a/Core/Other/Settings/Dialogs/DialogSettingsRestart.Designer.cs +++ b/Core/Other/Settings/Dialogs/DialogSettingsRestart.Designer.cs @@ -1,4 +1,4 @@ -namespace TweetDck.Core.Other.Settings.Dialogs { +namespace TweetDuck.Core.Other.Settings.Dialogs { partial class DialogSettingsRestart { /// <summary> /// Required designer variable. diff --git a/Core/Other/Settings/Dialogs/DialogSettingsRestart.cs b/Core/Other/Settings/Dialogs/DialogSettingsRestart.cs index e6e7401a..a719d84c 100644 --- a/Core/Other/Settings/Dialogs/DialogSettingsRestart.cs +++ b/Core/Other/Settings/Dialogs/DialogSettingsRestart.cs @@ -2,10 +2,10 @@ using System.IO; using System.Linq; using System.Windows.Forms; -using TweetDck.Configuration; -using TweetDck.Core.Utils; +using TweetDuck.Configuration; +using TweetDuck.Core.Utils; -namespace TweetDck.Core.Other.Settings.Dialogs{ +namespace TweetDuck.Core.Other.Settings.Dialogs{ sealed partial class DialogSettingsRestart : Form{ private const string DefaultLocale = "en-US"; diff --git a/Core/Other/Settings/Export/CombinedFileStream.cs b/Core/Other/Settings/Export/CombinedFileStream.cs index 222fda23..792a28f0 100644 --- a/Core/Other/Settings/Export/CombinedFileStream.cs +++ b/Core/Other/Settings/Export/CombinedFileStream.cs @@ -2,7 +2,7 @@ using System.IO; using System.Text; -namespace TweetDck.Core.Other.Settings.Export{ +namespace TweetDuck.Core.Other.Settings.Export{ class CombinedFileStream : IDisposable{ public const char KeySeparator = '|'; diff --git a/Core/Other/Settings/Export/ExportFileFlags.cs b/Core/Other/Settings/Export/ExportFileFlags.cs index 717e104f..6bc283cf 100644 --- a/Core/Other/Settings/Export/ExportFileFlags.cs +++ b/Core/Other/Settings/Export/ExportFileFlags.cs @@ -1,6 +1,6 @@ using System; -namespace TweetDck.Core.Other.Settings.Export{ +namespace TweetDuck.Core.Other.Settings.Export{ [Flags] enum ExportFileFlags{ None = 0, diff --git a/Core/Other/Settings/Export/ExportManager.cs b/Core/Other/Settings/Export/ExportManager.cs index 8b5d6026..fd62bcfd 100644 --- a/Core/Other/Settings/Export/ExportManager.cs +++ b/Core/Other/Settings/Export/ExportManager.cs @@ -3,11 +3,11 @@ using System.IO; using System.Linq; using System.Windows.Forms; -using TweetDck.Configuration; -using TweetDck.Plugins; -using TweetDck.Plugins.Enums; +using TweetDuck.Configuration; +using TweetDuck.Plugins; +using TweetDuck.Plugins.Enums; -namespace TweetDck.Core.Other.Settings.Export{ +namespace TweetDuck.Core.Other.Settings.Export{ sealed class ExportManager{ private static readonly string CookiesPath = Path.Combine(Program.StoragePath, "Cookies"); private static readonly string TempCookiesPath = Path.Combine(Program.StoragePath, "CookiesTmp"); diff --git a/Core/Other/Settings/TabSettingsAdvanced.Designer.cs b/Core/Other/Settings/TabSettingsAdvanced.Designer.cs index bdd11a61..96b5b804 100644 --- a/Core/Other/Settings/TabSettingsAdvanced.Designer.cs +++ b/Core/Other/Settings/TabSettingsAdvanced.Designer.cs @@ -1,4 +1,4 @@ -namespace TweetDck.Core.Other.Settings { +namespace TweetDuck.Core.Other.Settings { partial class TabSettingsAdvanced { /// <summary> /// Required designer variable. diff --git a/Core/Other/Settings/TabSettingsAdvanced.cs b/Core/Other/Settings/TabSettingsAdvanced.cs index ae3f64a7..cf8ea0b2 100644 --- a/Core/Other/Settings/TabSettingsAdvanced.cs +++ b/Core/Other/Settings/TabSettingsAdvanced.cs @@ -1,14 +1,14 @@ using System; using System.Diagnostics; using System.Windows.Forms; -using TweetDck.Configuration; -using TweetDck.Core.Controls; -using TweetDck.Core.Other.Settings.Dialogs; -using TweetDck.Core.Other.Settings.Export; -using TweetDck.Core.Utils; -using TweetDck.Plugins; +using TweetDuck.Configuration; +using TweetDuck.Core.Controls; +using TweetDuck.Core.Other.Settings.Dialogs; +using TweetDuck.Core.Other.Settings.Export; +using TweetDuck.Core.Utils; +using TweetDuck.Plugins; -namespace TweetDck.Core.Other.Settings{ +namespace TweetDuck.Core.Other.Settings{ partial class TabSettingsAdvanced : BaseTabSettings{ private readonly Action<string> reinjectBrowserCSS; private readonly PluginManager plugins; diff --git a/Core/Other/Settings/TabSettingsGeneral.Designer.cs b/Core/Other/Settings/TabSettingsGeneral.Designer.cs index 42412bfe..08f63368 100644 --- a/Core/Other/Settings/TabSettingsGeneral.Designer.cs +++ b/Core/Other/Settings/TabSettingsGeneral.Designer.cs @@ -1,4 +1,4 @@ -namespace TweetDck.Core.Other.Settings { +namespace TweetDuck.Core.Other.Settings { partial class TabSettingsGeneral { /// <summary> /// Required designer variable. diff --git a/Core/Other/Settings/TabSettingsGeneral.cs b/Core/Other/Settings/TabSettingsGeneral.cs index 3b619e11..92d68b5b 100644 --- a/Core/Other/Settings/TabSettingsGeneral.cs +++ b/Core/Other/Settings/TabSettingsGeneral.cs @@ -1,10 +1,10 @@ using System; using System.Windows.Forms; -using TweetDck.Core.Controls; -using TweetDck.Updates; -using TweetDck.Updates.Events; +using TweetDuck.Core.Controls; +using TweetDuck.Updates; +using TweetDuck.Updates.Events; -namespace TweetDck.Core.Other.Settings{ +namespace TweetDuck.Core.Other.Settings{ partial class TabSettingsGeneral : BaseTabSettings{ private readonly UpdateHandler updates; private int updateCheckEventId = -1; diff --git a/Core/Other/Settings/TabSettingsNotifications.Designer.cs b/Core/Other/Settings/TabSettingsNotifications.Designer.cs index 74b17552..4c9958a1 100644 --- a/Core/Other/Settings/TabSettingsNotifications.Designer.cs +++ b/Core/Other/Settings/TabSettingsNotifications.Designer.cs @@ -1,4 +1,4 @@ -namespace TweetDck.Core.Other.Settings { +namespace TweetDuck.Core.Other.Settings { partial class TabSettingsNotifications { /// <summary> /// Required designer variable. @@ -37,9 +37,9 @@ private void InitializeComponent() { this.trackBarEdgeDistance = new System.Windows.Forms.TrackBar(); this.groupNotificationDuration = new System.Windows.Forms.GroupBox(); this.tableLayoutDurationButtons = new System.Windows.Forms.TableLayoutPanel(); - this.btnDurationMedium = new TweetDck.Core.Controls.FlatButton(); - this.btnDurationLong = new TweetDck.Core.Controls.FlatButton(); - this.btnDurationShort = new TweetDck.Core.Controls.FlatButton(); + this.btnDurationMedium = new TweetDuck.Core.Controls.FlatButton(); + this.btnDurationLong = new TweetDuck.Core.Controls.FlatButton(); + this.btnDurationShort = new TweetDuck.Core.Controls.FlatButton(); this.labelDurationValue = new System.Windows.Forms.Label(); this.trackBarDuration = new System.Windows.Forms.TrackBar(); this.groupUserInterface = new System.Windows.Forms.GroupBox(); @@ -440,9 +440,9 @@ private void InitializeComponent() { private System.Windows.Forms.Label labelDurationValue; private System.Windows.Forms.TrackBar trackBarDuration; private System.Windows.Forms.TableLayoutPanel tableLayoutDurationButtons; - private TweetDck.Core.Controls.FlatButton btnDurationMedium; - private TweetDck.Core.Controls.FlatButton btnDurationLong; - private TweetDck.Core.Controls.FlatButton btnDurationShort; + private TweetDuck.Core.Controls.FlatButton btnDurationMedium; + private TweetDuck.Core.Controls.FlatButton btnDurationLong; + private TweetDuck.Core.Controls.FlatButton btnDurationShort; private System.Windows.Forms.CheckBox checkNonIntrusive; private System.Windows.Forms.Label labelIdlePause; private System.Windows.Forms.ComboBox comboBoxIdlePause; diff --git a/Core/Other/Settings/TabSettingsNotifications.cs b/Core/Other/Settings/TabSettingsNotifications.cs index 6e3c318b..45e1e96e 100644 --- a/Core/Other/Settings/TabSettingsNotifications.cs +++ b/Core/Other/Settings/TabSettingsNotifications.cs @@ -1,10 +1,10 @@ using System; using System.Globalization; using System.Windows.Forms; -using TweetDck.Core.Controls; -using TweetDck.Core.Notification; +using TweetDuck.Core.Controls; +using TweetDuck.Core.Notification; -namespace TweetDck.Core.Other.Settings{ +namespace TweetDuck.Core.Other.Settings{ partial class TabSettingsNotifications : BaseTabSettings{ private static readonly int[] IdlePauseSeconds = { 0, 30, 60, 120, 300 }; diff --git a/Core/Other/Settings/TabSettingsSounds.Designer.cs b/Core/Other/Settings/TabSettingsSounds.Designer.cs index 57edddce..03fb43ff 100644 --- a/Core/Other/Settings/TabSettingsSounds.Designer.cs +++ b/Core/Other/Settings/TabSettingsSounds.Designer.cs @@ -1,4 +1,4 @@ -namespace TweetDck.Core.Other.Settings { +namespace TweetDuck.Core.Other.Settings { partial class TabSettingsSounds { /// <summary> /// Required designer variable. diff --git a/Core/Other/Settings/TabSettingsSounds.cs b/Core/Other/Settings/TabSettingsSounds.cs index 09e3729d..77107022 100644 --- a/Core/Other/Settings/TabSettingsSounds.cs +++ b/Core/Other/Settings/TabSettingsSounds.cs @@ -2,10 +2,10 @@ using System.Drawing; using System.IO; using System.Windows.Forms; -using TweetDck.Core.Notification; -using TweetDck.Core.Notification.Sound; +using TweetDuck.Core.Notification; +using TweetDuck.Core.Notification.Sound; -namespace TweetDck.Core.Other.Settings{ +namespace TweetDuck.Core.Other.Settings{ partial class TabSettingsSounds : BaseTabSettings{ private readonly ISoundNotificationPlayer soundNotification; diff --git a/Core/TrayIcon.Designer.cs b/Core/TrayIcon.Designer.cs index 5720d039..fa64625b 100644 --- a/Core/TrayIcon.Designer.cs +++ b/Core/TrayIcon.Designer.cs @@ -1,4 +1,4 @@ -namespace TweetDck.Core { +namespace TweetDuck.Core { partial class TrayIcon { /// <summary> /// Required designer variable. diff --git a/Core/TrayIcon.cs b/Core/TrayIcon.cs index d32d0640..54ed17a1 100644 --- a/Core/TrayIcon.cs +++ b/Core/TrayIcon.cs @@ -2,7 +2,7 @@ using System.ComponentModel; using System.Windows.Forms; -namespace TweetDck.Core{ +namespace TweetDuck.Core{ partial class TrayIcon : Component{ public enum Behavior{ // keep order Disabled, DisplayOnly, MinimizeToTray, CloseToTray, Combined diff --git a/Core/Utils/BrowserCache.cs b/Core/Utils/BrowserCache.cs index 12c878a9..6f860cf6 100644 --- a/Core/Utils/BrowserCache.cs +++ b/Core/Utils/BrowserCache.cs @@ -4,7 +4,7 @@ using System.Threading.Tasks; using System.Linq; -namespace TweetDck.Core.Utils{ +namespace TweetDuck.Core.Utils{ static class BrowserCache{ private static bool ClearOnExit { get; set; } diff --git a/Core/Utils/BrowserUtils.cs b/Core/Utils/BrowserUtils.cs index 3ff6f192..8916536b 100644 --- a/Core/Utils/BrowserUtils.cs +++ b/Core/Utils/BrowserUtils.cs @@ -8,7 +8,7 @@ using System.Text.RegularExpressions; using System.Windows.Forms; -namespace TweetDck.Core.Utils{ +namespace TweetDuck.Core.Utils{ static class BrowserUtils{ public static string HeaderAcceptLanguage{ get{ diff --git a/Core/Utils/CommandLineArgs.cs b/Core/Utils/CommandLineArgs.cs index 297b7f3f..295233ec 100644 --- a/Core/Utils/CommandLineArgs.cs +++ b/Core/Utils/CommandLineArgs.cs @@ -1,7 +1,7 @@ using System.Collections.Generic; using System.Text; -namespace TweetDck.Core.Utils{ +namespace TweetDuck.Core.Utils{ class CommandLineArgs{ public static CommandLineArgs FromStringArray(char entryChar, string[] array){ CommandLineArgs args = new CommandLineArgs(); diff --git a/Core/Utils/CommandLineArgsParser.cs b/Core/Utils/CommandLineArgsParser.cs index 03fa7c64..9550d264 100644 --- a/Core/Utils/CommandLineArgsParser.cs +++ b/Core/Utils/CommandLineArgsParser.cs @@ -1,6 +1,6 @@ using System.Text.RegularExpressions; -namespace TweetDck.Core.Utils{ +namespace TweetDuck.Core.Utils{ static class CommandLineArgsParser{ private static Regex splitRegex; diff --git a/Core/Utils/HardwareAcceleration.cs b/Core/Utils/HardwareAcceleration.cs index 6e930537..ca866626 100644 --- a/Core/Utils/HardwareAcceleration.cs +++ b/Core/Utils/HardwareAcceleration.cs @@ -1,7 +1,7 @@ using System; using System.IO; -namespace TweetDck.Core.Utils{ +namespace TweetDuck.Core.Utils{ static class HardwareAcceleration{ private static readonly string LibEGL = Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "libEGL.dll"); private static readonly string LibGLES = Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "libGLESv2.dll"); diff --git a/Core/Utils/InjectedHTML.cs b/Core/Utils/InjectedHTML.cs index 5b261ca2..7982ff36 100644 --- a/Core/Utils/InjectedHTML.cs +++ b/Core/Utils/InjectedHTML.cs @@ -1,6 +1,6 @@ using System; -namespace TweetDck.Core.Utils{ +namespace TweetDuck.Core.Utils{ class InjectedHTML{ public enum Position{ Before, After diff --git a/Core/Utils/NativeCoreAudio.cs b/Core/Utils/NativeCoreAudio.cs index c343c00c..d90e6111 100644 --- a/Core/Utils/NativeCoreAudio.cs +++ b/Core/Utils/NativeCoreAudio.cs @@ -4,7 +4,7 @@ using System.IO; using System.Runtime.InteropServices; -namespace TweetDck.Core.Utils{ +namespace TweetDuck.Core.Utils{ static class NativeCoreAudio{ private const int EDATAFLOW_RENDER = 0; private const int EROLE_MULTIMEDIA = 1; diff --git a/Core/Utils/NativeMethods.cs b/Core/Utils/NativeMethods.cs index b0ca9c18..c0c70793 100644 --- a/Core/Utils/NativeMethods.cs +++ b/Core/Utils/NativeMethods.cs @@ -4,7 +4,7 @@ using System.Runtime.InteropServices; using System.Windows.Forms; -namespace TweetDck.Core.Utils{ +namespace TweetDuck.Core.Utils{ [SuppressMessage("ReSharper", "FieldCanBeMadeReadOnly.Local")] [SuppressMessage("ReSharper", "MemberCanBePrivate.Local")] static class NativeMethods{ diff --git a/Core/Utils/TwoKeyDictionary.cs b/Core/Utils/TwoKeyDictionary.cs index 61003fb7..39db733d 100644 --- a/Core/Utils/TwoKeyDictionary.cs +++ b/Core/Utils/TwoKeyDictionary.cs @@ -1,7 +1,7 @@ using System.Collections.Generic; using System.Linq; -namespace TweetDck.Core.Utils{ +namespace TweetDuck.Core.Utils{ class TwoKeyDictionary<K1, K2, V>{ private readonly Dictionary<K1, Dictionary<K2, V>> dict; private readonly int innerCapacity; diff --git a/Core/Utils/WindowState.cs b/Core/Utils/WindowState.cs index ac7a678e..2196df35 100644 --- a/Core/Utils/WindowState.cs +++ b/Core/Utils/WindowState.cs @@ -1,9 +1,9 @@ using System; using System.Drawing; using System.Windows.Forms; -using TweetDck.Core.Controls; +using TweetDuck.Core.Controls; -namespace TweetDck.Core.Utils{ +namespace TweetDuck.Core.Utils{ [Serializable] class WindowState{ private Rectangle rect; diff --git a/Core/Utils/WindowsUtils.cs b/Core/Utils/WindowsUtils.cs index 62334729..0df120a9 100644 --- a/Core/Utils/WindowsUtils.cs +++ b/Core/Utils/WindowsUtils.cs @@ -6,7 +6,7 @@ using System.Threading; using System.Windows.Forms; -namespace TweetDck.Core.Utils{ +namespace TweetDuck.Core.Utils{ static class WindowsUtils{ public static bool ShouldAvoidToolWindow { get; } diff --git a/Plugins/Controls/PluginControl.Designer.cs b/Plugins/Controls/PluginControl.Designer.cs index 8b9a711b..3d21914f 100644 --- a/Plugins/Controls/PluginControl.Designer.cs +++ b/Plugins/Controls/PluginControl.Designer.cs @@ -1,4 +1,4 @@ -namespace TweetDck.Plugins.Controls { +namespace TweetDuck.Plugins.Controls { partial class PluginControl { /// <summary> /// Required designer variable. diff --git a/Plugins/Controls/PluginControl.cs b/Plugins/Controls/PluginControl.cs index 189ecb03..468ad4ca 100644 --- a/Plugins/Controls/PluginControl.cs +++ b/Plugins/Controls/PluginControl.cs @@ -3,9 +3,9 @@ using System.Drawing; using System.IO; using System.Windows.Forms; -using TweetDck.Core.Utils; +using TweetDuck.Core.Utils; -namespace TweetDck.Plugins.Controls{ +namespace TweetDuck.Plugins.Controls{ partial class PluginControl : UserControl{ private readonly PluginManager pluginManager; private readonly Plugin plugin; diff --git a/Plugins/Controls/PluginListFlowLayout.cs b/Plugins/Controls/PluginListFlowLayout.cs index c1239fa8..ab1f3423 100644 --- a/Plugins/Controls/PluginListFlowLayout.cs +++ b/Plugins/Controls/PluginListFlowLayout.cs @@ -1,7 +1,7 @@ using System.Windows.Forms; -using TweetDck.Core.Utils; +using TweetDuck.Core.Utils; -namespace TweetDck.Plugins.Controls{ +namespace TweetDuck.Plugins.Controls{ sealed class PluginListFlowLayout : FlowLayoutPanel{ public PluginListFlowLayout(){ FlowDirection = FlowDirection.TopDown; diff --git a/Plugins/Enums/PluginEnvironment.cs b/Plugins/Enums/PluginEnvironment.cs index a6551746..bc86ee19 100644 --- a/Plugins/Enums/PluginEnvironment.cs +++ b/Plugins/Enums/PluginEnvironment.cs @@ -1,7 +1,7 @@ using System; using System.Collections.Generic; -namespace TweetDck.Plugins.Enums{ +namespace TweetDuck.Plugins.Enums{ [Flags] enum PluginEnvironment{ None = 0, diff --git a/Plugins/Enums/PluginFolder.cs b/Plugins/Enums/PluginFolder.cs index 6137da4b..5187c9bf 100644 --- a/Plugins/Enums/PluginFolder.cs +++ b/Plugins/Enums/PluginFolder.cs @@ -1,4 +1,4 @@ -namespace TweetDck.Plugins.Enums{ +namespace TweetDuck.Plugins.Enums{ enum PluginFolder{ Root, Data } diff --git a/Plugins/Enums/PluginGroup.cs b/Plugins/Enums/PluginGroup.cs index e54a3c58..b6b7612e 100644 --- a/Plugins/Enums/PluginGroup.cs +++ b/Plugins/Enums/PluginGroup.cs @@ -1,4 +1,4 @@ -namespace TweetDck.Plugins.Enums{ +namespace TweetDuck.Plugins.Enums{ enum PluginGroup{ Official, Custom } diff --git a/Plugins/Events/PluginChangedStateEventArgs.cs b/Plugins/Events/PluginChangedStateEventArgs.cs index 132564a8..21bbfe79 100644 --- a/Plugins/Events/PluginChangedStateEventArgs.cs +++ b/Plugins/Events/PluginChangedStateEventArgs.cs @@ -1,6 +1,6 @@ using System; -namespace TweetDck.Plugins.Events{ +namespace TweetDuck.Plugins.Events{ class PluginChangedStateEventArgs : EventArgs{ public Plugin Plugin { get; } public bool IsEnabled { get; } diff --git a/Plugins/Events/PluginErrorEventArgs.cs b/Plugins/Events/PluginErrorEventArgs.cs index ce5dba33..1f35b93e 100644 --- a/Plugins/Events/PluginErrorEventArgs.cs +++ b/Plugins/Events/PluginErrorEventArgs.cs @@ -1,7 +1,7 @@ using System; using System.Collections.Generic; -namespace TweetDck.Plugins.Events{ +namespace TweetDuck.Plugins.Events{ class PluginErrorEventArgs : EventArgs{ public bool HasErrors => Errors.Count > 0; diff --git a/Plugins/Plugin.cs b/Plugins/Plugin.cs index 339998cf..0de34517 100644 --- a/Plugins/Plugin.cs +++ b/Plugins/Plugin.cs @@ -3,9 +3,9 @@ using System.IO; using System.Linq; using System.Text; -using TweetDck.Plugins.Enums; +using TweetDuck.Plugins.Enums; -namespace TweetDck.Plugins{ +namespace TweetDuck.Plugins{ class Plugin{ public string Identifier { get; } public PluginGroup Group { get; } diff --git a/Plugins/PluginBridge.cs b/Plugins/PluginBridge.cs index 0b112cc9..64e2c815 100644 --- a/Plugins/PluginBridge.cs +++ b/Plugins/PluginBridge.cs @@ -2,11 +2,11 @@ using System.Collections.Generic; using System.IO; using System.Text; -using TweetDck.Core.Utils; -using TweetDck.Plugins.Enums; -using TweetDck.Plugins.Events; +using TweetDuck.Core.Utils; +using TweetDuck.Plugins.Enums; +using TweetDuck.Plugins.Events; -namespace TweetDck.Plugins{ +namespace TweetDuck.Plugins{ class PluginBridge{ private static string SanitizeCacheKey(string key){ return key.Replace('\\', '/').Trim(); diff --git a/Plugins/PluginConfig.cs b/Plugins/PluginConfig.cs index cf0c37cc..7257a189 100644 --- a/Plugins/PluginConfig.cs +++ b/Plugins/PluginConfig.cs @@ -2,9 +2,9 @@ using System.Collections.Generic; using System.IO; using System.Text; -using TweetDck.Plugins.Events; +using TweetDuck.Plugins.Events; -namespace TweetDck.Plugins{ +namespace TweetDuck.Plugins{ [Serializable] sealed class PluginConfig{ [field:NonSerialized] diff --git a/Plugins/PluginManager.cs b/Plugins/PluginManager.cs index 58735f7d..9596f4af 100644 --- a/Plugins/PluginManager.cs +++ b/Plugins/PluginManager.cs @@ -3,11 +3,11 @@ using System.Collections.Generic; using System.IO; using System.Linq; -using TweetDck.Plugins.Enums; -using TweetDck.Plugins.Events; -using TweetDck.Resources; +using TweetDuck.Plugins.Enums; +using TweetDuck.Plugins.Events; +using TweetDuck.Resources; -namespace TweetDck.Plugins{ +namespace TweetDuck.Plugins{ sealed class PluginManager{ public const string PluginBrowserScriptFile = "plugins.browser.js"; public const string PluginNotificationScriptFile = "plugins.notification.js"; diff --git a/Plugins/PluginScriptGenerator.cs b/Plugins/PluginScriptGenerator.cs index 961100ec..221ec861 100644 --- a/Plugins/PluginScriptGenerator.cs +++ b/Plugins/PluginScriptGenerator.cs @@ -1,7 +1,7 @@ using System.Text; -using TweetDck.Plugins.Enums; +using TweetDuck.Plugins.Enums; -namespace TweetDck.Plugins{ +namespace TweetDuck.Plugins{ static class PluginScriptGenerator{ public static string GenerateConfig(PluginConfig config){ return config.AnyDisabled ? "window.TD_PLUGINS.disabled = [\""+string.Join("\",\"", config.DisabledPlugins)+"\"];" : string.Empty; diff --git a/Program.cs b/Program.cs index a3098b3b..64d810e2 100644 --- a/Program.cs +++ b/Program.cs @@ -5,17 +5,17 @@ using System.Linq; using System.Threading; using System.Windows.Forms; -using TweetDck.Configuration; -using TweetDck.Core; -using TweetDck.Core.Handling; -using TweetDck.Core.Other; -using TweetDck.Core.Other.Settings.Export; -using TweetDck.Core.Utils; -using TweetDck.Plugins; -using TweetDck.Plugins.Events; -using TweetDck.Updates; +using TweetDuck.Configuration; +using TweetDuck.Core; +using TweetDuck.Core.Handling; +using TweetDuck.Core.Other; +using TweetDuck.Core.Other.Settings.Export; +using TweetDuck.Core.Utils; +using TweetDuck.Plugins; +using TweetDuck.Plugins.Events; +using TweetDuck.Updates; -namespace TweetDck{ +namespace TweetDuck{ static class Program{ public const string BrandName = "TweetDuck"; public const string Website = "https://tweetduck.chylex.com"; diff --git a/Properties/AssemblyInfo.cs b/Properties/AssemblyInfo.cs index eb0ded86..7da320e1 100644 --- a/Properties/AssemblyInfo.cs +++ b/Properties/AssemblyInfo.cs @@ -2,7 +2,7 @@ using System.Reflection; using System.Resources; using System.Runtime.InteropServices; -using TweetDck; +using TweetDuck; // General Information about an assembly is controlled through the following // set of attributes. Change these attribute values to modify the information diff --git a/Properties/Resources.Designer.cs b/Properties/Resources.Designer.cs index d44d25a6..b3403071 100644 --- a/Properties/Resources.Designer.cs +++ b/Properties/Resources.Designer.cs @@ -8,9 +8,10 @@ // </auto-generated> //------------------------------------------------------------------------------ -namespace TweetDck.Properties { - - +namespace TweetDuck.Properties { + using System; + + /// <summary> /// A strongly-typed resource class, for looking up localized strings, etc. /// </summary> @@ -38,7 +39,7 @@ internal Resources() { internal static global::System.Resources.ResourceManager ResourceManager { get { if (object.ReferenceEquals(resourceMan, null)) { - global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("TweetDck.Properties.Resources", typeof(Resources).Assembly); + global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("TweetDuck.Properties.Resources", typeof(Resources).Assembly); resourceMan = temp; } return resourceMan; diff --git a/Reporter.cs b/Reporter.cs index 3e9e6db2..c7436468 100644 --- a/Reporter.cs +++ b/Reporter.cs @@ -5,9 +5,9 @@ using System.IO; using System.Text; using System.Windows.Forms; -using TweetDck.Core.Other; +using TweetDuck.Core.Other; -namespace TweetDck{ +namespace TweetDuck{ class Reporter{ private readonly string logFile; diff --git a/Resources/ScriptLoader.cs b/Resources/ScriptLoader.cs index 919e2d66..0472723d 100644 --- a/Resources/ScriptLoader.cs +++ b/Resources/ScriptLoader.cs @@ -5,7 +5,7 @@ using System.Text; using System.Windows.Forms; -namespace TweetDck.Resources{ +namespace TweetDuck.Resources{ static class ScriptLoader{ private const string UrlPrefix = "td:"; diff --git a/TweetDck.csproj b/TweetDuck.csproj similarity index 99% rename from TweetDck.csproj rename to TweetDuck.csproj index fe0e9161..e9e859db 100644 --- a/TweetDck.csproj +++ b/TweetDuck.csproj @@ -1,4 +1,4 @@ -<?xml version="1.0" encoding="utf-8"?> +<?xml version="1.0" encoding="utf-8"?> <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Import Project="packages\CefSharp.WinForms.57.0.0\build\CefSharp.WinForms.props" Condition="Exists('packages\CefSharp.WinForms.57.0.0\build\CefSharp.WinForms.props')" /> <Import Project="packages\CefSharp.Common.57.0.0\build\CefSharp.Common.props" Condition="Exists('packages\CefSharp.Common.57.0.0\build\CefSharp.Common.props')" /> @@ -9,7 +9,7 @@ <ProjectGuid>{2389A7CD-E0D3-4706-8294-092929A33A2D}</ProjectGuid> <OutputType>WinExe</OutputType> <AppDesignerFolder>Properties</AppDesignerFolder> - <RootNamespace>TweetDck</RootNamespace> + <RootNamespace>TweetDuck</RootNamespace> <AssemblyName>TweetDuck</AssemblyName> <TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion> <FileAlignment>512</FileAlignment> diff --git a/TweetDck.sln b/TweetDuck.sln similarity index 93% rename from TweetDck.sln rename to TweetDuck.sln index 4f89c88e..5244aa02 100644 --- a/TweetDck.sln +++ b/TweetDuck.sln @@ -2,7 +2,7 @@ Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio 15 VisualStudioVersion = 15.0.26430.6 MinimumVisualStudioVersion = 10.0.40219.1 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TweetDck", "TweetDck.csproj", "{2389A7CD-E0D3-4706-8294-092929A33A2D}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TweetDuck", "TweetDuck.csproj", "{2389A7CD-E0D3-4706-8294-092929A33A2D}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TweetDuck.Browser", "subprocess\TweetDuck.Browser.csproj", "{B10B0017-819E-4F71-870F-8256B36A26AA}" EndProject @@ -19,13 +19,13 @@ Global {2389A7CD-E0D3-4706-8294-092929A33A2D}.Debug|x86.Deploy.0 = Debug|x86 {2389A7CD-E0D3-4706-8294-092929A33A2D}.Release|x86.ActiveCfg = Release|x86 {2389A7CD-E0D3-4706-8294-092929A33A2D}.Release|x86.Build.0 = Release|x86 - {A958FA7A-4A2C-42A7-BFA0-159343483F4E}.Debug|x86.ActiveCfg = Debug|x86 - {A958FA7A-4A2C-42A7-BFA0-159343483F4E}.Debug|x86.Build.0 = Debug|x86 - {A958FA7A-4A2C-42A7-BFA0-159343483F4E}.Release|x86.ActiveCfg = Release|x86 {B10B0017-819E-4F71-870F-8256B36A26AA}.Debug|x86.ActiveCfg = Debug|x86 {B10B0017-819E-4F71-870F-8256B36A26AA}.Debug|x86.Build.0 = Debug|x86 {B10B0017-819E-4F71-870F-8256B36A26AA}.Release|x86.ActiveCfg = Release|x86 {B10B0017-819E-4F71-870F-8256B36A26AA}.Release|x86.Build.0 = Release|x86 + {A958FA7A-4A2C-42A7-BFA0-159343483F4E}.Debug|x86.ActiveCfg = Debug|x86 + {A958FA7A-4A2C-42A7-BFA0-159343483F4E}.Debug|x86.Build.0 = Debug|x86 + {A958FA7A-4A2C-42A7-BFA0-159343483F4E}.Release|x86.ActiveCfg = Release|x86 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/TweetDck.sln.DotSettings b/TweetDuck.sln.DotSettings similarity index 100% rename from TweetDck.sln.DotSettings rename to TweetDuck.sln.DotSettings diff --git a/Updates/Events/UpdateAcceptedEventArgs.cs b/Updates/Events/UpdateAcceptedEventArgs.cs index 72a2a67c..7b59f73a 100644 --- a/Updates/Events/UpdateAcceptedEventArgs.cs +++ b/Updates/Events/UpdateAcceptedEventArgs.cs @@ -1,6 +1,6 @@ using System; -namespace TweetDck.Updates.Events{ +namespace TweetDuck.Updates.Events{ class UpdateAcceptedEventArgs : EventArgs{ public readonly UpdateInfo UpdateInfo; diff --git a/Updates/Events/UpdateCheckEventArgs.cs b/Updates/Events/UpdateCheckEventArgs.cs index 6b40fe9a..8ca6c06a 100644 --- a/Updates/Events/UpdateCheckEventArgs.cs +++ b/Updates/Events/UpdateCheckEventArgs.cs @@ -1,6 +1,6 @@ using System; -namespace TweetDck.Updates.Events{ +namespace TweetDuck.Updates.Events{ class UpdateCheckEventArgs : EventArgs{ public int EventId { get; } public bool UpdateAvailable { get; } diff --git a/Updates/Events/UpdateDismissedEventArgs.cs b/Updates/Events/UpdateDismissedEventArgs.cs index 8b5a4331..77e9d86c 100644 --- a/Updates/Events/UpdateDismissedEventArgs.cs +++ b/Updates/Events/UpdateDismissedEventArgs.cs @@ -1,6 +1,6 @@ using System; -namespace TweetDck.Updates.Events{ +namespace TweetDuck.Updates.Events{ class UpdateDismissedEventArgs : EventArgs{ public readonly string VersionTag; diff --git a/Updates/FormUpdateDownload.Designer.cs b/Updates/FormUpdateDownload.Designer.cs index 604c90c9..4a5ea17c 100644 --- a/Updates/FormUpdateDownload.Designer.cs +++ b/Updates/FormUpdateDownload.Designer.cs @@ -1,4 +1,4 @@ -namespace TweetDck.Updates { +namespace TweetDuck.Updates { partial class FormUpdateDownload { /// <summary> /// Required designer variable. diff --git a/Updates/FormUpdateDownload.cs b/Updates/FormUpdateDownload.cs index 53b28726..510452c1 100644 --- a/Updates/FormUpdateDownload.cs +++ b/Updates/FormUpdateDownload.cs @@ -3,10 +3,10 @@ using System.IO; using System.Net; using System.Windows.Forms; -using TweetDck.Core.Controls; -using TweetDck.Core.Utils; +using TweetDuck.Core.Controls; +using TweetDuck.Core.Utils; -namespace TweetDck.Updates{ +namespace TweetDuck.Updates{ sealed partial class FormUpdateDownload : Form{ private const double BytesToKB = 1024.0; diff --git a/Updates/UpdateHandler.cs b/Updates/UpdateHandler.cs index f45d363f..6cbd41fc 100644 --- a/Updates/UpdateHandler.cs +++ b/Updates/UpdateHandler.cs @@ -1,13 +1,13 @@ using CefSharp; using CefSharp.WinForms; using System; -using TweetDck.Core; -using TweetDck.Core.Controls; -using TweetDck.Core.Utils; -using TweetDck.Resources; -using TweetDck.Updates.Events; +using TweetDuck.Core; +using TweetDuck.Core.Controls; +using TweetDuck.Core.Utils; +using TweetDuck.Resources; +using TweetDuck.Updates.Events; -namespace TweetDck.Updates{ +namespace TweetDuck.Updates{ sealed class UpdateHandler{ private static bool IsSystemSupported => true; // Environment.OSVersion.Version >= new Version("6.1"); // 6.1 NT version = Windows 7 diff --git a/Updates/UpdateInfo.cs b/Updates/UpdateInfo.cs index 40790732..3844b0f1 100644 --- a/Updates/UpdateInfo.cs +++ b/Updates/UpdateInfo.cs @@ -1,6 +1,6 @@ -using TweetDck.Core.Utils; +using TweetDuck.Core.Utils; -namespace TweetDck.Updates{ +namespace TweetDuck.Updates{ class UpdateInfo{ public readonly string VersionTag; public readonly string DownloadUrl; diff --git a/Updates/UpdaterSettings.cs b/Updates/UpdaterSettings.cs index b972ce10..b1bece48 100644 --- a/Updates/UpdaterSettings.cs +++ b/Updates/UpdaterSettings.cs @@ -1,4 +1,4 @@ -namespace TweetDck.Updates{ +namespace TweetDuck.Updates{ class UpdaterSettings{ public bool AllowPreReleases { get; set; } public string DismissedUpdate { get; set; } diff --git a/tests/Core/Settings/TestCombinedFileStream.cs b/tests/Core/Settings/TestCombinedFileStream.cs index ebd5a44a..9299f89d 100644 --- a/tests/Core/Settings/TestCombinedFileStream.cs +++ b/tests/Core/Settings/TestCombinedFileStream.cs @@ -1,7 +1,7 @@ using Microsoft.VisualStudio.TestTools.UnitTesting; using System; using System.IO; -using TweetDck.Core.Other.Settings.Export; +using TweetDuck.Core.Other.Settings.Export; namespace UnitTests.Core.Settings{ [TestClass] diff --git a/tests/Core/Utils/TestBrowserUtils.cs b/tests/Core/Utils/TestBrowserUtils.cs index d179a79f..fa0f72f4 100644 --- a/tests/Core/Utils/TestBrowserUtils.cs +++ b/tests/Core/Utils/TestBrowserUtils.cs @@ -1,5 +1,5 @@ using Microsoft.VisualStudio.TestTools.UnitTesting; -using TweetDck.Core.Utils; +using TweetDuck.Core.Utils; namespace UnitTests.Core.Utils{ [TestClass] diff --git a/tests/Core/Utils/TestCommandLineArgs.cs b/tests/Core/Utils/TestCommandLineArgs.cs index 5709f5b6..7d13acb4 100644 --- a/tests/Core/Utils/TestCommandLineArgs.cs +++ b/tests/Core/Utils/TestCommandLineArgs.cs @@ -1,6 +1,6 @@ using Microsoft.VisualStudio.TestTools.UnitTesting; using System.Collections.Generic; -using TweetDck.Core.Utils; +using TweetDuck.Core.Utils; namespace UnitTests.Core.Utils{ [TestClass] diff --git a/tests/Core/Utils/TestCommandLineArgsParser.cs b/tests/Core/Utils/TestCommandLineArgsParser.cs index 96e39bd8..a9a40e6d 100644 --- a/tests/Core/Utils/TestCommandLineArgsParser.cs +++ b/tests/Core/Utils/TestCommandLineArgsParser.cs @@ -1,5 +1,5 @@ using Microsoft.VisualStudio.TestTools.UnitTesting; -using TweetDck.Core.Utils; +using TweetDuck.Core.Utils; namespace UnitTests.Core.Utils{ [TestClass] diff --git a/tests/Core/Utils/TestInjectedHTML.cs b/tests/Core/Utils/TestInjectedHTML.cs index 04d5097e..8ae62a95 100644 --- a/tests/Core/Utils/TestInjectedHTML.cs +++ b/tests/Core/Utils/TestInjectedHTML.cs @@ -2,7 +2,7 @@ using System.Collections.Generic; using System.Linq; using Microsoft.VisualStudio.TestTools.UnitTesting; -using TweetDck.Core.Utils; +using TweetDuck.Core.Utils; namespace UnitTests.Core.Utils{ [TestClass] diff --git a/tests/Core/Utils/TestTwoKeyDictionary.cs b/tests/Core/Utils/TestTwoKeyDictionary.cs index 556cad20..142f8fb4 100644 --- a/tests/Core/Utils/TestTwoKeyDictionary.cs +++ b/tests/Core/Utils/TestTwoKeyDictionary.cs @@ -1,7 +1,7 @@ using System; using System.Linq; using Microsoft.VisualStudio.TestTools.UnitTesting; -using TweetDck.Core.Utils; +using TweetDuck.Core.Utils; using System.Collections.Generic; namespace UnitTests.Core.Utils{ diff --git a/tests/UnitTests.csproj b/tests/UnitTests.csproj index 0106c08a..2e67154b 100644 --- a/tests/UnitTests.csproj +++ b/tests/UnitTests.csproj @@ -57,9 +57,9 @@ <Compile Include="TestUtils.cs" /> </ItemGroup> <ItemGroup> - <ProjectReference Include="..\TweetDck.csproj"> + <ProjectReference Include="..\TweetDuck.csproj"> <Project>{2389a7cd-e0d3-4706-8294-092929a33a2d}</Project> - <Name>TweetDck</Name> + <Name>TweetDuck</Name> </ProjectReference> </ItemGroup> <Choose>