章政 7 роки тому
батько
коміт
9e6b1e2543

+ 2 - 14
UAS_DeviceMonitor/Main.Designer.cs

@@ -113,7 +113,6 @@ namespace UAS_DeviceMonitor
             this.pl_dccode = new DevExpress.XtraGrid.Columns.GridColumn();
             this.pl_remark = new DevExpress.XtraGrid.Columns.GridColumn();
             this.PollingTimer = new System.Windows.Forms.Timer(this.components);
-            this.repositoryItemColorPickEdit1 = new DevExpress.XtraEditors.Repository.RepositoryItemColorPickEdit();
             ((System.ComponentModel.ISupportInitialize)(this.RibbonNav)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.MainTabControl)).BeginInit();
             this.MainTabControl.SuspendLayout();
@@ -134,7 +133,6 @@ namespace UAS_DeviceMonitor
             this.PagePolling.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.GridPolling)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.GridViewPolling)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.repositoryItemColorPickEdit1)).BeginInit();
             this.SuspendLayout();
             // 
             // RibbonNav
@@ -644,8 +642,8 @@ namespace UAS_DeviceMonitor
             this.GridPollingSetting.RepositoryItems.AddRange(new DevExpress.XtraEditors.Repository.RepositoryItem[] {
             this.dpc_enableCheckEdit,
             this.PollingSetItemLookUpEdit,
-            this.PollSettingItemColorEdit,
-            this.repositoryItemColorPickEdit1});
+            this.PollSettingItemColorEdit
+            });
             this.GridPollingSetting.RowCount = 0;
             this.GridPollingSetting.Size = new System.Drawing.Size(1027, 544);
             this.GridPollingSetting.TabIndex = 0;
@@ -786,7 +784,6 @@ namespace UAS_DeviceMonitor
             // PollSettingStatusColumn
             // 
             this.PollSettingStatusColumn.Caption = "运行状态";
-            this.PollSettingStatusColumn.ColumnEdit = this.PollSettingItemColorEdit;
             this.PollSettingStatusColumn.FieldName = "PollSettingItemColorEdit";
             this.PollSettingStatusColumn.Name = "PollSettingStatusColumn";
             this.PollSettingStatusColumn.Visible = true;
@@ -924,13 +921,6 @@ namespace UAS_DeviceMonitor
             this.pl_remark.Visible = true;
             this.pl_remark.VisibleIndex = 4;
             // 
-            // repositoryItemColorPickEdit1
-            // 
-            this.repositoryItemColorPickEdit1.AutoHeight = false;
-            this.repositoryItemColorPickEdit1.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
-            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
-            this.repositoryItemColorPickEdit1.Name = "repositoryItemColorPickEdit1";
-            // 
             // Main
             // 
             this.AllowFormGlass = DevExpress.Utils.DefaultBoolean.False;
@@ -967,7 +957,6 @@ namespace UAS_DeviceMonitor
             this.PagePolling.ResumeLayout(false);
             ((System.ComponentModel.ISupportInitialize)(this.GridPolling)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.GridViewPolling)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.repositoryItemColorPickEdit1)).EndInit();
             this.ResumeLayout(false);
             this.PerformLayout();
 
@@ -1053,6 +1042,5 @@ namespace UAS_DeviceMonitor
         private DevExpress.XtraGrid.Columns.GridColumn GRIDVIEWPOLLSETTINGCHOOSE;
         private DevExpress.XtraGrid.Columns.GridColumn PollSettingStatusColumn;
         private DevExpress.XtraEditors.Repository.RepositoryItemColorEdit PollSettingItemColorEdit;
-        private DevExpress.XtraEditors.Repository.RepositoryItemColorPickEdit repositoryItemColorPickEdit1;
     }
 }

+ 20 - 0
UAS_DeviceMonitor/Properties/Resources.Designer.cs

@@ -60,6 +60,26 @@ namespace UAS_DeviceMonitor.Properties {
             }
         }
         
+        /// <summary>
+        ///   查找 System.Drawing.Bitmap 类型的本地化资源。
+        /// </summary>
+        internal static System.Drawing.Bitmap check_16px_1137507_easyicon_net {
+            get {
+                object obj = ResourceManager.GetObject("check_16px_1137507_easyicon_net", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   查找 System.Drawing.Bitmap 类型的本地化资源。
+        /// </summary>
+        internal static System.Drawing.Bitmap close_24px_1069872_easyicon_net {
+            get {
+                object obj = ResourceManager.GetObject("close_24px_1069872_easyicon_net", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
         /// <summary>
         ///   查找 System.Drawing.Bitmap 类型的本地化资源。
         /// </summary>

+ 6 - 0
UAS_DeviceMonitor/Properties/Resources.resx

@@ -136,4 +136,10 @@
   <data name="U_Letter_64px_1121581_easyicon_net" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\U_Letter_64px_1121581_easyicon.net.ico;System.Drawing.Icon, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
+  <data name="check_16px_1137507_easyicon_net" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\check_16px_1137507_easyicon.net.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="close_24px_1069872_easyicon_net" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\close_24px_1069872_easyicon.net.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
 </root>

BIN
UAS_DeviceMonitor/Resources/check_16px_1137507_easyicon.net.png


BIN
UAS_DeviceMonitor/Resources/close_24px_1069872_easyicon.net.png