Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -207,6 +207,6 @@ More information can be found [here](docs/Debugger.md).
- [FFmpeg wrapper](https://github.com/rosenbjerg/FFMpegCore)
- [SkiaSharp](https://github.com/mono/SkiaSharp)
- [Material Icons](https://github.com/SKProCH/Material.Icons)
- [ZX Spectrum Font](https://github.com/comptic/zx-spectrum-font)
- [ZX Spectrum Font by Patrick H. Lauke](https://fontstruct.com/fontstructions/show/1398596)
- [Hack Font](https://sourcefoundry.org/hack/)
- [VT220 Font](https://github.com/svofski/glasstty/blob/master/Glass_TTY_VT220.ttf)
4 changes: 2 additions & 2 deletions src/Spectron.Debugger/Controls/CodeList.axaml
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@
Text="Code"
HorizontalAlignment="Center"
VerticalAlignment="Center"
FontFamily="{StaticResource SpectrumStrictFont}"
FontSize="20"/>
FontFamily="{StaticResource SpectrumFont}"
FontSize="9"/>
</Border>

<ListBox Grid.Row="1" ItemsSource="{Binding CodeLines}" Name="ListBox" DoubleTapped="ListBox_OnDoubleTapped">
Expand Down
4 changes: 2 additions & 2 deletions src/Spectron.Debugger/Controls/Cpu.axaml
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@
Text="CPU"
HorizontalAlignment="Center"
VerticalAlignment="Center"
FontFamily="{StaticResource SpectrumStrictFont}"
FontSize="20"/>
FontFamily="{StaticResource SpectrumFont}"
FontSize="9"/>
</Border>

<Border Grid.Row="1" Background="{DynamicResource SystemControlBackgroundChromeMediumLowBrush}">
Expand Down
4 changes: 2 additions & 2 deletions src/Spectron.Debugger/Controls/HexViewer.axaml
Original file line number Diff line number Diff line change
Expand Up @@ -90,8 +90,8 @@
<Grid x:DataType="controls:HexViewerCell" Height="{TemplateBinding CellHeight}">
<TextBlock Name="AsciiCell"
Text="{Binding Value, Converter={StaticResource AsciiConverter}}"
FontFamily="{StaticResource SpectrumStrictFont}"
FontSize="15"
FontFamily="{StaticResource SpectrumFont}"
FontSize="7"
VerticalAlignment="Center"
TextAlignment="Center"
Width="14"/>
Expand Down
4 changes: 2 additions & 2 deletions src/Spectron.Debugger/Controls/Memory.axaml
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@
Text="Memory"
HorizontalAlignment="Center"
VerticalAlignment="Center"
FontFamily="{StaticResource SpectrumStrictFont}"
FontSize="20"/>
FontFamily="{StaticResource SpectrumFont}"
FontSize="9"/>
</Border>

<Border Grid.Row="1" Background="{DynamicResource SystemControlBackgroundChromeMediumLowBrush}">
Expand Down
8 changes: 4 additions & 4 deletions src/Spectron.Debugger/Controls/Register.axaml
Original file line number Diff line number Diff line change
Expand Up @@ -17,16 +17,16 @@

<UserControl.Styles>
<Style Selector="TextBox.Register">
<Setter Property="FontFamily" Value="{StaticResource SpectrumStrictFont}"/>
<Setter Property="FontFamily" Value="{StaticResource SpectrumFont}"/>
<Setter Property="VerticalContentAlignment" Value="Center"/>
<Setter Property="FontSize" Value="20"/>
<Setter Property="FontSize" Value="9"/>
<Setter Property="Padding" Value="8 0 8 0"/>
<Setter Property="Height" Value="30"/>
</Style>
<Style Selector="TextBlock.Register">
<Setter Property="FontFamily" Value="{StaticResource SpectrumStrictFont}"/>
<Setter Property="FontFamily" Value="{StaticResource SpectrumFont}"/>
<Setter Property="VerticalAlignment" Value="Center"/>
<Setter Property="FontSize" Value="20"/>
<Setter Property="FontSize" Value="9"/>
</Style>
</UserControl.Styles>

Expand Down
18 changes: 10 additions & 8 deletions src/Spectron.Debugger/Controls/Stack.axaml
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@
Text="Stack"
HorizontalAlignment="Center"
VerticalAlignment="Center"
FontFamily="{StaticResource SpectrumStrictFont}"
FontSize="20"/>
FontFamily="{StaticResource SpectrumFont}"
FontSize="9"/>
</Border>

<ListBox Grid.Row="1" ItemsSource="{Binding Items}">
Expand Down Expand Up @@ -50,17 +50,19 @@

<TextBlock
Grid.Column="1"
FontFamily="{StaticResource SpectrumStrictFont}"
FontFamily="{StaticResource SpectrumFont}"
VerticalAlignment="Center"
TextAlignment="Left"
FontSize="20"
Margin="0 -4 0 0"
FontSize="9"
Margin="0 0 0 0"
Text="{Binding Address}"/>
<TextBlock
Grid.Column="2"
FontFamily="{StaticResource SpectrumStrictFont}"
FontFamily="{StaticResource SpectrumFont}"
VerticalAlignment="Center"
TextAlignment="Right"
FontSize="20"
Margin="0 -4 8 0"
FontSize="9"
Margin="0 0 8 0"
Text="{Binding Value}"/>
</Grid>
</DataTemplate>
Expand Down
3 changes: 1 addition & 2 deletions src/Spectron/App.axaml
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,7 @@

<Application.Resources>
<!-- Spectrum fonts -->
<FontFamily x:Key="SpectrumStrictFont">/Assets/Fonts/zxSpectrumStrict.ttf#zxSpectrumStrict</FontFamily>
<FontFamily x:Key="SpectrumExpandedFont">/Assets/Fonts/zxSpectrumExpanded.ttf#zxSpectrumExpand</FontFamily>
<FontFamily x:Key="SpectrumFont">/Assets/Fonts/zx-spectrum.ttf#ZX Spectrum Regular</FontFamily>
<FontFamily x:Key="HackRegular">/Assets/Fonts/Hack-Regular.ttf#Hack</FontFamily>
<FontFamily x:Key="VT220">/Assets/Fonts/Glass_TTY_VT220.ttf#Glass TTY VT220</FontFamily>

Expand Down
Binary file added src/Spectron/Assets/Fonts/zx-spectrum.ttf
Binary file not shown.
Binary file removed src/Spectron/Assets/Fonts/zxSpectrumExpanded.ttf
Binary file not shown.
Binary file removed src/Spectron/Assets/Fonts/zxSpectrumStrict.ttf
Binary file not shown.
14 changes: 7 additions & 7 deletions src/Spectron/Controls/PauseOverlay.axaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
xmlns:controls="clr-namespace:OldBit.Spectron.Controls">

<Design.PreviewWith>
<controls:PauseOverlay FontSize="60" />
<controls:PauseOverlay FontSize="27" />
</Design.PreviewWith>

<Style Selector="controls|PauseOverlay">
Expand All @@ -12,32 +12,32 @@
<StackPanel Orientation="Horizontal" Opacity="{Binding Opacity, RelativeSource={RelativeSource AncestorType={x:Type controls:PauseOverlay}}}" >
<TextBlock Text="P" x:Name="PART_LetterP" Opacity="1"
FontSize="{Binding FontSize, RelativeSource={RelativeSource AncestorType={x:Type controls:PauseOverlay}}}"
FontFamily="{StaticResource SpectrumStrictFont}"
FontFamily="{StaticResource SpectrumFont}"
Foreground="{StaticResource SpectrumBlack}"
/>
<TextBlock Text="A" x:Name="PART_LetterA" Opacity="1"
FontSize="{Binding FontSize, RelativeSource={RelativeSource AncestorType={x:Type controls:PauseOverlay}}}"
FontFamily="{StaticResource SpectrumStrictFont}"
FontFamily="{StaticResource SpectrumFont}"
Foreground="{StaticResource SpectrumBrightRed}"
/>
<TextBlock Text="U" x:Name="PART_LetterU" Opacity="1"
FontSize="{Binding FontSize, RelativeSource={RelativeSource AncestorType={x:Type controls:PauseOverlay}}}"
FontFamily="{StaticResource SpectrumStrictFont}"
FontFamily="{StaticResource SpectrumFont}"
Foreground="{StaticResource SpectrumBrightGreen}"
/>
<TextBlock Text="S" x:Name="PART_LetterS" Opacity="1"
FontSize="{Binding FontSize, RelativeSource={RelativeSource AncestorType={x:Type controls:PauseOverlay}}}"
FontFamily="{StaticResource SpectrumStrictFont}"
FontFamily="{StaticResource SpectrumFont}"
Foreground="{StaticResource SpectrumBrightYellow}"
/>
<TextBlock Text="E" x:Name="PART_LetterE" Opacity="1"
FontSize="{Binding FontSize, RelativeSource={RelativeSource AncestorType={x:Type controls:PauseOverlay}}}"
FontFamily="{StaticResource SpectrumStrictFont}"
FontFamily="{StaticResource SpectrumFont}"
Foreground="{StaticResource SpectrumBrightMagenta}"
/>
<TextBlock Text="D" x:Name="PART_LetterD" Opacity="1"
FontSize="{Binding FontSize, RelativeSource={RelativeSource AncestorType={x:Type controls:PauseOverlay}}}"
FontFamily="{StaticResource SpectrumStrictFont}"
FontFamily="{StaticResource SpectrumFont}"
Foreground="{StaticResource SpectrumBrightBlue}"
/>
</StackPanel>
Expand Down
4 changes: 2 additions & 2 deletions src/Spectron/Controls/TimeMachineTimer.axaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
x:Class="OldBit.Spectron.Controls.TimeMachineTimer">
<TextBlock
Name="Countdown"
FontFamily="{StaticResource SpectrumExpandedFont}"
FontSize="512"
FontFamily="{StaticResource SpectrumFont}"
FontSize="230"
Opacity=".8"
Foreground="{StaticResource SpectrumBrightMagenta}"
HorizontalAlignment="Center"
Expand Down
8 changes: 4 additions & 4 deletions src/Spectron/Views/AboutView.axaml
Original file line number Diff line number Diff line change
Expand Up @@ -48,10 +48,10 @@
<Grid RowDefinitions="96,*" Margin="10">
<Image Grid.Row="0" Source="../Assets/Logo.png" Height="128" Width="96"/>
<StackPanel Grid.Row="1">
<TextBlock Text="Spectron" FontFamily="{StaticResource SpectrumStrictFont}" FontSize="64" HorizontalAlignment="Center" Classes="Spectron"/>
<TextBlock Text="Version 1.0.0" FontFamily="{StaticResource SpectrumStrictFont}" FontSize="24" HorizontalAlignment="Center" Padding="8" Foreground="{StaticResource SpectrumBrightGreen}"/>
<TextBlock Text="© 2025-2026 Wojciech Sobieszek" FontFamily="{StaticResource SpectrumStrictFont}" FontSize="20" HorizontalAlignment="Center" Padding="0,20,0,3" Foreground="{StaticResource SpectrumBrightCyan}"/>
<TextBlock Text="OldBit Ltd" FontFamily="{StaticResource SpectrumStrictFont}" FontSize="20" HorizontalAlignment="Center" Foreground="{StaticResource SpectrumBrightCyan}"/>
<TextBlock Text="Spectron" FontFamily="{StaticResource SpectrumFont}" FontSize="29" HorizontalAlignment="Center" Classes="Spectron"/>
<TextBlock Text="Version 1.0.0" FontFamily="{StaticResource SpectrumFont}" FontSize="11" HorizontalAlignment="Center" Padding="30" Foreground="{StaticResource SpectrumBrightGreen}"/>
<TextBlock Text="© 2025-2026 Wojciech Sobieszek" FontFamily="{StaticResource SpectrumFont}" FontSize="9" HorizontalAlignment="Center" Padding="0,35,0,3" Foreground="{StaticResource SpectrumBrightCyan}"/>
<TextBlock Text="OldBit Ltd" FontFamily="{StaticResource SpectrumFont}" FontSize="9" HorizontalAlignment="Center" Foreground="{StaticResource SpectrumBrightCyan}"/>
</StackPanel>
</Grid>
</Window>
4 changes: 2 additions & 2 deletions src/Spectron/Views/DiskView.axaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@

<Window.Styles>
<Style Selector="TextBlock.ZX">
<Setter Property="FontFamily" Value="{StaticResource SpectrumStrictFont}"/>
<Setter Property="FontSize" Value="24"/>
<Setter Property="FontFamily" Value="{StaticResource SpectrumFont}"/>
<Setter Property="FontSize" Value="11"/>
<Setter Property="VerticalAlignment" Value="Center"/>
</Style>
</Window.Styles>
Expand Down
4 changes: 2 additions & 2 deletions src/Spectron/Views/KeyboardView.axaml
Original file line number Diff line number Diff line change
Expand Up @@ -19,12 +19,12 @@
<Image Source="../Assets/Keyboard.png"/>
<TextBlock
Text="Spectron Emulator"
FontFamily="{StaticResource SpectrumStrictFont}"
FontFamily="{StaticResource SpectrumFont}"
VerticalAlignment="Bottom"
HorizontalAlignment="Left"
Opacity=".7"
Margin="30,0,0,5"
FontSize="20"
FontSize="9"
Foreground="{StaticResource SpectrumBrightCyan}"
Background="Transparent"/>
</Grid>
Expand Down
4 changes: 2 additions & 2 deletions src/Spectron/Views/PreferencesView.axaml
Original file line number Diff line number Diff line change
Expand Up @@ -603,8 +603,8 @@
VerticalAlignment="Center"/>
<ComboBox
Grid.Column="1"
FontFamily="{StaticResource SpectrumStrictFont}"
FontSize="22"
FontFamily="{StaticResource SpectrumFont}"
FontSize="10"
Width="130"
ItemsSource="{Binding HexNumberFormats}"
SelectedValue="{Binding DebuggerNumberFormat}"
Expand Down
8 changes: 4 additions & 4 deletions src/Spectron/Views/TimeMachineView.axaml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@

<Window.Styles>
<Style Selector="TextBlock.ZX">
<Setter Property="FontFamily" Value="{StaticResource SpectrumStrictFont}"/>
<Setter Property="FontFamily" Value="{StaticResource SpectrumFont}"/>
</Style>
</Window.Styles>

Expand All @@ -29,11 +29,11 @@
<Slider Name="Slider" TickPlacement="None" FocusAdorner="{x:Null}" Height="35" Padding="20 0 20 0" Minimum="0" Maximum="{Binding EntriesCount}" Value="{Binding CurrentEntryIndex}" TickFrequency="1" IsSnapToTickEnabled="True"/>

<Grid ColumnDefinitions="*,*" Margin="20 0 20 0">
<TextBlock Grid.Column="0" Text="past" Classes="ZX" FontSize="15" Foreground="{StaticResource SpectrumWhite}"/>
<TextBlock Grid.Column="1" Text="now" TextAlignment="Right" Classes="ZX" FontSize="15" Foreground="{StaticResource SpectrumWhite}"/>
<TextBlock Grid.Column="0" Text="past" Classes="ZX" FontSize="8" Foreground="{StaticResource SpectrumWhite}"/>
<TextBlock Grid.Column="1" Text="now" TextAlignment="Right" Classes="ZX" FontSize="8" Foreground="{StaticResource SpectrumWhite}"/>
</Grid>

<Button HotKey="Enter" HorizontalAlignment="Center" Content="Time Travel" Command="{Binding TimeTravelCommand}" FontFamily="{StaticResource SpectrumStrictFont}" FontSize="20" CornerRadius="10"/>
<Button HotKey="Enter" HorizontalAlignment="Center" Content="Time Travel" Command="{Binding TimeTravelCommand}" FontFamily="{StaticResource SpectrumFont}" FontSize="9" CornerRadius="10"/>
</StackPanel>
</Grid>
</Window>