Merge branch 'develop'

teranum · Jan 9, 2024 · 1b38751 · 1b38751
2 parents df3010a + 27d4a10
commit 1b38751
Show file tree

Hide file tree

Showing 12 changed files with 34 additions and 12 deletions.
diff --git a/src/KOAStudio.Core/KOAStudio.Core.csproj b/src/KOAStudio.Core/KOAStudio.Core.csproj
@@ -20,7 +20,7 @@
 		<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="*" />
 		<PackageReference Include="Microsoft.Xaml.Behaviors.Wpf" Version="*" />
 		<PackageReference Include="AvalonEdit" Version="*" />
-		<PackageReference Include="KHOpenApi.NET" Version="1.4.0" />
+		<PackageReference Include="KHOpenApi.NET" Version="*" />
 	</ItemGroup>
 
 	<ItemGroup>

diff --git a/src/KOAStudio.Core/ViewModels/KOAWindowViewModel.cs b/src/KOAStudio.Core/ViewModels/KOAWindowViewModel.cs
@@ -10,12 +10,13 @@ namespace KOAStudio.Core.ViewModels
     internal partial class KOAWindowViewModel : ObservableObject
     {
         private readonly IUIRequest _uiRequest;
-        private readonly string _baseTitle =
-            System.Windows.Application.ResourceAssembly.GetName().Name
-            + (Environment.Is64BitProcess ? " - 64비트" : " - 32비트");
+        private readonly string _baseTitle;
 
         public KOAWindowViewModel(IUIRequest uiRequest)
         {
+            var assemblyName = System.Windows.Application.ResourceAssembly.GetName();
+            _baseTitle = $"{assemblyName.Name} v{assemblyName.Version.Major}.{assemblyName.Version.Minor} - {(Environment.Is64BitProcess ? "64비트" : "32비트")}";
+
             _uiRequest = uiRequest;
             _title = _baseTitle;
 

diff --git a/src/KOAStudio.Core/Views/KOAWindow.xaml b/src/KOAStudio.Core/Views/KOAWindow.xaml
@@ -41,6 +41,12 @@
                 <Separator />
                 <MenuItem Command="{Binding MenuExitCommand}" Header="끝내기" />
             </MenuItem>
+            <MenuItem Header="보기">
+                <MenuItem
+                    Header="항상위"
+                    IsCheckable="True"
+                    IsChecked="{Binding ElementName=root, Path=Topmost, Mode=TwoWay}" />
+            </MenuItem>
             <MenuItem Header="{Binding MenuCustomizeHeaderText}" ItemsSource="{Binding MenuCustomizeItems}">
                 <MenuItem.ItemContainerStyle>
                     <Style TargetType="{x:Type MenuItem}">

diff --git a/src/KOAStudio/Business/BusinessLogic.UIRequest.cs b/src/KOAStudio/Business/BusinessLogic.UIRequest.cs
@@ -572,6 +572,15 @@ public void MenuCustomizeAction(string text)
                     SetResultText(Properties.Resources.FID_KORNAME);
                 }
                 break;
+            case "KOAStudio 오픈소스":
+                {
+                    var sInfo = new System.Diagnostics.ProcessStartInfo("https://github.com/teranum/KOAStudio")
+                    {
+                        UseShellExecute = true,
+                    };
+                    System.Diagnostics.Process.Start(sInfo);
+                }
+                break;
             default:
                 break;
         }

diff --git a/src/KOAStudio/Business/BusinessLogic.cs b/src/KOAStudio/Business/BusinessLogic.cs
@@ -68,6 +68,7 @@ private struct KEY_VALUE
         "키움 Open API 서비스",
         "상시모의투자 신청",
         "FID 리스트",
+        "KOAStudio 오픈소스",
     ];
 
     private enum TAB_TREE_KIND

diff --git a/src/KOAStudio/FodyWeavers.xml b/src/KOAStudio/FodyWeavers.xml
diff --git a/src/KOAStudio/KOAStudio.csproj b/src/KOAStudio/KOAStudio.csproj
@@ -11,6 +11,7 @@
 		<ApplicationIcon>app.ico</ApplicationIcon>
 		<BaseOutputPath>$(SolutionDir)bin\</BaseOutputPath>
 		<Platforms>x86;x64</Platforms>
+		<Version>1.1</Version>
 		<PreserveCompilationContext>false</PreserveCompilationContext>
 		<NoWarn>$(NoWarn);MA0048</NoWarn>
 	</PropertyGroup>

diff --git a/src/WKOAStudio/AssemblyInfo.cs b/src/WKOAStudio/AssemblyInfo.cs
@@ -1,3 +1,4 @@
+using System.Reflection;
 using System.Windows;
 
 [assembly: ThemeInfo(

diff --git a/src/WKOAStudio/Business/BusinessLogic.UIRequests.cs b/src/WKOAStudio/Business/BusinessLogic.UIRequests.cs
@@ -535,6 +535,15 @@ public void MenuCustomizeAction(string text)
                     SetResultText(stringBuilder.ToString());
                 }
                 break;
+            case "WKOAStudio 오픈소스":
+                {
+                    var sInfo = new System.Diagnostics.ProcessStartInfo("https://github.com/teranum/KOAStudio")
+                    {
+                        UseShellExecute = true,
+                    };
+                    System.Diagnostics.Process.Start(sInfo);
+                }
+                break;
             default:
                 break;
         }

diff --git a/src/WKOAStudio/Business/BusinessLogic.cs b/src/WKOAStudio/Business/BusinessLogic.cs
@@ -70,6 +70,7 @@ private struct KEY_VALUE
         "키움 Open API 서비스",
         "상시모의투자 신청",
         "FID 리스트",
+        "WKOAStudio 오픈소스",
     ];
 
     private enum TAB_TREE_KIND

diff --git a/src/WKOAStudio/FodyWeavers.xml b/src/WKOAStudio/FodyWeavers.xml
diff --git a/src/WKOAStudio/WKOAStudio.csproj b/src/WKOAStudio/WKOAStudio.csproj
@@ -11,6 +11,7 @@
 		<ApplicationIcon>app.ico</ApplicationIcon>
 		<BaseOutputPath>$(SolutionDir)bin\</BaseOutputPath>
 		<Platforms>x86;x64</Platforms>
+		<Version>1.1</Version>
 		<PreserveCompilationContext>false</PreserveCompilationContext>
 		<NoWarn>$(NoWarn);MA0048</NoWarn>
 	</PropertyGroup>