프로젝트

일반

사용자정보

개정판 90d1dee0

ID90d1dee0ecc051f0e806c8700718d3c0b6ed3192
상위 0d2d2a08
하위 552af7c7, fa3271c7

임예철이(가) 8달 전에 추가함

Button Style 수정
init gridViewMarkup select all 추가

Change-Id: I1dabc4876f1e49f5e661dc904cd3745df766a9d9

차이점 보기:

KCOM/MainWindow.xaml.cs
378 378

  
379 379
                Header = "Confirm",
380 380
                Theme = new VisualStudio2013Theme(),
381
                ContentStyle = Application.Current.Resources["RadConfirmYNStyle"] as Style,
381
                ContentStyle = Application.Current.Resources["RadConfirmYCStyle"] as Style,
382 382
                ModalBackground = new SolidColorBrush { Color = Colors.Black, Opacity = 0.6 },
383 383

  
384 384
                Owner = Application.Current.MainWindow,
KCOM/Resources/RadConfirmStyle.xaml
118 118
                                x:Name="OK"
119 119
                                MinWidth="100"
120 120
                                Margin="0,10,8,8"
121
                                telerik:LocalizationManager.ResourceKey="Ok"
121
                                telerik:LocalizationManager.ResourceKey="Yes"
122 122
                                telerik:RadWindow.ResponseButton="Accept"
123 123
                                Command="{x:Static telerik:WindowCommands.Confirm}"
124 124
                                Content="OK">
......
130 130
                                x:Name="NO"
131 131
                                MinWidth="100"
132 132
                                Margin="0,10,8,8"
133
                                telerik:LocalizationManager.ResourceKey="Cancel"
133
                                telerik:LocalizationManager.ResourceKey="No"
134 134
                                Command="{x:Static telerik:WindowCommands.Cancel}"
135 135
                                Content="NO">
136 136
                                <telerik:StyleManager.Theme>
137 137
                                    <telerik:VisualStudio2013Theme />
138 138
                                </telerik:StyleManager.Theme>
139 139
                            </telerik:RadButton>
140
                            <telerik:RadButton
140
                            <!--<telerik:RadButton
141 141
                                x:Name="Cancel"
142 142
                                MinWidth="100"
143 143
                                Margin="0,10,8,8"
......
147 147
                                <telerik:StyleManager.Theme>
148 148
                                    <telerik:VisualStudio2013Theme />
149 149
                                </telerik:StyleManager.Theme>
150
                            </telerik:RadButton>
150
                            </telerik:RadButton>-->
151 151
                        </StackPanel>
152 152
                    </Grid>
153 153
                </ControlTemplate>
......
266 266
                                x:Name="OK"
267 267
                                MinWidth="100"
268 268
                                Margin="0,10,8,8"
269
                                telerik:LocalizationManager.ResourceKey="Ok"
269
                                telerik:LocalizationManager.ResourceKey="Yes"
270 270
                                telerik:RadWindow.ResponseButton="Accept"
271 271
                                Command="{x:Static telerik:WindowCommands.Confirm}"
272 272
                                Content="OK">
......
278 278
                                x:Name="Cancel"
279 279
                                MinWidth="100"
280 280
                                Margin="0,10,8,8"
281
                                telerik:LocalizationManager.ResourceKey="Close"
282
                                Command="{x:Static telerik:WindowCommands.Close}"
281
                                telerik:LocalizationManager.ResourceKey="No"
282
                                Command="{x:Static telerik:WindowCommands.Cancel}"
283 283
                                Content="Cancel">
284 284
                                <telerik:StyleManager.Theme>
285 285
                                    <telerik:VisualStudio2013Theme />
KCOM/Services/BaseServices.cs
652 652
                    Content = "Selected more than two identical user data. Do you want to select consolidation?",
653 653
                    Closed = new EventHandler<WindowClosedEventArgs>((sen, ea) =>
654 654
                    {
655
                        if(ea.DialogResult == null)
656
                        {
657
                            return;
658
                        }
655 659
                        if (e.AddedItems.Count() == 1)
656 660
                        {
657 661
                            MarkupInfoItem instanceItem = e.AddedItems.FirstOrDefault() as MarkupInfoItem;
......
816 820
                            Content = "Selected more than two identical user data. Do you want to select consolidation?",
817 821
                            Closed = new EventHandler<WindowClosedEventArgs>((sen, ea) =>
818 822
                            {
823
                                if (ea.DialogResult == null)
824
                                {
825
                                    return;
826
                                }
819 827
                                if (gridViewMarkup.SelectedItems.Count() == 1)
820 828
                                {
821 829
                                    MarkupInfoItem instanceItem = gridViewMarkup.SelectedItems.FirstOrDefault() as MarkupInfoItem;
KCOM/Views/MainMenu.xaml.cs
1178 1178
            System.Diagnostics.Debug.WriteLine("MarkupLoad - MarkupParser " + new TimeSpan(stopwatch.ElapsedTicks).ToString());
1179 1179

  
1180 1180
            /// fire selection event
1181
            gridViewMarkup.SelectAll(); // DIG 요청으로 첫 로드시 전체 선택 되도록 수정 2024-06-04 IRON
1181 1182
            List<MarkupInfoItem> gridSelectionItem = gridViewMarkup.SelectedItems.Cast<MarkupInfoItem>().ToList(); //선택 된 마크업
1182 1183
            this.gridViewMarkup.UnselectAll();
1183 1184
            this.gridViewMarkup.Select(gridSelectionItem);

내보내기 Unified diff

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