diff --git a/PerformanceOverlay/Controller.cs b/PerformanceOverlay/Controller.cs index 7779200..6c7121a 100644 --- a/PerformanceOverlay/Controller.cs +++ b/PerformanceOverlay/Controller.cs @@ -85,7 +85,7 @@ namespace PerformanceOverlay exitItem.Click += ExitItem_Click; notifyIcon = new System.Windows.Forms.NotifyIcon(components); - notifyIcon.Icon = Resources.traffic_light_outline; + notifyIcon.Icon = Resources.poll; notifyIcon.Text = TitleWithVersion; notifyIcon.Visible = true; notifyIcon.ContextMenuStrip = contextMenu; @@ -179,12 +179,12 @@ namespace PerformanceOverlay try { notifyIcon.Text = TitleWithVersion + ". RTSS Version: " + OSD.Version; - notifyIcon.Icon = Resources.traffic_light_outline; + notifyIcon.Icon = Resources.poll; } catch { notifyIcon.Text = TitleWithVersion + ". RTSS Not Available."; - notifyIcon.Icon = Resources.traffic_light_outline_red; + notifyIcon.Icon = Resources.poll_red; osdReset(); return; } diff --git a/PerformanceOverlay/PerformanceOverlay.csproj b/PerformanceOverlay/PerformanceOverlay.csproj index 50d944e..937695f 100644 --- a/PerformanceOverlay/PerformanceOverlay.csproj +++ b/PerformanceOverlay/PerformanceOverlay.csproj @@ -7,7 +7,7 @@ true enable app.manifest - Resources\traffic-light-outline.ico + Resources\poll.ico True @@ -20,7 +20,7 @@ - + diff --git a/PerformanceOverlay/Resources.Designer.cs b/PerformanceOverlay/Resources.Designer.cs index c3b5054..b66fd42 100644 --- a/PerformanceOverlay/Resources.Designer.cs +++ b/PerformanceOverlay/Resources.Designer.cs @@ -63,9 +63,9 @@ namespace PerformanceOverlay { /// /// Looks up a localized resource of type System.Drawing.Icon similar to (Icon). /// - internal static System.Drawing.Icon traffic_light_outline { + internal static System.Drawing.Icon poll { get { - object obj = ResourceManager.GetObject("traffic_light_outline", resourceCulture); + object obj = ResourceManager.GetObject("poll", resourceCulture); return ((System.Drawing.Icon)(obj)); } } @@ -73,9 +73,9 @@ namespace PerformanceOverlay { /// /// Looks up a localized resource of type System.Drawing.Icon similar to (Icon). /// - internal static System.Drawing.Icon traffic_light_outline_red { + internal static System.Drawing.Icon poll_red { get { - object obj = ResourceManager.GetObject("traffic_light_outline_red", resourceCulture); + object obj = ResourceManager.GetObject("poll_red", resourceCulture); return ((System.Drawing.Icon)(obj)); } } diff --git a/PerformanceOverlay/Resources.resx b/PerformanceOverlay/Resources.resx index 1411386..bb39ad0 100644 --- a/PerformanceOverlay/Resources.resx +++ b/PerformanceOverlay/Resources.resx @@ -118,10 +118,10 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - Resources\traffic-light-outline.ico;System.Drawing.Icon, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + Resources\poll.ico;System.Drawing.Icon, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - Resources\traffic-light-outline-red.ico;System.Drawing.Icon, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + Resources\poll_red.ico;System.Drawing.Icon, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a \ No newline at end of file diff --git a/PerformanceOverlay/Resources/NotifyIcon.ico b/PerformanceOverlay/Resources/NotifyIcon.ico deleted file mode 100644 index 5d06b9f..0000000 Binary files a/PerformanceOverlay/Resources/NotifyIcon.ico and /dev/null differ diff --git a/PowerControl/Resources/poll.ico b/PerformanceOverlay/Resources/poll.ico similarity index 100% rename from PowerControl/Resources/poll.ico rename to PerformanceOverlay/Resources/poll.ico diff --git a/PowerControl/Resources/poll_red.ico b/PerformanceOverlay/Resources/poll_red.ico similarity index 100% rename from PowerControl/Resources/poll_red.ico rename to PerformanceOverlay/Resources/poll_red.ico diff --git a/PerformanceOverlay/Resources/traffic-light-outline.png b/PerformanceOverlay/Resources/traffic-light-outline.png deleted file mode 100644 index e0e8c3b..0000000 Binary files a/PerformanceOverlay/Resources/traffic-light-outline.png and /dev/null differ diff --git a/PowerControl/Controller.cs b/PowerControl/Controller.cs index e1e8a3b..068a93c 100644 --- a/PowerControl/Controller.cs +++ b/PowerControl/Controller.cs @@ -78,7 +78,7 @@ namespace PowerControl exitItem.Click += ExitItem_Click; notifyIcon = new System.Windows.Forms.NotifyIcon(components); - notifyIcon.Icon = Resources.poll; + notifyIcon.Icon = Resources.traffic_light_outline; notifyIcon.Text = TitleWithVersion; notifyIcon.Visible = true; notifyIcon.ContextMenuStrip = contextMenu; @@ -194,12 +194,12 @@ namespace PowerControl try { notifyIcon.Text = TitleWithVersion + ". RTSS Version: " + OSD.Version; - notifyIcon.Icon = Resources.poll; + notifyIcon.Icon = Resources.traffic_light_outline; } catch { notifyIcon.Text = TitleWithVersion + ". RTSS Not Available."; - notifyIcon.Icon = Resources.poll_red; + notifyIcon.Icon = Resources.traffic_light_outline_red; } updateOSD(); diff --git a/PowerControl/PowerControl.csproj b/PowerControl/PowerControl.csproj index 00b420c..5fa715d 100644 --- a/PowerControl/PowerControl.csproj +++ b/PowerControl/PowerControl.csproj @@ -8,7 +8,7 @@ enable True app.manifest - Resources\poll.ico + Resources\traffic-light-outline.ico @@ -20,7 +20,7 @@ - + diff --git a/PowerControl/Resources.Designer.cs b/PowerControl/Resources.Designer.cs index d986e2f..d08fb10 100644 --- a/PowerControl/Resources.Designer.cs +++ b/PowerControl/Resources.Designer.cs @@ -63,9 +63,9 @@ namespace PowerControl { /// /// Looks up a localized resource of type System.Drawing.Icon similar to (Icon). /// - internal static System.Drawing.Icon poll { + internal static System.Drawing.Icon traffic_light_outline { get { - object obj = ResourceManager.GetObject("poll", resourceCulture); + object obj = ResourceManager.GetObject("traffic_light_outline", resourceCulture); return ((System.Drawing.Icon)(obj)); } } @@ -73,9 +73,9 @@ namespace PowerControl { /// /// Looks up a localized resource of type System.Drawing.Icon similar to (Icon). /// - internal static System.Drawing.Icon poll_red { + internal static System.Drawing.Icon traffic_light_outline_red { get { - object obj = ResourceManager.GetObject("poll_red", resourceCulture); + object obj = ResourceManager.GetObject("traffic_light_outline_red", resourceCulture); return ((System.Drawing.Icon)(obj)); } } diff --git a/PowerControl/Resources.resx b/PowerControl/Resources.resx index bb39ad0..1411386 100644 --- a/PowerControl/Resources.resx +++ b/PowerControl/Resources.resx @@ -118,10 +118,10 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - Resources\poll.ico;System.Drawing.Icon, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + Resources\traffic-light-outline.ico;System.Drawing.Icon, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - Resources\poll_red.ico;System.Drawing.Icon, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + Resources\traffic-light-outline-red.ico;System.Drawing.Icon, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a \ No newline at end of file diff --git a/PerformanceOverlay/Resources/traffic-light-outline-red.ico b/PowerControl/Resources/traffic-light-outline-red.ico similarity index 100% rename from PerformanceOverlay/Resources/traffic-light-outline-red.ico rename to PowerControl/Resources/traffic-light-outline-red.ico diff --git a/PerformanceOverlay/Resources/traffic-light-outline.ico b/PowerControl/Resources/traffic-light-outline.ico similarity index 100% rename from PerformanceOverlay/Resources/traffic-light-outline.ico rename to PowerControl/Resources/traffic-light-outline.ico diff --git a/RELEASE.md b/RELEASE.md index ee1ae4f..3881da9 100644 --- a/RELEASE.md +++ b/RELEASE.md @@ -8,5 +8,7 @@ - Add battery remaining - Add FPSWithBattery overlay - Add FPS Limit using RTSS +- Fix ryzenadj creating console window +- Swap icons of PerformanceOverlay and PowerControl If you found it useful buy me [Ko-fi](https://ko-fi.com/ayufan).