Changeset 216

Show
Ignore:
Timestamp:
03/31/07 16:33:57 (1 year ago)
Author:
ssamara2
Message:

--

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • TeachingSoftware/Backend/Component.cs

    r185 r216  
    3232                /// </summary> 
    3333                private ComponentInfo myInfo; 
     34 
     35        private string myComment; 
    3436 
    3537                // ? shape *****The actual type of <c>shape</c> and <c>color</c> will be determined by WPF 
    …… 
    9597                } 
    9698 
     99        public void setComment(String comment) 
     100        { 
     101            myComment = comment; 
     102        } 
     103 
     104        public String getComment() 
     105        { 
     106            return myComment; 
     107        } 
     108 
    97109                /// <summary> 
    98110                /// Set member <c>myInfo</c> 

  • TeachingSoftware/GUI/Conditional_Builder.xaml

    r205 r216  
    2626                                <Label HorizontalAlignment="Center" Margin="25,0,0,0" x:Name="Label_Header" VerticalAlignment="Top" Content="Conditional Builder" FontFamily="Arial" FontSize="18" FontWeight="Bold"/> 
    2727                                <Label HorizontalAlignment="Left" Margin="25,75,0,0" x:Name="Label_Type" VerticalAlignment="Top" Content="Conditional Type:"/> 
    28                                 <ComboBox HorizontalAlignment="Left" Margin="200,75,0,0" x:Name="ComboBox_Types" VerticalAlignment="Top" IsSynchronizedWithCurrentItem="False" Width="125" Height="Auto" SelectedIndex="-1" TabIndex="1"> 
     28                                <ComboBox HorizontalAlignment="Left" Margin="179,79,0,0" x:Name="ComboBox_Types" VerticalAlignment="Top" IsSynchronizedWithCurrentItem="False" Width="125" Height="Auto" SelectedIndex="-1" TabIndex="1"> 
    2929                                        <ComboBoxItem Content="If" Selected="If_Selected" x:Name="ComboItem_If" Background="#00EEEAEA"/> 
    3030                                        <ComboBoxItem x:Name="ComboItem_Else" Content="Else" Selected="Else_Selected"/> 
    …… 
    6464                                        <ListBox RenderTransformOrigin="1.163,1.518" d:LayoutOverrides="Margin" Margin="82.5,121.19,103.623,26.81" IsSynchronizedWithCurrentItem="False"/> 
    6565                                </Grid> 
    66                                 <ListBox HorizontalAlignment="Left" Margin="25,127,0,125" x:Name="ListBox_Variables_CB" ItemsSource="{Binding}"  Width="100" Height="Auto" IsSynchronizedWithCurrentItem="False" MouseDoubleClick="ListBox_DoubleClick_CB" VerticalAlignment="Stretch" Background="#FFEEEAEA"/> 
     66                                <ListBox HorizontalAlignment="Left" Margin="35,135,0,117" x:Name="ListBox_Variables_CB"  Width="100" Height="Auto" IsSynchronizedWithCurrentItem="False" MouseDoubleClick="ListBox_DoubleClick_CB" VerticalAlignment="Stretch" Background="#FFEEEAEA" RenderTransformOrigin="0.51,0.495"> 
     67                                        <Grid Width="96" Height="4"/> 
     68                                        <Label Width="11" Height="4" Content="Label"/> 
     69                                </ListBox> 
    6770                                <Button d:LayoutOverrides="Height" HorizontalAlignment="Left" Margin="50,340,0,0" x:Name="Button_Submit" VerticalAlignment="Top" Content="Submit" RenderTransformOrigin="0.5,-0.309" Width="50" Click="Submit_Clicked" TabIndex="8"/> 
    6871                                <Button RenderTransformOrigin="0.849,0.675" HorizontalAlignment="Left" Margin="50,370,0,50" x:Name="Button_Cancel" VerticalAlignment="Top" Width="50" Content="Cancel" Click="Cancel_Clicked" Height="22" TabIndex="5"/> 
    …… 
    7275                                <Label HorizontalAlignment="Left" Margin="25,104,0,0" x:Name="Label_variables" VerticalAlignment="Top" Content="Variables:"/> 
    7376                        </Grid> 
     77                        <Label HorizontalAlignment="Left" Margin="62,66,0,0" x:Name="Label_Title" VerticalAlignment="Top" Width="86" Height="25" Content="Title:"/> 
     78                        <TextBox HorizontalAlignment="Left" Margin="121,62,0,0" x:Name="TextBox_Title" VerticalAlignment="Top" Width="177" Height="26" Text="" TextWrapping="Wrap"/> 
     79                        <Label Margin="254,0,299,100" x:Name="Label_Description" VerticalAlignment="Bottom" Height="40" Content="Description:"/> 
     80                        <TextBox HorizontalAlignment="Right" Margin="0,0,118,73" x:Name="TextBox_Description" VerticalAlignment="Bottom" Width="177" Height="67" Text="" TextWrapping="Wrap"/> 
    7481                </Grid> 
    7582        </Border> 

  • TeachingSoftware/GUI/Conditional_Builder.xaml.cs

    r207 r216  
    180180        { 
    181181                        ConditionalComposite myReturn = null; 
     182            myReturn.setComment(this.TextBox_Description.ToString()); 
    182183 
    183184            if (this.selected_type == types.If) 

  • TeachingSoftware/GUI/Method_Builder.xaml

    r205 r216  
    4242                                        </Button.Background> 
    4343                                </Button> 
    44                                 <Button HorizontalAlignment="Left" Margin="175,300,0,0" x:Name="Button_Cancel" VerticalAlignment="Top" Content="Cancel" Click="Cancel_Clicked" TabIndex="10"> 
     44                                <Button Margin="0,300,193.587,0" x:Name="Button_Cancel" VerticalAlignment="Top" Content="Cancel" Click="Cancel_Clicked" TabIndex="10" d:LayoutOverrides="Width" HorizontalAlignment="Right"> 
    4545                                        <Button.Background> 
    4646                                                <LinearGradientBrush EndPoint="0,0.769" StartPoint="0,-0.231">