SVN r463
SVN-Revision: r463
This commit is contained in:
+20
-34
@@ -28,6 +28,7 @@
|
||||
/// </summary>
|
||||
private void InitializeComponent()
|
||||
{
|
||||
this.components = new System.ComponentModel.Container();
|
||||
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(FrmMain));
|
||||
this.xtraTabPage2 = new DevExpress.XtraTab.XtraTabPage();
|
||||
this.xtraTabPage3 = new DevExpress.XtraTab.XtraTabPage();
|
||||
@@ -43,7 +44,6 @@
|
||||
this.panelControl15 = new DevExpress.XtraEditors.PanelControl();
|
||||
this.splitContainer2 = new System.Windows.Forms.SplitContainer();
|
||||
this.gcMain = new Lskj.Control.GridControlEx();
|
||||
this.gcDetail = new Lskj.Control.GridControlEx();
|
||||
this.panel2 = new System.Windows.Forms.Panel();
|
||||
this.panelControl14 = new DevExpress.XtraEditors.PanelControl();
|
||||
this.gcRight = new Lskj.Control.GridControlEx();
|
||||
@@ -67,8 +67,8 @@
|
||||
this.gcAttach = new Lskj.Control.GridControlEx();
|
||||
this.panelControl4 = new DevExpress.XtraEditors.PanelControl();
|
||||
this.button7 = new System.Windows.Forms.Button();
|
||||
this.pMenu = new DevExpress.XtraBars.PopupMenu();
|
||||
this.barManager1 = new DevExpress.XtraBars.BarManager();
|
||||
this.pMenu = new DevExpress.XtraBars.PopupMenu(this.components);
|
||||
this.barManager1 = new DevExpress.XtraBars.BarManager(this.components);
|
||||
this.barDockControl1 = new DevExpress.XtraBars.BarDockControl();
|
||||
this.barDockControl2 = new DevExpress.XtraBars.BarDockControl();
|
||||
this.barDockControl3 = new DevExpress.XtraBars.BarDockControl();
|
||||
@@ -86,7 +86,8 @@
|
||||
this.lblUserName = new System.Windows.Forms.Label();
|
||||
this.lblDayName = new System.Windows.Forms.Label();
|
||||
this.xtraTabPage1 = new DevExpress.XtraTab.XtraTabPage();
|
||||
this.timer1 = new System.Windows.Forms.Timer();
|
||||
this.timer1 = new System.Windows.Forms.Timer(this.components);
|
||||
this.gcDetail = new Lskj.Control.GridControlEx();
|
||||
((System.ComponentModel.ISupportInitialize)(this.panelControl9)).BeginInit();
|
||||
this.panelControl9.SuspendLayout();
|
||||
((System.ComponentModel.ISupportInitialize)(this.panelControl12)).BeginInit();
|
||||
@@ -272,21 +273,12 @@
|
||||
this.gcMain.AdapterObj = null;
|
||||
this.gcMain.Dock = System.Windows.Forms.DockStyle.Fill;
|
||||
this.gcMain.Location = new System.Drawing.Point(0, 0);
|
||||
this.gcMain.Margin = new System.Windows.Forms.Padding(4);
|
||||
this.gcMain.Name = "gcMain";
|
||||
this.gcMain.SiftEnumObj = Lskj.Control.GridControlEx.HeaderSiftEnum.Sum;
|
||||
this.gcMain.Size = new System.Drawing.Size(1234, 240);
|
||||
this.gcMain.TabIndex = 1;
|
||||
//
|
||||
// gcDetail
|
||||
//
|
||||
this.gcDetail.AdapterObj = null;
|
||||
this.gcDetail.Dock = System.Windows.Forms.DockStyle.Fill;
|
||||
this.gcDetail.Location = new System.Drawing.Point(0, 0);
|
||||
this.gcDetail.Name = "gcDetail";
|
||||
this.gcDetail.SiftEnumObj = Lskj.Control.GridControlEx.HeaderSiftEnum.Sum;
|
||||
this.gcDetail.Size = new System.Drawing.Size(1234, 243);
|
||||
this.gcDetail.TabIndex = 2;
|
||||
//
|
||||
// panel2
|
||||
//
|
||||
this.panel2.BackgroundImage = global::Lskj.ProductPlatform.Properties.Resources._111;
|
||||
@@ -315,6 +307,7 @@
|
||||
this.gcRight.AdapterObj = null;
|
||||
this.gcRight.Dock = System.Windows.Forms.DockStyle.Fill;
|
||||
this.gcRight.Location = new System.Drawing.Point(0, 0);
|
||||
this.gcRight.Margin = new System.Windows.Forms.Padding(4);
|
||||
this.gcRight.Name = "gcRight";
|
||||
this.gcRight.SiftEnumObj = Lskj.Control.GridControlEx.HeaderSiftEnum.Sum;
|
||||
this.gcRight.Size = new System.Drawing.Size(76, 544);
|
||||
@@ -554,6 +547,7 @@
|
||||
this.gcAttach.AdapterObj = null;
|
||||
this.gcAttach.Dock = System.Windows.Forms.DockStyle.Fill;
|
||||
this.gcAttach.Location = new System.Drawing.Point(0, 0);
|
||||
this.gcAttach.Margin = new System.Windows.Forms.Padding(4);
|
||||
this.gcAttach.Name = "gcAttach";
|
||||
this.gcAttach.SiftEnumObj = Lskj.Control.GridControlEx.HeaderSiftEnum.Sum;
|
||||
this.gcAttach.Size = new System.Drawing.Size(1334, 708);
|
||||
@@ -776,6 +770,17 @@
|
||||
this.timer1.Interval = 1000;
|
||||
this.timer1.Tick += new System.EventHandler(this.timer1_Tick);
|
||||
//
|
||||
// gcDetail
|
||||
//
|
||||
this.gcDetail.AdapterObj = null;
|
||||
this.gcDetail.Dock = System.Windows.Forms.DockStyle.Fill;
|
||||
this.gcDetail.Location = new System.Drawing.Point(0, 0);
|
||||
this.gcDetail.Margin = new System.Windows.Forms.Padding(4);
|
||||
this.gcDetail.Name = "gcDetail";
|
||||
this.gcDetail.SiftEnumObj = Lskj.Control.GridControlEx.HeaderSiftEnum.Sum;
|
||||
this.gcDetail.Size = new System.Drawing.Size(1234, 243);
|
||||
this.gcDetail.TabIndex = 2;
|
||||
//
|
||||
// FrmMain
|
||||
//
|
||||
this.Appearance.BackColor = System.Drawing.SystemColors.Control;
|
||||
@@ -890,23 +895,4 @@
|
||||
private System.Windows.Forms.Label label2;
|
||||
private System.Windows.Forms.Timer timer1;
|
||||
private System.Windows.Forms.Button button8;
|
||||
private System.Windows.Forms.Button btnZX;
|
||||
private DevExpress.XtraBars.PopupMenu pMenu;
|
||||
private DevExpress.XtraBars.BarManager barManager1;
|
||||
private DevExpress.XtraBars.BarDockControl barDockControl1;
|
||||
private DevExpress.XtraBars.BarDockControl barDockControl2;
|
||||
private DevExpress.XtraBars.BarDockControl barDockControl3;
|
||||
private DevExpress.XtraBars.BarDockControl barDockControl5;
|
||||
private System.Windows.Forms.Label label1;
|
||||
private DevExpress.XtraEditors.PanelControl panelControl15;
|
||||
private System.Windows.Forms.SplitContainer splitContainer2;
|
||||
private Control.GridControlEx gcMain;
|
||||
private Control.GridControlEx gcDetail;
|
||||
private System.Windows.Forms.Panel panel2;
|
||||
private DevExpress.XtraEditors.PanelControl panelControl14;
|
||||
private DevExpress.XtraEditors.PanelControl panelControl16;
|
||||
private System.Windows.Forms.Label noticeContent;
|
||||
private System.Windows.Forms.Button butMachineSwitch;
|
||||
}
|
||||
}
|
||||
|
||||
private System.Windows
|
||||
@@ -617,6 +617,12 @@ namespace Lskj.ProductPlatform
|
||||
timer1.Interval = 1000 * 60 * (SystemInfo.Instance.Interval > 0 ? SystemInfo.Instance.Interval : 5);
|
||||
timer1.Start();
|
||||
}
|
||||
if (SystemInfo.Instance.HideHelpDocument)
|
||||
{
|
||||
this.button8.Visible = false;
|
||||
}
|
||||
|
||||
|
||||
this.gcMain.GridView.FocusedRowChanged += new DevExpress.XtraGrid.Views.Base.FocusedRowChangedEventHandler(OnRowFocusedRowChanged);
|
||||
|
||||
//this.gcMain.GridView.OptionsView.ShowFooter = false;
|
||||
@@ -699,6 +705,7 @@ namespace Lskj.ProductPlatform
|
||||
DataRow focusedRow = this.gcMain.GridView.GetFocusedDataRow();
|
||||
|
||||
GridRightMenuModel model = button.Tag as GridRightMenuModel;
|
||||
|
||||
if (rowItem == null && !model.isStartRun)
|
||||
{
|
||||
MessageUtil.Show(ResourceKeys.SelectRowIsNull);
|
||||
@@ -710,6 +717,7 @@ namespace Lskj.ProductPlatform
|
||||
{
|
||||
this.SearchLastGrid();
|
||||
}
|
||||
|
||||
}
|
||||
else
|
||||
{
|
||||
@@ -1343,37 +1351,4 @@ namespace Lskj.ProductPlatform
|
||||
if (!string.IsNullOrWhiteSpace(ERPInfo.Instance.LanguageName))
|
||||
{
|
||||
//翻译按钮固定文本
|
||||
this.TranslationFixedButton(this.panelControl13);
|
||||
this.label5.Visible = false;
|
||||
}
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
string Message = ErrorMessage.PromptErrorMessage(ex);
|
||||
MessageUtil.Show(Message, ex.Message);
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 翻译文本
|
||||
/// </summary>
|
||||
/// <param name="Control"></param>
|
||||
public void TranslationFixedButton(System.Windows.Forms.Control Control)
|
||||
{
|
||||
if (!string.IsNullOrWhiteSpace(ERPInfo.Instance.LanguageName))
|
||||
{
|
||||
foreach (System.Windows.Forms.Control ctrol in Control.Controls)
|
||||
{
|
||||
if (ctrol is Button)
|
||||
{
|
||||
Button simpleButton = ctrol as Button;
|
||||
simpleButton.Text = Business.Impl.LanguageTranslation.GetTranslatedText(ctrol.Text);
|
||||
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
}
|
||||
this.TranslationFixedButton(this.panelC
|
||||
Reference in New Issue
Block a user