ckaczor/WorkIndicator
1
0
Fork 0
Code Issues Actions Packages Projects Releases 12 Wiki Activity

Delete old junk from branch merge

Browse Source
This commit is contained in:
ckaczor
2026-08-07 10:50:47 -04:00
parent 4b9145054b
commit a29fcfe9a6
14 changed files with 0 additions and 421 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.gitattributes
-63
View File
@@ -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
.gitmodules
-6
View File
@@ -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
Common
-1
Submodule Common deleted from 81856b2700
Common.Wpf
-1
Submodule Common.Wpf deleted from 8a82786166
NuGet.config
-6
View File
@@ -1,6 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<configuration>
<config>
<add key="globalPackagesFolder" value=".\packages" />
</config>
</configuration>
Options/AboutOptionsPanel.xaml
-46
View File
@@ -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>
Options/AboutOptionsPanel.xaml.cs
-42
View File
@@ -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);
}
}
}
Options/GeneralOptionsPanel.xaml
-22
View File
@@ -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>
Options/GeneralOptionsPanel.xaml.cs
-39
View File
@@ -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;
}
}
Resources/ApplicationIcon.ico
BIN
View File
Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 2.5 KiB

TrayIcon.cs
-143
View File
@@ -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();
}
}
}
}
WorkIndicator.csproj.DotSettings
-2
View File
@@ -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>
WorkIndicator.nuspec
-19
View File
@@ -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>
appveyor.yml
-31
View File
@@ -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