From 1edbefb9561e7f6a97a2ed5a68099922ee583bf1 Mon Sep 17 00:00:00 2001 From: diluculo Date: Wed, 13 Jul 2016 14:51:11 +0900 Subject: [PATCH 01/13] 1. In startUp, a codeEditor document is not opened because of its _View is null. 2. Add IPropertyGrid to Demo.Modules.Startup.Module. and refresh it when ActiveDocument is changed. 3. Update StatusBar items(Line Number and Column) when the caret in a code editor is --- src/Gemini.Demo/Gemini.Demo.csproj | 3 ++ src/Gemini.Demo/Modules/Startup/Module.cs | 28 +++++++++--- src/Gemini.Demo/Resources/icon.png | Bin 0 -> 1287 bytes .../ViewModels/CodeEditorViewModel.cs | 42 ++++++++++++++++++ 4 files changed, 68 insertions(+), 5 deletions(-) create mode 100644 src/Gemini.Demo/Resources/icon.png diff --git a/src/Gemini.Demo/Gemini.Demo.csproj b/src/Gemini.Demo/Gemini.Demo.csproj index 1b3e7b15..02ef47c5 100644 --- a/src/Gemini.Demo/Gemini.Demo.csproj +++ b/src/Gemini.Demo/Gemini.Demo.csproj @@ -311,6 +311,9 @@ + + + diff --git a/src/Gemini.Demo/Modules/Startup/Module.cs b/src/Gemini.Demo/Modules/Startup/Module.cs index 3d73b23c..a3023f37 100644 --- a/src/Gemini.Demo/Modules/Startup/Module.cs +++ b/src/Gemini.Demo/Modules/Startup/Module.cs @@ -5,6 +5,8 @@ using Gemini.Framework; using Gemini.Modules.Inspector; using Gemini.Modules.Output; +using Gemini.Modules.PropertyGrid; +using System.Windows.Media.Imaging; namespace Gemini.Demo.Modules.Startup { @@ -13,6 +15,7 @@ public class Module : ModuleBase { private readonly IOutput _output; private readonly IInspectorTool _inspectorTool; + private readonly IPropertyGrid _propertyGrid; public override IEnumerable DefaultTools { @@ -20,10 +23,11 @@ public override IEnumerable DefaultTools } [ImportingConstructor] - public Module(IOutput output, IInspectorTool inspectorTool) + public Module(IOutput output, IInspectorTool inspectorTool, IPropertyGrid propertyGrid) { _output = output; _inspectorTool = inspectorTool; + _propertyGrid = propertyGrid; } public override void Initialize() @@ -33,17 +37,31 @@ public override void Initialize() //MainWindow.WindowState = WindowState.Maximized; MainWindow.Title = "Gemini Demo"; + MainWindow.Icon = new BitmapImage(new Uri("pack://application:,,/Resources/icon.png")); - Shell.StatusBar.AddItem("Hello world!", new GridLength(1, GridUnitType.Star)); - Shell.StatusBar.AddItem("Ln 44", new GridLength(100)); - Shell.StatusBar.AddItem("Col 79", new GridLength(100)); + Shell.StatusBar.AddItem("Ready", new GridLength(1, GridUnitType.Star)); + Shell.StatusBar.AddItem("Ln 1", new GridLength(100)); + Shell.StatusBar.AddItem("Col 1", new GridLength(100)); _output.AppendLine("Started up"); - Shell.ActiveDocumentChanged += (sender, e) => RefreshInspector(); + Shell.ActiveDocumentChanged += delegate + { + RefreshPropertyGrid(); + RefreshInspector(); + }; + RefreshPropertyGrid(); RefreshInspector(); } + private void RefreshPropertyGrid() + { + if (Shell.ActiveItem != null) + _propertyGrid.SelectedObject = Shell.ActiveItem; + else + _propertyGrid.SelectedObject = null; + } + private void RefreshInspector() { if (Shell.ActiveItem != null) diff --git a/src/Gemini.Demo/Resources/icon.png b/src/Gemini.Demo/Resources/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..1020506ae32a58ccf9568d99d611e627c2ced3d3 GIT binary patch literal 1287 zcmb_cYgCeV82`Voyhtxmlz1yIOgM$oPBvYVk(WdfP14Pb&Pfww^#ue zG_065QIWY%KvSmBm%4AG`qF&eW0_Y=Lu%STe$h~Qv09nIQiYr2mD9Yg_^^uX>e|&8 zCVo|n=!<)w+4b zYXil^nAC@K_{3JAO zaNTX&kFVRXL>g=#+jaO@dq*lF3P1AuQ;8w#J6v~jZW+7<5pg31&x2+^e@-(92-l*l zW0kESzYtT8v4QUnq#}&0S<*`X&Gwie^}RgG+}^uOa@)3NJv?PY-WDx4M&CO-Hk<|m zYqMT5J-I4=!R(y{>Ln$Xo0q&ljPcunILMY0KK@^r7UvaWmM~bnF480Yq1}PgCji_h zZ%L?Bcrb8vDY&>_oYrlOgog%OK_LM=GE$cKIrsJVg!*g+S`<|7EZ`Xx?gd`oN}#3?4ohMi07|3^2#2KDQjE%hqyUM5#>DALfW`%@+6B3^s7*+= z^}14F94R?T8-fq}yAE&r&>f z#LyrpM=pB#Jf_uk-MjH^cVh_ryelYcEew%#)o|*q!&lb$k8jei^b6pW zSly%Ykot}6MY?pAo7`(Gi4pO+J#%GF5X{ng99d+ady#DHVj6l^)(Oqt5gH$4EyJAh9;|d z_41XlKdSUxOe6X%yT7@Pt`c*P4pxtDz$_uKEXLv9mvTd+(O6)noZQq&sY{ z^fX27n|M43I&v8GuJ`3Wzi=XPy6KPPXG2<=m5-zvJ8SH@iqWpdbR^Z(); + + if (notYetLoaded) + { + ApplyOriginalText(); + notYetLoaded = false; + } } public override bool Equals(object obj) @@ -76,6 +89,12 @@ protected override Task DoSave(string filePath) private void ApplyOriginalText() { + if (_view == null) + { + notYetLoaded = true; + return; + } + _view.TextEditor.Text = _originalText; _view.TextEditor.TextChanged += delegate @@ -83,6 +102,13 @@ private void ApplyOriginalText() IsDirty = string.Compare(_originalText, _view.TextEditor.Text) != 0; }; + UpdateStatusBar(); + + _view.TextEditor.TextArea.Caret.PositionChanged += delegate + { + UpdateStatusBar(); + }; + var fileExtension = Path.GetExtension(FileName).ToLower(); ILanguageDefinition languageDefinition = _languageDefinitionManager.GetDefinitionByExtension(fileExtension); @@ -90,6 +116,22 @@ private void ApplyOriginalText() SetLanguage(languageDefinition); } + /// + /// Update Column and Line position properties when caret position is changed + /// + private void UpdateStatusBar() + { + int lineNumber = _view.TextEditor.Document.GetLineByOffset(_view.TextEditor.CaretOffset).LineNumber; + int colPosition = _view.TextEditor.TextArea.Caret.VisualColumn + 1; + int charPosition = _view.TextEditor.CaretOffset; + + if (_statusBar != null && _statusBar.Items.Count >= 3) + { + _statusBar.Items[1].Message = string.Format("Ln {0}", lineNumber); + _statusBar.Items[2].Message = string.Format("Col {0}", colPosition); + } + } + private void SetLanguage(ILanguageDefinition languageDefinition) { _view.TextEditor.SyntaxHighlighting = (languageDefinition != null) From c571aa507ac04c1a56dd5c8484fbd7bab82e4691 Mon Sep 17 00:00:00 2001 From: diluculo Date: Wed, 13 Jul 2016 17:28:36 +0900 Subject: [PATCH 02/13] In opening a file that is already open, just activate the tab. --- .../Shell/Commands/OpenFileCommandHandler.cs | 22 ++++++++++++++++++- 1 file changed, 21 insertions(+), 1 deletion(-) diff --git a/src/Gemini/Modules/Shell/Commands/OpenFileCommandHandler.cs b/src/Gemini/Modules/Shell/Commands/OpenFileCommandHandler.cs index 3e35da78..26397474 100644 --- a/src/Gemini/Modules/Shell/Commands/OpenFileCommandHandler.cs +++ b/src/Gemini/Modules/Shell/Commands/OpenFileCommandHandler.cs @@ -7,6 +7,7 @@ using Gemini.Framework.Commands; using Gemini.Framework.Services; using Microsoft.Win32; +using System.IO; namespace Gemini.Modules.Shell.Commands { @@ -35,7 +36,26 @@ public override async Task Run(Command command) .Select(x => x.Name + "|*" + x.FileExtension)); if (dialog.ShowDialog() == true) - _shell.OpenDocument(await GetEditor(dialog.FileName)); + { + // Check if the document is already open + var newPath = Path.GetFullPath(dialog.FileName); + foreach (IDocument document in _shell.Documents) + { + if (document is PersistedDocument) + { + var docPath = Path.GetFullPath(((PersistedDocument)document).FilePath); + if (string.Equals(newPath, docPath, System.StringComparison.OrdinalIgnoreCase)) + { + _shell.OpenDocument(document); + return; + } + } + } + + _shell.OpenDocument(await GetEditor(newPath)); + + // TODO: Add the file to the recent documents list + } } internal static Task GetEditor(string path) From 96b394803e15aa04239c712206c728631d16bf06 Mon Sep 17 00:00:00 2001 From: diluculo Date: Thu, 14 Jul 2016 10:27:23 +0900 Subject: [PATCH 03/13] Add Recent Files menu --- src/Gemini/Gemini.csproj | 8 ++ .../Modules/MainMenu/MenuDefinitions.cs | 3 + .../Modules/RecentFiles/IRecentViewItem.cs | 14 ++++ .../RecentFiles/IRecentViewSettings.cs | 13 +++ .../Commands/OpenRecentCommandHandler.cs | 79 +++++++++++++++++++ .../OpenRecentCommandListDefinition.cs | 21 +++++ src/Gemini/Modules/Shell/MenuDefinitions.cs | 15 +++- src/Gemini/Properties/Resources.Designer.cs | 36 +++++++++ src/Gemini/Properties/Resources.resx | 12 +++ 9 files changed, 200 insertions(+), 1 deletion(-) create mode 100644 src/Gemini/Modules/RecentFiles/IRecentViewItem.cs create mode 100644 src/Gemini/Modules/RecentFiles/IRecentViewSettings.cs create mode 100644 src/Gemini/Modules/Shell/Commands/OpenRecentCommandHandler.cs create mode 100644 src/Gemini/Modules/Shell/Commands/OpenRecentCommandListDefinition.cs diff --git a/src/Gemini/Gemini.csproj b/src/Gemini/Gemini.csproj index 450ff130..f8cd2db0 100644 --- a/src/Gemini/Gemini.csproj +++ b/src/Gemini/Gemini.csproj @@ -164,6 +164,8 @@ MainMenuSettingsView.xaml + + @@ -175,6 +177,8 @@ + + @@ -427,6 +431,10 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + 일반 + + + 환경 + + \ No newline at end of file diff --git a/src/Gemini.Modules.CodeEditor/Gemini.Modules.CodeEditor.csproj b/src/Gemini.Modules.CodeEditor/Gemini.Modules.CodeEditor.csproj index ff0ea3af..413d83fb 100644 --- a/src/Gemini.Modules.CodeEditor/Gemini.Modules.CodeEditor.csproj +++ b/src/Gemini.Modules.CodeEditor/Gemini.Modules.CodeEditor.csproj @@ -89,6 +89,7 @@ + ResXFileCodeGenerator Resources.Designer.cs diff --git a/src/Gemini.Modules.CodeEditor/Properties/Resources.ko-KR.resx b/src/Gemini.Modules.CodeEditor/Properties/Resources.ko-KR.resx new file mode 100644 index 00000000..bbe6cd80 --- /dev/null +++ b/src/Gemini.Modules.CodeEditor/Properties/Resources.ko-KR.resx @@ -0,0 +1,123 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + 파일 + + \ No newline at end of file diff --git a/src/Gemini.Modules.ErrorList/Gemini.Modules.ErrorList.csproj b/src/Gemini.Modules.ErrorList/Gemini.Modules.ErrorList.csproj index bd0a875d..ea152235 100644 --- a/src/Gemini.Modules.ErrorList/Gemini.Modules.ErrorList.csproj +++ b/src/Gemini.Modules.ErrorList/Gemini.Modules.ErrorList.csproj @@ -93,6 +93,7 @@ ErrorListView.xaml + ResXFileCodeGenerator Resources.Designer.cs diff --git a/src/Gemini.Modules.ErrorList/Properties/Resources.Designer.cs b/src/Gemini.Modules.ErrorList/Properties/Resources.Designer.cs index 063a5355..d9c7807f 100644 --- a/src/Gemini.Modules.ErrorList/Properties/Resources.Designer.cs +++ b/src/Gemini.Modules.ErrorList/Properties/Resources.Designer.cs @@ -1,10 +1,10 @@ //------------------------------------------------------------------------------ // -// This code was generated by a tool. -// Runtime Version:4.0.30319.42000 +// 이 코드는 도구를 사용하여 생성되었습니다. +// 런타임 버전:4.0.30319.42000 // -// Changes to this file may cause incorrect behavior and will be lost if -// the code is regenerated. +// 파일 내용을 변경하면 잘못된 동작이 발생할 수 있으며, 코드를 다시 생성하면 +// 이러한 변경 내용이 손실됩니다. // //------------------------------------------------------------------------------ @@ -13,12 +13,12 @@ namespace Gemini.Modules.ErrorList.Properties { /// - /// A strongly-typed resource class, for looking up localized strings, etc. + /// 지역화된 문자열 등을 찾기 위한 강력한 형식의 리소스 클래스입니다. /// - // This class was auto-generated by the StronglyTypedResourceBuilder - // class via a tool like ResGen or Visual Studio. - // To add or remove a member, edit your .ResX file then rerun ResGen - // with the /str option, or rebuild your VS project. + // 이 클래스는 ResGen 또는 Visual Studio와 같은 도구를 통해 StronglyTypedResourceBuilder + // 클래스에서 자동으로 생성되었습니다. + // 멤버를 추가하거나 제거하려면 .ResX 파일을 편집한 다음 /str 옵션을 사용하여 ResGen을 + // 다시 실행하거나 VS 프로젝트를 다시 빌드하십시오. [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] @@ -33,7 +33,7 @@ internal Resources() { } /// - /// Returns the cached ResourceManager instance used by this class. + /// 이 클래스에서 사용하는 캐시된 ResourceManager 인스턴스를 반환합니다. /// [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] internal static global::System.Resources.ResourceManager ResourceManager { @@ -47,8 +47,8 @@ internal Resources() { } /// - /// Overrides the current thread's CurrentUICulture property for all - /// resource lookups using this strongly typed resource class. + /// 이 강력한 형식의 리소스 클래스를 사용하여 모든 리소스 조회에 대한 현재 스레드의 CurrentUICulture + /// 속성을 재정의합니다. /// [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] internal static global::System.Globalization.CultureInfo Culture { @@ -61,7 +61,7 @@ internal Resources() { } /// - /// Looks up a localized string similar to {0} Errors. + /// {0} Errors과(와) 유사한 지역화된 문자열을 찾습니다. /// internal static string ErrorTextPlural { get { @@ -70,7 +70,7 @@ internal static string ErrorTextPlural { } /// - /// Looks up a localized string similar to {0} Error. + /// {0} Error과(와) 유사한 지역화된 문자열을 찾습니다. /// internal static string ErrorTextSingular { get { @@ -79,7 +79,7 @@ internal static string ErrorTextSingular { } /// - /// Looks up a localized string similar to {0} Messages. + /// {0} Messages과(와) 유사한 지역화된 문자열을 찾습니다. /// internal static string MessageTextPlural { get { @@ -88,7 +88,7 @@ internal static string MessageTextPlural { } /// - /// Looks up a localized string similar to {0} Message. + /// {0} Message과(와) 유사한 지역화된 문자열을 찾습니다. /// internal static string MessageTextSingular { get { @@ -97,7 +97,7 @@ internal static string MessageTextSingular { } /// - /// Looks up a localized string similar to Error L_ist. + /// Error L_ist과(와) 유사한 지역화된 문자열을 찾습니다. /// internal static string ViewErrorListCommandText { get { @@ -106,7 +106,7 @@ internal static string ViewErrorListCommandText { } /// - /// Looks up a localized string similar to Error List. + /// Error List과(와) 유사한 지역화된 문자열을 찾습니다. /// internal static string ViewErrorListCommandToolTip { get { @@ -115,7 +115,7 @@ internal static string ViewErrorListCommandToolTip { } /// - /// Looks up a localized string similar to {0} Warnings. + /// {0} Warnings과(와) 유사한 지역화된 문자열을 찾습니다. /// internal static string WarningTextPlural { get { @@ -124,7 +124,7 @@ internal static string WarningTextPlural { } /// - /// Looks up a localized string similar to {0} Warning. + /// {0} Warning과(와) 유사한 지역화된 문자열을 찾습니다. /// internal static string WarningTextSingular { get { diff --git a/src/Gemini.Modules.ErrorList/Properties/Resources.ko-KR.resx b/src/Gemini.Modules.ErrorList/Properties/Resources.ko-KR.resx new file mode 100644 index 00000000..9eee667d --- /dev/null +++ b/src/Gemini.Modules.ErrorList/Properties/Resources.ko-KR.resx @@ -0,0 +1,126 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + 오류 목록(_i) + + + 오류 목록 + + \ No newline at end of file diff --git a/src/Gemini.Modules.Inspector/Gemini.Modules.Inspector.csproj b/src/Gemini.Modules.Inspector/Gemini.Modules.Inspector.csproj index e25a14de..10a65085 100644 --- a/src/Gemini.Modules.Inspector/Gemini.Modules.Inspector.csproj +++ b/src/Gemini.Modules.Inspector/Gemini.Modules.Inspector.csproj @@ -236,6 +236,7 @@ PublicResXFileCodeGenerator Resources.de.Designer.cs + ResXFileCodeGenerator Resources.Designer.cs diff --git a/src/Gemini.Modules.Inspector/Properties/Resources.Designer.cs b/src/Gemini.Modules.Inspector/Properties/Resources.Designer.cs index 3ad7e56c..d8e7779a 100644 --- a/src/Gemini.Modules.Inspector/Properties/Resources.Designer.cs +++ b/src/Gemini.Modules.Inspector/Properties/Resources.Designer.cs @@ -1,10 +1,10 @@ //------------------------------------------------------------------------------ // -// This code was generated by a tool. -// Runtime Version:4.0.30319.42000 +// 이 코드는 도구를 사용하여 생성되었습니다. +// 런타임 버전:4.0.30319.42000 // -// Changes to this file may cause incorrect behavior and will be lost if -// the code is regenerated. +// 파일 내용을 변경하면 잘못된 동작이 발생할 수 있으며, 코드를 다시 생성하면 +// 이러한 변경 내용이 손실됩니다. // //------------------------------------------------------------------------------ @@ -13,12 +13,12 @@ namespace Gemini.Modules.Inspector.Properties { /// - /// A strongly-typed resource class, for looking up localized strings, etc. + /// 지역화된 문자열 등을 찾기 위한 강력한 형식의 리소스 클래스입니다. /// - // This class was auto-generated by the StronglyTypedResourceBuilder - // class via a tool like ResGen or Visual Studio. - // To add or remove a member, edit your .ResX file then rerun ResGen - // with the /str option, or rebuild your VS project. + // 이 클래스는 ResGen 또는 Visual Studio와 같은 도구를 통해 StronglyTypedResourceBuilder + // 클래스에서 자동으로 생성되었습니다. + // 멤버를 추가하거나 제거하려면 .ResX 파일을 편집한 다음 /str 옵션을 사용하여 ResGen을 + // 다시 실행하거나 VS 프로젝트를 다시 빌드하십시오. [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] @@ -33,7 +33,7 @@ internal Resources() { } /// - /// Returns the cached ResourceManager instance used by this class. + /// 이 클래스에서 사용하는 캐시된 ResourceManager 인스턴스를 반환합니다. /// [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] internal static global::System.Resources.ResourceManager ResourceManager { @@ -47,8 +47,8 @@ internal Resources() { } /// - /// Overrides the current thread's CurrentUICulture property for all - /// resource lookups using this strongly typed resource class. + /// 이 강력한 형식의 리소스 클래스를 사용하여 모든 리소스 조회에 대한 현재 스레드의 CurrentUICulture + /// 속성을 재정의합니다. /// [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] internal static global::System.Globalization.CultureInfo Culture { @@ -61,7 +61,7 @@ internal Resources() { } /// - /// Looks up a localized string similar to Change {0} from {1} to {2}. + /// Change {0} from {1} to {2}과(와) 유사한 지역화된 문자열을 찾습니다. /// internal static string ChangeObjectValueActionFormat { get { @@ -70,7 +70,7 @@ internal static string ChangeObjectValueActionFormat { } /// - /// Looks up a localized string similar to Advanced. + /// Advanced과(와) 유사한 지역화된 문자열을 찾습니다. /// internal static string ColorEditorAdvanced { get { @@ -79,7 +79,7 @@ internal static string ColorEditorAdvanced { } /// - /// Looks up a localized string similar to Available Colors. + /// Available Colors과(와) 유사한 지역화된 문자열을 찾습니다. /// internal static string ColorEditorAvailableColors { get { @@ -88,7 +88,7 @@ internal static string ColorEditorAvailableColors { } /// - /// Looks up a localized string similar to Recent Colors. + /// Recent Colors과(와) 유사한 지역화된 문자열을 찾습니다. /// internal static string ColorEditorRecentColors { get { @@ -97,7 +97,7 @@ internal static string ColorEditorRecentColors { } /// - /// Looks up a localized string similar to Standard. + /// Standard과(와) 유사한 지역화된 문자열을 찾습니다. /// internal static string ColorEditorStandard { get { @@ -106,7 +106,7 @@ internal static string ColorEditorStandard { } /// - /// Looks up a localized string similar to Standard Colors. + /// Standard Colors과(와) 유사한 지역화된 문자열을 찾습니다. /// internal static string ColorEditorStandardColors { get { @@ -115,7 +115,7 @@ internal static string ColorEditorStandardColors { } /// - /// Looks up a localized string similar to Miscellaneous. + /// Miscellaneous과(와) 유사한 지역화된 문자열을 찾습니다. /// internal static string InspectorBuilderMiscellaneous { get { @@ -124,7 +124,7 @@ internal static string InspectorBuilderMiscellaneous { } /// - /// Looks up a localized string similar to Inspector. + /// Inspector과(와) 유사한 지역화된 문자열을 찾습니다. /// internal static string InspectorDisplayName { get { @@ -133,7 +133,7 @@ internal static string InspectorDisplayName { } /// - /// Looks up a localized string similar to Reset all ⟲. + /// Reset all ⟲과(와) 유사한 지역화된 문자열을 찾습니다. /// internal static string ResetAll { get { @@ -142,7 +142,7 @@ internal static string ResetAll { } /// - /// Looks up a localized string similar to Reset {0} from {1} to {2}. + /// Reset {0} from {1} to {2}과(와) 유사한 지역화된 문자열을 찾습니다. /// internal static string ResetObjectValueActionFormat { get { @@ -151,7 +151,7 @@ internal static string ResetObjectValueActionFormat { } /// - /// Looks up a localized string similar to ⟲. + /// ⟲과(와) 유사한 지역화된 문자열을 찾습니다. /// internal static string ResetSymbol { get { @@ -160,7 +160,7 @@ internal static string ResetSymbol { } /// - /// Looks up a localized string similar to Reset. + /// Reset과(와) 유사한 지역화된 문자열을 찾습니다. /// internal static string ResetToolTip { get { @@ -169,7 +169,7 @@ internal static string ResetToolTip { } /// - /// Looks up a localized string similar to I_nspector. + /// I_nspector과(와) 유사한 지역화된 문자열을 찾습니다. /// internal static string ViewInspectorCommandText { get { @@ -178,7 +178,7 @@ internal static string ViewInspectorCommandText { } /// - /// Looks up a localized string similar to Inspector. + /// Inspector과(와) 유사한 지역화된 문자열을 찾습니다. /// internal static string ViewInspectorCommandToolTip { get { diff --git a/src/Gemini.Modules.Inspector/Properties/Resources.ko-KR.resx b/src/Gemini.Modules.Inspector/Properties/Resources.ko-KR.resx new file mode 100644 index 00000000..8a13be57 --- /dev/null +++ b/src/Gemini.Modules.Inspector/Properties/Resources.ko-KR.resx @@ -0,0 +1,153 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + 재설정 + + + 모두 재설정 + + + ⟲ + + + 사용가능한 색상 + + + 표준 색상 + + + 표준 + + + 최근에 사용한 색상 + + + 고급 + + + 검사기 + + + 검사기 + + + 검사기 + + \ No newline at end of file diff --git a/src/Gemini.Modules.Output/Gemini.Modules.Output.csproj b/src/Gemini.Modules.Output/Gemini.Modules.Output.csproj index 43654911..11cf60e6 100644 --- a/src/Gemini.Modules.Output/Gemini.Modules.Output.csproj +++ b/src/Gemini.Modules.Output/Gemini.Modules.Output.csproj @@ -103,6 +103,7 @@ ResXFileCodeGenerator Resources.de.Designer.cs + ResXFileCodeGenerator Resources.Designer.cs diff --git a/src/Gemini.Modules.Output/Properties/Resources.Designer.cs b/src/Gemini.Modules.Output/Properties/Resources.Designer.cs index f2bcf304..463620ee 100644 --- a/src/Gemini.Modules.Output/Properties/Resources.Designer.cs +++ b/src/Gemini.Modules.Output/Properties/Resources.Designer.cs @@ -1,10 +1,10 @@ //------------------------------------------------------------------------------ // -// This code was generated by a tool. -// Runtime Version:4.0.30319.42000 +// 이 코드는 도구를 사용하여 생성되었습니다. +// 런타임 버전:4.0.30319.42000 // -// Changes to this file may cause incorrect behavior and will be lost if -// the code is regenerated. +// 파일 내용을 변경하면 잘못된 동작이 발생할 수 있으며, 코드를 다시 생성하면 +// 이러한 변경 내용이 손실됩니다. // //------------------------------------------------------------------------------ @@ -13,12 +13,12 @@ namespace Gemini.Modules.Output.Properties { /// - /// A strongly-typed resource class, for looking up localized strings, etc. + /// 지역화된 문자열 등을 찾기 위한 강력한 형식의 리소스 클래스입니다. /// - // This class was auto-generated by the StronglyTypedResourceBuilder - // class via a tool like ResGen or Visual Studio. - // To add or remove a member, edit your .ResX file then rerun ResGen - // with the /str option, or rebuild your VS project. + // 이 클래스는 ResGen 또는 Visual Studio와 같은 도구를 통해 StronglyTypedResourceBuilder + // 클래스에서 자동으로 생성되었습니다. + // 멤버를 추가하거나 제거하려면 .ResX 파일을 편집한 다음 /str 옵션을 사용하여 ResGen을 + // 다시 실행하거나 VS 프로젝트를 다시 빌드하십시오. [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] @@ -33,7 +33,7 @@ internal Resources() { } /// - /// Returns the cached ResourceManager instance used by this class. + /// 이 클래스에서 사용하는 캐시된 ResourceManager 인스턴스를 반환합니다. /// [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] internal static global::System.Resources.ResourceManager ResourceManager { @@ -47,8 +47,8 @@ internal Resources() { } /// - /// Overrides the current thread's CurrentUICulture property for all - /// resource lookups using this strongly typed resource class. + /// 이 강력한 형식의 리소스 클래스를 사용하여 모든 리소스 조회에 대한 현재 스레드의 CurrentUICulture + /// 속성을 재정의합니다. /// [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] internal static global::System.Globalization.CultureInfo Culture { @@ -61,7 +61,7 @@ internal Resources() { } /// - /// Looks up a localized string similar to Output. + /// Output과(와) 유사한 지역화된 문자열을 찾습니다. /// internal static string OutputDisplayName { get { @@ -70,7 +70,7 @@ internal static string OutputDisplayName { } /// - /// Looks up a localized string similar to _Output. + /// _Output과(와) 유사한 지역화된 문자열을 찾습니다. /// internal static string ViewOutputCommandText { get { @@ -79,7 +79,7 @@ internal static string ViewOutputCommandText { } /// - /// Looks up a localized string similar to Output. + /// Output과(와) 유사한 지역화된 문자열을 찾습니다. /// internal static string ViewOutputCommandToolTip { get { diff --git a/src/Gemini.Modules.Output/Properties/Resources.ko-KR.resx b/src/Gemini.Modules.Output/Properties/Resources.ko-KR.resx new file mode 100644 index 00000000..ad435199 --- /dev/null +++ b/src/Gemini.Modules.Output/Properties/Resources.ko-KR.resx @@ -0,0 +1,129 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + 출력 + + + 출력(_O) + + + 출력 + + \ No newline at end of file diff --git a/src/Gemini.Modules.PropertyGrid/Gemini.Modules.PropertyGrid.csproj b/src/Gemini.Modules.PropertyGrid/Gemini.Modules.PropertyGrid.csproj index d8489bc0..4b8722ed 100644 --- a/src/Gemini.Modules.PropertyGrid/Gemini.Modules.PropertyGrid.csproj +++ b/src/Gemini.Modules.PropertyGrid/Gemini.Modules.PropertyGrid.csproj @@ -119,6 +119,7 @@ + ResXFileCodeGenerator Resources.Designer.cs diff --git a/src/Gemini.Modules.PropertyGrid/Properties/Resources.Designer.cs b/src/Gemini.Modules.PropertyGrid/Properties/Resources.Designer.cs index 7282741c..90726940 100644 --- a/src/Gemini.Modules.PropertyGrid/Properties/Resources.Designer.cs +++ b/src/Gemini.Modules.PropertyGrid/Properties/Resources.Designer.cs @@ -1,10 +1,10 @@ //------------------------------------------------------------------------------ // -// This code was generated by a tool. -// Runtime Version:4.0.30319.42000 +// 이 코드는 도구를 사용하여 생성되었습니다. +// 런타임 버전:4.0.30319.42000 // -// Changes to this file may cause incorrect behavior and will be lost if -// the code is regenerated. +// 파일 내용을 변경하면 잘못된 동작이 발생할 수 있으며, 코드를 다시 생성하면 +// 이러한 변경 내용이 손실됩니다. // //------------------------------------------------------------------------------ @@ -13,12 +13,12 @@ namespace Gemini.Modules.PropertyGrid.Properties { /// - /// A strongly-typed resource class, for looking up localized strings, etc. + /// 지역화된 문자열 등을 찾기 위한 강력한 형식의 리소스 클래스입니다. /// - // This class was auto-generated by the StronglyTypedResourceBuilder - // class via a tool like ResGen or Visual Studio. - // To add or remove a member, edit your .ResX file then rerun ResGen - // with the /str option, or rebuild your VS project. + // 이 클래스는 ResGen 또는 Visual Studio와 같은 도구를 통해 StronglyTypedResourceBuilder + // 클래스에서 자동으로 생성되었습니다. + // 멤버를 추가하거나 제거하려면 .ResX 파일을 편집한 다음 /str 옵션을 사용하여 ResGen을 + // 다시 실행하거나 VS 프로젝트를 다시 빌드하십시오. [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] @@ -33,7 +33,7 @@ internal Resources() { } /// - /// Returns the cached ResourceManager instance used by this class. + /// 이 클래스에서 사용하는 캐시된 ResourceManager 인스턴스를 반환합니다. /// [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] internal static global::System.Resources.ResourceManager ResourceManager { @@ -47,8 +47,8 @@ internal Resources() { } /// - /// Overrides the current thread's CurrentUICulture property for all - /// resource lookups using this strongly typed resource class. + /// 이 강력한 형식의 리소스 클래스를 사용하여 모든 리소스 조회에 대한 현재 스레드의 CurrentUICulture + /// 속성을 재정의합니다. /// [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] internal static global::System.Globalization.CultureInfo Culture { @@ -61,7 +61,7 @@ internal Resources() { } /// - /// Looks up a localized string similar to Properties _Window. + /// Properties _Window과(와) 유사한 지역화된 문자열을 찾습니다. /// internal static string ViewPropertyGridCommandText { get { @@ -70,7 +70,7 @@ internal static string ViewPropertyGridCommandText { } /// - /// Looks up a localized string similar to Properties Window. + /// Properties Window과(와) 유사한 지역화된 문자열을 찾습니다. /// internal static string ViewPropertyGridCommandToolTip { get { diff --git a/src/Gemini.Modules.PropertyGrid/Properties/Resources.ko-KR.resx b/src/Gemini.Modules.PropertyGrid/Properties/Resources.ko-KR.resx new file mode 100644 index 00000000..c46571b0 --- /dev/null +++ b/src/Gemini.Modules.PropertyGrid/Properties/Resources.ko-KR.resx @@ -0,0 +1,126 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + 속성 창 + + + 속성 창 + + \ No newline at end of file diff --git a/src/Gemini/Gemini.csproj b/src/Gemini/Gemini.csproj index 62cd1aff..57c4369d 100644 --- a/src/Gemini/Gemini.csproj +++ b/src/Gemini/Gemini.csproj @@ -175,6 +175,7 @@ MainMenuSettingsView.xaml + @@ -188,10 +189,10 @@ - - - - + + + + @@ -448,6 +449,7 @@ Resources.de.Designer.cs Designer + ResXFileCodeGenerator Resources.Designer.cs @@ -467,6 +469,7 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + 파일(_F) + + + 편집 + + + 창(_W) + + + 보기(_V) + + + 새로 만들기(_N) + + + 새로 만들기 + + + 열기(_O) + + + 열기 + + + 최근에 사용한 파일 + + + 최근에 사용한 파일 + + + 다른 이름으로 저장(_A) + + + 다른 이름으로 저장 + + + 저장(_S) + + + 저장 + + + 도움말(_H) + + + 다시 실행(_R) + + + 실행 취소(_U) + + + 실행 취소 + + + 다시 실행 + + + 닫기(_C) + + + 닫기 + + + 끝내기(_X) + + + 끝내기 + + + 문서 {0} + + + 도구(_T) + + + 옵션(_O) + + + 옵션 + + + 모두 저장 + + + 모두 저장 + + + 도구 상자(_X) + + + 도구 상자 + + + 언어: + + + 다시 시작해야 적용됩니다 + + + 옵션 + + + 일반 + + + 환경 + + + 시스템 + + + 블루 + + + 광원 + + + 어둡게 + + + 색 테마: + + + [기본 제목] + + + 기록 + + + 초기 상태 + + + 표준 + + + 카데고리 + + + 도구 상자 + + + 메뉴 자동 감추기 + + + 기록(_H) + + + 기록 + + \ No newline at end of file diff --git a/src/Gemini/Properties/Resources.zh-Hans.resx b/src/Gemini/Properties/Resources.zh-Hans.resx index eb14e2df..e4819ad3 100644 --- a/src/Gemini/Properties/Resources.zh-Hans.resx +++ b/src/Gemini/Properties/Resources.zh-Hans.resx @@ -264,4 +264,7 @@ 保存全部 + + 新建 + \ No newline at end of file From c87f661d61d0d6b359506e9628a1b59e535d8d9d Mon Sep 17 00:00:00 2001 From: diluculo Date: Mon, 18 Jul 2016 13:35:14 +0900 Subject: [PATCH 11/13] Gemini.Demo.TextEditor: TextWrapping and AcceptsReturn added --- src/Gemini.Demo/Modules/TextEditor/Views/EditorView.xaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Gemini.Demo/Modules/TextEditor/Views/EditorView.xaml b/src/Gemini.Demo/Modules/TextEditor/Views/EditorView.xaml index 334bf618..c911ed21 100644 --- a/src/Gemini.Demo/Modules/TextEditor/Views/EditorView.xaml +++ b/src/Gemini.Demo/Modules/TextEditor/Views/EditorView.xaml @@ -11,5 +11,5 @@ FontFamily="Consolas" FontSize="14" ScrollViewer.VerticalScrollBarVisibility="Visible" - ScrollViewer.HorizontalScrollBarVisibility="Visible"/> + ScrollViewer.HorizontalScrollBarVisibility="Visible" TextWrapping="Wrap" AcceptsReturn="True"/> From 41e1c653f3bd9754c0eda162a0b793942d49ce0e Mon Sep 17 00:00:00 2001 From: diluculo Date: Mon, 18 Jul 2016 17:47:41 +0900 Subject: [PATCH 12/13] Change ko-KR to ko --- src/Gemini.Demo/Gemini.Demo.csproj | 2 +- .../Properties/{Resources.ko-KR.resx => Resources.ko.resx} | 0 src/Gemini.Modules.CodeEditor/Gemini.Modules.CodeEditor.csproj | 2 +- .../Properties/{Resources.ko-KR.resx => Resources.ko.resx} | 0 src/Gemini.Modules.ErrorList/Gemini.Modules.ErrorList.csproj | 2 +- .../Properties/{Resources.ko-KR.resx => Resources.ko.resx} | 0 src/Gemini.Modules.Inspector/Gemini.Modules.Inspector.csproj | 2 +- .../Properties/{Resources.ko-KR.resx => Resources.ko.resx} | 0 src/Gemini.Modules.Output/Gemini.Modules.Output.csproj | 2 +- .../Properties/{Resources.ko-KR.resx => Resources.ko.resx} | 0 .../Gemini.Modules.PropertyGrid.csproj | 2 +- .../Properties/{Resources.ko-KR.resx => Resources.ko.resx} | 0 src/Gemini/Gemini.csproj | 2 +- .../Modules/MainMenu/ViewModels/MainMenuSettingsViewModel.cs | 2 +- .../Properties/{Resources.ko-KR.resx => Resources.ko.resx} | 0 15 files changed, 8 insertions(+), 8 deletions(-) rename src/Gemini.Demo/Properties/{Resources.ko-KR.resx => Resources.ko.resx} (100%) rename src/Gemini.Modules.CodeEditor/Properties/{Resources.ko-KR.resx => Resources.ko.resx} (100%) rename src/Gemini.Modules.ErrorList/Properties/{Resources.ko-KR.resx => Resources.ko.resx} (100%) rename src/Gemini.Modules.Inspector/Properties/{Resources.ko-KR.resx => Resources.ko.resx} (100%) rename src/Gemini.Modules.Output/Properties/{Resources.ko-KR.resx => Resources.ko.resx} (100%) rename src/Gemini.Modules.PropertyGrid/Properties/{Resources.ko-KR.resx => Resources.ko.resx} (100%) rename src/Gemini/Properties/{Resources.ko-KR.resx => Resources.ko.resx} (100%) diff --git a/src/Gemini.Demo/Gemini.Demo.csproj b/src/Gemini.Demo/Gemini.Demo.csproj index 85d85891..148ac294 100644 --- a/src/Gemini.Demo/Gemini.Demo.csproj +++ b/src/Gemini.Demo/Gemini.Demo.csproj @@ -227,7 +227,7 @@ ResXFileCodeGenerator Resources.de.Designer.cs - + ResXFileCodeGenerator Resources.Designer.cs diff --git a/src/Gemini.Demo/Properties/Resources.ko-KR.resx b/src/Gemini.Demo/Properties/Resources.ko.resx similarity index 100% rename from src/Gemini.Demo/Properties/Resources.ko-KR.resx rename to src/Gemini.Demo/Properties/Resources.ko.resx diff --git a/src/Gemini.Modules.CodeEditor/Gemini.Modules.CodeEditor.csproj b/src/Gemini.Modules.CodeEditor/Gemini.Modules.CodeEditor.csproj index 413d83fb..da6c88e2 100644 --- a/src/Gemini.Modules.CodeEditor/Gemini.Modules.CodeEditor.csproj +++ b/src/Gemini.Modules.CodeEditor/Gemini.Modules.CodeEditor.csproj @@ -89,7 +89,7 @@ - + ResXFileCodeGenerator Resources.Designer.cs diff --git a/src/Gemini.Modules.CodeEditor/Properties/Resources.ko-KR.resx b/src/Gemini.Modules.CodeEditor/Properties/Resources.ko.resx similarity index 100% rename from src/Gemini.Modules.CodeEditor/Properties/Resources.ko-KR.resx rename to src/Gemini.Modules.CodeEditor/Properties/Resources.ko.resx diff --git a/src/Gemini.Modules.ErrorList/Gemini.Modules.ErrorList.csproj b/src/Gemini.Modules.ErrorList/Gemini.Modules.ErrorList.csproj index ea152235..29f62b6d 100644 --- a/src/Gemini.Modules.ErrorList/Gemini.Modules.ErrorList.csproj +++ b/src/Gemini.Modules.ErrorList/Gemini.Modules.ErrorList.csproj @@ -93,7 +93,7 @@ ErrorListView.xaml - + ResXFileCodeGenerator Resources.Designer.cs diff --git a/src/Gemini.Modules.ErrorList/Properties/Resources.ko-KR.resx b/src/Gemini.Modules.ErrorList/Properties/Resources.ko.resx similarity index 100% rename from src/Gemini.Modules.ErrorList/Properties/Resources.ko-KR.resx rename to src/Gemini.Modules.ErrorList/Properties/Resources.ko.resx diff --git a/src/Gemini.Modules.Inspector/Gemini.Modules.Inspector.csproj b/src/Gemini.Modules.Inspector/Gemini.Modules.Inspector.csproj index 10a65085..66df3588 100644 --- a/src/Gemini.Modules.Inspector/Gemini.Modules.Inspector.csproj +++ b/src/Gemini.Modules.Inspector/Gemini.Modules.Inspector.csproj @@ -236,7 +236,7 @@ PublicResXFileCodeGenerator Resources.de.Designer.cs - + ResXFileCodeGenerator Resources.Designer.cs diff --git a/src/Gemini.Modules.Inspector/Properties/Resources.ko-KR.resx b/src/Gemini.Modules.Inspector/Properties/Resources.ko.resx similarity index 100% rename from src/Gemini.Modules.Inspector/Properties/Resources.ko-KR.resx rename to src/Gemini.Modules.Inspector/Properties/Resources.ko.resx diff --git a/src/Gemini.Modules.Output/Gemini.Modules.Output.csproj b/src/Gemini.Modules.Output/Gemini.Modules.Output.csproj index 11cf60e6..ed08888b 100644 --- a/src/Gemini.Modules.Output/Gemini.Modules.Output.csproj +++ b/src/Gemini.Modules.Output/Gemini.Modules.Output.csproj @@ -103,7 +103,7 @@ ResXFileCodeGenerator Resources.de.Designer.cs - + ResXFileCodeGenerator Resources.Designer.cs diff --git a/src/Gemini.Modules.Output/Properties/Resources.ko-KR.resx b/src/Gemini.Modules.Output/Properties/Resources.ko.resx similarity index 100% rename from src/Gemini.Modules.Output/Properties/Resources.ko-KR.resx rename to src/Gemini.Modules.Output/Properties/Resources.ko.resx diff --git a/src/Gemini.Modules.PropertyGrid/Gemini.Modules.PropertyGrid.csproj b/src/Gemini.Modules.PropertyGrid/Gemini.Modules.PropertyGrid.csproj index 4b8722ed..ba3a3fda 100644 --- a/src/Gemini.Modules.PropertyGrid/Gemini.Modules.PropertyGrid.csproj +++ b/src/Gemini.Modules.PropertyGrid/Gemini.Modules.PropertyGrid.csproj @@ -119,7 +119,7 @@ - + ResXFileCodeGenerator Resources.Designer.cs diff --git a/src/Gemini.Modules.PropertyGrid/Properties/Resources.ko-KR.resx b/src/Gemini.Modules.PropertyGrid/Properties/Resources.ko.resx similarity index 100% rename from src/Gemini.Modules.PropertyGrid/Properties/Resources.ko-KR.resx rename to src/Gemini.Modules.PropertyGrid/Properties/Resources.ko.resx diff --git a/src/Gemini/Gemini.csproj b/src/Gemini/Gemini.csproj index 57c4369d..3fd8e2fb 100644 --- a/src/Gemini/Gemini.csproj +++ b/src/Gemini/Gemini.csproj @@ -449,7 +449,7 @@ Resources.de.Designer.cs Designer - + ResXFileCodeGenerator Resources.Designer.cs diff --git a/src/Gemini/Modules/MainMenu/ViewModels/MainMenuSettingsViewModel.cs b/src/Gemini/Modules/MainMenu/ViewModels/MainMenuSettingsViewModel.cs index 461d147e..a7070eb3 100644 --- a/src/Gemini/Modules/MainMenu/ViewModels/MainMenuSettingsViewModel.cs +++ b/src/Gemini/Modules/MainMenu/ViewModels/MainMenuSettingsViewModel.cs @@ -17,7 +17,7 @@ public class MainMenuSettingsViewModel : PropertyChangedBase, ISettingsEditor "en", "de", "zh-Hans", - "ko-KR", + "ko", }; private ITheme _selectedTheme; diff --git a/src/Gemini/Properties/Resources.ko-KR.resx b/src/Gemini/Properties/Resources.ko.resx similarity index 100% rename from src/Gemini/Properties/Resources.ko-KR.resx rename to src/Gemini/Properties/Resources.ko.resx From 2c56f4686bc523fe60eee27e6df09f31551bae24 Mon Sep 17 00:00:00 2001 From: diluculo Date: Mon, 18 Jul 2016 18:21:41 +0900 Subject: [PATCH 13/13] "Async" removed in Run() method of SaveAllFilesCommandHandler.cs --- .../Modules/Shell/Commands/SaveAllFilesCommandHandler.cs | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/Gemini/Modules/Shell/Commands/SaveAllFilesCommandHandler.cs b/src/Gemini/Modules/Shell/Commands/SaveAllFilesCommandHandler.cs index 3f0a7f79..95491b0d 100644 --- a/src/Gemini/Modules/Shell/Commands/SaveAllFilesCommandHandler.cs +++ b/src/Gemini/Modules/Shell/Commands/SaveAllFilesCommandHandler.cs @@ -1,6 +1,7 @@ using Gemini.Framework; using Gemini.Framework.Commands; using Gemini.Framework.Services; +using Gemini.Framework.Threading; using System; using System.Collections.Generic; using System.ComponentModel.Composition; @@ -19,7 +20,7 @@ public SaveAllFilesCommandHandler(IShell shell) _shell = shell; } - public override async Task Run(Command command) + public override Task Run(Command command) { var tasks = new List>>(); @@ -36,6 +37,8 @@ public override async Task Run(Command command) } // TODO: display "Item(s) saved" in statusbar + + return TaskUtility.Completed; } // http://stackoverflow.com/questions/19431494/how-to-use-await-in-a-loop