6502/6502bench
1
0
Fork 0
mirror of https://github.com/fadden/6502bench.git synced 2024-12-28 16:31:17 +00:00
Code Issues Projects Releases Wiki Activity

Minor cleanup

Browse Source 
Remove left/right arrow PNGs.  Remove duplicate copies of icon.
Tweak some comments.  Set application icon.  Adjust padding on
group boxes in first tab of app settings.
This commit is contained in:
Andy McFadden 2019-08-12 13:45:00 -07:00
parent f33cd7d8a6
commit 9a6d8d2e28
9 changed files with 31 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
Asm65/Formatter.cs
View File

@ -72,10 +72,12 @@ namespace Asm65 {
public string mFullLineCommentDelimiterBase; // usually ';' or '*', WITHOUT extra space
public string mBoxLineCommentDelimiter; // usually blank or ';'
public string mAsciiDelimPattern; // delimiter pattern for ASCII constants
public string mHighAsciiDelimPattern; // delimiter pattern for high ASCII
public string mC64PetsciiDelimPattern; // delimiter pattern for C64 PETSCII
public string mC64ScreenCodeDelimPattern; // delimiter pattern for C64 screen code
// delimiter patterns for single character constants
// (currently also used for on-screen strings; asm gen strings are handled differently)
public string mAsciiDelimPattern;
public string mHighAsciiDelimPattern;
public string mC64PetsciiDelimPattern;
public string mC64ScreenCodeDelimPattern;
// miscellaneous
public bool mSpacesBetweenBytes; // "20edfd" vs. "20 ed fd"
@ -85,6 +87,7 @@ namespace Asm65 {
public enum CharConvMode { Unknown = 0, PlainAscii, HighLowAscii };
public CharConvMode mHexDumpCharConvMode; // character conversion mode for dumps
// This determines what operators are available and what their precedence is.
// Hopefully we don't need a separate mode for every assembler in existence.
public enum ExpressionMode { Unknown = 0, Common, Cc65, Merlin };
public ExpressionMode mExpressionMode; // symbol rendering mode

BIN
ImageSrc/SourceGenIcon.ico
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 139 KiB

BIN
ImageSrc/SourceGenIconSmall.ico
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 3.2 KiB

BIN
ImageSrc/left-arrow.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 156 B

BIN
ImageSrc/left-arrow.xcf
View File

Binary file not shown.

BIN
ImageSrc/right-arrow.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 155 B

5
SourceGen/FormatDescriptor.cs
View File

@ -32,8 +32,9 @@ namespace SourceGen {
/// There may be a large number of these, so try to keep the size down. These are usually
/// stored in lists, not arrays, so declaring as a struct wouldn't help with that.
///
/// The stringified form of the enum values are currently serialized into the project
/// file. DO NOT rename members of the enumeration without creating an upgrade path.
/// The stringified names of the enum values are currently serialized into the project
/// file. DO NOT rename members of the enumeration without creating an upgrade path. If
/// new values are added, the project file version number should be incremented.
/// </summary>
public class FormatDescriptor {
/// <summary>

3
SourceGen/SourceGen.csproj
View File

@ -34,6 +34,9 @@
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<PropertyGroup>
<ApplicationIcon>Res\SourceGenIcon.ico</ApplicationIcon>
</PropertyGroup>
<ItemGroup>
<Reference Include="System" />
<Reference Include="System.Data" />

36
SourceGen/WpfGui/EditAppSettings.xaml
View File

@ -53,7 +53,7 @@ limitations under the License.
</Grid.RowDefinitions>
<GroupBox Grid.Column="0" Grid.Row="0" Grid.RowSpan="3" Header="Column Visibility"
Margin="0,0,10,0">
Margin="0,0,10,0" Padding="2,0">
<StackPanel>
<Button Name="showCol0" Content="{}{0} Offset" Width="120" Margin="0,4"
Click="ColumnVisibilityButton_Click"/>
@ -77,9 +77,9 @@ limitations under the License.
</GroupBox>
<GroupBox Grid.Column="1" Grid.Row="0" Header="Code List Font"
Margin="5,0,5,0">
Margin="5,0,5,0" Padding="2,4">
<StackPanel>
<TextBlock Margin="0,4,0,0">Current font:</TextBlock>
<TextBlock>Current font:</TextBlock>
<TextBlock Name="codeListFontDesc" Margin="0,4,0,0">10-pt Hoser Sans</TextBlock>
<Button Content="Select Font..." Width="120" Margin="0,8,0,0"
HorizontalAlignment="Left" Click="SelectFontButton_Click"/>
@ -87,7 +87,7 @@ limitations under the License.
</GroupBox>
<GroupBox Grid.Column="1" Grid.Row="1" Grid.RowSpan="2" Header="Upper Case Display"
Margin="5,0,5,0">
Margin="5,0,5,0" Padding="2,4">
<StackPanel>
<CheckBox Content="Hexadecimal Values" Margin="0,4"
IsChecked="{Binding UpperHexValues}"/>
@ -109,9 +109,9 @@ limitations under the License.
</GroupBox>
<GroupBox Grid.Column="2" Grid.Row="0" Header="Clipboard"
Margin="10,0,0,0">
Margin="10,0,0,0" Padding="2,4">
<StackPanel>
<TextBlock Margin="0,4,0,0">Format for lines copied to clipboard:</TextBlock>
<TextBlock>Format for lines copied to clipboard:</TextBlock>
<ComboBox Name="clipboardFormatComboBox" IsReadOnly="True" Margin="0,8,0,0"
ItemsSource="{Binding ClipboardFormatItems}" DisplayMemberPath="Name"
SelectionChanged="ClipboardFormatComboBox_SelectionChanged"/>
@ -119,7 +119,7 @@ limitations under the License.
</GroupBox>
<GroupBox Grid.Column="2" Grid.Row="1" Header="Text Delimiters"
Margin="10,0,0,0">
Margin="10,0,0,0" Padding="2,0">
<StackPanel>
<Grid>
<Grid.Resources>
@ -128,7 +128,7 @@ limitations under the License.
<Thickness x:Key="ASC" Left="0" Top="2" Right="0" Bottom="0"/>
</Grid.Resources>
<Grid.ColumnDefinitions>
<ColumnDefinition Width="0.8*"/>
<ColumnDefinition Width="0.95*"/>
<ColumnDefinition Width="*"/>
</Grid.ColumnDefinitions>
<Grid.RowDefinitions>
@ -189,7 +189,7 @@ limitations under the License.
</TextBox.Text>
</TextBox>
<TextBlock Text="C64 Screen:" Grid.Column="0" Grid.Row="3"
<TextBlock Text="C64 Screen Code:" Grid.Column="0" Grid.Row="3"
HorizontalAlignment="Right" VerticalAlignment="Center"
Margin="{StaticResource ASC}"/>
<TextBox Grid.Column="1" Grid.Row="3"
@ -225,9 +225,9 @@ limitations under the License.
</GroupBox>
<GroupBox Grid.Column="2" Grid.Row="2" Header="Miscellaneous"
Margin="10,0,0,0">
Margin="10,0,0,0" Padding="2,4">
<StackPanel>
<CheckBox Content="Add spaces in bytes column" Margin="0,4,0,0"
<CheckBox Content="Add spaces in bytes column"
IsChecked="{Binding SpacesBetweenBytes}"/>
</StackPanel>
</GroupBox>
@ -240,8 +240,8 @@ limitations under the License.
<TabItem Name="asmConfigTab" Header="Asm Config">
<StackPanel>
<GroupBox Header="Assembler Configuration">
<Grid Margin="0,4,0,0">
<GroupBox Header="Assembler Configuration" Padding="2,4">
<Grid>
<Grid.ColumnDefinitions>
<ColumnDefinition Width="Auto"/>
<ColumnDefinition Width="*"/>
@ -334,7 +334,7 @@ limitations under the License.
<TextBlock DockPanel.Dock="Top" Margin="4,0,0,0"
Text="Configure display format options. This does not affect source code generation."/>
<GroupBox Header="Operand Width Disambiguator" Width="300" DockPanel.Dock="Top"
HorizontalAlignment="Left" Margin="0,8,0,0">
HorizontalAlignment="Left" Margin="0,8,0,0" Padding="2,0">
<Grid>
<Grid.ColumnDefinitions>
<ColumnDefinition Width="*"/>
@ -391,8 +391,8 @@ limitations under the License.
</StackPanel>
<GroupBox DockPanel.Dock="Bottom" Header="Quick Set"
Width="400" HorizontalAlignment="Right">
<DockPanel LastChildFill="False" Margin="8">
Width="400" HorizontalAlignment="Right" Padding="2,4">
<DockPanel LastChildFill="False" Margin="4">
<Button DockPanel.Dock="Left" Content="Default" Width="75"
Click="QuickFmtDefaultButton_Click"/>
<Button DockPanel.Dock="Right" Content="Set" Width="75" Margin="8,0,0,0"
@ -552,8 +552,8 @@ limitations under the License.
</Grid>
<GroupBox DockPanel.Dock="Bottom" Header="Quick Set"
Width="400" HorizontalAlignment="Right">
<DockPanel LastChildFill="False" Margin="8">
Width="400" HorizontalAlignment="Right" Padding="2,4">
<DockPanel LastChildFill="False" Margin="4">
<Button DockPanel.Dock="Left" Content="Default" Width="75"
Click="PseudoOpDefaultButton_Click"/>
<Button DockPanel.Dock="Right" Content="Set" Width="75" Margin="8,0,0,0"