Skip to content

Commit e839287

Browse files
berrndberrnd
committed
Implemented a new ShowTrayLauncher action type
1 parent 61f6e0b commit e839287

File tree

6 files changed

+249
-2
lines changed

6 files changed

+249
-2
lines changed

‎Data/ActionItem.cs

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,11 +57,11 @@ public class ActionItem
5757
public string PathOrUrl { get; set; }
5858

5959
[Category("TrayWindow"), Display(Order = 310)]
60-
[Description("When Type = ShowTrayBrowser or ShowTrayMediaPlayer, the width of the window (can be set to -1 to use the screen width)")]
60+
[Description("When Type = ShowTrayBrowser, ShowTrayMediaPlayer or ShowTrayLauncher, the width of the window (can be set to -1 to use the screen width)")]
6161
public int Width { get; set; } = 770;
6262

6363
[Category("TrayWindow"), Display(Order = 320)]
64-
[Description("When Type = ShowTrayBrowser or ShowTrayMediaPlayer, the height of the window (can be set to -1 to use the screen height)")]
64+
[Description("When Type = ShowTrayBrowser, ShowTrayMediaPlayer or ShowTrayLauncher, the height of the window (can be set to -1 to use the screen height)")]
6565
public int Height { get; set; } = 500;
6666

6767
[Category("TrayWindow"), Display(Order = 330)]
@@ -113,6 +113,8 @@ public enum ActionType
113113
ShowTrayBrowser,
114114
ShowTrayMediaPlayer,
115115

116+
ShowTrayLauncher,
117+
116118
CloseTraything,
117119
Separator,
118120
Headline

‎Traything.csproj

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -91,6 +91,12 @@
9191
<Compile Include="UI\FrmEditActionItem.Designer.cs">
9292
<DependentUpon>FrmEditActionItem.cs</DependentUpon>
9393
</Compile>
94+
<Compile Include="UI\FrmLauncher.cs">
95+
<SubType>Form</SubType>
96+
</Compile>
97+
<Compile Include="UI\FrmLauncher.Designer.cs">
98+
<DependentUpon>FrmLauncher.cs</DependentUpon>
99+
</Compile>
94100
<Compile Include="UI\FrmMain.cs">
95101
<SubType>Form</SubType>
96102
</Compile>
@@ -134,6 +140,9 @@
134140
<EmbeddedResource Include="UI\FrmEditActionItem.resx">
135141
<DependentUpon>FrmEditActionItem.cs</DependentUpon>
136142
</EmbeddedResource>
143+
<EmbeddedResource Include="UI\FrmLauncher.resx">
144+
<DependentUpon>FrmLauncher.cs</DependentUpon>
145+
</EmbeddedResource>
137146
<EmbeddedResource Include="UI\FrmMain.resx">
138147
<DependentUpon>FrmMain.cs</DependentUpon>
139148
</EmbeddedResource>

‎UI/FrmLauncher.Designer.cs

Lines changed: 59 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎UI/FrmLauncher.cs

Lines changed: 53 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,53 @@
1+
using System.Collections.Generic;
2+
using System.Drawing;
3+
using System.Windows.Forms;
4+
using Traything.Data;
5+
6+
namespace Traything.UI
7+
{
8+
public partial class FrmLauncher : BaseTrayForm
9+
{
10+
public FrmLauncher(FrmMain parent)
11+
{
12+
InitializeComponent();
13+
this.Parent = parent;
14+
this.Show();
15+
}
16+
17+
public override void ShowTrayForm(ActionItem item, List<ActionItem> inplaceActions)
18+
{
19+
while (!this.Ready)
20+
{
21+
Application.DoEvents();
22+
}
23+
24+
// Override default tray form style
25+
item.StayOpen = true;
26+
27+
base.ShowTrayForm(item, inplaceActions);
28+
29+
// Override default tray form style
30+
this.FormBorderStyle = FormBorderStyle.Fixed3D;
31+
this.MaximizeBox = false;
32+
33+
foreach (ActionItem actionItem in inplaceActions)
34+
{
35+
Button button = new Button();
36+
button.Text = actionItem.Name;
37+
button.Height = 24;
38+
button.Font = new Font(button.Font.FontFamily, 16, FontStyle.Bold);
39+
button.AutoSize = true;
40+
button.Width = this.FlowLayoutPanelActionButtons.Width - 6;
41+
button.Tag = actionItem;
42+
button.Click += this.ActionItemButton_Click;
43+
44+
this.FlowLayoutPanelActionButtons.Controls.Add(button);
45+
}
46+
}
47+
48+
private void ActionItemButton_Click(object sender, System.EventArgs e)
49+
{
50+
this.Parent.ExecuteAction((ActionItem)((Button)sender).Tag);
51+
}
52+
}
53+
}

‎UI/FrmLauncher.resx

Lines changed: 120 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,120 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<root>
3+
<!--
4+
Microsoft ResX Schema
5+
6+
Version 2.0
7+
8+
The primary goals of this format is to allow a simple XML format
9+
that is mostly human readable. The generation and parsing of the
10+
various data types are done through the TypeConverter classes
11+
associated with the data types.
12+
13+
Example:
14+
15+
... ado.net/XML headers & schema ...
16+
<resheader name="resmimetype">text/microsoft-resx</resheader>
17+
<resheader name="version">2.0</resheader>
18+
<resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
19+
<resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
20+
<data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
21+
<data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
22+
<data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
23+
<value>[base64 mime encoded serialized .NET Framework object]</value>
24+
</data>
25+
<data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
26+
<value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
27+
<comment>This is a comment</comment>
28+
</data>
29+
30+
There are any number of "resheader" rows that contain simple
31+
name/value pairs.
32+
33+
Each data row contains a name, and value. The row also contains a
34+
type or mimetype. Type corresponds to a .NET class that support
35+
text/value conversion through the TypeConverter architecture.
36+
Classes that don't support this are serialized and stored with the
37+
mimetype set.
38+
39+
The mimetype is used for serialized objects, and tells the
40+
ResXResourceReader how to depersist the object. This is currently not
41+
extensible. For a given mimetype the value must be set accordingly:
42+
43+
Note - application/x-microsoft.net.object.binary.base64 is the format
44+
that the ResXResourceWriter will generate, however the reader can
45+
read any of the formats listed below.
46+
47+
mimetype: application/x-microsoft.net.object.binary.base64
48+
value : The object must be serialized with
49+
: System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
50+
: and then encoded with base64 encoding.
51+
52+
mimetype: application/x-microsoft.net.object.soap.base64
53+
value : The object must be serialized with
54+
: System.Runtime.Serialization.Formatters.Soap.SoapFormatter
55+
: and then encoded with base64 encoding.
56+
57+
mimetype: application/x-microsoft.net.object.bytearray.base64
58+
value : The object must be serialized into a byte array
59+
: using a System.ComponentModel.TypeConverter
60+
: and then encoded with base64 encoding.
61+
-->
62+
<xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
63+
<xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
64+
<xsd:element name="root" msdata:IsDataSet="true">
65+
<xsd:complexType>
66+
<xsd:choice maxOccurs="unbounded">
67+
<xsd:element name="metadata">
68+
<xsd:complexType>
69+
<xsd:sequence>
70+
<xsd:element name="value" type="xsd:string" minOccurs="0" />
71+
</xsd:sequence>
72+
<xsd:attribute name="name" use="required" type="xsd:string" />
73+
<xsd:attribute name="type" type="xsd:string" />
74+
<xsd:attribute name="mimetype" type="xsd:string" />
75+
<xsd:attribute ref="xml:space" />
76+
</xsd:complexType>
77+
</xsd:element>
78+
<xsd:element name="assembly">
79+
<xsd:complexType>
80+
<xsd:attribute name="alias" type="xsd:string" />
81+
<xsd:attribute name="name" type="xsd:string" />
82+
</xsd:complexType>
83+
</xsd:element>
84+
<xsd:element name="data">
85+
<xsd:complexType>
86+
<xsd:sequence>
87+
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
88+
<xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
89+
</xsd:sequence>
90+
<xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
91+
<xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
92+
<xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
93+
<xsd:attribute ref="xml:space" />
94+
</xsd:complexType>
95+
</xsd:element>
96+
<xsd:element name="resheader">
97+
<xsd:complexType>
98+
<xsd:sequence>
99+
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
100+
</xsd:sequence>
101+
<xsd:attribute name="name" type="xsd:string" use="required" />
102+
</xsd:complexType>
103+
</xsd:element>
104+
</xsd:choice>
105+
</xsd:complexType>
106+
</xsd:element>
107+
</xsd:schema>
108+
<resheader name="resmimetype">
109+
<value>text/microsoft-resx</value>
110+
</resheader>
111+
<resheader name="version">
112+
<value>2.0</value>
113+
</resheader>
114+
<resheader name="reader">
115+
<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
116+
</resheader>
117+
<resheader name="writer">
118+
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
119+
</resheader>
120+
</root>

‎UI/FrmMain.cs

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -248,6 +248,10 @@ internal void ExecuteAction(ActionItem item)
248248
{
249249
this.Shutdown();
250250
}
251+
else if (item.Type == ActionType.ShowTrayLauncher)
252+
{
253+
new FrmLauncher(this).ShowTrayForm(item, this.Settings.Actions.FindAll(x => x.Type != ActionType.Separator && x.Scope == ActionScope.Global || (x.Scope == ActionScope.ThisComputer && x.Hostnames.Any(y => y.Equals(Environment.MachineName, StringComparison.OrdinalIgnoreCase)))));
254+
}
251255
else if (item.Type == ActionType.StartApplication)
252256
{
253257
ProcessStartInfo si = new ProcessStartInfo("cmd", " /c start \"\" " + item.Commandline);

0 commit comments

Comments
 (0)