/ - Diff - MARKUS - 일정관리

KCOM/App.xaml.cs
89	89
90	90	private string versionPath = null;
91	91	//public SplashScreen splash = new SplashScreen("splash.png");
92		public SplashScreenWindow splashScreen = new SplashScreenWindow();
	92	public static SplashScreenWindow splashScreen = new SplashScreenWindow();
93	93	protected override void OnStartup(StartupEventArgs e)
94	94	{
95	95	try
...	...
237	237	// splash.Close(new TimeSpan(0, 0, 2));
238	238	Task.Factory.StartNew(() =>
239	239	{
240		for (int i = 1; i <= 100; i++)
	240	int value = 100 / ISplashMessage.SplashMessageCnt;
	241	for (int i = 1; i <= ISplashMessage.SplashMessageCnt ; i++)
241	242	{
242		System.Threading.Thread.Sleep(1);
243		splashScreen.Dispatcher.Invoke(() => splashScreen.Progress = i);
	243	System.Threading.Thread.Sleep(3);
	244	splashScreen.Dispatcher.Invoke(() => splashScreen.Progress = i * value);
244	245	}
245	246	this.Dispatcher.Invoke(() =>
246	247	{
...	...
257	258
258	259	Task.Factory.StartNew(() =>
259	260	{
260		for (int i = 1; i <= 100; i++)
	261	int value = 100 / ISplashMessage.SplashMessageCnt;
	262	for (int i = 1; i <= ISplashMessage.SplashMessageCnt; i++)
261	263	{
262		System.Threading.Thread.Sleep(1);
263		splashScreen.Dispatcher.Invoke(() => splashScreen.Progress = i);
	264	System.Threading.Thread.Sleep(3);
	265	splashScreen.Dispatcher.Invoke(() => splashScreen.Progress = i * value);
264	266	}
	267
265	268	this.Dispatcher.Invoke(() =>
266	269	{
267	270	base.OnStartup(e);
...	...
279	282	{
280	283	Task.Factory.StartNew(() =>
281	284	{
282		for (int i = 1; i <= 100; i++)
	285	int value = 100 / ISplashMessage.SplashMessageCnt;
	286	for (int i = 1; i < ISplashMessage.SplashMessageCnt; i++)
283	287	{
284		System.Threading.Thread.Sleep(1);
285		splashScreen.Dispatcher.Invoke(() => splashScreen.Progress = i);
	288	System.Threading.Thread.Sleep(3);
	289
	290	splashScreen.Dispatcher.Invoke(() => splashScreen.Progress = i * value);
	291
	292	//App.
286	293	}
287	294	this.Dispatcher.Invoke(() =>
288	295	{
...	...
294	301
295	302	}
296	303
	304	public static void splashString(string text)
	305	{
	306	Task.Factory.StartNew(() =>
	307	{
	308	splashScreen.Dispatcher.Invoke(() => splashScreen.SplashText = text);
	309	});
	310	}
	311
	312
	313
297	314	/// <summary>
298	315	/// log unhandled exception
299	316	/// </summary>

KCOM/Common/InitData.cs
3	3	using System.Windows.Controls;
4	4	using System.Windows.Media;
5	5	using System.Drawing.Text;
	6	using KCOM.Common;
6	7
7	8	namespace KCOM.Views
8	9	{
...	...
17	18
18	19	public void InitDataSet()
19	20	{
	21	App.splashString(ISplashMessage.INITDATA);
20	22	dashSet = new List<DashStyle>()
21	23	{
22	24	new DashStyle { dashData = new DoubleCollection{999999}},

KCOM/Controls/Explorer.xaml.cs
23	23	{
24	24	public Explorer()
25	25	{
26		InitializeComponent();
	26	InitializeComponent();
27	27	this.Loaded += Explorer_Loaded;
28	28
29	29	}

KCOM/Controls/FavoritePanel.xaml.cs
29	29	public FavoritePanel()
30	30	{
31	31	//InitializeComponent();
	32	App.splashString(ISplashMessage.FAVORITEPANEL);
32	33	this.Loaded += FavoritePanel_Loaded;
33	34
34	35	}

KCOM/Controls/MarkupColorList.xaml.cs
1	1	using IKCOM;
	2	using KCOM.Common;
2	3	using System;
3	4	using System.Collections.Generic;
4	5	using System.Linq;
...	...
22	23	{
23	24	public MarkupColorList()
24	25	{
	26	App.splashString(ISplashMessage.MARKUPCOLORLIST);
25	27	InitializeComponent();
26	28	}
27	29

             public List<FAVORITE_DOC> _FavoriteSet { get; set; }
             public event PropertyChangedEventHandler PropertyChanged;
             public PageNavigator()
+            {
+            {
                 InitializeComponent();
                 _Initialize = true;
+            }

             public event PropertyChangedEventHandler PropertyChanged;
             public Sample()
+            {
                 //InitializeComponent();
                 //InitializeComponent();
                 App.splashString(ISplashMessage.SAMPLE);
                 this.Loaded += Sample_Loaded;
                 //_Initialize = true;

     using MarkupToPDF.Common;
     using KCOM.Common;
     using MarkupToPDF.Common;
     using System;
     using System.Collections.Generic;
     using System.ComponentModel;
-...
             private BackgroundWorker worker = new BackgroundWorker();
             public SearchPanel()
+            {
                 App.splashString(ISplashMessage.SEARCHPANEL);
                 InitializeComponent();
                 LibInit();
                 //this.Loaded += SearchPanel_Loaded;

KCOM/Controls/Symbol.xaml.cs
44	44
45	45	public Symbol()
46	46	{
	47	App.splashString(ISplashMessage.SYMBOL);
47	48	InitializeComponent();
48	49
49	50	//RadDragAndDropManager.AddDragInfoHandler(lstSymbolPrivate, OnDragPrivateInfo);

KCOM/Controls/thumbnailControl.xaml.cs
1		using System;
	1	using KCOM.Common;
	2	using System;
2	3	using System.Collections.Generic;
3	4	using System.Linq;
4	5	using System.Text;
...	...
21	22	{
22	23	public thumbnailControl()
23	24	{
	25	App.splashString(ISplashMessage.THUMBNAILCONTROL);
24	26	InitializeComponent();
25	27	}
26	28	}

KCOM/KCOM.csproj
256	256	<Compile Include="Common\Converter\SvgConverter.cs" />
257	257	<Compile Include="Common\Converter\SvgImageConverter.cs" />
258	258	<Compile Include="Common\FileStreamToBase64.cs" />
	259	<Compile Include="Common\ISplashMessage.cs" />
259	260	<Compile Include="Common\SelectionSet.cs" />
260	261	<Compile Include="Common\TempFile.cs" />
261	262	<Compile Include="Connected Services\ServiceDeepView\Reference.cs">

KCOM/MainWindow.xaml.cs
33	33	{
34	34	public MainWindow()
35	35	{
	36	App.splashString(ISplashMessage.MAINWINDOW);
36	37	this.Loaded += MainWindow_Loaded;
37	38	this.KeyDown += new KeyEventHandler(KeyEventDownAction);
38	39	this.KeyUp += new KeyEventHandler(KeyEventUpAction);

     using KCOM.Views;
     using KCOM.Common;
     using KCOM.Views;
     using System;
     using System.Collections.Generic;
     using System.ComponentModel;
-...
             public ConversationView()
+            {
                 App.splashString(ISplashMessage.CONVERSATIONVIEW);
                 InitializeComponent();
                 this.DataContext = this;
                 this.Loaded += ConversationView_Loaded;
                 btnMark.MouseLeftButtonDown += BtnMark_Click;
                 btnMail.MouseLeftButtonDown += BtnMail_Click;

             public MainMenu()
+            {
                 App.splashString(ISplashMessage.MAINMENU_0);
                 //InitializeComponent();
                 this.Loaded += MainMenu_Loaded;
+            }
-...
             /// </summary>
             public void UpdateMyMarkupList()
+            {
                 App.splashString(ISplashMessage.MAINMENU_3);
                 Logger.sendCheckLog("pageNavigator_PageChanging_ChangeCommentReact", 1);
                 bool isComingNewBie = false;
-...
+            }
             private void pageNavigator_PageChanging(object sender, Controls.Sample.PageChangeEventArgs e)
+            {
                 App.splashString(ISplashMessage.MAINMENU_1);
                 if (ViewerDataModel.Instance.UndoDataList.Count > 0)
+                {
                     this.ParentOfType<MainWindow>().dzTopMenu.SaveEvent(null, null);
-...
                 defaultBitmapImage.DecodePixelHeight = Int32.Parse(e.CurrentPage.PAGE_HEIGHT);
                 defaultBitmapImage.EndInit();
                 ViewerDataModel.Instance.ImageViewPath = null;
                 ViewerDataModel.Instance.ImageViewPath = null;
                 App.splashString(ISplashMessage.MAINMENU_2);
                 Logger.sendCheckLog("pageNavigator_PageChanging_BitmapImage Downloading", 1);
                 if (defaultBitmapImage.IsDownloading)
+                {
                     App.splashString(ISplashMessage.MAINMENU_4);
                     Logger.sendCheckLog("pageNavigator_PageChanging_BitmapImage IsDownloading", 1);
                     defaultBitmapImage.DownloadCompleted += (ex, arg) =>
+                    {
+                    {
                         defaultBitmapImage.Freeze();
                         ViewerDataModel.Instance.ImageViewPath = defaultBitmapImage;
                         ViewerDataModel.Instance.ImageViewWidth = defaultBitmapImage.PixelWidth;

KCOM/Views/SplashScreenWindow.xaml.cs
1		using System;
2		using System.Collections.Generic;
3		using System.Linq;
4		using System.Text;
5		using System.Threading.Tasks;
	1	using KCOM.Common;
6	2	using System.Windows;
7		using System.Windows.Controls;
8		using System.Windows.Data;
9		using System.Windows.Documents;
10		using System.Windows.Input;
11		using System.Windows.Media;
12		using System.Windows.Media.Imaging;
13		using System.Windows.Shapes;
14	3
15	4	namespace KCOM.Views
16	5	{
...	...
21	10	{
22	11	public SplashScreenWindow()
23	12	{
	13	App.splashString(ISplashMessage.SPLASHSCREENWINDOW);
24	14	InitializeComponent();
25	15	}
26	16
...	...
29	19	get { return progressBar.Value; }
30	20	set { progressBar.Value = value; }
31	21	}
	22
	23	public string SplashText
	24	{
	25	get { return splashText.Text; }
	26	set { splashText.Text = value; }
	27	}
32	28	}
33	29	}

     using System;
     using KCOM.Common;
     using System;
     using System.Collections.Generic;
     using System.Linq;
     using System.Text;
-...
+        {
             public TopMenu()
+            {
                 InitializeComponent();
                 App.splashString(ISplashMessage.TOPMENU);
                 InitializeComponent();
                 InitDataSet();
                 if (!App.ViewInfo.CreateFinalPDFPermission && !App.ViewInfo.NewCommentPermission)
+                {

ID	e0cfc73c7c1771a4fba7bb4db066ca7a022b5215
상위	554aae3b
하위	ef013bfc

프로젝트

일반

사용자정보

MARKUS

개정판 e0cfc73c

프로젝트

일반

사용자정보

MARKUS

개정판 e0cfc73c

연결된 일감