Skip to content

Commit

Permalink
Added pin screen
Browse files Browse the repository at this point in the history
  • Loading branch information
Evan Langlais authored and Evan Langlais committed Mar 21, 2017
1 parent cc0da51 commit 62765a7
Show file tree
Hide file tree
Showing 13 changed files with 769 additions and 31 deletions.
24 changes: 23 additions & 1 deletion Enigma/Enigma.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,20 @@
<Compile Include="StationsGUI\HostStationView.Designer.cs">
<DependentUpon>HostStationView.cs</DependentUpon>
</Compile>
<Compile Include="StationsGUI\PinScreen.cs">
<SubType>Form</SubType>
</Compile>
<Compile Include="StationsGUI\PinScreen.Designer.cs">
<DependentUpon>PinScreen.cs</DependentUpon>
</Compile>
<Compile Include="StationsGUI\WaiterStationView.cs">
<SubType>Form</SubType>
</Compile>
<Compile Include="StationsGUI\WaiterStationView.Designer.cs">
<DependentUpon>WaiterStationView.cs</DependentUpon>
</Compile>
<Compile Include="Stations\DebugStation.cs" />
<Compile Include="Stations\WaiterStation.cs" />
<Compile Include="Stations\HostStation.cs" />
<EmbeddedResource Include="EnigmaMain.resx">
<DependentUpon>EnigmaMain.cs</DependentUpon>
Expand All @@ -98,10 +111,17 @@
<Compile Include="Properties\Resources.Designer.cs">
<AutoGen>True</AutoGen>
<DependentUpon>Resources.resx</DependentUpon>
<DesignTime>True</DesignTime>
</Compile>
<EmbeddedResource Include="StationsGUI\HostStationView.resx">
<DependentUpon>HostStationView.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="StationsGUI\PinScreen.resx">
<DependentUpon>PinScreen.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="StationsGUI\WaiterStationView.resx">
<DependentUpon>WaiterStationView.cs</DependentUpon>
</EmbeddedResource>
<None Include="packages.config" />
<None Include="Properties\Settings.settings">
<Generator>SettingsSingleFileGenerator</Generator>
Expand All @@ -122,7 +142,9 @@
<Name>EnigmaX</Name>
</ProjectReference>
</ItemGroup>
<ItemGroup />
<ItemGroup>
<None Include="Resources\lonely_sun_by_butterflypics-d8orr9a.png" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.
Expand Down
13 changes: 13 additions & 0 deletions Enigma/EnigmaMain.Designer.cs

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 8 additions & 0 deletions Enigma/EnigmaMain.cs
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@
using System.Windows.Forms;
using Enigma.Stations;
using EnigmaX.Classes;
using Enigma.StationsGUI;

namespace Enigma
{
public partial class EnigmaMain : MetroForm
Expand Down Expand Up @@ -57,5 +59,11 @@ private void debugButton_Click(object sender, EventArgs e)
loadedStations.Add(station);
station.showView();
}

private void metroButton1_Click(object sender, EventArgs e)
{
PinScreen pinScreen = new PinScreen();
pinScreen.ShowDialog();
}
}
}
52 changes: 27 additions & 25 deletions Enigma/Properties/Resources.Designer.cs

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

17 changes: 12 additions & 5 deletions Enigma/Properties/Resources.resx
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@
mimetype: application/x-microsoft.net.object.binary.base64
value : The object must be serialized with
: System.Serialization.Formatters.Binary.BinaryFormatter
: System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
: and then encoded with base64 encoding.
mimetype: application/x-microsoft.net.object.soap.base64
Expand All @@ -60,6 +60,7 @@
: 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">
Expand All @@ -68,9 +69,10 @@
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" />
</xsd:sequence>
<xsd:attribute name="name" type="xsd:string" />
<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">
Expand All @@ -85,9 +87,10 @@
<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" msdata:Ordinal="1" />
<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">
Expand All @@ -109,9 +112,13 @@
<value>2.0</value>
</resheader>
<resheader name="reader">
<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
<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=2.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>
<assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
<data name="lonely_sun_by_butterflypics-d8orr9a" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\lonely_sun_by_butterflypics-d8orr9a.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
</root>
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
19 changes: 19 additions & 0 deletions Enigma/Stations/WaiterStation.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using EnigmaX.Classes;

namespace Enigma.Stations
{
class WaiterStation : Station
{
public WaiterStation(string stationid) : base(StationTypeDef.host, stationid)
{
view = new StationsGUI.WaiterStationView();

}

}
}
Loading

0 comments on commit 62765a7

Please sign in to comment.