控件重命名

UAS_DeviceMonitor/Main.Designer.cs

@@ -35,22 +35,30 @@
             this.ButtonDeviceKind = new DevExpress.XtraBars.BarButtonItem();
             this.barButtonGroup1 = new DevExpress.XtraBars.BarButtonGroup();
             this.ButtonDeviceStatus = new DevExpress.XtraBars.BarButtonItem();
-            this.barButtonItem4 = new DevExpress.XtraBars.BarButtonItem();
+            this.ButtonCommandSet = new DevExpress.XtraBars.BarButtonItem();
             this.barButtonItem5 = new DevExpress.XtraBars.BarButtonItem();
             this.DeviceInf = new DevExpress.XtraBars.Ribbon.RibbonPage();
-            this.ribbonPageGroup2 = new DevExpress.XtraBars.Ribbon.RibbonPageGroup();
+            this.RibDeviceInf = new DevExpress.XtraBars.Ribbon.RibbonPageGroup();
             this.DeviceCommandSetting = new DevExpress.XtraBars.Ribbon.RibbonPage();
-            this.ribbonPageGroup3 = new DevExpress.XtraBars.Ribbon.RibbonPageGroup();
+            this.RibDeviceCommand = new DevExpress.XtraBars.Ribbon.RibbonPageGroup();
             this.ribbonPage2 = new DevExpress.XtraBars.Ribbon.RibbonPage();
-            this.ribbonPageGroup4 = new DevExpress.XtraBars.Ribbon.RibbonPageGroup();
+            this.RibDeviceBadInf = new DevExpress.XtraBars.Ribbon.RibbonPageGroup();
             this.ribbonStatusBar = new DevExpress.XtraBars.Ribbon.RibbonStatusBar();
             this.ribbonPageGroup1 = new DevExpress.XtraBars.Ribbon.RibbonPageGroup();
             this.ribbonPage1 = new DevExpress.XtraBars.Ribbon.RibbonPage();
             this.MainTabControl = new DevExpress.XtraTab.XtraTabControl();
             this.PageDeviceList = new DevExpress.XtraTab.XtraTabPage();
+            this.PageCommandSet = new DevExpress.XtraTab.XtraTabPage();
+            this.PageDeviceKind = new DevExpress.XtraTab.XtraTabPage();
+            this.PageDeviceStatus = new DevExpress.XtraTab.XtraTabPage();
+            this.GridDeviceList = new DevExpress.XtraGrid.GridControl();
+            this.GridViewDeviceList = new DevExpress.XtraGrid.Views.Grid.GridView();
             ((System.ComponentModel.ISupportInitialize)(this.ribbon)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.MainTabControl)).BeginInit();
             this.MainTabControl.SuspendLayout();
+            this.PageDeviceList.SuspendLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.GridDeviceList)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.GridViewDeviceList)).BeginInit();
             this.SuspendLayout();
             // 
             // ribbon
@@ -65,7 +73,7 @@
             this.ButtonDeviceKind,
             this.barButtonGroup1,
             this.ButtonDeviceStatus,
-            this.barButtonItem4,
+            this.ButtonCommandSet,
             this.barButtonItem5});
             this.ribbon.Location = new System.Drawing.Point(0, 0);
             this.ribbon.MaxItemId = 11;
@@ -102,6 +110,7 @@
             this.ButtonDeviceKind.LargeGlyph = ((System.Drawing.Image)(resources.GetObject("ButtonDeviceKind.LargeGlyph")));
             this.ButtonDeviceKind.Name = "ButtonDeviceKind";
             this.ButtonDeviceKind.RibbonStyle = DevExpress.XtraBars.Ribbon.RibbonItemStyles.Large;
+            this.ButtonDeviceKind.Tag = "PageDeviceKind";
             this.ButtonDeviceKind.ItemClick += new DevExpress.XtraBars.ItemClickEventHandler(this.ButtonItem_ItemClick);
             // 
             // barButtonGroup1
@@ -119,15 +128,17 @@
             this.ButtonDeviceStatus.Id = 8;
             this.ButtonDeviceStatus.LargeGlyph = ((System.Drawing.Image)(resources.GetObject("ButtonDeviceStatus.LargeGlyph")));
             this.ButtonDeviceStatus.Name = "ButtonDeviceStatus";
+            this.ButtonDeviceStatus.Tag = "PageDeviceStatus";
             this.ButtonDeviceStatus.ItemClick += new DevExpress.XtraBars.ItemClickEventHandler(this.ButtonItem_ItemClick);
             // 
-            // barButtonItem4
+            // ButtonCommandSet
             // 
-            this.barButtonItem4.Caption = "指令设置";
-            this.barButtonItem4.Glyph = ((System.Drawing.Image)(resources.GetObject("barButtonItem4.Glyph")));
-            this.barButtonItem4.Id = 9;
-            this.barButtonItem4.LargeGlyph = ((System.Drawing.Image)(resources.GetObject("barButtonItem4.LargeGlyph")));
-            this.barButtonItem4.Name = "barButtonItem4";
+            this.ButtonCommandSet.Caption = "指令设置";
+            this.ButtonCommandSet.Glyph = ((System.Drawing.Image)(resources.GetObject("ButtonCommandSet.Glyph")));
+            this.ButtonCommandSet.Id = 9;
+            this.ButtonCommandSet.LargeGlyph = ((System.Drawing.Image)(resources.GetObject("ButtonCommandSet.LargeGlyph")));
+            this.ButtonCommandSet.Name = "ButtonCommandSet";
+            this.ButtonCommandSet.Tag = "PageCommandSet";
             // 
             // barButtonItem5
             // 
@@ -140,45 +151,45 @@
             // DeviceInf
             // 
             this.DeviceInf.Groups.AddRange(new DevExpress.XtraBars.Ribbon.RibbonPageGroup[] {
-            this.ribbonPageGroup2});
+            this.RibDeviceInf});
             this.DeviceInf.Name = "DeviceInf";
             this.DeviceInf.Text = "设备信息";
             // 
-            // ribbonPageGroup2
+            // RibDeviceInf
             // 
-            this.ribbonPageGroup2.AllowTextClipping = false;
-            this.ribbonPageGroup2.ItemLinks.Add(this.ButtonDeviceList);
-            this.ribbonPageGroup2.ItemLinks.Add(this.ButtonDeviceKind);
-            this.ribbonPageGroup2.ItemLinks.Add(this.ButtonDeviceStatus);
-            this.ribbonPageGroup2.Name = "ribbonPageGroup2";
-            this.ribbonPageGroup2.ShowCaptionButton = false;
+            this.RibDeviceInf.AllowTextClipping = false;
+            this.RibDeviceInf.ItemLinks.Add(this.ButtonDeviceList);
+            this.RibDeviceInf.ItemLinks.Add(this.ButtonDeviceKind);
+            this.RibDeviceInf.ItemLinks.Add(this.ButtonDeviceStatus);
+            this.RibDeviceInf.Name = "RibDeviceInf";
+            this.RibDeviceInf.ShowCaptionButton = false;
             // 
             // DeviceCommandSetting
             // 
             this.DeviceCommandSetting.Groups.AddRange(new DevExpress.XtraBars.Ribbon.RibbonPageGroup[] {
-            this.ribbonPageGroup3});
+            this.RibDeviceCommand});
             this.DeviceCommandSetting.Name = "DeviceCommandSetting";
             this.DeviceCommandSetting.Text = "设备指令配置";
             this.DeviceCommandSetting.Visible = false;
             // 
-            // ribbonPageGroup3
+            // RibDeviceCommand
             // 
-            this.ribbonPageGroup3.ItemLinks.Add(this.barButtonItem4);
-            this.ribbonPageGroup3.Name = "ribbonPageGroup3";
-            this.ribbonPageGroup3.Text = "ribbonPageGroup3";
+            this.RibDeviceCommand.ItemLinks.Add(this.ButtonCommandSet);
+            this.RibDeviceCommand.Name = "RibDeviceCommand";
+            this.RibDeviceCommand.Text = "ribbonPageGroup3";
             // 
             // ribbonPage2
             // 
             this.ribbonPage2.Groups.AddRange(new DevExpress.XtraBars.Ribbon.RibbonPageGroup[] {
-            this.ribbonPageGroup4});
+            this.RibDeviceBadInf});
             this.ribbonPage2.Name = "ribbonPage2";
             this.ribbonPage2.Text = "设备故障监控";
             // 
-            // ribbonPageGroup4
+            // RibDeviceBadInf
             // 
-            this.ribbonPageGroup4.ItemLinks.Add(this.barButtonItem5);
-            this.ribbonPageGroup4.Name = "ribbonPageGroup4";
-            this.ribbonPageGroup4.Text = "ribbonPageGroup4";
+            this.RibDeviceBadInf.ItemLinks.Add(this.barButtonItem5);
+            this.RibDeviceBadInf.Name = "RibDeviceBadInf";
+            this.RibDeviceBadInf.Text = "ribbonPageGroup4";
             // 
             // ribbonStatusBar
             // 
@@ -209,14 +220,53 @@
             this.MainTabControl.Size = new System.Drawing.Size(1033, 552);
             this.MainTabControl.TabIndex = 3;
             this.MainTabControl.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] {
-            this.PageDeviceList});
+            this.PageDeviceList,
+            this.PageCommandSet,
+            this.PageDeviceKind,
+            this.PageDeviceStatus});
             // 
             // PageDeviceList
             // 
+            this.PageDeviceList.Controls.Add(this.GridDeviceList);
             this.PageDeviceList.Name = "PageDeviceList";
             this.PageDeviceList.Size = new System.Drawing.Size(1027, 546);
             this.PageDeviceList.Text = "xtraTabPage1";
             // 
+            // PageCommandSet
+            // 
+            this.PageCommandSet.Name = "PageCommandSet";
+            this.PageCommandSet.Size = new System.Drawing.Size(1027, 546);
+            this.PageCommandSet.Text = "xtraTabPage1";
+            // 
+            // PageDeviceKind
+            // 
+            this.PageDeviceKind.Name = "PageDeviceKind";
+            this.PageDeviceKind.Size = new System.Drawing.Size(1027, 546);
+            this.PageDeviceKind.Text = "xtraTabPage2";
+            // 
+            // PageDeviceStatus
+            // 
+            this.PageDeviceStatus.Name = "PageDeviceStatus";
+            this.PageDeviceStatus.Size = new System.Drawing.Size(1027, 546);
+            this.PageDeviceStatus.Text = "xtraTabPage3";
+            // 
+            // GridDeviceList
+            // 
+            this.GridDeviceList.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.GridDeviceList.Location = new System.Drawing.Point(0, 0);
+            this.GridDeviceList.MainView = this.GridViewDeviceList;
+            this.GridDeviceList.MenuManager = this.ribbon;
+            this.GridDeviceList.Name = "GridDeviceList";
+            this.GridDeviceList.Size = new System.Drawing.Size(1027, 546);
+            this.GridDeviceList.TabIndex = 0;
+            this.GridDeviceList.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
+            this.GridViewDeviceList});
+            // 
+            // GridViewDeviceList
+            // 
+            this.GridViewDeviceList.GridControl = this.GridDeviceList;
+            this.GridViewDeviceList.Name = "GridViewDeviceList";
+            // 
             // Main
             // 
             this.AllowFormGlass = DevExpress.Utils.DefaultBoolean.False;
@@ -236,6 +286,9 @@
             ((System.ComponentModel.ISupportInitialize)(this.ribbon)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.MainTabControl)).EndInit();
             this.MainTabControl.ResumeLayout(false);
+            this.PageDeviceList.ResumeLayout(false);
+            ((System.ComponentModel.ISupportInitialize)(this.GridDeviceList)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.GridViewDeviceList)).EndInit();
             this.ResumeLayout(false);
             this.PerformLayout();
 
@@ -250,17 +303,22 @@
         private DevExpress.XtraBars.Ribbon.RibbonPage ribbonPage1;
         private DevExpress.XtraBars.BarButtonItem ButtonDeviceList;
         private DevExpress.XtraBars.Ribbon.RibbonPage DeviceInf;
-        private DevExpress.XtraBars.Ribbon.RibbonPageGroup ribbonPageGroup2;
+        private DevExpress.XtraBars.Ribbon.RibbonPageGroup RibDeviceInf;
         private DevExpress.XtraBars.BarButtonItem ButtonDeviceKind;
         private DevExpress.XtraBars.BarButtonGroup barButtonGroup1;
         private DevExpress.XtraTab.XtraTabControl MainTabControl;
         private DevExpress.XtraBars.BarButtonItem ButtonDeviceStatus;
         private DevExpress.XtraBars.Ribbon.RibbonPage DeviceCommandSetting;
         private DevExpress.XtraBars.Ribbon.RibbonPage ribbonPage2;
-        private DevExpress.XtraBars.BarButtonItem barButtonItem4;
-        private DevExpress.XtraBars.Ribbon.RibbonPageGroup ribbonPageGroup3;
+        private DevExpress.XtraBars.BarButtonItem ButtonCommandSet;
+        private DevExpress.XtraBars.Ribbon.RibbonPageGroup RibDeviceCommand;
         private DevExpress.XtraBars.BarButtonItem barButtonItem5;
-        private DevExpress.XtraBars.Ribbon.RibbonPageGroup ribbonPageGroup4;
+        private DevExpress.XtraBars.Ribbon.RibbonPageGroup RibDeviceBadInf;
         private DevExpress.XtraTab.XtraTabPage PageDeviceList;
+        private DevExpress.XtraTab.XtraTabPage PageCommandSet;
+        private DevExpress.XtraTab.XtraTabPage PageDeviceKind;
+        private DevExpress.XtraTab.XtraTabPage PageDeviceStatus;
+        private DevExpress.XtraGrid.GridControl GridDeviceList;
+        private DevExpress.XtraGrid.Views.Grid.GridView GridViewDeviceList;
     }
 }

UAS_DeviceMonitor/Main.cs

@@ -19,6 +19,7 @@ namespace UAS_DeviceMonitor
 
         private void Main_Load(object sender, EventArgs e)
         {
+            //隐藏素有的Xpage
             for (int i = 0; i < MainTabControl.TabPages.Count; i++)
             {
                 MainTabControl.TabPages[i].PageVisible = false;

UAS_DeviceMonitor/Main.resx

@@ -277,7 +277,7 @@
         YQmnyvVy01zcD5MC7lh3uWf3Qn+adfL/fpxeHtXAP2zZTBNbPKbVAAAAAElFTkSuQmCC
 </value>
   </data>
-  <data name="barButtonItem4.Glyph" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+  <data name="ButtonCommandSet.Glyph" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m
         dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAAcdEVYdFRpdGxlAExlZ2VuZDtMZWdlbmRMb2NhdGlv
@@ -294,7 +294,7 @@
         jtC/iZv2nfhPtCwd+At2xfPrFtRf5wAAAABJRU5ErkJggg==
 </value>
   </data>
-  <data name="barButtonItem4.LargeGlyph" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+  <data name="ButtonCommandSet.LargeGlyph" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m
         dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAAcdEVYdFRpdGxlAExlZ2VuZDtMZWdlbmRMb2NhdGlv