Rev 2369 | Show entire file | Ignore whitespace | Details | Blame | Last modification | View Log | RSS feed
Rev 2369 | Rev 2372 | ||
---|---|---|---|
Line 821... | Line 821... | ||
821 | 821 | ||
822 | </Grid> |
822 | </Grid> |
823 | </TabItem> |
823 | </TabItem> |
824 | </TabControl> |
824 | </TabControl> |
825 | </Grid> |
825 | </Grid> |
826 | <Grid x:Name="GridSettings" Background="#7B000000" HorizontalAlignment="Left" Width="233" Margin="23,36,0,0" Visibility="Collapsed"> |
826 | <Grid x:Name="GridSettings" Background="#7B000000" HorizontalAlignment="Left" Width="233" Margin="23,36,0,0"> |
827 | <TabControl x:Name="tabControlSettings" HorizontalAlignment="Left" Width="229" Background="{x:Null}" Margin="4,0,0,0"> |
827 | <TabControl x:Name="tabControlSettings" HorizontalAlignment="Left" Width="229" Background="{x:Null}" Margin="4,0,0,0"> |
828 | <TabItem Header="General" Margin="0,0,5.849,0"> |
828 | <TabItem Header="General" Margin="0,0,5.849,0"> |
829 | <Grid x:Name="TabGridGeneral"> |
829 | <Grid x:Name="TabGridGeneral"> |
830 | <local:SerialPortCtrl x:Name="serialPortCtrl" HorizontalAlignment="Left" Height="256" Margin="11,5,0,0" VerticalAlignment="Top" Width="210"/> |
830 | <local:SerialPortCtrl x:Name="serialPortCtrl" HorizontalAlignment="Left" Height="256" Margin="11,5,0,0" VerticalAlignment="Top" Width="210"/> |
Line 848... | Line 848... | ||
848 | <Label x:Name="label_Copy5" Content="Motors" HorizontalAlignment="Left" Margin="111,122,0,-30.62" VerticalAlignment="Top" Foreground="White" Padding="0" Width="51"/> |
848 | <Label x:Name="label_Copy5" Content="Motors" HorizontalAlignment="Left" Margin="111,122,0,-30.62" VerticalAlignment="Top" Foreground="White" Padding="0" Width="51"/> |
849 | <ComboBox x:Name="cBoxMotors" HorizontalAlignment="Left" Height="23" Margin="160,120,0,-33.62" VerticalAlignment="Top" Width="47" Padding="6,0,0,0" DropDownClosed="cBoxMotors_DropDownClosed"/> |
849 | <ComboBox x:Name="cBoxMotors" HorizontalAlignment="Left" Height="23" Margin="160,120,0,-33.62" VerticalAlignment="Top" Width="47" Padding="6,0,0,0" DropDownClosed="cBoxMotors_DropDownClosed"/> |
850 | </Grid> |
850 | </Grid> |
851 | </GroupBox> |
851 | </GroupBox> |
852 | <TextBox x:Name="tbSettingsCapa" HorizontalAlignment="Left" Height="21" Margin="74,457,0,0" TextWrapping="Wrap" Text="5000" VerticalAlignment="Top" Width="36" Visibility="Hidden"/> |
852 | <TextBox x:Name="tbSettingsCapa" HorizontalAlignment="Left" Height="21" Margin="74,457,0,0" TextWrapping="Wrap" Text="5000" VerticalAlignment="Top" Width="36" Visibility="Hidden"/> |
853 | <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"/> |
853 | <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"/> |
854 | </Grid> |
854 | </Grid> |
855 | </TabItem> |
855 | </TabItem> |
856 | <TabItem Header="Style" Margin="-6.849,0,-2.022,0"> |
856 | <TabItem Header="Style" Margin="-6.849,0,-2.022,0"> |
857 | <Grid x:Name="TabGridStyle"> |
857 | <Grid x:Name="TabGridStyle"> |
858 | <Label x:Name="label_Copy6" Content="Main window scale" HorizontalAlignment="Left" Margin="9,7,0,0" VerticalAlignment="Top" Foreground="White" Padding="0" Width="122"/> |
858 | <Label x:Name="label_Copy6" Content="Main window scale" HorizontalAlignment="Left" Margin="9,7,0,0" VerticalAlignment="Top" Foreground="White" Padding="0" Width="122"/> |
Line 932... | Line 932... | ||
932 | </Style.Triggers> |
932 | </Style.Triggers> |
933 | </Style> |
933 | </Style> |
934 | </Label.Style> |
934 | </Label.Style> |
935 | </Label> |
935 | </Label> |
936 | <Button x:Name="buttonUIScaleReset" Content="Reset" HorizontalAlignment="Left" Margin="14,248,0,0" VerticalAlignment="Top" Width="95" Click="buttonUIScaleReset_Click" Height="29"/> |
936 | <Button x:Name="buttonUIScaleReset" Content="Reset" HorizontalAlignment="Left" Margin="14,248,0,0" VerticalAlignment="Top" Width="95" Click="buttonUIScaleReset_Click" Height="29"/> |
937 | <GroupBox x:Name="groupBox1" Header="Topbar items" Margin="14,325,10,0" Foreground="White" BorderThickness="0.5" Height="197" VerticalAlignment="Top"> |
937 | <GroupBox x:Name="groupBox1" Header="Topbar items" Margin="14,323,10,0" Foreground="White" BorderThickness="0.5" Height="197" VerticalAlignment="Top"> |
938 | <Grid Margin="0,0,0,0"> |
938 | <Grid Margin="0,0,0,0"> |
939 | <CheckBox x:Name="chkBoxTopBarShowVoltage" Content="Voltage" Foreground="White" Margin="10,10,106,0" IsChecked="True" Height="18" VerticalAlignment="Top" /> |
939 | <CheckBox x:Name="chkBoxTopBarShowVoltage" Content="Voltage" Foreground="White" Margin="10,10,106,0" IsChecked="True" Height="18" VerticalAlignment="Top" /> |
940 | <CheckBox x:Name="chkBoxTopBarShowCapacity" Content="Capacity" Foreground="White" Margin="10,26,106,0" IsChecked="True" Height="18" VerticalAlignment="Top" /> |
940 | <CheckBox x:Name="chkBoxTopBarShowCapacity" Content="Capacity" Foreground="White" Margin="10,26,106,0" IsChecked="True" Height="18" VerticalAlignment="Top" /> |
941 | <CheckBox x:Name="chkBoxTopBarShowCurrent" Content="Current" Foreground="White" Margin="10,42,106,0" IsChecked="True" Height="18" VerticalAlignment="Top" /> |
941 | <CheckBox x:Name="chkBoxTopBarShowCurrent" Content="Current" Foreground="White" Margin="10,42,106,0" IsChecked="True" Height="18" VerticalAlignment="Top" /> |
942 | <CheckBox x:Name="chkBoxTopBarShowFlightTime" Content="FlightTime" Foreground="White" Margin="10,58,82,0" IsChecked="True" Height="18" VerticalAlignment="Top" /> |
942 | <CheckBox x:Name="chkBoxTopBarShowFlightTime" Content="FlightTime" Foreground="White" Margin="10,58,82,0" IsChecked="True" Height="18" VerticalAlignment="Top" /> |
Line 946... | Line 946... | ||
946 | <CheckBox x:Name="chkBoxTopBarShowMF" Content="Magnetic field" Foreground="White" Margin="10,124,70,-2" IsChecked="True" Height="18" VerticalAlignment="Top" /> |
946 | <CheckBox x:Name="chkBoxTopBarShowMF" Content="Magnetic field" Foreground="White" Margin="10,124,70,-2" IsChecked="True" Height="18" VerticalAlignment="Top" /> |
947 | <CheckBox x:Name="chkBoxTopBarShowSatellites" Content="Satellites" Foreground="White" Margin="10,141,70,0" IsChecked="True" Height="18" VerticalAlignment="Top" /> |
947 | <CheckBox x:Name="chkBoxTopBarShowSatellites" Content="Satellites" Foreground="White" Margin="10,141,70,0" IsChecked="True" Height="18" VerticalAlignment="Top" /> |
948 | <CheckBox x:Name="chkBoxTopBarShowRC" Content="RC quality" Foreground="White" Margin="10,157,70,0" IsChecked="True" Height="18" VerticalAlignment="Top" /> |
948 | <CheckBox x:Name="chkBoxTopBarShowRC" Content="RC quality" Foreground="White" Margin="10,157,70,0" IsChecked="True" Height="18" VerticalAlignment="Top" /> |
949 | </Grid> |
949 | </Grid> |
950 | </GroupBox> |
950 | </GroupBox> |
951 | <CheckBox x:Name="chkBoxShowHorizon" Content="Show Horizon/Heading" Foreground="White" Margin="14,541,64,0" IsChecked="True" Height="18" VerticalAlignment="Top" /> |
951 | <CheckBox x:Name="chkBoxShowHorizon" Content="Show Horizon/Heading" Foreground="White" Margin="14,529,64,0" IsChecked="True" Height="18" VerticalAlignment="Top" /> |
952 | <CheckBox x:Name="chkBoxSaveFullScreenState" Content="save fullscreen
scalings" Foreground="White" Margin="119,285,0,0" IsChecked="True" Height="33" VerticalAlignment="Top" VerticalContentAlignment="Center" Click="chkBoxSaveFullScreenState_Click" /> |
952 | <CheckBox x:Name="chkBoxSaveFullScreenState" Content="save fullscreen
scalings" Foreground="White" Margin="119,285,0,0" IsChecked="True" Height="33" VerticalAlignment="Top" VerticalContentAlignment="Center" Click="chkBoxSaveFullScreenState_Click" /> |
953 | <CheckBox x:Name="chkBoxSaveNormalState" Content="save normal
window scalings" Foreground="White" Margin="6,285,106,0" IsChecked="True" Height="33" VerticalAlignment="Top" VerticalContentAlignment="Center" Click="chkBoxSaveNormalState_Click" /> |
953 | <CheckBox x:Name="chkBoxSaveNormalState" Content="save normal
window scalings" Foreground="White" Margin="6,285,106,0" IsChecked="True" Height="33" VerticalAlignment="Top" VerticalContentAlignment="Center" Click="chkBoxSaveNormalState_Click" /> |
954 | </Grid> |
954 | </Grid> |
955 | </TabItem> |
955 | </TabItem> |
956 | <TabItem Header="Map" Height="20" VerticalAlignment="Top" Margin="1.022,0,-4,0"> |
956 | <TabItem Header="Map" Height="20" VerticalAlignment="Top" Margin="1.022,0,-4,0"> |
Line 1066... | Line 1066... | ||
1066 | 1066 | ||
1067 | </Grid> |
1067 | </Grid> |
1068 | </GroupBox> |
1068 | </GroupBox> |
1069 | </Grid> |
1069 | </Grid> |
1070 | </TabItem> |
1070 | </TabItem> |
1071 | <TabItem Header="Waypoints style" HorizontalAlignment="Left" Height="20" VerticalAlignment="Top" Width="104" Margin="-26.5,0,0,0"> |
1071 | <TabItem Header="Map elements style" HorizontalAlignment="Left" Height="20" VerticalAlignment="Top" Width="118" Margin="-19,0,0,0"> |
1072 | <Grid> |
1072 | <Grid> |
1073 | <Border Margin="0,10,0,0" BorderBrush="White" BorderThickness="0.5" CornerRadius="5" HorizontalAlignment="Right" Width="222" Height="206" VerticalAlignment="Top"> |
1073 | <Border Margin="0,10,0,0" BorderBrush="White" BorderThickness="0.5" CornerRadius="5" HorizontalAlignment="Right" Width="222" Height="263" VerticalAlignment="Top"> |
1074 | <Grid Margin="-0.5,-0.5,-0.5,1.5"> |
1074 | <Grid Margin="-0.5,-0.5,-0.5,1.5"> |
1075 | <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"> |
1075 | <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"> |
1076 | <ComboBoxItem Content="red"/> |
1076 | <ComboBoxItem Content="red"/> |
1077 | <ComboBoxItem Content="green"/> |
1077 | <ComboBoxItem Content="green"/> |
Line 1102... | Line 1102... | ||
1102 | <ComboBoxItem Content="blue"/> |
1102 | <ComboBoxItem Content="blue"/> |
1103 | <ComboBoxItem Content="yellow"/> |
1103 | <ComboBoxItem Content="yellow"/> |
1104 | <ComboBoxItem Content="pink"/> |
1104 | <ComboBoxItem Content="pink"/> |
1105 | </ComboBox> |
1105 | </ComboBox> |
1106 | <Label x:Name="label4_Copy4" Content="Copter color" HorizontalAlignment="Right" Margin="0,3,134,0" VerticalAlignment="Top" Width="80" Foreground="White"/> |
1106 | <Label x:Name="label4_Copy4" Content="Copter color" HorizontalAlignment="Right" Margin="0,3,134,0" VerticalAlignment="Top" Width="80" Foreground="White"/> |
1107 | <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"> |
1107 | <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"> |
1108 | <ComboBoxItem Content="red"/> |
1108 | <ComboBoxItem Content="red"/> |
1109 | <ComboBoxItem Content="green"/> |
1109 | <ComboBoxItem Content="green"/> |
1110 | <ComboBoxItem Content="blue"/> |
1110 | <ComboBoxItem Content="blue"/> |
1111 | <ComboBoxItem Content="yellow"/> |
1111 | <ComboBoxItem Content="yellow"/> |
1112 | <ComboBoxItem Content="pink"/> |
1112 | <ComboBoxItem Content="pink"/> |
1113 | </ComboBox> |
1113 | </ComboBox> |
1114 | <Label x:Name="label4_Copy10" Content="Route color" HorizontalAlignment="Right" Margin="0,135,28,0" VerticalAlignment="Top" Width="80" Foreground="White"/> |
1114 | <Label x:Name="label4_Copy10" Content="Route color" HorizontalAlignment="Right" Margin="0,195,133,0" VerticalAlignment="Top" Width="80" Foreground="White"/> |
- | 1115 | <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"> |
|
- | 1116 | <ComboBoxItem Content="red"/> |
|
- | 1117 | <ComboBoxItem Content="green"/> |
|
- | 1118 | <ComboBoxItem Content="blue"/> |
|
- | 1119 | <ComboBoxItem Content="yellow"/> |
|
- | 1120 | <ComboBoxItem Content="pink"/> |
|
- | 1121 | </ComboBox> |
|
- | 1122 | <Label x:Name="label4_Copy31" Content="Landing color" HorizontalAlignment="Right" Margin="0,137,12,0" VerticalAlignment="Top" Width="96" Foreground="White"/> |
|
Line 1115... | Line 1123... | ||
1115 | 1123 | ||
1116 | </Grid> |
1124 | </Grid> |
Line 1117... | Line 1125... | ||
1117 | </Border> |
1125 | </Border> |
Line 1177... | Line 1185... | ||
1177 | <Button x:Name="btnOSDForward" Content="Æ" HorizontalAlignment="Left" Height="34" Margin="203,5,0,0" VerticalAlignment="Top" Width="47" FontFamily="Wingdings 3" Click="btnOSDForward_Click"/> |
1185 | <Button x:Name="btnOSDForward" Content="Æ" HorizontalAlignment="Left" Height="34" Margin="203,5,0,0" VerticalAlignment="Top" Width="47" FontFamily="Wingdings 3" Click="btnOSDForward_Click"/> |
1178 | <Label x:Name="label_Copy7" Content="Page" HorizontalAlignment="Left" Margin="205,78,0,0" VerticalAlignment="Top" Foreground="White" Padding="0" Width="47"/> |
1186 | <Label x:Name="label_Copy7" Content="Page" HorizontalAlignment="Left" Margin="205,78,0,0" VerticalAlignment="Top" Foreground="White" Padding="0" Width="47"/> |
1179 | <Button x:Name="btnOSDEnter" Content="" HorizontalAlignment="Left" Height="34" Margin="87,90,0,0" VerticalAlignment="Top" Width="52" Click="btnOSDEnter_Click"/> |
1187 | <Button x:Name="btnOSDEnter" Content="" HorizontalAlignment="Left" Height="34" Margin="87,90,0,0" VerticalAlignment="Top" Width="52" Click="btnOSDEnter_Click"/> |
1180 | <Button x:Name="btnOSDLeave" Content="" HorizontalAlignment="Left" Height="34" Margin="144,90,0,0" VerticalAlignment="Top" Width="52" Click="btnOSDLeave_Click"/> |
1188 | <Button x:Name="btnOSDLeave" Content="" HorizontalAlignment="Left" Height="34" Margin="144,90,0,0" VerticalAlignment="Top" Width="52" Click="btnOSDLeave_Click"/> |
1181 | </Grid> |
1189 | </Grid> |
1182 | <Grid x:Name="GridWP" Margin="23,36,25,0" Background="#7F000000" Height="526" VerticalAlignment="Top"> |
1190 | <Grid x:Name="GridWP" Margin="23,36,25,0" Background="#7F000000" Height="526" VerticalAlignment="Top" Visibility="Collapsed"> |
1183 | <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"/> |
1191 | <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"/> |
1184 | <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"/> |
1192 | <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"/> |
1185 | <Label x:Name="label4_Copy" Content="WP Index" HorizontalAlignment="Left" Margin="94,194,0,0" VerticalAlignment="Top" Width="80" Foreground="White" Visibility="Hidden"/> |
1193 | <Label x:Name="label4_Copy" Content="WP Index" HorizontalAlignment="Left" Margin="94,194,0,0" VerticalAlignment="Top" Width="80" Foreground="White" Visibility="Hidden"/> |
1186 | <Label x:Name="lblWPIndex" Content="##" HorizontalAlignment="Left" Margin="170,194,0,0" VerticalAlignment="Top" Width="28" Foreground="White" Visibility="Hidden"/> |
1194 | <Label x:Name="lblWPIndex" Content="##" HorizontalAlignment="Left" Margin="170,194,0,0" VerticalAlignment="Top" Width="28" Foreground="White" Visibility="Hidden"/> |
1187 | <Border Margin="10,456,0,3" BorderBrush="White" BorderThickness="0.5" CornerRadius="5" HorizontalAlignment="Left" Width="640"> |
1195 | <Border Margin="10,456,0,3" BorderBrush="White" BorderThickness="0.5" CornerRadius="5" HorizontalAlignment="Left" Width="640"> |
Line 1294... | Line 1302... | ||
1294 | <Grid Margin="-0.5,-0.5,-0.5,4.5"> |
1302 | <Grid Margin="-0.5,-0.5,-0.5,4.5"> |
1295 | <ComboBox x:Name="cbWPEditType" HorizontalAlignment="Left" Height="22" Margin="10,24,0,0" VerticalAlignment="Top" Width="66"> |
1303 | <ComboBox x:Name="cbWPEditType" HorizontalAlignment="Left" Height="22" Margin="10,24,0,0" VerticalAlignment="Top" Width="66"> |
1296 | <ComboBoxItem Content="WP"/> |
1304 | <ComboBoxItem Content="WP"/> |
1297 | <ComboBoxItem Content="POI"/> |
1305 | <ComboBoxItem Content="POI"/> |
1298 | <ComboBoxItem Content="Failsafe"/> |
1306 | <ComboBoxItem Content="Failsafe"/> |
- | 1307 | <ComboBoxItem Content="Landing"/> |
|
1299 | </ComboBox> |
1308 | </ComboBox> |
1300 | <Label x:Name="label4a" Content="Type" HorizontalAlignment="Left" Margin="11,6,0,0" Width="39" Foreground="White" Padding="0" Height="18" VerticalAlignment="Top"/> |
1309 | <Label x:Name="label4a" Content="Type" HorizontalAlignment="Left" Margin="11,6,0,0" Width="39" Foreground="White" Padding="0" Height="18" VerticalAlignment="Top"/> |
1301 | <Label x:Name="label4b" Content="Prefix" HorizontalAlignment="Left" Margin="81,6,0,0" Width="35" Foreground="White" Padding="0" Height="18" VerticalAlignment="Top"/> |
1310 | <Label x:Name="label4b" Content="Prefix" HorizontalAlignment="Left" Margin="81,6,0,0" Width="35" Foreground="White" Padding="0" Height="18" VerticalAlignment="Top"/> |
1302 | <TextBox x:Name="tbWPEditPrefix" HorizontalAlignment="Left" Height="22" Margin="81,24,0,0" VerticalAlignment="Top" Width="29" IsUndoEnabled="False" MaxLines="1" MaxLength="1" Foreground="White" Background="{x:Null}" VerticalContentAlignment="Center" IsTabStop="False"/> |
1311 | <TextBox x:Name="tbWPEditPrefix" HorizontalAlignment="Left" Height="22" Margin="81,24,0,0" VerticalAlignment="Top" Width="29" IsUndoEnabled="False" MaxLines="1" MaxLength="1" Foreground="White" Background="{x:Null}" VerticalContentAlignment="Center" IsTabStop="False"/> |
1303 | <Label x:Name="label4_Copy16" Content="Latitude" HorizontalAlignment="Left" Margin="115,6,0,0" Width="54" Foreground="White" Padding="0" Height="18" VerticalAlignment="Top"/> |
1312 | <Label x:Name="label4_Copy16" Content="Latitude" HorizontalAlignment="Left" Margin="115,6,0,0" Width="54" Foreground="White" Padding="0" Height="18" VerticalAlignment="Top"/> |