Skip to content

Commit 2498f2f

Browse files
arkangel-devarkangel-dev
committed
Fixed some stuff
1 parent 9da2b59 commit 2498f2f

File tree

17 files changed

+127
-46
lines changed

17 files changed

+127
-46
lines changed

‎SyncPlayWPF/.vs/SyncPlayWPF/v16/.suo‎

15.5 KB
Binary file not shown.

‎SyncPlayWPF/SyncPlayWPF/Properties/AssemblyInfo.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,5 +51,5 @@
5151
// You can specify all the values or you can default the Build and Revision Numbers
5252
// by using the '*' as shown below:
5353
// [assembly: AssemblyVersion("1.0.*")]
54-
[assembly: AssemblyVersion("2021.201.38.0")]
55-
[assembly: AssemblyFileVersion("2021.201.38.0")]
54+
[assembly: AssemblyVersion("2021.201.40.0")]
55+
[assembly: AssemblyFileVersion("2021.201.40.0")]

‎SyncPlayWPF/SyncPlayWPF/SyncPlay/Client.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@ public void AddFileToPlayList(string path) {
111111
/// <param name="version">Version of the client</param>
112112
public SyncPlayClient(String serverip, int port, String username, String password, String roomname, String version) {
113113
nclient = new NetworkClient(serverip, port);
114-
pingService = new Misc.PingService();
114+
pingService = new PingService();
115115
nclient.Connect();
116116
HelloMessage = Packets.CraftIdentificationMessage(username, password, roomname, version);
117117
nclient.OnNewMessage += NewIncomingMessage;

‎SyncPlayWPF/SyncPlayWPF/bin/Debug/SyncPlayWPF.exe‎

512 Bytes
Binary file not shown.

‎SyncPlayWPF/SyncPlayWPF/bin/Debug/SyncPlayWPF.pdb‎

0 Bytes
Binary file not shown.

‎SyncPlayWPF/SyncPlayWPF/obj/Debug/MainWindow.baml‎

0 Bytes
Binary file not shown.

‎SyncPlayWPF/SyncPlayWPF/obj/Debug/Pages/NewSessionPage.baml‎

201 Bytes
Binary file not shown.

‎SyncPlayWPF/SyncPlayWPF/obj/Debug/Pages/NewSessionPage.g.cs‎

Lines changed: 48 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#pragma checksum "..\..\..\Pages\NewSessionPage.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "5E92C4F9ADFEF4B1ED6C0A28CE96136D7360623D89EAA8F2DDCAB3A544C4871F"
1+
#pragma checksum "..\..\..\Pages\NewSessionPage.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "5F510115FF0A6E92FFD8D22A6D8E6939A13EE52C522C158962ED832DB7DB3D93"
22
//------------------------------------------------------------------------------
33
// <auto-generated>
44
// This code was generated by a tool.
@@ -42,7 +42,39 @@ namespace SyncPlayWPF.Pages {
4242
public partial class NewSessionPage : System.Windows.Controls.UserControl, System.Windows.Markup.IComponentConnector {
4343

4444

45-
#line 72 "..\..\..\Pages\NewSessionPage.xaml"
45+
#line 58 "..\..\..\Pages\NewSessionPage.xaml"
46+
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
47+
internal SyncPlayWPF.CustomControls.PromptingLabel ServerAddressField;
48+
49+
#line default
50+
#line hidden
51+
52+
53+
#line 59 "..\..\..\Pages\NewSessionPage.xaml"
54+
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
55+
internal SyncPlayWPF.CustomControls.PromptingLabel UsernameField;
56+
57+
#line default
58+
#line hidden
59+
60+
61+
#line 60 "..\..\..\Pages\NewSessionPage.xaml"
62+
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
63+
internal SyncPlayWPF.CustomControls.PromptingPasswordBox PasswordField;
64+
65+
#line default
66+
#line hidden
67+
68+
69+
#line 61 "..\..\..\Pages\NewSessionPage.xaml"
70+
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
71+
internal SyncPlayWPF.CustomControls.PromptingLabel RoomNameField;
72+
73+
#line default
74+
#line hidden
75+
76+
77+
#line 71 "..\..\..\Pages\NewSessionPage.xaml"
4678
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
4779
internal SyncPlayWPF.CustomControls.LinkButton JoinRoomButton;
4880

@@ -87,14 +119,26 @@ void System.Windows.Markup.IComponentConnector.Connect(int connectionId, object
87119
switch (connectionId)
88120
{
89121
case 1:
122+
this.ServerAddressField = ((SyncPlayWPF.CustomControls.PromptingLabel)(target));
123+
return;
124+
case 2:
125+
this.UsernameField = ((SyncPlayWPF.CustomControls.PromptingLabel)(target));
126+
return;
127+
case 3:
128+
this.PasswordField = ((SyncPlayWPF.CustomControls.PromptingPasswordBox)(target));
129+
return;
130+
case 4:
131+
this.RoomNameField = ((SyncPlayWPF.CustomControls.PromptingLabel)(target));
132+
return;
133+
case 5:
90134

91-
#line 71 "..\..\..\Pages\NewSessionPage.xaml"
135+
#line 70 "..\..\..\Pages\NewSessionPage.xaml"
92136
((System.Windows.Controls.Button)(target)).Click += new System.Windows.RoutedEventHandler(this.JoinRoom_Clicked);
93137

94138
#line default
95139
#line hidden
96140
return;
97-
case 2:
141+
case 6:
98142
this.JoinRoomButton = ((SyncPlayWPF.CustomControls.LinkButton)(target));
99143
return;
100144
}

‎SyncPlayWPF/SyncPlayWPF/obj/Debug/Pages/NewSessionPage.g.i.cs‎

Lines changed: 75 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
// Updated by XamlIntelliSenseFileGenerator 7/20/2021 4:27:16 PM
2-
#pragma checksum "..\..\..\Pages\NewSessionPage.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "5E92C4F9ADFEF4B1ED6C0A28CE96136D7360623D89EAA8F2DDCAB3A544C4871F"
1+
#pragma checksum "..\..\..\Pages\NewSessionPage.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "5F510115FF0A6E92FFD8D22A6D8E6939A13EE52C522C158962ED832DB7DB3D93"
32
//------------------------------------------------------------------------------
43
// <auto-generated>
54
// This code was generated by a tool.
@@ -35,23 +34,55 @@
3534

3635

3736
namespace SyncPlayWPF.Pages {
38-
39-
37+
38+
4039
/// <summary>
4140
/// NewSessionPage
4241
/// </summary>
4342
public partial class NewSessionPage : System.Windows.Controls.UserControl, System.Windows.Markup.IComponentConnector {
44-
45-
46-
#line 72 "..\..\..\Pages\NewSessionPage.xaml"
43+
44+
45+
#line 58 "..\..\..\Pages\NewSessionPage.xaml"
46+
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
47+
internal SyncPlayWPF.CustomControls.PromptingLabel ServerAddressField;
48+
49+
#line default
50+
#line hidden
51+
52+
53+
#line 59 "..\..\..\Pages\NewSessionPage.xaml"
54+
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
55+
internal SyncPlayWPF.CustomControls.PromptingLabel UsernameField;
56+
57+
#line default
58+
#line hidden
59+
60+
61+
#line 60 "..\..\..\Pages\NewSessionPage.xaml"
62+
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
63+
internal SyncPlayWPF.CustomControls.PromptingPasswordBox PasswordField;
64+
65+
#line default
66+
#line hidden
67+
68+
69+
#line 61 "..\..\..\Pages\NewSessionPage.xaml"
70+
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
71+
internal SyncPlayWPF.CustomControls.PromptingLabel RoomNameField;
72+
73+
#line default
74+
#line hidden
75+
76+
77+
#line 71 "..\..\..\Pages\NewSessionPage.xaml"
4778
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
4879
internal SyncPlayWPF.CustomControls.LinkButton JoinRoomButton;
49-
50-
#line default
51-
#line hidden
52-
80+
81+
#line default
82+
#line hidden
83+
5384
private bool _contentLoaded;
54-
85+
5586
/// <summary>
5687
/// InitializeComponent
5788
/// </summary>
@@ -63,48 +94,56 @@ public void InitializeComponent() {
6394
}
6495
_contentLoaded = true;
6596
System.Uri resourceLocater = new System.Uri("/SyncPlayWPF;component/pages/newsessionpage.xaml", System.UriKind.Relative);
66-
67-
#line 1 "..\..\..\Pages\NewSessionPage.xaml"
97+
98+
#line 1 "..\..\..\Pages\NewSessionPage.xaml"
6899
System.Windows.Application.LoadComponent(this, resourceLocater);
69-
70-
#line default
71-
#line hidden
100+
101+
#line default
102+
#line hidden
72103
}
73-
104+
74105
[System.Diagnostics.DebuggerNonUserCodeAttribute()]
75106
[System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
76107
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
77108
internal System.Delegate _CreateDelegate(System.Type delegateType, string handler) {
78109
return System.Delegate.CreateDelegate(delegateType, this, handler);
79110
}
80-
111+
81112
[System.Diagnostics.DebuggerNonUserCodeAttribute()]
82113
[System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
83114
[System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)]
84115
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")]
85116
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Maintainability", "CA1502:AvoidExcessiveComplexity")]
86117
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1800:DoNotCastUnnecessarily")]
87118
void System.Windows.Markup.IComponentConnector.Connect(int connectionId, object target) {
88-
switch (connectionId) {
89-
case 1:
90-
91-
#line 71 "..\..\..\Pages\NewSessionPage.xaml"
92-
((System.Windows.Controls.Button)(target)).Click += new System.Windows.RoutedEventHandler(this.JoinRoom_Clicked);
93-
94-
#line default
95-
#line hidden
96-
return;
97-
case 2:
98-
this.JoinRoomButton = ((SyncPlayWPF.CustomControls.LinkButton)(target));
99-
return;
119+
switch (connectionId)
120+
{
121+
case 1:
122+
this.ServerAddressField = ((SyncPlayWPF.CustomControls.PromptingLabel)(target));
123+
return;
124+
case 2:
125+
this.UsernameField = ((SyncPlayWPF.CustomControls.PromptingLabel)(target));
126+
return;
127+
case 3:
128+
this.PasswordField = ((SyncPlayWPF.CustomControls.PromptingPasswordBox)(target));
129+
return;
130+
case 4:
131+
this.RoomNameField = ((SyncPlayWPF.CustomControls.PromptingLabel)(target));
132+
return;
133+
case 5:
134+
135+
#line 70 "..\..\..\Pages\NewSessionPage.xaml"
136+
((System.Windows.Controls.Button)(target)).Click += new System.Windows.RoutedEventHandler(this.JoinRoom_Clicked);
137+
138+
#line default
139+
#line hidden
140+
return;
141+
case 6:
142+
this.JoinRoomButton = ((SyncPlayWPF.CustomControls.LinkButton)(target));
143+
return;
100144
}
101145
this._contentLoaded = true;
102146
}
103-
104-
internal SyncPlayWPF.CustomControls.PromptingLabel ServerAddressField;
105-
internal SyncPlayWPF.CustomControls.PromptingLabel UsernameField;
106-
internal SyncPlayWPF.CustomControls.PromptingPasswordBox PasswordField;
107-
internal SyncPlayWPF.CustomControls.PromptingLabel RoomNameField;
108147
}
109148
}
110149

‎SyncPlayWPF/SyncPlayWPF/obj/Debug/Pages/SessionLandingPage.baml‎

0 Bytes
Binary file not shown.

0 commit comments

Comments
 (0)