lu
2025-11-07 2a547f5c737dcbdd795b60ece6b47de5ee5026e9
修改提示
已修改4个文件
已删除4个文件
90 ■■■■ 文件已修改
DevApp/Gs.DevApp/Properties/Resources.Designer.cs 20 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/Properties/Resources.resx 6 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/Resources/error10.jpg 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/Resources/login_bg.jpg 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/Resources/login_bg1.jpg 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/Resources/ok10.jpg 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/UserControl/Toast.Designer.cs 53 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/UserControl/Toast.cs 11 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/Properties/Resources.Designer.cs
@@ -1243,16 +1243,6 @@
        /// <summary>
        ///   查找 System.Drawing.Bitmap 类型的本地化资源。
        /// </summary>
        internal static System.Drawing.Bitmap error10 {
            get {
                object obj = ResourceManager.GetObject("error10", resourceCulture);
                return ((System.Drawing.Bitmap)(obj));
            }
        }
        /// <summary>
        ///   查找 System.Drawing.Bitmap 类型的本地化资源。
        /// </summary>
        internal static System.Drawing.Bitmap exportfile_16x16 {
            get {
                object obj = ResourceManager.GetObject("exportfile_16x16", resourceCulture);
@@ -1866,16 +1856,6 @@
        internal static System.Drawing.Bitmap newitem_16x16 {
            get {
                object obj = ResourceManager.GetObject("newitem_16x16", resourceCulture);
                return ((System.Drawing.Bitmap)(obj));
            }
        }
        /// <summary>
        ///   查找 System.Drawing.Bitmap 类型的本地化资源。
        /// </summary>
        internal static System.Drawing.Bitmap ok10 {
            get {
                object obj = ResourceManager.GetObject("ok10", resourceCulture);
                return ((System.Drawing.Bitmap)(obj));
            }
        }
DevApp/Gs.DevApp/Properties/Resources.resx
@@ -682,9 +682,6 @@
  <data name="fontsizeincrease_16x161" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\fontsizeincrease_16x161.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="error10" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\error10.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="refresh_32x321" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\refresh_32x321.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
@@ -1190,8 +1187,5 @@
  </data>
  <data name="trackingchanges_showmarkup_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\trackingchanges_showmarkup_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="ok10" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\ok10.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
</root>
DevApp/Gs.DevApp/Resources/error10.jpg
Binary files differ
DevApp/Gs.DevApp/Resources/login_bg.jpg
Binary files differ
DevApp/Gs.DevApp/Resources/login_bg1.jpg
Binary files differ
DevApp/Gs.DevApp/Resources/ok10.jpg
Binary files differ
DevApp/Gs.DevApp/UserControl/Toast.Designer.cs
@@ -30,47 +30,30 @@
        {
            DevExpress.XtraLayout.ColumnDefinition columnDefinition1 = new DevExpress.XtraLayout.ColumnDefinition();
            DevExpress.XtraLayout.RowDefinition rowDefinition1 = new DevExpress.XtraLayout.RowDefinition();
            DevExpress.XtraLayout.RowDefinition rowDefinition2 = new DevExpress.XtraLayout.RowDefinition();
            this.layoutControl1 = new DevExpress.XtraLayout.LayoutControl();
            this.panel1 = new System.Windows.Forms.Panel();
            this.testo = new DevExpress.XtraEditors.LabelControl();
            this.Root = new DevExpress.XtraLayout.LayoutControlGroup();
            this.layoutControlItem2 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem1 = new DevExpress.XtraLayout.LayoutControlItem();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControl1)).BeginInit();
            this.layoutControl1.SuspendLayout();
            ((System.ComponentModel.ISupportInitialize)(this.Root)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).BeginInit();
            this.SuspendLayout();
            // 
            // layoutControl1
            // 
            this.layoutControl1.Controls.Add(this.panel1);
            this.layoutControl1.Controls.Add(this.testo);
            this.layoutControl1.Dock = System.Windows.Forms.DockStyle.Fill;
            this.layoutControl1.Location = new System.Drawing.Point(0, 0);
            this.layoutControl1.Name = "layoutControl1";
            this.layoutControl1.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(1108, 126, 812, 500);
            this.layoutControl1.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(815, 172, 812, 500);
            this.layoutControl1.Root = this.Root;
            this.layoutControl1.Size = new System.Drawing.Size(567, 590);
            this.layoutControl1.Size = new System.Drawing.Size(595, 261);
            this.layoutControl1.TabIndex = 9;
            this.layoutControl1.Text = "layoutControl1";
            // 
            // panel1
            //
            this.panel1.BackgroundImage = global::Gs.DevApp.Properties.Resources.error10;
            this.panel1.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom;
            this.panel1.Location = new System.Drawing.Point(12, 12);
            this.panel1.Name = "panel1";
            this.panel1.Size = new System.Drawing.Size(543, 486);
            this.panel1.TabIndex = 8;
            //
            // testo
            // 
            this.testo.Appearance.BackColor = System.Drawing.Color.Firebrick;
            this.testo.Appearance.Font = new System.Drawing.Font("Tahoma", 38F);
            this.testo.Appearance.ForeColor = System.Drawing.Color.White;
            this.testo.Appearance.Options.UseBackColor = true;
            this.testo.Appearance.Options.UseFont = true;
            this.testo.Appearance.Options.UseForeColor = true;
@@ -79,9 +62,9 @@
            this.testo.Appearance.TextOptions.VAlignment = DevExpress.Utils.VertAlignment.Center;
            this.testo.Appearance.TextOptions.WordWrap = DevExpress.Utils.WordWrap.Wrap;
            this.testo.AutoSizeMode = DevExpress.XtraEditors.LabelAutoSizeMode.Vertical;
            this.testo.Location = new System.Drawing.Point(12, 502);
            this.testo.Location = new System.Drawing.Point(12, 121);
            this.testo.Name = "testo";
            this.testo.Size = new System.Drawing.Size(543, 76);
            this.testo.Size = new System.Drawing.Size(571, 18);
            this.testo.StyleController = this.layoutControl1;
            this.testo.TabIndex = 7;
            this.testo.Text = "labelControl1";
@@ -91,7 +74,6 @@
            this.Root.EnableIndentsWithoutBorders = DevExpress.Utils.DefaultBoolean.True;
            this.Root.GroupBordersVisible = false;
            this.Root.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] {
            this.layoutControlItem2,
            this.layoutControlItem1});
            this.Root.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table;
            this.Root.Name = "Root";
@@ -101,32 +83,20 @@
            columnDefinition1});
            rowDefinition1.Height = 100D;
            rowDefinition1.SizeType = System.Windows.Forms.SizeType.Percent;
            rowDefinition2.Height = 80D;
            rowDefinition2.SizeType = System.Windows.Forms.SizeType.AutoSize;
            this.Root.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] {
            rowDefinition1,
            rowDefinition2});
            this.Root.Size = new System.Drawing.Size(567, 590);
            rowDefinition1});
            this.Root.Size = new System.Drawing.Size(595, 261);
            this.Root.TextVisible = false;
            //
            // layoutControlItem2
            //
            this.layoutControlItem2.Control = this.panel1;
            this.layoutControlItem2.Location = new System.Drawing.Point(0, 0);
            this.layoutControlItem2.Name = "layoutControlItem2";
            this.layoutControlItem2.Size = new System.Drawing.Size(547, 490);
            this.layoutControlItem2.TextSize = new System.Drawing.Size(0, 0);
            this.layoutControlItem2.TextVisible = false;
            // 
            // layoutControlItem1
            // 
            this.layoutControlItem1.ContentHorzAlignment = DevExpress.Utils.HorzAlignment.Center;
            this.layoutControlItem1.ContentVertAlignment = DevExpress.Utils.VertAlignment.Center;
            this.layoutControlItem1.Control = this.testo;
            this.layoutControlItem1.Location = new System.Drawing.Point(0, 490);
            this.layoutControlItem1.Location = new System.Drawing.Point(0, 0);
            this.layoutControlItem1.Name = "layoutControlItem1";
            this.layoutControlItem1.OptionsTableLayoutItem.RowIndex = 1;
            this.layoutControlItem1.Size = new System.Drawing.Size(547, 80);
            this.layoutControlItem1.Size = new System.Drawing.Size(575, 241);
            this.layoutControlItem1.Text = "lbMsg";
            this.layoutControlItem1.TextSize = new System.Drawing.Size(0, 0);
            this.layoutControlItem1.TextVisible = false;
            // 
@@ -136,7 +106,7 @@
            this.Appearance.Options.UseBackColor = true;
            this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F);
            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
            this.ClientSize = new System.Drawing.Size(567, 590);
            this.ClientSize = new System.Drawing.Size(595, 261);
            this.ControlBox = false;
            this.Controls.Add(this.layoutControl1);
            this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.None;
@@ -150,17 +120,14 @@
            ((System.ComponentModel.ISupportInitialize)(this.layoutControl1)).EndInit();
            this.layoutControl1.ResumeLayout(false);
            ((System.ComponentModel.ISupportInitialize)(this.Root)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).EndInit();
            this.ResumeLayout(false);
        }
        #endregion
        private System.Windows.Forms.Panel panel1;
        private DevExpress.XtraLayout.LayoutControl layoutControl1;
        private DevExpress.XtraLayout.LayoutControlGroup Root;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem2;
        private DevExpress.XtraEditors.LabelControl testo;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem1;
    }
DevApp/Gs.DevApp/UserControl/Toast.cs
@@ -20,6 +20,9 @@
        public Toast(int it, string messageText, int vanishingSeconds = 5)
        {
            InitializeComponent();
            this.testo.Appearance.BackColor = System.Drawing.Color.Firebrick;
            this.testo.Appearance.Font = new System.Drawing.Font("Tahoma", 38F);
            this.testo.Appearance.ForeColor = System.Drawing.Color.White;
            try
            {
                string _vanishingSeconds = ConfigurationManager.AppSettings["ToastSeconds"];
@@ -33,23 +36,15 @@
            System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(Toast));
            if (it > 0)
            {
                this.panel1.BackgroundImage = global::Gs.DevApp.Properties.Resources.ok10;
                this.testo.Appearance.BackColor = System.Drawing.Color.SeaGreen;
            }
            else
            {
                this.panel1.BackgroundImage = global::Gs.DevApp.Properties.Resources.error10;
                this.testo.Appearance.BackColor = System.Drawing.Color.Firebrick;
            }
            double elapsedTime = 0;
            testo.Text = messageText;
            double vanishingMilliSeconds = vanishingSeconds * 1000;
            // message dimensions
            //this.Width = testo.Width + 50;
            //this.Height = testo.Height + 50;
            //text position
            // testo.Location = new Point((this.Width / 2) - (testo.Width / 2), (this.Height / 2) - (testo.Height / 2));
            //first timer
            tmr = new System.Windows.Forms.Timer();
            tmr.Tick += delegate
            {