Subversion Repositories Projects

Compare Revisions

Ignore whitespace Rev 2371 → Rev 2372

/MKLiveView/v1.0/Source/MainWindow.xaml
823,7 → 823,7
</TabItem>
</TabControl>
</Grid>
<Grid x:Name="GridSettings" Background="#7B000000" HorizontalAlignment="Left" Width="233" Margin="23,36,0,0" Visibility="Collapsed">
<Grid x:Name="GridSettings" Background="#7B000000" HorizontalAlignment="Left" Width="233" Margin="23,36,0,0">
<TabControl x:Name="tabControlSettings" HorizontalAlignment="Left" Width="229" Background="{x:Null}" Margin="4,0,0,0">
<TabItem Header="General" Margin="0,0,5.849,0">
<Grid x:Name="TabGridGeneral">
850,7 → 850,7
</Grid>
</GroupBox>
<TextBox x:Name="tbSettingsCapa" HorizontalAlignment="Left" Height="21" Margin="74,457,0,0" TextWrapping="Wrap" Text="5000" VerticalAlignment="Top" Width="36" Visibility="Hidden"/>
<Button x:Name="buttonSwitchNC" Content="switch to NC" HorizontalAlignment="Left" Height="49" Margin="10,532,0,0" VerticalAlignment="Top" Width="112" Click="buttonSwitchNC_Click" Style="{StaticResource HideSwitchNCButton}" Tag="{Binding ElementName=tbCtrl}" FontSize="16"/>
<Button x:Name="buttonSwitchNC" Content="switch to NC" HorizontalAlignment="Left" Height="49" Margin="48,447,0,0" VerticalAlignment="Top" Width="112" Click="buttonSwitchNC_Click" Style="{StaticResource HideSwitchNCButton}" Tag="{Binding ElementName=tbCtrl}" FontSize="16" Visibility="Hidden" Background="#FFF7ACAC" BorderBrush="Red"/>
</Grid>
</TabItem>
<TabItem Header="Style" Margin="-6.849,0,-2.022,0">
934,7 → 934,7
</Label.Style>
</Label>
<Button x:Name="buttonUIScaleReset" Content="Reset" HorizontalAlignment="Left" Margin="14,248,0,0" VerticalAlignment="Top" Width="95" Click="buttonUIScaleReset_Click" Height="29"/>
<GroupBox x:Name="groupBox1" Header="Topbar items" Margin="14,325,10,0" Foreground="White" BorderThickness="0.5" Height="197" VerticalAlignment="Top">
<GroupBox x:Name="groupBox1" Header="Topbar items" Margin="14,323,10,0" Foreground="White" BorderThickness="0.5" Height="197" VerticalAlignment="Top">
<Grid Margin="0,0,0,0">
<CheckBox x:Name="chkBoxTopBarShowVoltage" Content="Voltage" Foreground="White" Margin="10,10,106,0" IsChecked="True" Height="18" VerticalAlignment="Top" />
<CheckBox x:Name="chkBoxTopBarShowCapacity" Content="Capacity" Foreground="White" Margin="10,26,106,0" IsChecked="True" Height="18" VerticalAlignment="Top" />
948,7 → 948,7
<CheckBox x:Name="chkBoxTopBarShowRC" Content="RC quality" Foreground="White" Margin="10,157,70,0" IsChecked="True" Height="18" VerticalAlignment="Top" />
</Grid>
</GroupBox>
<CheckBox x:Name="chkBoxShowHorizon" Content="Show Horizon/Heading" Foreground="White" Margin="14,541,64,0" IsChecked="True" Height="18" VerticalAlignment="Top" />
<CheckBox x:Name="chkBoxShowHorizon" Content="Show Horizon/Heading" Foreground="White" Margin="14,529,64,0" IsChecked="True" Height="18" VerticalAlignment="Top" />
<CheckBox x:Name="chkBoxSaveFullScreenState" Content="save fullscreen&#xD;&#xA;scalings" Foreground="White" Margin="119,285,0,0" IsChecked="True" Height="33" VerticalAlignment="Top" VerticalContentAlignment="Center" Click="chkBoxSaveFullScreenState_Click" />
<CheckBox x:Name="chkBoxSaveNormalState" Content="save normal&#xA;window scalings" Foreground="White" Margin="6,285,106,0" IsChecked="True" Height="33" VerticalAlignment="Top" VerticalContentAlignment="Center" Click="chkBoxSaveNormalState_Click" />
</Grid>
1068,9 → 1068,9
</GroupBox>
</Grid>
</TabItem>
<TabItem Header="Waypoints style" HorizontalAlignment="Left" Height="20" VerticalAlignment="Top" Width="104" Margin="-26.5,0,0,0">
<TabItem Header="Map elements style" HorizontalAlignment="Left" Height="20" VerticalAlignment="Top" Width="118" Margin="-19,0,0,0">
<Grid>
<Border Margin="0,10,0,0" BorderBrush="White" BorderThickness="0.5" CornerRadius="5" HorizontalAlignment="Right" Width="222" Height="206" VerticalAlignment="Top">
<Border Margin="0,10,0,0" BorderBrush="White" BorderThickness="0.5" CornerRadius="5" HorizontalAlignment="Right" Width="222" Height="263" VerticalAlignment="Top">
<Grid Margin="-0.5,-0.5,-0.5,1.5">
<ComboBox x:Name="comboBoxFSColor" Height="33" VerticalAlignment="Top" SelectedIndex="0" HorizontalContentAlignment="Center" VerticalContentAlignment="Center" FontSize="16" DropDownClosed="comboBoxFSColor_DropDownClosed" HorizontalAlignment="Right" Width="95" Margin="0,161,117,0">
<ComboBoxItem Content="red"/>
1104,7 → 1104,7
<ComboBoxItem Content="pink"/>
</ComboBox>
<Label x:Name="label4_Copy4" Content="Copter color" HorizontalAlignment="Right" Margin="0,3,134,0" VerticalAlignment="Top" Width="80" Foreground="White"/>
<ComboBox x:Name="comboBoxRouteColor" Height="33" VerticalAlignment="Top" SelectedIndex="4" HorizontalContentAlignment="Center" VerticalContentAlignment="Center" FontSize="16" HorizontalAlignment="Right" Width="95" Margin="0,161,12,0" DropDownClosed="comboBoxRouteColor_DropDownClosed">
<ComboBox x:Name="comboBoxRouteColor" Height="33" VerticalAlignment="Top" SelectedIndex="4" HorizontalContentAlignment="Center" VerticalContentAlignment="Center" FontSize="16" HorizontalAlignment="Right" Width="95" Margin="0,221,117,0" DropDownClosed="comboBoxRouteColor_DropDownClosed">
<ComboBoxItem Content="red"/>
<ComboBoxItem Content="green"/>
<ComboBoxItem Content="blue"/>
1111,7 → 1111,15
<ComboBoxItem Content="yellow"/>
<ComboBoxItem Content="pink"/>
</ComboBox>
<Label x:Name="label4_Copy10" Content="Route color" HorizontalAlignment="Right" Margin="0,135,28,0" VerticalAlignment="Top" Width="80" Foreground="White"/>
<Label x:Name="label4_Copy10" Content="Route color" HorizontalAlignment="Right" Margin="0,195,133,0" VerticalAlignment="Top" Width="80" Foreground="White"/>
<ComboBox x:Name="comboBoxLandingColor" Height="33" VerticalAlignment="Top" SelectedIndex="2" HorizontalContentAlignment="Center" VerticalContentAlignment="Center" FontSize="16" DropDownClosed="comboBoxLandingColor_DropDownClosed" HorizontalAlignment="Right" Width="95" Margin="0,161,12,0">
<ComboBoxItem Content="red"/>
<ComboBoxItem Content="green"/>
<ComboBoxItem Content="blue"/>
<ComboBoxItem Content="yellow"/>
<ComboBoxItem Content="pink"/>
</ComboBox>
<Label x:Name="label4_Copy31" Content="Landing color" HorizontalAlignment="Right" Margin="0,137,12,0" VerticalAlignment="Top" Width="96" Foreground="White"/>
 
</Grid>
</Border>
1179,7 → 1187,7
<Button x:Name="btnOSDEnter" Content="" HorizontalAlignment="Left" Height="34" Margin="87,90,0,0" VerticalAlignment="Top" Width="52" Click="btnOSDEnter_Click"/>
<Button x:Name="btnOSDLeave" Content="" HorizontalAlignment="Left" Height="34" Margin="144,90,0,0" VerticalAlignment="Top" Width="52" Click="btnOSDLeave_Click"/>
</Grid>
<Grid x:Name="GridWP" Margin="23,36,25,0" Background="#7F000000" Height="526" VerticalAlignment="Top">
<Grid x:Name="GridWP" Margin="23,36,25,0" Background="#7F000000" Height="526" VerticalAlignment="Top" Visibility="Collapsed">
<Label x:Name="label4" Content="points" HorizontalAlignment="Right" Margin="0,480,51,0" VerticalAlignment="Top" Width="53" Foreground="White" Height="19" HorizontalContentAlignment="Right" Padding="0" VerticalContentAlignment="Center" FontSize="13"/>
<Label x:Name="lblWPCount" Content="##" HorizontalAlignment="Right" Margin="0,482,19,0" VerticalAlignment="Top" Width="26" Foreground="White" HorizontalContentAlignment="Right" Padding="0" Height="16" FontSize="13"/>
<Label x:Name="label4_Copy" Content="WP Index" HorizontalAlignment="Left" Margin="94,194,0,0" VerticalAlignment="Top" Width="80" Foreground="White" Visibility="Hidden"/>
1296,6 → 1304,7
<ComboBoxItem Content="WP"/>
<ComboBoxItem Content="POI"/>
<ComboBoxItem Content="Failsafe"/>
<ComboBoxItem Content="Landing"/>
</ComboBox>
<Label x:Name="label4a" Content="Type" HorizontalAlignment="Left" Margin="11,6,0,0" Width="39" Foreground="White" Padding="0" Height="18" VerticalAlignment="Top"/>
<Label x:Name="label4b" Content="Prefix" HorizontalAlignment="Left" Margin="81,6,0,0" Width="35" Foreground="White" Padding="0" Height="18" VerticalAlignment="Top"/>