This commit is contained in:
chi
2023-08-11 10:23:58 +09:00
parent c34372e262
commit 940b51b2e8
12 changed files with 1423 additions and 877 deletions

View File

@@ -125,6 +125,9 @@ namespace FPJ0000
rtBef.Text = string.Empty;
rtDesc.Text = string.Empty;
rtBack.Text = string.Empty;
rtTangil.Text = string.Empty;
rtIntangle.Text = string.Empty;
//신규데이터는 추가정보를 바로 저장할 수 없다.
if (dr.RowState == DataRowState.Detached || dr.RowState == DataRowState.Deleted)
@@ -151,6 +154,9 @@ namespace FPJ0000
if (string.IsNullOrEmpty(dr2.CMP_Before) == false) rtBef.Rtf = dr2.CMP_Before;
if (string.IsNullOrEmpty(dr2.CMP_Description) == false) rtDesc.Rtf = dr2.CMP_Description;
if (string.IsNullOrEmpty(dr2.CMP_Background) == false) rtBack.Rtf = dr2.CMP_Background;
if (dr2.Iseffect_intangibleNull() == false) rtIntangle.Rtf = dr2.effect_intangible;
if (dr2.Iseffect_tangibleNull() == false) rtTangil.Rtf = dr2.effect_tangible;
}
}
@@ -287,12 +293,14 @@ namespace FPJ0000
this.dr.CMP_Before = rtBef.Rtf;
this.dr.CMP_Description = rtDesc.Rtf;
this.dr.CMP_Background = rtBack.Rtf;
this.dr.effect_tangible = rtTangil.Rtf;
this.dr.effect_intangible = rtIntangle.Rtf;
// var s = "dbo.getUserName2(championid,usermanager) as name_champion," +
//"dbo.getUserName2(designid,usermain) as name_design," +
//"dbo.getUserName2(assemblyid,userAssembly) as name_assembly," +
//"dbo.getUserName2(epanelid,userhw2) as name_epanel," +
//"dbo.getUserName2(softwareid,usersub) as name_software";
// var s = "dbo.getUserName2(championid,usermanager) as name_champion," +
//"dbo.getUserName2(designid,usermain) as name_design," +
//"dbo.getUserName2(assemblyid,userAssembly) as name_assembly," +
//"dbo.getUserName2(epanelid,userhw2) as name_epanel," +
//"dbo.getUserName2(softwareid,usersub) as name_software";
//if (cmbChampion.SelectedIndex < 1)
//{
@@ -702,9 +710,47 @@ namespace FPJ0000
private void linkLabel11_LinkClicked(object sender, LinkLabelLinkClickedEventArgs e)
{
var f = new FCOMMON.fSFI();
var sfi_type = "O";
var sfi_count = 0f;
var sfi_time = 0f;
if (dr.Issfi_typeNull() == false) sfi_type = dr.sfi_type;
if (dr.Issfi_savecountNull() == false) sfi_count = dr.sfi_savecount;
if (dr.Issfi_savetimeNull() == false) sfi_time = dr.sfi_savetime;
var f = new FCOMMON.fSFI(sfi_type, sfi_time, sfi_count);
if (f.ShowDialog() == DialogResult.OK)
{
tbSFI.Text = f.Value.ToString("N2");
dr.sfi_type = f.radO.Checked ? "O" : "M";
if (f.radO.Checked)
dr.sfi_savetime = (float)f.nudOsavetime.Value;
else
dr.sfi_savetime = (float)f.nudMsavetime.Value;
dr.sfi_savecount = (float)f.nudMSaveCnt.Value;
dr.EndEdit();
}
}
private void arLabel9_Click(object sender, EventArgs e)
{
}
private void richTextBox1_DoubleClick(object sender, EventArgs e)
{
var rt = sender as System.Windows.Forms.RichTextBox;
var f = new Note.fTextEditor(rt.Rtf);
if (f.ShowDialog() == DialogResult.OK)
rt.Rtf = f.richTextBoxEx1.Rtf;
}
private void richTextBox2_DoubleClick(object sender, EventArgs e)
{
var rt = sender as System.Windows.Forms.RichTextBox;
var f = new Note.fTextEditor(rt.Rtf);
if (f.ShowDialog() == DialogResult.OK)
rt.Rtf = f.richTextBoxEx1.Rtf;
}
}
}