Smartcraft-Media-Tech/ntfysh-windows
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases 4 Wiki Activity

Add Publishing #7 #16

Open
seba76 wants to merge 2 commits from seba76/master into master
pull from: seba76/master
merge into: Smartcraft-Media-Tech:master
Conversation 1 Commits 2 Files Changed 8 +603 -239
7 changed files with 603 additions and 239 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit c7e02655b0 - Show all commits

345
ntfysh_client/MainForm.Designer.cs generated
View File

@@ -29,209 +29,219 @@ namespace ntfysh_client
/// </summary> /// </summary>
private void InitializeComponent() private void InitializeComponent()
{ {
this.components = new System.ComponentModel.Container(); components = new System.ComponentModel.Container();
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(MainForm)); System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(MainForm));
this.subscribeNewTopic = new System.Windows.Forms.Button(); subscribeNewTopic = new System.Windows.Forms.Button();
this.removeSelectedTopics = new System.Windows.Forms.Button(); removeSelectedTopics = new System.Windows.Forms.Button();
this.notificationTopics = new System.Windows.Forms.ListBox(); notificationTopics = new System.Windows.Forms.ListBox();
this.notifyIcon = new System.Windows.Forms.NotifyIcon(this.components); topicContextMenu = new System.Windows.Forms.ContextMenuStrip(components);
this.trayContextMenu = new System.Windows.Forms.ContextMenuStrip(this.components); sendNotificationMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.showControlWindowToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); notifyIcon = new System.Windows.Forms.NotifyIcon(components);
this.exitToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); trayContextMenu = new System.Windows.Forms.ContextMenuStrip(components);
this.menuStrip1 = new System.Windows.Forms.MenuStrip(); showControlWindowToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.fileToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); exitToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.exitToolStripMenuItem1 = new System.Windows.Forms.ToolStripMenuItem(); menuStrip1 = new System.Windows.Forms.MenuStrip();
this.helpToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); fileToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.ntfyshWebsiteToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); exitToolStripMenuItem1 = new System.Windows.Forms.ToolStripMenuItem();
this.toolStripMenuItem1 = new System.Windows.Forms.ToolStripSeparator(); settingsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.aboutToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); helpToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.label1 = new System.Windows.Forms.Label(); ntfyshWebsiteToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.settingsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); toolStripMenuItem1 = new System.Windows.Forms.ToolStripSeparator();
this.trayContextMenu.SuspendLayout(); aboutToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.menuStrip1.SuspendLayout(); label1 = new System.Windows.Forms.Label();
this.SuspendLayout(); toolTip = new System.Windows.Forms.ToolTip(components);
topicContextMenu.SuspendLayout();
trayContextMenu.SuspendLayout();
menuStrip1.SuspendLayout();
SuspendLayout();
// //
// subscribeNewTopic // subscribeNewTopic
// //
this.subscribeNewTopic.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); subscribeNewTopic.Anchor = System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right;
this.subscribeNewTopic.Location = new System.Drawing.Point(211, 251); subscribeNewTopic.Location = new System.Drawing.Point(211, 251);
this.subscribeNewTopic.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); subscribeNewTopic.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
this.subscribeNewTopic.Name = "subscribeNewTopic"; subscribeNewTopic.Name = "subscribeNewTopic";
this.subscribeNewTopic.Size = new System.Drawing.Size(188, 27); subscribeNewTopic.Size = new System.Drawing.Size(188, 27);
this.subscribeNewTopic.TabIndex = 2; subscribeNewTopic.TabIndex = 2;
this.subscribeNewTopic.Text = "Add"; subscribeNewTopic.Text = "Add";
this.subscribeNewTopic.UseVisualStyleBackColor = true; subscribeNewTopic.UseVisualStyleBackColor = true;
this.subscribeNewTopic.Click += new System.EventHandler(this.subscribeNewTopic_Click); subscribeNewTopic.Click += subscribeNewTopic_Click;
// //
// removeSelectedTopics // removeSelectedTopics
// //
this.removeSelectedTopics.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); removeSelectedTopics.Anchor = System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right;
this.removeSelectedTopics.Enabled = false; removeSelectedTopics.Enabled = false;
this.removeSelectedTopics.Location = new System.Drawing.Point(13, 251); removeSelectedTopics.Location = new System.Drawing.Point(13, 251);
this.removeSelectedTopics.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); removeSelectedTopics.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
this.removeSelectedTopics.Name = "removeSelectedTopics"; removeSelectedTopics.Name = "removeSelectedTopics";
this.removeSelectedTopics.Size = new System.Drawing.Size(188, 27); removeSelectedTopics.Size = new System.Drawing.Size(188, 27);
this.removeSelectedTopics.TabIndex = 0; removeSelectedTopics.TabIndex = 0;
this.removeSelectedTopics.Text = "Remove selected"; removeSelectedTopics.Text = "Remove selected";
this.removeSelectedTopics.UseVisualStyleBackColor = true; removeSelectedTopics.UseVisualStyleBackColor = true;
this.removeSelectedTopics.Click += new System.EventHandler(this.removeSelectedTopics_Click); removeSelectedTopics.Click += removeSelectedTopics_Click;
// //
// notificationTopics // notificationTopics
// //
this.notificationTopics.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) notificationTopics.Anchor = System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right;
| System.Windows.Forms.AnchorStyles.Right))); notificationTopics.ContextMenuStrip = topicContextMenu;
this.notificationTopics.FormattingEnabled = true; notificationTopics.FormattingEnabled = true;
this.notificationTopics.ItemHeight = 15; notificationTopics.ItemHeight = 15;
this.notificationTopics.Location = new System.Drawing.Point(13, 46); notificationTopics.Location = new System.Drawing.Point(13, 46);
this.notificationTopics.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); notificationTopics.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
this.notificationTopics.Name = "notificationTopics"; notificationTopics.Name = "notificationTopics";
this.notificationTopics.SelectionMode = System.Windows.Forms.SelectionMode.MultiExtended; notificationTopics.SelectionMode = System.Windows.Forms.SelectionMode.MultiExtended;
this.notificationTopics.Size = new System.Drawing.Size(386, 199); notificationTopics.Size = new System.Drawing.Size(386, 199);
this.notificationTopics.TabIndex = 3; notificationTopics.TabIndex = 3;
this.notificationTopics.Click += new System.EventHandler(this.notificationTopics_Click); toolTip.SetToolTip(notificationTopics, "Double click topic to send message");
this.notificationTopics.SelectedValueChanged += new System.EventHandler(this.notificationTopics_SelectedValueChanged); notificationTopics.Click += notificationTopics_Click;
notificationTopics.SelectedValueChanged += notificationTopics_SelectedValueChanged;
notificationTopics.MouseDoubleClick += notificationTopics_MouseDoubleClick;
//
// topicContextMenu
//
topicContextMenu.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { sendNotificationMenuItem });
topicContextMenu.Name = "topicContextMenu";
topicContextMenu.Size = new System.Drawing.Size(167, 26);
//
// sendNotificationMenuItem
//
sendNotificationMenuItem.Name = "sendNotificationMenuItem";
sendNotificationMenuItem.Size = new System.Drawing.Size(166, 22);
sendNotificationMenuItem.Text = "Send Notification";
sendNotificationMenuItem.Click += SendNotificationMenuItem_Click;
// //
// notifyIcon // notifyIcon
// //
this.notifyIcon.ContextMenuStrip = this.trayContextMenu; notifyIcon.ContextMenuStrip = trayContextMenu;
this.notifyIcon.Icon = ((System.Drawing.Icon)(resources.GetObject("notifyIcon.Icon"))); notifyIcon.Icon = (System.Drawing.Icon)resources.GetObject("notifyIcon.Icon");
this.notifyIcon.Text = "ntfy.sh"; notifyIcon.Text = "ntfy.sh";
this.notifyIcon.Visible = true; notifyIcon.Visible = true;
this.notifyIcon.Click += new System.EventHandler(this.notifyIcon_Click); notifyIcon.Click += notifyIcon_Click;
// //
// trayContextMenu // trayContextMenu
// //
this.trayContextMenu.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { trayContextMenu.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { showControlWindowToolStripMenuItem, exitToolStripMenuItem });
this.showControlWindowToolStripMenuItem, trayContextMenu.Name = "trayContextMenu";
this.exitToolStripMenuItem}); trayContextMenu.Size = new System.Drawing.Size(190, 48);
this.trayContextMenu.Name = "trayContextMenu";
this.trayContextMenu.Size = new System.Drawing.Size(190, 48);
// //
// showControlWindowToolStripMenuItem // showControlWindowToolStripMenuItem
// //
this.showControlWindowToolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("showControlWindowToolStripMenuItem.Image"))); showControlWindowToolStripMenuItem.Image = (System.Drawing.Image)resources.GetObject("showControlWindowToolStripMenuItem.Image");
this.showControlWindowToolStripMenuItem.Name = "showControlWindowToolStripMenuItem"; showControlWindowToolStripMenuItem.Name = "showControlWindowToolStripMenuItem";
this.showControlWindowToolStripMenuItem.Size = new System.Drawing.Size(189, 22); showControlWindowToolStripMenuItem.Size = new System.Drawing.Size(189, 22);
this.showControlWindowToolStripMenuItem.Text = "Show control window"; showControlWindowToolStripMenuItem.Text = "Show control window";
this.showControlWindowToolStripMenuItem.Click += new System.EventHandler(this.showControlWindowToolStripMenuItem_Click); showControlWindowToolStripMenuItem.Click += showControlWindowToolStripMenuItem_Click;
// //
// exitToolStripMenuItem // exitToolStripMenuItem
// //
this.exitToolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("exitToolStripMenuItem.Image"))); exitToolStripMenuItem.Image = (System.Drawing.Image)resources.GetObject("exitToolStripMenuItem.Image");
this.exitToolStripMenuItem.Name = "exitToolStripMenuItem"; exitToolStripMenuItem.Name = "exitToolStripMenuItem";
this.exitToolStripMenuItem.Size = new System.Drawing.Size(189, 22); exitToolStripMenuItem.Size = new System.Drawing.Size(189, 22);
this.exitToolStripMenuItem.Text = "Exit"; exitToolStripMenuItem.Text = "Exit";
this.exitToolStripMenuItem.Click += new System.EventHandler(this.exitToolStripMenuItem_Click); exitToolStripMenuItem.Click += exitToolStripMenuItem_Click;
// //
// menuStrip1 // menuStrip1
// //
this.menuStrip1.BackColor = System.Drawing.Color.White; menuStrip1.BackColor = System.Drawing.Color.White;
this.menuStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { menuStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { fileToolStripMenuItem, helpToolStripMenuItem });
this.fileToolStripMenuItem, menuStrip1.Location = new System.Drawing.Point(0, 0);
this.helpToolStripMenuItem}); menuStrip1.Name = "menuStrip1";
this.menuStrip1.Location = new System.Drawing.Point(0, 0); menuStrip1.Padding = new System.Windows.Forms.Padding(7, 2, 0, 2);
this.menuStrip1.Name = "menuStrip1"; menuStrip1.Size = new System.Drawing.Size(412, 24);
this.menuStrip1.Padding = new System.Windows.Forms.Padding(7, 2, 0, 2); menuStrip1.TabIndex = 4;
this.menuStrip1.Size = new System.Drawing.Size(412, 24); menuStrip1.Text = "menuStrip1";
this.menuStrip1.TabIndex = 4;
this.menuStrip1.Text = "menuStrip1";
// //
// fileToolStripMenuItem // fileToolStripMenuItem
// //
this.fileToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { fileToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { exitToolStripMenuItem1, settingsToolStripMenuItem });
this.exitToolStripMenuItem1, fileToolStripMenuItem.Name = "fileToolStripMenuItem";
this.settingsToolStripMenuItem}); fileToolStripMenuItem.Size = new System.Drawing.Size(37, 20);
this.fileToolStripMenuItem.Name = "fileToolStripMenuItem"; fileToolStripMenuItem.Text = "File";
this.fileToolStripMenuItem.Size = new System.Drawing.Size(37, 20);
this.fileToolStripMenuItem.Text = "File";
// //
alexhorner commented 2024-12-17 17:32:01 -05:00 (Migrated from github.com)
Review
Copy Link

Nice-to-have: It'd be good if an icon was found from the VS Icon Pack and placed against this menu item the same as all other menu items

Nice-to-have: It'd be good if an icon was found from the VS Icon Pack and placed against this menu item the same as all other menu items
// exitToolStripMenuItem1 // exitToolStripMenuItem1
// //
this.exitToolStripMenuItem1.Image = ((System.Drawing.Image)(resources.GetObject("exitToolStripMenuItem1.Image"))); exitToolStripMenuItem1.Image = (System.Drawing.Image)resources.GetObject("exitToolStripMenuItem1.Image");
this.exitToolStripMenuItem1.Name = "exitToolStripMenuItem1"; exitToolStripMenuItem1.Name = "exitToolStripMenuItem1";
this.exitToolStripMenuItem1.Size = new System.Drawing.Size(180, 22); exitToolStripMenuItem1.Size = new System.Drawing.Size(116, 22);
this.exitToolStripMenuItem1.Text = "Exit"; exitToolStripMenuItem1.Text = "Exit";
this.exitToolStripMenuItem1.Click += new System.EventHandler(this.exitToolStripMenuItem1_Click); exitToolStripMenuItem1.Click += exitToolStripMenuItem1_Click;
//
// helpToolStripMenuItem
//
this.helpToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
this.ntfyshWebsiteToolStripMenuItem,
this.toolStripMenuItem1,
this.aboutToolStripMenuItem});
this.helpToolStripMenuItem.Name = "helpToolStripMenuItem";
this.helpToolStripMenuItem.Size = new System.Drawing.Size(44, 20);
this.helpToolStripMenuItem.Text = "Help";
//
// ntfyshWebsiteToolStripMenuItem
//
this.ntfyshWebsiteToolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("ntfyshWebsiteToolStripMenuItem.Image")));
this.ntfyshWebsiteToolStripMenuItem.Name = "ntfyshWebsiteToolStripMenuItem";
this.ntfyshWebsiteToolStripMenuItem.Size = new System.Drawing.Size(185, 22);
this.ntfyshWebsiteToolStripMenuItem.Text = "Open ntfy.sh website";
this.ntfyshWebsiteToolStripMenuItem.Click += new System.EventHandler(this.ntfyshWebsiteToolStripMenuItem_Click);
//
// toolStripMenuItem1
//
this.toolStripMenuItem1.Name = "toolStripMenuItem1";
this.toolStripMenuItem1.Size = new System.Drawing.Size(182, 6);
//
// aboutToolStripMenuItem
//
this.aboutToolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("aboutToolStripMenuItem.Image")));
this.aboutToolStripMenuItem.Name = "aboutToolStripMenuItem";
this.aboutToolStripMenuItem.Size = new System.Drawing.Size(185, 22);
this.aboutToolStripMenuItem.Text = "About";
this.aboutToolStripMenuItem.Click += new System.EventHandler(this.aboutToolStripMenuItem_Click);
//
// label1
//
this.label1.AutoSize = true;
this.label1.Location = new System.Drawing.Point(13, 27);
this.label1.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label1.Name = "label1";
this.label1.Size = new System.Drawing.Size(170, 15);
this.label1.TabIndex = 1;
this.label1.Text = "Subscribed Notification Topics:";
// //
// settingsToolStripMenuItem // settingsToolStripMenuItem
// //
this.settingsToolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("settingsToolStripMenuItem.Image"))); settingsToolStripMenuItem.Image = (System.Drawing.Image)resources.GetObject("settingsToolStripMenuItem.Image");
this.settingsToolStripMenuItem.Name = "settingsToolStripMenuItem"; settingsToolStripMenuItem.Name = "settingsToolStripMenuItem";
this.settingsToolStripMenuItem.Size = new System.Drawing.Size(180, 22); settingsToolStripMenuItem.Size = new System.Drawing.Size(116, 22);
this.settingsToolStripMenuItem.Text = "Settings"; settingsToolStripMenuItem.Text = "Settings";
this.settingsToolStripMenuItem.Click += new System.EventHandler(this.settingsToolStripMenuItem_Click); settingsToolStripMenuItem.Click += settingsToolStripMenuItem_Click;
//
// helpToolStripMenuItem
//
helpToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { ntfyshWebsiteToolStripMenuItem, toolStripMenuItem1, aboutToolStripMenuItem });
helpToolStripMenuItem.Name = "helpToolStripMenuItem";
helpToolStripMenuItem.Size = new System.Drawing.Size(44, 20);
helpToolStripMenuItem.Text = "Help";
//
// ntfyshWebsiteToolStripMenuItem
//
ntfyshWebsiteToolStripMenuItem.Image = (System.Drawing.Image)resources.GetObject("ntfyshWebsiteToolStripMenuItem.Image");
ntfyshWebsiteToolStripMenuItem.Name = "ntfyshWebsiteToolStripMenuItem";
ntfyshWebsiteToolStripMenuItem.Size = new System.Drawing.Size(185, 22);
ntfyshWebsiteToolStripMenuItem.Text = "Open ntfy.sh website";
ntfyshWebsiteToolStripMenuItem.Click += ntfyshWebsiteToolStripMenuItem_Click;
//
// toolStripMenuItem1
//
toolStripMenuItem1.Name = "toolStripMenuItem1";
toolStripMenuItem1.Size = new System.Drawing.Size(182, 6);
//
// aboutToolStripMenuItem
//
aboutToolStripMenuItem.Image = (System.Drawing.Image)resources.GetObject("aboutToolStripMenuItem.Image");
aboutToolStripMenuItem.Name = "aboutToolStripMenuItem";
aboutToolStripMenuItem.Size = new System.Drawing.Size(185, 22);
aboutToolStripMenuItem.Text = "About";
aboutToolStripMenuItem.Click += aboutToolStripMenuItem_Click;
//
// label1
//
label1.AutoSize = true;
label1.Location = new System.Drawing.Point(13, 27);
label1.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
label1.Name = "label1";
label1.Size = new System.Drawing.Size(171, 15);
label1.TabIndex = 1;
label1.Text = "Subscribed Notification Topics:";
// //
// MainForm // MainForm
// //
this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 15F); AutoScaleDimensions = new System.Drawing.SizeF(7F, 15F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.BackColor = System.Drawing.Color.White; BackColor = System.Drawing.Color.White;
this.ClientSize = new System.Drawing.Size(412, 288); ClientSize = new System.Drawing.Size(412, 288);
this.Controls.Add(this.menuStrip1); Controls.Add(menuStrip1);
this.Controls.Add(this.notificationTopics); Controls.Add(notificationTopics);
this.Controls.Add(this.removeSelectedTopics); Controls.Add(removeSelectedTopics);
this.Controls.Add(this.subscribeNewTopic); Controls.Add(subscribeNewTopic);
this.Controls.Add(this.label1); Controls.Add(label1);
this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedSingle; FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedSingle;
this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon"))); Icon = (System.Drawing.Icon)resources.GetObject("$this.Icon");
this.KeyPreview = true; KeyPreview = true;
this.MainMenuStrip = this.menuStrip1; MainMenuStrip = menuStrip1;
this.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
this.MaximizeBox = false; MaximizeBox = false;
this.MinimizeBox = false; MinimizeBox = false;
this.Name = "MainForm"; Name = "MainForm";
this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen; StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen;
this.Text = "ntfy.sh"; Text = "ntfy.sh";
this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.MainForm_FormClosing); FormClosing += MainForm_FormClosing;
this.FormClosed += new System.Windows.Forms.FormClosedEventHandler(this.MainForm_FormClosed); FormClosed += MainForm_FormClosed;
this.Load += new System.EventHandler(this.MainForm_Load); Load += MainForm_Load;
this.trayContextMenu.ResumeLayout(false); topicContextMenu.ResumeLayout(false);
this.menuStrip1.ResumeLayout(false); trayContextMenu.ResumeLayout(false);
this.menuStrip1.PerformLayout(); menuStrip1.ResumeLayout(false);
this.ResumeLayout(false); menuStrip1.PerformLayout();
this.PerformLayout(); ResumeLayout(false);
PerformLayout();
} }
#endregion #endregion
@@ -251,6 +261,9 @@ namespace ntfysh_client
private System.Windows.Forms.ToolStripMenuItem ntfyshWebsiteToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem ntfyshWebsiteToolStripMenuItem;
private System.Windows.Forms.ToolStripSeparator toolStripMenuItem1; private System.Windows.Forms.ToolStripSeparator toolStripMenuItem1;
private System.Windows.Forms.ToolStripMenuItem settingsToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem settingsToolStripMenuItem;
private System.Windows.Forms.ContextMenuStrip topicContextMenu;
private System.Windows.Forms.ToolStripMenuItem sendNotificationMenuItem;
private System.Windows.Forms.ToolTip toolTip;
} }
} }

113
ntfysh_client/MainForm.cs
View File

@@ -4,7 +4,9 @@ using System.Diagnostics;
using System.Drawing; using System.Drawing;
using System.IO; using System.IO;
using System.Linq; using System.Linq;
using System.Net.Http;
using System.Reflection; using System.Reflection;
using System.Threading.Tasks;
using System.Windows.Forms; using System.Windows.Forms;
using Newtonsoft.Json; using Newtonsoft.Json;
using ntfysh_client.Notifications; using ntfysh_client.Notifications;
@@ -24,10 +26,10 @@ namespace ntfysh_client
_notificationListener.OnNotificationReceive += OnNotificationReceive; _notificationListener.OnNotificationReceive += OnNotificationReceive;
_notificationListener.OnConnectionMultiAttemptFailure += OnConnectionMultiAttemptFailure; _notificationListener.OnConnectionMultiAttemptFailure += OnConnectionMultiAttemptFailure;
_notificationListener.OnConnectionCredentialsFailure += OnConnectionCredentialsFailure; _notificationListener.OnConnectionCredentialsFailure += OnConnectionCredentialsFailure;
InitializeComponent(); InitializeComponent();
} }
private void MainForm_Load(object sender, EventArgs e) private void MainForm_Load(object sender, EventArgs e)
{ {
LoadSettings(); LoadSettings();
@@ -39,7 +41,7 @@ namespace ntfysh_client
if (_startInTray) if (_startInTray)
{ {
_startInTray = false; _startInTray = false;
/* /*
* TODO This little workaround prevents the window from appearing with a flash, but the taskbar icon appears for a moment. * TODO This little workaround prevents the window from appearing with a flash, but the taskbar icon appears for a moment.
* *
@@ -49,10 +51,10 @@ namespace ntfysh_client
base.SetVisibleCore(true); base.SetVisibleCore(true);
base.SetVisibleCore(false); base.SetVisibleCore(false);
Opacity = 1; Opacity = 1;
return; return;
} }
base.SetVisibleCore(value); base.SetVisibleCore(value);
} }
@@ -69,7 +71,7 @@ namespace ntfysh_client
}; };
string finalTitle = string.IsNullOrWhiteSpace(e.Title) ? $"{e.Sender.TopicId}@{e.Sender.ServerUrl}" : e.Title; string finalTitle = string.IsNullOrWhiteSpace(e.Title) ? $"{e.Sender.TopicId}@{e.Sender.ServerUrl}" : e.Title;
notifyIcon.ShowBalloonTip((int)TimeSpan.FromSeconds((double)Program.Settings.Timeout).TotalMilliseconds, finalTitle, e.Message, priorityIcon); notifyIcon.ShowBalloonTip((int)TimeSpan.FromSeconds((double)Program.Settings.Timeout).TotalMilliseconds, finalTitle, e.Message, priorityIcon);
} }
@@ -77,11 +79,11 @@ namespace ntfysh_client
{ {
MessageBox.Show($"Connecting to topic ID '{topic.TopicId}' on server '{topic.ServerUrl}' failed after multiple attempts.\n\nThis topic ID will be ignored and you will not receive notifications for it until you restart the application.", "Connection Failure", MessageBoxButtons.OK, MessageBoxIcon.Error); MessageBox.Show($"Connecting to topic ID '{topic.TopicId}' on server '{topic.ServerUrl}' failed after multiple attempts.\n\nThis topic ID will be ignored and you will not receive notifications for it until you restart the application.", "Connection Failure", MessageBoxButtons.OK, MessageBoxIcon.Error);
} }
private void OnConnectionCredentialsFailure(NotificationListener sender, SubscribedTopic topic) private void OnConnectionCredentialsFailure(NotificationListener sender, SubscribedTopic topic)
{ {
string reason = string.IsNullOrWhiteSpace(topic.Username) ? "credentials are required but were not provided" : "the entered credentials are incorrect"; string reason = string.IsNullOrWhiteSpace(topic.Username) ? "credentials are required but were not provided" : "the entered credentials are incorrect";
MessageBox.Show($"Connecting to topic ID '{topic.TopicId}' on server '{topic.ServerUrl}' failed because {reason}.\n\nThis topic ID will be ignored and you will not receive notifications for it until you correct the credentials.", "Connection Authentication Failure", MessageBoxButtons.OK, MessageBoxIcon.Error); MessageBox.Show($"Connecting to topic ID '{topic.TopicId}' on server '{topic.ServerUrl}' failed because {reason}.\n\nThis topic ID will be ignored and you will not receive notifications for it until you correct the credentials.", "Connection Authentication Failure", MessageBoxButtons.OK, MessageBoxIcon.Error);
} }
@@ -92,11 +94,11 @@ namespace ntfysh_client
//Do not subscribe on cancelled dialog //Do not subscribe on cancelled dialog
if (result != DialogResult.OK) return; if (result != DialogResult.OK) return;
//Convert the reconnection values to ints //Convert the reconnection values to ints
int reconnectAttempts = Convert.ToInt32(Math.Ceiling(Program.Settings.ReconnectAttempts)); int reconnectAttempts = Convert.ToInt32(Math.Ceiling(Program.Settings.ReconnectAttempts));
int reconnectAttemptDelay = Convert.ToInt32(Math.Ceiling(Program.Settings.ReconnectAttemptDelay)); int reconnectAttemptDelay = Convert.ToInt32(Math.Ceiling(Program.Settings.ReconnectAttemptDelay));
//Subscribe //Subscribe
if (dialog.UseWebsockets) if (dialog.UseWebsockets)
{ {
@@ -109,7 +111,7 @@ namespace ntfysh_client
//Add to the user visible list //Add to the user visible list
notificationTopics.Items.Add(dialog.Unique); notificationTopics.Items.Add(dialog.Unique);
//Save the topics persistently //Save the topics persistently
SaveTopicsToFile(); SaveTopicsToFile();
} }
@@ -119,14 +121,14 @@ namespace ntfysh_client
while (notificationTopics.SelectedIndex > -1) while (notificationTopics.SelectedIndex > -1)
{ {
string topicUniqueString = (string)notificationTopics.Items[notificationTopics.SelectedIndex]; string topicUniqueString = (string)notificationTopics.Items[notificationTopics.SelectedIndex];
await _notificationListener.UnsubscribeFromTopicAsync(topicUniqueString); await _notificationListener.UnsubscribeFromTopicAsync(topicUniqueString);
notificationTopics.Items.Remove(topicUniqueString); notificationTopics.Items.Remove(topicUniqueString);
} }
SaveTopicsToFile(); SaveTopicsToFile();
} }
private void settingsToolStripMenuItem_Click(object sender, EventArgs e) private void settingsToolStripMenuItem_Click(object sender, EventArgs e)
{ {
using SettingsDialog dialog = new(); using SettingsDialog dialog = new();
@@ -135,7 +137,7 @@ namespace ntfysh_client
dialog.Timeout = Program.Settings.Timeout; dialog.Timeout = Program.Settings.Timeout;
dialog.ReconnectAttempts = Program.Settings.ReconnectAttempts; dialog.ReconnectAttempts = Program.Settings.ReconnectAttempts;
dialog.ReconnectAttemptDelay = Program.Settings.ReconnectAttemptDelay; dialog.ReconnectAttemptDelay = Program.Settings.ReconnectAttemptDelay;
//Show dialog //Show dialog
DialogResult result = dialog.ShowDialog(); DialogResult result = dialog.ShowDialog();
@@ -146,7 +148,7 @@ namespace ntfysh_client
Program.Settings.Timeout = dialog.Timeout; Program.Settings.Timeout = dialog.Timeout;
Program.Settings.ReconnectAttempts = dialog.ReconnectAttempts; Program.Settings.ReconnectAttempts = dialog.ReconnectAttempts;
Program.Settings.ReconnectAttemptDelay = dialog.ReconnectAttemptDelay; Program.Settings.ReconnectAttemptDelay = dialog.ReconnectAttemptDelay;
//Save new settings persistently //Save new settings persistently
SaveSettingsToFile(); SaveSettingsToFile();
} }
@@ -167,9 +169,9 @@ namespace ntfysh_client
private void notifyIcon_Click(object sender, EventArgs e) private void notifyIcon_Click(object sender, EventArgs e)
{ {
MouseEventArgs mouseEv = (MouseEventArgs)e; MouseEventArgs mouseEv = (MouseEventArgs)e;
if (mouseEv.Button != MouseButtons.Left) return; if (mouseEv.Button != MouseButtons.Left) return;
Visible = !Visible; Visible = !Visible;
BringToFront(); BringToFront();
} }
@@ -185,7 +187,7 @@ namespace ntfysh_client
string binaryDirectory = Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location) ?? throw new InvalidOperationException("Unable to determine path for application"); string binaryDirectory = Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location) ?? throw new InvalidOperationException("Unable to determine path for application");
return Path.Combine(binaryDirectory ?? throw new InvalidOperationException("Unable to determine path for topics file"), "topics.json"); return Path.Combine(binaryDirectory ?? throw new InvalidOperationException("Unable to determine path for topics file"), "topics.json");
} }
private string GetLegacyTopicsFilePath() private string GetLegacyTopicsFilePath()
{ {
string binaryDirectory = Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location) ?? throw new InvalidOperationException("Unable to determine path for application"); string binaryDirectory = Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location) ?? throw new InvalidOperationException("Unable to determine path for application");
@@ -195,20 +197,20 @@ namespace ntfysh_client
private void SaveTopicsToFile() private void SaveTopicsToFile()
{ {
string topicsSerialised = JsonConvert.SerializeObject(_notificationListener.SubscribedTopicsByUnique.Select(st => st.Value).ToList(), Formatting.Indented); string topicsSerialised = JsonConvert.SerializeObject(_notificationListener.SubscribedTopicsByUnique.Select(st => st.Value).ToList(), Formatting.Indented);
File.WriteAllText(GetTopicsFilePath(), topicsSerialised); File.WriteAllText(GetTopicsFilePath(), topicsSerialised);
} }
private string GetSettingsFilePath() private string GetSettingsFilePath()
{ {
string binaryDirectory = Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location) ?? throw new InvalidOperationException("Unable to determine path for application"); string binaryDirectory = Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location) ?? throw new InvalidOperationException("Unable to determine path for application");
return Path.Combine(binaryDirectory ?? throw new InvalidOperationException("Unable to determine path for settings file"), "settings.json"); return Path.Combine(binaryDirectory ?? throw new InvalidOperationException("Unable to determine path for settings file"), "settings.json");
} }
private void SaveSettingsToFile() private void SaveSettingsToFile()
{ {
string settingsSerialised = JsonConvert.SerializeObject(Program.Settings, Formatting.Indented); string settingsSerialised = JsonConvert.SerializeObject(Program.Settings, Formatting.Indented);
File.WriteAllText(GetSettingsFilePath(), settingsSerialised); File.WriteAllText(GetSettingsFilePath(), settingsSerialised);
} }
@@ -222,7 +224,7 @@ namespace ntfysh_client
{ {
//Read old format //Read old format
List<string> legacyTopics = new List<string>(); List<string> legacyTopics = new List<string>();
using (StreamReader reader = new StreamReader(legacyTopicsPath)) using (StreamReader reader = new StreamReader(legacyTopicsPath))
{ {
while (!reader.EndOfStream) while (!reader.EndOfStream)
@@ -236,17 +238,17 @@ namespace ntfysh_client
List<SubscribedTopic> newTopics = legacyTopics.Select(lt => new SubscribedTopic(lt, "https://ntfy.sh", null, null)).ToList(); List<SubscribedTopic> newTopics = legacyTopics.Select(lt => new SubscribedTopic(lt, "https://ntfy.sh", null, null)).ToList();
string newFormatSerialised = JsonConvert.SerializeObject(newTopics, Formatting.Indented); string newFormatSerialised = JsonConvert.SerializeObject(newTopics, Formatting.Indented);
//Write new format //Write new format
File.WriteAllText(topicsFilePath, newFormatSerialised); File.WriteAllText(topicsFilePath, newFormatSerialised);
//Delete old format //Delete old format
File.Delete(legacyTopicsPath); File.Delete(legacyTopicsPath);
} }
//Check if we have any topics file on disk to load //Check if we have any topics file on disk to load
if (!File.Exists(topicsFilePath)) return; if (!File.Exists(topicsFilePath)) return;
//We have a topics file. Load it! //We have a topics file. Load it!
string topicsSerialised = File.ReadAllText(topicsFilePath); string topicsSerialised = File.ReadAllText(topicsFilePath);
@@ -266,32 +268,32 @@ namespace ntfysh_client
//TODO Deserialise error! //TODO Deserialise error!
return; return;
} }
//Convert the reconnection values to ints //Convert the reconnection values to ints
int reconnectAttempts = Convert.ToInt32(Math.Ceiling(Program.Settings.ReconnectAttempts)); int reconnectAttempts = Convert.ToInt32(Math.Ceiling(Program.Settings.ReconnectAttempts));
int reconnectAttemptDelay = Convert.ToInt32(Math.Ceiling(Program.Settings.ReconnectAttemptDelay)); int reconnectAttemptDelay = Convert.ToInt32(Math.Ceiling(Program.Settings.ReconnectAttemptDelay));
//Load them in //Load them in
foreach (SubscribedTopic topic in topics) foreach (SubscribedTopic topic in topics)
{ {
string[] parts = topic.ServerUrl.Split("://", 2); string[] parts = topic.ServerUrl.Split("://", 2);
switch (parts[0].ToLower()) switch (parts[0].ToLower())
{ {
case "ws": case "ws":
case "wss": case "wss":
_notificationListener.SubscribeToTopicUsingWebsocket($"{topic.TopicId}@{topic.ServerUrl}", topic.TopicId, topic.ServerUrl, topic.Username, topic.Password, reconnectAttempts, reconnectAttemptDelay); _notificationListener.SubscribeToTopicUsingWebsocket($"{topic.TopicId}@{topic.ServerUrl}", topic.TopicId, topic.ServerUrl, topic.Username, topic.Password, reconnectAttempts, reconnectAttemptDelay);
break; break;
case "http": case "http":
case "https": case "https":
_notificationListener.SubscribeToTopicUsingLongHttpJson($"{topic.TopicId}@{topic.ServerUrl}", topic.TopicId, topic.ServerUrl, topic.Username, topic.Password, reconnectAttempts, reconnectAttemptDelay); _notificationListener.SubscribeToTopicUsingLongHttpJson($"{topic.TopicId}@{topic.ServerUrl}", topic.TopicId, topic.ServerUrl, topic.Username, topic.Password, reconnectAttempts, reconnectAttemptDelay);
break; break;
default: default:
continue; continue;
} }
notificationTopics.Items.Add($"{topic.TopicId}@{topic.ServerUrl}"); notificationTopics.Items.Add($"{topic.TopicId}@{topic.ServerUrl}");
} }
} }
@@ -303,7 +305,7 @@ namespace ntfysh_client
ReconnectAttempts = 10, ReconnectAttempts = 10,
ReconnectAttemptDelay = 3 ReconnectAttemptDelay = 3
}; };
private void MergeSettingsRevisions(SettingsModel older, SettingsModel newer) private void MergeSettingsRevisions(SettingsModel older, SettingsModel newer)
{ {
//Apply settings introduced in Revision 1 //Apply settings introduced in Revision 1
@@ -321,12 +323,12 @@ namespace ntfysh_client
{ {
string settingsFilePath = GetSettingsFilePath(); string settingsFilePath = GetSettingsFilePath();
SettingsModel defaultSettings = GetDefaultSettings(); SettingsModel defaultSettings = GetDefaultSettings();
//Check if we have any settings file on disk to load. If we don't, initialise defaults //Check if we have any settings file on disk to load. If we don't, initialise defaults
if (!File.Exists(settingsFilePath)) if (!File.Exists(settingsFilePath))
{ {
Program.Settings = defaultSettings; Program.Settings = defaultSettings;
SaveSettingsToFile(); SaveSettingsToFile();
return; return;
@@ -339,7 +341,7 @@ namespace ntfysh_client
if (string.IsNullOrWhiteSpace(settingsSerialised)) if (string.IsNullOrWhiteSpace(settingsSerialised))
{ {
Program.Settings = defaultSettings; Program.Settings = defaultSettings;
SaveSettingsToFile(); SaveSettingsToFile();
return; return;
@@ -352,14 +354,14 @@ namespace ntfysh_client
if (settings is null) if (settings is null)
{ {
Program.Settings = defaultSettings; Program.Settings = defaultSettings;
SaveSettingsToFile(); SaveSettingsToFile();
return; return;
} }
Program.Settings = settings; Program.Settings = settings;
//Check the settings revision. If it is older than the current latest revision, apply the settings defaults missing from previous revision //Check the settings revision. If it is older than the current latest revision, apply the settings defaults missing from previous revision
if (Program.Settings.Revision < defaultSettings.ReconnectAttempts) if (Program.Settings.Revision < defaultSettings.ReconnectAttempts)
{ {
@@ -372,14 +374,14 @@ namespace ntfysh_client
{ {
notifyIcon.Dispose(); notifyIcon.Dispose();
} }
private void MainForm_FormClosing(object sender, FormClosingEventArgs e) private void MainForm_FormClosing(object sender, FormClosingEventArgs e)
{ {
// Let it close // Let it close
if (_trueExit) return; if (_trueExit) return;
if (e.CloseReason != CloseReason.UserClosing) return; if (e.CloseReason != CloseReason.UserClosing) return;
Visible = false; Visible = false;
e.Cancel = true; e.Cancel = true;
} }
@@ -409,5 +411,32 @@ namespace ntfysh_client
_trueExit = true; _trueExit = true;
Close(); Close();
} }
private async void SendNotificationMenuItem_Click(object sender, System.EventArgs e)
{
await SendMessage();
}
private async void notificationTopics_MouseDoubleClick(object sender, MouseEventArgs e)
{
await SendMessage();
}
private async Task SendMessage()
{
if (notificationTopics.SelectedItem != null && string.IsNullOrEmpty(notificationTopics.SelectedItem as string) == false)
{
var dlg = new SendMessageForm();
var r = dlg.ShowDialog(this);
if (r == DialogResult.OK)
{
var topicAndHost = notificationTopics.SelectedItem.ToString()?.Split("@");
var topic = topicAndHost[0];
var host = topicAndHost[1].Replace("wss", "https");
var msg = dlg.Message;
await _notificationListener.SendNotification(host, new NtfyEvent { Topic = topic, Title = dlg.Title, Message = msg });
}
}
}
} }
} }

128
ntfysh_client/MainForm.resx
View File

@@ -1,4 +1,64 @@
<root> <?xml version="1.0" encoding="utf-8"?>
<root>
<!--
Microsoft ResX Schema
Version 2.0
The primary goals of this format is to allow a simple XML format
that is mostly human readable. The generation and parsing of the
various data types are done through the TypeConverter classes
associated with the data types.
Example:
... ado.net/XML headers & schema ...
<resheader name="resmimetype">text/microsoft-resx</resheader>
<resheader name="version">2.0</resheader>
<resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
<resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
<data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
<data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
<data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
<value>[base64 mime encoded serialized .NET Framework object]</value>
</data>
<data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
<comment>This is a comment</comment>
</data>
There are any number of "resheader" rows that contain simple
name/value pairs.
Each data row contains a name, and value. The row also contains a
type or mimetype. Type corresponds to a .NET class that support
text/value conversion through the TypeConverter architecture.
Classes that don't support this are serialized and stored with the
mimetype set.
The mimetype is used for serialized objects, and tells the
ResXResourceReader how to depersist the object. This is currently not
extensible. For a given mimetype the value must be set accordingly:
Note - application/x-microsoft.net.object.binary.base64 is the format
that the ResXResourceWriter will generate, however the reader can
read any of the formats listed below.
mimetype: application/x-microsoft.net.object.binary.base64
value : The object must be serialized with
: System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
: and then encoded with base64 encoding.
mimetype: application/x-microsoft.net.object.soap.base64
value : The object must be serialized with
: System.Runtime.Serialization.Formatters.Soap.SoapFormatter
: and then encoded with base64 encoding.
mimetype: application/x-microsoft.net.object.bytearray.base64
value : The object must be serialized into a byte array
: using a System.ComponentModel.TypeConverter
: and then encoded with base64 encoding.
-->
<xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata"> <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
<xsd:import namespace="http://www.w3.org/XML/1998/namespace" /> <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
<xsd:element name="root" msdata:IsDataSet="true"> <xsd:element name="root" msdata:IsDataSet="true">
@@ -57,6 +117,12 @@
<resheader name="writer"> <resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader> </resheader>
<metadata name="topicContextMenu.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>384, 17</value>
</metadata>
<metadata name="toolTip.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>537, 17</value>
</metadata>
<metadata name="notifyIcon.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"> <metadata name="notifyIcon.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>17, 17</value> <value>17, 17</value>
</metadata> </metadata>
@@ -67,19 +133,19 @@
<data name="showControlWindowToolStripMenuItem.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64"> <data name="showControlWindowToolStripMenuItem.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value> <value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAACBjSFJNAAB6 iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAACBjSFJNAAB6
JgAAgIQAAPoAAACA6AAAdTAAAOpgAAA6mAAAF3CculE8AAAACXBIWXMAAA68AAAOvAGVvHJJAAAAiklE JgAAgIQAAPoAAACA6AAAdTAAAOpgAAA6mAAAF3CculE8AAAACXBIWXMAAA68AAAOvAGVvHJJAAAAgElE
QVQ4T8WPQQqAIBBFvUOrXIhu3dcZOkqtu5R1ia4SdRDrxyyGGKmBIOGBDL6nmk9WCGE9yUpW0q9Ads7V QVQ4T2NgoAZQVFR8oKio+J9E/ADZgP9ycnKSpGCQHuoZoKCg8BiLE/FikB5kF+yXkpISJgWD9BBtQIbp
GuCQ/kHAe79joAEO6dcLFmttpQEO6c+Bvpm2oZ0zwB4zVQBiF8cIsMdMDPCb+G2vA/wgP/z6C6WAhBgo ykeZZqv+gzCITbIBII0eWsVaIAxi4zQA2SZk24g2AFkhsmKivYDLAGwYqwG4vIANYzWAFIxuwAqQAIl4
fUFCDGi4BxIGShLpvy5jDoPes/0oNG3VAAAAAElFTkSuQmCC BdyAAQUAg96z/bGuwC8AAAAASUVORK5CYII=
</value> </value>
</data> </data>
<data name="exitToolStripMenuItem.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64"> <data name="exitToolStripMenuItem.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value> <value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAACBjSFJNAAB6 iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAACBjSFJNAAB6
JgAAgIQAAPoAAACA6AAAdTAAAOpgAAA6mAAAF3CculE8AAAACXBIWXMAAA68AAAOvAGVvHJJAAAAgUlE JgAAgIQAAPoAAACA6AAAdTAAAOpgAAA6mAAAF3CculE8AAAACXBIWXMAAA68AAAOvAGVvHJJAAAAhklE
QVQ4T2OgGjjOLq4AZeIFWNWBBI9yib06zC3uABXCCkDyIHVYDTnMI2pzhEvs5VFucSeoEAo4wiNii08e QVQ4T2NgoBY4zi6ugC6GDWBVBxI8yiX26jC3uAO6HDIAyYPUYTXkMI+ozREusZdHucWd0OVA4AiPiC0+
DHAZQshwFICumCTNMADyK1gTl2gJiCYUNlgBSDPQ1v8gGipEPKDIBRSFAa6oIsoQQvGM1xCqpESsglgA eTDAZQgucawAXTE6nygA8itYE5doCYgmFDZYAUjzUW7x/yAaXY4goMgF6H5G5+MFuKKKKENwaYYBvIZQ
seroBRgYAOoOWBJbfVcRAAAAAElFTkSuQmCC JSViFcQCiFVHPwAA6g5YEuFUY5cAAAAASUVORK5CYII=
</value> </value>
</data> </data>
<data name="notifyIcon.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64"> <data name="notifyIcon.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
@@ -267,43 +333,43 @@
<data name="exitToolStripMenuItem1.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64"> <data name="exitToolStripMenuItem1.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value> <value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAACBjSFJNAAB6 iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAACBjSFJNAAB6
JgAAgIQAAPoAAACA6AAAdTAAAOpgAAA6mAAAF3CculE8AAAACXBIWXMAAA68AAAOvAGVvHJJAAAAgUlE JgAAgIQAAPoAAACA6AAAdTAAAOpgAAA6mAAAF3CculE8AAAACXBIWXMAAA68AAAOvAGVvHJJAAAAhklE
QVQ4T2OgGjjOLq4AZeIFWNWBBI9yib06zC3uABXCCkDyIHVYDTnMI2pzhEvs5VFucSeoEAo4wiNii08e QVQ4T2NgoBY4zi6ugC6GDWBVBxI8yiX26jC3uAO6HDIAyYPUYTXkMI+ozREusZdHucWd0OVA4AiPiC0+
DHAZQshwFICumCTNMADyK1gTl2gJiCYUNlgBSDPQ1v8gGipEPKDIBRSFAa6oIsoQQvGM1xCqpESsglgA eTDAZQgucawAXTE6nygA8itYE5doCYgmFDZYAUjzUW7x/yAaXY4goMgF6H5G5+MFuKKKKENwaYYBvIZQ
seroBRgYAOoOWBJbfVcRAAAAAElFTkSuQmCC JSViFcQCiFVHPwAA6g5YEuFUY5cAAAAASUVORK5CYII=
</value> </value>
</data> </data>
<data name="settingsToolStripMenuItem.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64"> <data name="settingsToolStripMenuItem.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value> <value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAACBjSFJNAAB6 iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAACBjSFJNAAB6
JgAAgIQAAPoAAACA6AAAdTAAAOpgAAA6mAAAF3CculE8AAAACXBIWXMAAA7CAAAOwgEVKEqAAAABT0lE JgAAgIQAAPoAAACA6AAAdTAAAOpgAAA6mAAAF3CculE8AAAACXBIWXMAAA6/AAAOvwE4BVMkAAABQUlE
QVQ4T7WTzU3DUBCEXQICcSAYx5bdgKkDEuggF37aIJwJVBBfsCsAux+iII6hgvCNM5GV8HeBlUa73tnZ QVQ4T7WTTU4CQRCF5whG48KxnfoqMxfAcyjoDdz4cw1xLXoC2AgnULmPBuMST4B5pEigGeNGK+mkp1+/
fe9lE/ybJUlyC5bG2OmfLY7jK1CGYbiLr/v9/kigQeNcqRqXbxrEJXgBBYJX/DviPE3TY8Xk5vgpmIHP V1Wva4riv8Ld79x9Eauf460BXAPjlNIu8GpmF1ruPo2zse7kvGUAV8AbMHL3D+DLzDp1XR9r7+4zYAi8
TUhWKoii6AA/RPygWFBMbmCuAKVlnVG0AzHDnzH1iPheJ/HkiXLEp/rWdSxbGckxRTVYeNoEPFF4mGVZ t4oAE12oquoA6JnZo/Za2gPdwEaqJOcXZrYjdTM7q+v6CHhQJZF5oDN3P9W32tkgyyT1DMwj2wB4Tikd
CC9uYm4BamksbxssIUe6r46pKRKaDjx97uvkqpXGdNdA5G8NNOSrBmPQcDS9fHsFvms1sVjcnTn9Io00 Nk2T3F3YILC57m4YK6dllvpVmcoi4gqP7LNopxPGLrYEBP4moCRtAn09VTi/bEFlSyTIwu4D04tMt2Zj
lq8Mcv2I5xK5yVxQrBwnOCF+o/G+ZZ1BaEkKHRM/0DTFgicPzWkXKss6I7lepClT20XyfXPFzmkHdMpr zcTzMFEis3UTq6o6AT6bptnfICtiSEbxVN2WZ+wFplmY5Pz1QRquBin67UTZOtMMqMqbnL8M4FLqZVnu
yzYN8gJUvV5vD/9M4fYqP34r3jZEetj1n+nG6b+2IPgAzHGHcFUSC1YAAAAASUVORK5CYII= AS8to/z0IzmPMHb1M93m+J/FN8xxh3CJx7rTAAAAAElFTkSuQmCC
</value> </value>
</data> </data>
<data name="ntfyshWebsiteToolStripMenuItem.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64"> <data name="ntfyshWebsiteToolStripMenuItem.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value> <value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAACBjSFJNAAB6 iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAACBjSFJNAAB6
JgAAgIQAAPoAAACA6AAAdTAAAOpgAAA6mAAAF3CculE8AAAACXBIWXMAAA68AAAOvAGVvHJJAAABDElE JgAAgIQAAPoAAACA6AAAdTAAAOpgAAA6mAAAF3CculE8AAAACXBIWXMAAA68AAAOvAGVvHJJAAABCUlE
QVQ4T91RO3bCQAzUy3uhChdJnTVlCj5FcMsZsF1jmy4XycPrzl6fBLgEXMFp4srRiF0wcaBP5j0VI2m0 QVQ4T91Ru3LCMBC8yUxcJT+SOhJlCh5FoOUbsKixRcePZJDc2ecvMfwE/ILTxBWZlbFHyBP6sDMqbu/2
4zH9EwSq8gPP7ELPNFxtpxrbn9vVPkSsykOkqvHi2QxsWwAevhQTzG8eCb1yD7Glv2I5MlM+sLX0GqEq br0megzEolzEkg9KcqMkX7zXXPl5qOnhxKI4rUU5Xr5x5PdQq/d8gv6fS5QsjhCHvI/ViKdKchXyDkoU
6+jVPFl6QZz7lOgdJVnzuMq/sEepbsGln2YnR3AAm0IcIE71geJsTO9mcOWAOa3zicxxxGWApXMGabaH 9fqDX0KekmxBqT1QaprnTfaDOdL2gtrx2rSO4AA2B2JtT5SYMe04unGw44i22cT1saTLAEN9BtocIXYZ
WDLwqhmLj8tR8SYzh2Qz5b3TUQSEF7jkLzysdB2o4tPybU8MxB9DdlFb9gNwAJv30HXQg8sAS/jmLiQD yHKmJJ9Xo/zz5ki6n5I27VIEhAvdX3ja2DoW+fe1rgZiIPl6JW3rkG4BB7B5D76DAboMMIRv9uEysDPS
PWPxkdabvrMzEBBeQOpI35Vw7t8V/yEQfQPXsZpY9UsnYgAAAABJRU5ErkJggg== 5kzb/dBZDwSEC0gd6XfP1aa6L/5X+AXXsZpYG9LldQAAAABJRU5ErkJggg==
</value> </value>
</data> </data>
<data name="aboutToolStripMenuItem.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64"> <data name="aboutToolStripMenuItem.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value> <value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAACBjSFJNAAB6 iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAACBjSFJNAAB6
JgAAgIQAAPoAAACA6AAAdTAAAOpgAAA6mAAAF3CculE8AAAACXBIWXMAAA68AAAOvAGVvHJJAAAAwUlE JgAAgIQAAPoAAACA6AAAdTAAAOpgAAA6mAAAF3CculE8AAAACXBIWXMAAA68AAAOvAGVvHJJAAAAvklE
QVQ4T2OgClBUVHwAxP9JxA+g2sEG/JeTk5MkBYP0QLVTwQAFBYXHIAFSMEgPVDvYBfulpKSEScEgPVDt QVQ4T8WOPQoCMRBGZ9KELRez4CYxzFzCG3gKwRN4GQs7a1mw9ACew8oFCxtLC7uVAZWwSDCw6MAjP/C9
dDIA6OTNQHX/YXysBjAxMcUxMjKuBrGB9DIgPxqmARhwOUBD3sD4WA0QERGRBHLvCwoKygLpm6KiohIw +QCGGGZumbnLpI0FXQihzkEywwmI6PyhYhLJxA0O1tpRDpL5rYCI9lI9KVBKLRBxJ3dE3Cql5q9ACGFJ
DVBNz5HY2L0AtHkOEE8F4okgvoyMjDSSJsIGsLOzuwKFfnBycppJS0vLAJ39BUQTbQA6RnYBMkY3YAVI RNekwBhTA8CpLMsJAByrqhrHLZj5khQ8N28QcY2IK3l7712WQGs9A4B7URRT55wnopucXwv6xA1i+oJG
gES8Aqp9QAEDAwCq9oYvtggceQAAAABJRU5ErkJggg== PjJp3oK/zgOq9oYvURh7ngAAAABJRU5ErkJggg==
</value> </value>
</data> </data>
<data name="$this.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64"> <data name="$this.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">

7
ntfysh_client/Notifications/NotificationListener.cs
View File

@@ -6,6 +6,7 @@ using System.Linq;
using System.Net; using System.Net;
using System.Net.Http; using System.Net.Http;
using System.Net.Http.Headers; using System.Net.Http.Headers;
using System.Net.Http.Json;
using System.Net.WebSockets; using System.Net.WebSockets;
using System.Text; using System.Text;
using System.Threading; using System.Threading;
@@ -350,5 +351,11 @@ namespace ntfysh_client.Notifications
//Remove the old topic //Remove the old topic
SubscribedTopicsByUnique.Remove(topicUniqueString); SubscribedTopicsByUnique.Remove(topicUniqueString);
} }
public async Task<HttpResponseMessage> SendNotification(string host, NtfyEvent message)
{
var httpClient = new HttpClient();
return await httpClient.PostAsJsonAsync<NtfyEvent>(host, message);
}
} }
} }

108
ntfysh_client/SendMessageForm.Designer.cs generated Normal file
View File

@@ -0,0 +1,108 @@
namespace ntfysh_client
{
partial class SendMessageForm
alexhorner commented 2024-12-17 17:24:49 -05:00 (Migrated from github.com)
Review
Copy Link

Please add a title to the window so that it doesn't just say "SendMessageForm" in the title bar

Please add a title to the window so that it doesn't just say "SendMessageForm" in the title bar
{
/// <summary>
/// Required designer variable.
/// </summary>
private System.ComponentModel.IContainer components = null;
/// <summary>
/// Clean up any resources being used.
/// </summary>
/// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
protected override void Dispose(bool disposing)
{
if (disposing && (components != null))
{
components.Dispose();
}
base.Dispose(disposing);
}
#region Windows Form Designer generated code
/// <summary>
/// Required method for Designer support - do not modify
/// the contents of this method with the code editor.
/// </summary>
private void InitializeComponent()
{
richTextBox = new System.Windows.Forms.RichTextBox();
button2 = new System.Windows.Forms.Button();
textBox = new System.Windows.Forms.TextBox();
label1 = new System.Windows.Forms.Label();
label2 = new System.Windows.Forms.Label();
SuspendLayout();
//
// richTextBox
//
richTextBox.Location = new System.Drawing.Point(12, 71);
richTextBox.Name = "richTextBox";
richTextBox.Size = new System.Drawing.Size(365, 165);
richTextBox.TabIndex = 0;
richTextBox.Text = "";
//
// button2
//
button2.Location = new System.Drawing.Point(302, 242);
button2.Name = "button2";
button2.Size = new System.Drawing.Size(75, 23);
button2.TabIndex = 2;
button2.Text = "Send";
button2.UseVisualStyleBackColor = true;
button2.Click += button2_Click;
//
// textBox
//
textBox.Location = new System.Drawing.Point(12, 27);
textBox.Name = "textBox";
textBox.Size = new System.Drawing.Size(365, 23);
textBox.TabIndex = 3;
//
// label1
//
label1.AutoSize = true;
label1.Location = new System.Drawing.Point(12, 53);
label1.Name = "label1";
label1.Size = new System.Drawing.Size(56, 15);
label1.TabIndex = 4;
label1.Text = "Message:";
//
// label2
//
label2.AutoSize = true;
label2.Location = new System.Drawing.Point(12, 9);
label2.Name = "label2";
label2.Size = new System.Drawing.Size(33, 15);
label2.TabIndex = 5;
label2.Text = "Title:";
//
// SendMessageForm
//
AutoScaleDimensions = new System.Drawing.SizeF(7F, 15F);
AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
ClientSize = new System.Drawing.Size(389, 277);
Controls.Add(label2);
Controls.Add(label1);
Controls.Add(textBox);
Controls.Add(button2);
Controls.Add(richTextBox);
FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow;
MaximizeBox = false;
MinimizeBox = false;
Name = "SendMessageForm";
Text = "SendMessageForm";
ResumeLayout(false);
PerformLayout();
}
#endregion
private System.Windows.Forms.RichTextBox richTextBox;
private System.Windows.Forms.Button button2;
private System.Windows.Forms.TextBox textBox;
private System.Windows.Forms.Label label1;
private System.Windows.Forms.Label label2;
}
}

21
ntfysh_client/SendMessageForm.cs Normal file
View File

@@ -0,0 +1,21 @@
using System.Windows.Forms;
namespace ntfysh_client
{
public partial class SendMessageForm : Form
{
public string Message => richTextBox.Text;
public string Title => textBox.Text;
public SendMessageForm()
{
InitializeComponent();
}
private void button2_Click(object sender, System.EventArgs e)
{
DialogResult = DialogResult.OK;
Close();
}
}
}

120
ntfysh_client/SendMessageForm.resx Normal file
View File

@@ -0,0 +1,120 @@
<?xml version="1.0" encoding="utf-8"?>
<root>
<!--
Microsoft ResX Schema
Version 2.0
The primary goals of this format is to allow a simple XML format
that is mostly human readable. The generation and parsing of the
various data types are done through the TypeConverter classes
associated with the data types.
Example:
... ado.net/XML headers & schema ...
<resheader name="resmimetype">text/microsoft-resx</resheader>
<resheader name="version">2.0</resheader>
<resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
<resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
<data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
<data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
<data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
<value>[base64 mime encoded serialized .NET Framework object]</value>
</data>
<data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
<comment>This is a comment</comment>
</data>
There are any number of "resheader" rows that contain simple
name/value pairs.
Each data row contains a name, and value. The row also contains a
type or mimetype. Type corresponds to a .NET class that support
text/value conversion through the TypeConverter architecture.
Classes that don't support this are serialized and stored with the
mimetype set.
The mimetype is used for serialized objects, and tells the
ResXResourceReader how to depersist the object. This is currently not
extensible. For a given mimetype the value must be set accordingly:
Note - application/x-microsoft.net.object.binary.base64 is the format
that the ResXResourceWriter will generate, however the reader can
read any of the formats listed below.
mimetype: application/x-microsoft.net.object.binary.base64
value : The object must be serialized with
: System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
: and then encoded with base64 encoding.
mimetype: application/x-microsoft.net.object.soap.base64
value : The object must be serialized with
: System.Runtime.Serialization.Formatters.Soap.SoapFormatter
: and then encoded with base64 encoding.
mimetype: application/x-microsoft.net.object.bytearray.base64
value : The object must be serialized into a byte array
: using a System.ComponentModel.TypeConverter
: and then encoded with base64 encoding.
-->
<xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
<xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
<xsd:element name="root" msdata:IsDataSet="true">
<xsd:complexType>
<xsd:choice maxOccurs="unbounded">
<xsd:element name="metadata">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" />
</xsd:sequence>
<xsd:attribute name="name" use="required" type="xsd:string" />
<xsd:attribute name="type" type="xsd:string" />
<xsd:attribute name="mimetype" type="xsd:string" />
<xsd:attribute ref="xml:space" />
</xsd:complexType>
</xsd:element>
<xsd:element name="assembly">
<xsd:complexType>
<xsd:attribute name="alias" type="xsd:string" />
<xsd:attribute name="name" type="xsd:string" />
</xsd:complexType>
</xsd:element>
<xsd:element name="data">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
<xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
</xsd:sequence>
<xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
<xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
<xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
<xsd:attribute ref="xml:space" />
</xsd:complexType>
</xsd:element>
<xsd:element name="resheader">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
</xsd:sequence>
<xsd:attribute name="name" type="xsd:string" use="required" />
</xsd:complexType>
</xsd:element>
</xsd:choice>
</xsd:complexType>
</xsd:element>
</xsd:schema>
<resheader name="resmimetype">
<value>text/microsoft-resx</value>
</resheader>
<resheader name="version">
<value>2.0</value>
</resheader>
<resheader name="reader">
<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
</root>