From a29fcfe9a6481ff88d4607504154c4237d3adc92 Mon Sep 17 00:00:00 2001
From: Chris Kaczor <chris@kaczorzoo.net>
Date: Fri, 7 Aug 2026 10:50:47 -0400
Subject: [PATCH] Delete old junk from branch merge

---
 .gitattributes                      |  63 ------------
 .gitmodules                         |   6 --
 Common                              |   1 -
 Common.Wpf                          |   1 -
 NuGet.config                        |   6 --
 Options/AboutOptionsPanel.xaml      |  46 ---------
 Options/AboutOptionsPanel.xaml.cs   |  42 --------
 Options/GeneralOptionsPanel.xaml    |  22 -----
 Options/GeneralOptionsPanel.xaml.cs |  39 --------
 Resources/ApplicationIcon.ico       | Bin 2550 -> 0 bytes
 TrayIcon.cs                         | 143 ----------------------------
 WorkIndicator.csproj.DotSettings    |   2 -
 WorkIndicator.nuspec                |  19 ----
 appveyor.yml                        |  31 ------
 14 files changed, 421 deletions(-)
 delete mode 100644 .gitattributes
 delete mode 100644 .gitmodules
 delete mode 160000 Common
 delete mode 160000 Common.Wpf
 delete mode 100644 NuGet.config
 delete mode 100644 Options/AboutOptionsPanel.xaml
 delete mode 100644 Options/AboutOptionsPanel.xaml.cs
 delete mode 100644 Options/GeneralOptionsPanel.xaml
 delete mode 100644 Options/GeneralOptionsPanel.xaml.cs
 delete mode 100644 Resources/ApplicationIcon.ico
 delete mode 100644 TrayIcon.cs
 delete mode 100644 WorkIndicator.csproj.DotSettings
 delete mode 100644 WorkIndicator.nuspec
 delete mode 100644 appveyor.yml

diff --git a/.gitattributes b/.gitattributes
deleted file mode 100644
index 1ff0c42..0000000
--- a/.gitattributes
+++ /dev/null
@@ -1,63 +0,0 @@
-###############################################################################
-# Set default behavior to automatically normalize line endings.
-###############################################################################
-* text=auto
-
-###############################################################################
-# Set default behavior for command prompt diff.
-#
-# This is need for earlier builds of msysgit that does not have it on by
-# default for csharp files.
-# Note: This is only used by command line
-###############################################################################
-#*.cs     diff=csharp
-
-###############################################################################
-# Set the merge driver for project and solution files
-#
-# Merging from the command prompt will add diff markers to the files if there
-# are conflicts (Merging from VS is not affected by the settings below, in VS
-# the diff markers are never inserted). Diff markers may cause the following 
-# file extensions to fail to load in VS. An alternative would be to treat
-# these files as binary and thus will always conflict and require user
-# intervention with every merge. To do so, just uncomment the entries below
-###############################################################################
-#*.sln       merge=binary
-#*.csproj    merge=binary
-#*.vbproj    merge=binary
-#*.vcxproj   merge=binary
-#*.vcproj    merge=binary
-#*.dbproj    merge=binary
-#*.fsproj    merge=binary
-#*.lsproj    merge=binary
-#*.wixproj   merge=binary
-#*.modelproj merge=binary
-#*.sqlproj   merge=binary
-#*.wwaproj   merge=binary
-
-###############################################################################
-# behavior for image files
-#
-# image files are treated as binary by default.
-###############################################################################
-#*.jpg   binary
-#*.png   binary
-#*.gif   binary
-
-###############################################################################
-# diff behavior for common document formats
-# 
-# Convert binary document formats to text before diffing them. This feature
-# is only available from the command line. Turn it on by uncommenting the 
-# entries below.
-###############################################################################
-#*.doc   diff=astextplain
-#*.DOC   diff=astextplain
-#*.docx  diff=astextplain
-#*.DOCX  diff=astextplain
-#*.dot   diff=astextplain
-#*.DOT   diff=astextplain
-#*.pdf   diff=astextplain
-#*.PDF   diff=astextplain
-#*.rtf   diff=astextplain
-#*.RTF   diff=astextplain
diff --git a/.gitmodules b/.gitmodules
deleted file mode 100644
index b2a9186..0000000
--- a/.gitmodules
+++ /dev/null
@@ -1,6 +0,0 @@
-[submodule "Common"]
-	path = Common
-	url = https://github.com/ckaczor/Common.git
-[submodule "Common.Wpf"]
-	path = Common.Wpf
-	url = https://github.com/ckaczor/Common.Wpf.git
diff --git a/Common b/Common
deleted file mode 160000
index 81856b2..0000000
--- a/Common
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 81856b27001b1e271184f8dce84e7e061fe4d557
diff --git a/Common.Wpf b/Common.Wpf
deleted file mode 160000
index 8a82786..0000000
--- a/Common.Wpf
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 8a82786166d49271b22e48aba0ca34cf8d366872
diff --git a/NuGet.config b/NuGet.config
deleted file mode 100644
index 8043d3f..0000000
--- a/NuGet.config
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<configuration>
-	<config>
-		<add key="globalPackagesFolder" value=".\packages" />
-	</config>
-</configuration>
\ No newline at end of file
diff --git a/Options/AboutOptionsPanel.xaml b/Options/AboutOptionsPanel.xaml
deleted file mode 100644
index bf41ee4..0000000
--- a/Options/AboutOptionsPanel.xaml
+++ /dev/null
@@ -1,46 +0,0 @@
-<windows:CategoryPanel x:Class="WorkIndicator.Options.AboutOptionsPanel"
-                       xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-                       xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-                       xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-                       xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-                       xmlns:windows="clr-namespace:Common.Wpf.Windows;assembly=Common.Wpf"
-                       xmlns:properties="clr-namespace:WorkIndicator.Properties"
-                       mc:Ignorable="d"
-                       d:DesignHeight="300"
-                       d:DesignWidth="300">
-    <Grid>
-        <Grid.RowDefinitions>
-            <RowDefinition Height="Auto"></RowDefinition>
-            <RowDefinition Height="Auto"></RowDefinition>
-            <RowDefinition Height="Auto"></RowDefinition>
-            <RowDefinition Height="Auto"></RowDefinition>
-            <RowDefinition Height="*"></RowDefinition>
-        </Grid.RowDefinitions>
-        <TextBlock Text="[Application Name]"
-                   Name="ApplicationNameLabel"
-                   VerticalAlignment="Top"
-                   FontWeight="Bold"
-                   Grid.Row="0" />
-        <TextBlock Text="[Application Version]"
-                   Margin="0,6,0,0"
-                   Name="VersionLabel"
-                   VerticalAlignment="Top" 
-                   Grid.Row="1" />
-        <TextBlock Text="[Company]"
-                   Margin="0,6,0,0"
-                   Name="CompanyLabel"
-                   VerticalAlignment="Top" 
-                   Grid.Row="2" />
-        <StackPanel Grid.Row="3"
-                    Grid.Column="0"
-                    Margin="0,20,0,0"
-                    Orientation="Horizontal">
-            <Button Content="{x:Static properties:Resources.CheckUpdate}"
-                HorizontalAlignment="Left"                
-                Padding="6,2"               
-                Click="HandleCheckForUpdateButtonClick"
-                VerticalContentAlignment="Center" />
-            <Label Name="UpdateMessage" Content="" VerticalContentAlignment="Center" Padding="6,0" />
-        </StackPanel>
-    </Grid>
-</windows:CategoryPanel>
diff --git a/Options/AboutOptionsPanel.xaml.cs b/Options/AboutOptionsPanel.xaml.cs
deleted file mode 100644
index 2e1234f..0000000
--- a/Options/AboutOptionsPanel.xaml.cs
+++ /dev/null
@@ -1,42 +0,0 @@
-using Common.Update;
-using System.Reflection;
-using System.Windows;
-
-namespace WorkIndicator.Options
-{
-    public partial class AboutOptionsPanel
-    {
-        public AboutOptionsPanel()
-        {
-            InitializeComponent();
-        }
-
-        public override void LoadPanel(object data)
-        {
-            base.LoadPanel(data);
-
-            ApplicationNameLabel.Text = Properties.Resources.ApplicationName;
-
-            var version = UpdateCheck.LocalVersion.ToString();
-            VersionLabel.Text = string.Format(Properties.Resources.About_Version, version);
-
-            CompanyLabel.Text = ((AssemblyCompanyAttribute)Assembly.GetEntryAssembly().GetCustomAttributes(typeof(AssemblyCompanyAttribute), false)[0]).Company;
-        }
-
-        public override bool ValidatePanel()
-        {
-            return true;
-        }
-
-        public override void SavePanel()
-        {
-        }
-
-        public override string CategoryName => Properties.Resources.OptionCategory_About;
-
-        private async void HandleCheckForUpdateButtonClick(object sender, RoutedEventArgs e)
-        {
-            await UpdateCheck.CheckUpdate((status, message) => UpdateMessage.Content = message);
-        }
-    }
-}
diff --git a/Options/GeneralOptionsPanel.xaml b/Options/GeneralOptionsPanel.xaml
deleted file mode 100644
index 199b3af..0000000
--- a/Options/GeneralOptionsPanel.xaml
+++ /dev/null
@@ -1,22 +0,0 @@
-<windows:CategoryPanel x:Class="WorkIndicator.Options.GeneralOptionsPanel"
-                       xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-                       xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-                       xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-                       xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-                       xmlns:windows="clr-namespace:Common.Wpf.Windows;assembly=Common.Wpf"
-                       xmlns:properties="clr-namespace:WorkIndicator.Properties"
-                       mc:Ignorable="d"
-                       d:DesignHeight="300"
-                       d:DesignWidth="300">
-    <Grid>
-        <Grid.ColumnDefinitions>
-            <ColumnDefinition Width="Auto" />
-            <ColumnDefinition Width="*" />
-        </Grid.ColumnDefinitions>
-        <CheckBox Content="{x:Static properties:Resources.StartWithWindows}"
-                  Name="StartWithWindows"
-                  VerticalAlignment="Top"
-                  VerticalContentAlignment="Center"
-                  Grid.ColumnSpan="2" />
-    </Grid>
-</windows:CategoryPanel>
diff --git a/Options/GeneralOptionsPanel.xaml.cs b/Options/GeneralOptionsPanel.xaml.cs
deleted file mode 100644
index dd34f50..0000000
--- a/Options/GeneralOptionsPanel.xaml.cs
+++ /dev/null
@@ -1,39 +0,0 @@
-using Common.Wpf.Extensions;
-using System.Windows;
-
-namespace WorkIndicator.Options
-{
-    public partial class GeneralOptionsPanel
-    {
-        public GeneralOptionsPanel()
-        {
-            InitializeComponent();
-        }
-
-        public override void LoadPanel(object data)
-        {
-            base.LoadPanel(data);
-
-            var settings = Properties.Settings.Default;
-
-            StartWithWindows.IsChecked = settings.StartWithWindows;
-        }
-
-        public override bool ValidatePanel()
-        {
-            return true;
-        }
-
-        public override void SavePanel()
-        {
-            var settings = Properties.Settings.Default;
-
-            if (StartWithWindows.IsChecked.HasValue && settings.StartWithWindows != StartWithWindows.IsChecked.Value)
-                settings.StartWithWindows = StartWithWindows.IsChecked.Value;
-
-            Application.Current.SetStartWithWindows(settings.StartWithWindows);
-        }
-
-        public override string CategoryName => Properties.Resources.OptionCategory_General;
-    }
-}
diff --git a/Resources/ApplicationIcon.ico b/Resources/ApplicationIcon.ico
deleted file mode 100644
index 9c706cfec4f6783e21ea0d08026bafbf9359480e..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2550
zcmeH}T~JhY7{(uDfnrh2&<a>wD-5+Fsg(FoDptyZRx+fZuL&9rr>XRY8?PjrF1l%^
zrY^*09GlX?u@5&Cw5CCDx@jvDN?YChV8($(wnf;lr{|nqKPq-+Z@Tk8^X&P*?>W!e
zGv~}azZXcs49uPl9dE$;G+-eRukBcG0p3%u$mmIS$+*r~RVn5n_H)giBs!k~IvarP
zYbEXXY{-@Juy6BXX$f|>WMX$~Ccb>bim%?x#CPpkI$H6~<}4i9l8vu7&BDR<Iq2J(
zkG_t4{MFrzaaR+9-?vE{F|@q|Lpv%k^hqT=pVi>ho;sZFa^k$J8J*iI@zL8Wu<h_J
zbR61+cL(+%s%L8VMX+Tog0222Ixa@>@dVLziD(@T<E_ysHc3uz1WjkcXc>;EFP)jf
zhI2u@KN3NgeEkzq{23xDehZ^~D1`FCAZk4!)JbdPt=F;s<RsSpF^LzwVHCNiu;`~L
zlpOV;^mq_ugCQ(GI)ZYk>PJ7S-F~FHF2K?khUKsymfnl79PlCS2O>?qboJ8JEAIE9
zc)*9HlB0hFs|H4qy8i-lx;&V>*8`ht*!&L54tP=8?KSt+J!j$QJ&S@5`%&=05wmA}
zo9pZP8~A_UKt}3}^lSd%M$63Xv{+`CU29Hm?%d3)7tG1G+48ck);G_$+Y5}eiLaaH
z-Fn+Cvo2S_f;$Qe@4Wp={c3Yvef`rfw8k4P%??L(wZrlJE3rmPL)l|B73F1(@%rV4
z`>GzTT(Pq8rP%q^Pn47{T(<Q7Cm)a1&#fzdC}sIQ_pW+2R-@^GC3i1g^k8kg1lBx!
zSJ5L1wJU3_)A>}a2(JVt=TEP(Y~WPJe`WLykKz4i&f3kJRw;v%S!5tj8GBl}8&>{?
zmAPK>oGlrzagB2McjYye$C8!GZ7Q!%ChJ$82bI@UHk(pzQ#l_>*00Q`@|?<ZQ_6RW
z4@}lCUQi667+^|Fpm>tBU)-TMLor6$Nb!c^Qqq2Lhhh%J8&hHr#i6A9ulEe@RYp@B
zpt3(E?UmhZJ9zwyMDIX(p7C1GiH^dZ$09b@d5Sd@b4(d~ae)hV9%EbYiFXp+LyT~X
zBNWppK2e;axJL2K?1?WFOMXe@7jH(zCyJdE|0wQJOr)4dF_B^x#ig-CezDLm7E;Wm
z_)4*w;w{Btiop~kDP{%|`Ncwy*hul4Vzar#YI(yH*D3Z=%#1;CnwvP?<DZJ96zi#(
zfSL)Y`GA@eDE3o)X03bt^J%PROV4X<{Q1%$ahqa4HD^$B1~mgv>}Kh}_^-NVW+K1Q
v4@Q}@+8x+0-upEJOh^IE1O6I!pgR=hynlNWWsK1`^5olTa^`aO80Y^66h~;P

diff --git a/TrayIcon.cs b/TrayIcon.cs
deleted file mode 100644
index e055bce..0000000
--- a/TrayIcon.cs
+++ /dev/null
@@ -1,143 +0,0 @@
-using Common.Wpf.Windows;
-using System.Collections.Generic;
-using System.Windows.Forms;
-using WorkIndicator.Options;
-using WorkIndicator.Properties;
-
-using Application = System.Windows.Application;
-
-namespace WorkIndicator
-{
-    internal static class TrayIcon
-    {
-        private static NotifyIcon _trayIcon;
-
-        private static bool _initialized;
-
-        private static CategoryWindow _optionsWindow;
-
-        public static void Initialize()
-        {
-            // Create the tray icon
-            _trayIcon = new NotifyIcon { Icon = Resources.ApplicationIcon, Text = Resources.ApplicationName };
-
-            // Setup the menu
-            var contextMenuStrip = new ContextMenuStrip();
-            contextMenuStrip.Opening += HandleContextMenuStripOpening;
-
-            // Add the menu items
-            var menuItem = new ToolStripMenuItem(Resources.Auto, null, HandleStatusMenuClick) { Tag = Status.Auto };
-            contextMenuStrip.Items.Add(menuItem);
-
-            // --
-
-            menuItem = new ToolStripMenuItem(Resources.Free, null, HandleStatusMenuClick) { Tag = Status.Free };
-            contextMenuStrip.Items.Add(menuItem);
-
-            // --
-
-            menuItem = new ToolStripMenuItem(Resources.Working, null, HandleStatusMenuClick) { Tag = Status.Working };
-            contextMenuStrip.Items.Add(menuItem);
-
-            // --
-
-            menuItem = new ToolStripMenuItem(Resources.OnPhone, null, HandleStatusMenuClick) { Tag = Status.OnPhone };
-            contextMenuStrip.Items.Add(menuItem);
-
-            // --
-
-            menuItem = new ToolStripMenuItem(Resources.Talking, null, HandleStatusMenuClick) { Tag = Status.Talking };
-            contextMenuStrip.Items.Add(menuItem);
-
-            // --
-
-            contextMenuStrip.Items.Add("-");
-            contextMenuStrip.Items.Add(Resources.TrayIconContextMenuSettings, null, HandleContextMenuSettingsClick);
-
-            // --
-
-            contextMenuStrip.Items.Add("-");
-            contextMenuStrip.Items.Add(Resources.TrayIconContextMenuExit, null, HandleContextMenuExitClick);
-
-            // Set the menu into the icon
-            _trayIcon.ContextMenuStrip = contextMenuStrip;
-
-            // Show the icon
-            _trayIcon.Visible = true;
-
-            _initialized = true;
-        }
-
-        public static void ShowUpdateMessage(string text)
-        {
-            _trayIcon.ShowBalloonTip(200, Resources.ApplicationName, text, ToolTipIcon.None);
-        }
-
-        static void HandleContextMenuStripOpening(object sender, System.ComponentModel.CancelEventArgs e)
-        {
-            foreach (ToolStripItem menuItem in _trayIcon.ContextMenuStrip.Items)
-            {
-                if (menuItem.Tag == null)
-                    continue;
-
-                var status = (Status)menuItem.Tag;
-
-                ((ToolStripMenuItem)menuItem).Checked = (LightController.Status == status);
-            }
-        }
-
-        private static void HandleStatusMenuClick(object sender, System.EventArgs e)
-        {
-            var menuItem = (ToolStripMenuItem)sender;
-
-            var status = (Status)menuItem.Tag;
-
-            LightController.Status = status;
-        }
-
-        private static void HandleContextMenuSettingsClick(object sender, System.EventArgs e)
-        {
-            ShowSettings();
-        }
-
-        private static void HandleContextMenuExitClick(object sender, System.EventArgs e)
-        {
-            // Shutdown the application
-            Application.Current.Shutdown();
-        }
-
-        public static void Dispose()
-        {
-            if (!_initialized)
-                return;
-
-            // Get rid of the icon
-            _trayIcon.Visible = false;
-            _trayIcon.Dispose();
-
-            _initialized = false;
-        }
-
-        private static void ShowSettings()
-        {
-            var panels = new List<CategoryPanel>
-            {
-                new GeneralOptionsPanel(),
-                new AboutOptionsPanel()
-            };
-
-            if (_optionsWindow == null)
-            {
-                _optionsWindow = new CategoryWindow(null, panels, Resources.ResourceManager, "OptionsWindow");
-                _optionsWindow.Closed += (o, args) => { _optionsWindow = null; };
-            }
-
-            var dialogResult = _optionsWindow.ShowDialog();
-
-            if (dialogResult.HasValue && dialogResult.Value)
-            {
-                Settings.Default.Save();
-            }
-        }
-    }
-}
diff --git a/WorkIndicator.csproj.DotSettings b/WorkIndicator.csproj.DotSettings
deleted file mode 100644
index a21b0f7..0000000
--- a/WorkIndicator.csproj.DotSettings
+++ /dev/null
@@ -1,2 +0,0 @@
-<wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
-	<s:Boolean x:Key="/Default/CodeInspection/NamespaceProvider/NamespaceFoldersToSkip/=Delcom/@EntryIndexedValue">False</s:Boolean></wpf:ResourceDictionary>
\ No newline at end of file
diff --git a/WorkIndicator.nuspec b/WorkIndicator.nuspec
deleted file mode 100644
index fbdecf9..0000000
--- a/WorkIndicator.nuspec
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0"?>
-<package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
-  <metadata>
-    <id>WorkIndicator</id>
-    <title>Work Indicator</title>
-    <version>$version$</version>
-    <authors>Chris Kaczor</authors>
-    <description>Controls a Delcom Green/Yellow/Red Indicator to show work status (free, working, on phone, talking) either manually or automatically.</description>
-    <projectUrl>https://github.com/ckaczor/WorkIndicator</projectUrl>
-    <license type="expression">MIT</license>
-    <tags></tags>
-    <dependencies>
-      <group targetFramework=".NETFramework4.5" />
-    </dependencies>
-  </metadata>
-  <files>
-    <file src="bin\$configuration$\**\*" target="lib\net45" exclude="*.pdb;*.nupkg;*.vshost.*" />
-  </files>
-</package>
\ No newline at end of file
diff --git a/appveyor.yml b/appveyor.yml
deleted file mode 100644
index aba2f93..0000000
--- a/appveyor.yml
+++ /dev/null
@@ -1,31 +0,0 @@
-version: 1.0.{build}
-pull_requests:
-  do_not_increment_build_number: true
-skip_tags: true
-image: Visual Studio 2017
-configuration: Release
-assembly_info:
-  patch: true
-  file: 'Properties\AssemblyInfo.cs'
-  assembly_version: '{version}'
-  assembly_file_version: '{version}'
-build:
-  project: WorkIndicator.sln
-  verbosity: minimal
-after_build:
-- ps: >-
-    nuget pack WorkIndicator.nuspec -Version $env:APPVEYOR_BUILD_VERSION -Properties Configuration=Release -OutputDirectory bin\Release\
-
-    $squirrel = ".\packages\squirrel.windows\*\tools\Squirrel.exe"
-
-    .$squirrel -releasify ".\bin\$env:CONFIGURATION\WorkIndicator.$env:APPVEYOR_BUILD_VERSION.nupkg" | Write-Output
-artifacts:
-- path: Releases\*
-  name: Releases
-deploy:
-- provider: Environment
-  name: GitHub
-install:
-- cmd: git submodule update --init --recursive
-before_build:
-- cmd: nuget restore
\ No newline at end of file