Skip to content

Commit 2d0508a

Browse files
memorydreammemorydream
committed
CP: update style
1 parent bffa982 commit 2d0508a

File tree

1 file changed

+144
-145
lines changed

1 file changed

+144
-145
lines changed

‎PearlCalculatorCP/Views/MainWindow.axaml‎

Lines changed: 144 additions & 145 deletions
Original file line numberDiff line numberDiff line change
@@ -82,171 +82,170 @@
8282
<ScaleTransform ScaleX="{Binding WindowScale}"
8383
ScaleY="{Binding WindowScale}" />
8484
</LayoutTransformControl.LayoutTransform>
85-
86-
<Grid ColumnDefinitions="2*, 2, 2*">
8785

88-
<Grid Column="0" ColumnDefinitions="*, Auto" RowDefinitions="Auto, *">
89-
<TabControl Grid.Row="0" Grid.RowSpan="2" Grid.Column="0" Grid.ColumnSpan="2">
90-
91-
<!--General FTL Group-->
92-
<TabItem Header="{i18n:Translate GeneralFTLHeader, Fallback='General FTL'}">
86+
<Grid ColumnDefinitions="2*, 2*">
9387

94-
<Border Classes="GlobalGeneralBorder" Margin="0, 5" Padding="4,0">
88+
<Grid Column="0" ColumnDefinitions="*, Auto" RowDefinitions="Auto, *">
89+
<TabControl Grid.Row="0" Grid.RowSpan="2" Grid.Column="0" Grid.ColumnSpan="2">
9590

96-
<TabControl>
91+
<!--General FTL Group-->
92+
<TabItem Header="{i18n:Translate GeneralFTLHeader, Fallback='General FTL'}">
9793

98-
<!--General-->
99-
<TabItem Header="{i18n:Translate GeneralFTLGeneralHeader, Fallback='General'}">
94+
<Border Classes="GlobalGeneralBorder" Margin="0, 5" Padding="4,0">
10095

101-
<StackPanel Spacing="8">
96+
<TabControl>
10297

103-
<StackPanel>
104-
<TextBlock Text="{i18n:Translate PearlPosX, Fallback='Pearl X :'}" Classes="InputBoxTB" />
105-
<NumericUpDown Value="{Binding PearlPosX}" />
106-
</StackPanel>
107-
108-
<StackPanel>
109-
<TextBlock Text="{i18n:Translate PearlPosZ, Fallback='Pearl Z :'}" Classes="InputBoxTB" />
110-
<NumericUpDown Value="{Binding PearlPosZ}" />
111-
</StackPanel>
112-
113-
<StackPanel>
114-
<TextBlock Text="{i18n:Translate DestinationX, Fallback='Destination X :'}" Classes="InputBoxTB" />
115-
<NumericUpDown Value="{Binding DestinationX}" />
116-
</StackPanel>
117-
118-
<StackPanel>
119-
<TextBlock Text="{i18n:Translate DestinationZ, Fallback='Destination Z :'}" Classes="InputBoxTB" />
120-
<NumericUpDown Value="{Binding DestinationZ}" />
121-
</StackPanel>
98+
<!--General-->
99+
<TabItem Header="{i18n:Translate GeneralFTLGeneralHeader, Fallback='General'}">
122100

123-
<StackPanel>
124-
<TextBlock Text="{i18n:Translate MaxTNT, Fallback='Max TNT :'}" Classes="InputBoxTB" />
125-
<NumericUpDown Value="{Binding MaxTNT}" ValueChanged="NumericUpDownToUInt_OnValueChanged" />
126-
</StackPanel>
101+
<StackPanel Spacing="8">
127102

128-
<Border Margin="12,4,12,0">
129-
<StackPanel Orientation="Horizontal" Spacing="60">
130-
<RadioButton IsChecked="{Binding Direction, Converter={StaticResource IsCheckedFormEnum}, ConverterParameter={x:Static libWorld:Direction.North}}" Content="North" GroupName="DirectionSelectGroup" Name="NorthRB" />
131-
<RadioButton IsChecked="{Binding Direction, Converter={StaticResource IsCheckedFormEnum}, ConverterParameter={x:Static libWorld:Direction.South}}" Content="South" GroupName="DirectionSelectGroup" Name="SouthRB" />
132-
<RadioButton IsChecked="{Binding Direction, Converter={StaticResource IsCheckedFormEnum}, ConverterParameter={x:Static libWorld:Direction.East}}" Content="East" GroupName="DirectionSelectGroup" Name="EastRB" />
133-
<RadioButton IsChecked="{Binding Direction, Converter={StaticResource IsCheckedFormEnum}, ConverterParameter={x:Static libWorld:Direction.West}}" Content="West" GroupName="DirectionSelectGroup" Name="WestRB" />
103+
<StackPanel>
104+
<TextBlock Text="{i18n:Translate PearlPosX, Fallback='Pearl X :'}" Classes="InputBoxTB" />
105+
<NumericUpDown Value="{Binding PearlPosX}" />
134106
</StackPanel>
135-
</Border>
136-
137-
<StackPanel>
138-
<TextBlock Text="{i18n:Translate RedTNT, Fallback='Red TNT :'}" Classes="InputBoxTB" />
139-
<NumericUpDown Value="{Binding RedTNT}" ValueChanged="NumericUpDownToUInt_OnValueChanged" />
140-
</StackPanel>
141107

142-
<StackPanel>
143-
<TextBlock Text="{i18n:Translate BlueTNT, Fallback='Blue TNT :'}" Classes="InputBoxTB" />
144-
<NumericUpDown Value="{Binding BlueTNT}" ValueChanged="NumericUpDownToUInt_OnValueChanged" />
145-
</StackPanel>
146-
147-
<StackPanel Spacing="2" Margin="0,4,0,0">
148-
<Button Classes="GeneralButtonStyle" Content="{i18n:Translate CalculateTNTAmount, Fallback='Calculate TNT Amount'}" Command="{Binding CalculateTNTAmount}" />
149-
<Button Classes="GeneralButtonStyle" Content="{i18n:Translate PearlSimulate, Fallback='Pearl Simulate'}" Command="{Binding PearlSimulate}" />
150-
<Button Classes="GeneralButtonStyle" Content="{i18n:Translate ImportSettings, Fallback='Import Settings'}" Click="ImportSettingsBtn_OnClick" />
151-
<Button Classes="GeneralButtonStyle" Content="{i18n:Translate SaveSettings, Fallback='Save Settings'}" Click="SaveSettingsBtn_OnClick" />
152-
</StackPanel>
108+
<StackPanel>
109+
<TextBlock Text="{i18n:Translate PearlPosZ, Fallback='Pearl Z :'}" Classes="InputBoxTB" />
110+
<NumericUpDown Value="{Binding PearlPosZ}" />
111+
</StackPanel>
153112

154-
</StackPanel>
113+
<StackPanel>
114+
<TextBlock Text="{i18n:Translate DestinationX, Fallback='Destination X :'}" Classes="InputBoxTB" />
115+
<NumericUpDown Value="{Binding DestinationX}" />
116+
</StackPanel>
155117

156-
</TabItem>
118+
<StackPanel>
119+
<TextBlock Text="{i18n:Translate DestinationZ, Fallback='Destination Z :'}" Classes="InputBoxTB" />
120+
<NumericUpDown Value="{Binding DestinationZ}" />
121+
</StackPanel>
157122

158-
<!--Advanced-->
159-
<TabItem Header="{i18n:Translate GeneralFTLAdvancedHeader, Fallback='Advanced'}">
160-
<gFTLComponents:Advance />
161-
</TabItem>
123+
<StackPanel>
124+
<TextBlock Text="{i18n:Translate MaxTNT, Fallback='Max TNT :'}" Classes="InputBoxTB" />
125+
<NumericUpDown Value="{Binding MaxTNT}" ValueChanged="NumericUpDownToUInt_OnValueChanged" />
126+
</StackPanel>
162127

163-
<!--Settings-->
164-
<TabItem Header="{i18n:Translate GeneralFTLSettingsHeader, Fallback='Settings'}">
165-
<gFTLComponents:MoreSettings />
166-
</TabItem>
128+
<Border Margin="12,4,12,0">
129+
<StackPanel Orientation="Horizontal" Spacing="60">
130+
<RadioButton IsChecked="{Binding Direction, Converter={StaticResource IsCheckedFormEnum}, ConverterParameter={x:Static libWorld:Direction.North}}" Content="North" GroupName="DirectionSelectGroup" Name="NorthRB" />
131+
<RadioButton IsChecked="{Binding Direction, Converter={StaticResource IsCheckedFormEnum}, ConverterParameter={x:Static libWorld:Direction.South}}" Content="South" GroupName="DirectionSelectGroup" Name="SouthRB" />
132+
<RadioButton IsChecked="{Binding Direction, Converter={StaticResource IsCheckedFormEnum}, ConverterParameter={x:Static libWorld:Direction.East}}" Content="East" GroupName="DirectionSelectGroup" Name="EastRB" />
133+
<RadioButton IsChecked="{Binding Direction, Converter={StaticResource IsCheckedFormEnum}, ConverterParameter={x:Static libWorld:Direction.West}}" Content="West" GroupName="DirectionSelectGroup" Name="WestRB" />
134+
</StackPanel>
135+
</Border>
136+
137+
<StackPanel>
138+
<TextBlock Text="{i18n:Translate RedTNT, Fallback='Red TNT :'}" Classes="InputBoxTB" />
139+
<NumericUpDown Value="{Binding RedTNT}" ValueChanged="NumericUpDownToUInt_OnValueChanged" />
140+
</StackPanel>
167141

168-
</TabControl>
142+
<StackPanel>
143+
<TextBlock Text="{i18n:Translate BlueTNT, Fallback='Blue TNT :'}" Classes="InputBoxTB" />
144+
<NumericUpDown Value="{Binding BlueTNT}" ValueChanged="NumericUpDownToUInt_OnValueChanged" />
145+
</StackPanel>
169146

170-
</Border>
147+
<StackPanel Spacing="2" Margin="0,4,0,0">
148+
<Button Classes="GeneralButtonStyle" Content="{i18n:Translate CalculateTNTAmount, Fallback='Calculate TNT Amount'}" Command="{Binding CalculateTNTAmount}" />
149+
<Button Classes="GeneralButtonStyle" Content="{i18n:Translate PearlSimulate, Fallback='Pearl Simulate'}" Command="{Binding PearlSimulate}" />
150+
<Button Classes="GeneralButtonStyle" Content="{i18n:Translate ImportSettings, Fallback='Import Settings'}" Click="ImportSettingsBtn_OnClick" />
151+
<Button Classes="GeneralButtonStyle" Content="{i18n:Translate SaveSettings, Fallback='Save Settings'}" Click="SaveSettingsBtn_OnClick" />
152+
</StackPanel>
171153

172-
</TabItem>
154+
</StackPanel>
173155

174-
<!--Manually-->
175-
<TabItem Header="{i18n:Translate ManuallyHeader, Fallback='Manually'}">
176-
<views:Manually />
177-
</TabItem>
178-
179-
</TabControl>
156+
</TabItem>
157+
158+
<!--Advanced-->
159+
<TabItem Header="{i18n:Translate GeneralFTLAdvancedHeader, Fallback='Advanced'}">
160+
<gFTLComponents:Advance />
161+
</TabItem>
162+
163+
<!--Settings-->
164+
<TabItem Header="{i18n:Translate GeneralFTLSettingsHeader, Fallback='Settings'}">
165+
<gFTLComponents:MoreSettings />
166+
</TabItem>
167+
168+
</TabControl>
169+
170+
</Border>
171+
172+
</TabItem>
173+
174+
<!--Manually-->
175+
<TabItem Header="{i18n:Translate ManuallyHeader, Fallback='Manually'}">
176+
<views:Manually />
177+
</TabItem>
178+
179+
</TabControl>
180+
181+
<!--More info btn-->
182+
<Button Grid.Row="0" Grid.Column="1" Name="MoreInfoBtn" Margin="12, 12" BorderThickness="0"
183+
PointerEnter="MoreInfoBtn_OnPointerEnter" PointerLeave="MoreInfoBtn_OnPointerLeave"
184+
Click="MoreInfoBtn_OnClick">
185+
186+
<Button.Styles>
187+
<Style Selector="Button">
188+
<Setter Property="Background" Value="Transparent" />
189+
</Style>
190+
191+
<Style Selector="Button:pointerover /template/ContentPresenter">
192+
<Setter Property="Background" Value="#66E0E0E0" />
193+
<Setter Property="BorderThickness" Value="0" />
194+
</Style>
195+
<Style Selector="Button:pressed /template/ContentPresenter">
196+
<Setter Property="Background" Value="#BBE0E0E0" />
197+
<Setter Property="BorderThickness" Value="0" />
198+
</Style>
199+
</Button.Styles>
200+
201+
<Button.Content>
202+
<StackPanel Spacing="2">
203+
<Ellipse Width="5" Height="5" Fill="{Binding MoreInfoBrush}" />
204+
<Ellipse Width="5" Height="5" Fill="{Binding MoreInfoBrush}" />
205+
<Ellipse Width="5" Height="5" Fill="{Binding MoreInfoBrush}" />
206+
</StackPanel>
207+
</Button.Content>
208+
209+
<Button.ContextMenu>
210+
<ContextMenu Background="White">
211+
<MenuItem Header="{i18n:Translate SetDefaultSettings, Fallback='Default settings'}" Click="SetDefaultSettings" />
212+
<MenuItem Header="{i18n:Translate VideoLink, Fallback='Video'}" Click="OpenVideoLink" IsEnabled="False" />
213+
<MenuItem Header="{i18n:Translate GithubLink, Fallback='Github'}" Click="OpenGithubLink" />
214+
<MenuItem Header="{i18n:Translate About, Fallback='About'}" Click="OpenAboutWindow" />
215+
<MenuItem Header="{i18n:Translate Languages, Fallback='Languages'}">
216+
<MenuItem Header="en" Command="{Binding ChangeLanguageOptional}" CommandParameter="en" />
217+
<MenuItem Header="中文(简体)" Command="{Binding ChangeLanguageOptional}" CommandParameter="zh_cn" />
218+
<MenuItem Header="中文(繁体)" Command="{Binding ChangeLanguageOptional}" CommandParameter="zh_tw" />
219+
220+
<MenuItem.Resources>
221+
<Color x:Key="MenuFlyoutPresenterBackground">White</Color>
222+
</MenuItem.Resources>
223+
224+
</MenuItem>
225+
</ContextMenu>
226+
</Button.ContextMenu>
227+
228+
</Button>
229+
230+
</Grid>
231+
232+
<Grid Column="1">
233+
<TabControl>
234+
235+
<!--Result Display-->
236+
<TabItem Header="{i18n:Translate DisplayHeader, Fallback='Display'}">
237+
<vc:ResultPanel Margin="0,5" />
238+
</TabItem>
239+
240+
<!--Console-->
241+
<TabItem Header="{i18n:Translate ConsoleHeader, Fallback='Console'}">
242+
<vc:ConsolePanel Margin="0, 5" />
243+
</TabItem>
244+
245+
</TabControl>
246+
</Grid>
180247

181-
<!--More info btn-->
182-
<Button Grid.Row="0" Grid.Column="1" Name="MoreInfoBtn" Margin="12, 12" BorderThickness="0"
183-
PointerEnter="MoreInfoBtn_OnPointerEnter" PointerLeave="MoreInfoBtn_OnPointerLeave"
184-
Click="MoreInfoBtn_OnClick">
185-
186-
<Button.Styles>
187-
<Style Selector="Button">
188-
<Setter Property="Background" Value="Transparent" />
189-
</Style>
190-
191-
<Style Selector="Button:pointerover /template/ContentPresenter">
192-
<Setter Property="Background" Value="#66E0E0E0" />
193-
<Setter Property="BorderThickness" Value="0" />
194-
</Style>
195-
<Style Selector="Button:pressed /template/ContentPresenter">
196-
<Setter Property="Background" Value="#BBE0E0E0" />
197-
<Setter Property="BorderThickness" Value="0" />
198-
</Style>
199-
</Button.Styles>
200-
201-
<Button.Content>
202-
<StackPanel Spacing="2">
203-
<Ellipse Width="5" Height="5" Fill="{Binding MoreInfoBrush}" />
204-
<Ellipse Width="5" Height="5" Fill="{Binding MoreInfoBrush}" />
205-
<Ellipse Width="5" Height="5" Fill="{Binding MoreInfoBrush}" />
206-
</StackPanel>
207-
</Button.Content>
208-
209-
<Button.ContextMenu>
210-
<ContextMenu Background="White">
211-
<MenuItem Header="{i18n:Translate SetDefaultSettings, Fallback='Default settings'}" Click="SetDefaultSettings" />
212-
<MenuItem Header="{i18n:Translate VideoLink, Fallback='Video'}" Click="OpenVideoLink" IsEnabled="False" />
213-
<MenuItem Header="{i18n:Translate GithubLink, Fallback='Github'}" Click="OpenGithubLink" />
214-
<MenuItem Header="{i18n:Translate About, Fallback='About'}" Click="OpenAboutWindow" />
215-
<MenuItem Header="{i18n:Translate Languages, Fallback='Languages'}">
216-
<MenuItem Header="en" Command="{Binding ChangeLanguageOptional}" CommandParameter="en" />
217-
<MenuItem Header="中文(简体)" Command="{Binding ChangeLanguageOptional}" CommandParameter="zh_cn" />
218-
<MenuItem Header="中文(繁体)" Command="{Binding ChangeLanguageOptional}" CommandParameter="zh_tw" />
219-
220-
<MenuItem.Resources>
221-
<Color x:Key="MenuFlyoutPresenterBackground">White</Color>
222-
</MenuItem.Resources>
223-
224-
</MenuItem>
225-
</ContextMenu>
226-
</Button.ContextMenu>
227-
228-
</Button>
229-
230-
</Grid>
231-
232-
<Grid Column="1" Background="{DynamicResource CPBorderBrush}" />
233-
234-
<Grid Column="2">
235-
<TabControl>
236-
237-
<!--Result Display-->
238-
<TabItem Header="{i18n:Translate DisplayHeader, Fallback='Display'}">
239-
<vc:ResultPanel Margin="0,5" />
240-
</TabItem>
241-
242-
<!--Console-->
243-
<TabItem Header="{i18n:Translate ConsoleHeader, Fallback='Console'}">
244-
<vc:ConsolePanel Margin="0, 5" />
245-
</TabItem>
246-
247-
</TabControl>
248248
</Grid>
249-
</Grid>
250249
</LayoutTransformControl>
251250

252251
</Window>

0 commit comments

Comments
 (0)