프로젝트

일반

사용자정보

개정판 ffcc8124

IDffcc81244e89fad9cb0c89b633334a9529ef9587
상위 f8769f8a
하위 498f0fc9

이지연이(가) 약 6년 전에 추가함

issue #769 Symbol Ui 수정 및 Public Symbol 에 저장된 데이터를 마커스 화면에 불러오기

차이점 보기:

KCOM/Controls/Symbol.xaml
57 57 
                                <ColumnDefinition Width="3*"/>
58 58 
                                <ColumnDefinition Width="3*"/>
59 59 
                            </Grid.ColumnDefinitions>
60 
                            <Button Content="Register" Grid.Column="1" Click="Create_Symbol" Margin="5,0,0,0" FontWeight="Normal" Padding="5" Background="#3d3d3d" Foreground="White"/>
61 
                            <Button Content="Rename" Grid.Column="2" Click="Rename_Symbol" Margin="5,0,0,0" FontWeight="Normal" Padding="5" Background="#3d3d3d" Foreground="White"/>
62 
                            <Button Content="Remove" Grid.Column="3" Click="Remove_Symbol" Margin="5,0,0,0" FontWeight="Normal" Padding="5"  Background="#3d3d3d" Foreground="White"/>
60 
                            <Button Content="Place"     Grid.Column="0" Click="Place_Symbol"  Margin="5,0,0,0" FontWeight="Normal" Padding="5" Background="#3d3d3d" Foreground="White"/>
61 
                            <Button Content="Register"  Grid.Column="1" Click="Create_Symbol" Margin="5,0,0,0" FontWeight="Normal" Padding="5" Background="#3d3d3d" Foreground="White"/>
62 
                            <Button Content="Rename"    Grid.Column="2" Click="Rename_Symbol" Margin="5,0,0,0" FontWeight="Normal" Padding="5" Background="#3d3d3d" Foreground="White"/>
63 
                            <Button Content="Remove"    Grid.Column="3" Click="Remove_Symbol" Margin="5,0,0,0" FontWeight="Normal" Padding="5" Background="#3d3d3d" Foreground="White"/>
63 64 
                        </Grid>
64 65 
                        <Grid Margin="0,10">
65 66 
                            <Grid.ColumnDefinitions>
66 
                                <ColumnDefinition Width="1*"/>
67 
                                <ColumnDefinition Width="3*"/>
68 
                            </Grid.ColumnDefinitions>
69 
                            <Button Content="Place" Click="Place_Symbol" Grid.Column="0"  Margin="5,0,0,0" FontWeight="Normal" Padding="5" Background="#3d3d3d" Foreground="White"/>
70 
                            <TextBlock Text="[Tip : Double Click]" Grid.Column="1" FontSize="10" VerticalAlignment="Center" HorizontalAlignment="Right"/>
67 
                                <ColumnDefinition Width="*"/>
68 
                            </Grid.ColumnDefinitions>
69 
                            <TextBlock Text="[Tip : Double Click]" Grid.Column="0" FontSize="10" VerticalAlignment="Center" HorizontalAlignment="Right"/>
71 70 
                        </Grid>
72 71 
                    </StackPanel>
73 72 
                    <ScrollViewer x:Name="ScView" Grid.Row="1" >
......
78 77 
                                 PreviewMouseWheel ="lstSymbolPrivate_PreviewMouseWheel">
79 78 
                            <telerik:ListBoxDragDrop.Behavior>
80 79 
                                <telerik:ListBoxDragDropBehavior AllowReorder="True" />
81 
                            </telerik:ListBoxDragDrop.Behavior>
82
80 
                            </telerik:ListBoxDragDrop.Behavior>
83 81 
                        </ListBox>
84 82 
                    </ScrollViewer>
85 83 
                </Grid>
86 84 
            </telerik:RadTabItem>
87
88 
            <telerik:RadTabItem Header="Public" FontSize="10" FontWeight="Normal" HeaderForeground="{DynamicResource KCOMColor_MarkerBrush}" >
85 

  		




  
  86
  
    
            <telerik:RadTabItem Header="Public" FontWeight="Bold" FontSize="10" HeaderForeground="{DynamicResource KCOMColor_MarkerBrush}" >


  		




  89
  87
  
    
                <Grid>


  		




  90
  88
  
    
                    <Grid.RowDefinitions>


  		




  91
  89
  
    
                        <RowDefinition Height="Auto"/>


  		




  ......




  99
  97
  
    
                                <ColumnDefinition Width="3*"/>


  		




  100
  98
  
    
                            </Grid.ColumnDefinitions>


  		




  101
  99
  
    
                            


  		




  102
  
  
    
                            <TextBlock VerticalAlignment="Center">Department</TextBlock>


  		




  103
  
  
    
                            <telerik:RadComboBox EmptyText="ALL" Grid.Column="1"  HorizontalAlignment="Stretch" Margin="5" DropDownWidth="*" Background="White" BorderBrush="#d6d6d6" x:Name="deptlist"


  		




  
  100
  
    
                            <TextBlock FontWeight="Normal" VerticalAlignment="Center">Department</TextBlock>


  		




  
  101
  
    
                            <telerik:RadComboBox FontWeight="Normal" EmptyText="ALL" Grid.Column="1"  HorizontalAlignment="Stretch" Margin="5" DropDownWidth="*" Background="White" BorderBrush="#d6d6d6" x:Name="deptlist"


  		




  104
  102
  
    
                                                  ClearSelectionButtonVisibility="Visible" ClearSelectionButtonContent="Show All" SelectionChanged="deptlist_SelectionChanged"/>


  		




  105
  103
  
    

  		




  106
  104
  
    
                        </Grid>


  		




  107
  
  
    
                        <Grid Margin="0,10">


  		




  
  105
  
    

  		




  
  106
  
    
                        <Grid Margin="0,0">


  		




  108
  107
  
    
                            <Grid.ColumnDefinitions>


  		




  109
  
  
    
                                <ColumnDefinition Width="1*"/>


  		




  110
  108
  
    
                                <ColumnDefinition Width="3*"/>


  		




  
  109
  
    
                                <ColumnDefinition Width="3*"/>


  		




  
  110
  
    
                                <ColumnDefinition Width="3*"/>


  		




  
  111
  
    
                                <ColumnDefinition Width="3*"/>


  		




  
  112
  
    
                            </Grid.ColumnDefinitions>


  		




  
  113
  
    
                            <Button Content="Place" Click="Place_Symbol_Public" Grid.Column="0"  Margin="5,0,0,0" FontWeight="Normal" Padding="5" Background="#3d3d3d" Foreground="White"/>


  		




  
  114
  
    
                            <!--


  		




  
  115
  
    
                            <Button Content="Register" Grid.Column="1" Click="Create_Symbol" Margin="5,0,0,0" FontWeight="Normal" Padding="5" Background="#3d3d3d" Foreground="White"/>


  		




  
  116
  
    
                            <Button Content="Rename" Grid.Column="2" Click="Rename_Symbol" Margin="5,0,0,0" FontWeight="Normal" Padding="5" Background="#3d3d3d" Foreground="White"/>


  		




  
  117
  
    
                            <Button Content="Remove" Grid.Column="3" Click="Remove_Symbol" Margin="5,0,0,0" FontWeight="Normal" Padding="5"  Background="#3d3d3d" Foreground="White"/>-->


  		




  
  118
  
    
                        </Grid>


  		




  
  119
  
    
                        <Grid Margin="0,10">


  		




  
  120
  
    
                            <Grid.ColumnDefinitions>


  		




  
  121
  
    
                                <ColumnDefinition Width="*"/>


  		




  111
  122
  
    
                            </Grid.ColumnDefinitions>


  		




  112
  
  
    
                            <Button Content="Place" Grid.Column="0"  Click="Remove_Symbol"  Margin="5,0,0,0" FontWeight="Normal" Padding="5" Background="#3d3d3d" Foreground="White"/>


  		




  113
  
  
    
                            <TextBlock Text="[Tip : Double Click]" Grid.Column="1" FontSize="10" VerticalAlignment="Center" HorizontalAlignment="Right"/>


  		




  
  123
  
    
                            <TextBlock Text="[Tip : Double Click]" Grid.Column="0" FontSize="10" VerticalAlignment="Center" HorizontalAlignment="Right"/>


  		




  114
  124
  
    
                        </Grid>


  		




  115
  125
  
    
                    </StackPanel>


  		




  
  126
  
    

  		




  116
  127
  
    
                    <ScrollViewer x:Name="ScView_Public" Grid.Row="1" >


  		




  117
  
  
    
                        <ListBox x:Name="lstSymbolPublic" Background="#f5f5f5" FontWeight="Normal" ItemTemplate="{StaticResource SymbolTemplate_Private}" MouseDoubleClick="Move_Symbol" PreviewMouseWheel ="lstSymbolPublic_PreviewMouseWheel">


  		




  
  128
  
    
                        <ListBox x:Name="lstSymbolPublic" Background="#f5f5f5" FontWeight="Normal" ItemTemplate="{StaticResource SymbolTemplate_Private}" 


  		




  
  129
  
    
                                 MouseDown="lstSymbolPrivate_MouseDown"


  		




  
  130
  
    
                                 PreviewMouseUp="lstSymbolPrivate_PreviewMouseUp"


  		




  
  131
  
    
                                 MouseLeave="lstSymbolPrivate_MouseLeave"


  		




  
  132
  
    
                                 PreviewMouseWheel ="lstSymbolPublic_PreviewMouseWheel">


  		




  118
  133
  
    
                            <telerik:ListBoxDragDrop.Behavior>


  		




  119
  134
  
    
                                <telerik:ListBoxDragDropBehavior AllowReorder="True" />


  		




  120
  135
  
    
                            </telerik:ListBoxDragDrop.Behavior>


  		




  121
  136
  
    
                        </ListBox>


  		




  122
  
  
    
                    </ScrollViewer>


  		




  
  137
  
    
                    </ScrollViewer>                   


  		




  123
  138
  
    
                </Grid>


  		




  124
  139
  
    
            </telerik:RadTabItem>


  		




  125
  140
  
    
        </telerik:RadTabControl>


  		












  

    
      KCOM/Controls/Symbol.xaml.cs
    
  





  485
  485
  
    
            string id = (lstSymbolPrivate.SelectedItem as Symbol_Custom).ID;


  		




  486
  486
  
    
            this.PlaceSymbol(id);


  		




  487
  487
  
    
        }


  		




  
  488
  
    

  		




  
  489
  
    
        private void Place_Symbol_Public(object sender, RoutedEventArgs e)


  		




  
  490
  
    
        {


  		




  
  491
  
    
            if (lstSymbolPublic.SelectedItem == null)


  		




  
  492
  
    
            {


  		




  
  493
  
    
                DialogMessage_Alert("Please Select Symbol", "Alert");


  		




  
  494
  
    
                return;


  		




  
  495
  
    
            }


  		




  
  496
  
    

  		




  
  497
  
    
            string id = (lstSymbolPublic.SelectedItem as Symbol_Custom).ID;


  		




  
  498
  
    
            this.PlaceSymbol(id);


  		




  
  499
  
    
        }


  		




  488
  500
  
    
    }


  		




  489
  501
  
    
}


  		












내보내기  Unified diff




         
        

    















   



  

  
  클립보드 이미지 추가
  (최대 크기: 500 MB)