Permalink
Browse files

Fixed help window size. Hopefully fixing line endings stuff

  • Loading branch information...
1 parent e9c7fd7 commit 585a26a2818a264e83ceaeec103477c71b6b4f13 @benrhughes committed Aug 20, 2012
Showing with 1,578 additions and 1,556 deletions.
  1. +22 −0 .gitattributes
  2. +20 −20 Client/FilterDialog.xaml
  3. +86 −86 Client/FilterDialog.xaml.cs
  4. +2 −2 Client/Help.xaml
  5. +972 −972 Client/MainWindow.xaml.cs
  6. +219 −219 Client/Resource.resx
  7. +252 −252 Client/User.Designer.cs
  8. +5 −5 Updates.xml
View
@@ -0,0 +1,22 @@
+# Auto detect text files and perform LF normalization
+* text=auto
+
+# Custom for Visual Studio
+*.cs diff=csharp
+*.sln merge=union
+*.csproj merge=union
+*.vbproj merge=union
+*.fsproj merge=union
+*.dbproj merge=union
+
+# Standard to msysgit
+*.doc diff=astextplain
+*.DOC diff=astextplain
+*.docx diff=astextplain
+*.DOCX diff=astextplain
+*.dot diff=astextplain
+*.DOT diff=astextplain
+*.pdf diff=astextplain
+*.PDF diff=astextplain
+*.rtf diff=astextplain
+*.RTF diff=astextplain
View
@@ -1,20 +1,20 @@
-<Window x:Class="Client.FilterDialog"
- xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
- xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
- Title="Filter" Height="494" Width="385" WindowStyle="ToolWindow" ShowInTaskbar="False">
- <Grid>
- <TextBox Height="62" Name="tbFilter" VerticalAlignment="Top" AcceptsReturn="True" TextWrapping="Wrap" PreviewKeyUp="tbFilter_PreviewKeyUp" Margin="0,60,0,0" />
- <Button Content="OK" Height="23" HorizontalAlignment="Right" Name="OK" VerticalAlignment="Bottom" Width="75" IsDefault="True" Click="OK_Click" Margin="0,0,81,1" />
- <Button Content="Cancel" Height="23" HorizontalAlignment="Right" Margin="0,0,0,1" Name="Cancel" VerticalAlignment="Bottom" Width="75" Click="Cancel_Click" />
- <Button Content="_Clear Active" Height="23" HorizontalAlignment="Right" Margin="0,0,300,1" Name="Clear" VerticalAlignment="Bottom" Width="75" Click="Clear_Click" />
- <Button Content="Clear _All" Height="23" HorizontalAlignment="Right" Margin="0,0,220,1" Name="Clear_All" VerticalAlignment="Bottom" Width="75" Click="Clear_All_Click" />
- <TextBox AcceptsReturn="True" Height="70" Margin="1,150,0,0" Name="tbFilterPreset1" TextWrapping="Wrap" VerticalAlignment="Top" />
- <TextBox AcceptsReturn="True" Height="70" Margin="1,250,0,0" Name="tbFilterPreset2" TextWrapping="Wrap" VerticalAlignment="Top" />
- <TextBox AcceptsReturn="True" Height="70" Margin="1,350,0,0" Name="tbFilterPreset3" TextWrapping="Wrap" VerticalAlignment="Top" />
- <Label Content="To invoke a filter from the main window, press '1', '2' or '3'" Height="28" HorizontalAlignment="Left" Margin="1,7,0,0" Name="label1" VerticalAlignment="Top" Width="344" />
- <Label Content="Currently active filter:" Height="28" HorizontalAlignment="Left" Margin="1,40,0,0" Name="label2" VerticalAlignment="Top" />
- <Label Content="Preset filter #1:" Height="28" HorizontalAlignment="Left" Margin="1,130,0,0" Name="label3" VerticalAlignment="Top" />
- <Label Content="Preset filter #2:" Height="28" HorizontalAlignment="Left" Margin="1,230,0,0" Name="label4" VerticalAlignment="Top" />
- <Label Content="Preset filter #3:" Height="28" HorizontalAlignment="Left" Margin="1,330,0,0" Name="label5" VerticalAlignment="Top" />
- </Grid>
-</Window>
+<Window x:Class="Client.FilterDialog"
+ xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+ xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+ Title="Filter" Height="494" Width="385" WindowStyle="ToolWindow" ShowInTaskbar="False">
+ <Grid>
+ <TextBox Height="62" Name="tbFilter" VerticalAlignment="Top" AcceptsReturn="True" TextWrapping="Wrap" PreviewKeyUp="tbFilter_PreviewKeyUp" Margin="0,60,0,0" />
+ <Button Content="OK" Height="23" HorizontalAlignment="Right" Name="OK" VerticalAlignment="Bottom" Width="75" IsDefault="True" Click="OK_Click" Margin="0,0,81,1" />
+ <Button Content="Cancel" Height="23" HorizontalAlignment="Right" Margin="0,0,0,1" Name="Cancel" VerticalAlignment="Bottom" Width="75" Click="Cancel_Click" />
+ <Button Content="_Clear Active" Height="23" HorizontalAlignment="Right" Margin="0,0,300,1" Name="Clear" VerticalAlignment="Bottom" Width="75" Click="Clear_Click" />
+ <Button Content="Clear _All" Height="23" HorizontalAlignment="Right" Margin="0,0,220,1" Name="Clear_All" VerticalAlignment="Bottom" Width="75" Click="Clear_All_Click" />
+ <TextBox AcceptsReturn="True" Height="70" Margin="1,150,0,0" Name="tbFilterPreset1" TextWrapping="Wrap" VerticalAlignment="Top" />
+ <TextBox AcceptsReturn="True" Height="70" Margin="1,250,0,0" Name="tbFilterPreset2" TextWrapping="Wrap" VerticalAlignment="Top" />
+ <TextBox AcceptsReturn="True" Height="70" Margin="1,350,0,0" Name="tbFilterPreset3" TextWrapping="Wrap" VerticalAlignment="Top" />
+ <Label Content="To invoke a filter from the main window, press '1', '2' or '3'" Height="28" HorizontalAlignment="Left" Margin="1,7,0,0" Name="label1" VerticalAlignment="Top" Width="344" />
+ <Label Content="Currently active filter:" Height="28" HorizontalAlignment="Left" Margin="1,40,0,0" Name="label2" VerticalAlignment="Top" />
+ <Label Content="Preset filter #1:" Height="28" HorizontalAlignment="Left" Margin="1,130,0,0" Name="label3" VerticalAlignment="Top" />
+ <Label Content="Preset filter #2:" Height="28" HorizontalAlignment="Left" Margin="1,230,0,0" Name="label4" VerticalAlignment="Top" />
+ <Label Content="Preset filter #3:" Height="28" HorizontalAlignment="Left" Margin="1,330,0,0" Name="label5" VerticalAlignment="Top" />
+ </Grid>
+</Window>
View
@@ -1,86 +1,86 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Windows;
-using System.Windows.Controls;
-using System.Windows.Data;
-using System.Windows.Documents;
-using System.Windows.Input;
-using System.Windows.Media;
-using System.Windows.Media.Imaging;
-using System.Windows.Shapes;
-
-namespace Client
-{
- /// <summary>
- /// Interaction logic for FilterDialog.xaml
- /// </summary>
- public partial class FilterDialog : Window
- {
- private bool _prevKeyWasEnter;
- public string FilterText
- {
- get { return tbFilter.Text; }
- set { tbFilter.Text = value; tbFilter.CaretIndex = tbFilter.Text.Length; }
- }
-
- public string FilterTextPreset1
- {
- get { return tbFilterPreset1.Text; }
- set { tbFilterPreset1.Text = value; tbFilterPreset1.CaretIndex = tbFilterPreset1.Text.Length; }
- }
-
- public string FilterTextPreset2
- {
- get { return tbFilterPreset2.Text; }
- set { tbFilterPreset2.Text = value; tbFilterPreset2.CaretIndex = tbFilterPreset2.Text.Length; }
- }
-
- public string FilterTextPreset3
- {
- get { return tbFilterPreset3.Text; }
- set { tbFilterPreset3.Text = value; tbFilterPreset3.CaretIndex = tbFilterPreset3.Text.Length; }
- }
-
- public FilterDialog()
- {
- InitializeComponent();
- tbFilter.Focus();
- }
-
- private void OK_Click(object sender, RoutedEventArgs e)
- {
- this.DialogResult = true;
- }
-
- private void Cancel_Click(object sender, RoutedEventArgs e)
- {
- this.DialogResult = false;
- }
-
- private void Clear_Click(object sender, RoutedEventArgs e)
- {
- tbFilter.Clear();
- }
-
- private void Clear_All_Click(object sender, RoutedEventArgs e)
- {
- tbFilter.Clear();
- tbFilterPreset1.Clear();
- tbFilterPreset2.Clear();
- tbFilterPreset3.Clear();
- }
- private void tbFilter_PreviewKeyUp(object sender, KeyEventArgs e)
- {
- if (e.Key == Key.Escape)
- this.DialogResult = true;
- else if (e.Key == Key.Enter && _prevKeyWasEnter)
- this.DialogResult = true;
- else if (e.Key == Key.Enter)
- _prevKeyWasEnter = true;
- else
- _prevKeyWasEnter = false;
- }
- }
-}
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Input;
+using System.Windows.Media;
+using System.Windows.Media.Imaging;
+using System.Windows.Shapes;
+
+namespace Client
+{
+ /// <summary>
+ /// Interaction logic for FilterDialog.xaml
+ /// </summary>
+ public partial class FilterDialog : Window
+ {
+ private bool _prevKeyWasEnter;
+ public string FilterText
+ {
+ get { return tbFilter.Text; }
+ set { tbFilter.Text = value; tbFilter.CaretIndex = tbFilter.Text.Length; }
+ }
+
+ public string FilterTextPreset1
+ {
+ get { return tbFilterPreset1.Text; }
+ set { tbFilterPreset1.Text = value; tbFilterPreset1.CaretIndex = tbFilterPreset1.Text.Length; }
+ }
+
+ public string FilterTextPreset2
+ {
+ get { return tbFilterPreset2.Text; }
+ set { tbFilterPreset2.Text = value; tbFilterPreset2.CaretIndex = tbFilterPreset2.Text.Length; }
+ }
+
+ public string FilterTextPreset3
+ {
+ get { return tbFilterPreset3.Text; }
+ set { tbFilterPreset3.Text = value; tbFilterPreset3.CaretIndex = tbFilterPreset3.Text.Length; }
+ }
+
+ public FilterDialog()
+ {
+ InitializeComponent();
+ tbFilter.Focus();
+ }
+
+ private void OK_Click(object sender, RoutedEventArgs e)
+ {
+ this.DialogResult = true;
+ }
+
+ private void Cancel_Click(object sender, RoutedEventArgs e)
+ {
+ this.DialogResult = false;
+ }
+
+ private void Clear_Click(object sender, RoutedEventArgs e)
+ {
+ tbFilter.Clear();
+ }
+
+ private void Clear_All_Click(object sender, RoutedEventArgs e)
+ {
+ tbFilter.Clear();
+ tbFilterPreset1.Clear();
+ tbFilterPreset2.Clear();
+ tbFilterPreset3.Clear();
+ }
+ private void tbFilter_PreviewKeyUp(object sender, KeyEventArgs e)
+ {
+ if (e.Key == Key.Escape)
+ this.DialogResult = true;
+ else if (e.Key == Key.Enter && _prevKeyWasEnter)
+ this.DialogResult = true;
+ else if (e.Key == Key.Enter)
+ _prevKeyWasEnter = true;
+ else
+ _prevKeyWasEnter = false;
+ }
+ }
+}
View
@@ -1,14 +1,14 @@
<Window x:Class="Client.Help"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
- Title="Help" Height="623" Width="400">
+ Title="Help" Width="400">
<ScrollViewer>
<Grid>
<TextBlock Height="35" FontSize="20" Margin="23,0,0,0" Name="tbTitle" Text="Title" VerticalAlignment="Top" HorizontalAlignment="Left" />
<TextBlock Name="tbVersion" Text="Version" Margin="0,9,44,0" Height="23" VerticalAlignment="Top" HorizontalAlignment="Right" />
<TextBlock Height="auto" HorizontalAlignment="Left" Margin="23,38,0,0" Name="tbHelpText" Text="Help Text" VerticalAlignment="Top" />
- <TextBlock HorizontalAlignment="Left" Margin="23,560,0,0" Name="textBlock1" Text="More info available at " Height="23" VerticalAlignment="Top">
+ <TextBlock HorizontalAlignment="Left" Margin="23,600,0,0" Name="textBlock1" Text="More info available at " Height="23" VerticalAlignment="Top">
<Hyperlink Name="hLink" RequestNavigate="Hyperlink_RequestNavigate"><TextBlock Name="tbLink" Text="benrhughes.com/todotxt.net" /></Hyperlink>
</TextBlock>
Oops, something went wrong.

0 comments on commit 585a26a

Please sign in to comment.