diff --git a/Configuration/UserConfig.cs b/Configuration/UserConfig.cs index e3192573..c54c0480 100644 --- a/Configuration/UserConfig.cs +++ b/Configuration/UserConfig.cs @@ -2,9 +2,9 @@ using System.Collections.Generic; using System.Drawing; using System.IO; -using TweetDuck.Core; using TweetDuck.Core.Controls; using TweetDuck.Core.Notification; +using TweetDuck.Core.Other; using TweetDuck.Core.Utils; using TweetDuck.Data; using TweetDuck.Data.Serialization; diff --git a/Core/FormBrowser.Designer.cs b/Core/FormBrowser.Designer.cs index 141e14e1..e86f17b8 100644 --- a/Core/FormBrowser.Designer.cs +++ b/Core/FormBrowser.Designer.cs @@ -24,7 +24,7 @@ protected override void Dispose(bool disposing) { /// </summary> private void InitializeComponent() { this.components = new System.ComponentModel.Container(); - this.trayIcon = new TweetDuck.Core.TrayIcon(this.components); + this.trayIcon = new TweetDuck.Core.Other.TrayIcon(this.components); this.toolTip = new System.Windows.Forms.ToolTip(this.components); this.timerResize = new System.Windows.Forms.Timer(this.components); this.SuspendLayout(); @@ -57,7 +57,7 @@ private void InitializeComponent() { #endregion - private TrayIcon trayIcon; + private TweetDuck.Core.Other.TrayIcon trayIcon; private System.Windows.Forms.ToolTip toolTip; private System.Windows.Forms.Timer timerResize; } diff --git a/Core/TrayIcon.Designer.cs b/Core/Other/TrayIcon.Designer.cs similarity index 97% rename from Core/TrayIcon.Designer.cs rename to Core/Other/TrayIcon.Designer.cs index fa64625b..90ce4daf 100644 --- a/Core/TrayIcon.Designer.cs +++ b/Core/Other/TrayIcon.Designer.cs @@ -1,4 +1,4 @@ -namespace TweetDuck.Core { +namespace TweetDuck.Core.Other { partial class TrayIcon { /// <summary> /// Required designer variable. diff --git a/Core/TrayIcon.cs b/Core/Other/TrayIcon.cs similarity index 96% rename from Core/TrayIcon.cs rename to Core/Other/TrayIcon.cs index a40c5d3c..3f461770 100644 --- a/Core/TrayIcon.cs +++ b/Core/Other/TrayIcon.cs @@ -2,7 +2,7 @@ using System.ComponentModel; using System.Windows.Forms; -namespace TweetDuck.Core{ +namespace TweetDuck.Core.Other{ sealed partial class TrayIcon : Component{ public enum Behavior{ // keep order Disabled, DisplayOnly, MinimizeToTray, CloseToTray, Combined @@ -12,7 +12,9 @@ public enum Behavior{ // keep order public event EventHandler ClickClose; public bool Visible{ - get => notifyIcon.Visible; + get{ + return notifyIcon.Visible; + } set{ if (value){ diff --git a/TweetDuck.csproj b/TweetDuck.csproj index 895d451c..2a4e19e8 100644 --- a/TweetDuck.csproj +++ b/TweetDuck.csproj @@ -270,10 +270,10 @@ <Compile Include="Updates\FormUpdateDownload.Designer.cs"> <DependentUpon>FormUpdateDownload.cs</DependentUpon> </Compile> - <Compile Include="Core\TrayIcon.cs"> + <Compile Include="Core\Other\TrayIcon.cs"> <SubType>Component</SubType> </Compile> - <Compile Include="Core\TrayIcon.Designer.cs"> + <Compile Include="Core\Other\TrayIcon.Designer.cs"> <DependentUpon>TrayIcon.cs</DependentUpon> </Compile> <Compile Include="Core\Utils\BrowserCache.cs" /> diff --git a/tests/Configuration/TestUserConfig.cs b/tests/Configuration/TestUserConfig.cs index a2f67b17..af68e553 100644 --- a/tests/Configuration/TestUserConfig.cs +++ b/tests/Configuration/TestUserConfig.cs @@ -3,7 +3,7 @@ using System.IO; using Microsoft.VisualStudio.TestTools.UnitTesting; using TweetDuck.Configuration; -using TweetDuck.Core; +using TweetDuck.Core.Other; namespace UnitTests.Configuration{ [TestClass]