Skip to content

Commit ed2b268

Browse files
aleknyalekny
authored
Merge pull request #2 from alekny/newtextbox
Replace RichTextBox with AvalonText
2 parents 3577874 + 0045641 commit ed2b268

14 files changed

Lines changed: 113 additions & 653 deletions

‎LICENSE‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
MIT License
22

3-
Copyright (c) alekny 2021
3+
Copyright (c) alekny 2022
44

55
Permission is hereby granted, free of charge, to any person obtaining a copy
66
of this software and associated documentation files (the "Software"), to deal

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ Checks ETF2L/RGL/UGC-Roster via status output
44

55
[![Github Version](https://img.shields.io/github/v/release/alekny/TF2CompRosterChecker?style=flat-square)](https://github.com/alekny/TF2CompRosterChecker/releases) [![Github All Releases](https://img.shields.io/github/downloads/alekny/TF2CompRosterChecker/total.svg?style=flat-square)](https://github.com/alekny/TF2CompRosterChecker/releases) [![Github License](https://img.shields.io/github/license/alekny/TF2CompRosterChecker?style=flat-square)](https://github.com/alekny/TF2CompRosterChecker/blob/master/README.md)
66

7-
[Download Version 1.7.5](https://github.com/alekny/TF2CompRosterChecker/releases/tag/1.7.5)
7+
[Download Version 1.7.7](https://github.com/alekny/TF2CompRosterChecker/releases/tag/1.7.7)
88

99
![preview](https://i.imgur.com/GMXXqmB.gif)
1010

‎TF2CompRosterChecker/App.xaml.cs‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,5 +13,6 @@ namespace TF2CompRosterChecker
1313
/// </summary>
1414
public partial class App : Application
1515
{
16+
1617
}
1718
}

‎TF2CompRosterChecker/ETF2LChecker.cs‎

Lines changed: 1 addition & 96 deletions
Original file line numberDiff line numberDiff line change
@@ -1,99 +1,4 @@
1-
/**
2-
*
3-
* Costura.Fody
4-
* Copyright (c) Simon Cropp, Cameron MacFarland
5-
*
6-
* Permission is hereby granted, free of charge, to any person obtaining a copy
7-
* of this software and associated documentation files (the "Software"), to deal
8-
* in the Software without restriction, including without limitation the rights
9-
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
10-
* copies of the Software, and to permit persons to whom the Software is
11-
* furnished to do so, subject to the following conditions:
12-
*
13-
* The above copyright notice and this permission notice shall be included in
14-
* all copies or substantial portions of the Software.
15-
*
16-
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
17-
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
18-
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
19-
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
20-
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
21-
* FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
22-
* IN THE SOFTWARE.
23-
*
24-
* -----------------------------------------------------------------------------
25-
*
26-
* Fody
27-
* Copyright (c) Simon Cropp
28-
*
29-
* Permission is hereby granted, free of charge, to any person obtaining a copy
30-
* of this software and associated documentation files (the "Software"), to deal
31-
* in the Software without restriction, including without limitation the rights
32-
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
33-
* copies of the Software, and to permit persons to whom the Software is
34-
* furnished to do so, subject to the following conditions:
35-
*
36-
* The above copyright notice and this permission notice shall be included in
37-
* all copies or substantial portions of the Software.
38-
*
39-
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
40-
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
41-
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
42-
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
43-
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
44-
* FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
45-
* IN THE SOFTWARE.
46-
*
47-
* -----------------------------------------------------------------------------
48-
*
49-
*
50-
* Html Agility Pack (HAP)
51-
* Copyright (c)ZZZ Projects, Simon Mourrier, Jeff Klawiter, Stephan Grell
52-
*
53-
* Permission is hereby granted, free of charge, to any person obtaining a copy
54-
* of this software and associated documentation files (the "Software"), to deal
55-
* in the Software without restriction, including without limitation the rights
56-
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
57-
* copies of the Software, and to permit persons to whom the Software is
58-
* furnished to do so, subject to the following conditions:
59-
*
60-
* The above copyright notice and this permission notice shall be included in
61-
* all copies or substantial portions of the Software.
62-
*
63-
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
64-
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
65-
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
66-
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
67-
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
68-
* FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
69-
* IN THE SOFTWARE.
70-
*
71-
* -----------------------------------------------------------------------------
72-
*
73-
* Newtonsoft.Json
74-
* Copyright (c) James Newton-King
75-
*
76-
* Permission is hereby granted, free of charge, to any person obtaining a copy
77-
* of this software and associated documentation files (the "Software"), to deal
78-
* in the Software without restriction, including without limitation the rights
79-
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
80-
* copies of the Software, and to permit persons to whom the Software is
81-
* furnished to do so, subject to the following conditions:
82-
*
83-
* The above copyright notice and this permission notice shall be included in
84-
* all copies or substantial portions of the Software.
85-
*
86-
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
87-
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
88-
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
89-
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
90-
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
91-
* FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
92-
* IN THE SOFTWARE.
93-
*
94-
*/
95-
96-
using Newtonsoft.Json.Linq;
1+
using Newtonsoft.Json.Linq;
972
using System;
983
using System.Collections.Generic;
994
using System.Net;

‎TF2CompRosterChecker/MainWindow.xaml‎

Lines changed: 4 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
66
xmlns:local="clr-namespace:TF2CompRosterChecker"
77
mc:Ignorable="d"
8-
Title="TF2CompRosterChecker v1.7.5" Height="368" Width="790"
8+
Title="TF2CompRosterChecker v1.7.7" Height="368" Width="790"
99
ResizeMode="CanMinimize">
1010
<Window.Resources>
1111
<Storyboard x:Key="copiedNoticeAnimation">
@@ -48,7 +48,7 @@
4848
<ComboBoxItem Content="UGC (4v4)"/>
4949
</ComboBox>
5050
<TextBlock Name="header" HorizontalAlignment="Left" Margin="17,9,0,0" TextWrapping="Wrap" Text="Paste Status Output here:" VerticalAlignment="Top" Foreground="#d1d1d1" FontSize="13"/>
51-
<TextBlock HorizontalAlignment="Left" Margin="495.2,9,0,0" TextWrapping="Wrap" VerticalAlignment="Top" Foreground="#d1d1d1" Grid.Column="1" FontSize="13">v1.7.5 by <Hyperlink
51+
<TextBlock HorizontalAlignment="Left" Margin="495.2,9,0,0" TextWrapping="Wrap" VerticalAlignment="Top" Foreground="#d1d1d1" Grid.Column="1" FontSize="13">v1.7.7 by <Hyperlink
5252
NavigateUri="https://proph.im"
5353
RequestNavigate="Hyperlink_RequestNavigate" Foreground="#7fd0ff">
5454
proph
@@ -59,19 +59,8 @@
5959
<TextBlock HorizontalAlignment="Left" Margin="361.2,291,0,0" TextWrapping="Wrap" Text="- has bans on record" VerticalAlignment="Top" Foreground="#d1d1d1" Grid.Column="1" FontSize="13"/>
6060
<TextBlock HorizontalAlignment="Left" Margin="488.2,293,0,0" TextWrapping="Wrap" VerticalAlignment="Top" Foreground="#d1d1d1" FontSize="10" Grid.Column="1"><Hyperlink Click="Show_Licenses" Foreground="#7fd0ff">Open Source Licenses</Hyperlink></TextBlock>
6161
<TextBlock HorizontalAlignment="Left" Margin="348.2,291,0,0" TextWrapping="Wrap" Text="[!]" VerticalAlignment="Top" Foreground="Red" Grid.Column="1" FontSize="13"/>
62-
<RichTextBox Name="statusOutput" Height="257" Margin="17,31,0,0" VerticalAlignment="Top" FontFamily="Consolas" TextChanged="TextBox_TextChanged" KeyDown="TextBox_KeyDown" DataObject.Pasting="TextBoxPasting" BorderBrush="#000000" SelectionBrush="#7fd0ff" VerticalScrollBarVisibility="Visible" Grid.ColumnSpan="2" HorizontalAlignment="Left" Width="744" FontSize="13">
63-
<RichTextBox.Resources>
64-
<Style TargetType="{x:Type Paragraph}">
65-
<Setter Property="Margin" Value="0"/>
66-
</Style>
67-
</RichTextBox.Resources>
68-
<FlowDocument>
69-
<Paragraph>
70-
<Run Text=""/>
71-
</Paragraph>
72-
</FlowDocument>
73-
</RichTextBox>
62+
<avalonEdit:TextEditor xmlns:avalonEdit="http://icsharpcode.net/sharpdevelop/avalonedit" Name="statusOutput" FontFamily="Consolas" FontSize="13" Margin="17,31,17,48" BorderBrush="Black" Grid.ColumnSpan="2" HorizontalScrollBarVisibility="Hidden" TextChanged="statusOutput_TextChanged" KeyDown="statusOutput_KeyDown"/>
7463
<TextBlock Name="foundIDs" HorizontalAlignment="Left" Margin="12.836,10,0,0" TextWrapping="Wrap" Text="" VerticalAlignment="Top" Foreground="#d1d1d1" Grid.Column="1" FontSize="13"/>
7564
<TextBlock Name="copiedNotice" HorizontalAlignment="Left" Margin="129.2,9,0,0" TextWrapping="Wrap" Text="SteamID copied to Clipboard" VerticalAlignment="Top" Foreground="Yellow" Grid.Column="1" FontSize="13" Visibility="Hidden" />
7665
</Grid>
77-
</Window>
66+
</Window>

0 commit comments

Comments
 (0)