Skip to content

Commit b86cdbb

Browse files
author
David Khristepher Santos
committed
UI Adjustments for GameListWindow
1 parent 12fdfe1 commit b86cdbb

File tree

2 files changed

+19
-7
lines changed

2 files changed

+19
-7
lines changed

PSXPackagerGUI/GameListWindow.xaml

Lines changed: 16 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,15 +8,23 @@
88
mc:Ignorable="d"
99
d:DataContext="{d:DesignInstance models:GameListWindowModel, IsDesignTimeCreatable=True}"
1010
WindowStyle="ToolWindow"
11+
FocusManager.FocusedElement="{Binding ElementName=SearchTextBox}"
1112
Title="GamesDB" Height="450" Width="800">
12-
<Grid x:Name="Grid">
13+
<Grid x:Name="Grid" Margin="5">
1314
<Grid.RowDefinitions>
1415
<RowDefinition Height="30"/>
1516
<RowDefinition/>
1617
<RowDefinition Height="30"/>
1718
</Grid.RowDefinitions>
18-
<TextBox Grid.Row="0" VerticalContentAlignment="Center" Text="{Binding SearchText, UpdateSourceTrigger=PropertyChanged}"></TextBox>
19-
<DataGrid Grid.Row="1" ItemsSource="{Binding Entries}" AutoGenerateColumns="False" SelectedItem="{Binding SelectedGame}" CanUserAddRows="False" CanUserDeleteRows="False" IsReadOnly="True">
19+
<Grid Grid.Row="0">
20+
<Grid.ColumnDefinitions>
21+
<ColumnDefinition Width="50"/>
22+
<ColumnDefinition/>
23+
</Grid.ColumnDefinitions>
24+
<Label VerticalContentAlignment="Center">Search</Label>
25+
<TextBox Grid.Column="1" Margin="5,0,0,0" Name="SearchTextBox" VerticalContentAlignment="Center" Text="{Binding SearchText, UpdateSourceTrigger=PropertyChanged}"></TextBox>
26+
</Grid>
27+
<DataGrid Margin="0,5,0,5" Grid.Row="1" ItemsSource="{Binding Entries}" AutoGenerateColumns="False" SelectedItem="{Binding SelectedGame}" CanUserAddRows="False" CanUserDeleteRows="False" IsReadOnly="True">
2028
<DataGrid.ContextMenu>
2129
<ContextMenu>
2230
<MenuItem Header="Copy GameID" Click="CopyGameID_Click"></MenuItem>
@@ -37,10 +45,13 @@
3745
<Grid Grid.Row="2" x:Name="Actions">
3846
<Grid.ColumnDefinitions>
3947
<ColumnDefinition/>
48+
<ColumnDefinition Width="Auto"/>
4049
<ColumnDefinition/>
4150
</Grid.ColumnDefinitions>
42-
<Button Grid.Column="0" Click="Cancel_Click">Cancel</Button>
43-
<Button Grid.Column="1" Click="Select_Click" IsEnabled="{Binding HasSelected}">Select</Button>
51+
<StackPanel Grid.Column="1" Orientation="Horizontal">
52+
<Button Width="100" Click="Cancel_Click">Cancel</Button>
53+
<Button Width="100" Margin="10,0,0,0" Click="Select_Click" IsEnabled="{Binding HasSelected}">Select</Button>
54+
</StackPanel>
4455
</Grid>
4556
</Grid>
4657
</Window>

PSXPackagerGUI/Pages/SinglePage.SFO.xaml.cs

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ private void SetSFOMetaData()
101101
//Value = "1.00";
102102
entry.EntryType = SFOEntryType.STR;
103103
entry.IsEditable = true;
104-
entry.MaxLength = 9;
104+
entry.MaxLength = 16;
105105
entry.Validator = ValidateVersion;
106106
entry.ToolTip = "Decimal value e.g. 1.00";
107107
break;
@@ -128,6 +128,7 @@ private void SetSFOMetaData()
128128
//Value = SFOValues.PSPSystemVersion;
129129
entry.EntryType = SFOEntryType.STR;
130130
entry.IsEditable = true;
131+
entry.MaxLength = 16;
131132
entry.Validator = ValidateVersion;
132133
entry.ToolTip = "Minimum required System Version e.g. 3.01";
133134
break;
@@ -171,7 +172,7 @@ private bool ValidateParentalLevel(string value)
171172

172173
if (int.TryParse(value, out var intValue))
173174
{
174-
return intValue is >= 0 and <= 11;
175+
return intValue is >= 1 and <= 11;
175176
}
176177

177178
return false;

0 commit comments

Comments
 (0)