From: newton-cn Date: Sat, 11 Jan 2025 03:33:50 +0000 (+0900) Subject: 일회용 적립 개발중 X-Git-Url: https://git.insang.kr/gitweb/?a=commitdiff_plain;h=d5098ecc27b0362df25212ddbb13e559b6ac0192;p=newton-cn_pos.git 일회용 적립 개발중 --- diff --git a/.vs/newton-cn/v16/.suo b/.vs/newton-cn/v16/.suo index 5cf9483..d2a27b3 100644 Binary files a/.vs/newton-cn/v16/.suo and b/.vs/newton-cn/v16/.suo differ diff --git a/newton-cn/Form1.Designer.cs b/newton-cn/Form1.Designer.cs index 7f0ac06..b9ce847 100644 --- a/newton-cn/Form1.Designer.cs +++ b/newton-cn/Form1.Designer.cs @@ -31,16 +31,17 @@ namespace newton_cn { this.button1 = new System.Windows.Forms.Button(); this.button2 = new System.Windows.Forms.Button(); - this.eclipseControl1 = new newton_cn.EclipseControl(); this.button3 = new System.Windows.Forms.Button(); + this.button4 = new System.Windows.Forms.Button(); + this.eclipseControl1 = new newton_cn.EclipseControl(); this.SuspendLayout(); // // button1 // this.button1.Font = new System.Drawing.Font("굴림", 11.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(129))); - this.button1.Location = new System.Drawing.Point(83, 5); + this.button1.Location = new System.Drawing.Point(213, 4); this.button1.Name = "button1"; - this.button1.Size = new System.Drawing.Size(58, 30); + this.button1.Size = new System.Drawing.Size(58, 35); this.button1.TabIndex = 0; this.button1.Text = "상품"; this.button1.UseVisualStyleBackColor = true; @@ -49,42 +50,54 @@ namespace newton_cn // button2 // this.button2.Font = new System.Drawing.Font("굴림", 15.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(129))); - this.button2.Location = new System.Drawing.Point(147, 5); + this.button2.Location = new System.Drawing.Point(277, 4); this.button2.Name = "button2"; - this.button2.Size = new System.Drawing.Size(28, 30); + this.button2.Size = new System.Drawing.Size(28, 35); this.button2.TabIndex = 1; this.button2.Text = "φ"; this.button2.UseVisualStyleBackColor = true; this.button2.Click += new System.EventHandler(this.button2_Click); // - // eclipseControl1 - // - this.eclipseControl1.CornerRadius = 20; - this.eclipseControl1.TargetControl = this; - // // button3 // this.button3.Font = new System.Drawing.Font("굴림", 11.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(129))); - this.button3.Location = new System.Drawing.Point(12, 5); + this.button3.Location = new System.Drawing.Point(111, 4); this.button3.Name = "button3"; - this.button3.Size = new System.Drawing.Size(65, 30); + this.button3.Size = new System.Drawing.Size(96, 35); this.button3.TabIndex = 2; - this.button3.Text = "적립금"; + this.button3.Text = "포인트사용"; this.button3.UseVisualStyleBackColor = true; this.button3.Click += new System.EventHandler(this.button3_Click); // + // button4 + // + this.button4.Font = new System.Drawing.Font("굴림", 11.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(129))); + this.button4.Location = new System.Drawing.Point(9, 4); + this.button4.Name = "button4"; + this.button4.Size = new System.Drawing.Size(96, 35); + this.button4.TabIndex = 3; + this.button4.Text = "일회용적립"; + this.button4.UseVisualStyleBackColor = true; + this.button4.Click += new System.EventHandler(this.button4_Click); + // + // eclipseControl1 + // + this.eclipseControl1.CornerRadius = 20; + this.eclipseControl1.TargetControl = this; + // // Form1 // this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 12F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.BackColor = System.Drawing.SystemColors.ActiveCaption; this.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None; - this.ClientSize = new System.Drawing.Size(187, 40); + this.ClientSize = new System.Drawing.Size(313, 44); + this.Controls.Add(this.button4); this.Controls.Add(this.button3); this.Controls.Add(this.button2); this.Controls.Add(this.button1); this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.None; - this.Location = new System.Drawing.Point(200, 0); + this.Location = new System.Drawing.Point(10, 0); this.Name = "Form1"; this.StartPosition = System.Windows.Forms.FormStartPosition.Manual; this.TopMost = true; @@ -99,6 +112,7 @@ namespace newton_cn private EclipseControl eclipseControl1; private System.Windows.Forms.Button button2; private System.Windows.Forms.Button button3; + private System.Windows.Forms.Button button4; } } diff --git a/newton-cn/Form1.cs b/newton-cn/Form1.cs index f7cced3..ee2a0ca 100644 --- a/newton-cn/Form1.cs +++ b/newton-cn/Form1.cs @@ -61,11 +61,19 @@ namespace newton_cn private void button3_Click(object sender, EventArgs e) { - Console.WriteLine("폼띄우기"); + //Console.WriteLine("폼띄우기"); Form3 dlg = new Form3(); dlg.ShowDialog(); } + + private void button4_Click(object sender, EventArgs e) + { + Console.WriteLine("폼띄우기"); + Form5 dlg = new Form5(); + + dlg.ShowDialog(); + } } diff --git a/newton-cn/Form3.Designer.cs b/newton-cn/Form3.Designer.cs index 8fc12ad..5e56954 100644 --- a/newton-cn/Form3.Designer.cs +++ b/newton-cn/Form3.Designer.cs @@ -224,7 +224,6 @@ namespace newton_cn this.ShowIcon = false; this.ShowInTaskbar = false; this.StartPosition = System.Windows.Forms.FormStartPosition.Manual; - this.Text = "Form3"; this.TopMost = true; this.ResumeLayout(false); this.PerformLayout(); diff --git a/newton-cn/Form5.Designer.cs b/newton-cn/Form5.Designer.cs new file mode 100644 index 0000000..0fbcb80 --- /dev/null +++ b/newton-cn/Form5.Designer.cs @@ -0,0 +1,114 @@ + +namespace newton_cn +{ + partial class Form5 + { + /// + /// Required designer variable. + /// + private System.ComponentModel.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() + { + this.button1 = new System.Windows.Forms.Button(); + this.listView1 = new System.Windows.Forms.ListView(); + this.label1 = new System.Windows.Forms.Label(); + this.dateTimePicker1 = new System.Windows.Forms.DateTimePicker(); + this.button2 = new System.Windows.Forms.Button(); + this.SuspendLayout(); + // + // button1 + // + this.button1.Location = new System.Drawing.Point(757, 12); + this.button1.Name = "button1"; + this.button1.Size = new System.Drawing.Size(31, 27); + this.button1.TabIndex = 0; + this.button1.Text = "X"; + this.button1.UseVisualStyleBackColor = true; + this.button1.Click += new System.EventHandler(this.button1_Click); + // + // listView1 + // + this.listView1.HideSelection = false; + this.listView1.Location = new System.Drawing.Point(12, 45); + this.listView1.Name = "listView1"; + this.listView1.Size = new System.Drawing.Size(776, 307); + this.listView1.TabIndex = 1; + this.listView1.UseCompatibleStateImageBehavior = false; + // + // label1 + // + this.label1.AutoSize = true; + this.label1.Location = new System.Drawing.Point(81, 18); + this.label1.Name = "label1"; + this.label1.Size = new System.Drawing.Size(105, 12); + this.label1.TabIndex = 2; + this.label1.Text = "일회용 포인트적립"; + // + // dateTimePicker1 + // + this.dateTimePicker1.CalendarFont = new System.Drawing.Font("굴림", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(129))); + this.dateTimePicker1.Font = new System.Drawing.Font("굴림", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(129))); + this.dateTimePicker1.Location = new System.Drawing.Point(319, 8); + this.dateTimePicker1.Name = "dateTimePicker1"; + this.dateTimePicker1.Size = new System.Drawing.Size(131, 26); + this.dateTimePicker1.TabIndex = 3; + this.dateTimePicker1.ValueChanged += new System.EventHandler(this.dateTimePicker1_ValueChanged); + // + // button2 + // + this.button2.Location = new System.Drawing.Point(713, 395); + this.button2.Name = "button2"; + this.button2.Size = new System.Drawing.Size(75, 23); + this.button2.TabIndex = 4; + this.button2.Text = "5% 적립"; + this.button2.UseVisualStyleBackColor = true; + // + // Form5 + // + this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 12F); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.ClientSize = new System.Drawing.Size(800, 450); + this.ControlBox = false; + this.Controls.Add(this.button2); + this.Controls.Add(this.dateTimePicker1); + this.Controls.Add(this.label1); + this.Controls.Add(this.listView1); + this.Controls.Add(this.button1); + this.Location = new System.Drawing.Point(1, 50); + this.Name = "Form5"; + this.StartPosition = System.Windows.Forms.FormStartPosition.Manual; + this.Load += new System.EventHandler(this.Form5_Load); + this.ResumeLayout(false); + this.PerformLayout(); + + } + + #endregion + + private System.Windows.Forms.Button button1; + private System.Windows.Forms.ListView listView1; + private System.Windows.Forms.Label label1; + private System.Windows.Forms.DateTimePicker dateTimePicker1; + private System.Windows.Forms.Button button2; + } +} \ No newline at end of file diff --git a/newton-cn/Form5.cs b/newton-cn/Form5.cs new file mode 100644 index 0000000..76ca661 --- /dev/null +++ b/newton-cn/Form5.cs @@ -0,0 +1,36 @@ +using System; +using System.Collections.Generic; +using System.ComponentModel; +using System.Data; +using System.Drawing; +using System.Linq; +using System.Text; +using System.Windows.Forms; + +namespace newton_cn +{ + public partial class Form5 : Form + { + public Form5() + { + InitializeComponent(); + dateTimePicker1.Format = DateTimePickerFormat.Custom; + dateTimePicker1.CustomFormat = "yyyy-MM-dd"; + } + + private void Form5_Load(object sender, EventArgs e) + { + + } + + private void button1_Click(object sender, EventArgs e) + { + Application.OpenForms["Form5"].Close(); + } + + private void dateTimePicker1_ValueChanged(object sender, EventArgs e) + { + Console.WriteLine(dateTimePicker1.Text); + } + } +} diff --git a/newton-cn/Form5.resx b/newton-cn/Form5.resx new file mode 100644 index 0000000..7080a7d --- /dev/null +++ b/newton-cn/Form5.resx @@ -0,0 +1,120 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + \ No newline at end of file diff --git a/newton-cn/bin/Debug/newton-cn.exe b/newton-cn/bin/Debug/newton-cn.exe index f64d30e..acf3fac 100644 Binary files a/newton-cn/bin/Debug/newton-cn.exe and b/newton-cn/bin/Debug/newton-cn.exe differ diff --git a/newton-cn/bin/Debug/newton-cn.pdb b/newton-cn/bin/Debug/newton-cn.pdb index 734d490..6f5b658 100644 Binary files a/newton-cn/bin/Debug/newton-cn.pdb and b/newton-cn/bin/Debug/newton-cn.pdb differ diff --git a/newton-cn/newton-cn.csproj b/newton-cn/newton-cn.csproj index e29a838..bd6bac9 100644 --- a/newton-cn/newton-cn.csproj +++ b/newton-cn/newton-cn.csproj @@ -51,6 +51,7 @@ + @@ -60,6 +61,7 @@ + @@ -77,6 +79,12 @@ Form4.cs + + Form + + + Form5.cs + @@ -106,6 +114,9 @@ Form4.cs + + Form5.cs + ResXFileCodeGenerator Resources.Designer.cs diff --git a/newton-cn/obj/Debug/DesignTimeResolveAssemblyReferences.cache b/newton-cn/obj/Debug/DesignTimeResolveAssemblyReferences.cache index 9afcdff..328c5ac 100644 Binary files a/newton-cn/obj/Debug/DesignTimeResolveAssemblyReferences.cache and b/newton-cn/obj/Debug/DesignTimeResolveAssemblyReferences.cache differ diff --git a/newton-cn/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/newton-cn/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache index 332634e..21074d4 100644 Binary files a/newton-cn/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache and b/newton-cn/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache differ diff --git a/newton-cn/obj/Debug/newton-cn.csproj.AssemblyReference.cache b/newton-cn/obj/Debug/newton-cn.csproj.AssemblyReference.cache index 9e16c69..f5e894a 100644 Binary files a/newton-cn/obj/Debug/newton-cn.csproj.AssemblyReference.cache and b/newton-cn/obj/Debug/newton-cn.csproj.AssemblyReference.cache differ diff --git a/newton-cn/obj/Debug/newton-cn.csproj.CoreCompileInputs.cache b/newton-cn/obj/Debug/newton-cn.csproj.CoreCompileInputs.cache index 9557366..f4ffa1c 100644 --- a/newton-cn/obj/Debug/newton-cn.csproj.CoreCompileInputs.cache +++ b/newton-cn/obj/Debug/newton-cn.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -a57cd293bb18147329b91cd138d49d97ab5de67e +9c927f7136556afac3ccb2fe06ffe7b69bd3cafc diff --git a/newton-cn/obj/Debug/newton-cn.csproj.FileListAbsolute.txt b/newton-cn/obj/Debug/newton-cn.csproj.FileListAbsolute.txt index 4355493..b9b0e30 100644 --- a/newton-cn/obj/Debug/newton-cn.csproj.FileListAbsolute.txt +++ b/newton-cn/obj/Debug/newton-cn.csproj.FileListAbsolute.txt @@ -33,3 +33,4 @@ z:\바탕 화면\insang\workspace\newton-cn_pos\newton-cn\obj\Debug\newton-cn.cs z:\바탕 화면\insang\workspace\newton-cn_pos\newton-cn\obj\Debug\newton-cn.exe z:\바탕 화면\insang\workspace\newton-cn_pos\newton-cn\obj\Debug\newton-cn.pdb z:\바탕 화면\insang\workspace\newton-cn_pos\newton-cn\obj\Debug\newton-cn.csproj.AssemblyReference.cache +z:\바탕 화면\insang\workspace\newton-cn_pos\newton-cn\obj\Debug\newton_cn.Form5.resources diff --git a/newton-cn/obj/Debug/newton-cn.csproj.GenerateResource.cache b/newton-cn/obj/Debug/newton-cn.csproj.GenerateResource.cache index 3723ab1..fa65fa5 100644 Binary files a/newton-cn/obj/Debug/newton-cn.csproj.GenerateResource.cache and b/newton-cn/obj/Debug/newton-cn.csproj.GenerateResource.cache differ diff --git a/newton-cn/obj/Debug/newton-cn.exe b/newton-cn/obj/Debug/newton-cn.exe index f64d30e..acf3fac 100644 Binary files a/newton-cn/obj/Debug/newton-cn.exe and b/newton-cn/obj/Debug/newton-cn.exe differ diff --git a/newton-cn/obj/Debug/newton-cn.pdb b/newton-cn/obj/Debug/newton-cn.pdb index 734d490..6f5b658 100644 Binary files a/newton-cn/obj/Debug/newton-cn.pdb and b/newton-cn/obj/Debug/newton-cn.pdb differ diff --git a/newton-cn/obj/Debug/newton_cn.Form5.resources b/newton-cn/obj/Debug/newton_cn.Form5.resources new file mode 100644 index 0000000..06c24d0 Binary files /dev/null and b/newton-cn/obj/Debug/newton_cn.Form5.resources differ