Skip to content

Commit 8723c0b

Browse files
MattEqualsCoderMattEqualsCoder
committed
Updated MainWindow borders
1 parent 4e7e1fe commit 8723c0b

File tree

4 files changed

+102
-97
lines changed

4 files changed

+102
-97
lines changed

‎MSURandomizer/MSURandomizer.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<ApplicationManifest>app.manifest</ApplicationManifest>
88
<AvaloniaUseCompiledBindingsByDefault>true</AvaloniaUseCompiledBindingsByDefault>
99
<PackageIcon>MSURandomizerIcon.ico</PackageIcon>
10-
<Version>2.0.0-alpha.1</Version>
10+
<Version>2.0.0-beta.1</Version>
1111
<ApplicationIcon>MSURandomizerIcon.ico</ApplicationIcon>
1212
</PropertyGroup>
1313

‎MSURandomizer/Views/MsuList.axaml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323
ItemsSource="{Binding FilteredMsus}"
2424
SelectionMode="Multiple,Toggle"
2525
SelectedItems="{Binding SelectedMsus}"
26+
BorderThickness="0"
2627
SelectionChanged="SelectingItemsControl_OnSelectionChanged"
2728
>
2829
<ListBox.ItemTemplate>

‎MSURandomizer/Views/MsuWindow.axaml‎

Lines changed: 99 additions & 95 deletions
Original file line numberDiff line numberDiff line change
@@ -17,103 +17,107 @@
1717
</Design.DataContext>
1818
<LayoutTransformControl Name="MainLayout">
1919
<DockPanel Name="BodyPanel">
20-
<Grid ColumnDefinitions="*, Auto, Auto, Auto, Auto, Auto" DockPanel.Dock="Top" Margin="5">
21-
<StackPanel Orientation="Vertical" Grid.Column="0" Margin="5">
22-
<TextBlock>Output MSU Type</TextBlock>
23-
<ComboBox
24-
ItemsSource="{Binding MsusTypes}"
25-
SelectedItem="{Binding SelectedMsuType, Mode=TwoWay}"
26-
SelectionChanged="MsuTypeComboBox_OnSelectionChanged"
27-
IsEnabled="{Binding !AreMsusLoading}"
28-
>
29-
</ComboBox>
30-
</StackPanel>
31-
<StackPanel Orientation="Vertical" Grid.Column="1" Margin="5" MinWidth="150">
32-
<TextBlock>Filter</TextBlock>
33-
<controls:EnumComboBox
34-
EnumType="{Binding Filter, Converter={StaticResource TypeConverter}}"
35-
Value="{Binding Filter, Mode=TwoWay}"
36-
ValueChanged="EnumComboBox_OnValueChanged"
37-
IsEnabled="{Binding !AreMsusLoading}"
38-
>
39-
</controls:EnumComboBox>
40-
</StackPanel>
41-
<StackPanel Orientation="Vertical" Grid.Column="2" Margin="5" MinWidth="100">
42-
<TextBlock></TextBlock>
43-
<Button Name="SelectAllButton"
44-
Click="SelectAllButton_OnClick"
20+
<controls:HeaderFooter DockPanel.Dock="Top" BorderSize="0 0 0 2">
21+
<Grid ColumnDefinitions="*, Auto, Auto, Auto, Auto, Auto" Margin="5">
22+
<StackPanel Orientation="Vertical" Grid.Column="0" Margin="5">
23+
<TextBlock>Output MSU Type</TextBlock>
24+
<ComboBox
25+
ItemsSource="{Binding MsusTypes}"
26+
SelectedItem="{Binding SelectedMsuType, Mode=TwoWay}"
27+
SelectionChanged="MsuTypeComboBox_OnSelectionChanged"
4528
IsEnabled="{Binding !AreMsusLoading}"
46-
>
47-
Select All
48-
</Button>
49-
</StackPanel>
50-
<StackPanel Orientation="Vertical" Grid.Column="3" Margin="5" MinWidth="100">
51-
<TextBlock></TextBlock>
52-
<Button Name="SelectNoneButton"
53-
Click="SelectNoneButton_OnClick"
29+
>
30+
</ComboBox>
31+
</StackPanel>
32+
<StackPanel Orientation="Vertical" Grid.Column="1" Margin="5" MinWidth="150">
33+
<TextBlock>Filter</TextBlock>
34+
<controls:EnumComboBox
35+
EnumType="{Binding Filter, Converter={StaticResource TypeConverter}}"
36+
Value="{Binding Filter, Mode=TwoWay}"
37+
ValueChanged="EnumComboBox_OnValueChanged"
5438
IsEnabled="{Binding !AreMsusLoading}"
55-
>
56-
Select None
57-
</Button>
58-
</StackPanel>
59-
<StackPanel Orientation="Vertical" Grid.Column="4" Margin="5" IsVisible="{Binding IsHardwareModeButtonVisible}">
60-
<TextBlock></TextBlock>
61-
<Button Name="HardwareButton"
62-
Click="HardwareButton_OnClick"
63-
Height="24.5"
64-
IsEnabled="{Binding !AreMsusLoading}"
65-
>
66-
<avalonia:MaterialIcon Kind="Usb"/>
67-
</Button>
68-
</StackPanel>
69-
<StackPanel Orientation="Vertical" Grid.Column="5" Margin="5">
70-
<TextBlock></TextBlock>
71-
<Button Name="SettingsButton" Click="SettingsButton_OnClick" Height="24.5">
72-
<avalonia:MaterialIcon Kind="Settings"/>
73-
</Button>
74-
</StackPanel>
75-
</Grid>
76-
<Grid ColumnDefinitions="*, Auto" DockPanel.Dock="Bottom" Margin="5">
77-
<TextBlock Grid.Column="0" VerticalAlignment="Center" Text="{Binding MsuCountText}" Margin="5" />
78-
<StackPanel Grid.Column="1" Orientation="Horizontal">
79-
<Button Name="SelectMsuButton"
80-
Margin="5"
81-
Content="{Binding SelectMsusText}"
82-
IsEnabled="{Binding IsSelectMsuEnabled}"
83-
IsVisible="{Binding IsSelectMsuButtonVisible}"
84-
Click="SelectMsuButton_OnClick"
85-
/>
86-
<Button Name="CancelButton"
87-
Margin="5"
88-
Content="_Cancel"
89-
IsEnabled="{Binding IsCancelEnabled}"
90-
IsVisible="{Binding IsCancelButtonVisible}"
91-
Click="CancelButton_OnClick"
92-
/>
93-
<Button Name="RandomMsuButton"
94-
Margin="5"
95-
Content="{Binding RandomMsuText}"
96-
IsEnabled="{Binding IsRandomMsuEnabled}"
97-
IsVisible="{Binding IsRandomMsuButtonVisible}"
98-
Click="RandomMsuButton_OnClick"
99-
/>
100-
<Button Name="ShuffledMsuButton"
101-
Margin="5"
102-
Content="Create _Shuffled MSU"
103-
IsEnabled="{Binding IsShuffledMsuEnabled}"
104-
IsVisible="{Binding IsShuffledMsuButtonVisible}"
105-
Click="ShuffledMsuButton_OnClick"
106-
/>
107-
<Button Name="ContinuousShuffleButton"
108-
Margin="5"
109-
Content="_Continuously Shuffled MSU"
110-
IsEnabled="{Binding IsContinuousShuffleEnabled}"
111-
IsVisible="{Binding IsContinuousShuffleButtonVisible}"
112-
Click="ContinuousShuffleButton_OnClick"
113-
/>
114-
</StackPanel>
115-
116-
</Grid>
39+
>
40+
</controls:EnumComboBox>
41+
</StackPanel>
42+
<StackPanel Orientation="Vertical" Grid.Column="2" Margin="5" MinWidth="100">
43+
<TextBlock></TextBlock>
44+
<Button Name="SelectAllButton"
45+
Click="SelectAllButton_OnClick"
46+
IsEnabled="{Binding !AreMsusLoading}"
47+
>
48+
Select All
49+
</Button>
50+
</StackPanel>
51+
<StackPanel Orientation="Vertical" Grid.Column="3" Margin="5" MinWidth="100">
52+
<TextBlock></TextBlock>
53+
<Button Name="SelectNoneButton"
54+
Click="SelectNoneButton_OnClick"
55+
IsEnabled="{Binding !AreMsusLoading}"
56+
>
57+
Select None
58+
</Button>
59+
</StackPanel>
60+
<StackPanel Orientation="Vertical" Grid.Column="4" Margin="5" IsVisible="{Binding IsHardwareModeButtonVisible}">
61+
<TextBlock></TextBlock>
62+
<Button Name="HardwareButton"
63+
Click="HardwareButton_OnClick"
64+
Height="24.5"
65+
IsEnabled="{Binding !AreMsusLoading}"
66+
>
67+
<avalonia:MaterialIcon Kind="Usb"/>
68+
</Button>
69+
</StackPanel>
70+
<StackPanel Orientation="Vertical" Grid.Column="5" Margin="5">
71+
<TextBlock></TextBlock>
72+
<Button Name="SettingsButton" Click="SettingsButton_OnClick" Height="24.5">
73+
<avalonia:MaterialIcon Kind="Settings"/>
74+
</Button>
75+
</StackPanel>
76+
</Grid>
77+
</controls:HeaderFooter>
78+
<controls:HeaderFooter DockPanel.Dock="Bottom">
79+
<Grid ColumnDefinitions="*, Auto" Margin="5">
80+
<TextBlock Grid.Column="0" VerticalAlignment="Center" Text="{Binding MsuCountText}" Margin="5" />
81+
<StackPanel Grid.Column="1" Orientation="Horizontal">
82+
<Button Name="SelectMsuButton"
83+
Margin="5"
84+
Content="{Binding SelectMsusText}"
85+
IsEnabled="{Binding IsSelectMsuEnabled}"
86+
IsVisible="{Binding IsSelectMsuButtonVisible}"
87+
Click="SelectMsuButton_OnClick"
88+
/>
89+
<Button Name="CancelButton"
90+
Margin="5"
91+
Content="_Cancel"
92+
IsEnabled="{Binding IsCancelEnabled}"
93+
IsVisible="{Binding IsCancelButtonVisible}"
94+
Click="CancelButton_OnClick"
95+
/>
96+
<Button Name="RandomMsuButton"
97+
Margin="5"
98+
Content="{Binding RandomMsuText}"
99+
IsEnabled="{Binding IsRandomMsuEnabled}"
100+
IsVisible="{Binding IsRandomMsuButtonVisible}"
101+
Click="RandomMsuButton_OnClick"
102+
/>
103+
<Button Name="ShuffledMsuButton"
104+
Margin="5"
105+
Content="Create _Shuffled MSU"
106+
IsEnabled="{Binding IsShuffledMsuEnabled}"
107+
IsVisible="{Binding IsShuffledMsuButtonVisible}"
108+
Click="ShuffledMsuButton_OnClick"
109+
/>
110+
<Button Name="ContinuousShuffleButton"
111+
Margin="5"
112+
Content="_Continuously Shuffled MSU"
113+
IsEnabled="{Binding IsContinuousShuffleEnabled}"
114+
IsVisible="{Binding IsContinuousShuffleButtonVisible}"
115+
Click="ContinuousShuffleButton_OnClick"
116+
/>
117+
</StackPanel>
118+
119+
</Grid>
120+
</controls:HeaderFooter>
117121
<views:MsuList Name="MsuList" />
118122
</DockPanel>
119123
</LayoutTransformControl>

‎MSURandomizerLibrary/MSURandomizerLibrary.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
<PackageRequireLicenseAcceptance>False</PackageRequireLicenseAcceptance>
1515
<IncludeSymbols>False</IncludeSymbols>
1616
<SymbolPackageFormat>snupkg</SymbolPackageFormat>
17-
<Version>2.0.0-alpha.1</Version>
17+
<Version>2.0.0-beta.1</Version>
1818
<PackageId>MattEqualsCoder.MSURandomizer.Library</PackageId>
1919
<GenerateDocumentationFile>True</GenerateDocumentationFile>
2020
<TargetFramework>net8.0</TargetFramework>

0 commit comments

Comments
 (0)