From cefff2910d66ca95505ff1c692f70018247c9d33 Mon Sep 17 00:00:00 2001 From: sydneyowl <84191144+SydneyOwl@users.noreply.github.com> Date: Mon, 1 Apr 2024 16:36:45 +0800 Subject: [PATCH] :construction_worker: Elegant CI --- .github/workflows/build.yml | 101 ++++++++++++ .github/workflows/gt12.yml | 29 ---- .github/workflows/shx8x00.yml | 29 ---- .github/workflows/shx8x00_nobt.yml | 29 ---- GT12/App.config | 8 + GT12/HID/VERSION.cs | 8 + GT12/Properties/AssemblyInfo.cs | 5 - GT12/SHX-GT12-CPS.csproj | 5 + GT12/SHX_GT12_CPS.FormAbout.resx | 30 ---- GT12/SHX_GT12_CPS/FormAbout.Designer.cs | 154 ++++++++++++++++++ GT12/SHX_GT12_CPS/FormAbout.cs | 110 ++----------- GT12/SHX_GT12_CPS/FormAbout.resx | 130 +++++++++++++++ GT12/SHX_GT12_CPS/FormMain.cs | 2 +- ...ner.cs => FormSatelliteHelper.Designer.cs} | 4 +- ...elliteHelper.cs => FormSatelliteHelper.cs} | 4 +- ...teHelper.resx => FormSatelliteHelper.resx} | 0 readme.md | 8 +- shx8x00/SQ5R.Properties/VERSION.cs | 8 + shx8x00/SQ5R.View.FormAbout.resx | 58 ------- shx8x00/SQ5R.View/FormAbout.Designer.cs | 154 ++++++++++++++++++ shx8x00/SQ5R.View/FormAbout.cs | 115 ++----------- shx8x00/SQ5R.View/FormAbout.resx | 130 +++++++++++++++ 22 files changed, 730 insertions(+), 391 deletions(-) create mode 100644 .github/workflows/build.yml delete mode 100644 .github/workflows/gt12.yml delete mode 100644 .github/workflows/shx8x00.yml delete mode 100644 .github/workflows/shx8x00_nobt.yml create mode 100644 GT12/App.config create mode 100644 GT12/HID/VERSION.cs delete mode 100644 GT12/SHX_GT12_CPS.FormAbout.resx create mode 100644 GT12/SHX_GT12_CPS/FormAbout.Designer.cs create mode 100644 GT12/SHX_GT12_CPS/FormAbout.resx rename GT12/SHX_GT12_CPS/{FromSatelliteHelper.Designer.cs => FormSatelliteHelper.Designer.cs} (99%) rename GT12/SHX_GT12_CPS/{FromSatelliteHelper.cs => FormSatelliteHelper.cs} (99%) rename GT12/SHX_GT12_CPS/{FromSatelliteHelper.resx => FormSatelliteHelper.resx} (100%) create mode 100644 shx8x00/SQ5R.Properties/VERSION.cs delete mode 100644 shx8x00/SQ5R.View.FormAbout.resx create mode 100644 shx8x00/SQ5R.View/FormAbout.Designer.cs create mode 100644 shx8x00/SQ5R.View/FormAbout.resx diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml new file mode 100644 index 0000000..c09d597 --- /dev/null +++ b/.github/workflows/build.yml @@ -0,0 +1,101 @@ +name: Senhaix Build + +permissions: + contents: write + +on: + push: + branches: [ "master" ] + tags: [ "*" ] + pull_request: + branches: [ "master" ] + +jobs: + + build: + runs-on: windows-latest + + steps: + - name: Checkout + uses: actions/checkout@v3 + with: + fetch-depth: 0 + submodules: 'recursive' + + # Add MSBuild to the PATH: https://github.com/microsoft/setup-msbuild + - name: Setup MSBuild.exe + uses: microsoft/setup-msbuild@v1.0.2 + + # Restore the application to populate the obj folder with RuntimeIdentifiers + - name: Build the application + shell: pwsh + run: | + mkdir tmp + Set-TimeZone -Name "China Standard Time" + $commitHash = git rev-parse --short HEAD + $buildTime = Get-Date -Format "yyyy-MM-dd HH:mm:ss" + $tagName = git describe --tags --abbrev=0 --always || "" + cd GT12\HID + $sourceFile = "./VERSION.cs" + (Get-Content $sourceFile) ` + -replace '@COMMIT_HASH@', $commitHash ` + -replace '@BUILD_TIME@', $buildTime ` + -replace '@TAG_NAME@', $tagName ` + | Set-Content $sourceFile + cd .. + msbuild /t:Restore + msbuild + cd bin\Debug\net462 + mkdir -Force lib + mkdir GT12-Freq-Writer + mv *.dll lib + mv lib GT12-Freq-Writer + mv *.exe GT12-Freq-Writer + mv *.config GT12-Freq-Writer + mv *.pdb GT12-Freq-Writer + cp D:\a\senhaix-freq-writer-enhanced\senhaix-freq-writer-enhanced\data\satellite_data\data\amsat-all-frequencies.json GT12-Freq-Writer + Compress-Archive -Path .\GT12-Freq-Writer -DestinationPath ..\..\..\..\tmp\GT12-Freq-Writer-${tagName}.zip + cd ..\..\..\..\shx8x00\SQ5R.Properties + $sourceFile = "./VERSION.cs" + (Get-Content $sourceFile) ` + -replace '@COMMIT_HASH@', $commitHash ` + -replace '@BUILD_TIME@', $buildTime ` + -replace '@TAG_NAME@', $tagName ` + | Set-Content $sourceFile + cd .. + msbuild SHX8800.csproj /t:Restore + msbuild SHX8800.csproj + msbuild SHX8800_nobt.csproj /t:Restore + msbuild SHX8800_nobt.csproj + cd bin\Debug\net462 + mkdir -Force lib + mkdir Shx8x00-Freq-Writer-With-Bluetooth + mv *.dll lib + mv lib Shx8x00-Freq-Writer-With-Bluetooth + mv *.exe Shx8x00-Freq-Writer-With-Bluetooth + mv *.config Shx8x00-Freq-Writer-With-Bluetooth + mv *.pdb Shx8x00-Freq-Writer-With-Bluetooth + cp D:\a\senhaix-freq-writer-enhanced\senhaix-freq-writer-enhanced\data\satellite_data\data\amsat-all-frequencies.json Shx8x00-Freq-Writer-With-Bluetooth + Compress-Archive -Path .\Shx8x00-Freq-Writer-With-Bluetooth -DestinationPath ..\..\..\..\tmp\Shx8x00-Freq-Writer-With-Bluetooth-${tagName}.zip + cd ..\net20 + mkdir -Force lib + mkdir Shx8x00-Freq-Writer + mv *.dll lib + mv lib Shx8x00-Freq-Writer + mv *.exe Shx8x00-Freq-Writer + mv *.config Shx8x00-Freq-Writer + mv *.pdb Shx8x00-Freq-Writer + cp D:\a\senhaix-freq-writer-enhanced\senhaix-freq-writer-enhanced\data\satellite_data\data\amsat-all-frequencies.json Shx8x00-Freq-Writer + Compress-Archive -Path .\Shx8x00-Freq-Writer -DestinationPath ..\..\..\..\tmp\Shx8x00-Freq-Writer-${tagName}.zip + + - name: Upload Artifact + uses: actions/upload-artifact@v2 + with: + name: entire-folder-artifact + path: ./tmp # 替换为你要上传的文件夹路径 + + - name: Release + uses: softprops/action-gh-release@v2 + if: startsWith(github.ref, 'refs/tags/') + with: + files: ./tmp/* \ No newline at end of file diff --git a/.github/workflows/gt12.yml b/.github/workflows/gt12.yml deleted file mode 100644 index 8715f6c..0000000 --- a/.github/workflows/gt12.yml +++ /dev/null @@ -1,29 +0,0 @@ -name: GT12 BUILD - -on: - push: - branches: [ "master" ] - pull_request: - branches: [ "master" ] - -jobs: - - build: - runs-on: windows-latest - - steps: - - name: Checkout - uses: actions/checkout@v3 - with: - fetch-depth: 0 - - # Add MSBuild to the PATH: https://github.com/microsoft/setup-msbuild - - name: Setup MSBuild.exe - uses: microsoft/setup-msbuild@v1.0.2 - - # Restore the application to populate the obj folder with RuntimeIdentifiers - - name: Build the application - run: | - cd GT12 - msbuild /t:Restore - msbuild diff --git a/.github/workflows/shx8x00.yml b/.github/workflows/shx8x00.yml deleted file mode 100644 index e328788..0000000 --- a/.github/workflows/shx8x00.yml +++ /dev/null @@ -1,29 +0,0 @@ -name: shx8x00 BUILD - -on: - push: - branches: [ "master" ] - pull_request: - branches: [ "master" ] - -jobs: - - build: - runs-on: windows-latest - - steps: - - name: Checkout - uses: actions/checkout@v3 - with: - fetch-depth: 0 - - # Add MSBuild to the PATH: https://github.com/microsoft/setup-msbuild - - name: Setup MSBuild.exe - uses: microsoft/setup-msbuild@v1.0.2 - - # Restore the application to populate the obj folder with RuntimeIdentifiers - - name: Build the application - run: | - cd shx8x00 - msbuild SHX8800.csproj /t:Restore - msbuild SHX8800.csproj diff --git a/.github/workflows/shx8x00_nobt.yml b/.github/workflows/shx8x00_nobt.yml deleted file mode 100644 index 156a6ad..0000000 --- a/.github/workflows/shx8x00_nobt.yml +++ /dev/null @@ -1,29 +0,0 @@ -name: shx8x00_nobt BUILD - -on: - push: - branches: [ "master" ] - pull_request: - branches: [ "master" ] - -jobs: - - build: - runs-on: windows-latest - - steps: - - name: Checkout - uses: actions/checkout@v3 - with: - fetch-depth: 0 - - # Add MSBuild to the PATH: https://github.com/microsoft/setup-msbuild - - name: Setup MSBuild.exe - uses: microsoft/setup-msbuild@v1.0.2 - - # Restore the application to populate the obj folder with RuntimeIdentifiers - - name: Build the application - run: | - cd shx8x00 - msbuild SHX8800_nobt.csproj /t:Restore - msbuild SHX8800_nobt.csproj diff --git a/GT12/App.config b/GT12/App.config new file mode 100644 index 0000000..c54d460 --- /dev/null +++ b/GT12/App.config @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/GT12/HID/VERSION.cs b/GT12/HID/VERSION.cs new file mode 100644 index 0000000..2d1b0fa --- /dev/null +++ b/GT12/HID/VERSION.cs @@ -0,0 +1,8 @@ +namespace HID; + +public class VERSION +{ + public static string GitCommitHash = "@COMMIT_HASH@"; + public static string BuildTime = "@BUILD_TIME@"; + public static string Version = "@TAG_NAME@"; +} \ No newline at end of file diff --git a/GT12/Properties/AssemblyInfo.cs b/GT12/Properties/AssemblyInfo.cs index 2a78a9a..7e39ae8 100644 --- a/GT12/Properties/AssemblyInfo.cs +++ b/GT12/Properties/AssemblyInfo.cs @@ -5,12 +5,7 @@ using System.Runtime.Versioning; [assembly: AssemblyTitle("SHX-GT12 CPS")] -[assembly: AssemblyDescription("")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("")] [assembly: AssemblyProduct("SHX-GT12 CPS")] -[assembly: AssemblyCopyright("Copyright © 2021")] -[assembly: AssemblyTrademark("")] [assembly: ComVisible(false)] [assembly: Guid("a8381aea-8dc4-43a5-9de5-f6bc6d2c2de5")] [assembly: AssemblyFileVersion("1.0.0.0")] diff --git a/GT12/SHX-GT12-CPS.csproj b/GT12/SHX-GT12-CPS.csproj index 1a233a3..aa76d27 100644 --- a/GT12/SHX-GT12-CPS.csproj +++ b/GT12/SHX-GT12-CPS.csproj @@ -25,4 +25,9 @@ .\DevComponents.DotNetBar2.dll + + + Form + + \ No newline at end of file diff --git a/GT12/SHX_GT12_CPS.FormAbout.resx b/GT12/SHX_GT12_CPS.FormAbout.resx deleted file mode 100644 index 5de8d0b..0000000 --- a/GT12/SHX_GT12_CPS.FormAbout.resx +++ /dev/null @@ -1,30 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -text/microsoft-resx1.3System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089AAEAAAD/////AQAAAAAAAAAMAgAAAFFTeXN0ZW0uRHJhd2luZywgVmVyc2lvbj00LjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWIwM2Y1ZjdmMTFkNTBhM2EFAQAAABNTeXN0ZW0uRHJhd2luZy5JY29uAgAAAAhJY29uRGF0YQhJY29uU2l6ZQcEAhNTeXN0ZW0uRHJhd2luZy5TaXplAgAAAAIAAAAJAwAAAAX8////E1N5c3RlbS5EcmF3aW5nLlNpemUCAAAABXdpZHRoBmhlaWdodAAACAgCAAAAAAAAAAAAAAAPAwAAAP4CAAACAAABAAEAICAQAAEABADoAgAAFgAAACgAAAAgAAAAQAAAAAEABAAAAAAAgAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACAAACAAAAAgIAAgAAAAIAAgACAgAAAgICAAMDAwAAAAP8AAP8AAAD//wD/AAAA/wD/AP//AAD///8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAB3dwd3cHd3AAAAAAAAAAAAd3cHd3B3dwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAB3dwd3cHd3AAAAAAAAAAAAd3cHd3B3dwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAB3dwd3cHd3AAAAAAAAAAAAd3cHd3B3dwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAqqqqqqqqqgAAAAAAAAAAAKAAoACgAKoAAAAAAAAAAACgoKCgoKCqAAAAAAAAAAAAoACgAKAAqgAAAAAAAAAAAKqqqqqqqqoAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHBwd3d3dwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcHB3d3d3cAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwcHd3d3cAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD/gAH//wAA//4AAH/+AAB//gAAf/4AAH/+AAB//gAAf/4AAH/+AAB//gAAf/4AAH/+AAB//gAAf/4AAH/+AAB//gAAf/4AAH/+AAB//gAAf/4AAH/+AAB//gAAf/4AAH/+AAB//wAA///H4///x+P//8f3///H////x////8f//ws=AAEAAAD/////AQAAAAAAAAAMAgAAAFFTeXN0ZW0uRHJhd2luZywgVmVyc2lvbj00LjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWIwM2Y1ZjdmMTFkNTBhM2EFAQAAABVTeXN0ZW0uRHJhd2luZy5CaXRtYXABAAAABERhdGEHAgIAAAAJAwAAAA8DAAAAIwEAAAKJUE5HDQoaCgAAAA1JSERSAAAAIAAAACAIBgAAAHN6evQAAAAEZ0FNQQAAsY8L/GEFAAAACXBIWXMAABJ0AAASdAHeZh94AAAAxUlEQVRYR+2UwQ6DMAzF+un98yGFVKTbEyRup11mZHVEYNrLWoFX8Cf8N5DdwNc2mNlA5hlMJp55pkyMEpdQQSLGAr33j/XO8V4Qo2JEjAXGqeL65HjXxbyHqBgLjBPF9c7xXhCjYkSMihExZ4BeWzdwxXL38wxzBavr+H2KmcOV+3mGmYPVa9sG1sWoGBFjAfVPl525mNLH1MzFxMiKGAuok2VnLqb0MTVzMTGyIsYC6mTZmYspfUzN3CViiLgFFc74QGsHvwirjKN99S8AAAAASUVORK5CYIIL \ No newline at end of file diff --git a/GT12/SHX_GT12_CPS/FormAbout.Designer.cs b/GT12/SHX_GT12_CPS/FormAbout.Designer.cs new file mode 100644 index 0000000..cff53a1 --- /dev/null +++ b/GT12/SHX_GT12_CPS/FormAbout.Designer.cs @@ -0,0 +1,154 @@ +using System.ComponentModel; + +namespace SHX_GT12_CPS; + +partial class FormAbout +{ + /// + /// Required designer variable. + /// + private IContainer components = null; + + /// + /// Clean up any resources being used. + /// + /// true if managed resources should be disposed; otherwise, false. + protected override void Dispose(bool disposing) + { + if (disposing && (components != null)) + { + components.Dispose(); + } + + base.Dispose(disposing); + } + + #region Windows Form Designer generated code + + /// + /// Required method for Designer support - do not modify + /// the contents of this method with the code editor. + /// + private void InitializeComponent() + { + System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(FormAbout)); + this.label1 = new System.Windows.Forms.Label(); + this.label2 = new System.Windows.Forms.Label(); + this.label3 = new System.Windows.Forms.Label(); + this.label4 = new System.Windows.Forms.Label(); + this.label5 = new System.Windows.Forms.Label(); + this.label6 = new System.Windows.Forms.Label(); + this.ver = new System.Windows.Forms.Label(); + this.commit = new System.Windows.Forms.Label(); + this.ctime = new System.Windows.Forms.Label(); + this.SuspendLayout(); + // + // label1 + // + this.label1.Image = ((System.Drawing.Image)(resources.GetObject("label1.Image"))); + this.label1.Location = new System.Drawing.Point(21, 50); + this.label1.Name = "label1"; + this.label1.Size = new System.Drawing.Size(45, 50); + this.label1.TabIndex = 0; + // + // label2 + // + this.label2.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.label2.Location = new System.Drawing.Point(89, 27); + this.label2.Name = "label2"; + this.label2.Size = new System.Drawing.Size(246, 47); + this.label2.TabIndex = 1; + this.label2.Text = "森海克斯GT12写频软件修改版"; + // + // label3 + // + this.label3.Location = new System.Drawing.Point(101, 73); + this.label3.Name = "label3"; + this.label3.Size = new System.Drawing.Size(75, 27); + this.label3.TabIndex = 2; + this.label3.Text = "版本号："; + // + // label4 + // + this.label4.Location = new System.Drawing.Point(101, 101); + this.label4.Name = "label4"; + this.label4.Size = new System.Drawing.Size(75, 21); + this.label4.TabIndex = 3; + this.label4.Text = "提交Hash:"; + // + // label5 + // + this.label5.Location = new System.Drawing.Point(45, 188); + this.label5.Name = "label5"; + this.label5.Size = new System.Drawing.Size(323, 76); + this.label5.TabIndex = 4; + this.label5.Text = "https://github.com/SydneyOwl/senhaix-freq-writer-enhanced"; + // + // label6 + // + this.label6.Location = new System.Drawing.Point(101, 131); + this.label6.Name = "label6"; + this.label6.Size = new System.Drawing.Size(217, 44); + this.label6.TabIndex = 5; + this.label6.Text = "编译时间："; + this.label6.Click += new System.EventHandler(this.label6_Click_1); + // + // ver + // + this.ver.Location = new System.Drawing.Point(156, 73); + this.ver.Name = "ver"; + this.ver.Size = new System.Drawing.Size(114, 25); + this.ver.TabIndex = 6; + this.ver.Text = "（未知）"; + // + // commit + // + this.commit.Location = new System.Drawing.Point(156, 101); + this.commit.Name = "commit"; + this.commit.Size = new System.Drawing.Size(114, 28); + this.commit.TabIndex = 7; + this.commit.Text = "（未知）"; + // + // ctime + // + this.ctime.Location = new System.Drawing.Point(156, 131); + this.ctime.Name = "ctime"; + this.ctime.Size = new System.Drawing.Size(114, 25); + this.ctime.TabIndex = 8; + this.ctime.Text = "（未知）"; + // + // FormAbout + // + this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.ClientSize = new System.Drawing.Size(347, 223); + this.Controls.Add(this.ctime); + this.Controls.Add(this.commit); + this.Controls.Add(this.ver); + this.Controls.Add(this.label6); + this.Controls.Add(this.label5); + this.Controls.Add(this.label4); + this.Controls.Add(this.label3); + this.Controls.Add(this.label2); + this.Controls.Add(this.label1); + this.Name = "FormAbout"; + this.Text = "关于"; + this.ResumeLayout(false); + } + + private System.Windows.Forms.Label ver; + private System.Windows.Forms.Label commit; + private System.Windows.Forms.Label ctime; + + private System.Windows.Forms.Label label6; + + private System.Windows.Forms.Label label3; + private System.Windows.Forms.Label label4; + private System.Windows.Forms.Label label5; + + private System.Windows.Forms.Label label2; + + private System.Windows.Forms.Label label1; + + #endregion +} \ No newline at end of file diff --git a/GT12/SHX_GT12_CPS/FormAbout.cs b/GT12/SHX_GT12_CPS/FormAbout.cs index f0e22cb..ab27ce4 100644 --- a/GT12/SHX_GT12_CPS/FormAbout.cs +++ b/GT12/SHX_GT12_CPS/FormAbout.cs @@ -1,113 +1,29 @@ -using System; -using System.ComponentModel; -using System.Drawing; +using System; +using System.Diagnostics; +using System.Reflection; using System.Windows.Forms; +using HID; namespace SHX_GT12_CPS; -public class FormAbout : Form +public partial class FormAbout : Form { - private readonly IContainer components = null; - - private Label label_MsgLine1; - - private Label label_MsgLine2; - - private Label label_MsgLine3; - - private Label label_MsgLine4; - private readonly string lang = "中文"; - - private PictureBox pictureBox1; - public FormAbout() { InitializeComponent(); + + ver.Text = VERSION.Version; + commit.Text = VERSION.GitCommitHash; + ctime.Text = VERSION.BuildTime; } - private void FormAbout_Load(object sender, EventArgs e) + private void label6_Click(object sender, EventArgs e) { - if (lang == "中文") - { - label_MsgLine1.Text = "GT12 编程软件修改版"; - label_MsgLine2.Text = "版本 v0.2"; - label_MsgLine3.Text = "73 de sydneyowl"; - label_MsgLine4.Text = ""; - } - else - { - label_MsgLine1.Text = "GT12 Program Software Enhanced"; - label_MsgLine2.Text = "Version v0.2"; - label_MsgLine3.Text = "73 de sydneyowl"; - label_MsgLine4.Text = ""; - } - } - - protected override void Dispose(bool disposing) - { - if (disposing && components != null) components.Dispose(); - - base.Dispose(disposing); + // throw new System.NotImplementedException(); } - private void InitializeComponent() + private void label6_Click_1(object sender, EventArgs e) { - var resources = - new ComponentResourceManager(typeof(FormAbout)); - label_MsgLine1 = new Label(); - label_MsgLine2 = new Label(); - label_MsgLine3 = new Label(); - label_MsgLine4 = new Label(); - pictureBox1 = new PictureBox(); - ((ISupportInitialize)pictureBox1).BeginInit(); - SuspendLayout(); - label_MsgLine1.AutoSize = true; - label_MsgLine1.Location = new Point(132, 35); - label_MsgLine1.Name = "label_MsgLine1"; - label_MsgLine1.Size = new Size(55, 15); - label_MsgLine1.TabIndex = 0; - label_MsgLine1.Text = "label1"; - label_MsgLine2.AutoSize = true; - label_MsgLine2.Location = new Point(132, 66); - label_MsgLine2.Name = "label_MsgLine2"; - label_MsgLine2.Size = new Size(55, 15); - label_MsgLine2.TabIndex = 1; - label_MsgLine2.Text = "label2"; - label_MsgLine3.AutoSize = true; - label_MsgLine3.Location = new Point(132, 100); - label_MsgLine3.Name = "label_MsgLine3"; - label_MsgLine3.Size = new Size(55, 15); - label_MsgLine3.TabIndex = 2; - label_MsgLine3.Text = "label3"; - label_MsgLine4.AutoSize = true; - label_MsgLine4.Location = new Point(132, 132); - label_MsgLine4.Name = "label_MsgLine4"; - label_MsgLine4.Size = new Size(55, 15); - label_MsgLine4.TabIndex = 3; - label_MsgLine4.Text = "label4"; - pictureBox1.BackgroundImageLayout = ImageLayout.Center; - pictureBox1.Image = (Image)resources.GetObject("pictureBox1.Image"); - pictureBox1.Location = new Point(46, 65); - pictureBox1.Name = "pictureBox1"; - pictureBox1.Size = new Size(50, 50); - pictureBox1.SizeMode = PictureBoxSizeMode.CenterImage; - pictureBox1.TabIndex = 4; - pictureBox1.TabStop = false; - AutoScaleDimensions = new SizeF(8f, 15f); - AutoScaleMode = AutoScaleMode.Font; - ClientSize = new Size(529, 183); - Controls.Add(pictureBox1); - Controls.Add(label_MsgLine4); - Controls.Add(label_MsgLine3); - Controls.Add(label_MsgLine2); - Controls.Add(label_MsgLine1); - Icon = (Icon)resources.GetObject("$this.Icon"); - Name = "FormAbout"; - StartPosition = FormStartPosition.CenterParent; - Text = "GT12"; - Load += FormAbout_Load; - ((ISupportInitialize)pictureBox1).EndInit(); - ResumeLayout(false); - PerformLayout(); + // throw new System.NotImplementedException(); } } \ No newline at end of file diff --git a/GT12/SHX_GT12_CPS/FormAbout.resx b/GT12/SHX_GT12_CPS/FormAbout.resx new file mode 100644 index 0000000..bd8c7b7 --- /dev/null +++ b/GT12/SHX_GT12_CPS/FormAbout.resx @@ -0,0 +1,130 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 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 + + + + + iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO + wwAADsMBx2+oZAAAAMVJREFUWEftlMEOgzAMxfrp/fMhhVSk2xMkbqddZmR1RGDay1qBV/An/DeQ3cDX + NpjZQOYZTCaeeaZMjBKXUEEixgK994/1zvFeEKNiRIwFxqni+uR418W8h6gYC4wTxfXO8V4Qo2JEjIoR + MWeAXls3cMVy9/MMcwWr6/h9ipnDlft5hpmD1WvbBtbFqBgRYwH1T5eduZjSx9TMxcTIihgLqJNlZy6m + 9DE1czExsiLGAupk2ZmLKX1MzdwlYoi4BRXO+EBrB78Iq4yjffUvAAAAAElFTkSuQmCC + + + \ No newline at end of file diff --git a/GT12/SHX_GT12_CPS/FormMain.cs b/GT12/SHX_GT12_CPS/FormMain.cs index e24989c..75e8454 100644 --- a/GT12/SHX_GT12_CPS/FormMain.cs +++ b/GT12/SHX_GT12_CPS/FormMain.cs @@ -345,7 +345,7 @@ private void menuItem_P_Write_Click(object sender, EventArgs e) private void menuItem_H_SatlliteHelper_Click(object sender, EventArgs e) { - new FromSatelliteHelper().ShowDialog(); + new FormSatelliteHelper().ShowDialog(); } private void menuItem_H_About_Click(object sender, EventArgs e) diff --git a/GT12/SHX_GT12_CPS/FromSatelliteHelper.Designer.cs b/GT12/SHX_GT12_CPS/FormSatelliteHelper.Designer.cs similarity index 99% rename from GT12/SHX_GT12_CPS/FromSatelliteHelper.Designer.cs rename to GT12/SHX_GT12_CPS/FormSatelliteHelper.Designer.cs index 00c31ea..6f8517a 100644 --- a/GT12/SHX_GT12_CPS/FromSatelliteHelper.Designer.cs +++ b/GT12/SHX_GT12_CPS/FormSatelliteHelper.Designer.cs @@ -2,7 +2,7 @@ namespace SHX_GT12_CPS; -partial class FromSatelliteHelper +partial class FormSatelliteHelper { /// /// Required designer variable. @@ -242,7 +242,7 @@ private void InitializeComponent() this.Controls.Add(this.button1); this.Location = new System.Drawing.Point(15, 15); this.Margin = new System.Windows.Forms.Padding(2); - this.Name = "FromSatelliteHelper"; + this.Name = "FormSatelliteHelper"; this.Text = "打星助手"; this.Load += new System.EventHandler(this.FromSatelliteHelper_Load); this.ResumeLayout(false); diff --git a/GT12/SHX_GT12_CPS/FromSatelliteHelper.cs b/GT12/SHX_GT12_CPS/FormSatelliteHelper.cs similarity index 99% rename from GT12/SHX_GT12_CPS/FromSatelliteHelper.cs rename to GT12/SHX_GT12_CPS/FormSatelliteHelper.cs index d01c75e..55f8784 100644 --- a/GT12/SHX_GT12_CPS/FromSatelliteHelper.cs +++ b/GT12/SHX_GT12_CPS/FormSatelliteHelper.cs @@ -9,14 +9,14 @@ namespace SHX_GT12_CPS; -public partial class FromSatelliteHelper : Form +public partial class FormSatelliteHelper : Form { private List namelist = new(); private JArray satelliteJson = new(); private string[] currentChannel = new string[12]; - public FromSatelliteHelper() + public FormSatelliteHelper() { InitializeComponent(); button2.Hide(); diff --git a/GT12/SHX_GT12_CPS/FromSatelliteHelper.resx b/GT12/SHX_GT12_CPS/FormSatelliteHelper.resx similarity index 100% rename from GT12/SHX_GT12_CPS/FromSatelliteHelper.resx rename to GT12/SHX_GT12_CPS/FormSatelliteHelper.resx diff --git a/readme.md b/readme.md index e9c6b2e..d4ded1a 100644 --- a/readme.md +++ b/readme.md @@ -4,9 +4,7 @@ [![downloads@latest](https://img.shields.io/github/downloads/SydneyOwl/shx8x00-freq-writer-enhanced/latest/total)](https://github.com/SydneyOwl/shx8x00-freq-writer-enhanced/releases/latest?style=for-the-badge) ![version](https://img.shields.io/github/v/tag/sydneyowl/shx8x00-freq-writer-enhanced?label=version&style=flat-square?style=for-the-badge) -![gt12](https://github.com/sydneyowl/senhaix-freq-writer-enhanced/actions/workflows/gt12.yml/badge.svg) -![shx8x00_nobt](https://github.com/sydneyowl/senhaix-freq-writer-enhanced/actions/workflows/shx8x00_nobt.yml/badge.svg) -![shx8x00](https://github.com/sydneyowl/senhaix-freq-writer-enhanced/actions/workflows/shx8x00.yml/badge.svg) +![senhaix](https://github.com/sydneyowl/senhaix-freq-writer-enhanced/actions/workflows/build.yml/badge.svg) ## 简介 @@ -24,7 +22,9 @@ |`SHX8800_nobt`|.net2.0| |`gt12`|.net4.6.2, win8+| -如果您需要同时克隆卫星数据，请使用`git clone --recursive`。 +您也可以参考`.github/workflows/build.yml`进行编译。 + +如果您需要同时克隆卫星数据，请使用`--recursive`。 ## 其他 diff --git a/shx8x00/SQ5R.Properties/VERSION.cs b/shx8x00/SQ5R.Properties/VERSION.cs new file mode 100644 index 0000000..638756b --- /dev/null +++ b/shx8x00/SQ5R.Properties/VERSION.cs @@ -0,0 +1,8 @@ +namespace SQ5R.Properties; + +public class VERSION +{ + public static string GitCommitHash = "@COMMIT_HASH@"; + public static string BuildTime = "@BUILD_TIME@"; + public static string Version = "@TAG_NAME@"; +} \ No newline at end of file diff --git a/shx8x00/SQ5R.View.FormAbout.resx b/shx8x00/SQ5R.View.FormAbout.resx deleted file mode 100644 index 28da925..0000000 --- a/shx8x00/SQ5R.View.FormAbout.resx +++ /dev/null @@ -1,58 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - text/microsoft-resx - - - 1.3 - - - 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 - - - - - AAEAAAD/////AQAAAAAAAAAMAgAAAFFTeXN0ZW0uRHJhd2luZywgVmVyc2lvbj0yLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWIwM2Y1ZjdmMTFkNTBhM2EFAQAAABNTeXN0ZW0uRHJhd2luZy5JY29uAgAAAAhJY29uRGF0YQhJY29uU2l6ZQcEAhNTeXN0ZW0uRHJhd2luZy5TaXplAgAAAAIAAAAJAwAAAAX8////E1N5c3RlbS5EcmF3aW5nLlNpemUCAAAABXdpZHRoBmhlaWdodAAACAgCAAAAAAAAAAAAAAAPAwAAAP4CAAACAAABAAEAICAQAAEABADoAgAAFgAAACgAAAAgAAAAQAAAAAEABAAAAAAAgAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACAAACAAAAAgIAAgAAAAIAAgACAgAAAgICAAMDAwAAAAP8AAP8AAAD//wD/AAAA/wD/AP//AAD///8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAB3dwd3cHd3AAAAAAAAAAAAd3cHd3B3dwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAB3dwd3cHd3AAAAAAAAAAAAd3cHd3B3dwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAB3dwd3cHd3AAAAAAAAAAAAd3cHd3B3dwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAqqqqqqqqqgAAAAAAAAAAAKAAoACgAKoAAAAAAAAAAACgoKCgoKCqAAAAAAAAAAAAoACgAKAAqgAAAAAAAAAAAKqqqqqqqqoAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHBwd3d3dwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcHB3d3d3cAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwcHd3d3cAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD/gAH//wAA//4AAH/+AAB//gAAf/4AAH/+AAB//gAAf/4AAH/+AAB//gAAf/4AAH/+AAB//gAAf/4AAH/+AAB//gAAf/4AAH/+AAB//gAAf/4AAH/+AAB//gAAf/4AAH/+AAB//wAA///H4///x+P//8f3///H////x////8f//ws= - - - - - AAEAAAD/////AQAAAAAAAAAMAgAAAFFTeXN0ZW0uRHJhd2luZywgVmVyc2lvbj0yLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWIwM2Y1ZjdmMTFkNTBhM2EFAQAAABVTeXN0ZW0uRHJhd2luZy5CaXRtYXABAAAABERhdGEHAgIAAAAJAwAAAA8DAAAAIwEAAAKJUE5HDQoaCgAAAA1JSERSAAAAIAAAACAIBgAAAHN6evQAAAAEZ0FNQQAAsY8L/GEFAAAACXBIWXMAABJ0AAASdAHeZh94AAAAxUlEQVRYR+2UwQ6DMAzF+un98yGFVKTbEyRup11mZHVEYNrLWoFX8Cf8N5DdwNc2mNlA5hlMJp55pkyMEpdQQSLGAr33j/XO8V4Qo2JEjAXGqeL65HjXxbyHqBgLjBPF9c7xXhCjYkSMihExZ4BeWzdwxXL38wxzBavr+H2KmcOV+3mGmYPVa9sG1sWoGBFjAfVPl525mNLH1MzFxMiKGAuok2VnLqb0MTVzMTGyIsYC6mTZmYspfUzN3CViiLgFFc74QGsHvwirjKN99S8AAAAASUVORK5CYIIL - - - \ No newline at end of file diff --git a/shx8x00/SQ5R.View/FormAbout.Designer.cs b/shx8x00/SQ5R.View/FormAbout.Designer.cs new file mode 100644 index 0000000..52f9e47 --- /dev/null +++ b/shx8x00/SQ5R.View/FormAbout.Designer.cs @@ -0,0 +1,154 @@ +using System.ComponentModel; + +namespace SQ5R.View; + +partial class FormAbout +{ + /// + /// Required designer variable. + /// + private IContainer components = null; + + /// + /// Clean up any resources being used. + /// + /// true if managed resources should be disposed; otherwise, false. + protected override void Dispose(bool disposing) + { + if (disposing && (components != null)) + { + components.Dispose(); + } + + base.Dispose(disposing); + } + + #region Windows Form Designer generated code + + /// + /// Required method for Designer support - do not modify + /// the contents of this method with the code editor. + /// + private void InitializeComponent() + { + System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(FormAbout)); + this.label1 = new System.Windows.Forms.Label(); + this.label2 = new System.Windows.Forms.Label(); + this.label3 = new System.Windows.Forms.Label(); + this.label4 = new System.Windows.Forms.Label(); + this.label5 = new System.Windows.Forms.Label(); + this.label6 = new System.Windows.Forms.Label(); + this.ver = new System.Windows.Forms.Label(); + this.commit = new System.Windows.Forms.Label(); + this.ctime = new System.Windows.Forms.Label(); + this.SuspendLayout(); + // + // label1 + // + this.label1.Image = ((System.Drawing.Image)(resources.GetObject("label1.Image"))); + this.label1.Location = new System.Drawing.Point(21, 59); + this.label1.Name = "label1"; + this.label1.Size = new System.Drawing.Size(45, 50); + this.label1.TabIndex = 0; + // + // label2 + // + this.label2.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.label2.Location = new System.Drawing.Point(45, 26); + this.label2.Name = "label2"; + this.label2.Size = new System.Drawing.Size(317, 47); + this.label2.TabIndex = 1; + this.label2.Text = "森海克斯8800、8600写频软件修改版"; + // + // label3 + // + this.label3.Location = new System.Drawing.Point(101, 73); + this.label3.Name = "label3"; + this.label3.Size = new System.Drawing.Size(75, 27); + this.label3.TabIndex = 2; + this.label3.Text = "版本号："; + // + // label4 + // + this.label4.Location = new System.Drawing.Point(101, 101); + this.label4.Name = "label4"; + this.label4.Size = new System.Drawing.Size(75, 21); + this.label4.TabIndex = 3; + this.label4.Text = "提交Hash:"; + // + // label5 + // + this.label5.Location = new System.Drawing.Point(45, 188); + this.label5.Name = "label5"; + this.label5.Size = new System.Drawing.Size(323, 76); + this.label5.TabIndex = 4; + this.label5.Text = "https://github.com/SydneyOwl/senhaix-freq-writer-enhanced"; + // + // label6 + // + this.label6.Location = new System.Drawing.Point(101, 131); + this.label6.Name = "label6"; + this.label6.Size = new System.Drawing.Size(217, 44); + this.label6.TabIndex = 5; + this.label6.Text = "编译时间："; + this.label6.Click += new System.EventHandler(this.label6_Click_1); + // + // ver + // + this.ver.Location = new System.Drawing.Point(156, 73); + this.ver.Name = "ver"; + this.ver.Size = new System.Drawing.Size(114, 25); + this.ver.TabIndex = 6; + this.ver.Text = "（未知）"; + // + // commit + // + this.commit.Location = new System.Drawing.Point(156, 101); + this.commit.Name = "commit"; + this.commit.Size = new System.Drawing.Size(114, 28); + this.commit.TabIndex = 7; + this.commit.Text = "（未知）"; + // + // ctime + // + this.ctime.Location = new System.Drawing.Point(156, 131); + this.ctime.Name = "ctime"; + this.ctime.Size = new System.Drawing.Size(114, 25); + this.ctime.TabIndex = 8; + this.ctime.Text = "（未知）"; + // + // FormAbout + // + this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.ClientSize = new System.Drawing.Size(347, 223); + this.Controls.Add(this.ctime); + this.Controls.Add(this.commit); + this.Controls.Add(this.ver); + this.Controls.Add(this.label6); + this.Controls.Add(this.label5); + this.Controls.Add(this.label4); + this.Controls.Add(this.label3); + this.Controls.Add(this.label2); + this.Controls.Add(this.label1); + this.Name = "FormAbout"; + this.Text = "关于"; + this.ResumeLayout(false); + } + + private System.Windows.Forms.Label ver; + private System.Windows.Forms.Label commit; + private System.Windows.Forms.Label ctime; + + private System.Windows.Forms.Label label6; + + private System.Windows.Forms.Label label3; + private System.Windows.Forms.Label label4; + private System.Windows.Forms.Label label5; + + private System.Windows.Forms.Label label2; + + private System.Windows.Forms.Label label1; + + #endregion +} \ No newline at end of file diff --git a/shx8x00/SQ5R.View/FormAbout.cs b/shx8x00/SQ5R.View/FormAbout.cs index d05251e..7cec77f 100644 --- a/shx8x00/SQ5R.View/FormAbout.cs +++ b/shx8x00/SQ5R.View/FormAbout.cs @@ -1,122 +1,27 @@ -using System; -using System.ComponentModel; -using System.Drawing; +using System; using System.Windows.Forms; using SQ5R.Properties; namespace SQ5R.View; -public class FormAbout : Form +public partial class FormAbout : Form { - private readonly IContainer components = null; - - private Label label_MsgLine1; - - private Label label_MsgLine2; - - private Label label_MsgLine3; - - private Label label_MsgLine4; - - private PictureBox pictureBox1; - public FormAbout() { InitializeComponent(); + + ver.Text = VERSION.Version; + commit.Text = VERSION.GitCommitHash; + ctime.Text = VERSION.BuildTime; } - private void FormAbout_Load(object sender, EventArgs e) + private void label6_Click(object sender, EventArgs e) { - var language = Settings.Default.language; - if (language == "中文") - { - label_MsgLine1.Text = "SHX8800 编程软件(修改版)"; - label_MsgLine2.Text = "版本 v0.2"; - label_MsgLine3.Text = "无蓝牙支持"; -#if NET462 - label_MsgLine3.Text = "蓝牙支持"; -#endif - label_MsgLine4.Text = "de SydneyOwl tu 73"; - } - else - { - label_MsgLine1.Text = "SHX8800 Program Software"; - label_MsgLine2.Text = "Version v2.4"; - label_MsgLine3.Text = "No Bluetooth plugin"; -#if NET462 - label_MsgLine3.Text = "Bluetooth plugin"; -#endif - label_MsgLine4.Text = "de SydneyOwl tu 73"; - } - } - - protected override void Dispose(bool disposing) - { - if (disposing && components != null) components.Dispose(); - - base.Dispose(disposing); + // throw new System.NotImplementedException(); } - private void InitializeComponent() + private void label6_Click_1(object sender, EventArgs e) { - var resources = - new ComponentResourceManager(typeof(FormAbout)); - label_MsgLine1 = new Label(); - label_MsgLine2 = new Label(); - label_MsgLine3 = new Label(); - label_MsgLine4 = new Label(); - pictureBox1 = new PictureBox(); - ((ISupportInitialize)pictureBox1).BeginInit(); - SuspendLayout(); - label_MsgLine1.AutoSize = true; - label_MsgLine1.Location = new Point(106, 23); - label_MsgLine1.Name = "label_MsgLine1"; - label_MsgLine1.Size = new Size(55, 15); - label_MsgLine1.TabIndex = 0; - label_MsgLine1.Text = "label1"; - label_MsgLine2.AutoSize = true; - label_MsgLine2.Location = new Point(106, 51); - label_MsgLine2.Name = "label_MsgLine2"; - label_MsgLine2.Size = new Size(55, 15); - label_MsgLine2.TabIndex = 1; - label_MsgLine2.Text = "label1"; - label_MsgLine3.AutoSize = true; - label_MsgLine3.Location = new Point(106, 79); - label_MsgLine3.Name = "label_MsgLine3"; - label_MsgLine3.Size = new Size(55, 15); - label_MsgLine3.TabIndex = 2; - label_MsgLine3.Text = "label1"; - label_MsgLine4.AutoSize = true; - label_MsgLine4.Location = new Point(106, 107); - label_MsgLine4.Name = "label_MsgLine4"; - label_MsgLine4.Size = new Size(55, 15); - label_MsgLine4.TabIndex = 3; - label_MsgLine4.Text = "label1"; - pictureBox1.BackgroundImage = (Image)resources.GetObject("pictureBox1.BackgroundImage"); - pictureBox1.BackgroundImageLayout = ImageLayout.Center; - pictureBox1.Location = new Point(34, 33); - pictureBox1.Name = "pictureBox1"; - pictureBox1.Size = new Size(49, 50); - pictureBox1.TabIndex = 4; - pictureBox1.TabStop = false; - AutoScaleDimensions = new SizeF(8f, 15f); - AutoScaleMode = AutoScaleMode.Font; - ClientSize = new Size(478, 149); - Controls.Add(pictureBox1); - Controls.Add(label_MsgLine4); - Controls.Add(label_MsgLine3); - Controls.Add(label_MsgLine2); - Controls.Add(label_MsgLine1); - FormBorderStyle = FormBorderStyle.FixedSingle; - Icon = (Icon)resources.GetObject("$this.Icon"); - MaximizeBox = false; - MinimizeBox = false; - Name = "FormAbout"; - StartPosition = FormStartPosition.CenterParent; - Text = "SHX8800"; - Load += FormAbout_Load; - ((ISupportInitialize)pictureBox1).EndInit(); - ResumeLayout(false); - PerformLayout(); + // throw new System.NotImplementedException(); } } \ No newline at end of file diff --git a/shx8x00/SQ5R.View/FormAbout.resx b/shx8x00/SQ5R.View/FormAbout.resx new file mode 100644 index 0000000..bd8c7b7 --- /dev/null +++ b/shx8x00/SQ5R.View/FormAbout.resx @@ -0,0 +1,130 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 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 + + + + + iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO + wwAADsMBx2+oZAAAAMVJREFUWEftlMEOgzAMxfrp/fMhhVSk2xMkbqddZmR1RGDay1qBV/An/DeQ3cDX + NpjZQOYZTCaeeaZMjBKXUEEixgK994/1zvFeEKNiRIwFxqni+uR418W8h6gYC4wTxfXO8V4Qo2JEjIoR + MWeAXls3cMVy9/MMcwWr6/h9ipnDlft5hpmD1WvbBtbFqBgRYwH1T5eduZjSx9TMxcTIihgLqJNlZy6m + 9DE1czExsiLGAupk2ZmLKX1MzdwlYoi4BRXO+EBrB78Iq4yjffUvAAAAAElFTkSuQmCC + + + \ No newline at end of file