Subversion Repositories Projects

Rev

Rev 2405 | Show entire file | Ignore whitespace | Details | Blame | Last modification | View Log | RSS feed

Rev 2405 Rev 2408
Line 592... Line 592...
592 
                            </Style.Triggers>
 592 
                            </Style.Triggers>
593 
                        </Style>
 593 
                        </Style>
594 
                    </Label.Style>
 594 
                    </Label.Style>
595 
                </Label>
 595 
                </Label>
596 
            </Grid>
 596 
            </Grid>
597 
            <Grid x:Name="GridData" Background="#7F000000" HorizontalAlignment="Left" Width="204" Margin="23,36,0,0" >
 597 
            <Grid x:Name="GridData" Background="#7F000000" HorizontalAlignment="Left" Width="204" Margin="23,36,0,0" Visibility="Collapsed" >
598 
                <TabControl x:Name="tabControl" HorizontalAlignment="Left" Height="619" VerticalAlignment="Top" Width="200" Background="{x:Null}" Margin="2,0,0,0">
 598 
                <TabControl x:Name="tabControl" HorizontalAlignment="Left" Height="619" VerticalAlignment="Top" Width="200" Background="{x:Null}" Margin="2,0,0,0">
599 
                    <TabItem Header="Analog">
 599 
                    <TabItem Header="Analog">
600 
                        <Grid>
 600 
                        <Grid>
601 
                            <TextBlock x:Name="tbVolt" HorizontalAlignment="Left" Height="23" Margin="110,42,0,0" TextWrapping="Wrap" Text="NA" VerticalAlignment="Top" Width="65" Foreground="White" FontSize="16"/>
 601 
                            <TextBlock x:Name="tbVolt" HorizontalAlignment="Left" Height="23" Margin="110,42,0,0" TextWrapping="Wrap" Text="NA" VerticalAlignment="Top" Width="65" Foreground="White" FontSize="16"/>
602 
                            <TextBlock x:Name="tbCur" HorizontalAlignment="Left" Height="23" Margin="110,60,0,0" TextWrapping="Wrap" Text="NA" VerticalAlignment="Top" Width="65" Foreground="White" FontSize="16"/>
 602 
                            <TextBlock x:Name="tbCur" HorizontalAlignment="Left" Height="23" Margin="110,60,0,0" TextWrapping="Wrap" Text="NA" VerticalAlignment="Top" Width="65" Foreground="White" FontSize="16"/>
Line 838... Line 838...
838 
 
 838 
 
839 
                        </Grid>
 839 
                        </Grid>
840 
                    </TabItem>
 840 
                    </TabItem>
841 
                </TabControl>
 841 
                </TabControl>
842 
            </Grid>
 842 
            </Grid>
843 
            <Grid x:Name="GridSettings" Background="#7B000000" HorizontalAlignment="Left" Width="233" Margin="23,36,0,0" Visibility="Collapsed">
 843 
            <Grid x:Name="GridSettings" Background="#7B000000" HorizontalAlignment="Left" Width="233" Margin="23,36,0,0">
844 
                <TabControl x:Name="tabControlSettings" HorizontalAlignment="Left" Width="229" Background="{x:Null}" Margin="4,0,0,0">
 844 
                <TabControl x:Name="tabControlSettings" HorizontalAlignment="Left" Width="229" Background="{x:Null}" Margin="4,0,0,0">
845 
                    <TabItem Header="General" Margin="0,0,5.849,0">
 845 
                    <TabItem Header="General" Margin="0,0,5.849,0">
846 
                        <Grid x:Name="TabGridGeneral">
 846 
                        <Grid x:Name="TabGridGeneral">
847 
                            <wpConverter:SerialPortCtrl x:Name="serialPortCtrl" HorizontalAlignment="Left" Height="256" Margin="11,5,0,0" VerticalAlignment="Top" Width="210"/>
 847 
                            <wpConverter:SerialPortCtrl x:Name="serialPortCtrl" HorizontalAlignment="Left" Height="256" Margin="11,5,0,0" VerticalAlignment="Top" Width="210"/>
Line 1141... Line 1141...
1141 
                                        <ComboBoxItem Content="blue"/>
 1141 
                                        <ComboBoxItem Content="blue"/>
1142 
                                        <ComboBoxItem Content="yellow"/>
 1142 
                                        <ComboBoxItem Content="yellow"/>
1143 
                                        <ComboBoxItem Content="pink"/>
 1143 
                                        <ComboBoxItem Content="pink"/>
1144 
                                    </ComboBox>
 1144 
                                    </ComboBox>
1145 
                                    <Label x:Name="label4_Copy33" Content="Heading color" HorizontalAlignment="Right" Margin="0,3,12,0" VerticalAlignment="Top" Width="96" Foreground="White"/>
 1145 
                                    <Label x:Name="label4_Copy33" Content="Heading color" HorizontalAlignment="Right" Margin="0,3,12,0" VerticalAlignment="Top" Width="96" Foreground="White"/>
- 
 
 1146 
                                    <ComboBox x:Name="comboBoxWPMaxRangeColor" Height="33" VerticalAlignment="Top" SelectedIndex="4" HorizontalContentAlignment="Center" VerticalContentAlignment="Center" FontSize="16" HorizontalAlignment="Right" Width="95" Margin="0,221,11,0" DropDownClosed="comboBoxWPMaxRangeColor_DropDownClosed">
- 
 
 1147 
                                        <ComboBoxItem Content="red"/>
- 
 
 1148 
                                        <ComboBoxItem Content="green"/>
- 
 
 1149 
                                        <ComboBoxItem Content="blue"/>
- 
 
 1150 
                                        <ComboBoxItem Content="yellow"/>
- 
 
 1151 
                                        <ComboBoxItem Content="pink"/>
- 
 
 1152 
                                    </ComboBox>
- 
 
 1153 
                                    <Label x:Name="label4_Copy39" Content="max range color" HorizontalAlignment="Right" Margin="0,195,10,0" VerticalAlignment="Top" Width="97" Foreground="White"/>
Line 1146... Line 1154...
1146 
 
 1154 
 
1147 
                                </Grid>
 1155 
                                </Grid>
Line 1148... Line 1156...
1148 
                            </Border>
 1156 
                            </Border>