Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Feature/76 fix radio panel headers #83

Merged
merged 1 commit into from
Nov 27, 2023
Merged

Feature/76 fix radio panel headers #83

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
10 changes: 5 additions & 5 deletions DCS-SR-Client/UI/RadioOverlayWindow/RadioOverlayFiveHorizontal.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,18 +50,18 @@
HorizontalAlignment="Right"
Orientation="Horizontal">
<TextBlock Name="ControlText"
Width="665"
Height="16"
Width="605"
Height="12"
Margin="5,0,0,0"
VerticalAlignment="Center"
FontSize="13"
FontSize="8"
Foreground="#E7E7E7"
Padding="0"
Text="5 Radio Panel Horizontal" />
Text="5 Radio Panel" />
<TextBlock Name="ControlSubText"
Width="100"
Text="VNGD is best"
FontSize="11"
FontSize="8"
TextAlignment="Center"
VerticalAlignment="Center"
Foreground="#E7E7E7"
Expand Down
4 changes: 2 additions & 2 deletions DCS-SR-Client/UI/RadioOverlayWindow/RadioOverlayOneHorizontal.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,11 +54,11 @@
FontSize="8"
Foreground="#E7E7E7"
Padding="0"
Text="1 Radio Panel Horizontal" />
Text="1 Radio Panel" />
<TextBlock Name="ControlSubText"
Width="100"
Text="VNGD is best"
FontSize="11"
FontSize="8"
TextAlignment="Center"
VerticalAlignment="Center"
Foreground="#E7E7E7"
Expand Down
6 changes: 3 additions & 3 deletions DCS-SR-Client/UI/RadioOverlayWindow/RadioOverlayOneVertical.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,19 +36,19 @@
Width="118"
Height="12"
Margin="5,0,0,0"
VerticalAlignment="Top"
VerticalAlignment="Center"
FontSize="8"
Foreground="#E7E7E7"
Padding="0"
Text="" />
Text="1 Radio Panel" />
<Button Margin="0,0,0,0"
Click="Button_About"
Style="{StaticResource DarkStyle-Button}">
<Button.Content>
<Grid Width="10" Height="10">
<TextBlock HorizontalAlignment="Center"
VerticalAlignment="Center"
FontWeight="Bold"
FontWeight="Bold"
FontSize="10"
Padding="0"
Text="?" />
Expand Down
10 changes: 5 additions & 5 deletions DCS-SR-Client/UI/RadioOverlayWindow/RadioOverlayTenHorizontal.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
<ColumnDefinition Width="1*" />
</Grid.ColumnDefinitions>
<Grid.RowDefinitions>
<RowDefinition Height="20" />
<RowDefinition Height="16" />
<RowDefinition />
<RowDefinition />
<RowDefinition Height="35" />
Expand All @@ -52,17 +52,17 @@
Orientation="Horizontal">
<TextBlock Name="ControlText"
Width="608"
Height="16"
Height="12"
Margin="5,0,0,0"
VerticalAlignment="Center"
FontSize="13"
FontSize="8"
Foreground="#E7E7E7"
Padding="0"
Text="10 Horizontal" />
Text="10 Radio Panel" />
<TextBlock Name="ControlSubText"
Width="100"
Text="VNGD is best"
FontSize="11"
FontSize="8"
TextAlignment="Center"
VerticalAlignment="Center"
Foreground="#E7E7E7"
Expand Down
8 changes: 4 additions & 4 deletions DCS-SR-Client/UI/RadioOverlayWindow/RadioOverlayTenHorizontalWide.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,17 +56,17 @@
Orientation="Horizontal">
<TextBlock Name="ControlText"
Width="1510"
Height="16"
Height="12"
Margin="5,0,0,0"
VerticalAlignment="Center"
FontSize="13"
FontSize="8"
Foreground="#E7E7E7"
Padding="0"
Text="10 Radio Panel - Ultrawide" />
<TextBlock Name="ControlSubText"
Width="100"
Text="VNGD is best"
FontSize="11"
FontSize="8"
TextAlignment="Center"
VerticalAlignment="Center"
Foreground="#E7E7E7"
Expand Down Expand Up @@ -177,7 +177,7 @@

<awacsOverlayWindow:IntercomControlGroup x:Name="intercom"
Margin="0,0,0,0"
HorizontalAlignment="Left"
HorizontalAlignment="Center"
RadioId="0" />

<StackPanel
Expand Down
15 changes: 8 additions & 7 deletions DCS-SR-Client/UI/RadioOverlayWindow/RadioOverlayTenVertical.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
<ColumnDefinition Width="1*" />
</Grid.ColumnDefinitions>
<Grid.RowDefinitions>
<RowDefinition Height="20" />
<RowDefinition Height="16" />
<RowDefinition />
<RowDefinition />
<RowDefinition />
Expand All @@ -52,13 +52,13 @@
Orientation="Horizontal">
<TextBlock Name="ControlText"
Width="250"
Height="16"
Height="12"
Margin="5,0,0,0"
VerticalAlignment="Center"
FontSize="13"
FontSize="8"
Foreground="#E7E7E7"
Padding="0"
Text="10 Vertical" />
Text="10 Radio Panel" />
<TextBlock Name="Orientation"
Width="28"
Height="12"
Expand All @@ -69,9 +69,10 @@
Padding="0"
Text="Vertical" />
<Button Margin="0,0,0,0"
Click="Button_Swap_Orientation"
Style="{StaticResource DarkStyle-Button}"
ToolTip="Swap to horizon orientation">
Height="15"
Click="Button_Swap_Orientation"
Style="{StaticResource DarkStyle-Button}"
ToolTip="Swap to horizon orientation">
<Button.Content>
<Grid Width="10" Height="10">
<Image Source="../../SRS_Orientation_Toggle.png" />
Expand Down
4 changes: 2 additions & 2 deletions DCS-SR-Client/UI/RadioOverlayWindow/RadioOverlayTenVerticalLong.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@

</Grid.ColumnDefinitions>
<Grid.RowDefinitions>
<RowDefinition Height="12" />
<RowDefinition Height="16" />
<RowDefinition Height="80"/>
<RowDefinition Height="80"/>
<RowDefinition Height="80"/>
Expand Down Expand Up @@ -63,7 +63,7 @@
FontSize="8"
Foreground="#E7E7E7"
Padding="0"
Text="10 Vertical" />
Text="10 Radio Panel" />
<Button Height="15"
Margin="0,0,0,0"
VerticalAlignment="Center"
Expand Down
10 changes: 5 additions & 5 deletions DCS-SR-Client/UI/RadioOverlayWindow/RadioOverlayThreeHorizontal.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@
Name="RadioOverlayWin"
Title="DCS-SimpleRadio"
Width="510"
Height="130"
Height="117"
MinWidth="510"
MinHeight="130"
MinHeight="117"
AllowsTransparency="True"
Background="#444"
Opacity="1.0"
Expand Down Expand Up @@ -36,9 +36,9 @@
<ColumnDefinition Width="1*" />
</Grid.ColumnDefinitions>
<Grid.RowDefinitions>
<RowDefinition Height="16" />
<RowDefinition Height="80" />
<RowDefinition Height="20" />
<RowDefinition />
<RowDefinition Height="25" />

</Grid.RowDefinitions>

Expand All @@ -57,7 +57,7 @@
<TextBlock Name="ControlSubText"
Width="100"
Text="VNGD is best"
FontSize="11"
FontSize="8"
TextAlignment="Center"
VerticalAlignment="Center"
Foreground="#E7E7E7"
Expand Down
2 changes: 1 addition & 1 deletion DCS-SR-Client/UI/RadioOverlayWindow/RadioOverlayThreeVertical.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@
<Grid Width="10" Height="10">
<TextBlock HorizontalAlignment="Center"
VerticalAlignment="Center"
FontWeight="Bold"
FontWeight="Bold"
FontSize="10"
Padding="0"
Text="?" />
Expand Down
1 change: 1 addition & 0 deletions DCS-SR-Client/UI/RadioOverlayWindow/RadioOverlayTwoHorizontal.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,7 @@
Width="80"
Text="VNGD is best"
FontSize="8"
Height="12"
TextAlignment="Center"
VerticalAlignment="Center"
Foreground="#E7E7E7"
Expand Down
2 changes: 1 addition & 1 deletion DCS-SR-Client/UI/RadioOverlayWindow/RadioOverlayTwoVertical.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@
<local:IntercomControlGroup x:Name="Intercom" RadioId="0" />
<Separator Width="170" Margin="0 2" />

<TextBlock x:Name="RadioLabel"
<TextBlock
Margin="5,0,0,0"
Width="60"
HorizontalAlignment="Center"
Expand Down
Loading