make tray pop up and make it work
This commit is contained in:
@@ -16,6 +16,7 @@ namespace ntfysh_client
|
|||||||
private readonly NotificationListener _notificationListener;
|
private readonly NotificationListener _notificationListener;
|
||||||
private bool _startInTray;
|
private bool _startInTray;
|
||||||
private bool _trueExit;
|
private bool _trueExit;
|
||||||
|
private NotificationDialog notificationDialog;
|
||||||
|
|
||||||
public MainForm(NotificationListener notificationListener, bool startInTray = false)
|
public MainForm(NotificationListener notificationListener, bool startInTray = false)
|
||||||
{
|
{
|
||||||
@@ -32,6 +33,8 @@ namespace ntfysh_client
|
|||||||
{
|
{
|
||||||
LoadSettings();
|
LoadSettings();
|
||||||
LoadTopics();
|
LoadTopics();
|
||||||
|
|
||||||
|
this.notificationDialog = new NotificationDialog();
|
||||||
}
|
}
|
||||||
|
|
||||||
protected override void SetVisibleCore(bool value)
|
protected override void SetVisibleCore(bool value)
|
||||||
@@ -70,7 +73,9 @@ 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);
|
||||||
|
//this.notificationDialog.IsVisible = true;
|
||||||
|
this.notificationDialog.ShowNotification(finalTitle, e.Message);
|
||||||
}
|
}
|
||||||
|
|
||||||
private void OnConnectionMultiAttemptFailure(NotificationListener sender, SubscribedTopic topic)
|
private void OnConnectionMultiAttemptFailure(NotificationListener sender, SubscribedTopic topic)
|
||||||
|
85
ntfysh_client/NotificationDialog.Designer.cs
generated
Normal file
85
ntfysh_client/NotificationDialog.Designer.cs
generated
Normal file
@@ -0,0 +1,85 @@
|
|||||||
|
namespace ntfysh_client
|
||||||
|
{
|
||||||
|
partial class NotificationDialog
|
||||||
|
{
|
||||||
|
/// <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()
|
||||||
|
{
|
||||||
|
tbTitle = new System.Windows.Forms.TextBox();
|
||||||
|
button1 = new System.Windows.Forms.Button();
|
||||||
|
tbMessage = new System.Windows.Forms.TextBox();
|
||||||
|
SuspendLayout();
|
||||||
|
//
|
||||||
|
// tbTitle
|
||||||
|
//
|
||||||
|
tbTitle.Location = new System.Drawing.Point(12, 58);
|
||||||
|
tbTitle.Name = "tbTitle";
|
||||||
|
tbTitle.ReadOnly = true;
|
||||||
|
tbTitle.Size = new System.Drawing.Size(725, 23);
|
||||||
|
tbTitle.TabIndex = 0;
|
||||||
|
//
|
||||||
|
// button1
|
||||||
|
//
|
||||||
|
button1.Location = new System.Drawing.Point(759, 7);
|
||||||
|
button1.Name = "button1";
|
||||||
|
button1.Size = new System.Drawing.Size(29, 38);
|
||||||
|
button1.TabIndex = 1;
|
||||||
|
button1.Text = "x";
|
||||||
|
button1.UseVisualStyleBackColor = true;
|
||||||
|
button1.Click += btnClose_Click;
|
||||||
|
//
|
||||||
|
// tbMessage
|
||||||
|
//
|
||||||
|
tbMessage.Location = new System.Drawing.Point(12, 97);
|
||||||
|
tbMessage.Multiline = true;
|
||||||
|
tbMessage.Name = "tbMessage";
|
||||||
|
tbMessage.ReadOnly = true;
|
||||||
|
tbMessage.Size = new System.Drawing.Size(725, 253);
|
||||||
|
tbMessage.TabIndex = 2;
|
||||||
|
//
|
||||||
|
// NotificationDialog
|
||||||
|
//
|
||||||
|
AutoScaleDimensions = new System.Drawing.SizeF(7F, 15F);
|
||||||
|
AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
|
||||||
|
BackColor = System.Drawing.SystemColors.ControlDark;
|
||||||
|
ClientSize = new System.Drawing.Size(800, 450);
|
||||||
|
Controls.Add(tbMessage);
|
||||||
|
Controls.Add(button1);
|
||||||
|
Controls.Add(tbTitle);
|
||||||
|
FormBorderStyle = System.Windows.Forms.FormBorderStyle.None;
|
||||||
|
Name = "NotificationDialog";
|
||||||
|
Text = "NotificationDialog";
|
||||||
|
ResumeLayout(false);
|
||||||
|
PerformLayout();
|
||||||
|
}
|
||||||
|
|
||||||
|
#endregion
|
||||||
|
|
||||||
|
private System.Windows.Forms.TextBox tbTitle;
|
||||||
|
private System.Windows.Forms.Button button1;
|
||||||
|
private System.Windows.Forms.TextBox tbMessage;
|
||||||
|
}
|
||||||
|
}
|
84
ntfysh_client/NotificationDialog.cs
Normal file
84
ntfysh_client/NotificationDialog.cs
Normal file
@@ -0,0 +1,84 @@
|
|||||||
|
using System;
|
||||||
|
using System.Collections.Generic;
|
||||||
|
using System.ComponentModel;
|
||||||
|
using System.Data;
|
||||||
|
using System.Drawing;
|
||||||
|
using System.Linq;
|
||||||
|
using System.Runtime.InteropServices;
|
||||||
|
using System.Security.Cryptography.X509Certificates;
|
||||||
|
using System.Text;
|
||||||
|
using System.Threading.Tasks;
|
||||||
|
using System.Windows.Forms;
|
||||||
|
using static System.Windows.Forms.VisualStyles.VisualStyleElement;
|
||||||
|
|
||||||
|
namespace ntfysh_client
|
||||||
|
{
|
||||||
|
public partial class NotificationDialog : Form
|
||||||
|
{
|
||||||
|
[DllImport("user32.dll", CharSet = CharSet.Auto)]
|
||||||
|
private static extern bool AnimateWindow(IntPtr hWnd, int time, int flags);
|
||||||
|
|
||||||
|
private const int ScreenMargin = 20;
|
||||||
|
|
||||||
|
private void SetWindowPosition()
|
||||||
|
{
|
||||||
|
int workingtop = Screen.PrimaryScreen.WorkingArea.Height - this.Height;
|
||||||
|
this.Top = workingtop - NotificationDialog.ScreenMargin;
|
||||||
|
|
||||||
|
int workingleft = Screen.PrimaryScreen.WorkingArea.Width - this.Width;
|
||||||
|
this.Left = workingleft - NotificationDialog.ScreenMargin;
|
||||||
|
}
|
||||||
|
|
||||||
|
protected override void SetVisibleCore(bool value)
|
||||||
|
{
|
||||||
|
//base.SetVisibleCore(false);
|
||||||
|
this.SetWindowPosition();
|
||||||
|
if (value)
|
||||||
|
{
|
||||||
|
this.BringToFront();
|
||||||
|
AnimateWindow(this.Handle, 250, 0x00040000 | 0x00000008);
|
||||||
|
}
|
||||||
|
base.SetVisibleCore(value);
|
||||||
|
}
|
||||||
|
|
||||||
|
public void ShowNotification(string title, string message)
|
||||||
|
{
|
||||||
|
this.tbTitle.Text = title;
|
||||||
|
this.tbMessage.Text = message;
|
||||||
|
this.Show();
|
||||||
|
this.SetWindowPosition();
|
||||||
|
}
|
||||||
|
|
||||||
|
public bool IsVisible
|
||||||
|
{
|
||||||
|
get { return this.Visible; }
|
||||||
|
set { this.Visible = value; }
|
||||||
|
}
|
||||||
|
|
||||||
|
protected override void OnShown(EventArgs e)
|
||||||
|
{
|
||||||
|
|
||||||
|
base.OnShown(e);
|
||||||
|
}
|
||||||
|
|
||||||
|
public NotificationDialog()
|
||||||
|
{
|
||||||
|
this.IsVisible = false;
|
||||||
|
InitializeComponent();
|
||||||
|
InitializeWindowHidden();
|
||||||
|
}
|
||||||
|
|
||||||
|
private void InitializeWindowHidden()
|
||||||
|
{
|
||||||
|
this.Opacity = 0;
|
||||||
|
this.ShowNotification("Title", "Message");
|
||||||
|
this.IsVisible = false;
|
||||||
|
this.Opacity = 1;
|
||||||
|
}
|
||||||
|
|
||||||
|
private void btnClose_Click(object sender, EventArgs e)
|
||||||
|
{
|
||||||
|
this.IsVisible = false;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
120
ntfysh_client/NotificationDialog.resx
Normal file
120
ntfysh_client/NotificationDialog.resx
Normal 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>
|
Reference in New Issue
Block a user