Skip to content

Commit

Permalink
bump version + remove checkbox backgrounds
Browse files Browse the repository at this point in the history
  • Loading branch information
lay295 committed Oct 26, 2022
1 parent e7d4355 commit ca4563e
Show file tree
Hide file tree
Showing 7 changed files with 23 additions and 23 deletions.
2 changes: 1 addition & 1 deletion TwitchDownloaderCLI/TwitchDownloaderCLI.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

<PropertyGroup>
<OutputType>Exe</OutputType>
<Version>1.50.4</Version>
<Version>1.50.5</Version>
<Platforms>AnyCPU;x64</Platforms>
<TargetFramework>net6.0</TargetFramework>
<LangVersion>default</LangVersion>
Expand Down
2 changes: 1 addition & 1 deletion TwitchDownloaderWPF/MainWindow.xaml.cs
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ private async void Window_Loaded(object sender, RoutedEventArgs e)
if (!File.Exists("ffmpeg.exe"))
await FFmpegDownloader.GetLatestVersion(FFmpegVersion.Full);

Version currentVersion = new Version("1.50.4");
Version currentVersion = new Version("1.50.5");

AutoUpdater.InstalledVersion = currentVersion;
AutoUpdater.Start("https://downloader-update.twitcharchives.workers.dev");
Expand Down
12 changes: 6 additions & 6 deletions TwitchDownloaderWPF/PageChatDownload.xaml
Original file line number Diff line number Diff line change
Expand Up @@ -76,26 +76,26 @@
</StackPanel>
<StackPanel Margin="5,5,0,0">
<StackPanel Orientation="Horizontal">
<CheckBox x:Name="checkStart" VerticalAlignment="Center" HorizontalAlignment="Left" Background="{DynamicResource AppCheckBox}" BorderBrush="{DynamicResource AppElementBorder}" />
<CheckBox x:Name="checkStart" VerticalAlignment="Center" HorizontalAlignment="Left" BorderBrush="{DynamicResource AppElementBorder}" />
<TextBlock Margin="2,0,0,0" Text="Start" VerticalAlignment="Center" Foreground="{DynamicResource AppText}" />
<hc:NumericUpDown Margin="3,-1,0,0" Minimum="0" Value="0" x:Name="numStartHour" Background="{DynamicResource AppElementBackground}" BorderBrush="{DynamicResource AppElementBorder}" Foreground="{DynamicResource AppText}" />
<hc:NumericUpDown Margin="3,-1,0,0" Minimum="0" Value="0" x:Name="numStartMinute" Background="{DynamicResource AppElementBackground}" BorderBrush="{DynamicResource AppElementBorder}" Foreground="{DynamicResource AppText}" />
<hc:NumericUpDown Margin="3,-1,0,0" Minimum="0" Value="0" x:Name="numStartSecond" Background="{DynamicResource AppElementBackground}" BorderBrush="{DynamicResource AppElementBorder}" Foreground="{DynamicResource AppText}" />
</StackPanel>
<StackPanel Orientation="Horizontal" Margin="0,3,0,0">
<CheckBox x:Name="checkEnd" VerticalAlignment="Center" HorizontalAlignment="Left" Background="{DynamicResource AppCheckBox}" BorderBrush="{DynamicResource AppElementBorder}" />
<CheckBox x:Name="checkEnd" VerticalAlignment="Center" HorizontalAlignment="Left" BorderBrush="{DynamicResource AppElementBorder}" />
<TextBlock Margin="2,0,5,0" Text="End" VerticalAlignment="Center" Foreground="{DynamicResource AppText}"/>
<hc:NumericUpDown Margin="3,-1,0,0" Minimum="0" Value="0" x:Name="numEndHour" Background="{DynamicResource AppElementBackground}" BorderBrush="{DynamicResource AppElementBorder}" Foreground="{DynamicResource AppText}" />
<hc:NumericUpDown Margin="3,-1,0,0" Minimum="0" Value="0" x:Name="numEndMinute" Background="{DynamicResource AppElementBackground}" BorderBrush="{DynamicResource AppElementBorder}" Foreground="{DynamicResource AppText}" />
<hc:NumericUpDown Margin="3,-1,0,0" Minimum="0" Value="0" x:Name="numEndSecond" Background="{DynamicResource AppElementBackground}" BorderBrush="{DynamicResource AppElementBorder}" Foreground="{DynamicResource AppText}" />

</StackPanel>
</StackPanel>
<CheckBox x:Name="checkEmbed" Margin="5,8,0,0" Checked="checkEmbed_Checked" Unchecked="checkEmbed_Unchecked" Background="{DynamicResource AppCheckBox}" BorderBrush="{DynamicResource AppElementBorder}" />
<CheckBox x:Name="checkEmbed" Margin="5,8,0,0" Checked="checkEmbed_Checked" Unchecked="checkEmbed_Unchecked" BorderBrush="{DynamicResource AppElementBorder}" />
<StackPanel Visibility="Collapsed" x:Name="thirdPartyEmbedOptions" Orientation="Horizontal">
<CheckBox x:Name="checkBttvEmbed" Margin="5,8,0,0" Checked="checkBttvEmbed_Checked" Unchecked="checkBttvEmbed_Unchecked" Content="BTTV" Background="{DynamicResource AppCheckBox}" BorderBrush="{DynamicResource AppElementBorder}" Foreground="{DynamicResource AppText}" />
<CheckBox x:Name="checkFfzEmbed" Margin="5,8,0,0" Checked="checkFfzEmbed_Checked" Unchecked="checkFfzEmbed_Unchecked" Content="FFZ" Background="{DynamicResource AppCheckBox}" BorderBrush="{DynamicResource AppElementBorder}" Foreground="{DynamicResource AppText}" />
<CheckBox x:Name="checkStvEmbed" Margin="5,8,0,0" Checked="checkStvEmbed_Checked" Unchecked="checkStvEmbed_Unchecked" Content="7TV" Background="{DynamicResource AppCheckBox}" BorderBrush="{DynamicResource AppElementBorder}" Foreground="{DynamicResource AppText}" />
<CheckBox x:Name="checkBttvEmbed" Margin="5,8,0,0" Checked="checkBttvEmbed_Checked" Unchecked="checkBttvEmbed_Unchecked" Content="BTTV" BorderBrush="{DynamicResource AppElementBorder}" Foreground="{DynamicResource AppText}" />
<CheckBox x:Name="checkFfzEmbed" Margin="5,8,0,0" Checked="checkFfzEmbed_Checked" Unchecked="checkFfzEmbed_Unchecked" Content="FFZ" BorderBrush="{DynamicResource AppElementBorder}" Foreground="{DynamicResource AppText}" />
<CheckBox x:Name="checkStvEmbed" Margin="5,8,0,0" Checked="checkStvEmbed_Checked" Unchecked="checkStvEmbed_Unchecked" Content="7TV" BorderBrush="{DynamicResource AppElementBorder}" Foreground="{DynamicResource AppText}" />
</StackPanel>
<hc:NumericUpDown Margin="4,5,0,0" Minimum="1" Value="1" Width="60" x:Name="numChatDownloadConnections" HorizontalAlignment="Left" ValueChanged="numChatDownloadConnections_ValueChanged" Background="{DynamicResource AppElementBackground}" BorderBrush="{DynamicResource AppElementBorder}" Foreground="{DynamicResource AppText}" />
</StackPanel>
Expand Down
16 changes: 8 additions & 8 deletions TwitchDownloaderWPF/PageChatRender.xaml
Original file line number Diff line number Diff line change
Expand Up @@ -62,10 +62,10 @@
<TextBlock Text="Emote Scale:" HorizontalAlignment="Right" Margin="0,22,0,0" Foreground="{DynamicResource AppText}"/>
</StackPanel>
<StackPanel Orientation="Vertical" Margin="0,10,0,5">
<CheckBox x:Name="checkOutline" HorizontalAlignment="Left" Margin="0,2,0,0" Background="{DynamicResource AppCheckBox}" BorderBrush="{DynamicResource AppElementBorder}"/>
<CheckBox x:Name="checkTimestamp" HorizontalAlignment="Left" Margin="0,6,0,0" Background="{DynamicResource AppCheckBox}" BorderBrush="{DynamicResource AppElementBorder}"/>
<CheckBox x:Name="checkSub" HorizontalAlignment="Left" Margin="0,6,0,0" Background="{DynamicResource AppCheckBox}" BorderBrush="{DynamicResource AppElementBorder}"/>
<CheckBox x:Name="checkBadge" HorizontalAlignment="Left" Margin="0,6,0,0" Background="{DynamicResource AppCheckBox}" BorderBrush="{DynamicResource AppElementBorder}"/>
<CheckBox x:Name="checkOutline" HorizontalAlignment="Left" Margin="0,2,0,0" BorderBrush="{DynamicResource AppElementBorder}"/>
<CheckBox x:Name="checkTimestamp" HorizontalAlignment="Left" Margin="0,6,0,0" BorderBrush="{DynamicResource AppElementBorder}"/>
<CheckBox x:Name="checkSub" HorizontalAlignment="Left" Margin="0,6,0,0" BorderBrush="{DynamicResource AppElementBorder}"/>
<CheckBox x:Name="checkBadge" HorizontalAlignment="Left" Margin="0,6,0,0" BorderBrush="{DynamicResource AppElementBorder}"/>
<TextBox x:Name="textUpdateTime" Text="1.0" Width="50" HorizontalAlignment="Left" Margin="0,7,0,0" Background="{DynamicResource AppElementBackground}" BorderBrush="{DynamicResource AppElementBorder}" Foreground="{DynamicResource AppText}"/>
<TextBox x:Name="textEmoteScale" Text="1.0" Width="50" HorizontalAlignment="Left" Margin="0,7,0,0" Background="{DynamicResource AppElementBackground}" BorderBrush="{DynamicResource AppElementBorder}" Foreground="{DynamicResource AppText}"/>
</StackPanel>
Expand All @@ -75,9 +75,9 @@
<TextBlock Text="7TV Emotes:" HorizontalAlignment="Right" Margin="0,6,0,0" Foreground="{DynamicResource AppText}"/>
</StackPanel>
<StackPanel Orientation="Vertical" Margin="0,10,0,2">
<CheckBox x:Name="checkBTTV" HorizontalAlignment="Left" Margin="0,2,0,0" Background="{DynamicResource AppCheckBox}" BorderBrush="{DynamicResource AppElementBorder}"/>
<CheckBox x:Name="checkFFZ" HorizontalAlignment="Left" Margin="0,6,0,0" Background="{DynamicResource AppCheckBox}" BorderBrush="{DynamicResource AppElementBorder}"/>
<CheckBox x:Name="checkSTV" HorizontalAlignment="Left" Margin="0,6,0,0" Background="{DynamicResource AppCheckBox}" BorderBrush="{DynamicResource AppElementBorder}"/>
<CheckBox x:Name="checkBTTV" HorizontalAlignment="Left" Margin="0,2,0,0" BorderBrush="{DynamicResource AppElementBorder}"/>
<CheckBox x:Name="checkFFZ" HorizontalAlignment="Left" Margin="0,6,0,0" BorderBrush="{DynamicResource AppElementBorder}"/>
<CheckBox x:Name="checkSTV" HorizontalAlignment="Left" Margin="0,6,0,0" BorderBrush="{DynamicResource AppElementBorder}"/>
</StackPanel>
<StackPanel Orientation="Vertical" Margin="20,10,0,5">
<TextBlock Text="Chat Badge Filter:" Foreground="{DynamicResource AppText}"></TextBlock>
Expand All @@ -99,7 +99,7 @@
<ComboBox x:Name="comboFormat" MinWidth="120" MaxWidth="300" HorizontalAlignment="Left" Background="{DynamicResource DropdownBackground}" BorderBrush="{DynamicResource DropdownBorder}" Foreground="{DynamicResource DropdownText}"/>
<ComboBox x:Name="comboCodec" MinWidth="120" MaxWidth="300" HorizontalAlignment="Left" Margin="0,7,0,0" Background="{DynamicResource DropdownBackground}" BorderBrush="{DynamicResource DropdownBorder}" Foreground="{DynamicResource DropdownText}"/>
<TextBox x:Name="textFramerate" Text="30" Width="50" HorizontalAlignment="Left" Margin="0,7,0,0" Background="{DynamicResource AppElementBackground}" BorderBrush="{DynamicResource AppElementBorder}" Foreground="{DynamicResource AppText}"/>
<CheckBox x:Name="checkMask" HorizontalAlignment="Left" Margin="0,6,0,0" Background="{DynamicResource AppCheckBox}" BorderBrush="{DynamicResource AppElementBorder}"/>
<CheckBox x:Name="checkMask" HorizontalAlignment="Left" Margin="0,6,0,0" BorderBrush="{DynamicResource AppElementBorder}"/>
</StackPanel>
</DockPanel>
</TabItem>
Expand Down
4 changes: 2 additions & 2 deletions TwitchDownloaderWPF/PageVodDownload.xaml
Original file line number Diff line number Diff line change
Expand Up @@ -68,14 +68,14 @@
<ComboBox x:Name="comboQuality" Margin="5,10,0,0" Background="{DynamicResource DropdownBackground}" BorderBrush="{DynamicResource DropdownBorder}" Foreground="{DynamicResource DropdownText}"/>
<StackPanel Margin="5,5,0,0">
<StackPanel Orientation="Horizontal">
<CheckBox x:Name="checkStart" VerticalAlignment="Center" HorizontalAlignment="Left" Checked="checkStart_OnCheckStateChanged" Unchecked="checkStart_OnCheckStateChanged" Background="{DynamicResource AppCheckBox}" BorderBrush="{DynamicResource AppElementBorder}"/>
<CheckBox x:Name="checkStart" VerticalAlignment="Center" HorizontalAlignment="Left" Checked="checkStart_OnCheckStateChanged" Unchecked="checkStart_OnCheckStateChanged" BorderBrush="{DynamicResource AppElementBorder}"/>
<TextBlock Margin="2,0,0,0" Text="Start" VerticalAlignment="Center" Foreground="{DynamicResource AppText}" />
<hc:NumericUpDown Margin="3,-1,0,0" Minimum="0" Value="0" x:Name="numStartHour" Background="{DynamicResource AppElementBackground}" BorderBrush="{DynamicResource AppElementBorder}" Foreground="{DynamicResource AppText}" />
<hc:NumericUpDown Margin="3,-1,0,0" Minimum="0" Value="0" x:Name="numStartMinute" Background="{DynamicResource AppElementBackground}" BorderBrush="{DynamicResource AppElementBorder}" Foreground="{DynamicResource AppText}" />
<hc:NumericUpDown Margin="3,-1,0,0" Minimum="0" Value="0" x:Name="numStartSecond" Background="{DynamicResource AppElementBackground}" BorderBrush="{DynamicResource AppElementBorder}" Foreground="{DynamicResource AppText}" />
</StackPanel>
<StackPanel Orientation="Horizontal" Margin="0,3,0,0">
<CheckBox x:Name="checkEnd" VerticalAlignment="Center" HorizontalAlignment="Left" Checked="checkEnd_OnCheckStateChanged" Unchecked="checkEnd_OnCheckStateChanged" Background="{DynamicResource AppCheckBox}" BorderBrush="{DynamicResource AppElementBorder}"/>
<CheckBox x:Name="checkEnd" VerticalAlignment="Center" HorizontalAlignment="Left" Checked="checkEnd_OnCheckStateChanged" Unchecked="checkEnd_OnCheckStateChanged" BorderBrush="{DynamicResource AppElementBorder}"/>
<TextBlock Text="End" VerticalAlignment="Center" Margin="2,0,5,0" Foreground="{DynamicResource AppText}" />
<hc:NumericUpDown Margin="3,-1,0,0" Minimum="0" Value="0" x:Name="numEndHour" Background="{DynamicResource AppElementBackground}" BorderBrush="{DynamicResource AppElementBorder}" Foreground="{DynamicResource AppText}" />
<hc:NumericUpDown Margin="3,-1,0,0" Minimum="0" Value="0" x:Name="numEndMinute" Background="{DynamicResource AppElementBackground}" BorderBrush="{DynamicResource AppElementBorder}" Foreground="{DynamicResource AppText}" />
Expand Down
2 changes: 1 addition & 1 deletion TwitchDownloaderWPF/SettingsPage.xaml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
</StackPanel>
<StackPanel Margin="0,0,0,10" Orientation="Horizontal">
<TextBlock Margin="3,4,3,3" Text="Hide Donation Button:" Foreground="{DynamicResource AppText}" />
<CheckBox x:Name="checkDonation" VerticalAlignment="Center" HorizontalAlignment="Left" Margin="0,2,0,0" Background="{DynamicResource AppCheckBox}" BorderBrush="{DynamicResource AppElementBorder}" />
<CheckBox x:Name="checkDonation" VerticalAlignment="Center" HorizontalAlignment="Left" Margin="0,2,0,0" BorderBrush="{DynamicResource AppElementBorder}" />
</StackPanel>
<StackPanel Margin="0,0,0,10" Orientation="Horizontal">
<TextBlock Margin="3,8,3,3" Text="Application Theme:" Foreground="{DynamicResource AppText}" />
Expand Down
8 changes: 4 additions & 4 deletions TwitchDownloaderWPF/WindowQueueOptions.xaml
Original file line number Diff line number Diff line change
Expand Up @@ -10,14 +10,14 @@
<TextBox x:Name="textFolder" HorizontalAlignment="Left" Height="23" Margin="106,10,0,0" TextWrapping="Wrap" Text="" VerticalAlignment="Top" Width="279" Background="{DynamicResource AppElementBackground}" BorderBrush="{DynamicResource AppElementBorder}" Foreground="{DynamicResource AppText}"/>
<Button x:Name="btnFolder" Content="Select Folder" HorizontalAlignment="Left" Margin="390,10,0,0" VerticalAlignment="Top" Width="89" Click="btnFolder_Click" Background="{DynamicResource ActionButtonBackground}" Foreground="{DynamicResource ActionButtonText}" BorderBrush="{DynamicResource ActionButtonBorder}"/>
<TextBlock Text="Download Folder:" HorizontalAlignment="Left" Margin="10,16,0,0" VerticalAlignment="Top" Foreground="{DynamicResource AppText}"/>
<CheckBox x:Name="checkChat" Content="Download Chat" HorizontalAlignment="Left" Margin="10,65,0,0" VerticalAlignment="Top" Checked="checkChat_Checked" Unchecked="checkChat_Unchecked" Background="{DynamicResource AppCheckBox}" BorderBrush="{DynamicResource AppElementBorder}" Foreground="{DynamicResource AppText}"/>
<CheckBox x:Name="checkRender" IsEnabled="False" Content="Render Chat" HorizontalAlignment="Left" Margin="10,137,0,0" VerticalAlignment="Top" Background="{DynamicResource AppCheckBox}" BorderBrush="{DynamicResource AppElementBorder}" Foreground="{DynamicResource AppText}"/>
<CheckBox x:Name="checkChat" Content="Download Chat" HorizontalAlignment="Left" Margin="10,65,0,0" VerticalAlignment="Top" Checked="checkChat_Checked" Unchecked="checkChat_Unchecked" BorderBrush="{DynamicResource AppElementBorder}" Foreground="{DynamicResource AppText}"/>
<CheckBox x:Name="checkRender" IsEnabled="False" Content="Render Chat" HorizontalAlignment="Left" Margin="10,137,0,0" VerticalAlignment="Top" BorderBrush="{DynamicResource AppElementBorder}" Foreground="{DynamicResource AppText}"/>
<Button x:Name="btnQueue" Content="Add To Queue" HorizontalAlignment="Left" Margin="199,115,0,0" VerticalAlignment="Top" Width="105" Height="45" Click="btnQueue_Click" Background="{DynamicResource ActionButtonBackground}" Foreground="{DynamicResource ActionButtonText}" BorderBrush="{DynamicResource ActionButtonBorder}"/>
<RadioButton x:Name="radioJson" IsEnabled="False" IsChecked="True" Content="JSON" HorizontalAlignment="Left" Margin="27,87,0,0" VerticalAlignment="Top" Checked="radioJson_Checked" Background="{DynamicResource AppRadio}" BorderBrush="{DynamicResource AppElementBorder}" Foreground="{DynamicResource AppText}"/>
<RadioButton x:Name="radioTxt" IsEnabled="False" Content="TXT" HorizontalAlignment="Left" Margin="82,87,0,0" VerticalAlignment="Top" Checked="radioTxt_Checked" Background="{DynamicResource AppRadio}" BorderBrush="{DynamicResource AppElementBorder}" Foreground="{DynamicResource AppText}"/>
<RadioButton x:Name="radioHTML" IsEnabled="False" Content="HTML" HorizontalAlignment="Left" Margin="130,87,0,0" VerticalAlignment="Top" Checked="radioHTML_Checked" Background="{DynamicResource AppRadio}" BorderBrush="{DynamicResource AppElementBorder}" Foreground="{DynamicResource AppText}"/>
<CheckBox x:Name="checkEmbed" IsEnabled="False" Content="Embed Emotes" HorizontalAlignment="Left" Margin="27,115,0,0" VerticalAlignment="Top" Background="{DynamicResource AppCheckBox}" BorderBrush="{DynamicResource AppElementBorder}" Foreground="{DynamicResource AppText}"/>
<CheckBox x:Name="checkVideo" Content="Download Video" HorizontalAlignment="Left" Margin="10,43,0,0" VerticalAlignment="Top" Background="{DynamicResource AppCheckBox}" BorderBrush="{DynamicResource AppElementBorder}" Foreground="{DynamicResource AppText}"/>
<CheckBox x:Name="checkEmbed" IsEnabled="False" Content="Embed Emotes" HorizontalAlignment="Left" Margin="27,115,0,0" VerticalAlignment="Top" BorderBrush="{DynamicResource AppElementBorder}" Foreground="{DynamicResource AppText}"/>
<CheckBox x:Name="checkVideo" Content="Download Video" HorizontalAlignment="Left" Margin="10,43,0,0" VerticalAlignment="Top" BorderBrush="{DynamicResource AppElementBorder}" Foreground="{DynamicResource AppText}"/>

</Grid>
</Window>

0 comments on commit ca4563e

Please sign in to comment.