This commit is contained in:
chikyun.kim
2019-07-26 17:28:19 +09:00
parent ae209e00af
commit 11d7c7f704
58 changed files with 3360 additions and 6285 deletions

View File

@@ -19,7 +19,7 @@ namespace Project
this.KeyDown += (s1, e1) =>
{
if (e1.KeyCode == Keys.F12) btSetting.PerformClick();
else if (e1.KeyCode == Keys.F11) btLog.PerformClick();
//else if (e1.KeyCode == Keys.F11) btLog.PerformClick();
else if (e1.KeyCode == Keys.F1 && e1.Control && e1.Shift)
{
Dialog.fDebug f = new Dialog.fDebug();
@@ -156,7 +156,7 @@ namespace Project
void _SetLang()
{
btSetting.Text = Lang.Setting;
//btSetting.Text = Lang.Setting;
}
void barcode_ReceiveData(object sender, Device.Barcode.ReceiveDataEventArgs e)
@@ -378,13 +378,11 @@ namespace Project
void menu_nrpurchase()
{
string formkey = "PUCHASE";
if (!ShowForm(formkey))
AddForm(formkey, new FEQ0000.fPurchase());
}
private void nRPurchaseToolStripMenuItem_Click(object sender, EventArgs e)
{
menu_nrpurchase();
@@ -472,16 +470,34 @@ namespace Project
f.Dock = DockStyle.Fill;
f.ControlBox = false;
f.FormBorderStyle = System.Windows.Forms.FormBorderStyle.None;
f.FormClosed += f_FormClosed;
f.Tag = key;
this.tabControl1.TabPages.Add(key, f.Text);
this.tabControl1.TabPages[this.tabControl1.TabPages.Count - 1].BorderStyle = BorderStyle.Fixed3D;
this.tabControl1.TabPages[this.tabControl1.TabPages.Count - 1].Padding = new Padding(10, 10, 10, 10);
this.tabControl1.TabPages[this.tabControl1.TabPages.Count - 1].BackColor = Color.LightGray;
this.tabControl1.TabPages[this.tabControl1.TabPages.Count - 1].ContextMenuStrip = this.cmTab;
this.tabControl1.TabPages[this.tabControl1.TabPages.Count - 1].Controls.Add(f);
this.tabControl1.SelectedIndex = this.tabControl1.TabPages.Count - 1;
this.tabControl1.TabPages[this.tabControl1.TabPages.Count - 1].Tag = key;
this.tabControl1.SelectedIndex = this.tabControl1.TabPages.Count - 1;
f.Show();
}
void f_FormClosed(object sender, FormClosedEventArgs e)
{
var f = sender as Form;
var key = f.Tag.ToString();
foreach(TabPage tab in this.tabControl1.TabPages)
{
if (tab.Visible == true)
{
this.tabControl1.TabPages.Remove(tab);
break;
}
}
if (this.tabControl1.TabPages.Count > 0) this.tabControl1.SelectedIndex = this.tabControl1.TabCount - 1;
}
private void ToolStripMenuItem_Click(object sender, EventArgs e)
{
_Management.fLineCode f = new _Management.fLineCode();
@@ -550,18 +566,16 @@ namespace Project
private void ToolStripMenuItem_Click(object sender, EventArgs e)
{
if (this.tabControl1.TabPages.Count > 1)
while (tabControl1.TabPages.Count > 0)
{
while (tabControl1.TabPages.Count > 1)
{
var tab = this.tabControl1.TabPages[1];
var f = tab.Controls[0] as System.Windows.Forms.Form;
f.Close();
f.Dispose();
tabControl1.TabPages.Remove(tab);
this.tabControl1.Refresh();
}
var tab = this.tabControl1.TabPages[0];
var f = tab.Controls[0] as System.Windows.Forms.Form;
f.Close();
f.Dispose();
tabControl1.TabPages.Remove(tab);
this.tabControl1.Refresh();
}
Func_Login();
}