Skip to content

Commit 07bba26

Browse files
authored
Merge pull request #8 from cppshane/ansi-support
Ansi support
2 parents c37a50a + 82ec3d2 commit 07bba26

File tree

6 files changed

+149
-234
lines changed

6 files changed

+149
-234
lines changed

Background-Terminal-Setup/Product.wxs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
33
<?include $(sys.CURRENTDIR)\Config.wxi?>
4-
<Product Id="*" Name="$(var.ProductName)" Language="1033" Version="1.2.4.0" Manufacturer="shaneduffy.io" UpgradeCode="983054b1-dfd7-4147-b5cc-fc703cefcc1c">
4+
<Product Id="*" Name="$(var.ProductName)" Language="1033" Version="1.2.5.0" Manufacturer="shaneduffy.io" UpgradeCode="983054b1-dfd7-4147-b5cc-fc703cefcc1c">
55
<Package InstallerVersion="200" InstallPrivileges="elevated" Compressed="yes" InstallScope="perMachine" Description="$(var.ProductName)"/>
66

77
<MajorUpgrade DowngradeErrorMessage="A newer version of Background Terminal is already installed." />

Background-Terminal/Background-Terminal.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<UseWPF>true</UseWPF>
88
<ApplicationIcon>background-terminal.ico</ApplicationIcon>
99
<Platforms>x86;x64</Platforms>
10-
<Version>1.2.4</Version>
10+
<Version>1.2.5</Version>
1111
</PropertyGroup>
1212

1313
<ItemGroup>

Background-Terminal/BackgroundTerminalSettings.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ public class BackgroundTerminalSettings
1717
public double PosY { get; set; }
1818
public double Width { get; set; }
1919
public double Height { get; set; }
20+
public string RegexFilter { get; set; }
2021
public List<NewlineTrigger> NewlineTriggers { get; set; }
2122
}
2223
}

Background-Terminal/MainWindow.xaml

Lines changed: 26 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
xmlns:tb="http://www.hardcodet.net/taskbar"
88
Title="Background Terminal"
99
Width="400"
10-
Height="450"
10+
Height="480"
1111
AllowsTransparency="True"
1212
Background="Transparent"
1313
Closed="MainWindow_Closed"
@@ -180,6 +180,7 @@
180180
<RowDefinition Height="30" />
181181
<RowDefinition Height="30" />
182182
<RowDefinition Height="30" />
183+
<RowDefinition Height="30" />
183184
<RowDefinition Height="10" />
184185
<RowDefinition Height="30" />
185186
<RowDefinition Height="30" />
@@ -188,7 +189,7 @@
188189
<RowDefinition Height="100" />
189190
<RowDefinition Height="30" />
190191
</Grid.RowDefinitions>
191-
<Border Grid.RowSpan="11" Background="#F5F5F5" />
192+
<Border Grid.RowSpan="12" Background="#F5F5F5" />
192193
<Grid Grid.Row="0">
193194
<Grid.ColumnDefinitions>
194195
<ColumnDefinition Width="1*" />
@@ -290,13 +291,30 @@
290291
VerticalContentAlignment="Center" />
291292
</Grid>
292293
<Grid Grid.Row="5">
294+
<Grid.ColumnDefinitions>
295+
<ColumnDefinition Width="1*" />
296+
<ColumnDefinition Width="1*" />
297+
</Grid.ColumnDefinitions>
298+
<Label
299+
Grid.Column="0"
300+
VerticalAlignment="Center"
301+
HorizontalContentAlignment="Center"
302+
Content="Regex Filter:"
303+
FontFamily="Yu Gothic UI Light" />
304+
<TextBox
305+
x:Name="RegexFilter_TextBox"
306+
Grid.Column="1"
307+
Margin="10,5,10,5"
308+
VerticalContentAlignment="Center" />
309+
</Grid>
310+
<Grid Grid.Row="6">
293311
<Border
294312
Height="1"
295313
Margin="10,0,10,0"
296314
BorderBrush="Gray"
297315
BorderThickness="1" />
298316
</Grid>
299-
<Grid Grid.Row="6">
317+
<Grid Grid.Row="7">
300318
<Grid.ColumnDefinitions>
301319
<ColumnDefinition Width="1*" />
302320
<ColumnDefinition Width="1*" />
@@ -317,7 +335,7 @@
317335
Style="{StaticResource StandardButton1}" />
318336
</Grid>
319337
</Grid>
320-
<Grid Grid.Row="7">
338+
<Grid Grid.Row="8">
321339
<Grid.ColumnDefinitions>
322340
<ColumnDefinition Width="1*" />
323341
<ColumnDefinition Width="1*" />
@@ -360,7 +378,7 @@
360378
FontFamily="Yu Gothic UI" />
361379
</Grid>
362380
</Grid>
363-
<Grid Grid.Row="8">
381+
<Grid Grid.Row="9">
364382
<Grid.ColumnDefinitions>
365383
<ColumnDefinition Width="1*" />
366384
<ColumnDefinition Width="1*" />
@@ -403,14 +421,14 @@
403421
FontFamily="Yu Gothic UI" />
404422
</Grid>
405423
</Grid>
406-
<Grid Grid.Row="9">
424+
<Grid Grid.Row="10">
407425
<Border
408426
Height="1"
409427
Margin="10,0,10,0"
410428
BorderBrush="Gray"
411429
BorderThickness="1" />
412430
</Grid>
413-
<Grid Grid.Row="10">
431+
<Grid Grid.Row="11">
414432
<Grid.RowDefinitions>
415433
<RowDefinition Height="30" />
416434
<RowDefinition Height="1*" />
@@ -489,7 +507,7 @@
489507
</ListBox.ItemTemplate>
490508
</ListBox>
491509
</Grid>
492-
<Grid Grid.Row="11">
510+
<Grid Grid.Row="12">
493511
<Grid.ColumnDefinitions>
494512
<ColumnDefinition Width="1*" />
495513
<ColumnDefinition Width="1" />

0 commit comments

Comments
 (0)