Skip to content

Commit

Permalink
1.0.5.7はリジェクト、バグバグでウィンドウを閉じると2回目起動しないという...
Browse files Browse the repository at this point in the history
  • Loading branch information
komiyamma committed Mar 28, 2023
1 parent 3f404f7 commit 11c9cb2
Show file tree
Hide file tree
Showing 31 changed files with 45 additions and 32 deletions.
Binary file modified src/.vs/HmChatGPT35Turbo/DesignTimeBuild/.dtbcache.v2
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file modified src/.vs/HmChatGPT35Turbo/v17/.futdcache.v2
Binary file not shown.
Binary file modified src/.vs/HmChatGPT35Turbo/v17/.suo
Binary file not shown.
Binary file modified src/.vs/ProjectEvaluation/hmchatgpt35turbo.metadata.v6.1
Binary file not shown.
Binary file modified src/.vs/ProjectEvaluation/hmchatgpt35turbo.projects.v6.1
Binary file not shown.
6 changes: 3 additions & 3 deletions src/HmChatGPT35Turbo/HmChatGPT35Turbo.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@
<BaseOutputPath>bin\$(PlatformTarget)</BaseOutputPath>
<Authors>Akitsugu Komiyama</Authors>
<Copyright>$(Authors)</Copyright>
<AssemblyVersion>1.0.5.7</AssemblyVersion>
<FileVersion>1.0.5.7</FileVersion>
<Version>1.0.5.7</Version>
<AssemblyVersion>1.0.5.8</AssemblyVersion>
<FileVersion>1.0.5.8</FileVersion>
<Version>1.0.5.8</Version>
</PropertyGroup>

<PropertyGroup Condition="'$(Platform)'=='x86'">
Expand Down
13 changes: 9 additions & 4 deletions src/HmChatGPT35Turbo/WinForm.cs
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ void SetForm()
this.Width = (int)((500 * DisplayDpi) / 96);
this.Height = (int)((210 * DisplayDpi) / 96);
this.FormClosing += AppForm_FormClosing;
this.AutoScaleMode = AutoScaleMode.Dpi;
// this.AutoScaleMode = AutoScaleMode.Dpi;
}

private void AppForm_FormClosing(object? sender, FormClosingEventArgs e)
Expand Down Expand Up @@ -101,9 +101,14 @@ public void UpdateTextBox()
tb.Text = selectedText;
}

this.ActiveControl = tb;
tb.Focus();
tb.Select(tb.Text.Length, 0); // カーソルの位置を末尾に配置しておく。
// 見えてない時は、以下はエラーを履くので、tryでくくっておく
try {
this.ActiveControl = tb;
tb.Focus();
tb.Select(tb.Text.Length, 0); // カーソルの位置を末尾に配置しておく。
}
catch (Exception) {
}
}
}

Expand Down
34 changes: 21 additions & 13 deletions src/HmChatGPT35Turbo/WinFormCOMInterface.cs
Original file line number Diff line number Diff line change
Expand Up @@ -17,24 +17,32 @@ public class HmChatGPT35Turbo

public long CreateForm(string key = "")
{
if (form != null)
try
{
form.UpdateTextBox();
}
if (form != null)
{
form.UpdateTextBox();
}

if (form == null || !form.Visible)
{
output = new HmOutputWriter();
input = new HmInputReader();
form = new AppForm(key, output, input);
if (form == null || !form.Visible)
{
output = new HmOutputWriter();
input = new HmInputReader();
form = new AppForm(key, output, input);

sm.CreateSharedMemory();
}
sm.CreateSharedMemory();
}

form.Show();
form.Show();

// フォームを前に持ってくるだけ
form.BringToFront();
// フォームを前に持ってくるだけ
form.BringToFront();
}
catch (Exception ex)
{
string err = ex.Message + "\r\n" + ex.StackTrace;
output?.WriteLine(err);
}
return -1;
}

Expand Down
Binary file not shown.
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
"compilationOptions": {},
"targets": {
".NETCoreApp,Version=v6.0": {
"HmChatGPT35Turbo/1.0.5.7": {
"HmChatGPT35Turbo/1.0.5.8": {
"dependencies": {
"Betalgo.OpenAI.GPT3": "6.8.1",
"HmNetCOM": "2.0.7.9"
Expand Down Expand Up @@ -154,7 +154,7 @@
}
},
"libraries": {
"HmChatGPT35Turbo/1.0.5.7": {
"HmChatGPT35Turbo/1.0.5.8": {
"type": "project",
"serviceable": false,
"sha512": ""
Expand Down
Binary file not shown.
Binary file not shown.
Binary file not shown.
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
"compilationOptions": {},
"targets": {
".NETCoreApp,Version=v6.0": {
"HmChatGPT35Turbo/1.0.5.7": {
"HmChatGPT35Turbo/1.0.5.8": {
"dependencies": {
"Betalgo.OpenAI.GPT3": "6.8.1",
"HmNetCOM": "2.0.7.9"
Expand Down Expand Up @@ -154,7 +154,7 @@
}
},
"libraries": {
"HmChatGPT35Turbo/1.0.5.7": {
"HmChatGPT35Turbo/1.0.5.8": {
"type": "project",
"serviceable": false,
"sha512": ""
Expand Down
Binary file not shown.
Binary file not shown.
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
},
"projects": {
"G:\\repogitory\\hm_openai_chatgpt35_turbo\\src\\HmChatGPT35Turbo\\HmChatGPT35Turbo.csproj": {
"version": "1.0.5.7",
"version": "1.0.5.8",
"restore": {
"projectUniqueName": "G:\\repogitory\\hm_openai_chatgpt35_turbo\\src\\HmChatGPT35Turbo\\HmChatGPT35Turbo.csproj",
"projectName": "HmChatGPT35Turbo",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,11 @@
[assembly: System.Reflection.AssemblyCompanyAttribute("Akitsugu Komiyama")]
[assembly: System.Reflection.AssemblyConfigurationAttribute("Release")]
[assembly: System.Reflection.AssemblyCopyrightAttribute("Akitsugu Komiyama")]
[assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.5.7")]
[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.5.7")]
[assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.5.8")]
[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.5.8")]
[assembly: System.Reflection.AssemblyProductAttribute("HmChatGPT35Turbo")]
[assembly: System.Reflection.AssemblyTitleAttribute("HmChatGPT35Turbo")]
[assembly: System.Reflection.AssemblyVersionAttribute("1.0.5.7")]
[assembly: System.Reflection.AssemblyVersionAttribute("1.0.5.8")]
[assembly: System.Runtime.Versioning.TargetPlatformAttribute("Windows7.0")]
[assembly: System.Runtime.Versioning.SupportedOSPlatformAttribute("Windows7.0")]

Expand Down
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2bc6103f1247fe53a6c2642ebfcddc1a9720f49a
250069fc9e7849a6c0b846693174cc037a91d385
Original file line number Diff line number Diff line change
@@ -1 +1 @@
{"{cf709244-a284-419e-832d-0b354ee2950d}":{"type":"HmNetCOM.HmMacroCOMVar","assembly":"HmChatGPT35Turbo, Version=1.0.5.7, Culture=neutral, PublicKeyToken=null","progid":"HmNetCOM.HmMacroCOMVar"},"{bccbe82c-56e1-4056-ae7c-3c4f62806732}":{"type":"HmOpenAIChatGpt35Turbo.HmChatGPT35Turbo","assembly":"HmChatGPT35Turbo, Version=1.0.5.7, Culture=neutral, PublicKeyToken=null","progid":"HmOpenAIChatGpt35Turbo.HmChatGPT35Turbo"},"{9818f69e-a37d-4a03-bca1-c4c172366473}":{"type":"HmOpenAIChatGpt35Turbo.HmChatGPT35TurboSharedMemory","assembly":"HmChatGPT35Turbo, Version=1.0.5.7, Culture=neutral, PublicKeyToken=null","progid":"HmOpenAIChatGpt35Turbo.HmChatGPT35TurboSharedMemory"}}
{"{cf709244-a284-419e-832d-0b354ee2950d}":{"type":"HmNetCOM.HmMacroCOMVar","assembly":"HmChatGPT35Turbo, Version=1.0.5.8, Culture=neutral, PublicKeyToken=null","progid":"HmNetCOM.HmMacroCOMVar"},"{bccbe82c-56e1-4056-ae7c-3c4f62806732}":{"type":"HmOpenAIChatGpt35Turbo.HmChatGPT35Turbo","assembly":"HmChatGPT35Turbo, Version=1.0.5.8, Culture=neutral, PublicKeyToken=null","progid":"HmOpenAIChatGpt35Turbo.HmChatGPT35Turbo"},"{9818f69e-a37d-4a03-bca1-c4c172366473}":{"type":"HmOpenAIChatGpt35Turbo.HmChatGPT35TurboSharedMemory","assembly":"HmChatGPT35Turbo, Version=1.0.5.8, Culture=neutral, PublicKeyToken=null","progid":"HmOpenAIChatGpt35Turbo.HmChatGPT35TurboSharedMemory"}}
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
2 changes: 1 addition & 1 deletion src/HmChatGPT35Turbo/obj/project.assets.json
Original file line number Diff line number Diff line change
Expand Up @@ -592,7 +592,7 @@
"C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder": {}
},
"project": {
"version": "1.0.5.7",
"version": "1.0.5.8",
"restore": {
"projectUniqueName": "G:\\repogitory\\hm_openai_chatgpt35_turbo\\src\\HmChatGPT35Turbo\\HmChatGPT35Turbo.csproj",
"projectName": "HmChatGPT35Turbo",
Expand Down
2 changes: 1 addition & 1 deletion src/HmChatGPT35Turbo/obj/project.nuget.cache
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"version": 2,
"dgSpecHash": "7Bmoa+w+6vseaW7D+Zf1M1GiLp7iDIIwTOm0fMNzvPDHRluKACGJyFTBQ4/SxyRwx1RNN9N2qSFqeZ01Z7TyDw==",
"dgSpecHash": "bghu/b/3b6cvU6tZCmTyo3ovUs+jiEz/OoNIFfHkqttlkko475rXYq0CdkpqGAtx44fcoRtnaMY5LNMvohVekg==",
"success": true,
"projectFilePath": "G:\\repogitory\\hm_openai_chatgpt35_turbo\\src\\HmChatGPT35Turbo\\HmChatGPT35Turbo.csproj",
"expectedPackageFiles": [
Expand Down

0 comments on commit 11c9cb2

Please sign in to comment.