diff --git a/Cyberpipe.suo b/Cyberpipe.suo index 13a1659..6abc092 100644 --- a/Cyberpipe.suo +++ b/Cyberpipe.suo Binary files differ diff --git a/Cyberpipe.suo b/Cyberpipe.suo index 13a1659..6abc092 100644 --- a/Cyberpipe.suo +++ b/Cyberpipe.suo Binary files differ diff --git a/FormDocumentManager.cs b/FormDocumentManager.cs index 7925e2c..1c21f81 100644 --- a/FormDocumentManager.cs +++ b/FormDocumentManager.cs @@ -395,7 +395,7 @@ private void FormDocumentManager_Load(object sender, EventArgs e) { IS_OPEN = true; - //changeCursor(); + changeCursor(); dateTime_end.Value = DateTime.Now; dateTime_begin.Value = DateTime.Now.AddDays(-6); Thread loadThread = new Thread(new ThreadStart(doFormLoad)); diff --git a/Cyberpipe.suo b/Cyberpipe.suo index 13a1659..6abc092 100644 --- a/Cyberpipe.suo +++ b/Cyberpipe.suo Binary files differ diff --git a/FormDocumentManager.cs b/FormDocumentManager.cs index 7925e2c..1c21f81 100644 --- a/FormDocumentManager.cs +++ b/FormDocumentManager.cs @@ -395,7 +395,7 @@ private void FormDocumentManager_Load(object sender, EventArgs e) { IS_OPEN = true; - //changeCursor(); + changeCursor(); dateTime_end.Value = DateTime.Now; dateTime_begin.Value = DateTime.Now.AddDays(-6); Thread loadThread = new Thread(new ThreadStart(doFormLoad)); diff --git a/MainFrm.cs b/MainFrm.cs index e801c7e..c5b7a38 100644 --- a/MainFrm.cs +++ b/MainFrm.cs @@ -14368,17 +14368,7 @@ globeControl1.Globe.Action = EnumAction3D.TrackPolygon; } - private void ribbonTabItem7_Click(object sender, EventArgs e) - { - - } - - private void label1_Click(object sender, EventArgs e) - { - - } - - + } diff --git a/Cyberpipe.suo b/Cyberpipe.suo index 13a1659..6abc092 100644 --- a/Cyberpipe.suo +++ b/Cyberpipe.suo Binary files differ diff --git a/FormDocumentManager.cs b/FormDocumentManager.cs index 7925e2c..1c21f81 100644 --- a/FormDocumentManager.cs +++ b/FormDocumentManager.cs @@ -395,7 +395,7 @@ private void FormDocumentManager_Load(object sender, EventArgs e) { IS_OPEN = true; - //changeCursor(); + changeCursor(); dateTime_end.Value = DateTime.Now; dateTime_begin.Value = DateTime.Now.AddDays(-6); Thread loadThread = new Thread(new ThreadStart(doFormLoad)); diff --git a/MainFrm.cs b/MainFrm.cs index e801c7e..c5b7a38 100644 --- a/MainFrm.cs +++ b/MainFrm.cs @@ -14368,17 +14368,7 @@ globeControl1.Globe.Action = EnumAction3D.TrackPolygon; } - private void ribbonTabItem7_Click(object sender, EventArgs e) - { - - } - - private void label1_Click(object sender, EventArgs e) - { - - } - - + } diff --git a/MainFrm.designer.cs b/MainFrm.designer.cs index ee6e5b6..e9b8b02 100644 --- a/MainFrm.designer.cs +++ b/MainFrm.designer.cs @@ -82,7 +82,6 @@ this.sideBar1 = new DevComponents.DotNetBar.SideBar(); this.panelEx3 = new DevComponents.DotNetBar.PanelEx(); this.layerSensorTree = new System.Windows.Forms.TreeView(); - this.layerTree = new Cyberpipe.MyTreeView(); this.sideBarPanelItem3 = new DevComponents.DotNetBar.SideBarPanelItem(); this.controlContainerItem3 = new DevComponents.DotNetBar.ControlContainerItem(); this.sideBarPanelItem4 = new DevComponents.DotNetBar.SideBarPanelItem(); @@ -372,6 +371,15 @@ this.btn_Person = new DevComponents.DotNetBar.ButtonItem(); this.btn_constructMap = new DevComponents.DotNetBar.ButtonItem(); this.buttonItem9 = new DevComponents.DotNetBar.ButtonItem(); + this.ribbonPanel8 = new DevComponents.DotNetBar.RibbonPanel(); + this.ribbonBar_UserInfo = new DevComponents.DotNetBar.RibbonBar(); + this.btn_user_info = new DevComponents.DotNetBar.ButtonItem(); + this.btn_role_info = new DevComponents.DotNetBar.ButtonItem(); + this.btn_resc_info = new DevComponents.DotNetBar.ButtonItem(); + this.btn_role_resc = new DevComponents.DotNetBar.ButtonItem(); + this.btn_user_role = new DevComponents.DotNetBar.ButtonItem(); + this.btn_password_edit = new DevComponents.DotNetBar.ButtonItem(); + this.btn_reset_password = new DevComponents.DotNetBar.ButtonItem(); this.ribbonPanel2 = new DevComponents.DotNetBar.RibbonPanel(); this.ribbonBar4 = new DevComponents.DotNetBar.RibbonBar(); this.buttonItem_TaskManager = new DevComponents.DotNetBar.ButtonItem(); @@ -556,15 +564,6 @@ this.ribbonBar5 = new DevComponents.DotNetBar.RibbonBar(); this.btn_flag = new DevComponents.DotNetBar.ButtonItem(); this.slider4ground = new DevComponents.DotNetBar.SliderItem(); - this.ribbonPanel8 = new DevComponents.DotNetBar.RibbonPanel(); - this.ribbonBar_UserInfo = new DevComponents.DotNetBar.RibbonBar(); - this.btn_user_info = new DevComponents.DotNetBar.ButtonItem(); - this.btn_role_info = new DevComponents.DotNetBar.ButtonItem(); - this.btn_resc_info = new DevComponents.DotNetBar.ButtonItem(); - this.btn_role_resc = new DevComponents.DotNetBar.ButtonItem(); - this.btn_user_role = new DevComponents.DotNetBar.ButtonItem(); - this.btn_password_edit = new DevComponents.DotNetBar.ButtonItem(); - this.btn_reset_password = new DevComponents.DotNetBar.ButtonItem(); this.ribbonTabItem1 = new DevComponents.DotNetBar.RibbonTabItem(); this.ribbonTabItem14 = new DevComponents.DotNetBar.RibbonTabItem(); this.ribbonTabItem2 = new DevComponents.DotNetBar.RibbonTabItem(); @@ -612,6 +611,7 @@ this.buttonItem75 = new DevComponents.DotNetBar.ButtonItem(); this.buttonItem76 = new DevComponents.DotNetBar.ButtonItem(); this.label1 = new System.Windows.Forms.Label(); + this.layerTree = new Cyberpipe.MyTreeView(); this.statusStrip1.SuspendLayout(); this.sideBar1.SuspendLayout(); this.panelEx3.SuspendLayout(); @@ -649,11 +649,11 @@ this.contextMenuStripDeleteLayerNode.SuspendLayout(); this.ribbonControl1.SuspendLayout(); this.ribbonPanel3.SuspendLayout(); + this.ribbonPanel8.SuspendLayout(); this.ribbonPanel2.SuspendLayout(); this.ribbonPanel15.SuspendLayout(); this.ribbonPanel1.SuspendLayout(); this.ribbonPanel7.SuspendLayout(); - this.ribbonPanel8.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).BeginInit(); this.SuspendLayout(); // @@ -1048,16 +1048,6 @@ this.layerSensorTree.AfterCheck += new System.Windows.Forms.TreeViewEventHandler(this.layerMarkerTree_AfterCheck); this.layerSensorTree.NodeMouseClick += new System.Windows.Forms.TreeNodeMouseClickEventHandler(this.layerMarkerTree_NodeMouseClick); // - // layerTree - // - this.layerTree.CheckBoxes = true; - this.layerTree.ItemHeight = 18; - this.layerTree.Location = new System.Drawing.Point(30, 78); - this.layerTree.Name = "layerTree"; - this.layerTree.Size = new System.Drawing.Size(121, 97); - this.layerTree.TabIndex = 1; - this.layerTree.AfterCheck += new System.Windows.Forms.TreeViewEventHandler(this.layerTree_AfterCheck); - // // sideBarPanelItem3 // this.sideBarPanelItem3.FontBold = true; @@ -4126,11 +4116,11 @@ this.ribbonControl1.BackgroundStyle.Class = ""; this.ribbonControl1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonControl1.Controls.Add(this.ribbonPanel3); + this.ribbonControl1.Controls.Add(this.ribbonPanel8); this.ribbonControl1.Controls.Add(this.ribbonPanel2); this.ribbonControl1.Controls.Add(this.ribbonPanel15); this.ribbonControl1.Controls.Add(this.ribbonPanel1); this.ribbonControl1.Controls.Add(this.ribbonPanel7); - this.ribbonControl1.Controls.Add(this.ribbonPanel8); this.ribbonControl1.Dock = System.Windows.Forms.DockStyle.Top; this.ribbonControl1.ImeMode = System.Windows.Forms.ImeMode.NoControl; this.ribbonControl1.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { @@ -4272,6 +4262,135 @@ this.buttonItem9.Text = "文档管理"; this.buttonItem9.Click += new System.EventHandler(this.buttonItem9_Click); // + // ribbonPanel8 + // + this.ribbonPanel8.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonPanel8.Controls.Add(this.ribbonBar_UserInfo); + this.ribbonPanel8.Dock = System.Windows.Forms.DockStyle.Fill; + this.ribbonPanel8.Location = new System.Drawing.Point(0, 0); + this.ribbonPanel8.Name = "ribbonPanel8"; + this.ribbonPanel8.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); + this.ribbonPanel8.Size = new System.Drawing.Size(1328, 95); + // + // + // + this.ribbonPanel8.Style.Class = ""; + this.ribbonPanel8.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel8.StyleMouseDown.Class = ""; + this.ribbonPanel8.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel8.StyleMouseOver.Class = ""; + this.ribbonPanel8.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonPanel8.TabIndex = 42; + this.ribbonPanel8.Visible = false; + // + // ribbonBar_UserInfo + // + this.ribbonBar_UserInfo.AutoOverflowEnabled = true; + // + // + // + this.ribbonBar_UserInfo.BackgroundMouseOverStyle.Class = ""; + this.ribbonBar_UserInfo.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar_UserInfo.BackgroundStyle.Class = ""; + this.ribbonBar_UserInfo.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar_UserInfo.ContainerControlProcessDialogKey = true; + this.ribbonBar_UserInfo.Dock = System.Windows.Forms.DockStyle.Left; + this.ribbonBar_UserInfo.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { + this.btn_user_info, + this.btn_role_info, + this.btn_resc_info, + this.btn_role_resc, + this.btn_user_role, + this.btn_password_edit, + this.btn_reset_password}); + this.ribbonBar_UserInfo.Location = new System.Drawing.Point(3, 0); + this.ribbonBar_UserInfo.Name = "ribbonBar_UserInfo"; + this.ribbonBar_UserInfo.Size = new System.Drawing.Size(427, 92); + this.ribbonBar_UserInfo.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonBar_UserInfo.TabIndex = 0; + // + // + // + this.ribbonBar_UserInfo.TitleStyle.Class = ""; + this.ribbonBar_UserInfo.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar_UserInfo.TitleStyleMouseOver.Class = ""; + this.ribbonBar_UserInfo.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // btn_user_info + // + this.btn_user_info.Image = global::Cyberpipe.Properties.Resources._24x24icon_13_hover; + this.btn_user_info.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.btn_user_info.Name = "btn_user_info"; + this.btn_user_info.SubItemsExpandWidth = 14; + this.btn_user_info.Text = "用户管理"; + this.btn_user_info.Click += new System.EventHandler(this.btn_user_info_Click); + // + // btn_role_info + // + this.btn_role_info.Image = global::Cyberpipe.Properties.Resources._24x24icon_05_hover1; + this.btn_role_info.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.btn_role_info.Name = "btn_role_info"; + this.btn_role_info.SubItemsExpandWidth = 14; + this.btn_role_info.Text = "角色管理"; + this.btn_role_info.Click += new System.EventHandler(this.btn_role_info_Click); + // + // btn_resc_info + // + this.btn_resc_info.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__09; + this.btn_resc_info.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.btn_resc_info.Name = "btn_resc_info"; + this.btn_resc_info.SubItemsExpandWidth = 14; + this.btn_resc_info.Text = "资源管理"; + this.btn_resc_info.Click += new System.EventHandler(this.btn_resc_info_Click); + // + // btn_role_resc + // + this.btn_role_resc.Image = global::Cyberpipe.Properties.Resources.btnlegendSet_Image_副本; + this.btn_role_resc.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.btn_role_resc.Name = "btn_role_resc"; + this.btn_role_resc.SubItemsExpandWidth = 14; + this.btn_role_resc.Text = "角色授权"; + this.btn_role_resc.Click += new System.EventHandler(this.btn_role_resc_Click); + // + // btn_user_role + // + this.btn_user_role.Image = global::Cyberpipe.Properties.Resources._24x24icon_08_hover; + this.btn_user_role.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.btn_user_role.Name = "btn_user_role"; + this.btn_user_role.SubItemsExpandWidth = 14; + this.btn_user_role.Text = "用户授权"; + this.btn_user_role.Click += new System.EventHandler(this.btn_user_role_Click); + // + // btn_password_edit + // + this.btn_password_edit.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__67; + this.btn_password_edit.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.btn_password_edit.Name = "btn_password_edit"; + this.btn_password_edit.SubItemsExpandWidth = 14; + this.btn_password_edit.Text = "密码修改"; + this.btn_password_edit.Click += new System.EventHandler(this.btn_password_edit_Click); + // + // btn_reset_password + // + this.btn_reset_password.Image = global::Cyberpipe.Properties.Resources.liuxiang; + this.btn_reset_password.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.btn_reset_password.Name = "btn_reset_password"; + this.btn_reset_password.SubItemsExpandWidth = 14; + this.btn_reset_password.Text = "重置密码"; + this.btn_reset_password.Click += new System.EventHandler(this.btn_reset_password_Click); + // // ribbonPanel2 // this.ribbonPanel2.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -5931,135 +6050,6 @@ this.slider4ground.Value = 0; this.slider4ground.ValueChanged += new System.EventHandler(this.slider4ground_ValueChanged); // - // ribbonPanel8 - // - this.ribbonPanel8.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonPanel8.Controls.Add(this.ribbonBar_UserInfo); - this.ribbonPanel8.Dock = System.Windows.Forms.DockStyle.Fill; - this.ribbonPanel8.Location = new System.Drawing.Point(0, 0); - this.ribbonPanel8.Name = "ribbonPanel8"; - this.ribbonPanel8.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); - this.ribbonPanel8.Size = new System.Drawing.Size(1328, 95); - // - // - // - this.ribbonPanel8.Style.Class = ""; - this.ribbonPanel8.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel8.StyleMouseDown.Class = ""; - this.ribbonPanel8.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel8.StyleMouseOver.Class = ""; - this.ribbonPanel8.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonPanel8.TabIndex = 42; - this.ribbonPanel8.Visible = false; - // - // ribbonBar_UserInfo - // - this.ribbonBar_UserInfo.AutoOverflowEnabled = true; - // - // - // - this.ribbonBar_UserInfo.BackgroundMouseOverStyle.Class = ""; - this.ribbonBar_UserInfo.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar_UserInfo.BackgroundStyle.Class = ""; - this.ribbonBar_UserInfo.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar_UserInfo.ContainerControlProcessDialogKey = true; - this.ribbonBar_UserInfo.Dock = System.Windows.Forms.DockStyle.Left; - this.ribbonBar_UserInfo.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { - this.btn_user_info, - this.btn_role_info, - this.btn_resc_info, - this.btn_role_resc, - this.btn_user_role, - this.btn_password_edit, - this.btn_reset_password}); - this.ribbonBar_UserInfo.Location = new System.Drawing.Point(3, 0); - this.ribbonBar_UserInfo.Name = "ribbonBar_UserInfo"; - this.ribbonBar_UserInfo.Size = new System.Drawing.Size(427, 92); - this.ribbonBar_UserInfo.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonBar_UserInfo.TabIndex = 0; - // - // - // - this.ribbonBar_UserInfo.TitleStyle.Class = ""; - this.ribbonBar_UserInfo.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar_UserInfo.TitleStyleMouseOver.Class = ""; - this.ribbonBar_UserInfo.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // btn_user_info - // - this.btn_user_info.Image = global::Cyberpipe.Properties.Resources._24x24icon_13_hover; - this.btn_user_info.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.btn_user_info.Name = "btn_user_info"; - this.btn_user_info.SubItemsExpandWidth = 14; - this.btn_user_info.Text = "用户管理"; - this.btn_user_info.Click += new System.EventHandler(this.btn_user_info_Click); - // - // btn_role_info - // - this.btn_role_info.Image = global::Cyberpipe.Properties.Resources._24x24icon_05_hover1; - this.btn_role_info.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.btn_role_info.Name = "btn_role_info"; - this.btn_role_info.SubItemsExpandWidth = 14; - this.btn_role_info.Text = "角色管理"; - this.btn_role_info.Click += new System.EventHandler(this.btn_role_info_Click); - // - // btn_resc_info - // - this.btn_resc_info.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__09; - this.btn_resc_info.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.btn_resc_info.Name = "btn_resc_info"; - this.btn_resc_info.SubItemsExpandWidth = 14; - this.btn_resc_info.Text = "资源管理"; - this.btn_resc_info.Click += new System.EventHandler(this.btn_resc_info_Click); - // - // btn_role_resc - // - this.btn_role_resc.Image = global::Cyberpipe.Properties.Resources.btnlegendSet_Image_副本; - this.btn_role_resc.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.btn_role_resc.Name = "btn_role_resc"; - this.btn_role_resc.SubItemsExpandWidth = 14; - this.btn_role_resc.Text = "角色授权"; - this.btn_role_resc.Click += new System.EventHandler(this.btn_role_resc_Click); - // - // btn_user_role - // - this.btn_user_role.Image = global::Cyberpipe.Properties.Resources._24x24icon_08_hover; - this.btn_user_role.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.btn_user_role.Name = "btn_user_role"; - this.btn_user_role.SubItemsExpandWidth = 14; - this.btn_user_role.Text = "用户授权"; - this.btn_user_role.Click += new System.EventHandler(this.btn_user_role_Click); - // - // btn_password_edit - // - this.btn_password_edit.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__67; - this.btn_password_edit.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.btn_password_edit.Name = "btn_password_edit"; - this.btn_password_edit.SubItemsExpandWidth = 14; - this.btn_password_edit.Text = "密码修改"; - this.btn_password_edit.Click += new System.EventHandler(this.btn_password_edit_Click); - // - // btn_reset_password - // - this.btn_reset_password.Image = global::Cyberpipe.Properties.Resources.liuxiang; - this.btn_reset_password.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.btn_reset_password.Name = "btn_reset_password"; - this.btn_reset_password.SubItemsExpandWidth = 14; - this.btn_reset_password.Text = "重置密码"; - this.btn_reset_password.Click += new System.EventHandler(this.btn_reset_password_Click); - // // ribbonTabItem1 // this.ribbonTabItem1.ButtonStyle = DevComponents.DotNetBar.eButtonStyle.ImageAndText; @@ -6110,7 +6100,6 @@ this.ribbonTabItem7.Name = "ribbonTabItem7"; this.ribbonTabItem7.Panel = this.ribbonPanel7; this.ribbonTabItem7.Text = "标识器管理"; - this.ribbonTabItem7.Click += new System.EventHandler(this.ribbonTabItem7_Click); this.ribbonTabItem7.MouseDown += new System.Windows.Forms.MouseEventHandler(this.ribbonTabItem7_MouseDown); // // ribbonTabItem8 @@ -6428,14 +6417,27 @@ // // label1 // + this.label1.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); + this.label1.AutoEllipsis = true; this.label1.AutoSize = true; this.label1.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.label1.Image = global::Cyberpipe.Properties.Resources.user; - this.label1.Location = new System.Drawing.Point(1198, 53); + this.label1.Location = new System.Drawing.Point(1205, 51); this.label1.Name = "label1"; this.label1.Size = new System.Drawing.Size(56, 16); - this.label1.TabIndex = 28; + this.label1.TabIndex = 32; this.label1.Text = "label1"; + this.label1.TextAlign = System.Drawing.ContentAlignment.TopRight; + // + // layerTree + // + this.layerTree.CheckBoxes = true; + this.layerTree.ItemHeight = 18; + this.layerTree.Location = new System.Drawing.Point(30, 78); + this.layerTree.Name = "layerTree"; + this.layerTree.Size = new System.Drawing.Size(121, 97); + this.layerTree.TabIndex = 1; + this.layerTree.AfterCheck += new System.Windows.Forms.TreeViewEventHandler(this.layerTree_AfterCheck); // // MainFrm // @@ -6512,11 +6514,11 @@ this.ribbonControl1.ResumeLayout(false); this.ribbonControl1.PerformLayout(); this.ribbonPanel3.ResumeLayout(false); + this.ribbonPanel8.ResumeLayout(false); this.ribbonPanel2.ResumeLayout(false); this.ribbonPanel15.ResumeLayout(false); this.ribbonPanel1.ResumeLayout(false); this.ribbonPanel7.ResumeLayout(false); - this.ribbonPanel8.ResumeLayout(false); ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).EndInit(); this.ResumeLayout(false); this.PerformLayout(); diff --git a/Cyberpipe.suo b/Cyberpipe.suo index 13a1659..6abc092 100644 --- a/Cyberpipe.suo +++ b/Cyberpipe.suo Binary files differ diff --git a/FormDocumentManager.cs b/FormDocumentManager.cs index 7925e2c..1c21f81 100644 --- a/FormDocumentManager.cs +++ b/FormDocumentManager.cs @@ -395,7 +395,7 @@ private void FormDocumentManager_Load(object sender, EventArgs e) { IS_OPEN = true; - //changeCursor(); + changeCursor(); dateTime_end.Value = DateTime.Now; dateTime_begin.Value = DateTime.Now.AddDays(-6); Thread loadThread = new Thread(new ThreadStart(doFormLoad)); diff --git a/MainFrm.cs b/MainFrm.cs index e801c7e..c5b7a38 100644 --- a/MainFrm.cs +++ b/MainFrm.cs @@ -14368,17 +14368,7 @@ globeControl1.Globe.Action = EnumAction3D.TrackPolygon; } - private void ribbonTabItem7_Click(object sender, EventArgs e) - { - - } - - private void label1_Click(object sender, EventArgs e) - { - - } - - + } diff --git a/MainFrm.designer.cs b/MainFrm.designer.cs index ee6e5b6..e9b8b02 100644 --- a/MainFrm.designer.cs +++ b/MainFrm.designer.cs @@ -82,7 +82,6 @@ this.sideBar1 = new DevComponents.DotNetBar.SideBar(); this.panelEx3 = new DevComponents.DotNetBar.PanelEx(); this.layerSensorTree = new System.Windows.Forms.TreeView(); - this.layerTree = new Cyberpipe.MyTreeView(); this.sideBarPanelItem3 = new DevComponents.DotNetBar.SideBarPanelItem(); this.controlContainerItem3 = new DevComponents.DotNetBar.ControlContainerItem(); this.sideBarPanelItem4 = new DevComponents.DotNetBar.SideBarPanelItem(); @@ -372,6 +371,15 @@ this.btn_Person = new DevComponents.DotNetBar.ButtonItem(); this.btn_constructMap = new DevComponents.DotNetBar.ButtonItem(); this.buttonItem9 = new DevComponents.DotNetBar.ButtonItem(); + this.ribbonPanel8 = new DevComponents.DotNetBar.RibbonPanel(); + this.ribbonBar_UserInfo = new DevComponents.DotNetBar.RibbonBar(); + this.btn_user_info = new DevComponents.DotNetBar.ButtonItem(); + this.btn_role_info = new DevComponents.DotNetBar.ButtonItem(); + this.btn_resc_info = new DevComponents.DotNetBar.ButtonItem(); + this.btn_role_resc = new DevComponents.DotNetBar.ButtonItem(); + this.btn_user_role = new DevComponents.DotNetBar.ButtonItem(); + this.btn_password_edit = new DevComponents.DotNetBar.ButtonItem(); + this.btn_reset_password = new DevComponents.DotNetBar.ButtonItem(); this.ribbonPanel2 = new DevComponents.DotNetBar.RibbonPanel(); this.ribbonBar4 = new DevComponents.DotNetBar.RibbonBar(); this.buttonItem_TaskManager = new DevComponents.DotNetBar.ButtonItem(); @@ -556,15 +564,6 @@ this.ribbonBar5 = new DevComponents.DotNetBar.RibbonBar(); this.btn_flag = new DevComponents.DotNetBar.ButtonItem(); this.slider4ground = new DevComponents.DotNetBar.SliderItem(); - this.ribbonPanel8 = new DevComponents.DotNetBar.RibbonPanel(); - this.ribbonBar_UserInfo = new DevComponents.DotNetBar.RibbonBar(); - this.btn_user_info = new DevComponents.DotNetBar.ButtonItem(); - this.btn_role_info = new DevComponents.DotNetBar.ButtonItem(); - this.btn_resc_info = new DevComponents.DotNetBar.ButtonItem(); - this.btn_role_resc = new DevComponents.DotNetBar.ButtonItem(); - this.btn_user_role = new DevComponents.DotNetBar.ButtonItem(); - this.btn_password_edit = new DevComponents.DotNetBar.ButtonItem(); - this.btn_reset_password = new DevComponents.DotNetBar.ButtonItem(); this.ribbonTabItem1 = new DevComponents.DotNetBar.RibbonTabItem(); this.ribbonTabItem14 = new DevComponents.DotNetBar.RibbonTabItem(); this.ribbonTabItem2 = new DevComponents.DotNetBar.RibbonTabItem(); @@ -612,6 +611,7 @@ this.buttonItem75 = new DevComponents.DotNetBar.ButtonItem(); this.buttonItem76 = new DevComponents.DotNetBar.ButtonItem(); this.label1 = new System.Windows.Forms.Label(); + this.layerTree = new Cyberpipe.MyTreeView(); this.statusStrip1.SuspendLayout(); this.sideBar1.SuspendLayout(); this.panelEx3.SuspendLayout(); @@ -649,11 +649,11 @@ this.contextMenuStripDeleteLayerNode.SuspendLayout(); this.ribbonControl1.SuspendLayout(); this.ribbonPanel3.SuspendLayout(); + this.ribbonPanel8.SuspendLayout(); this.ribbonPanel2.SuspendLayout(); this.ribbonPanel15.SuspendLayout(); this.ribbonPanel1.SuspendLayout(); this.ribbonPanel7.SuspendLayout(); - this.ribbonPanel8.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).BeginInit(); this.SuspendLayout(); // @@ -1048,16 +1048,6 @@ this.layerSensorTree.AfterCheck += new System.Windows.Forms.TreeViewEventHandler(this.layerMarkerTree_AfterCheck); this.layerSensorTree.NodeMouseClick += new System.Windows.Forms.TreeNodeMouseClickEventHandler(this.layerMarkerTree_NodeMouseClick); // - // layerTree - // - this.layerTree.CheckBoxes = true; - this.layerTree.ItemHeight = 18; - this.layerTree.Location = new System.Drawing.Point(30, 78); - this.layerTree.Name = "layerTree"; - this.layerTree.Size = new System.Drawing.Size(121, 97); - this.layerTree.TabIndex = 1; - this.layerTree.AfterCheck += new System.Windows.Forms.TreeViewEventHandler(this.layerTree_AfterCheck); - // // sideBarPanelItem3 // this.sideBarPanelItem3.FontBold = true; @@ -4126,11 +4116,11 @@ this.ribbonControl1.BackgroundStyle.Class = ""; this.ribbonControl1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonControl1.Controls.Add(this.ribbonPanel3); + this.ribbonControl1.Controls.Add(this.ribbonPanel8); this.ribbonControl1.Controls.Add(this.ribbonPanel2); this.ribbonControl1.Controls.Add(this.ribbonPanel15); this.ribbonControl1.Controls.Add(this.ribbonPanel1); this.ribbonControl1.Controls.Add(this.ribbonPanel7); - this.ribbonControl1.Controls.Add(this.ribbonPanel8); this.ribbonControl1.Dock = System.Windows.Forms.DockStyle.Top; this.ribbonControl1.ImeMode = System.Windows.Forms.ImeMode.NoControl; this.ribbonControl1.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { @@ -4272,6 +4262,135 @@ this.buttonItem9.Text = "文档管理"; this.buttonItem9.Click += new System.EventHandler(this.buttonItem9_Click); // + // ribbonPanel8 + // + this.ribbonPanel8.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonPanel8.Controls.Add(this.ribbonBar_UserInfo); + this.ribbonPanel8.Dock = System.Windows.Forms.DockStyle.Fill; + this.ribbonPanel8.Location = new System.Drawing.Point(0, 0); + this.ribbonPanel8.Name = "ribbonPanel8"; + this.ribbonPanel8.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); + this.ribbonPanel8.Size = new System.Drawing.Size(1328, 95); + // + // + // + this.ribbonPanel8.Style.Class = ""; + this.ribbonPanel8.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel8.StyleMouseDown.Class = ""; + this.ribbonPanel8.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel8.StyleMouseOver.Class = ""; + this.ribbonPanel8.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonPanel8.TabIndex = 42; + this.ribbonPanel8.Visible = false; + // + // ribbonBar_UserInfo + // + this.ribbonBar_UserInfo.AutoOverflowEnabled = true; + // + // + // + this.ribbonBar_UserInfo.BackgroundMouseOverStyle.Class = ""; + this.ribbonBar_UserInfo.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar_UserInfo.BackgroundStyle.Class = ""; + this.ribbonBar_UserInfo.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar_UserInfo.ContainerControlProcessDialogKey = true; + this.ribbonBar_UserInfo.Dock = System.Windows.Forms.DockStyle.Left; + this.ribbonBar_UserInfo.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { + this.btn_user_info, + this.btn_role_info, + this.btn_resc_info, + this.btn_role_resc, + this.btn_user_role, + this.btn_password_edit, + this.btn_reset_password}); + this.ribbonBar_UserInfo.Location = new System.Drawing.Point(3, 0); + this.ribbonBar_UserInfo.Name = "ribbonBar_UserInfo"; + this.ribbonBar_UserInfo.Size = new System.Drawing.Size(427, 92); + this.ribbonBar_UserInfo.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonBar_UserInfo.TabIndex = 0; + // + // + // + this.ribbonBar_UserInfo.TitleStyle.Class = ""; + this.ribbonBar_UserInfo.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar_UserInfo.TitleStyleMouseOver.Class = ""; + this.ribbonBar_UserInfo.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // btn_user_info + // + this.btn_user_info.Image = global::Cyberpipe.Properties.Resources._24x24icon_13_hover; + this.btn_user_info.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.btn_user_info.Name = "btn_user_info"; + this.btn_user_info.SubItemsExpandWidth = 14; + this.btn_user_info.Text = "用户管理"; + this.btn_user_info.Click += new System.EventHandler(this.btn_user_info_Click); + // + // btn_role_info + // + this.btn_role_info.Image = global::Cyberpipe.Properties.Resources._24x24icon_05_hover1; + this.btn_role_info.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.btn_role_info.Name = "btn_role_info"; + this.btn_role_info.SubItemsExpandWidth = 14; + this.btn_role_info.Text = "角色管理"; + this.btn_role_info.Click += new System.EventHandler(this.btn_role_info_Click); + // + // btn_resc_info + // + this.btn_resc_info.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__09; + this.btn_resc_info.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.btn_resc_info.Name = "btn_resc_info"; + this.btn_resc_info.SubItemsExpandWidth = 14; + this.btn_resc_info.Text = "资源管理"; + this.btn_resc_info.Click += new System.EventHandler(this.btn_resc_info_Click); + // + // btn_role_resc + // + this.btn_role_resc.Image = global::Cyberpipe.Properties.Resources.btnlegendSet_Image_副本; + this.btn_role_resc.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.btn_role_resc.Name = "btn_role_resc"; + this.btn_role_resc.SubItemsExpandWidth = 14; + this.btn_role_resc.Text = "角色授权"; + this.btn_role_resc.Click += new System.EventHandler(this.btn_role_resc_Click); + // + // btn_user_role + // + this.btn_user_role.Image = global::Cyberpipe.Properties.Resources._24x24icon_08_hover; + this.btn_user_role.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.btn_user_role.Name = "btn_user_role"; + this.btn_user_role.SubItemsExpandWidth = 14; + this.btn_user_role.Text = "用户授权"; + this.btn_user_role.Click += new System.EventHandler(this.btn_user_role_Click); + // + // btn_password_edit + // + this.btn_password_edit.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__67; + this.btn_password_edit.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.btn_password_edit.Name = "btn_password_edit"; + this.btn_password_edit.SubItemsExpandWidth = 14; + this.btn_password_edit.Text = "密码修改"; + this.btn_password_edit.Click += new System.EventHandler(this.btn_password_edit_Click); + // + // btn_reset_password + // + this.btn_reset_password.Image = global::Cyberpipe.Properties.Resources.liuxiang; + this.btn_reset_password.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.btn_reset_password.Name = "btn_reset_password"; + this.btn_reset_password.SubItemsExpandWidth = 14; + this.btn_reset_password.Text = "重置密码"; + this.btn_reset_password.Click += new System.EventHandler(this.btn_reset_password_Click); + // // ribbonPanel2 // this.ribbonPanel2.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -5931,135 +6050,6 @@ this.slider4ground.Value = 0; this.slider4ground.ValueChanged += new System.EventHandler(this.slider4ground_ValueChanged); // - // ribbonPanel8 - // - this.ribbonPanel8.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonPanel8.Controls.Add(this.ribbonBar_UserInfo); - this.ribbonPanel8.Dock = System.Windows.Forms.DockStyle.Fill; - this.ribbonPanel8.Location = new System.Drawing.Point(0, 0); - this.ribbonPanel8.Name = "ribbonPanel8"; - this.ribbonPanel8.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); - this.ribbonPanel8.Size = new System.Drawing.Size(1328, 95); - // - // - // - this.ribbonPanel8.Style.Class = ""; - this.ribbonPanel8.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel8.StyleMouseDown.Class = ""; - this.ribbonPanel8.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel8.StyleMouseOver.Class = ""; - this.ribbonPanel8.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonPanel8.TabIndex = 42; - this.ribbonPanel8.Visible = false; - // - // ribbonBar_UserInfo - // - this.ribbonBar_UserInfo.AutoOverflowEnabled = true; - // - // - // - this.ribbonBar_UserInfo.BackgroundMouseOverStyle.Class = ""; - this.ribbonBar_UserInfo.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar_UserInfo.BackgroundStyle.Class = ""; - this.ribbonBar_UserInfo.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar_UserInfo.ContainerControlProcessDialogKey = true; - this.ribbonBar_UserInfo.Dock = System.Windows.Forms.DockStyle.Left; - this.ribbonBar_UserInfo.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { - this.btn_user_info, - this.btn_role_info, - this.btn_resc_info, - this.btn_role_resc, - this.btn_user_role, - this.btn_password_edit, - this.btn_reset_password}); - this.ribbonBar_UserInfo.Location = new System.Drawing.Point(3, 0); - this.ribbonBar_UserInfo.Name = "ribbonBar_UserInfo"; - this.ribbonBar_UserInfo.Size = new System.Drawing.Size(427, 92); - this.ribbonBar_UserInfo.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonBar_UserInfo.TabIndex = 0; - // - // - // - this.ribbonBar_UserInfo.TitleStyle.Class = ""; - this.ribbonBar_UserInfo.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar_UserInfo.TitleStyleMouseOver.Class = ""; - this.ribbonBar_UserInfo.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // btn_user_info - // - this.btn_user_info.Image = global::Cyberpipe.Properties.Resources._24x24icon_13_hover; - this.btn_user_info.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.btn_user_info.Name = "btn_user_info"; - this.btn_user_info.SubItemsExpandWidth = 14; - this.btn_user_info.Text = "用户管理"; - this.btn_user_info.Click += new System.EventHandler(this.btn_user_info_Click); - // - // btn_role_info - // - this.btn_role_info.Image = global::Cyberpipe.Properties.Resources._24x24icon_05_hover1; - this.btn_role_info.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.btn_role_info.Name = "btn_role_info"; - this.btn_role_info.SubItemsExpandWidth = 14; - this.btn_role_info.Text = "角色管理"; - this.btn_role_info.Click += new System.EventHandler(this.btn_role_info_Click); - // - // btn_resc_info - // - this.btn_resc_info.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__09; - this.btn_resc_info.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.btn_resc_info.Name = "btn_resc_info"; - this.btn_resc_info.SubItemsExpandWidth = 14; - this.btn_resc_info.Text = "资源管理"; - this.btn_resc_info.Click += new System.EventHandler(this.btn_resc_info_Click); - // - // btn_role_resc - // - this.btn_role_resc.Image = global::Cyberpipe.Properties.Resources.btnlegendSet_Image_副本; - this.btn_role_resc.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.btn_role_resc.Name = "btn_role_resc"; - this.btn_role_resc.SubItemsExpandWidth = 14; - this.btn_role_resc.Text = "角色授权"; - this.btn_role_resc.Click += new System.EventHandler(this.btn_role_resc_Click); - // - // btn_user_role - // - this.btn_user_role.Image = global::Cyberpipe.Properties.Resources._24x24icon_08_hover; - this.btn_user_role.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.btn_user_role.Name = "btn_user_role"; - this.btn_user_role.SubItemsExpandWidth = 14; - this.btn_user_role.Text = "用户授权"; - this.btn_user_role.Click += new System.EventHandler(this.btn_user_role_Click); - // - // btn_password_edit - // - this.btn_password_edit.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__67; - this.btn_password_edit.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.btn_password_edit.Name = "btn_password_edit"; - this.btn_password_edit.SubItemsExpandWidth = 14; - this.btn_password_edit.Text = "密码修改"; - this.btn_password_edit.Click += new System.EventHandler(this.btn_password_edit_Click); - // - // btn_reset_password - // - this.btn_reset_password.Image = global::Cyberpipe.Properties.Resources.liuxiang; - this.btn_reset_password.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.btn_reset_password.Name = "btn_reset_password"; - this.btn_reset_password.SubItemsExpandWidth = 14; - this.btn_reset_password.Text = "重置密码"; - this.btn_reset_password.Click += new System.EventHandler(this.btn_reset_password_Click); - // // ribbonTabItem1 // this.ribbonTabItem1.ButtonStyle = DevComponents.DotNetBar.eButtonStyle.ImageAndText; @@ -6110,7 +6100,6 @@ this.ribbonTabItem7.Name = "ribbonTabItem7"; this.ribbonTabItem7.Panel = this.ribbonPanel7; this.ribbonTabItem7.Text = "标识器管理"; - this.ribbonTabItem7.Click += new System.EventHandler(this.ribbonTabItem7_Click); this.ribbonTabItem7.MouseDown += new System.Windows.Forms.MouseEventHandler(this.ribbonTabItem7_MouseDown); // // ribbonTabItem8 @@ -6428,14 +6417,27 @@ // // label1 // + this.label1.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); + this.label1.AutoEllipsis = true; this.label1.AutoSize = true; this.label1.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.label1.Image = global::Cyberpipe.Properties.Resources.user; - this.label1.Location = new System.Drawing.Point(1198, 53); + this.label1.Location = new System.Drawing.Point(1205, 51); this.label1.Name = "label1"; this.label1.Size = new System.Drawing.Size(56, 16); - this.label1.TabIndex = 28; + this.label1.TabIndex = 32; this.label1.Text = "label1"; + this.label1.TextAlign = System.Drawing.ContentAlignment.TopRight; + // + // layerTree + // + this.layerTree.CheckBoxes = true; + this.layerTree.ItemHeight = 18; + this.layerTree.Location = new System.Drawing.Point(30, 78); + this.layerTree.Name = "layerTree"; + this.layerTree.Size = new System.Drawing.Size(121, 97); + this.layerTree.TabIndex = 1; + this.layerTree.AfterCheck += new System.Windows.Forms.TreeViewEventHandler(this.layerTree_AfterCheck); // // MainFrm // @@ -6512,11 +6514,11 @@ this.ribbonControl1.ResumeLayout(false); this.ribbonControl1.PerformLayout(); this.ribbonPanel3.ResumeLayout(false); + this.ribbonPanel8.ResumeLayout(false); this.ribbonPanel2.ResumeLayout(false); this.ribbonPanel15.ResumeLayout(false); this.ribbonPanel1.ResumeLayout(false); this.ribbonPanel7.ResumeLayout(false); - this.ribbonPanel8.ResumeLayout(false); ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).EndInit(); this.ResumeLayout(false); this.PerformLayout(); diff --git a/MainFrm.resx b/MainFrm.resx index 15e5339..9d1d787 100644 --- a/MainFrm.resx +++ b/MainFrm.resx @@ -2094,7 +2094,7 @@ - 211 + 166 diff --git a/Cyberpipe.suo b/Cyberpipe.suo index 13a1659..6abc092 100644 --- a/Cyberpipe.suo +++ b/Cyberpipe.suo Binary files differ diff --git a/FormDocumentManager.cs b/FormDocumentManager.cs index 7925e2c..1c21f81 100644 --- a/FormDocumentManager.cs +++ b/FormDocumentManager.cs @@ -395,7 +395,7 @@ private void FormDocumentManager_Load(object sender, EventArgs e) { IS_OPEN = true; - //changeCursor(); + changeCursor(); dateTime_end.Value = DateTime.Now; dateTime_begin.Value = DateTime.Now.AddDays(-6); Thread loadThread = new Thread(new ThreadStart(doFormLoad)); diff --git a/MainFrm.cs b/MainFrm.cs index e801c7e..c5b7a38 100644 --- a/MainFrm.cs +++ b/MainFrm.cs @@ -14368,17 +14368,7 @@ globeControl1.Globe.Action = EnumAction3D.TrackPolygon; } - private void ribbonTabItem7_Click(object sender, EventArgs e) - { - - } - - private void label1_Click(object sender, EventArgs e) - { - - } - - + } diff --git a/MainFrm.designer.cs b/MainFrm.designer.cs index ee6e5b6..e9b8b02 100644 --- a/MainFrm.designer.cs +++ b/MainFrm.designer.cs @@ -82,7 +82,6 @@ this.sideBar1 = new DevComponents.DotNetBar.SideBar(); this.panelEx3 = new DevComponents.DotNetBar.PanelEx(); this.layerSensorTree = new System.Windows.Forms.TreeView(); - this.layerTree = new Cyberpipe.MyTreeView(); this.sideBarPanelItem3 = new DevComponents.DotNetBar.SideBarPanelItem(); this.controlContainerItem3 = new DevComponents.DotNetBar.ControlContainerItem(); this.sideBarPanelItem4 = new DevComponents.DotNetBar.SideBarPanelItem(); @@ -372,6 +371,15 @@ this.btn_Person = new DevComponents.DotNetBar.ButtonItem(); this.btn_constructMap = new DevComponents.DotNetBar.ButtonItem(); this.buttonItem9 = new DevComponents.DotNetBar.ButtonItem(); + this.ribbonPanel8 = new DevComponents.DotNetBar.RibbonPanel(); + this.ribbonBar_UserInfo = new DevComponents.DotNetBar.RibbonBar(); + this.btn_user_info = new DevComponents.DotNetBar.ButtonItem(); + this.btn_role_info = new DevComponents.DotNetBar.ButtonItem(); + this.btn_resc_info = new DevComponents.DotNetBar.ButtonItem(); + this.btn_role_resc = new DevComponents.DotNetBar.ButtonItem(); + this.btn_user_role = new DevComponents.DotNetBar.ButtonItem(); + this.btn_password_edit = new DevComponents.DotNetBar.ButtonItem(); + this.btn_reset_password = new DevComponents.DotNetBar.ButtonItem(); this.ribbonPanel2 = new DevComponents.DotNetBar.RibbonPanel(); this.ribbonBar4 = new DevComponents.DotNetBar.RibbonBar(); this.buttonItem_TaskManager = new DevComponents.DotNetBar.ButtonItem(); @@ -556,15 +564,6 @@ this.ribbonBar5 = new DevComponents.DotNetBar.RibbonBar(); this.btn_flag = new DevComponents.DotNetBar.ButtonItem(); this.slider4ground = new DevComponents.DotNetBar.SliderItem(); - this.ribbonPanel8 = new DevComponents.DotNetBar.RibbonPanel(); - this.ribbonBar_UserInfo = new DevComponents.DotNetBar.RibbonBar(); - this.btn_user_info = new DevComponents.DotNetBar.ButtonItem(); - this.btn_role_info = new DevComponents.DotNetBar.ButtonItem(); - this.btn_resc_info = new DevComponents.DotNetBar.ButtonItem(); - this.btn_role_resc = new DevComponents.DotNetBar.ButtonItem(); - this.btn_user_role = new DevComponents.DotNetBar.ButtonItem(); - this.btn_password_edit = new DevComponents.DotNetBar.ButtonItem(); - this.btn_reset_password = new DevComponents.DotNetBar.ButtonItem(); this.ribbonTabItem1 = new DevComponents.DotNetBar.RibbonTabItem(); this.ribbonTabItem14 = new DevComponents.DotNetBar.RibbonTabItem(); this.ribbonTabItem2 = new DevComponents.DotNetBar.RibbonTabItem(); @@ -612,6 +611,7 @@ this.buttonItem75 = new DevComponents.DotNetBar.ButtonItem(); this.buttonItem76 = new DevComponents.DotNetBar.ButtonItem(); this.label1 = new System.Windows.Forms.Label(); + this.layerTree = new Cyberpipe.MyTreeView(); this.statusStrip1.SuspendLayout(); this.sideBar1.SuspendLayout(); this.panelEx3.SuspendLayout(); @@ -649,11 +649,11 @@ this.contextMenuStripDeleteLayerNode.SuspendLayout(); this.ribbonControl1.SuspendLayout(); this.ribbonPanel3.SuspendLayout(); + this.ribbonPanel8.SuspendLayout(); this.ribbonPanel2.SuspendLayout(); this.ribbonPanel15.SuspendLayout(); this.ribbonPanel1.SuspendLayout(); this.ribbonPanel7.SuspendLayout(); - this.ribbonPanel8.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).BeginInit(); this.SuspendLayout(); // @@ -1048,16 +1048,6 @@ this.layerSensorTree.AfterCheck += new System.Windows.Forms.TreeViewEventHandler(this.layerMarkerTree_AfterCheck); this.layerSensorTree.NodeMouseClick += new System.Windows.Forms.TreeNodeMouseClickEventHandler(this.layerMarkerTree_NodeMouseClick); // - // layerTree - // - this.layerTree.CheckBoxes = true; - this.layerTree.ItemHeight = 18; - this.layerTree.Location = new System.Drawing.Point(30, 78); - this.layerTree.Name = "layerTree"; - this.layerTree.Size = new System.Drawing.Size(121, 97); - this.layerTree.TabIndex = 1; - this.layerTree.AfterCheck += new System.Windows.Forms.TreeViewEventHandler(this.layerTree_AfterCheck); - // // sideBarPanelItem3 // this.sideBarPanelItem3.FontBold = true; @@ -4126,11 +4116,11 @@ this.ribbonControl1.BackgroundStyle.Class = ""; this.ribbonControl1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonControl1.Controls.Add(this.ribbonPanel3); + this.ribbonControl1.Controls.Add(this.ribbonPanel8); this.ribbonControl1.Controls.Add(this.ribbonPanel2); this.ribbonControl1.Controls.Add(this.ribbonPanel15); this.ribbonControl1.Controls.Add(this.ribbonPanel1); this.ribbonControl1.Controls.Add(this.ribbonPanel7); - this.ribbonControl1.Controls.Add(this.ribbonPanel8); this.ribbonControl1.Dock = System.Windows.Forms.DockStyle.Top; this.ribbonControl1.ImeMode = System.Windows.Forms.ImeMode.NoControl; this.ribbonControl1.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { @@ -4272,6 +4262,135 @@ this.buttonItem9.Text = "文档管理"; this.buttonItem9.Click += new System.EventHandler(this.buttonItem9_Click); // + // ribbonPanel8 + // + this.ribbonPanel8.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonPanel8.Controls.Add(this.ribbonBar_UserInfo); + this.ribbonPanel8.Dock = System.Windows.Forms.DockStyle.Fill; + this.ribbonPanel8.Location = new System.Drawing.Point(0, 0); + this.ribbonPanel8.Name = "ribbonPanel8"; + this.ribbonPanel8.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); + this.ribbonPanel8.Size = new System.Drawing.Size(1328, 95); + // + // + // + this.ribbonPanel8.Style.Class = ""; + this.ribbonPanel8.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel8.StyleMouseDown.Class = ""; + this.ribbonPanel8.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel8.StyleMouseOver.Class = ""; + this.ribbonPanel8.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonPanel8.TabIndex = 42; + this.ribbonPanel8.Visible = false; + // + // ribbonBar_UserInfo + // + this.ribbonBar_UserInfo.AutoOverflowEnabled = true; + // + // + // + this.ribbonBar_UserInfo.BackgroundMouseOverStyle.Class = ""; + this.ribbonBar_UserInfo.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar_UserInfo.BackgroundStyle.Class = ""; + this.ribbonBar_UserInfo.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar_UserInfo.ContainerControlProcessDialogKey = true; + this.ribbonBar_UserInfo.Dock = System.Windows.Forms.DockStyle.Left; + this.ribbonBar_UserInfo.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { + this.btn_user_info, + this.btn_role_info, + this.btn_resc_info, + this.btn_role_resc, + this.btn_user_role, + this.btn_password_edit, + this.btn_reset_password}); + this.ribbonBar_UserInfo.Location = new System.Drawing.Point(3, 0); + this.ribbonBar_UserInfo.Name = "ribbonBar_UserInfo"; + this.ribbonBar_UserInfo.Size = new System.Drawing.Size(427, 92); + this.ribbonBar_UserInfo.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonBar_UserInfo.TabIndex = 0; + // + // + // + this.ribbonBar_UserInfo.TitleStyle.Class = ""; + this.ribbonBar_UserInfo.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar_UserInfo.TitleStyleMouseOver.Class = ""; + this.ribbonBar_UserInfo.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // btn_user_info + // + this.btn_user_info.Image = global::Cyberpipe.Properties.Resources._24x24icon_13_hover; + this.btn_user_info.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.btn_user_info.Name = "btn_user_info"; + this.btn_user_info.SubItemsExpandWidth = 14; + this.btn_user_info.Text = "用户管理"; + this.btn_user_info.Click += new System.EventHandler(this.btn_user_info_Click); + // + // btn_role_info + // + this.btn_role_info.Image = global::Cyberpipe.Properties.Resources._24x24icon_05_hover1; + this.btn_role_info.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.btn_role_info.Name = "btn_role_info"; + this.btn_role_info.SubItemsExpandWidth = 14; + this.btn_role_info.Text = "角色管理"; + this.btn_role_info.Click += new System.EventHandler(this.btn_role_info_Click); + // + // btn_resc_info + // + this.btn_resc_info.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__09; + this.btn_resc_info.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.btn_resc_info.Name = "btn_resc_info"; + this.btn_resc_info.SubItemsExpandWidth = 14; + this.btn_resc_info.Text = "资源管理"; + this.btn_resc_info.Click += new System.EventHandler(this.btn_resc_info_Click); + // + // btn_role_resc + // + this.btn_role_resc.Image = global::Cyberpipe.Properties.Resources.btnlegendSet_Image_副本; + this.btn_role_resc.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.btn_role_resc.Name = "btn_role_resc"; + this.btn_role_resc.SubItemsExpandWidth = 14; + this.btn_role_resc.Text = "角色授权"; + this.btn_role_resc.Click += new System.EventHandler(this.btn_role_resc_Click); + // + // btn_user_role + // + this.btn_user_role.Image = global::Cyberpipe.Properties.Resources._24x24icon_08_hover; + this.btn_user_role.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.btn_user_role.Name = "btn_user_role"; + this.btn_user_role.SubItemsExpandWidth = 14; + this.btn_user_role.Text = "用户授权"; + this.btn_user_role.Click += new System.EventHandler(this.btn_user_role_Click); + // + // btn_password_edit + // + this.btn_password_edit.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__67; + this.btn_password_edit.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.btn_password_edit.Name = "btn_password_edit"; + this.btn_password_edit.SubItemsExpandWidth = 14; + this.btn_password_edit.Text = "密码修改"; + this.btn_password_edit.Click += new System.EventHandler(this.btn_password_edit_Click); + // + // btn_reset_password + // + this.btn_reset_password.Image = global::Cyberpipe.Properties.Resources.liuxiang; + this.btn_reset_password.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.btn_reset_password.Name = "btn_reset_password"; + this.btn_reset_password.SubItemsExpandWidth = 14; + this.btn_reset_password.Text = "重置密码"; + this.btn_reset_password.Click += new System.EventHandler(this.btn_reset_password_Click); + // // ribbonPanel2 // this.ribbonPanel2.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -5931,135 +6050,6 @@ this.slider4ground.Value = 0; this.slider4ground.ValueChanged += new System.EventHandler(this.slider4ground_ValueChanged); // - // ribbonPanel8 - // - this.ribbonPanel8.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonPanel8.Controls.Add(this.ribbonBar_UserInfo); - this.ribbonPanel8.Dock = System.Windows.Forms.DockStyle.Fill; - this.ribbonPanel8.Location = new System.Drawing.Point(0, 0); - this.ribbonPanel8.Name = "ribbonPanel8"; - this.ribbonPanel8.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); - this.ribbonPanel8.Size = new System.Drawing.Size(1328, 95); - // - // - // - this.ribbonPanel8.Style.Class = ""; - this.ribbonPanel8.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel8.StyleMouseDown.Class = ""; - this.ribbonPanel8.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel8.StyleMouseOver.Class = ""; - this.ribbonPanel8.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonPanel8.TabIndex = 42; - this.ribbonPanel8.Visible = false; - // - // ribbonBar_UserInfo - // - this.ribbonBar_UserInfo.AutoOverflowEnabled = true; - // - // - // - this.ribbonBar_UserInfo.BackgroundMouseOverStyle.Class = ""; - this.ribbonBar_UserInfo.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar_UserInfo.BackgroundStyle.Class = ""; - this.ribbonBar_UserInfo.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar_UserInfo.ContainerControlProcessDialogKey = true; - this.ribbonBar_UserInfo.Dock = System.Windows.Forms.DockStyle.Left; - this.ribbonBar_UserInfo.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { - this.btn_user_info, - this.btn_role_info, - this.btn_resc_info, - this.btn_role_resc, - this.btn_user_role, - this.btn_password_edit, - this.btn_reset_password}); - this.ribbonBar_UserInfo.Location = new System.Drawing.Point(3, 0); - this.ribbonBar_UserInfo.Name = "ribbonBar_UserInfo"; - this.ribbonBar_UserInfo.Size = new System.Drawing.Size(427, 92); - this.ribbonBar_UserInfo.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonBar_UserInfo.TabIndex = 0; - // - // - // - this.ribbonBar_UserInfo.TitleStyle.Class = ""; - this.ribbonBar_UserInfo.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar_UserInfo.TitleStyleMouseOver.Class = ""; - this.ribbonBar_UserInfo.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // btn_user_info - // - this.btn_user_info.Image = global::Cyberpipe.Properties.Resources._24x24icon_13_hover; - this.btn_user_info.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.btn_user_info.Name = "btn_user_info"; - this.btn_user_info.SubItemsExpandWidth = 14; - this.btn_user_info.Text = "用户管理"; - this.btn_user_info.Click += new System.EventHandler(this.btn_user_info_Click); - // - // btn_role_info - // - this.btn_role_info.Image = global::Cyberpipe.Properties.Resources._24x24icon_05_hover1; - this.btn_role_info.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.btn_role_info.Name = "btn_role_info"; - this.btn_role_info.SubItemsExpandWidth = 14; - this.btn_role_info.Text = "角色管理"; - this.btn_role_info.Click += new System.EventHandler(this.btn_role_info_Click); - // - // btn_resc_info - // - this.btn_resc_info.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__09; - this.btn_resc_info.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.btn_resc_info.Name = "btn_resc_info"; - this.btn_resc_info.SubItemsExpandWidth = 14; - this.btn_resc_info.Text = "资源管理"; - this.btn_resc_info.Click += new System.EventHandler(this.btn_resc_info_Click); - // - // btn_role_resc - // - this.btn_role_resc.Image = global::Cyberpipe.Properties.Resources.btnlegendSet_Image_副本; - this.btn_role_resc.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.btn_role_resc.Name = "btn_role_resc"; - this.btn_role_resc.SubItemsExpandWidth = 14; - this.btn_role_resc.Text = "角色授权"; - this.btn_role_resc.Click += new System.EventHandler(this.btn_role_resc_Click); - // - // btn_user_role - // - this.btn_user_role.Image = global::Cyberpipe.Properties.Resources._24x24icon_08_hover; - this.btn_user_role.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.btn_user_role.Name = "btn_user_role"; - this.btn_user_role.SubItemsExpandWidth = 14; - this.btn_user_role.Text = "用户授权"; - this.btn_user_role.Click += new System.EventHandler(this.btn_user_role_Click); - // - // btn_password_edit - // - this.btn_password_edit.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__67; - this.btn_password_edit.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.btn_password_edit.Name = "btn_password_edit"; - this.btn_password_edit.SubItemsExpandWidth = 14; - this.btn_password_edit.Text = "密码修改"; - this.btn_password_edit.Click += new System.EventHandler(this.btn_password_edit_Click); - // - // btn_reset_password - // - this.btn_reset_password.Image = global::Cyberpipe.Properties.Resources.liuxiang; - this.btn_reset_password.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.btn_reset_password.Name = "btn_reset_password"; - this.btn_reset_password.SubItemsExpandWidth = 14; - this.btn_reset_password.Text = "重置密码"; - this.btn_reset_password.Click += new System.EventHandler(this.btn_reset_password_Click); - // // ribbonTabItem1 // this.ribbonTabItem1.ButtonStyle = DevComponents.DotNetBar.eButtonStyle.ImageAndText; @@ -6110,7 +6100,6 @@ this.ribbonTabItem7.Name = "ribbonTabItem7"; this.ribbonTabItem7.Panel = this.ribbonPanel7; this.ribbonTabItem7.Text = "标识器管理"; - this.ribbonTabItem7.Click += new System.EventHandler(this.ribbonTabItem7_Click); this.ribbonTabItem7.MouseDown += new System.Windows.Forms.MouseEventHandler(this.ribbonTabItem7_MouseDown); // // ribbonTabItem8 @@ -6428,14 +6417,27 @@ // // label1 // + this.label1.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); + this.label1.AutoEllipsis = true; this.label1.AutoSize = true; this.label1.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.label1.Image = global::Cyberpipe.Properties.Resources.user; - this.label1.Location = new System.Drawing.Point(1198, 53); + this.label1.Location = new System.Drawing.Point(1205, 51); this.label1.Name = "label1"; this.label1.Size = new System.Drawing.Size(56, 16); - this.label1.TabIndex = 28; + this.label1.TabIndex = 32; this.label1.Text = "label1"; + this.label1.TextAlign = System.Drawing.ContentAlignment.TopRight; + // + // layerTree + // + this.layerTree.CheckBoxes = true; + this.layerTree.ItemHeight = 18; + this.layerTree.Location = new System.Drawing.Point(30, 78); + this.layerTree.Name = "layerTree"; + this.layerTree.Size = new System.Drawing.Size(121, 97); + this.layerTree.TabIndex = 1; + this.layerTree.AfterCheck += new System.Windows.Forms.TreeViewEventHandler(this.layerTree_AfterCheck); // // MainFrm // @@ -6512,11 +6514,11 @@ this.ribbonControl1.ResumeLayout(false); this.ribbonControl1.PerformLayout(); this.ribbonPanel3.ResumeLayout(false); + this.ribbonPanel8.ResumeLayout(false); this.ribbonPanel2.ResumeLayout(false); this.ribbonPanel15.ResumeLayout(false); this.ribbonPanel1.ResumeLayout(false); this.ribbonPanel7.ResumeLayout(false); - this.ribbonPanel8.ResumeLayout(false); ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).EndInit(); this.ResumeLayout(false); this.PerformLayout(); diff --git a/MainFrm.resx b/MainFrm.resx index 15e5339..9d1d787 100644 --- a/MainFrm.resx +++ b/MainFrm.resx @@ -2094,7 +2094,7 @@ - 211 + 166 diff --git a/bin/x86/Debug/EMSCyberpipe.exe b/bin/x86/Debug/EMSCyberpipe.exe index c40cffc..8924ace 100644 --- a/bin/x86/Debug/EMSCyberpipe.exe +++ b/bin/x86/Debug/EMSCyberpipe.exe Binary files differ diff --git a/Cyberpipe.suo b/Cyberpipe.suo index 13a1659..6abc092 100644 --- a/Cyberpipe.suo +++ b/Cyberpipe.suo Binary files differ diff --git a/FormDocumentManager.cs b/FormDocumentManager.cs index 7925e2c..1c21f81 100644 --- a/FormDocumentManager.cs +++ b/FormDocumentManager.cs @@ -395,7 +395,7 @@ private void FormDocumentManager_Load(object sender, EventArgs e) { IS_OPEN = true; - //changeCursor(); + changeCursor(); dateTime_end.Value = DateTime.Now; dateTime_begin.Value = DateTime.Now.AddDays(-6); Thread loadThread = new Thread(new ThreadStart(doFormLoad)); diff --git a/MainFrm.cs b/MainFrm.cs index e801c7e..c5b7a38 100644 --- a/MainFrm.cs +++ b/MainFrm.cs @@ -14368,17 +14368,7 @@ globeControl1.Globe.Action = EnumAction3D.TrackPolygon; } - private void ribbonTabItem7_Click(object sender, EventArgs e) - { - - } - - private void label1_Click(object sender, EventArgs e) - { - - } - - + } diff --git a/MainFrm.designer.cs b/MainFrm.designer.cs index ee6e5b6..e9b8b02 100644 --- a/MainFrm.designer.cs +++ b/MainFrm.designer.cs @@ -82,7 +82,6 @@ this.sideBar1 = new DevComponents.DotNetBar.SideBar(); this.panelEx3 = new DevComponents.DotNetBar.PanelEx(); this.layerSensorTree = new System.Windows.Forms.TreeView(); - this.layerTree = new Cyberpipe.MyTreeView(); this.sideBarPanelItem3 = new DevComponents.DotNetBar.SideBarPanelItem(); this.controlContainerItem3 = new DevComponents.DotNetBar.ControlContainerItem(); this.sideBarPanelItem4 = new DevComponents.DotNetBar.SideBarPanelItem(); @@ -372,6 +371,15 @@ this.btn_Person = new DevComponents.DotNetBar.ButtonItem(); this.btn_constructMap = new DevComponents.DotNetBar.ButtonItem(); this.buttonItem9 = new DevComponents.DotNetBar.ButtonItem(); + this.ribbonPanel8 = new DevComponents.DotNetBar.RibbonPanel(); + this.ribbonBar_UserInfo = new DevComponents.DotNetBar.RibbonBar(); + this.btn_user_info = new DevComponents.DotNetBar.ButtonItem(); + this.btn_role_info = new DevComponents.DotNetBar.ButtonItem(); + this.btn_resc_info = new DevComponents.DotNetBar.ButtonItem(); + this.btn_role_resc = new DevComponents.DotNetBar.ButtonItem(); + this.btn_user_role = new DevComponents.DotNetBar.ButtonItem(); + this.btn_password_edit = new DevComponents.DotNetBar.ButtonItem(); + this.btn_reset_password = new DevComponents.DotNetBar.ButtonItem(); this.ribbonPanel2 = new DevComponents.DotNetBar.RibbonPanel(); this.ribbonBar4 = new DevComponents.DotNetBar.RibbonBar(); this.buttonItem_TaskManager = new DevComponents.DotNetBar.ButtonItem(); @@ -556,15 +564,6 @@ this.ribbonBar5 = new DevComponents.DotNetBar.RibbonBar(); this.btn_flag = new DevComponents.DotNetBar.ButtonItem(); this.slider4ground = new DevComponents.DotNetBar.SliderItem(); - this.ribbonPanel8 = new DevComponents.DotNetBar.RibbonPanel(); - this.ribbonBar_UserInfo = new DevComponents.DotNetBar.RibbonBar(); - this.btn_user_info = new DevComponents.DotNetBar.ButtonItem(); - this.btn_role_info = new DevComponents.DotNetBar.ButtonItem(); - this.btn_resc_info = new DevComponents.DotNetBar.ButtonItem(); - this.btn_role_resc = new DevComponents.DotNetBar.ButtonItem(); - this.btn_user_role = new DevComponents.DotNetBar.ButtonItem(); - this.btn_password_edit = new DevComponents.DotNetBar.ButtonItem(); - this.btn_reset_password = new DevComponents.DotNetBar.ButtonItem(); this.ribbonTabItem1 = new DevComponents.DotNetBar.RibbonTabItem(); this.ribbonTabItem14 = new DevComponents.DotNetBar.RibbonTabItem(); this.ribbonTabItem2 = new DevComponents.DotNetBar.RibbonTabItem(); @@ -612,6 +611,7 @@ this.buttonItem75 = new DevComponents.DotNetBar.ButtonItem(); this.buttonItem76 = new DevComponents.DotNetBar.ButtonItem(); this.label1 = new System.Windows.Forms.Label(); + this.layerTree = new Cyberpipe.MyTreeView(); this.statusStrip1.SuspendLayout(); this.sideBar1.SuspendLayout(); this.panelEx3.SuspendLayout(); @@ -649,11 +649,11 @@ this.contextMenuStripDeleteLayerNode.SuspendLayout(); this.ribbonControl1.SuspendLayout(); this.ribbonPanel3.SuspendLayout(); + this.ribbonPanel8.SuspendLayout(); this.ribbonPanel2.SuspendLayout(); this.ribbonPanel15.SuspendLayout(); this.ribbonPanel1.SuspendLayout(); this.ribbonPanel7.SuspendLayout(); - this.ribbonPanel8.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).BeginInit(); this.SuspendLayout(); // @@ -1048,16 +1048,6 @@ this.layerSensorTree.AfterCheck += new System.Windows.Forms.TreeViewEventHandler(this.layerMarkerTree_AfterCheck); this.layerSensorTree.NodeMouseClick += new System.Windows.Forms.TreeNodeMouseClickEventHandler(this.layerMarkerTree_NodeMouseClick); // - // layerTree - // - this.layerTree.CheckBoxes = true; - this.layerTree.ItemHeight = 18; - this.layerTree.Location = new System.Drawing.Point(30, 78); - this.layerTree.Name = "layerTree"; - this.layerTree.Size = new System.Drawing.Size(121, 97); - this.layerTree.TabIndex = 1; - this.layerTree.AfterCheck += new System.Windows.Forms.TreeViewEventHandler(this.layerTree_AfterCheck); - // // sideBarPanelItem3 // this.sideBarPanelItem3.FontBold = true; @@ -4126,11 +4116,11 @@ this.ribbonControl1.BackgroundStyle.Class = ""; this.ribbonControl1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonControl1.Controls.Add(this.ribbonPanel3); + this.ribbonControl1.Controls.Add(this.ribbonPanel8); this.ribbonControl1.Controls.Add(this.ribbonPanel2); this.ribbonControl1.Controls.Add(this.ribbonPanel15); this.ribbonControl1.Controls.Add(this.ribbonPanel1); this.ribbonControl1.Controls.Add(this.ribbonPanel7); - this.ribbonControl1.Controls.Add(this.ribbonPanel8); this.ribbonControl1.Dock = System.Windows.Forms.DockStyle.Top; this.ribbonControl1.ImeMode = System.Windows.Forms.ImeMode.NoControl; this.ribbonControl1.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { @@ -4272,6 +4262,135 @@ this.buttonItem9.Text = "文档管理"; this.buttonItem9.Click += new System.EventHandler(this.buttonItem9_Click); // + // ribbonPanel8 + // + this.ribbonPanel8.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonPanel8.Controls.Add(this.ribbonBar_UserInfo); + this.ribbonPanel8.Dock = System.Windows.Forms.DockStyle.Fill; + this.ribbonPanel8.Location = new System.Drawing.Point(0, 0); + this.ribbonPanel8.Name = "ribbonPanel8"; + this.ribbonPanel8.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); + this.ribbonPanel8.Size = new System.Drawing.Size(1328, 95); + // + // + // + this.ribbonPanel8.Style.Class = ""; + this.ribbonPanel8.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel8.StyleMouseDown.Class = ""; + this.ribbonPanel8.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel8.StyleMouseOver.Class = ""; + this.ribbonPanel8.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonPanel8.TabIndex = 42; + this.ribbonPanel8.Visible = false; + // + // ribbonBar_UserInfo + // + this.ribbonBar_UserInfo.AutoOverflowEnabled = true; + // + // + // + this.ribbonBar_UserInfo.BackgroundMouseOverStyle.Class = ""; + this.ribbonBar_UserInfo.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar_UserInfo.BackgroundStyle.Class = ""; + this.ribbonBar_UserInfo.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar_UserInfo.ContainerControlProcessDialogKey = true; + this.ribbonBar_UserInfo.Dock = System.Windows.Forms.DockStyle.Left; + this.ribbonBar_UserInfo.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { + this.btn_user_info, + this.btn_role_info, + this.btn_resc_info, + this.btn_role_resc, + this.btn_user_role, + this.btn_password_edit, + this.btn_reset_password}); + this.ribbonBar_UserInfo.Location = new System.Drawing.Point(3, 0); + this.ribbonBar_UserInfo.Name = "ribbonBar_UserInfo"; + this.ribbonBar_UserInfo.Size = new System.Drawing.Size(427, 92); + this.ribbonBar_UserInfo.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonBar_UserInfo.TabIndex = 0; + // + // + // + this.ribbonBar_UserInfo.TitleStyle.Class = ""; + this.ribbonBar_UserInfo.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar_UserInfo.TitleStyleMouseOver.Class = ""; + this.ribbonBar_UserInfo.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // btn_user_info + // + this.btn_user_info.Image = global::Cyberpipe.Properties.Resources._24x24icon_13_hover; + this.btn_user_info.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.btn_user_info.Name = "btn_user_info"; + this.btn_user_info.SubItemsExpandWidth = 14; + this.btn_user_info.Text = "用户管理"; + this.btn_user_info.Click += new System.EventHandler(this.btn_user_info_Click); + // + // btn_role_info + // + this.btn_role_info.Image = global::Cyberpipe.Properties.Resources._24x24icon_05_hover1; + this.btn_role_info.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.btn_role_info.Name = "btn_role_info"; + this.btn_role_info.SubItemsExpandWidth = 14; + this.btn_role_info.Text = "角色管理"; + this.btn_role_info.Click += new System.EventHandler(this.btn_role_info_Click); + // + // btn_resc_info + // + this.btn_resc_info.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__09; + this.btn_resc_info.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.btn_resc_info.Name = "btn_resc_info"; + this.btn_resc_info.SubItemsExpandWidth = 14; + this.btn_resc_info.Text = "资源管理"; + this.btn_resc_info.Click += new System.EventHandler(this.btn_resc_info_Click); + // + // btn_role_resc + // + this.btn_role_resc.Image = global::Cyberpipe.Properties.Resources.btnlegendSet_Image_副本; + this.btn_role_resc.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.btn_role_resc.Name = "btn_role_resc"; + this.btn_role_resc.SubItemsExpandWidth = 14; + this.btn_role_resc.Text = "角色授权"; + this.btn_role_resc.Click += new System.EventHandler(this.btn_role_resc_Click); + // + // btn_user_role + // + this.btn_user_role.Image = global::Cyberpipe.Properties.Resources._24x24icon_08_hover; + this.btn_user_role.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.btn_user_role.Name = "btn_user_role"; + this.btn_user_role.SubItemsExpandWidth = 14; + this.btn_user_role.Text = "用户授权"; + this.btn_user_role.Click += new System.EventHandler(this.btn_user_role_Click); + // + // btn_password_edit + // + this.btn_password_edit.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__67; + this.btn_password_edit.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.btn_password_edit.Name = "btn_password_edit"; + this.btn_password_edit.SubItemsExpandWidth = 14; + this.btn_password_edit.Text = "密码修改"; + this.btn_password_edit.Click += new System.EventHandler(this.btn_password_edit_Click); + // + // btn_reset_password + // + this.btn_reset_password.Image = global::Cyberpipe.Properties.Resources.liuxiang; + this.btn_reset_password.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.btn_reset_password.Name = "btn_reset_password"; + this.btn_reset_password.SubItemsExpandWidth = 14; + this.btn_reset_password.Text = "重置密码"; + this.btn_reset_password.Click += new System.EventHandler(this.btn_reset_password_Click); + // // ribbonPanel2 // this.ribbonPanel2.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -5931,135 +6050,6 @@ this.slider4ground.Value = 0; this.slider4ground.ValueChanged += new System.EventHandler(this.slider4ground_ValueChanged); // - // ribbonPanel8 - // - this.ribbonPanel8.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonPanel8.Controls.Add(this.ribbonBar_UserInfo); - this.ribbonPanel8.Dock = System.Windows.Forms.DockStyle.Fill; - this.ribbonPanel8.Location = new System.Drawing.Point(0, 0); - this.ribbonPanel8.Name = "ribbonPanel8"; - this.ribbonPanel8.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); - this.ribbonPanel8.Size = new System.Drawing.Size(1328, 95); - // - // - // - this.ribbonPanel8.Style.Class = ""; - this.ribbonPanel8.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel8.StyleMouseDown.Class = ""; - this.ribbonPanel8.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel8.StyleMouseOver.Class = ""; - this.ribbonPanel8.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonPanel8.TabIndex = 42; - this.ribbonPanel8.Visible = false; - // - // ribbonBar_UserInfo - // - this.ribbonBar_UserInfo.AutoOverflowEnabled = true; - // - // - // - this.ribbonBar_UserInfo.BackgroundMouseOverStyle.Class = ""; - this.ribbonBar_UserInfo.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar_UserInfo.BackgroundStyle.Class = ""; - this.ribbonBar_UserInfo.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar_UserInfo.ContainerControlProcessDialogKey = true; - this.ribbonBar_UserInfo.Dock = System.Windows.Forms.DockStyle.Left; - this.ribbonBar_UserInfo.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { - this.btn_user_info, - this.btn_role_info, - this.btn_resc_info, - this.btn_role_resc, - this.btn_user_role, - this.btn_password_edit, - this.btn_reset_password}); - this.ribbonBar_UserInfo.Location = new System.Drawing.Point(3, 0); - this.ribbonBar_UserInfo.Name = "ribbonBar_UserInfo"; - this.ribbonBar_UserInfo.Size = new System.Drawing.Size(427, 92); - this.ribbonBar_UserInfo.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonBar_UserInfo.TabIndex = 0; - // - // - // - this.ribbonBar_UserInfo.TitleStyle.Class = ""; - this.ribbonBar_UserInfo.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar_UserInfo.TitleStyleMouseOver.Class = ""; - this.ribbonBar_UserInfo.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // btn_user_info - // - this.btn_user_info.Image = global::Cyberpipe.Properties.Resources._24x24icon_13_hover; - this.btn_user_info.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.btn_user_info.Name = "btn_user_info"; - this.btn_user_info.SubItemsExpandWidth = 14; - this.btn_user_info.Text = "用户管理"; - this.btn_user_info.Click += new System.EventHandler(this.btn_user_info_Click); - // - // btn_role_info - // - this.btn_role_info.Image = global::Cyberpipe.Properties.Resources._24x24icon_05_hover1; - this.btn_role_info.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.btn_role_info.Name = "btn_role_info"; - this.btn_role_info.SubItemsExpandWidth = 14; - this.btn_role_info.Text = "角色管理"; - this.btn_role_info.Click += new System.EventHandler(this.btn_role_info_Click); - // - // btn_resc_info - // - this.btn_resc_info.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__09; - this.btn_resc_info.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.btn_resc_info.Name = "btn_resc_info"; - this.btn_resc_info.SubItemsExpandWidth = 14; - this.btn_resc_info.Text = "资源管理"; - this.btn_resc_info.Click += new System.EventHandler(this.btn_resc_info_Click); - // - // btn_role_resc - // - this.btn_role_resc.Image = global::Cyberpipe.Properties.Resources.btnlegendSet_Image_副本; - this.btn_role_resc.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.btn_role_resc.Name = "btn_role_resc"; - this.btn_role_resc.SubItemsExpandWidth = 14; - this.btn_role_resc.Text = "角色授权"; - this.btn_role_resc.Click += new System.EventHandler(this.btn_role_resc_Click); - // - // btn_user_role - // - this.btn_user_role.Image = global::Cyberpipe.Properties.Resources._24x24icon_08_hover; - this.btn_user_role.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.btn_user_role.Name = "btn_user_role"; - this.btn_user_role.SubItemsExpandWidth = 14; - this.btn_user_role.Text = "用户授权"; - this.btn_user_role.Click += new System.EventHandler(this.btn_user_role_Click); - // - // btn_password_edit - // - this.btn_password_edit.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__67; - this.btn_password_edit.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.btn_password_edit.Name = "btn_password_edit"; - this.btn_password_edit.SubItemsExpandWidth = 14; - this.btn_password_edit.Text = "密码修改"; - this.btn_password_edit.Click += new System.EventHandler(this.btn_password_edit_Click); - // - // btn_reset_password - // - this.btn_reset_password.Image = global::Cyberpipe.Properties.Resources.liuxiang; - this.btn_reset_password.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.btn_reset_password.Name = "btn_reset_password"; - this.btn_reset_password.SubItemsExpandWidth = 14; - this.btn_reset_password.Text = "重置密码"; - this.btn_reset_password.Click += new System.EventHandler(this.btn_reset_password_Click); - // // ribbonTabItem1 // this.ribbonTabItem1.ButtonStyle = DevComponents.DotNetBar.eButtonStyle.ImageAndText; @@ -6110,7 +6100,6 @@ this.ribbonTabItem7.Name = "ribbonTabItem7"; this.ribbonTabItem7.Panel = this.ribbonPanel7; this.ribbonTabItem7.Text = "标识器管理"; - this.ribbonTabItem7.Click += new System.EventHandler(this.ribbonTabItem7_Click); this.ribbonTabItem7.MouseDown += new System.Windows.Forms.MouseEventHandler(this.ribbonTabItem7_MouseDown); // // ribbonTabItem8 @@ -6428,14 +6417,27 @@ // // label1 // + this.label1.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); + this.label1.AutoEllipsis = true; this.label1.AutoSize = true; this.label1.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.label1.Image = global::Cyberpipe.Properties.Resources.user; - this.label1.Location = new System.Drawing.Point(1198, 53); + this.label1.Location = new System.Drawing.Point(1205, 51); this.label1.Name = "label1"; this.label1.Size = new System.Drawing.Size(56, 16); - this.label1.TabIndex = 28; + this.label1.TabIndex = 32; this.label1.Text = "label1"; + this.label1.TextAlign = System.Drawing.ContentAlignment.TopRight; + // + // layerTree + // + this.layerTree.CheckBoxes = true; + this.layerTree.ItemHeight = 18; + this.layerTree.Location = new System.Drawing.Point(30, 78); + this.layerTree.Name = "layerTree"; + this.layerTree.Size = new System.Drawing.Size(121, 97); + this.layerTree.TabIndex = 1; + this.layerTree.AfterCheck += new System.Windows.Forms.TreeViewEventHandler(this.layerTree_AfterCheck); // // MainFrm // @@ -6512,11 +6514,11 @@ this.ribbonControl1.ResumeLayout(false); this.ribbonControl1.PerformLayout(); this.ribbonPanel3.ResumeLayout(false); + this.ribbonPanel8.ResumeLayout(false); this.ribbonPanel2.ResumeLayout(false); this.ribbonPanel15.ResumeLayout(false); this.ribbonPanel1.ResumeLayout(false); this.ribbonPanel7.ResumeLayout(false); - this.ribbonPanel8.ResumeLayout(false); ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).EndInit(); this.ResumeLayout(false); this.PerformLayout(); diff --git a/MainFrm.resx b/MainFrm.resx index 15e5339..9d1d787 100644 --- a/MainFrm.resx +++ b/MainFrm.resx @@ -2094,7 +2094,7 @@ - 211 + 166 diff --git a/bin/x86/Debug/EMSCyberpipe.exe b/bin/x86/Debug/EMSCyberpipe.exe index c40cffc..8924ace 100644 --- a/bin/x86/Debug/EMSCyberpipe.exe +++ b/bin/x86/Debug/EMSCyberpipe.exe Binary files differ diff --git a/bin/x86/Debug/EMSCyberpipe.pdb b/bin/x86/Debug/EMSCyberpipe.pdb index eb32a47..1f02683 100644 --- a/bin/x86/Debug/EMSCyberpipe.pdb +++ b/bin/x86/Debug/EMSCyberpipe.pdb Binary files differ diff --git a/Cyberpipe.suo b/Cyberpipe.suo index 13a1659..6abc092 100644 --- a/Cyberpipe.suo +++ b/Cyberpipe.suo Binary files differ diff --git a/FormDocumentManager.cs b/FormDocumentManager.cs index 7925e2c..1c21f81 100644 --- a/FormDocumentManager.cs +++ b/FormDocumentManager.cs @@ -395,7 +395,7 @@ private void FormDocumentManager_Load(object sender, EventArgs e) { IS_OPEN = true; - //changeCursor(); + changeCursor(); dateTime_end.Value = DateTime.Now; dateTime_begin.Value = DateTime.Now.AddDays(-6); Thread loadThread = new Thread(new ThreadStart(doFormLoad)); diff --git a/MainFrm.cs b/MainFrm.cs index e801c7e..c5b7a38 100644 --- a/MainFrm.cs +++ b/MainFrm.cs @@ -14368,17 +14368,7 @@ globeControl1.Globe.Action = EnumAction3D.TrackPolygon; } - private void ribbonTabItem7_Click(object sender, EventArgs e) - { - - } - - private void label1_Click(object sender, EventArgs e) - { - - } - - + } diff --git a/MainFrm.designer.cs b/MainFrm.designer.cs index ee6e5b6..e9b8b02 100644 --- a/MainFrm.designer.cs +++ b/MainFrm.designer.cs @@ -82,7 +82,6 @@ this.sideBar1 = new DevComponents.DotNetBar.SideBar(); this.panelEx3 = new DevComponents.DotNetBar.PanelEx(); this.layerSensorTree = new System.Windows.Forms.TreeView(); - this.layerTree = new Cyberpipe.MyTreeView(); this.sideBarPanelItem3 = new DevComponents.DotNetBar.SideBarPanelItem(); this.controlContainerItem3 = new DevComponents.DotNetBar.ControlContainerItem(); this.sideBarPanelItem4 = new DevComponents.DotNetBar.SideBarPanelItem(); @@ -372,6 +371,15 @@ this.btn_Person = new DevComponents.DotNetBar.ButtonItem(); this.btn_constructMap = new DevComponents.DotNetBar.ButtonItem(); this.buttonItem9 = new DevComponents.DotNetBar.ButtonItem(); + this.ribbonPanel8 = new DevComponents.DotNetBar.RibbonPanel(); + this.ribbonBar_UserInfo = new DevComponents.DotNetBar.RibbonBar(); + this.btn_user_info = new DevComponents.DotNetBar.ButtonItem(); + this.btn_role_info = new DevComponents.DotNetBar.ButtonItem(); + this.btn_resc_info = new DevComponents.DotNetBar.ButtonItem(); + this.btn_role_resc = new DevComponents.DotNetBar.ButtonItem(); + this.btn_user_role = new DevComponents.DotNetBar.ButtonItem(); + this.btn_password_edit = new DevComponents.DotNetBar.ButtonItem(); + this.btn_reset_password = new DevComponents.DotNetBar.ButtonItem(); this.ribbonPanel2 = new DevComponents.DotNetBar.RibbonPanel(); this.ribbonBar4 = new DevComponents.DotNetBar.RibbonBar(); this.buttonItem_TaskManager = new DevComponents.DotNetBar.ButtonItem(); @@ -556,15 +564,6 @@ this.ribbonBar5 = new DevComponents.DotNetBar.RibbonBar(); this.btn_flag = new DevComponents.DotNetBar.ButtonItem(); this.slider4ground = new DevComponents.DotNetBar.SliderItem(); - this.ribbonPanel8 = new DevComponents.DotNetBar.RibbonPanel(); - this.ribbonBar_UserInfo = new DevComponents.DotNetBar.RibbonBar(); - this.btn_user_info = new DevComponents.DotNetBar.ButtonItem(); - this.btn_role_info = new DevComponents.DotNetBar.ButtonItem(); - this.btn_resc_info = new DevComponents.DotNetBar.ButtonItem(); - this.btn_role_resc = new DevComponents.DotNetBar.ButtonItem(); - this.btn_user_role = new DevComponents.DotNetBar.ButtonItem(); - this.btn_password_edit = new DevComponents.DotNetBar.ButtonItem(); - this.btn_reset_password = new DevComponents.DotNetBar.ButtonItem(); this.ribbonTabItem1 = new DevComponents.DotNetBar.RibbonTabItem(); this.ribbonTabItem14 = new DevComponents.DotNetBar.RibbonTabItem(); this.ribbonTabItem2 = new DevComponents.DotNetBar.RibbonTabItem(); @@ -612,6 +611,7 @@ this.buttonItem75 = new DevComponents.DotNetBar.ButtonItem(); this.buttonItem76 = new DevComponents.DotNetBar.ButtonItem(); this.label1 = new System.Windows.Forms.Label(); + this.layerTree = new Cyberpipe.MyTreeView(); this.statusStrip1.SuspendLayout(); this.sideBar1.SuspendLayout(); this.panelEx3.SuspendLayout(); @@ -649,11 +649,11 @@ this.contextMenuStripDeleteLayerNode.SuspendLayout(); this.ribbonControl1.SuspendLayout(); this.ribbonPanel3.SuspendLayout(); + this.ribbonPanel8.SuspendLayout(); this.ribbonPanel2.SuspendLayout(); this.ribbonPanel15.SuspendLayout(); this.ribbonPanel1.SuspendLayout(); this.ribbonPanel7.SuspendLayout(); - this.ribbonPanel8.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).BeginInit(); this.SuspendLayout(); // @@ -1048,16 +1048,6 @@ this.layerSensorTree.AfterCheck += new System.Windows.Forms.TreeViewEventHandler(this.layerMarkerTree_AfterCheck); this.layerSensorTree.NodeMouseClick += new System.Windows.Forms.TreeNodeMouseClickEventHandler(this.layerMarkerTree_NodeMouseClick); // - // layerTree - // - this.layerTree.CheckBoxes = true; - this.layerTree.ItemHeight = 18; - this.layerTree.Location = new System.Drawing.Point(30, 78); - this.layerTree.Name = "layerTree"; - this.layerTree.Size = new System.Drawing.Size(121, 97); - this.layerTree.TabIndex = 1; - this.layerTree.AfterCheck += new System.Windows.Forms.TreeViewEventHandler(this.layerTree_AfterCheck); - // // sideBarPanelItem3 // this.sideBarPanelItem3.FontBold = true; @@ -4126,11 +4116,11 @@ this.ribbonControl1.BackgroundStyle.Class = ""; this.ribbonControl1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonControl1.Controls.Add(this.ribbonPanel3); + this.ribbonControl1.Controls.Add(this.ribbonPanel8); this.ribbonControl1.Controls.Add(this.ribbonPanel2); this.ribbonControl1.Controls.Add(this.ribbonPanel15); this.ribbonControl1.Controls.Add(this.ribbonPanel1); this.ribbonControl1.Controls.Add(this.ribbonPanel7); - this.ribbonControl1.Controls.Add(this.ribbonPanel8); this.ribbonControl1.Dock = System.Windows.Forms.DockStyle.Top; this.ribbonControl1.ImeMode = System.Windows.Forms.ImeMode.NoControl; this.ribbonControl1.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { @@ -4272,6 +4262,135 @@ this.buttonItem9.Text = "文档管理"; this.buttonItem9.Click += new System.EventHandler(this.buttonItem9_Click); // + // ribbonPanel8 + // + this.ribbonPanel8.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonPanel8.Controls.Add(this.ribbonBar_UserInfo); + this.ribbonPanel8.Dock = System.Windows.Forms.DockStyle.Fill; + this.ribbonPanel8.Location = new System.Drawing.Point(0, 0); + this.ribbonPanel8.Name = "ribbonPanel8"; + this.ribbonPanel8.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); + this.ribbonPanel8.Size = new System.Drawing.Size(1328, 95); + // + // + // + this.ribbonPanel8.Style.Class = ""; + this.ribbonPanel8.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel8.StyleMouseDown.Class = ""; + this.ribbonPanel8.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel8.StyleMouseOver.Class = ""; + this.ribbonPanel8.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonPanel8.TabIndex = 42; + this.ribbonPanel8.Visible = false; + // + // ribbonBar_UserInfo + // + this.ribbonBar_UserInfo.AutoOverflowEnabled = true; + // + // + // + this.ribbonBar_UserInfo.BackgroundMouseOverStyle.Class = ""; + this.ribbonBar_UserInfo.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar_UserInfo.BackgroundStyle.Class = ""; + this.ribbonBar_UserInfo.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar_UserInfo.ContainerControlProcessDialogKey = true; + this.ribbonBar_UserInfo.Dock = System.Windows.Forms.DockStyle.Left; + this.ribbonBar_UserInfo.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { + this.btn_user_info, + this.btn_role_info, + this.btn_resc_info, + this.btn_role_resc, + this.btn_user_role, + this.btn_password_edit, + this.btn_reset_password}); + this.ribbonBar_UserInfo.Location = new System.Drawing.Point(3, 0); + this.ribbonBar_UserInfo.Name = "ribbonBar_UserInfo"; + this.ribbonBar_UserInfo.Size = new System.Drawing.Size(427, 92); + this.ribbonBar_UserInfo.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonBar_UserInfo.TabIndex = 0; + // + // + // + this.ribbonBar_UserInfo.TitleStyle.Class = ""; + this.ribbonBar_UserInfo.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar_UserInfo.TitleStyleMouseOver.Class = ""; + this.ribbonBar_UserInfo.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // btn_user_info + // + this.btn_user_info.Image = global::Cyberpipe.Properties.Resources._24x24icon_13_hover; + this.btn_user_info.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.btn_user_info.Name = "btn_user_info"; + this.btn_user_info.SubItemsExpandWidth = 14; + this.btn_user_info.Text = "用户管理"; + this.btn_user_info.Click += new System.EventHandler(this.btn_user_info_Click); + // + // btn_role_info + // + this.btn_role_info.Image = global::Cyberpipe.Properties.Resources._24x24icon_05_hover1; + this.btn_role_info.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.btn_role_info.Name = "btn_role_info"; + this.btn_role_info.SubItemsExpandWidth = 14; + this.btn_role_info.Text = "角色管理"; + this.btn_role_info.Click += new System.EventHandler(this.btn_role_info_Click); + // + // btn_resc_info + // + this.btn_resc_info.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__09; + this.btn_resc_info.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.btn_resc_info.Name = "btn_resc_info"; + this.btn_resc_info.SubItemsExpandWidth = 14; + this.btn_resc_info.Text = "资源管理"; + this.btn_resc_info.Click += new System.EventHandler(this.btn_resc_info_Click); + // + // btn_role_resc + // + this.btn_role_resc.Image = global::Cyberpipe.Properties.Resources.btnlegendSet_Image_副本; + this.btn_role_resc.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.btn_role_resc.Name = "btn_role_resc"; + this.btn_role_resc.SubItemsExpandWidth = 14; + this.btn_role_resc.Text = "角色授权"; + this.btn_role_resc.Click += new System.EventHandler(this.btn_role_resc_Click); + // + // btn_user_role + // + this.btn_user_role.Image = global::Cyberpipe.Properties.Resources._24x24icon_08_hover; + this.btn_user_role.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.btn_user_role.Name = "btn_user_role"; + this.btn_user_role.SubItemsExpandWidth = 14; + this.btn_user_role.Text = "用户授权"; + this.btn_user_role.Click += new System.EventHandler(this.btn_user_role_Click); + // + // btn_password_edit + // + this.btn_password_edit.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__67; + this.btn_password_edit.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.btn_password_edit.Name = "btn_password_edit"; + this.btn_password_edit.SubItemsExpandWidth = 14; + this.btn_password_edit.Text = "密码修改"; + this.btn_password_edit.Click += new System.EventHandler(this.btn_password_edit_Click); + // + // btn_reset_password + // + this.btn_reset_password.Image = global::Cyberpipe.Properties.Resources.liuxiang; + this.btn_reset_password.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.btn_reset_password.Name = "btn_reset_password"; + this.btn_reset_password.SubItemsExpandWidth = 14; + this.btn_reset_password.Text = "重置密码"; + this.btn_reset_password.Click += new System.EventHandler(this.btn_reset_password_Click); + // // ribbonPanel2 // this.ribbonPanel2.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -5931,135 +6050,6 @@ this.slider4ground.Value = 0; this.slider4ground.ValueChanged += new System.EventHandler(this.slider4ground_ValueChanged); // - // ribbonPanel8 - // - this.ribbonPanel8.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonPanel8.Controls.Add(this.ribbonBar_UserInfo); - this.ribbonPanel8.Dock = System.Windows.Forms.DockStyle.Fill; - this.ribbonPanel8.Location = new System.Drawing.Point(0, 0); - this.ribbonPanel8.Name = "ribbonPanel8"; - this.ribbonPanel8.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); - this.ribbonPanel8.Size = new System.Drawing.Size(1328, 95); - // - // - // - this.ribbonPanel8.Style.Class = ""; - this.ribbonPanel8.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel8.StyleMouseDown.Class = ""; - this.ribbonPanel8.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel8.StyleMouseOver.Class = ""; - this.ribbonPanel8.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonPanel8.TabIndex = 42; - this.ribbonPanel8.Visible = false; - // - // ribbonBar_UserInfo - // - this.ribbonBar_UserInfo.AutoOverflowEnabled = true; - // - // - // - this.ribbonBar_UserInfo.BackgroundMouseOverStyle.Class = ""; - this.ribbonBar_UserInfo.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar_UserInfo.BackgroundStyle.Class = ""; - this.ribbonBar_UserInfo.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar_UserInfo.ContainerControlProcessDialogKey = true; - this.ribbonBar_UserInfo.Dock = System.Windows.Forms.DockStyle.Left; - this.ribbonBar_UserInfo.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { - this.btn_user_info, - this.btn_role_info, - this.btn_resc_info, - this.btn_role_resc, - this.btn_user_role, - this.btn_password_edit, - this.btn_reset_password}); - this.ribbonBar_UserInfo.Location = new System.Drawing.Point(3, 0); - this.ribbonBar_UserInfo.Name = "ribbonBar_UserInfo"; - this.ribbonBar_UserInfo.Size = new System.Drawing.Size(427, 92); - this.ribbonBar_UserInfo.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonBar_UserInfo.TabIndex = 0; - // - // - // - this.ribbonBar_UserInfo.TitleStyle.Class = ""; - this.ribbonBar_UserInfo.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar_UserInfo.TitleStyleMouseOver.Class = ""; - this.ribbonBar_UserInfo.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // btn_user_info - // - this.btn_user_info.Image = global::Cyberpipe.Properties.Resources._24x24icon_13_hover; - this.btn_user_info.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.btn_user_info.Name = "btn_user_info"; - this.btn_user_info.SubItemsExpandWidth = 14; - this.btn_user_info.Text = "用户管理"; - this.btn_user_info.Click += new System.EventHandler(this.btn_user_info_Click); - // - // btn_role_info - // - this.btn_role_info.Image = global::Cyberpipe.Properties.Resources._24x24icon_05_hover1; - this.btn_role_info.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.btn_role_info.Name = "btn_role_info"; - this.btn_role_info.SubItemsExpandWidth = 14; - this.btn_role_info.Text = "角色管理"; - this.btn_role_info.Click += new System.EventHandler(this.btn_role_info_Click); - // - // btn_resc_info - // - this.btn_resc_info.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__09; - this.btn_resc_info.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.btn_resc_info.Name = "btn_resc_info"; - this.btn_resc_info.SubItemsExpandWidth = 14; - this.btn_resc_info.Text = "资源管理"; - this.btn_resc_info.Click += new System.EventHandler(this.btn_resc_info_Click); - // - // btn_role_resc - // - this.btn_role_resc.Image = global::Cyberpipe.Properties.Resources.btnlegendSet_Image_副本; - this.btn_role_resc.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.btn_role_resc.Name = "btn_role_resc"; - this.btn_role_resc.SubItemsExpandWidth = 14; - this.btn_role_resc.Text = "角色授权"; - this.btn_role_resc.Click += new System.EventHandler(this.btn_role_resc_Click); - // - // btn_user_role - // - this.btn_user_role.Image = global::Cyberpipe.Properties.Resources._24x24icon_08_hover; - this.btn_user_role.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.btn_user_role.Name = "btn_user_role"; - this.btn_user_role.SubItemsExpandWidth = 14; - this.btn_user_role.Text = "用户授权"; - this.btn_user_role.Click += new System.EventHandler(this.btn_user_role_Click); - // - // btn_password_edit - // - this.btn_password_edit.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__67; - this.btn_password_edit.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.btn_password_edit.Name = "btn_password_edit"; - this.btn_password_edit.SubItemsExpandWidth = 14; - this.btn_password_edit.Text = "密码修改"; - this.btn_password_edit.Click += new System.EventHandler(this.btn_password_edit_Click); - // - // btn_reset_password - // - this.btn_reset_password.Image = global::Cyberpipe.Properties.Resources.liuxiang; - this.btn_reset_password.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.btn_reset_password.Name = "btn_reset_password"; - this.btn_reset_password.SubItemsExpandWidth = 14; - this.btn_reset_password.Text = "重置密码"; - this.btn_reset_password.Click += new System.EventHandler(this.btn_reset_password_Click); - // // ribbonTabItem1 // this.ribbonTabItem1.ButtonStyle = DevComponents.DotNetBar.eButtonStyle.ImageAndText; @@ -6110,7 +6100,6 @@ this.ribbonTabItem7.Name = "ribbonTabItem7"; this.ribbonTabItem7.Panel = this.ribbonPanel7; this.ribbonTabItem7.Text = "标识器管理"; - this.ribbonTabItem7.Click += new System.EventHandler(this.ribbonTabItem7_Click); this.ribbonTabItem7.MouseDown += new System.Windows.Forms.MouseEventHandler(this.ribbonTabItem7_MouseDown); // // ribbonTabItem8 @@ -6428,14 +6417,27 @@ // // label1 // + this.label1.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); + this.label1.AutoEllipsis = true; this.label1.AutoSize = true; this.label1.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.label1.Image = global::Cyberpipe.Properties.Resources.user; - this.label1.Location = new System.Drawing.Point(1198, 53); + this.label1.Location = new System.Drawing.Point(1205, 51); this.label1.Name = "label1"; this.label1.Size = new System.Drawing.Size(56, 16); - this.label1.TabIndex = 28; + this.label1.TabIndex = 32; this.label1.Text = "label1"; + this.label1.TextAlign = System.Drawing.ContentAlignment.TopRight; + // + // layerTree + // + this.layerTree.CheckBoxes = true; + this.layerTree.ItemHeight = 18; + this.layerTree.Location = new System.Drawing.Point(30, 78); + this.layerTree.Name = "layerTree"; + this.layerTree.Size = new System.Drawing.Size(121, 97); + this.layerTree.TabIndex = 1; + this.layerTree.AfterCheck += new System.Windows.Forms.TreeViewEventHandler(this.layerTree_AfterCheck); // // MainFrm // @@ -6512,11 +6514,11 @@ this.ribbonControl1.ResumeLayout(false); this.ribbonControl1.PerformLayout(); this.ribbonPanel3.ResumeLayout(false); + this.ribbonPanel8.ResumeLayout(false); this.ribbonPanel2.ResumeLayout(false); this.ribbonPanel15.ResumeLayout(false); this.ribbonPanel1.ResumeLayout(false); this.ribbonPanel7.ResumeLayout(false); - this.ribbonPanel8.ResumeLayout(false); ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).EndInit(); this.ResumeLayout(false); this.PerformLayout(); diff --git a/MainFrm.resx b/MainFrm.resx index 15e5339..9d1d787 100644 --- a/MainFrm.resx +++ b/MainFrm.resx @@ -2094,7 +2094,7 @@ - 211 + 166 diff --git a/bin/x86/Debug/EMSCyberpipe.exe b/bin/x86/Debug/EMSCyberpipe.exe index c40cffc..8924ace 100644 --- a/bin/x86/Debug/EMSCyberpipe.exe +++ b/bin/x86/Debug/EMSCyberpipe.exe Binary files differ diff --git a/bin/x86/Debug/EMSCyberpipe.pdb b/bin/x86/Debug/EMSCyberpipe.pdb index eb32a47..1f02683 100644 --- a/bin/x86/Debug/EMSCyberpipe.pdb +++ b/bin/x86/Debug/EMSCyberpipe.pdb Binary files differ diff --git a/bin/x86/Debug/download/BootStrap_pdf.zip b/bin/x86/Debug/download/BootStrap_pdf.zip deleted file mode 100644 index 993e02b..0000000 --- a/bin/x86/Debug/download/BootStrap_pdf.zip +++ /dev/null Binary files differ diff --git a/Cyberpipe.suo b/Cyberpipe.suo index 13a1659..6abc092 100644 --- a/Cyberpipe.suo +++ b/Cyberpipe.suo Binary files differ diff --git a/FormDocumentManager.cs b/FormDocumentManager.cs index 7925e2c..1c21f81 100644 --- a/FormDocumentManager.cs +++ b/FormDocumentManager.cs @@ -395,7 +395,7 @@ private void FormDocumentManager_Load(object sender, EventArgs e) { IS_OPEN = true; - //changeCursor(); + changeCursor(); dateTime_end.Value = DateTime.Now; dateTime_begin.Value = DateTime.Now.AddDays(-6); Thread loadThread = new Thread(new ThreadStart(doFormLoad)); diff --git a/MainFrm.cs b/MainFrm.cs index e801c7e..c5b7a38 100644 --- a/MainFrm.cs +++ b/MainFrm.cs @@ -14368,17 +14368,7 @@ globeControl1.Globe.Action = EnumAction3D.TrackPolygon; } - private void ribbonTabItem7_Click(object sender, EventArgs e) - { - - } - - private void label1_Click(object sender, EventArgs e) - { - - } - - + } diff --git a/MainFrm.designer.cs b/MainFrm.designer.cs index ee6e5b6..e9b8b02 100644 --- a/MainFrm.designer.cs +++ b/MainFrm.designer.cs @@ -82,7 +82,6 @@ this.sideBar1 = new DevComponents.DotNetBar.SideBar(); this.panelEx3 = new DevComponents.DotNetBar.PanelEx(); this.layerSensorTree = new System.Windows.Forms.TreeView(); - this.layerTree = new Cyberpipe.MyTreeView(); this.sideBarPanelItem3 = new DevComponents.DotNetBar.SideBarPanelItem(); this.controlContainerItem3 = new DevComponents.DotNetBar.ControlContainerItem(); this.sideBarPanelItem4 = new DevComponents.DotNetBar.SideBarPanelItem(); @@ -372,6 +371,15 @@ this.btn_Person = new DevComponents.DotNetBar.ButtonItem(); this.btn_constructMap = new DevComponents.DotNetBar.ButtonItem(); this.buttonItem9 = new DevComponents.DotNetBar.ButtonItem(); + this.ribbonPanel8 = new DevComponents.DotNetBar.RibbonPanel(); + this.ribbonBar_UserInfo = new DevComponents.DotNetBar.RibbonBar(); + this.btn_user_info = new DevComponents.DotNetBar.ButtonItem(); + this.btn_role_info = new DevComponents.DotNetBar.ButtonItem(); + this.btn_resc_info = new DevComponents.DotNetBar.ButtonItem(); + this.btn_role_resc = new DevComponents.DotNetBar.ButtonItem(); + this.btn_user_role = new DevComponents.DotNetBar.ButtonItem(); + this.btn_password_edit = new DevComponents.DotNetBar.ButtonItem(); + this.btn_reset_password = new DevComponents.DotNetBar.ButtonItem(); this.ribbonPanel2 = new DevComponents.DotNetBar.RibbonPanel(); this.ribbonBar4 = new DevComponents.DotNetBar.RibbonBar(); this.buttonItem_TaskManager = new DevComponents.DotNetBar.ButtonItem(); @@ -556,15 +564,6 @@ this.ribbonBar5 = new DevComponents.DotNetBar.RibbonBar(); this.btn_flag = new DevComponents.DotNetBar.ButtonItem(); this.slider4ground = new DevComponents.DotNetBar.SliderItem(); - this.ribbonPanel8 = new DevComponents.DotNetBar.RibbonPanel(); - this.ribbonBar_UserInfo = new DevComponents.DotNetBar.RibbonBar(); - this.btn_user_info = new DevComponents.DotNetBar.ButtonItem(); - this.btn_role_info = new DevComponents.DotNetBar.ButtonItem(); - this.btn_resc_info = new DevComponents.DotNetBar.ButtonItem(); - this.btn_role_resc = new DevComponents.DotNetBar.ButtonItem(); - this.btn_user_role = new DevComponents.DotNetBar.ButtonItem(); - this.btn_password_edit = new DevComponents.DotNetBar.ButtonItem(); - this.btn_reset_password = new DevComponents.DotNetBar.ButtonItem(); this.ribbonTabItem1 = new DevComponents.DotNetBar.RibbonTabItem(); this.ribbonTabItem14 = new DevComponents.DotNetBar.RibbonTabItem(); this.ribbonTabItem2 = new DevComponents.DotNetBar.RibbonTabItem(); @@ -612,6 +611,7 @@ this.buttonItem75 = new DevComponents.DotNetBar.ButtonItem(); this.buttonItem76 = new DevComponents.DotNetBar.ButtonItem(); this.label1 = new System.Windows.Forms.Label(); + this.layerTree = new Cyberpipe.MyTreeView(); this.statusStrip1.SuspendLayout(); this.sideBar1.SuspendLayout(); this.panelEx3.SuspendLayout(); @@ -649,11 +649,11 @@ this.contextMenuStripDeleteLayerNode.SuspendLayout(); this.ribbonControl1.SuspendLayout(); this.ribbonPanel3.SuspendLayout(); + this.ribbonPanel8.SuspendLayout(); this.ribbonPanel2.SuspendLayout(); this.ribbonPanel15.SuspendLayout(); this.ribbonPanel1.SuspendLayout(); this.ribbonPanel7.SuspendLayout(); - this.ribbonPanel8.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).BeginInit(); this.SuspendLayout(); // @@ -1048,16 +1048,6 @@ this.layerSensorTree.AfterCheck += new System.Windows.Forms.TreeViewEventHandler(this.layerMarkerTree_AfterCheck); this.layerSensorTree.NodeMouseClick += new System.Windows.Forms.TreeNodeMouseClickEventHandler(this.layerMarkerTree_NodeMouseClick); // - // layerTree - // - this.layerTree.CheckBoxes = true; - this.layerTree.ItemHeight = 18; - this.layerTree.Location = new System.Drawing.Point(30, 78); - this.layerTree.Name = "layerTree"; - this.layerTree.Size = new System.Drawing.Size(121, 97); - this.layerTree.TabIndex = 1; - this.layerTree.AfterCheck += new System.Windows.Forms.TreeViewEventHandler(this.layerTree_AfterCheck); - // // sideBarPanelItem3 // this.sideBarPanelItem3.FontBold = true; @@ -4126,11 +4116,11 @@ this.ribbonControl1.BackgroundStyle.Class = ""; this.ribbonControl1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonControl1.Controls.Add(this.ribbonPanel3); + this.ribbonControl1.Controls.Add(this.ribbonPanel8); this.ribbonControl1.Controls.Add(this.ribbonPanel2); this.ribbonControl1.Controls.Add(this.ribbonPanel15); this.ribbonControl1.Controls.Add(this.ribbonPanel1); this.ribbonControl1.Controls.Add(this.ribbonPanel7); - this.ribbonControl1.Controls.Add(this.ribbonPanel8); this.ribbonControl1.Dock = System.Windows.Forms.DockStyle.Top; this.ribbonControl1.ImeMode = System.Windows.Forms.ImeMode.NoControl; this.ribbonControl1.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { @@ -4272,6 +4262,135 @@ this.buttonItem9.Text = "文档管理"; this.buttonItem9.Click += new System.EventHandler(this.buttonItem9_Click); // + // ribbonPanel8 + // + this.ribbonPanel8.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonPanel8.Controls.Add(this.ribbonBar_UserInfo); + this.ribbonPanel8.Dock = System.Windows.Forms.DockStyle.Fill; + this.ribbonPanel8.Location = new System.Drawing.Point(0, 0); + this.ribbonPanel8.Name = "ribbonPanel8"; + this.ribbonPanel8.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); + this.ribbonPanel8.Size = new System.Drawing.Size(1328, 95); + // + // + // + this.ribbonPanel8.Style.Class = ""; + this.ribbonPanel8.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel8.StyleMouseDown.Class = ""; + this.ribbonPanel8.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel8.StyleMouseOver.Class = ""; + this.ribbonPanel8.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonPanel8.TabIndex = 42; + this.ribbonPanel8.Visible = false; + // + // ribbonBar_UserInfo + // + this.ribbonBar_UserInfo.AutoOverflowEnabled = true; + // + // + // + this.ribbonBar_UserInfo.BackgroundMouseOverStyle.Class = ""; + this.ribbonBar_UserInfo.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar_UserInfo.BackgroundStyle.Class = ""; + this.ribbonBar_UserInfo.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar_UserInfo.ContainerControlProcessDialogKey = true; + this.ribbonBar_UserInfo.Dock = System.Windows.Forms.DockStyle.Left; + this.ribbonBar_UserInfo.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { + this.btn_user_info, + this.btn_role_info, + this.btn_resc_info, + this.btn_role_resc, + this.btn_user_role, + this.btn_password_edit, + this.btn_reset_password}); + this.ribbonBar_UserInfo.Location = new System.Drawing.Point(3, 0); + this.ribbonBar_UserInfo.Name = "ribbonBar_UserInfo"; + this.ribbonBar_UserInfo.Size = new System.Drawing.Size(427, 92); + this.ribbonBar_UserInfo.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonBar_UserInfo.TabIndex = 0; + // + // + // + this.ribbonBar_UserInfo.TitleStyle.Class = ""; + this.ribbonBar_UserInfo.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar_UserInfo.TitleStyleMouseOver.Class = ""; + this.ribbonBar_UserInfo.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // btn_user_info + // + this.btn_user_info.Image = global::Cyberpipe.Properties.Resources._24x24icon_13_hover; + this.btn_user_info.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.btn_user_info.Name = "btn_user_info"; + this.btn_user_info.SubItemsExpandWidth = 14; + this.btn_user_info.Text = "用户管理"; + this.btn_user_info.Click += new System.EventHandler(this.btn_user_info_Click); + // + // btn_role_info + // + this.btn_role_info.Image = global::Cyberpipe.Properties.Resources._24x24icon_05_hover1; + this.btn_role_info.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.btn_role_info.Name = "btn_role_info"; + this.btn_role_info.SubItemsExpandWidth = 14; + this.btn_role_info.Text = "角色管理"; + this.btn_role_info.Click += new System.EventHandler(this.btn_role_info_Click); + // + // btn_resc_info + // + this.btn_resc_info.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__09; + this.btn_resc_info.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.btn_resc_info.Name = "btn_resc_info"; + this.btn_resc_info.SubItemsExpandWidth = 14; + this.btn_resc_info.Text = "资源管理"; + this.btn_resc_info.Click += new System.EventHandler(this.btn_resc_info_Click); + // + // btn_role_resc + // + this.btn_role_resc.Image = global::Cyberpipe.Properties.Resources.btnlegendSet_Image_副本; + this.btn_role_resc.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.btn_role_resc.Name = "btn_role_resc"; + this.btn_role_resc.SubItemsExpandWidth = 14; + this.btn_role_resc.Text = "角色授权"; + this.btn_role_resc.Click += new System.EventHandler(this.btn_role_resc_Click); + // + // btn_user_role + // + this.btn_user_role.Image = global::Cyberpipe.Properties.Resources._24x24icon_08_hover; + this.btn_user_role.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.btn_user_role.Name = "btn_user_role"; + this.btn_user_role.SubItemsExpandWidth = 14; + this.btn_user_role.Text = "用户授权"; + this.btn_user_role.Click += new System.EventHandler(this.btn_user_role_Click); + // + // btn_password_edit + // + this.btn_password_edit.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__67; + this.btn_password_edit.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.btn_password_edit.Name = "btn_password_edit"; + this.btn_password_edit.SubItemsExpandWidth = 14; + this.btn_password_edit.Text = "密码修改"; + this.btn_password_edit.Click += new System.EventHandler(this.btn_password_edit_Click); + // + // btn_reset_password + // + this.btn_reset_password.Image = global::Cyberpipe.Properties.Resources.liuxiang; + this.btn_reset_password.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.btn_reset_password.Name = "btn_reset_password"; + this.btn_reset_password.SubItemsExpandWidth = 14; + this.btn_reset_password.Text = "重置密码"; + this.btn_reset_password.Click += new System.EventHandler(this.btn_reset_password_Click); + // // ribbonPanel2 // this.ribbonPanel2.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -5931,135 +6050,6 @@ this.slider4ground.Value = 0; this.slider4ground.ValueChanged += new System.EventHandler(this.slider4ground_ValueChanged); // - // ribbonPanel8 - // - this.ribbonPanel8.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonPanel8.Controls.Add(this.ribbonBar_UserInfo); - this.ribbonPanel8.Dock = System.Windows.Forms.DockStyle.Fill; - this.ribbonPanel8.Location = new System.Drawing.Point(0, 0); - this.ribbonPanel8.Name = "ribbonPanel8"; - this.ribbonPanel8.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); - this.ribbonPanel8.Size = new System.Drawing.Size(1328, 95); - // - // - // - this.ribbonPanel8.Style.Class = ""; - this.ribbonPanel8.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel8.StyleMouseDown.Class = ""; - this.ribbonPanel8.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel8.StyleMouseOver.Class = ""; - this.ribbonPanel8.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonPanel8.TabIndex = 42; - this.ribbonPanel8.Visible = false; - // - // ribbonBar_UserInfo - // - this.ribbonBar_UserInfo.AutoOverflowEnabled = true; - // - // - // - this.ribbonBar_UserInfo.BackgroundMouseOverStyle.Class = ""; - this.ribbonBar_UserInfo.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar_UserInfo.BackgroundStyle.Class = ""; - this.ribbonBar_UserInfo.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar_UserInfo.ContainerControlProcessDialogKey = true; - this.ribbonBar_UserInfo.Dock = System.Windows.Forms.DockStyle.Left; - this.ribbonBar_UserInfo.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { - this.btn_user_info, - this.btn_role_info, - this.btn_resc_info, - this.btn_role_resc, - this.btn_user_role, - this.btn_password_edit, - this.btn_reset_password}); - this.ribbonBar_UserInfo.Location = new System.Drawing.Point(3, 0); - this.ribbonBar_UserInfo.Name = "ribbonBar_UserInfo"; - this.ribbonBar_UserInfo.Size = new System.Drawing.Size(427, 92); - this.ribbonBar_UserInfo.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonBar_UserInfo.TabIndex = 0; - // - // - // - this.ribbonBar_UserInfo.TitleStyle.Class = ""; - this.ribbonBar_UserInfo.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar_UserInfo.TitleStyleMouseOver.Class = ""; - this.ribbonBar_UserInfo.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // btn_user_info - // - this.btn_user_info.Image = global::Cyberpipe.Properties.Resources._24x24icon_13_hover; - this.btn_user_info.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.btn_user_info.Name = "btn_user_info"; - this.btn_user_info.SubItemsExpandWidth = 14; - this.btn_user_info.Text = "用户管理"; - this.btn_user_info.Click += new System.EventHandler(this.btn_user_info_Click); - // - // btn_role_info - // - this.btn_role_info.Image = global::Cyberpipe.Properties.Resources._24x24icon_05_hover1; - this.btn_role_info.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.btn_role_info.Name = "btn_role_info"; - this.btn_role_info.SubItemsExpandWidth = 14; - this.btn_role_info.Text = "角色管理"; - this.btn_role_info.Click += new System.EventHandler(this.btn_role_info_Click); - // - // btn_resc_info - // - this.btn_resc_info.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__09; - this.btn_resc_info.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.btn_resc_info.Name = "btn_resc_info"; - this.btn_resc_info.SubItemsExpandWidth = 14; - this.btn_resc_info.Text = "资源管理"; - this.btn_resc_info.Click += new System.EventHandler(this.btn_resc_info_Click); - // - // btn_role_resc - // - this.btn_role_resc.Image = global::Cyberpipe.Properties.Resources.btnlegendSet_Image_副本; - this.btn_role_resc.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.btn_role_resc.Name = "btn_role_resc"; - this.btn_role_resc.SubItemsExpandWidth = 14; - this.btn_role_resc.Text = "角色授权"; - this.btn_role_resc.Click += new System.EventHandler(this.btn_role_resc_Click); - // - // btn_user_role - // - this.btn_user_role.Image = global::Cyberpipe.Properties.Resources._24x24icon_08_hover; - this.btn_user_role.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.btn_user_role.Name = "btn_user_role"; - this.btn_user_role.SubItemsExpandWidth = 14; - this.btn_user_role.Text = "用户授权"; - this.btn_user_role.Click += new System.EventHandler(this.btn_user_role_Click); - // - // btn_password_edit - // - this.btn_password_edit.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__67; - this.btn_password_edit.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.btn_password_edit.Name = "btn_password_edit"; - this.btn_password_edit.SubItemsExpandWidth = 14; - this.btn_password_edit.Text = "密码修改"; - this.btn_password_edit.Click += new System.EventHandler(this.btn_password_edit_Click); - // - // btn_reset_password - // - this.btn_reset_password.Image = global::Cyberpipe.Properties.Resources.liuxiang; - this.btn_reset_password.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.btn_reset_password.Name = "btn_reset_password"; - this.btn_reset_password.SubItemsExpandWidth = 14; - this.btn_reset_password.Text = "重置密码"; - this.btn_reset_password.Click += new System.EventHandler(this.btn_reset_password_Click); - // // ribbonTabItem1 // this.ribbonTabItem1.ButtonStyle = DevComponents.DotNetBar.eButtonStyle.ImageAndText; @@ -6110,7 +6100,6 @@ this.ribbonTabItem7.Name = "ribbonTabItem7"; this.ribbonTabItem7.Panel = this.ribbonPanel7; this.ribbonTabItem7.Text = "标识器管理"; - this.ribbonTabItem7.Click += new System.EventHandler(this.ribbonTabItem7_Click); this.ribbonTabItem7.MouseDown += new System.Windows.Forms.MouseEventHandler(this.ribbonTabItem7_MouseDown); // // ribbonTabItem8 @@ -6428,14 +6417,27 @@ // // label1 // + this.label1.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); + this.label1.AutoEllipsis = true; this.label1.AutoSize = true; this.label1.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.label1.Image = global::Cyberpipe.Properties.Resources.user; - this.label1.Location = new System.Drawing.Point(1198, 53); + this.label1.Location = new System.Drawing.Point(1205, 51); this.label1.Name = "label1"; this.label1.Size = new System.Drawing.Size(56, 16); - this.label1.TabIndex = 28; + this.label1.TabIndex = 32; this.label1.Text = "label1"; + this.label1.TextAlign = System.Drawing.ContentAlignment.TopRight; + // + // layerTree + // + this.layerTree.CheckBoxes = true; + this.layerTree.ItemHeight = 18; + this.layerTree.Location = new System.Drawing.Point(30, 78); + this.layerTree.Name = "layerTree"; + this.layerTree.Size = new System.Drawing.Size(121, 97); + this.layerTree.TabIndex = 1; + this.layerTree.AfterCheck += new System.Windows.Forms.TreeViewEventHandler(this.layerTree_AfterCheck); // // MainFrm // @@ -6512,11 +6514,11 @@ this.ribbonControl1.ResumeLayout(false); this.ribbonControl1.PerformLayout(); this.ribbonPanel3.ResumeLayout(false); + this.ribbonPanel8.ResumeLayout(false); this.ribbonPanel2.ResumeLayout(false); this.ribbonPanel15.ResumeLayout(false); this.ribbonPanel1.ResumeLayout(false); this.ribbonPanel7.ResumeLayout(false); - this.ribbonPanel8.ResumeLayout(false); ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).EndInit(); this.ResumeLayout(false); this.PerformLayout(); diff --git a/MainFrm.resx b/MainFrm.resx index 15e5339..9d1d787 100644 --- a/MainFrm.resx +++ b/MainFrm.resx @@ -2094,7 +2094,7 @@ - 211 + 166 diff --git a/bin/x86/Debug/EMSCyberpipe.exe b/bin/x86/Debug/EMSCyberpipe.exe index c40cffc..8924ace 100644 --- a/bin/x86/Debug/EMSCyberpipe.exe +++ b/bin/x86/Debug/EMSCyberpipe.exe Binary files differ diff --git a/bin/x86/Debug/EMSCyberpipe.pdb b/bin/x86/Debug/EMSCyberpipe.pdb index eb32a47..1f02683 100644 --- a/bin/x86/Debug/EMSCyberpipe.pdb +++ b/bin/x86/Debug/EMSCyberpipe.pdb Binary files differ diff --git a/bin/x86/Debug/download/BootStrap_pdf.zip b/bin/x86/Debug/download/BootStrap_pdf.zip deleted file mode 100644 index 993e02b..0000000 --- a/bin/x86/Debug/download/BootStrap_pdf.zip +++ /dev/null Binary files differ diff --git "a/bin/x86/Debug/download/BootStrap\345\205\245\351\227\250\346\225\231\347\250\213.pdf" "b/bin/x86/Debug/download/BootStrap\345\205\245\351\227\250\346\225\231\347\250\213.pdf" deleted file mode 100644 index 7fe754a..0000000 --- "a/bin/x86/Debug/download/BootStrap\345\205\245\351\227\250\346\225\231\347\250\213.pdf" +++ /dev/null Binary files differ diff --git a/Cyberpipe.suo b/Cyberpipe.suo index 13a1659..6abc092 100644 --- a/Cyberpipe.suo +++ b/Cyberpipe.suo Binary files differ diff --git a/FormDocumentManager.cs b/FormDocumentManager.cs index 7925e2c..1c21f81 100644 --- a/FormDocumentManager.cs +++ b/FormDocumentManager.cs @@ -395,7 +395,7 @@ private void FormDocumentManager_Load(object sender, EventArgs e) { IS_OPEN = true; - //changeCursor(); + changeCursor(); dateTime_end.Value = DateTime.Now; dateTime_begin.Value = DateTime.Now.AddDays(-6); Thread loadThread = new Thread(new ThreadStart(doFormLoad)); diff --git a/MainFrm.cs b/MainFrm.cs index e801c7e..c5b7a38 100644 --- a/MainFrm.cs +++ b/MainFrm.cs @@ -14368,17 +14368,7 @@ globeControl1.Globe.Action = EnumAction3D.TrackPolygon; } - private void ribbonTabItem7_Click(object sender, EventArgs e) - { - - } - - private void label1_Click(object sender, EventArgs e) - { - - } - - + } diff --git a/MainFrm.designer.cs b/MainFrm.designer.cs index ee6e5b6..e9b8b02 100644 --- a/MainFrm.designer.cs +++ b/MainFrm.designer.cs @@ -82,7 +82,6 @@ this.sideBar1 = new DevComponents.DotNetBar.SideBar(); this.panelEx3 = new DevComponents.DotNetBar.PanelEx(); this.layerSensorTree = new System.Windows.Forms.TreeView(); - this.layerTree = new Cyberpipe.MyTreeView(); this.sideBarPanelItem3 = new DevComponents.DotNetBar.SideBarPanelItem(); this.controlContainerItem3 = new DevComponents.DotNetBar.ControlContainerItem(); this.sideBarPanelItem4 = new DevComponents.DotNetBar.SideBarPanelItem(); @@ -372,6 +371,15 @@ this.btn_Person = new DevComponents.DotNetBar.ButtonItem(); this.btn_constructMap = new DevComponents.DotNetBar.ButtonItem(); this.buttonItem9 = new DevComponents.DotNetBar.ButtonItem(); + this.ribbonPanel8 = new DevComponents.DotNetBar.RibbonPanel(); + this.ribbonBar_UserInfo = new DevComponents.DotNetBar.RibbonBar(); + this.btn_user_info = new DevComponents.DotNetBar.ButtonItem(); + this.btn_role_info = new DevComponents.DotNetBar.ButtonItem(); + this.btn_resc_info = new DevComponents.DotNetBar.ButtonItem(); + this.btn_role_resc = new DevComponents.DotNetBar.ButtonItem(); + this.btn_user_role = new DevComponents.DotNetBar.ButtonItem(); + this.btn_password_edit = new DevComponents.DotNetBar.ButtonItem(); + this.btn_reset_password = new DevComponents.DotNetBar.ButtonItem(); this.ribbonPanel2 = new DevComponents.DotNetBar.RibbonPanel(); this.ribbonBar4 = new DevComponents.DotNetBar.RibbonBar(); this.buttonItem_TaskManager = new DevComponents.DotNetBar.ButtonItem(); @@ -556,15 +564,6 @@ this.ribbonBar5 = new DevComponents.DotNetBar.RibbonBar(); this.btn_flag = new DevComponents.DotNetBar.ButtonItem(); this.slider4ground = new DevComponents.DotNetBar.SliderItem(); - this.ribbonPanel8 = new DevComponents.DotNetBar.RibbonPanel(); - this.ribbonBar_UserInfo = new DevComponents.DotNetBar.RibbonBar(); - this.btn_user_info = new DevComponents.DotNetBar.ButtonItem(); - this.btn_role_info = new DevComponents.DotNetBar.ButtonItem(); - this.btn_resc_info = new DevComponents.DotNetBar.ButtonItem(); - this.btn_role_resc = new DevComponents.DotNetBar.ButtonItem(); - this.btn_user_role = new DevComponents.DotNetBar.ButtonItem(); - this.btn_password_edit = new DevComponents.DotNetBar.ButtonItem(); - this.btn_reset_password = new DevComponents.DotNetBar.ButtonItem(); this.ribbonTabItem1 = new DevComponents.DotNetBar.RibbonTabItem(); this.ribbonTabItem14 = new DevComponents.DotNetBar.RibbonTabItem(); this.ribbonTabItem2 = new DevComponents.DotNetBar.RibbonTabItem(); @@ -612,6 +611,7 @@ this.buttonItem75 = new DevComponents.DotNetBar.ButtonItem(); this.buttonItem76 = new DevComponents.DotNetBar.ButtonItem(); this.label1 = new System.Windows.Forms.Label(); + this.layerTree = new Cyberpipe.MyTreeView(); this.statusStrip1.SuspendLayout(); this.sideBar1.SuspendLayout(); this.panelEx3.SuspendLayout(); @@ -649,11 +649,11 @@ this.contextMenuStripDeleteLayerNode.SuspendLayout(); this.ribbonControl1.SuspendLayout(); this.ribbonPanel3.SuspendLayout(); + this.ribbonPanel8.SuspendLayout(); this.ribbonPanel2.SuspendLayout(); this.ribbonPanel15.SuspendLayout(); this.ribbonPanel1.SuspendLayout(); this.ribbonPanel7.SuspendLayout(); - this.ribbonPanel8.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).BeginInit(); this.SuspendLayout(); // @@ -1048,16 +1048,6 @@ this.layerSensorTree.AfterCheck += new System.Windows.Forms.TreeViewEventHandler(this.layerMarkerTree_AfterCheck); this.layerSensorTree.NodeMouseClick += new System.Windows.Forms.TreeNodeMouseClickEventHandler(this.layerMarkerTree_NodeMouseClick); // - // layerTree - // - this.layerTree.CheckBoxes = true; - this.layerTree.ItemHeight = 18; - this.layerTree.Location = new System.Drawing.Point(30, 78); - this.layerTree.Name = "layerTree"; - this.layerTree.Size = new System.Drawing.Size(121, 97); - this.layerTree.TabIndex = 1; - this.layerTree.AfterCheck += new System.Windows.Forms.TreeViewEventHandler(this.layerTree_AfterCheck); - // // sideBarPanelItem3 // this.sideBarPanelItem3.FontBold = true; @@ -4126,11 +4116,11 @@ this.ribbonControl1.BackgroundStyle.Class = ""; this.ribbonControl1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonControl1.Controls.Add(this.ribbonPanel3); + this.ribbonControl1.Controls.Add(this.ribbonPanel8); this.ribbonControl1.Controls.Add(this.ribbonPanel2); this.ribbonControl1.Controls.Add(this.ribbonPanel15); this.ribbonControl1.Controls.Add(this.ribbonPanel1); this.ribbonControl1.Controls.Add(this.ribbonPanel7); - this.ribbonControl1.Controls.Add(this.ribbonPanel8); this.ribbonControl1.Dock = System.Windows.Forms.DockStyle.Top; this.ribbonControl1.ImeMode = System.Windows.Forms.ImeMode.NoControl; this.ribbonControl1.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { @@ -4272,6 +4262,135 @@ this.buttonItem9.Text = "文档管理"; this.buttonItem9.Click += new System.EventHandler(this.buttonItem9_Click); // + // ribbonPanel8 + // + this.ribbonPanel8.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonPanel8.Controls.Add(this.ribbonBar_UserInfo); + this.ribbonPanel8.Dock = System.Windows.Forms.DockStyle.Fill; + this.ribbonPanel8.Location = new System.Drawing.Point(0, 0); + this.ribbonPanel8.Name = "ribbonPanel8"; + this.ribbonPanel8.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); + this.ribbonPanel8.Size = new System.Drawing.Size(1328, 95); + // + // + // + this.ribbonPanel8.Style.Class = ""; + this.ribbonPanel8.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel8.StyleMouseDown.Class = ""; + this.ribbonPanel8.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel8.StyleMouseOver.Class = ""; + this.ribbonPanel8.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonPanel8.TabIndex = 42; + this.ribbonPanel8.Visible = false; + // + // ribbonBar_UserInfo + // + this.ribbonBar_UserInfo.AutoOverflowEnabled = true; + // + // + // + this.ribbonBar_UserInfo.BackgroundMouseOverStyle.Class = ""; + this.ribbonBar_UserInfo.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar_UserInfo.BackgroundStyle.Class = ""; + this.ribbonBar_UserInfo.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar_UserInfo.ContainerControlProcessDialogKey = true; + this.ribbonBar_UserInfo.Dock = System.Windows.Forms.DockStyle.Left; + this.ribbonBar_UserInfo.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { + this.btn_user_info, + this.btn_role_info, + this.btn_resc_info, + this.btn_role_resc, + this.btn_user_role, + this.btn_password_edit, + this.btn_reset_password}); + this.ribbonBar_UserInfo.Location = new System.Drawing.Point(3, 0); + this.ribbonBar_UserInfo.Name = "ribbonBar_UserInfo"; + this.ribbonBar_UserInfo.Size = new System.Drawing.Size(427, 92); + this.ribbonBar_UserInfo.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonBar_UserInfo.TabIndex = 0; + // + // + // + this.ribbonBar_UserInfo.TitleStyle.Class = ""; + this.ribbonBar_UserInfo.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar_UserInfo.TitleStyleMouseOver.Class = ""; + this.ribbonBar_UserInfo.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // btn_user_info + // + this.btn_user_info.Image = global::Cyberpipe.Properties.Resources._24x24icon_13_hover; + this.btn_user_info.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.btn_user_info.Name = "btn_user_info"; + this.btn_user_info.SubItemsExpandWidth = 14; + this.btn_user_info.Text = "用户管理"; + this.btn_user_info.Click += new System.EventHandler(this.btn_user_info_Click); + // + // btn_role_info + // + this.btn_role_info.Image = global::Cyberpipe.Properties.Resources._24x24icon_05_hover1; + this.btn_role_info.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.btn_role_info.Name = "btn_role_info"; + this.btn_role_info.SubItemsExpandWidth = 14; + this.btn_role_info.Text = "角色管理"; + this.btn_role_info.Click += new System.EventHandler(this.btn_role_info_Click); + // + // btn_resc_info + // + this.btn_resc_info.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__09; + this.btn_resc_info.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.btn_resc_info.Name = "btn_resc_info"; + this.btn_resc_info.SubItemsExpandWidth = 14; + this.btn_resc_info.Text = "资源管理"; + this.btn_resc_info.Click += new System.EventHandler(this.btn_resc_info_Click); + // + // btn_role_resc + // + this.btn_role_resc.Image = global::Cyberpipe.Properties.Resources.btnlegendSet_Image_副本; + this.btn_role_resc.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.btn_role_resc.Name = "btn_role_resc"; + this.btn_role_resc.SubItemsExpandWidth = 14; + this.btn_role_resc.Text = "角色授权"; + this.btn_role_resc.Click += new System.EventHandler(this.btn_role_resc_Click); + // + // btn_user_role + // + this.btn_user_role.Image = global::Cyberpipe.Properties.Resources._24x24icon_08_hover; + this.btn_user_role.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.btn_user_role.Name = "btn_user_role"; + this.btn_user_role.SubItemsExpandWidth = 14; + this.btn_user_role.Text = "用户授权"; + this.btn_user_role.Click += new System.EventHandler(this.btn_user_role_Click); + // + // btn_password_edit + // + this.btn_password_edit.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__67; + this.btn_password_edit.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.btn_password_edit.Name = "btn_password_edit"; + this.btn_password_edit.SubItemsExpandWidth = 14; + this.btn_password_edit.Text = "密码修改"; + this.btn_password_edit.Click += new System.EventHandler(this.btn_password_edit_Click); + // + // btn_reset_password + // + this.btn_reset_password.Image = global::Cyberpipe.Properties.Resources.liuxiang; + this.btn_reset_password.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.btn_reset_password.Name = "btn_reset_password"; + this.btn_reset_password.SubItemsExpandWidth = 14; + this.btn_reset_password.Text = "重置密码"; + this.btn_reset_password.Click += new System.EventHandler(this.btn_reset_password_Click); + // // ribbonPanel2 // this.ribbonPanel2.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -5931,135 +6050,6 @@ this.slider4ground.Value = 0; this.slider4ground.ValueChanged += new System.EventHandler(this.slider4ground_ValueChanged); // - // ribbonPanel8 - // - this.ribbonPanel8.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonPanel8.Controls.Add(this.ribbonBar_UserInfo); - this.ribbonPanel8.Dock = System.Windows.Forms.DockStyle.Fill; - this.ribbonPanel8.Location = new System.Drawing.Point(0, 0); - this.ribbonPanel8.Name = "ribbonPanel8"; - this.ribbonPanel8.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); - this.ribbonPanel8.Size = new System.Drawing.Size(1328, 95); - // - // - // - this.ribbonPanel8.Style.Class = ""; - this.ribbonPanel8.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel8.StyleMouseDown.Class = ""; - this.ribbonPanel8.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel8.StyleMouseOver.Class = ""; - this.ribbonPanel8.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonPanel8.TabIndex = 42; - this.ribbonPanel8.Visible = false; - // - // ribbonBar_UserInfo - // - this.ribbonBar_UserInfo.AutoOverflowEnabled = true; - // - // - // - this.ribbonBar_UserInfo.BackgroundMouseOverStyle.Class = ""; - this.ribbonBar_UserInfo.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar_UserInfo.BackgroundStyle.Class = ""; - this.ribbonBar_UserInfo.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar_UserInfo.ContainerControlProcessDialogKey = true; - this.ribbonBar_UserInfo.Dock = System.Windows.Forms.DockStyle.Left; - this.ribbonBar_UserInfo.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { - this.btn_user_info, - this.btn_role_info, - this.btn_resc_info, - this.btn_role_resc, - this.btn_user_role, - this.btn_password_edit, - this.btn_reset_password}); - this.ribbonBar_UserInfo.Location = new System.Drawing.Point(3, 0); - this.ribbonBar_UserInfo.Name = "ribbonBar_UserInfo"; - this.ribbonBar_UserInfo.Size = new System.Drawing.Size(427, 92); - this.ribbonBar_UserInfo.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonBar_UserInfo.TabIndex = 0; - // - // - // - this.ribbonBar_UserInfo.TitleStyle.Class = ""; - this.ribbonBar_UserInfo.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar_UserInfo.TitleStyleMouseOver.Class = ""; - this.ribbonBar_UserInfo.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // btn_user_info - // - this.btn_user_info.Image = global::Cyberpipe.Properties.Resources._24x24icon_13_hover; - this.btn_user_info.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.btn_user_info.Name = "btn_user_info"; - this.btn_user_info.SubItemsExpandWidth = 14; - this.btn_user_info.Text = "用户管理"; - this.btn_user_info.Click += new System.EventHandler(this.btn_user_info_Click); - // - // btn_role_info - // - this.btn_role_info.Image = global::Cyberpipe.Properties.Resources._24x24icon_05_hover1; - this.btn_role_info.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.btn_role_info.Name = "btn_role_info"; - this.btn_role_info.SubItemsExpandWidth = 14; - this.btn_role_info.Text = "角色管理"; - this.btn_role_info.Click += new System.EventHandler(this.btn_role_info_Click); - // - // btn_resc_info - // - this.btn_resc_info.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__09; - this.btn_resc_info.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.btn_resc_info.Name = "btn_resc_info"; - this.btn_resc_info.SubItemsExpandWidth = 14; - this.btn_resc_info.Text = "资源管理"; - this.btn_resc_info.Click += new System.EventHandler(this.btn_resc_info_Click); - // - // btn_role_resc - // - this.btn_role_resc.Image = global::Cyberpipe.Properties.Resources.btnlegendSet_Image_副本; - this.btn_role_resc.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.btn_role_resc.Name = "btn_role_resc"; - this.btn_role_resc.SubItemsExpandWidth = 14; - this.btn_role_resc.Text = "角色授权"; - this.btn_role_resc.Click += new System.EventHandler(this.btn_role_resc_Click); - // - // btn_user_role - // - this.btn_user_role.Image = global::Cyberpipe.Properties.Resources._24x24icon_08_hover; - this.btn_user_role.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.btn_user_role.Name = "btn_user_role"; - this.btn_user_role.SubItemsExpandWidth = 14; - this.btn_user_role.Text = "用户授权"; - this.btn_user_role.Click += new System.EventHandler(this.btn_user_role_Click); - // - // btn_password_edit - // - this.btn_password_edit.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__67; - this.btn_password_edit.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.btn_password_edit.Name = "btn_password_edit"; - this.btn_password_edit.SubItemsExpandWidth = 14; - this.btn_password_edit.Text = "密码修改"; - this.btn_password_edit.Click += new System.EventHandler(this.btn_password_edit_Click); - // - // btn_reset_password - // - this.btn_reset_password.Image = global::Cyberpipe.Properties.Resources.liuxiang; - this.btn_reset_password.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.btn_reset_password.Name = "btn_reset_password"; - this.btn_reset_password.SubItemsExpandWidth = 14; - this.btn_reset_password.Text = "重置密码"; - this.btn_reset_password.Click += new System.EventHandler(this.btn_reset_password_Click); - // // ribbonTabItem1 // this.ribbonTabItem1.ButtonStyle = DevComponents.DotNetBar.eButtonStyle.ImageAndText; @@ -6110,7 +6100,6 @@ this.ribbonTabItem7.Name = "ribbonTabItem7"; this.ribbonTabItem7.Panel = this.ribbonPanel7; this.ribbonTabItem7.Text = "标识器管理"; - this.ribbonTabItem7.Click += new System.EventHandler(this.ribbonTabItem7_Click); this.ribbonTabItem7.MouseDown += new System.Windows.Forms.MouseEventHandler(this.ribbonTabItem7_MouseDown); // // ribbonTabItem8 @@ -6428,14 +6417,27 @@ // // label1 // + this.label1.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); + this.label1.AutoEllipsis = true; this.label1.AutoSize = true; this.label1.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.label1.Image = global::Cyberpipe.Properties.Resources.user; - this.label1.Location = new System.Drawing.Point(1198, 53); + this.label1.Location = new System.Drawing.Point(1205, 51); this.label1.Name = "label1"; this.label1.Size = new System.Drawing.Size(56, 16); - this.label1.TabIndex = 28; + this.label1.TabIndex = 32; this.label1.Text = "label1"; + this.label1.TextAlign = System.Drawing.ContentAlignment.TopRight; + // + // layerTree + // + this.layerTree.CheckBoxes = true; + this.layerTree.ItemHeight = 18; + this.layerTree.Location = new System.Drawing.Point(30, 78); + this.layerTree.Name = "layerTree"; + this.layerTree.Size = new System.Drawing.Size(121, 97); + this.layerTree.TabIndex = 1; + this.layerTree.AfterCheck += new System.Windows.Forms.TreeViewEventHandler(this.layerTree_AfterCheck); // // MainFrm // @@ -6512,11 +6514,11 @@ this.ribbonControl1.ResumeLayout(false); this.ribbonControl1.PerformLayout(); this.ribbonPanel3.ResumeLayout(false); + this.ribbonPanel8.ResumeLayout(false); this.ribbonPanel2.ResumeLayout(false); this.ribbonPanel15.ResumeLayout(false); this.ribbonPanel1.ResumeLayout(false); this.ribbonPanel7.ResumeLayout(false); - this.ribbonPanel8.ResumeLayout(false); ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).EndInit(); this.ResumeLayout(false); this.PerformLayout(); diff --git a/MainFrm.resx b/MainFrm.resx index 15e5339..9d1d787 100644 --- a/MainFrm.resx +++ b/MainFrm.resx @@ -2094,7 +2094,7 @@ - 211 + 166 diff --git a/bin/x86/Debug/EMSCyberpipe.exe b/bin/x86/Debug/EMSCyberpipe.exe index c40cffc..8924ace 100644 --- a/bin/x86/Debug/EMSCyberpipe.exe +++ b/bin/x86/Debug/EMSCyberpipe.exe Binary files differ diff --git a/bin/x86/Debug/EMSCyberpipe.pdb b/bin/x86/Debug/EMSCyberpipe.pdb index eb32a47..1f02683 100644 --- a/bin/x86/Debug/EMSCyberpipe.pdb +++ b/bin/x86/Debug/EMSCyberpipe.pdb Binary files differ diff --git a/bin/x86/Debug/download/BootStrap_pdf.zip b/bin/x86/Debug/download/BootStrap_pdf.zip deleted file mode 100644 index 993e02b..0000000 --- a/bin/x86/Debug/download/BootStrap_pdf.zip +++ /dev/null Binary files differ diff --git "a/bin/x86/Debug/download/BootStrap\345\205\245\351\227\250\346\225\231\347\250\213.pdf" "b/bin/x86/Debug/download/BootStrap\345\205\245\351\227\250\346\225\231\347\250\213.pdf" deleted file mode 100644 index 7fe754a..0000000 --- "a/bin/x86/Debug/download/BootStrap\345\205\245\351\227\250\346\225\231\347\250\213.pdf" +++ /dev/null Binary files differ diff --git "a/bin/x86/Debug/download/axure7.0\346\225\231\347\250\213\050\345\233\276\346\226\207\346\241\210\344\276\213\051.pdf" "b/bin/x86/Debug/download/axure7.0\346\225\231\347\250\213\050\345\233\276\346\226\207\346\241\210\344\276\213\051.pdf" deleted file mode 100644 index 751a2a4..0000000 --- "a/bin/x86/Debug/download/axure7.0\346\225\231\347\250\213\050\345\233\276\346\226\207\346\241\210\344\276\213\051.pdf" +++ /dev/null Binary files differ diff --git a/Cyberpipe.suo b/Cyberpipe.suo index 13a1659..6abc092 100644 --- a/Cyberpipe.suo +++ b/Cyberpipe.suo Binary files differ diff --git a/FormDocumentManager.cs b/FormDocumentManager.cs index 7925e2c..1c21f81 100644 --- a/FormDocumentManager.cs +++ b/FormDocumentManager.cs @@ -395,7 +395,7 @@ private void FormDocumentManager_Load(object sender, EventArgs e) { IS_OPEN = true; - //changeCursor(); + changeCursor(); dateTime_end.Value = DateTime.Now; dateTime_begin.Value = DateTime.Now.AddDays(-6); Thread loadThread = new Thread(new ThreadStart(doFormLoad)); diff --git a/MainFrm.cs b/MainFrm.cs index e801c7e..c5b7a38 100644 --- a/MainFrm.cs +++ b/MainFrm.cs @@ -14368,17 +14368,7 @@ globeControl1.Globe.Action = EnumAction3D.TrackPolygon; } - private void ribbonTabItem7_Click(object sender, EventArgs e) - { - - } - - private void label1_Click(object sender, EventArgs e) - { - - } - - + } diff --git a/MainFrm.designer.cs b/MainFrm.designer.cs index ee6e5b6..e9b8b02 100644 --- a/MainFrm.designer.cs +++ b/MainFrm.designer.cs @@ -82,7 +82,6 @@ this.sideBar1 = new DevComponents.DotNetBar.SideBar(); this.panelEx3 = new DevComponents.DotNetBar.PanelEx(); this.layerSensorTree = new System.Windows.Forms.TreeView(); - this.layerTree = new Cyberpipe.MyTreeView(); this.sideBarPanelItem3 = new DevComponents.DotNetBar.SideBarPanelItem(); this.controlContainerItem3 = new DevComponents.DotNetBar.ControlContainerItem(); this.sideBarPanelItem4 = new DevComponents.DotNetBar.SideBarPanelItem(); @@ -372,6 +371,15 @@ this.btn_Person = new DevComponents.DotNetBar.ButtonItem(); this.btn_constructMap = new DevComponents.DotNetBar.ButtonItem(); this.buttonItem9 = new DevComponents.DotNetBar.ButtonItem(); + this.ribbonPanel8 = new DevComponents.DotNetBar.RibbonPanel(); + this.ribbonBar_UserInfo = new DevComponents.DotNetBar.RibbonBar(); + this.btn_user_info = new DevComponents.DotNetBar.ButtonItem(); + this.btn_role_info = new DevComponents.DotNetBar.ButtonItem(); + this.btn_resc_info = new DevComponents.DotNetBar.ButtonItem(); + this.btn_role_resc = new DevComponents.DotNetBar.ButtonItem(); + this.btn_user_role = new DevComponents.DotNetBar.ButtonItem(); + this.btn_password_edit = new DevComponents.DotNetBar.ButtonItem(); + this.btn_reset_password = new DevComponents.DotNetBar.ButtonItem(); this.ribbonPanel2 = new DevComponents.DotNetBar.RibbonPanel(); this.ribbonBar4 = new DevComponents.DotNetBar.RibbonBar(); this.buttonItem_TaskManager = new DevComponents.DotNetBar.ButtonItem(); @@ -556,15 +564,6 @@ this.ribbonBar5 = new DevComponents.DotNetBar.RibbonBar(); this.btn_flag = new DevComponents.DotNetBar.ButtonItem(); this.slider4ground = new DevComponents.DotNetBar.SliderItem(); - this.ribbonPanel8 = new DevComponents.DotNetBar.RibbonPanel(); - this.ribbonBar_UserInfo = new DevComponents.DotNetBar.RibbonBar(); - this.btn_user_info = new DevComponents.DotNetBar.ButtonItem(); - this.btn_role_info = new DevComponents.DotNetBar.ButtonItem(); - this.btn_resc_info = new DevComponents.DotNetBar.ButtonItem(); - this.btn_role_resc = new DevComponents.DotNetBar.ButtonItem(); - this.btn_user_role = new DevComponents.DotNetBar.ButtonItem(); - this.btn_password_edit = new DevComponents.DotNetBar.ButtonItem(); - this.btn_reset_password = new DevComponents.DotNetBar.ButtonItem(); this.ribbonTabItem1 = new DevComponents.DotNetBar.RibbonTabItem(); this.ribbonTabItem14 = new DevComponents.DotNetBar.RibbonTabItem(); this.ribbonTabItem2 = new DevComponents.DotNetBar.RibbonTabItem(); @@ -612,6 +611,7 @@ this.buttonItem75 = new DevComponents.DotNetBar.ButtonItem(); this.buttonItem76 = new DevComponents.DotNetBar.ButtonItem(); this.label1 = new System.Windows.Forms.Label(); + this.layerTree = new Cyberpipe.MyTreeView(); this.statusStrip1.SuspendLayout(); this.sideBar1.SuspendLayout(); this.panelEx3.SuspendLayout(); @@ -649,11 +649,11 @@ this.contextMenuStripDeleteLayerNode.SuspendLayout(); this.ribbonControl1.SuspendLayout(); this.ribbonPanel3.SuspendLayout(); + this.ribbonPanel8.SuspendLayout(); this.ribbonPanel2.SuspendLayout(); this.ribbonPanel15.SuspendLayout(); this.ribbonPanel1.SuspendLayout(); this.ribbonPanel7.SuspendLayout(); - this.ribbonPanel8.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).BeginInit(); this.SuspendLayout(); // @@ -1048,16 +1048,6 @@ this.layerSensorTree.AfterCheck += new System.Windows.Forms.TreeViewEventHandler(this.layerMarkerTree_AfterCheck); this.layerSensorTree.NodeMouseClick += new System.Windows.Forms.TreeNodeMouseClickEventHandler(this.layerMarkerTree_NodeMouseClick); // - // layerTree - // - this.layerTree.CheckBoxes = true; - this.layerTree.ItemHeight = 18; - this.layerTree.Location = new System.Drawing.Point(30, 78); - this.layerTree.Name = "layerTree"; - this.layerTree.Size = new System.Drawing.Size(121, 97); - this.layerTree.TabIndex = 1; - this.layerTree.AfterCheck += new System.Windows.Forms.TreeViewEventHandler(this.layerTree_AfterCheck); - // // sideBarPanelItem3 // this.sideBarPanelItem3.FontBold = true; @@ -4126,11 +4116,11 @@ this.ribbonControl1.BackgroundStyle.Class = ""; this.ribbonControl1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonControl1.Controls.Add(this.ribbonPanel3); + this.ribbonControl1.Controls.Add(this.ribbonPanel8); this.ribbonControl1.Controls.Add(this.ribbonPanel2); this.ribbonControl1.Controls.Add(this.ribbonPanel15); this.ribbonControl1.Controls.Add(this.ribbonPanel1); this.ribbonControl1.Controls.Add(this.ribbonPanel7); - this.ribbonControl1.Controls.Add(this.ribbonPanel8); this.ribbonControl1.Dock = System.Windows.Forms.DockStyle.Top; this.ribbonControl1.ImeMode = System.Windows.Forms.ImeMode.NoControl; this.ribbonControl1.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { @@ -4272,6 +4262,135 @@ this.buttonItem9.Text = "文档管理"; this.buttonItem9.Click += new System.EventHandler(this.buttonItem9_Click); // + // ribbonPanel8 + // + this.ribbonPanel8.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonPanel8.Controls.Add(this.ribbonBar_UserInfo); + this.ribbonPanel8.Dock = System.Windows.Forms.DockStyle.Fill; + this.ribbonPanel8.Location = new System.Drawing.Point(0, 0); + this.ribbonPanel8.Name = "ribbonPanel8"; + this.ribbonPanel8.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); + this.ribbonPanel8.Size = new System.Drawing.Size(1328, 95); + // + // + // + this.ribbonPanel8.Style.Class = ""; + this.ribbonPanel8.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel8.StyleMouseDown.Class = ""; + this.ribbonPanel8.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel8.StyleMouseOver.Class = ""; + this.ribbonPanel8.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonPanel8.TabIndex = 42; + this.ribbonPanel8.Visible = false; + // + // ribbonBar_UserInfo + // + this.ribbonBar_UserInfo.AutoOverflowEnabled = true; + // + // + // + this.ribbonBar_UserInfo.BackgroundMouseOverStyle.Class = ""; + this.ribbonBar_UserInfo.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar_UserInfo.BackgroundStyle.Class = ""; + this.ribbonBar_UserInfo.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar_UserInfo.ContainerControlProcessDialogKey = true; + this.ribbonBar_UserInfo.Dock = System.Windows.Forms.DockStyle.Left; + this.ribbonBar_UserInfo.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { + this.btn_user_info, + this.btn_role_info, + this.btn_resc_info, + this.btn_role_resc, + this.btn_user_role, + this.btn_password_edit, + this.btn_reset_password}); + this.ribbonBar_UserInfo.Location = new System.Drawing.Point(3, 0); + this.ribbonBar_UserInfo.Name = "ribbonBar_UserInfo"; + this.ribbonBar_UserInfo.Size = new System.Drawing.Size(427, 92); + this.ribbonBar_UserInfo.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonBar_UserInfo.TabIndex = 0; + // + // + // + this.ribbonBar_UserInfo.TitleStyle.Class = ""; + this.ribbonBar_UserInfo.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar_UserInfo.TitleStyleMouseOver.Class = ""; + this.ribbonBar_UserInfo.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // btn_user_info + // + this.btn_user_info.Image = global::Cyberpipe.Properties.Resources._24x24icon_13_hover; + this.btn_user_info.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.btn_user_info.Name = "btn_user_info"; + this.btn_user_info.SubItemsExpandWidth = 14; + this.btn_user_info.Text = "用户管理"; + this.btn_user_info.Click += new System.EventHandler(this.btn_user_info_Click); + // + // btn_role_info + // + this.btn_role_info.Image = global::Cyberpipe.Properties.Resources._24x24icon_05_hover1; + this.btn_role_info.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.btn_role_info.Name = "btn_role_info"; + this.btn_role_info.SubItemsExpandWidth = 14; + this.btn_role_info.Text = "角色管理"; + this.btn_role_info.Click += new System.EventHandler(this.btn_role_info_Click); + // + // btn_resc_info + // + this.btn_resc_info.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__09; + this.btn_resc_info.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.btn_resc_info.Name = "btn_resc_info"; + this.btn_resc_info.SubItemsExpandWidth = 14; + this.btn_resc_info.Text = "资源管理"; + this.btn_resc_info.Click += new System.EventHandler(this.btn_resc_info_Click); + // + // btn_role_resc + // + this.btn_role_resc.Image = global::Cyberpipe.Properties.Resources.btnlegendSet_Image_副本; + this.btn_role_resc.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.btn_role_resc.Name = "btn_role_resc"; + this.btn_role_resc.SubItemsExpandWidth = 14; + this.btn_role_resc.Text = "角色授权"; + this.btn_role_resc.Click += new System.EventHandler(this.btn_role_resc_Click); + // + // btn_user_role + // + this.btn_user_role.Image = global::Cyberpipe.Properties.Resources._24x24icon_08_hover; + this.btn_user_role.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.btn_user_role.Name = "btn_user_role"; + this.btn_user_role.SubItemsExpandWidth = 14; + this.btn_user_role.Text = "用户授权"; + this.btn_user_role.Click += new System.EventHandler(this.btn_user_role_Click); + // + // btn_password_edit + // + this.btn_password_edit.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__67; + this.btn_password_edit.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.btn_password_edit.Name = "btn_password_edit"; + this.btn_password_edit.SubItemsExpandWidth = 14; + this.btn_password_edit.Text = "密码修改"; + this.btn_password_edit.Click += new System.EventHandler(this.btn_password_edit_Click); + // + // btn_reset_password + // + this.btn_reset_password.Image = global::Cyberpipe.Properties.Resources.liuxiang; + this.btn_reset_password.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.btn_reset_password.Name = "btn_reset_password"; + this.btn_reset_password.SubItemsExpandWidth = 14; + this.btn_reset_password.Text = "重置密码"; + this.btn_reset_password.Click += new System.EventHandler(this.btn_reset_password_Click); + // // ribbonPanel2 // this.ribbonPanel2.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -5931,135 +6050,6 @@ this.slider4ground.Value = 0; this.slider4ground.ValueChanged += new System.EventHandler(this.slider4ground_ValueChanged); // - // ribbonPanel8 - // - this.ribbonPanel8.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonPanel8.Controls.Add(this.ribbonBar_UserInfo); - this.ribbonPanel8.Dock = System.Windows.Forms.DockStyle.Fill; - this.ribbonPanel8.Location = new System.Drawing.Point(0, 0); - this.ribbonPanel8.Name = "ribbonPanel8"; - this.ribbonPanel8.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); - this.ribbonPanel8.Size = new System.Drawing.Size(1328, 95); - // - // - // - this.ribbonPanel8.Style.Class = ""; - this.ribbonPanel8.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel8.StyleMouseDown.Class = ""; - this.ribbonPanel8.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel8.StyleMouseOver.Class = ""; - this.ribbonPanel8.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonPanel8.TabIndex = 42; - this.ribbonPanel8.Visible = false; - // - // ribbonBar_UserInfo - // - this.ribbonBar_UserInfo.AutoOverflowEnabled = true; - // - // - // - this.ribbonBar_UserInfo.BackgroundMouseOverStyle.Class = ""; - this.ribbonBar_UserInfo.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar_UserInfo.BackgroundStyle.Class = ""; - this.ribbonBar_UserInfo.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar_UserInfo.ContainerControlProcessDialogKey = true; - this.ribbonBar_UserInfo.Dock = System.Windows.Forms.DockStyle.Left; - this.ribbonBar_UserInfo.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { - this.btn_user_info, - this.btn_role_info, - this.btn_resc_info, - this.btn_role_resc, - this.btn_user_role, - this.btn_password_edit, - this.btn_reset_password}); - this.ribbonBar_UserInfo.Location = new System.Drawing.Point(3, 0); - this.ribbonBar_UserInfo.Name = "ribbonBar_UserInfo"; - this.ribbonBar_UserInfo.Size = new System.Drawing.Size(427, 92); - this.ribbonBar_UserInfo.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonBar_UserInfo.TabIndex = 0; - // - // - // - this.ribbonBar_UserInfo.TitleStyle.Class = ""; - this.ribbonBar_UserInfo.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar_UserInfo.TitleStyleMouseOver.Class = ""; - this.ribbonBar_UserInfo.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // btn_user_info - // - this.btn_user_info.Image = global::Cyberpipe.Properties.Resources._24x24icon_13_hover; - this.btn_user_info.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.btn_user_info.Name = "btn_user_info"; - this.btn_user_info.SubItemsExpandWidth = 14; - this.btn_user_info.Text = "用户管理"; - this.btn_user_info.Click += new System.EventHandler(this.btn_user_info_Click); - // - // btn_role_info - // - this.btn_role_info.Image = global::Cyberpipe.Properties.Resources._24x24icon_05_hover1; - this.btn_role_info.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.btn_role_info.Name = "btn_role_info"; - this.btn_role_info.SubItemsExpandWidth = 14; - this.btn_role_info.Text = "角色管理"; - this.btn_role_info.Click += new System.EventHandler(this.btn_role_info_Click); - // - // btn_resc_info - // - this.btn_resc_info.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__09; - this.btn_resc_info.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.btn_resc_info.Name = "btn_resc_info"; - this.btn_resc_info.SubItemsExpandWidth = 14; - this.btn_resc_info.Text = "资源管理"; - this.btn_resc_info.Click += new System.EventHandler(this.btn_resc_info_Click); - // - // btn_role_resc - // - this.btn_role_resc.Image = global::Cyberpipe.Properties.Resources.btnlegendSet_Image_副本; - this.btn_role_resc.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.btn_role_resc.Name = "btn_role_resc"; - this.btn_role_resc.SubItemsExpandWidth = 14; - this.btn_role_resc.Text = "角色授权"; - this.btn_role_resc.Click += new System.EventHandler(this.btn_role_resc_Click); - // - // btn_user_role - // - this.btn_user_role.Image = global::Cyberpipe.Properties.Resources._24x24icon_08_hover; - this.btn_user_role.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.btn_user_role.Name = "btn_user_role"; - this.btn_user_role.SubItemsExpandWidth = 14; - this.btn_user_role.Text = "用户授权"; - this.btn_user_role.Click += new System.EventHandler(this.btn_user_role_Click); - // - // btn_password_edit - // - this.btn_password_edit.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__67; - this.btn_password_edit.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.btn_password_edit.Name = "btn_password_edit"; - this.btn_password_edit.SubItemsExpandWidth = 14; - this.btn_password_edit.Text = "密码修改"; - this.btn_password_edit.Click += new System.EventHandler(this.btn_password_edit_Click); - // - // btn_reset_password - // - this.btn_reset_password.Image = global::Cyberpipe.Properties.Resources.liuxiang; - this.btn_reset_password.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.btn_reset_password.Name = "btn_reset_password"; - this.btn_reset_password.SubItemsExpandWidth = 14; - this.btn_reset_password.Text = "重置密码"; - this.btn_reset_password.Click += new System.EventHandler(this.btn_reset_password_Click); - // // ribbonTabItem1 // this.ribbonTabItem1.ButtonStyle = DevComponents.DotNetBar.eButtonStyle.ImageAndText; @@ -6110,7 +6100,6 @@ this.ribbonTabItem7.Name = "ribbonTabItem7"; this.ribbonTabItem7.Panel = this.ribbonPanel7; this.ribbonTabItem7.Text = "标识器管理"; - this.ribbonTabItem7.Click += new System.EventHandler(this.ribbonTabItem7_Click); this.ribbonTabItem7.MouseDown += new System.Windows.Forms.MouseEventHandler(this.ribbonTabItem7_MouseDown); // // ribbonTabItem8 @@ -6428,14 +6417,27 @@ // // label1 // + this.label1.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); + this.label1.AutoEllipsis = true; this.label1.AutoSize = true; this.label1.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.label1.Image = global::Cyberpipe.Properties.Resources.user; - this.label1.Location = new System.Drawing.Point(1198, 53); + this.label1.Location = new System.Drawing.Point(1205, 51); this.label1.Name = "label1"; this.label1.Size = new System.Drawing.Size(56, 16); - this.label1.TabIndex = 28; + this.label1.TabIndex = 32; this.label1.Text = "label1"; + this.label1.TextAlign = System.Drawing.ContentAlignment.TopRight; + // + // layerTree + // + this.layerTree.CheckBoxes = true; + this.layerTree.ItemHeight = 18; + this.layerTree.Location = new System.Drawing.Point(30, 78); + this.layerTree.Name = "layerTree"; + this.layerTree.Size = new System.Drawing.Size(121, 97); + this.layerTree.TabIndex = 1; + this.layerTree.AfterCheck += new System.Windows.Forms.TreeViewEventHandler(this.layerTree_AfterCheck); // // MainFrm // @@ -6512,11 +6514,11 @@ this.ribbonControl1.ResumeLayout(false); this.ribbonControl1.PerformLayout(); this.ribbonPanel3.ResumeLayout(false); + this.ribbonPanel8.ResumeLayout(false); this.ribbonPanel2.ResumeLayout(false); this.ribbonPanel15.ResumeLayout(false); this.ribbonPanel1.ResumeLayout(false); this.ribbonPanel7.ResumeLayout(false); - this.ribbonPanel8.ResumeLayout(false); ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).EndInit(); this.ResumeLayout(false); this.PerformLayout(); diff --git a/MainFrm.resx b/MainFrm.resx index 15e5339..9d1d787 100644 --- a/MainFrm.resx +++ b/MainFrm.resx @@ -2094,7 +2094,7 @@ - 211 + 166 diff --git a/bin/x86/Debug/EMSCyberpipe.exe b/bin/x86/Debug/EMSCyberpipe.exe index c40cffc..8924ace 100644 --- a/bin/x86/Debug/EMSCyberpipe.exe +++ b/bin/x86/Debug/EMSCyberpipe.exe Binary files differ diff --git a/bin/x86/Debug/EMSCyberpipe.pdb b/bin/x86/Debug/EMSCyberpipe.pdb index eb32a47..1f02683 100644 --- a/bin/x86/Debug/EMSCyberpipe.pdb +++ b/bin/x86/Debug/EMSCyberpipe.pdb Binary files differ diff --git a/bin/x86/Debug/download/BootStrap_pdf.zip b/bin/x86/Debug/download/BootStrap_pdf.zip deleted file mode 100644 index 993e02b..0000000 --- a/bin/x86/Debug/download/BootStrap_pdf.zip +++ /dev/null Binary files differ diff --git "a/bin/x86/Debug/download/BootStrap\345\205\245\351\227\250\346\225\231\347\250\213.pdf" "b/bin/x86/Debug/download/BootStrap\345\205\245\351\227\250\346\225\231\347\250\213.pdf" deleted file mode 100644 index 7fe754a..0000000 --- "a/bin/x86/Debug/download/BootStrap\345\205\245\351\227\250\346\225\231\347\250\213.pdf" +++ /dev/null Binary files differ diff --git "a/bin/x86/Debug/download/axure7.0\346\225\231\347\250\213\050\345\233\276\346\226\207\346\241\210\344\276\213\051.pdf" "b/bin/x86/Debug/download/axure7.0\346\225\231\347\250\213\050\345\233\276\346\226\207\346\241\210\344\276\213\051.pdf" deleted file mode 100644 index 751a2a4..0000000 --- "a/bin/x86/Debug/download/axure7.0\346\225\231\347\250\213\050\345\233\276\346\226\207\346\241\210\344\276\213\051.pdf" +++ /dev/null Binary files differ diff --git a/bin/x86/Debug/download/temp.xlsx b/bin/x86/Debug/download/temp.xlsx deleted file mode 100644 index 5ccf6c9..0000000 --- a/bin/x86/Debug/download/temp.xlsx +++ /dev/null Binary files differ diff --git a/Cyberpipe.suo b/Cyberpipe.suo index 13a1659..6abc092 100644 --- a/Cyberpipe.suo +++ b/Cyberpipe.suo Binary files differ diff --git a/FormDocumentManager.cs b/FormDocumentManager.cs index 7925e2c..1c21f81 100644 --- a/FormDocumentManager.cs +++ b/FormDocumentManager.cs @@ -395,7 +395,7 @@ private void FormDocumentManager_Load(object sender, EventArgs e) { IS_OPEN = true; - //changeCursor(); + changeCursor(); dateTime_end.Value = DateTime.Now; dateTime_begin.Value = DateTime.Now.AddDays(-6); Thread loadThread = new Thread(new ThreadStart(doFormLoad)); diff --git a/MainFrm.cs b/MainFrm.cs index e801c7e..c5b7a38 100644 --- a/MainFrm.cs +++ b/MainFrm.cs @@ -14368,17 +14368,7 @@ globeControl1.Globe.Action = EnumAction3D.TrackPolygon; } - private void ribbonTabItem7_Click(object sender, EventArgs e) - { - - } - - private void label1_Click(object sender, EventArgs e) - { - - } - - + } diff --git a/MainFrm.designer.cs b/MainFrm.designer.cs index ee6e5b6..e9b8b02 100644 --- a/MainFrm.designer.cs +++ b/MainFrm.designer.cs @@ -82,7 +82,6 @@ this.sideBar1 = new DevComponents.DotNetBar.SideBar(); this.panelEx3 = new DevComponents.DotNetBar.PanelEx(); this.layerSensorTree = new System.Windows.Forms.TreeView(); - this.layerTree = new Cyberpipe.MyTreeView(); this.sideBarPanelItem3 = new DevComponents.DotNetBar.SideBarPanelItem(); this.controlContainerItem3 = new DevComponents.DotNetBar.ControlContainerItem(); this.sideBarPanelItem4 = new DevComponents.DotNetBar.SideBarPanelItem(); @@ -372,6 +371,15 @@ this.btn_Person = new DevComponents.DotNetBar.ButtonItem(); this.btn_constructMap = new DevComponents.DotNetBar.ButtonItem(); this.buttonItem9 = new DevComponents.DotNetBar.ButtonItem(); + this.ribbonPanel8 = new DevComponents.DotNetBar.RibbonPanel(); + this.ribbonBar_UserInfo = new DevComponents.DotNetBar.RibbonBar(); + this.btn_user_info = new DevComponents.DotNetBar.ButtonItem(); + this.btn_role_info = new DevComponents.DotNetBar.ButtonItem(); + this.btn_resc_info = new DevComponents.DotNetBar.ButtonItem(); + this.btn_role_resc = new DevComponents.DotNetBar.ButtonItem(); + this.btn_user_role = new DevComponents.DotNetBar.ButtonItem(); + this.btn_password_edit = new DevComponents.DotNetBar.ButtonItem(); + this.btn_reset_password = new DevComponents.DotNetBar.ButtonItem(); this.ribbonPanel2 = new DevComponents.DotNetBar.RibbonPanel(); this.ribbonBar4 = new DevComponents.DotNetBar.RibbonBar(); this.buttonItem_TaskManager = new DevComponents.DotNetBar.ButtonItem(); @@ -556,15 +564,6 @@ this.ribbonBar5 = new DevComponents.DotNetBar.RibbonBar(); this.btn_flag = new DevComponents.DotNetBar.ButtonItem(); this.slider4ground = new DevComponents.DotNetBar.SliderItem(); - this.ribbonPanel8 = new DevComponents.DotNetBar.RibbonPanel(); - this.ribbonBar_UserInfo = new DevComponents.DotNetBar.RibbonBar(); - this.btn_user_info = new DevComponents.DotNetBar.ButtonItem(); - this.btn_role_info = new DevComponents.DotNetBar.ButtonItem(); - this.btn_resc_info = new DevComponents.DotNetBar.ButtonItem(); - this.btn_role_resc = new DevComponents.DotNetBar.ButtonItem(); - this.btn_user_role = new DevComponents.DotNetBar.ButtonItem(); - this.btn_password_edit = new DevComponents.DotNetBar.ButtonItem(); - this.btn_reset_password = new DevComponents.DotNetBar.ButtonItem(); this.ribbonTabItem1 = new DevComponents.DotNetBar.RibbonTabItem(); this.ribbonTabItem14 = new DevComponents.DotNetBar.RibbonTabItem(); this.ribbonTabItem2 = new DevComponents.DotNetBar.RibbonTabItem(); @@ -612,6 +611,7 @@ this.buttonItem75 = new DevComponents.DotNetBar.ButtonItem(); this.buttonItem76 = new DevComponents.DotNetBar.ButtonItem(); this.label1 = new System.Windows.Forms.Label(); + this.layerTree = new Cyberpipe.MyTreeView(); this.statusStrip1.SuspendLayout(); this.sideBar1.SuspendLayout(); this.panelEx3.SuspendLayout(); @@ -649,11 +649,11 @@ this.contextMenuStripDeleteLayerNode.SuspendLayout(); this.ribbonControl1.SuspendLayout(); this.ribbonPanel3.SuspendLayout(); + this.ribbonPanel8.SuspendLayout(); this.ribbonPanel2.SuspendLayout(); this.ribbonPanel15.SuspendLayout(); this.ribbonPanel1.SuspendLayout(); this.ribbonPanel7.SuspendLayout(); - this.ribbonPanel8.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).BeginInit(); this.SuspendLayout(); // @@ -1048,16 +1048,6 @@ this.layerSensorTree.AfterCheck += new System.Windows.Forms.TreeViewEventHandler(this.layerMarkerTree_AfterCheck); this.layerSensorTree.NodeMouseClick += new System.Windows.Forms.TreeNodeMouseClickEventHandler(this.layerMarkerTree_NodeMouseClick); // - // layerTree - // - this.layerTree.CheckBoxes = true; - this.layerTree.ItemHeight = 18; - this.layerTree.Location = new System.Drawing.Point(30, 78); - this.layerTree.Name = "layerTree"; - this.layerTree.Size = new System.Drawing.Size(121, 97); - this.layerTree.TabIndex = 1; - this.layerTree.AfterCheck += new System.Windows.Forms.TreeViewEventHandler(this.layerTree_AfterCheck); - // // sideBarPanelItem3 // this.sideBarPanelItem3.FontBold = true; @@ -4126,11 +4116,11 @@ this.ribbonControl1.BackgroundStyle.Class = ""; this.ribbonControl1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonControl1.Controls.Add(this.ribbonPanel3); + this.ribbonControl1.Controls.Add(this.ribbonPanel8); this.ribbonControl1.Controls.Add(this.ribbonPanel2); this.ribbonControl1.Controls.Add(this.ribbonPanel15); this.ribbonControl1.Controls.Add(this.ribbonPanel1); this.ribbonControl1.Controls.Add(this.ribbonPanel7); - this.ribbonControl1.Controls.Add(this.ribbonPanel8); this.ribbonControl1.Dock = System.Windows.Forms.DockStyle.Top; this.ribbonControl1.ImeMode = System.Windows.Forms.ImeMode.NoControl; this.ribbonControl1.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { @@ -4272,6 +4262,135 @@ this.buttonItem9.Text = "文档管理"; this.buttonItem9.Click += new System.EventHandler(this.buttonItem9_Click); // + // ribbonPanel8 + // + this.ribbonPanel8.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonPanel8.Controls.Add(this.ribbonBar_UserInfo); + this.ribbonPanel8.Dock = System.Windows.Forms.DockStyle.Fill; + this.ribbonPanel8.Location = new System.Drawing.Point(0, 0); + this.ribbonPanel8.Name = "ribbonPanel8"; + this.ribbonPanel8.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); + this.ribbonPanel8.Size = new System.Drawing.Size(1328, 95); + // + // + // + this.ribbonPanel8.Style.Class = ""; + this.ribbonPanel8.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel8.StyleMouseDown.Class = ""; + this.ribbonPanel8.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel8.StyleMouseOver.Class = ""; + this.ribbonPanel8.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonPanel8.TabIndex = 42; + this.ribbonPanel8.Visible = false; + // + // ribbonBar_UserInfo + // + this.ribbonBar_UserInfo.AutoOverflowEnabled = true; + // + // + // + this.ribbonBar_UserInfo.BackgroundMouseOverStyle.Class = ""; + this.ribbonBar_UserInfo.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar_UserInfo.BackgroundStyle.Class = ""; + this.ribbonBar_UserInfo.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar_UserInfo.ContainerControlProcessDialogKey = true; + this.ribbonBar_UserInfo.Dock = System.Windows.Forms.DockStyle.Left; + this.ribbonBar_UserInfo.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { + this.btn_user_info, + this.btn_role_info, + this.btn_resc_info, + this.btn_role_resc, + this.btn_user_role, + this.btn_password_edit, + this.btn_reset_password}); + this.ribbonBar_UserInfo.Location = new System.Drawing.Point(3, 0); + this.ribbonBar_UserInfo.Name = "ribbonBar_UserInfo"; + this.ribbonBar_UserInfo.Size = new System.Drawing.Size(427, 92); + this.ribbonBar_UserInfo.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonBar_UserInfo.TabIndex = 0; + // + // + // + this.ribbonBar_UserInfo.TitleStyle.Class = ""; + this.ribbonBar_UserInfo.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar_UserInfo.TitleStyleMouseOver.Class = ""; + this.ribbonBar_UserInfo.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // btn_user_info + // + this.btn_user_info.Image = global::Cyberpipe.Properties.Resources._24x24icon_13_hover; + this.btn_user_info.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.btn_user_info.Name = "btn_user_info"; + this.btn_user_info.SubItemsExpandWidth = 14; + this.btn_user_info.Text = "用户管理"; + this.btn_user_info.Click += new System.EventHandler(this.btn_user_info_Click); + // + // btn_role_info + // + this.btn_role_info.Image = global::Cyberpipe.Properties.Resources._24x24icon_05_hover1; + this.btn_role_info.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.btn_role_info.Name = "btn_role_info"; + this.btn_role_info.SubItemsExpandWidth = 14; + this.btn_role_info.Text = "角色管理"; + this.btn_role_info.Click += new System.EventHandler(this.btn_role_info_Click); + // + // btn_resc_info + // + this.btn_resc_info.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__09; + this.btn_resc_info.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.btn_resc_info.Name = "btn_resc_info"; + this.btn_resc_info.SubItemsExpandWidth = 14; + this.btn_resc_info.Text = "资源管理"; + this.btn_resc_info.Click += new System.EventHandler(this.btn_resc_info_Click); + // + // btn_role_resc + // + this.btn_role_resc.Image = global::Cyberpipe.Properties.Resources.btnlegendSet_Image_副本; + this.btn_role_resc.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.btn_role_resc.Name = "btn_role_resc"; + this.btn_role_resc.SubItemsExpandWidth = 14; + this.btn_role_resc.Text = "角色授权"; + this.btn_role_resc.Click += new System.EventHandler(this.btn_role_resc_Click); + // + // btn_user_role + // + this.btn_user_role.Image = global::Cyberpipe.Properties.Resources._24x24icon_08_hover; + this.btn_user_role.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.btn_user_role.Name = "btn_user_role"; + this.btn_user_role.SubItemsExpandWidth = 14; + this.btn_user_role.Text = "用户授权"; + this.btn_user_role.Click += new System.EventHandler(this.btn_user_role_Click); + // + // btn_password_edit + // + this.btn_password_edit.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__67; + this.btn_password_edit.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.btn_password_edit.Name = "btn_password_edit"; + this.btn_password_edit.SubItemsExpandWidth = 14; + this.btn_password_edit.Text = "密码修改"; + this.btn_password_edit.Click += new System.EventHandler(this.btn_password_edit_Click); + // + // btn_reset_password + // + this.btn_reset_password.Image = global::Cyberpipe.Properties.Resources.liuxiang; + this.btn_reset_password.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.btn_reset_password.Name = "btn_reset_password"; + this.btn_reset_password.SubItemsExpandWidth = 14; + this.btn_reset_password.Text = "重置密码"; + this.btn_reset_password.Click += new System.EventHandler(this.btn_reset_password_Click); + // // ribbonPanel2 // this.ribbonPanel2.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -5931,135 +6050,6 @@ this.slider4ground.Value = 0; this.slider4ground.ValueChanged += new System.EventHandler(this.slider4ground_ValueChanged); // - // ribbonPanel8 - // - this.ribbonPanel8.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonPanel8.Controls.Add(this.ribbonBar_UserInfo); - this.ribbonPanel8.Dock = System.Windows.Forms.DockStyle.Fill; - this.ribbonPanel8.Location = new System.Drawing.Point(0, 0); - this.ribbonPanel8.Name = "ribbonPanel8"; - this.ribbonPanel8.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); - this.ribbonPanel8.Size = new System.Drawing.Size(1328, 95); - // - // - // - this.ribbonPanel8.Style.Class = ""; - this.ribbonPanel8.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel8.StyleMouseDown.Class = ""; - this.ribbonPanel8.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel8.StyleMouseOver.Class = ""; - this.ribbonPanel8.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonPanel8.TabIndex = 42; - this.ribbonPanel8.Visible = false; - // - // ribbonBar_UserInfo - // - this.ribbonBar_UserInfo.AutoOverflowEnabled = true; - // - // - // - this.ribbonBar_UserInfo.BackgroundMouseOverStyle.Class = ""; - this.ribbonBar_UserInfo.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar_UserInfo.BackgroundStyle.Class = ""; - this.ribbonBar_UserInfo.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar_UserInfo.ContainerControlProcessDialogKey = true; - this.ribbonBar_UserInfo.Dock = System.Windows.Forms.DockStyle.Left; - this.ribbonBar_UserInfo.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { - this.btn_user_info, - this.btn_role_info, - this.btn_resc_info, - this.btn_role_resc, - this.btn_user_role, - this.btn_password_edit, - this.btn_reset_password}); - this.ribbonBar_UserInfo.Location = new System.Drawing.Point(3, 0); - this.ribbonBar_UserInfo.Name = "ribbonBar_UserInfo"; - this.ribbonBar_UserInfo.Size = new System.Drawing.Size(427, 92); - this.ribbonBar_UserInfo.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonBar_UserInfo.TabIndex = 0; - // - // - // - this.ribbonBar_UserInfo.TitleStyle.Class = ""; - this.ribbonBar_UserInfo.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar_UserInfo.TitleStyleMouseOver.Class = ""; - this.ribbonBar_UserInfo.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // btn_user_info - // - this.btn_user_info.Image = global::Cyberpipe.Properties.Resources._24x24icon_13_hover; - this.btn_user_info.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.btn_user_info.Name = "btn_user_info"; - this.btn_user_info.SubItemsExpandWidth = 14; - this.btn_user_info.Text = "用户管理"; - this.btn_user_info.Click += new System.EventHandler(this.btn_user_info_Click); - // - // btn_role_info - // - this.btn_role_info.Image = global::Cyberpipe.Properties.Resources._24x24icon_05_hover1; - this.btn_role_info.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.btn_role_info.Name = "btn_role_info"; - this.btn_role_info.SubItemsExpandWidth = 14; - this.btn_role_info.Text = "角色管理"; - this.btn_role_info.Click += new System.EventHandler(this.btn_role_info_Click); - // - // btn_resc_info - // - this.btn_resc_info.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__09; - this.btn_resc_info.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.btn_resc_info.Name = "btn_resc_info"; - this.btn_resc_info.SubItemsExpandWidth = 14; - this.btn_resc_info.Text = "资源管理"; - this.btn_resc_info.Click += new System.EventHandler(this.btn_resc_info_Click); - // - // btn_role_resc - // - this.btn_role_resc.Image = global::Cyberpipe.Properties.Resources.btnlegendSet_Image_副本; - this.btn_role_resc.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.btn_role_resc.Name = "btn_role_resc"; - this.btn_role_resc.SubItemsExpandWidth = 14; - this.btn_role_resc.Text = "角色授权"; - this.btn_role_resc.Click += new System.EventHandler(this.btn_role_resc_Click); - // - // btn_user_role - // - this.btn_user_role.Image = global::Cyberpipe.Properties.Resources._24x24icon_08_hover; - this.btn_user_role.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.btn_user_role.Name = "btn_user_role"; - this.btn_user_role.SubItemsExpandWidth = 14; - this.btn_user_role.Text = "用户授权"; - this.btn_user_role.Click += new System.EventHandler(this.btn_user_role_Click); - // - // btn_password_edit - // - this.btn_password_edit.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__67; - this.btn_password_edit.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.btn_password_edit.Name = "btn_password_edit"; - this.btn_password_edit.SubItemsExpandWidth = 14; - this.btn_password_edit.Text = "密码修改"; - this.btn_password_edit.Click += new System.EventHandler(this.btn_password_edit_Click); - // - // btn_reset_password - // - this.btn_reset_password.Image = global::Cyberpipe.Properties.Resources.liuxiang; - this.btn_reset_password.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.btn_reset_password.Name = "btn_reset_password"; - this.btn_reset_password.SubItemsExpandWidth = 14; - this.btn_reset_password.Text = "重置密码"; - this.btn_reset_password.Click += new System.EventHandler(this.btn_reset_password_Click); - // // ribbonTabItem1 // this.ribbonTabItem1.ButtonStyle = DevComponents.DotNetBar.eButtonStyle.ImageAndText; @@ -6110,7 +6100,6 @@ this.ribbonTabItem7.Name = "ribbonTabItem7"; this.ribbonTabItem7.Panel = this.ribbonPanel7; this.ribbonTabItem7.Text = "标识器管理"; - this.ribbonTabItem7.Click += new System.EventHandler(this.ribbonTabItem7_Click); this.ribbonTabItem7.MouseDown += new System.Windows.Forms.MouseEventHandler(this.ribbonTabItem7_MouseDown); // // ribbonTabItem8 @@ -6428,14 +6417,27 @@ // // label1 // + this.label1.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); + this.label1.AutoEllipsis = true; this.label1.AutoSize = true; this.label1.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.label1.Image = global::Cyberpipe.Properties.Resources.user; - this.label1.Location = new System.Drawing.Point(1198, 53); + this.label1.Location = new System.Drawing.Point(1205, 51); this.label1.Name = "label1"; this.label1.Size = new System.Drawing.Size(56, 16); - this.label1.TabIndex = 28; + this.label1.TabIndex = 32; this.label1.Text = "label1"; + this.label1.TextAlign = System.Drawing.ContentAlignment.TopRight; + // + // layerTree + // + this.layerTree.CheckBoxes = true; + this.layerTree.ItemHeight = 18; + this.layerTree.Location = new System.Drawing.Point(30, 78); + this.layerTree.Name = "layerTree"; + this.layerTree.Size = new System.Drawing.Size(121, 97); + this.layerTree.TabIndex = 1; + this.layerTree.AfterCheck += new System.Windows.Forms.TreeViewEventHandler(this.layerTree_AfterCheck); // // MainFrm // @@ -6512,11 +6514,11 @@ this.ribbonControl1.ResumeLayout(false); this.ribbonControl1.PerformLayout(); this.ribbonPanel3.ResumeLayout(false); + this.ribbonPanel8.ResumeLayout(false); this.ribbonPanel2.ResumeLayout(false); this.ribbonPanel15.ResumeLayout(false); this.ribbonPanel1.ResumeLayout(false); this.ribbonPanel7.ResumeLayout(false); - this.ribbonPanel8.ResumeLayout(false); ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).EndInit(); this.ResumeLayout(false); this.PerformLayout(); diff --git a/MainFrm.resx b/MainFrm.resx index 15e5339..9d1d787 100644 --- a/MainFrm.resx +++ b/MainFrm.resx @@ -2094,7 +2094,7 @@ - 211 + 166 diff --git a/bin/x86/Debug/EMSCyberpipe.exe b/bin/x86/Debug/EMSCyberpipe.exe index c40cffc..8924ace 100644 --- a/bin/x86/Debug/EMSCyberpipe.exe +++ b/bin/x86/Debug/EMSCyberpipe.exe Binary files differ diff --git a/bin/x86/Debug/EMSCyberpipe.pdb b/bin/x86/Debug/EMSCyberpipe.pdb index eb32a47..1f02683 100644 --- a/bin/x86/Debug/EMSCyberpipe.pdb +++ b/bin/x86/Debug/EMSCyberpipe.pdb Binary files differ diff --git a/bin/x86/Debug/download/BootStrap_pdf.zip b/bin/x86/Debug/download/BootStrap_pdf.zip deleted file mode 100644 index 993e02b..0000000 --- a/bin/x86/Debug/download/BootStrap_pdf.zip +++ /dev/null Binary files differ diff --git "a/bin/x86/Debug/download/BootStrap\345\205\245\351\227\250\346\225\231\347\250\213.pdf" "b/bin/x86/Debug/download/BootStrap\345\205\245\351\227\250\346\225\231\347\250\213.pdf" deleted file mode 100644 index 7fe754a..0000000 --- "a/bin/x86/Debug/download/BootStrap\345\205\245\351\227\250\346\225\231\347\250\213.pdf" +++ /dev/null Binary files differ diff --git "a/bin/x86/Debug/download/axure7.0\346\225\231\347\250\213\050\345\233\276\346\226\207\346\241\210\344\276\213\051.pdf" "b/bin/x86/Debug/download/axure7.0\346\225\231\347\250\213\050\345\233\276\346\226\207\346\241\210\344\276\213\051.pdf" deleted file mode 100644 index 751a2a4..0000000 --- "a/bin/x86/Debug/download/axure7.0\346\225\231\347\250\213\050\345\233\276\346\226\207\346\241\210\344\276\213\051.pdf" +++ /dev/null Binary files differ diff --git a/bin/x86/Debug/download/temp.xlsx b/bin/x86/Debug/download/temp.xlsx deleted file mode 100644 index 5ccf6c9..0000000 --- a/bin/x86/Debug/download/temp.xlsx +++ /dev/null Binary files differ diff --git a/obj/x86/Debug/DesignTimeResolveAssemblyReferences.cache b/obj/x86/Debug/DesignTimeResolveAssemblyReferences.cache index 2b22f93..2aff211 100644 --- a/obj/x86/Debug/DesignTimeResolveAssemblyReferences.cache +++ b/obj/x86/Debug/DesignTimeResolveAssemblyReferences.cache Binary files differ diff --git a/Cyberpipe.suo b/Cyberpipe.suo index 13a1659..6abc092 100644 --- a/Cyberpipe.suo +++ b/Cyberpipe.suo Binary files differ diff --git a/FormDocumentManager.cs b/FormDocumentManager.cs index 7925e2c..1c21f81 100644 --- a/FormDocumentManager.cs +++ b/FormDocumentManager.cs @@ -395,7 +395,7 @@ private void FormDocumentManager_Load(object sender, EventArgs e) { IS_OPEN = true; - //changeCursor(); + changeCursor(); dateTime_end.Value = DateTime.Now; dateTime_begin.Value = DateTime.Now.AddDays(-6); Thread loadThread = new Thread(new ThreadStart(doFormLoad)); diff --git a/MainFrm.cs b/MainFrm.cs index e801c7e..c5b7a38 100644 --- a/MainFrm.cs +++ b/MainFrm.cs @@ -14368,17 +14368,7 @@ globeControl1.Globe.Action = EnumAction3D.TrackPolygon; } - private void ribbonTabItem7_Click(object sender, EventArgs e) - { - - } - - private void label1_Click(object sender, EventArgs e) - { - - } - - + } diff --git a/MainFrm.designer.cs b/MainFrm.designer.cs index ee6e5b6..e9b8b02 100644 --- a/MainFrm.designer.cs +++ b/MainFrm.designer.cs @@ -82,7 +82,6 @@ this.sideBar1 = new DevComponents.DotNetBar.SideBar(); this.panelEx3 = new DevComponents.DotNetBar.PanelEx(); this.layerSensorTree = new System.Windows.Forms.TreeView(); - this.layerTree = new Cyberpipe.MyTreeView(); this.sideBarPanelItem3 = new DevComponents.DotNetBar.SideBarPanelItem(); this.controlContainerItem3 = new DevComponents.DotNetBar.ControlContainerItem(); this.sideBarPanelItem4 = new DevComponents.DotNetBar.SideBarPanelItem(); @@ -372,6 +371,15 @@ this.btn_Person = new DevComponents.DotNetBar.ButtonItem(); this.btn_constructMap = new DevComponents.DotNetBar.ButtonItem(); this.buttonItem9 = new DevComponents.DotNetBar.ButtonItem(); + this.ribbonPanel8 = new DevComponents.DotNetBar.RibbonPanel(); + this.ribbonBar_UserInfo = new DevComponents.DotNetBar.RibbonBar(); + this.btn_user_info = new DevComponents.DotNetBar.ButtonItem(); + this.btn_role_info = new DevComponents.DotNetBar.ButtonItem(); + this.btn_resc_info = new DevComponents.DotNetBar.ButtonItem(); + this.btn_role_resc = new DevComponents.DotNetBar.ButtonItem(); + this.btn_user_role = new DevComponents.DotNetBar.ButtonItem(); + this.btn_password_edit = new DevComponents.DotNetBar.ButtonItem(); + this.btn_reset_password = new DevComponents.DotNetBar.ButtonItem(); this.ribbonPanel2 = new DevComponents.DotNetBar.RibbonPanel(); this.ribbonBar4 = new DevComponents.DotNetBar.RibbonBar(); this.buttonItem_TaskManager = new DevComponents.DotNetBar.ButtonItem(); @@ -556,15 +564,6 @@ this.ribbonBar5 = new DevComponents.DotNetBar.RibbonBar(); this.btn_flag = new DevComponents.DotNetBar.ButtonItem(); this.slider4ground = new DevComponents.DotNetBar.SliderItem(); - this.ribbonPanel8 = new DevComponents.DotNetBar.RibbonPanel(); - this.ribbonBar_UserInfo = new DevComponents.DotNetBar.RibbonBar(); - this.btn_user_info = new DevComponents.DotNetBar.ButtonItem(); - this.btn_role_info = new DevComponents.DotNetBar.ButtonItem(); - this.btn_resc_info = new DevComponents.DotNetBar.ButtonItem(); - this.btn_role_resc = new DevComponents.DotNetBar.ButtonItem(); - this.btn_user_role = new DevComponents.DotNetBar.ButtonItem(); - this.btn_password_edit = new DevComponents.DotNetBar.ButtonItem(); - this.btn_reset_password = new DevComponents.DotNetBar.ButtonItem(); this.ribbonTabItem1 = new DevComponents.DotNetBar.RibbonTabItem(); this.ribbonTabItem14 = new DevComponents.DotNetBar.RibbonTabItem(); this.ribbonTabItem2 = new DevComponents.DotNetBar.RibbonTabItem(); @@ -612,6 +611,7 @@ this.buttonItem75 = new DevComponents.DotNetBar.ButtonItem(); this.buttonItem76 = new DevComponents.DotNetBar.ButtonItem(); this.label1 = new System.Windows.Forms.Label(); + this.layerTree = new Cyberpipe.MyTreeView(); this.statusStrip1.SuspendLayout(); this.sideBar1.SuspendLayout(); this.panelEx3.SuspendLayout(); @@ -649,11 +649,11 @@ this.contextMenuStripDeleteLayerNode.SuspendLayout(); this.ribbonControl1.SuspendLayout(); this.ribbonPanel3.SuspendLayout(); + this.ribbonPanel8.SuspendLayout(); this.ribbonPanel2.SuspendLayout(); this.ribbonPanel15.SuspendLayout(); this.ribbonPanel1.SuspendLayout(); this.ribbonPanel7.SuspendLayout(); - this.ribbonPanel8.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).BeginInit(); this.SuspendLayout(); // @@ -1048,16 +1048,6 @@ this.layerSensorTree.AfterCheck += new System.Windows.Forms.TreeViewEventHandler(this.layerMarkerTree_AfterCheck); this.layerSensorTree.NodeMouseClick += new System.Windows.Forms.TreeNodeMouseClickEventHandler(this.layerMarkerTree_NodeMouseClick); // - // layerTree - // - this.layerTree.CheckBoxes = true; - this.layerTree.ItemHeight = 18; - this.layerTree.Location = new System.Drawing.Point(30, 78); - this.layerTree.Name = "layerTree"; - this.layerTree.Size = new System.Drawing.Size(121, 97); - this.layerTree.TabIndex = 1; - this.layerTree.AfterCheck += new System.Windows.Forms.TreeViewEventHandler(this.layerTree_AfterCheck); - // // sideBarPanelItem3 // this.sideBarPanelItem3.FontBold = true; @@ -4126,11 +4116,11 @@ this.ribbonControl1.BackgroundStyle.Class = ""; this.ribbonControl1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonControl1.Controls.Add(this.ribbonPanel3); + this.ribbonControl1.Controls.Add(this.ribbonPanel8); this.ribbonControl1.Controls.Add(this.ribbonPanel2); this.ribbonControl1.Controls.Add(this.ribbonPanel15); this.ribbonControl1.Controls.Add(this.ribbonPanel1); this.ribbonControl1.Controls.Add(this.ribbonPanel7); - this.ribbonControl1.Controls.Add(this.ribbonPanel8); this.ribbonControl1.Dock = System.Windows.Forms.DockStyle.Top; this.ribbonControl1.ImeMode = System.Windows.Forms.ImeMode.NoControl; this.ribbonControl1.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { @@ -4272,6 +4262,135 @@ this.buttonItem9.Text = "文档管理"; this.buttonItem9.Click += new System.EventHandler(this.buttonItem9_Click); // + // ribbonPanel8 + // + this.ribbonPanel8.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonPanel8.Controls.Add(this.ribbonBar_UserInfo); + this.ribbonPanel8.Dock = System.Windows.Forms.DockStyle.Fill; + this.ribbonPanel8.Location = new System.Drawing.Point(0, 0); + this.ribbonPanel8.Name = "ribbonPanel8"; + this.ribbonPanel8.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); + this.ribbonPanel8.Size = new System.Drawing.Size(1328, 95); + // + // + // + this.ribbonPanel8.Style.Class = ""; + this.ribbonPanel8.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel8.StyleMouseDown.Class = ""; + this.ribbonPanel8.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel8.StyleMouseOver.Class = ""; + this.ribbonPanel8.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonPanel8.TabIndex = 42; + this.ribbonPanel8.Visible = false; + // + // ribbonBar_UserInfo + // + this.ribbonBar_UserInfo.AutoOverflowEnabled = true; + // + // + // + this.ribbonBar_UserInfo.BackgroundMouseOverStyle.Class = ""; + this.ribbonBar_UserInfo.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar_UserInfo.BackgroundStyle.Class = ""; + this.ribbonBar_UserInfo.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar_UserInfo.ContainerControlProcessDialogKey = true; + this.ribbonBar_UserInfo.Dock = System.Windows.Forms.DockStyle.Left; + this.ribbonBar_UserInfo.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { + this.btn_user_info, + this.btn_role_info, + this.btn_resc_info, + this.btn_role_resc, + this.btn_user_role, + this.btn_password_edit, + this.btn_reset_password}); + this.ribbonBar_UserInfo.Location = new System.Drawing.Point(3, 0); + this.ribbonBar_UserInfo.Name = "ribbonBar_UserInfo"; + this.ribbonBar_UserInfo.Size = new System.Drawing.Size(427, 92); + this.ribbonBar_UserInfo.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonBar_UserInfo.TabIndex = 0; + // + // + // + this.ribbonBar_UserInfo.TitleStyle.Class = ""; + this.ribbonBar_UserInfo.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar_UserInfo.TitleStyleMouseOver.Class = ""; + this.ribbonBar_UserInfo.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // btn_user_info + // + this.btn_user_info.Image = global::Cyberpipe.Properties.Resources._24x24icon_13_hover; + this.btn_user_info.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.btn_user_info.Name = "btn_user_info"; + this.btn_user_info.SubItemsExpandWidth = 14; + this.btn_user_info.Text = "用户管理"; + this.btn_user_info.Click += new System.EventHandler(this.btn_user_info_Click); + // + // btn_role_info + // + this.btn_role_info.Image = global::Cyberpipe.Properties.Resources._24x24icon_05_hover1; + this.btn_role_info.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.btn_role_info.Name = "btn_role_info"; + this.btn_role_info.SubItemsExpandWidth = 14; + this.btn_role_info.Text = "角色管理"; + this.btn_role_info.Click += new System.EventHandler(this.btn_role_info_Click); + // + // btn_resc_info + // + this.btn_resc_info.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__09; + this.btn_resc_info.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.btn_resc_info.Name = "btn_resc_info"; + this.btn_resc_info.SubItemsExpandWidth = 14; + this.btn_resc_info.Text = "资源管理"; + this.btn_resc_info.Click += new System.EventHandler(this.btn_resc_info_Click); + // + // btn_role_resc + // + this.btn_role_resc.Image = global::Cyberpipe.Properties.Resources.btnlegendSet_Image_副本; + this.btn_role_resc.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.btn_role_resc.Name = "btn_role_resc"; + this.btn_role_resc.SubItemsExpandWidth = 14; + this.btn_role_resc.Text = "角色授权"; + this.btn_role_resc.Click += new System.EventHandler(this.btn_role_resc_Click); + // + // btn_user_role + // + this.btn_user_role.Image = global::Cyberpipe.Properties.Resources._24x24icon_08_hover; + this.btn_user_role.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.btn_user_role.Name = "btn_user_role"; + this.btn_user_role.SubItemsExpandWidth = 14; + this.btn_user_role.Text = "用户授权"; + this.btn_user_role.Click += new System.EventHandler(this.btn_user_role_Click); + // + // btn_password_edit + // + this.btn_password_edit.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__67; + this.btn_password_edit.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.btn_password_edit.Name = "btn_password_edit"; + this.btn_password_edit.SubItemsExpandWidth = 14; + this.btn_password_edit.Text = "密码修改"; + this.btn_password_edit.Click += new System.EventHandler(this.btn_password_edit_Click); + // + // btn_reset_password + // + this.btn_reset_password.Image = global::Cyberpipe.Properties.Resources.liuxiang; + this.btn_reset_password.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.btn_reset_password.Name = "btn_reset_password"; + this.btn_reset_password.SubItemsExpandWidth = 14; + this.btn_reset_password.Text = "重置密码"; + this.btn_reset_password.Click += new System.EventHandler(this.btn_reset_password_Click); + // // ribbonPanel2 // this.ribbonPanel2.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -5931,135 +6050,6 @@ this.slider4ground.Value = 0; this.slider4ground.ValueChanged += new System.EventHandler(this.slider4ground_ValueChanged); // - // ribbonPanel8 - // - this.ribbonPanel8.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonPanel8.Controls.Add(this.ribbonBar_UserInfo); - this.ribbonPanel8.Dock = System.Windows.Forms.DockStyle.Fill; - this.ribbonPanel8.Location = new System.Drawing.Point(0, 0); - this.ribbonPanel8.Name = "ribbonPanel8"; - this.ribbonPanel8.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); - this.ribbonPanel8.Size = new System.Drawing.Size(1328, 95); - // - // - // - this.ribbonPanel8.Style.Class = ""; - this.ribbonPanel8.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel8.StyleMouseDown.Class = ""; - this.ribbonPanel8.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel8.StyleMouseOver.Class = ""; - this.ribbonPanel8.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonPanel8.TabIndex = 42; - this.ribbonPanel8.Visible = false; - // - // ribbonBar_UserInfo - // - this.ribbonBar_UserInfo.AutoOverflowEnabled = true; - // - // - // - this.ribbonBar_UserInfo.BackgroundMouseOverStyle.Class = ""; - this.ribbonBar_UserInfo.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar_UserInfo.BackgroundStyle.Class = ""; - this.ribbonBar_UserInfo.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar_UserInfo.ContainerControlProcessDialogKey = true; - this.ribbonBar_UserInfo.Dock = System.Windows.Forms.DockStyle.Left; - this.ribbonBar_UserInfo.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { - this.btn_user_info, - this.btn_role_info, - this.btn_resc_info, - this.btn_role_resc, - this.btn_user_role, - this.btn_password_edit, - this.btn_reset_password}); - this.ribbonBar_UserInfo.Location = new System.Drawing.Point(3, 0); - this.ribbonBar_UserInfo.Name = "ribbonBar_UserInfo"; - this.ribbonBar_UserInfo.Size = new System.Drawing.Size(427, 92); - this.ribbonBar_UserInfo.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonBar_UserInfo.TabIndex = 0; - // - // - // - this.ribbonBar_UserInfo.TitleStyle.Class = ""; - this.ribbonBar_UserInfo.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar_UserInfo.TitleStyleMouseOver.Class = ""; - this.ribbonBar_UserInfo.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // btn_user_info - // - this.btn_user_info.Image = global::Cyberpipe.Properties.Resources._24x24icon_13_hover; - this.btn_user_info.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.btn_user_info.Name = "btn_user_info"; - this.btn_user_info.SubItemsExpandWidth = 14; - this.btn_user_info.Text = "用户管理"; - this.btn_user_info.Click += new System.EventHandler(this.btn_user_info_Click); - // - // btn_role_info - // - this.btn_role_info.Image = global::Cyberpipe.Properties.Resources._24x24icon_05_hover1; - this.btn_role_info.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.btn_role_info.Name = "btn_role_info"; - this.btn_role_info.SubItemsExpandWidth = 14; - this.btn_role_info.Text = "角色管理"; - this.btn_role_info.Click += new System.EventHandler(this.btn_role_info_Click); - // - // btn_resc_info - // - this.btn_resc_info.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__09; - this.btn_resc_info.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.btn_resc_info.Name = "btn_resc_info"; - this.btn_resc_info.SubItemsExpandWidth = 14; - this.btn_resc_info.Text = "资源管理"; - this.btn_resc_info.Click += new System.EventHandler(this.btn_resc_info_Click); - // - // btn_role_resc - // - this.btn_role_resc.Image = global::Cyberpipe.Properties.Resources.btnlegendSet_Image_副本; - this.btn_role_resc.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.btn_role_resc.Name = "btn_role_resc"; - this.btn_role_resc.SubItemsExpandWidth = 14; - this.btn_role_resc.Text = "角色授权"; - this.btn_role_resc.Click += new System.EventHandler(this.btn_role_resc_Click); - // - // btn_user_role - // - this.btn_user_role.Image = global::Cyberpipe.Properties.Resources._24x24icon_08_hover; - this.btn_user_role.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.btn_user_role.Name = "btn_user_role"; - this.btn_user_role.SubItemsExpandWidth = 14; - this.btn_user_role.Text = "用户授权"; - this.btn_user_role.Click += new System.EventHandler(this.btn_user_role_Click); - // - // btn_password_edit - // - this.btn_password_edit.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__67; - this.btn_password_edit.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.btn_password_edit.Name = "btn_password_edit"; - this.btn_password_edit.SubItemsExpandWidth = 14; - this.btn_password_edit.Text = "密码修改"; - this.btn_password_edit.Click += new System.EventHandler(this.btn_password_edit_Click); - // - // btn_reset_password - // - this.btn_reset_password.Image = global::Cyberpipe.Properties.Resources.liuxiang; - this.btn_reset_password.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.btn_reset_password.Name = "btn_reset_password"; - this.btn_reset_password.SubItemsExpandWidth = 14; - this.btn_reset_password.Text = "重置密码"; - this.btn_reset_password.Click += new System.EventHandler(this.btn_reset_password_Click); - // // ribbonTabItem1 // this.ribbonTabItem1.ButtonStyle = DevComponents.DotNetBar.eButtonStyle.ImageAndText; @@ -6110,7 +6100,6 @@ this.ribbonTabItem7.Name = "ribbonTabItem7"; this.ribbonTabItem7.Panel = this.ribbonPanel7; this.ribbonTabItem7.Text = "标识器管理"; - this.ribbonTabItem7.Click += new System.EventHandler(this.ribbonTabItem7_Click); this.ribbonTabItem7.MouseDown += new System.Windows.Forms.MouseEventHandler(this.ribbonTabItem7_MouseDown); // // ribbonTabItem8 @@ -6428,14 +6417,27 @@ // // label1 // + this.label1.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); + this.label1.AutoEllipsis = true; this.label1.AutoSize = true; this.label1.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.label1.Image = global::Cyberpipe.Properties.Resources.user; - this.label1.Location = new System.Drawing.Point(1198, 53); + this.label1.Location = new System.Drawing.Point(1205, 51); this.label1.Name = "label1"; this.label1.Size = new System.Drawing.Size(56, 16); - this.label1.TabIndex = 28; + this.label1.TabIndex = 32; this.label1.Text = "label1"; + this.label1.TextAlign = System.Drawing.ContentAlignment.TopRight; + // + // layerTree + // + this.layerTree.CheckBoxes = true; + this.layerTree.ItemHeight = 18; + this.layerTree.Location = new System.Drawing.Point(30, 78); + this.layerTree.Name = "layerTree"; + this.layerTree.Size = new System.Drawing.Size(121, 97); + this.layerTree.TabIndex = 1; + this.layerTree.AfterCheck += new System.Windows.Forms.TreeViewEventHandler(this.layerTree_AfterCheck); // // MainFrm // @@ -6512,11 +6514,11 @@ this.ribbonControl1.ResumeLayout(false); this.ribbonControl1.PerformLayout(); this.ribbonPanel3.ResumeLayout(false); + this.ribbonPanel8.ResumeLayout(false); this.ribbonPanel2.ResumeLayout(false); this.ribbonPanel15.ResumeLayout(false); this.ribbonPanel1.ResumeLayout(false); this.ribbonPanel7.ResumeLayout(false); - this.ribbonPanel8.ResumeLayout(false); ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).EndInit(); this.ResumeLayout(false); this.PerformLayout(); diff --git a/MainFrm.resx b/MainFrm.resx index 15e5339..9d1d787 100644 --- a/MainFrm.resx +++ b/MainFrm.resx @@ -2094,7 +2094,7 @@ - 211 + 166 diff --git a/bin/x86/Debug/EMSCyberpipe.exe b/bin/x86/Debug/EMSCyberpipe.exe index c40cffc..8924ace 100644 --- a/bin/x86/Debug/EMSCyberpipe.exe +++ b/bin/x86/Debug/EMSCyberpipe.exe Binary files differ diff --git a/bin/x86/Debug/EMSCyberpipe.pdb b/bin/x86/Debug/EMSCyberpipe.pdb index eb32a47..1f02683 100644 --- a/bin/x86/Debug/EMSCyberpipe.pdb +++ b/bin/x86/Debug/EMSCyberpipe.pdb Binary files differ diff --git a/bin/x86/Debug/download/BootStrap_pdf.zip b/bin/x86/Debug/download/BootStrap_pdf.zip deleted file mode 100644 index 993e02b..0000000 --- a/bin/x86/Debug/download/BootStrap_pdf.zip +++ /dev/null Binary files differ diff --git "a/bin/x86/Debug/download/BootStrap\345\205\245\351\227\250\346\225\231\347\250\213.pdf" "b/bin/x86/Debug/download/BootStrap\345\205\245\351\227\250\346\225\231\347\250\213.pdf" deleted file mode 100644 index 7fe754a..0000000 --- "a/bin/x86/Debug/download/BootStrap\345\205\245\351\227\250\346\225\231\347\250\213.pdf" +++ /dev/null Binary files differ diff --git "a/bin/x86/Debug/download/axure7.0\346\225\231\347\250\213\050\345\233\276\346\226\207\346\241\210\344\276\213\051.pdf" "b/bin/x86/Debug/download/axure7.0\346\225\231\347\250\213\050\345\233\276\346\226\207\346\241\210\344\276\213\051.pdf" deleted file mode 100644 index 751a2a4..0000000 --- "a/bin/x86/Debug/download/axure7.0\346\225\231\347\250\213\050\345\233\276\346\226\207\346\241\210\344\276\213\051.pdf" +++ /dev/null Binary files differ diff --git a/bin/x86/Debug/download/temp.xlsx b/bin/x86/Debug/download/temp.xlsx deleted file mode 100644 index 5ccf6c9..0000000 --- a/bin/x86/Debug/download/temp.xlsx +++ /dev/null Binary files differ diff --git a/obj/x86/Debug/DesignTimeResolveAssemblyReferences.cache b/obj/x86/Debug/DesignTimeResolveAssemblyReferences.cache index 2b22f93..2aff211 100644 --- a/obj/x86/Debug/DesignTimeResolveAssemblyReferences.cache +++ b/obj/x86/Debug/DesignTimeResolveAssemblyReferences.cache Binary files differ diff --git a/obj/x86/Debug/EMSCyberpipe.exe b/obj/x86/Debug/EMSCyberpipe.exe index c40cffc..8924ace 100644 --- a/obj/x86/Debug/EMSCyberpipe.exe +++ b/obj/x86/Debug/EMSCyberpipe.exe Binary files differ diff --git a/Cyberpipe.suo b/Cyberpipe.suo index 13a1659..6abc092 100644 --- a/Cyberpipe.suo +++ b/Cyberpipe.suo Binary files differ diff --git a/FormDocumentManager.cs b/FormDocumentManager.cs index 7925e2c..1c21f81 100644 --- a/FormDocumentManager.cs +++ b/FormDocumentManager.cs @@ -395,7 +395,7 @@ private void FormDocumentManager_Load(object sender, EventArgs e) { IS_OPEN = true; - //changeCursor(); + changeCursor(); dateTime_end.Value = DateTime.Now; dateTime_begin.Value = DateTime.Now.AddDays(-6); Thread loadThread = new Thread(new ThreadStart(doFormLoad)); diff --git a/MainFrm.cs b/MainFrm.cs index e801c7e..c5b7a38 100644 --- a/MainFrm.cs +++ b/MainFrm.cs @@ -14368,17 +14368,7 @@ globeControl1.Globe.Action = EnumAction3D.TrackPolygon; } - private void ribbonTabItem7_Click(object sender, EventArgs e) - { - - } - - private void label1_Click(object sender, EventArgs e) - { - - } - - + } diff --git a/MainFrm.designer.cs b/MainFrm.designer.cs index ee6e5b6..e9b8b02 100644 --- a/MainFrm.designer.cs +++ b/MainFrm.designer.cs @@ -82,7 +82,6 @@ this.sideBar1 = new DevComponents.DotNetBar.SideBar(); this.panelEx3 = new DevComponents.DotNetBar.PanelEx(); this.layerSensorTree = new System.Windows.Forms.TreeView(); - this.layerTree = new Cyberpipe.MyTreeView(); this.sideBarPanelItem3 = new DevComponents.DotNetBar.SideBarPanelItem(); this.controlContainerItem3 = new DevComponents.DotNetBar.ControlContainerItem(); this.sideBarPanelItem4 = new DevComponents.DotNetBar.SideBarPanelItem(); @@ -372,6 +371,15 @@ this.btn_Person = new DevComponents.DotNetBar.ButtonItem(); this.btn_constructMap = new DevComponents.DotNetBar.ButtonItem(); this.buttonItem9 = new DevComponents.DotNetBar.ButtonItem(); + this.ribbonPanel8 = new DevComponents.DotNetBar.RibbonPanel(); + this.ribbonBar_UserInfo = new DevComponents.DotNetBar.RibbonBar(); + this.btn_user_info = new DevComponents.DotNetBar.ButtonItem(); + this.btn_role_info = new DevComponents.DotNetBar.ButtonItem(); + this.btn_resc_info = new DevComponents.DotNetBar.ButtonItem(); + this.btn_role_resc = new DevComponents.DotNetBar.ButtonItem(); + this.btn_user_role = new DevComponents.DotNetBar.ButtonItem(); + this.btn_password_edit = new DevComponents.DotNetBar.ButtonItem(); + this.btn_reset_password = new DevComponents.DotNetBar.ButtonItem(); this.ribbonPanel2 = new DevComponents.DotNetBar.RibbonPanel(); this.ribbonBar4 = new DevComponents.DotNetBar.RibbonBar(); this.buttonItem_TaskManager = new DevComponents.DotNetBar.ButtonItem(); @@ -556,15 +564,6 @@ this.ribbonBar5 = new DevComponents.DotNetBar.RibbonBar(); this.btn_flag = new DevComponents.DotNetBar.ButtonItem(); this.slider4ground = new DevComponents.DotNetBar.SliderItem(); - this.ribbonPanel8 = new DevComponents.DotNetBar.RibbonPanel(); - this.ribbonBar_UserInfo = new DevComponents.DotNetBar.RibbonBar(); - this.btn_user_info = new DevComponents.DotNetBar.ButtonItem(); - this.btn_role_info = new DevComponents.DotNetBar.ButtonItem(); - this.btn_resc_info = new DevComponents.DotNetBar.ButtonItem(); - this.btn_role_resc = new DevComponents.DotNetBar.ButtonItem(); - this.btn_user_role = new DevComponents.DotNetBar.ButtonItem(); - this.btn_password_edit = new DevComponents.DotNetBar.ButtonItem(); - this.btn_reset_password = new DevComponents.DotNetBar.ButtonItem(); this.ribbonTabItem1 = new DevComponents.DotNetBar.RibbonTabItem(); this.ribbonTabItem14 = new DevComponents.DotNetBar.RibbonTabItem(); this.ribbonTabItem2 = new DevComponents.DotNetBar.RibbonTabItem(); @@ -612,6 +611,7 @@ this.buttonItem75 = new DevComponents.DotNetBar.ButtonItem(); this.buttonItem76 = new DevComponents.DotNetBar.ButtonItem(); this.label1 = new System.Windows.Forms.Label(); + this.layerTree = new Cyberpipe.MyTreeView(); this.statusStrip1.SuspendLayout(); this.sideBar1.SuspendLayout(); this.panelEx3.SuspendLayout(); @@ -649,11 +649,11 @@ this.contextMenuStripDeleteLayerNode.SuspendLayout(); this.ribbonControl1.SuspendLayout(); this.ribbonPanel3.SuspendLayout(); + this.ribbonPanel8.SuspendLayout(); this.ribbonPanel2.SuspendLayout(); this.ribbonPanel15.SuspendLayout(); this.ribbonPanel1.SuspendLayout(); this.ribbonPanel7.SuspendLayout(); - this.ribbonPanel8.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).BeginInit(); this.SuspendLayout(); // @@ -1048,16 +1048,6 @@ this.layerSensorTree.AfterCheck += new System.Windows.Forms.TreeViewEventHandler(this.layerMarkerTree_AfterCheck); this.layerSensorTree.NodeMouseClick += new System.Windows.Forms.TreeNodeMouseClickEventHandler(this.layerMarkerTree_NodeMouseClick); // - // layerTree - // - this.layerTree.CheckBoxes = true; - this.layerTree.ItemHeight = 18; - this.layerTree.Location = new System.Drawing.Point(30, 78); - this.layerTree.Name = "layerTree"; - this.layerTree.Size = new System.Drawing.Size(121, 97); - this.layerTree.TabIndex = 1; - this.layerTree.AfterCheck += new System.Windows.Forms.TreeViewEventHandler(this.layerTree_AfterCheck); - // // sideBarPanelItem3 // this.sideBarPanelItem3.FontBold = true; @@ -4126,11 +4116,11 @@ this.ribbonControl1.BackgroundStyle.Class = ""; this.ribbonControl1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonControl1.Controls.Add(this.ribbonPanel3); + this.ribbonControl1.Controls.Add(this.ribbonPanel8); this.ribbonControl1.Controls.Add(this.ribbonPanel2); this.ribbonControl1.Controls.Add(this.ribbonPanel15); this.ribbonControl1.Controls.Add(this.ribbonPanel1); this.ribbonControl1.Controls.Add(this.ribbonPanel7); - this.ribbonControl1.Controls.Add(this.ribbonPanel8); this.ribbonControl1.Dock = System.Windows.Forms.DockStyle.Top; this.ribbonControl1.ImeMode = System.Windows.Forms.ImeMode.NoControl; this.ribbonControl1.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { @@ -4272,6 +4262,135 @@ this.buttonItem9.Text = "文档管理"; this.buttonItem9.Click += new System.EventHandler(this.buttonItem9_Click); // + // ribbonPanel8 + // + this.ribbonPanel8.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonPanel8.Controls.Add(this.ribbonBar_UserInfo); + this.ribbonPanel8.Dock = System.Windows.Forms.DockStyle.Fill; + this.ribbonPanel8.Location = new System.Drawing.Point(0, 0); + this.ribbonPanel8.Name = "ribbonPanel8"; + this.ribbonPanel8.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); + this.ribbonPanel8.Size = new System.Drawing.Size(1328, 95); + // + // + // + this.ribbonPanel8.Style.Class = ""; + this.ribbonPanel8.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel8.StyleMouseDown.Class = ""; + this.ribbonPanel8.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel8.StyleMouseOver.Class = ""; + this.ribbonPanel8.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonPanel8.TabIndex = 42; + this.ribbonPanel8.Visible = false; + // + // ribbonBar_UserInfo + // + this.ribbonBar_UserInfo.AutoOverflowEnabled = true; + // + // + // + this.ribbonBar_UserInfo.BackgroundMouseOverStyle.Class = ""; + this.ribbonBar_UserInfo.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar_UserInfo.BackgroundStyle.Class = ""; + this.ribbonBar_UserInfo.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar_UserInfo.ContainerControlProcessDialogKey = true; + this.ribbonBar_UserInfo.Dock = System.Windows.Forms.DockStyle.Left; + this.ribbonBar_UserInfo.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { + this.btn_user_info, + this.btn_role_info, + this.btn_resc_info, + this.btn_role_resc, + this.btn_user_role, + this.btn_password_edit, + this.btn_reset_password}); + this.ribbonBar_UserInfo.Location = new System.Drawing.Point(3, 0); + this.ribbonBar_UserInfo.Name = "ribbonBar_UserInfo"; + this.ribbonBar_UserInfo.Size = new System.Drawing.Size(427, 92); + this.ribbonBar_UserInfo.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonBar_UserInfo.TabIndex = 0; + // + // + // + this.ribbonBar_UserInfo.TitleStyle.Class = ""; + this.ribbonBar_UserInfo.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar_UserInfo.TitleStyleMouseOver.Class = ""; + this.ribbonBar_UserInfo.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // btn_user_info + // + this.btn_user_info.Image = global::Cyberpipe.Properties.Resources._24x24icon_13_hover; + this.btn_user_info.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.btn_user_info.Name = "btn_user_info"; + this.btn_user_info.SubItemsExpandWidth = 14; + this.btn_user_info.Text = "用户管理"; + this.btn_user_info.Click += new System.EventHandler(this.btn_user_info_Click); + // + // btn_role_info + // + this.btn_role_info.Image = global::Cyberpipe.Properties.Resources._24x24icon_05_hover1; + this.btn_role_info.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.btn_role_info.Name = "btn_role_info"; + this.btn_role_info.SubItemsExpandWidth = 14; + this.btn_role_info.Text = "角色管理"; + this.btn_role_info.Click += new System.EventHandler(this.btn_role_info_Click); + // + // btn_resc_info + // + this.btn_resc_info.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__09; + this.btn_resc_info.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.btn_resc_info.Name = "btn_resc_info"; + this.btn_resc_info.SubItemsExpandWidth = 14; + this.btn_resc_info.Text = "资源管理"; + this.btn_resc_info.Click += new System.EventHandler(this.btn_resc_info_Click); + // + // btn_role_resc + // + this.btn_role_resc.Image = global::Cyberpipe.Properties.Resources.btnlegendSet_Image_副本; + this.btn_role_resc.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.btn_role_resc.Name = "btn_role_resc"; + this.btn_role_resc.SubItemsExpandWidth = 14; + this.btn_role_resc.Text = "角色授权"; + this.btn_role_resc.Click += new System.EventHandler(this.btn_role_resc_Click); + // + // btn_user_role + // + this.btn_user_role.Image = global::Cyberpipe.Properties.Resources._24x24icon_08_hover; + this.btn_user_role.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.btn_user_role.Name = "btn_user_role"; + this.btn_user_role.SubItemsExpandWidth = 14; + this.btn_user_role.Text = "用户授权"; + this.btn_user_role.Click += new System.EventHandler(this.btn_user_role_Click); + // + // btn_password_edit + // + this.btn_password_edit.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__67; + this.btn_password_edit.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.btn_password_edit.Name = "btn_password_edit"; + this.btn_password_edit.SubItemsExpandWidth = 14; + this.btn_password_edit.Text = "密码修改"; + this.btn_password_edit.Click += new System.EventHandler(this.btn_password_edit_Click); + // + // btn_reset_password + // + this.btn_reset_password.Image = global::Cyberpipe.Properties.Resources.liuxiang; + this.btn_reset_password.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.btn_reset_password.Name = "btn_reset_password"; + this.btn_reset_password.SubItemsExpandWidth = 14; + this.btn_reset_password.Text = "重置密码"; + this.btn_reset_password.Click += new System.EventHandler(this.btn_reset_password_Click); + // // ribbonPanel2 // this.ribbonPanel2.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -5931,135 +6050,6 @@ this.slider4ground.Value = 0; this.slider4ground.ValueChanged += new System.EventHandler(this.slider4ground_ValueChanged); // - // ribbonPanel8 - // - this.ribbonPanel8.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonPanel8.Controls.Add(this.ribbonBar_UserInfo); - this.ribbonPanel8.Dock = System.Windows.Forms.DockStyle.Fill; - this.ribbonPanel8.Location = new System.Drawing.Point(0, 0); - this.ribbonPanel8.Name = "ribbonPanel8"; - this.ribbonPanel8.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); - this.ribbonPanel8.Size = new System.Drawing.Size(1328, 95); - // - // - // - this.ribbonPanel8.Style.Class = ""; - this.ribbonPanel8.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel8.StyleMouseDown.Class = ""; - this.ribbonPanel8.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel8.StyleMouseOver.Class = ""; - this.ribbonPanel8.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonPanel8.TabIndex = 42; - this.ribbonPanel8.Visible = false; - // - // ribbonBar_UserInfo - // - this.ribbonBar_UserInfo.AutoOverflowEnabled = true; - // - // - // - this.ribbonBar_UserInfo.BackgroundMouseOverStyle.Class = ""; - this.ribbonBar_UserInfo.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar_UserInfo.BackgroundStyle.Class = ""; - this.ribbonBar_UserInfo.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar_UserInfo.ContainerControlProcessDialogKey = true; - this.ribbonBar_UserInfo.Dock = System.Windows.Forms.DockStyle.Left; - this.ribbonBar_UserInfo.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { - this.btn_user_info, - this.btn_role_info, - this.btn_resc_info, - this.btn_role_resc, - this.btn_user_role, - this.btn_password_edit, - this.btn_reset_password}); - this.ribbonBar_UserInfo.Location = new System.Drawing.Point(3, 0); - this.ribbonBar_UserInfo.Name = "ribbonBar_UserInfo"; - this.ribbonBar_UserInfo.Size = new System.Drawing.Size(427, 92); - this.ribbonBar_UserInfo.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonBar_UserInfo.TabIndex = 0; - // - // - // - this.ribbonBar_UserInfo.TitleStyle.Class = ""; - this.ribbonBar_UserInfo.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar_UserInfo.TitleStyleMouseOver.Class = ""; - this.ribbonBar_UserInfo.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // btn_user_info - // - this.btn_user_info.Image = global::Cyberpipe.Properties.Resources._24x24icon_13_hover; - this.btn_user_info.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.btn_user_info.Name = "btn_user_info"; - this.btn_user_info.SubItemsExpandWidth = 14; - this.btn_user_info.Text = "用户管理"; - this.btn_user_info.Click += new System.EventHandler(this.btn_user_info_Click); - // - // btn_role_info - // - this.btn_role_info.Image = global::Cyberpipe.Properties.Resources._24x24icon_05_hover1; - this.btn_role_info.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.btn_role_info.Name = "btn_role_info"; - this.btn_role_info.SubItemsExpandWidth = 14; - this.btn_role_info.Text = "角色管理"; - this.btn_role_info.Click += new System.EventHandler(this.btn_role_info_Click); - // - // btn_resc_info - // - this.btn_resc_info.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__09; - this.btn_resc_info.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.btn_resc_info.Name = "btn_resc_info"; - this.btn_resc_info.SubItemsExpandWidth = 14; - this.btn_resc_info.Text = "资源管理"; - this.btn_resc_info.Click += new System.EventHandler(this.btn_resc_info_Click); - // - // btn_role_resc - // - this.btn_role_resc.Image = global::Cyberpipe.Properties.Resources.btnlegendSet_Image_副本; - this.btn_role_resc.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.btn_role_resc.Name = "btn_role_resc"; - this.btn_role_resc.SubItemsExpandWidth = 14; - this.btn_role_resc.Text = "角色授权"; - this.btn_role_resc.Click += new System.EventHandler(this.btn_role_resc_Click); - // - // btn_user_role - // - this.btn_user_role.Image = global::Cyberpipe.Properties.Resources._24x24icon_08_hover; - this.btn_user_role.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.btn_user_role.Name = "btn_user_role"; - this.btn_user_role.SubItemsExpandWidth = 14; - this.btn_user_role.Text = "用户授权"; - this.btn_user_role.Click += new System.EventHandler(this.btn_user_role_Click); - // - // btn_password_edit - // - this.btn_password_edit.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__67; - this.btn_password_edit.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.btn_password_edit.Name = "btn_password_edit"; - this.btn_password_edit.SubItemsExpandWidth = 14; - this.btn_password_edit.Text = "密码修改"; - this.btn_password_edit.Click += new System.EventHandler(this.btn_password_edit_Click); - // - // btn_reset_password - // - this.btn_reset_password.Image = global::Cyberpipe.Properties.Resources.liuxiang; - this.btn_reset_password.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.btn_reset_password.Name = "btn_reset_password"; - this.btn_reset_password.SubItemsExpandWidth = 14; - this.btn_reset_password.Text = "重置密码"; - this.btn_reset_password.Click += new System.EventHandler(this.btn_reset_password_Click); - // // ribbonTabItem1 // this.ribbonTabItem1.ButtonStyle = DevComponents.DotNetBar.eButtonStyle.ImageAndText; @@ -6110,7 +6100,6 @@ this.ribbonTabItem7.Name = "ribbonTabItem7"; this.ribbonTabItem7.Panel = this.ribbonPanel7; this.ribbonTabItem7.Text = "标识器管理"; - this.ribbonTabItem7.Click += new System.EventHandler(this.ribbonTabItem7_Click); this.ribbonTabItem7.MouseDown += new System.Windows.Forms.MouseEventHandler(this.ribbonTabItem7_MouseDown); // // ribbonTabItem8 @@ -6428,14 +6417,27 @@ // // label1 // + this.label1.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); + this.label1.AutoEllipsis = true; this.label1.AutoSize = true; this.label1.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.label1.Image = global::Cyberpipe.Properties.Resources.user; - this.label1.Location = new System.Drawing.Point(1198, 53); + this.label1.Location = new System.Drawing.Point(1205, 51); this.label1.Name = "label1"; this.label1.Size = new System.Drawing.Size(56, 16); - this.label1.TabIndex = 28; + this.label1.TabIndex = 32; this.label1.Text = "label1"; + this.label1.TextAlign = System.Drawing.ContentAlignment.TopRight; + // + // layerTree + // + this.layerTree.CheckBoxes = true; + this.layerTree.ItemHeight = 18; + this.layerTree.Location = new System.Drawing.Point(30, 78); + this.layerTree.Name = "layerTree"; + this.layerTree.Size = new System.Drawing.Size(121, 97); + this.layerTree.TabIndex = 1; + this.layerTree.AfterCheck += new System.Windows.Forms.TreeViewEventHandler(this.layerTree_AfterCheck); // // MainFrm // @@ -6512,11 +6514,11 @@ this.ribbonControl1.ResumeLayout(false); this.ribbonControl1.PerformLayout(); this.ribbonPanel3.ResumeLayout(false); + this.ribbonPanel8.ResumeLayout(false); this.ribbonPanel2.ResumeLayout(false); this.ribbonPanel15.ResumeLayout(false); this.ribbonPanel1.ResumeLayout(false); this.ribbonPanel7.ResumeLayout(false); - this.ribbonPanel8.ResumeLayout(false); ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).EndInit(); this.ResumeLayout(false); this.PerformLayout(); diff --git a/MainFrm.resx b/MainFrm.resx index 15e5339..9d1d787 100644 --- a/MainFrm.resx +++ b/MainFrm.resx @@ -2094,7 +2094,7 @@ - 211 + 166 diff --git a/bin/x86/Debug/EMSCyberpipe.exe b/bin/x86/Debug/EMSCyberpipe.exe index c40cffc..8924ace 100644 --- a/bin/x86/Debug/EMSCyberpipe.exe +++ b/bin/x86/Debug/EMSCyberpipe.exe Binary files differ diff --git a/bin/x86/Debug/EMSCyberpipe.pdb b/bin/x86/Debug/EMSCyberpipe.pdb index eb32a47..1f02683 100644 --- a/bin/x86/Debug/EMSCyberpipe.pdb +++ b/bin/x86/Debug/EMSCyberpipe.pdb Binary files differ diff --git a/bin/x86/Debug/download/BootStrap_pdf.zip b/bin/x86/Debug/download/BootStrap_pdf.zip deleted file mode 100644 index 993e02b..0000000 --- a/bin/x86/Debug/download/BootStrap_pdf.zip +++ /dev/null Binary files differ diff --git "a/bin/x86/Debug/download/BootStrap\345\205\245\351\227\250\346\225\231\347\250\213.pdf" "b/bin/x86/Debug/download/BootStrap\345\205\245\351\227\250\346\225\231\347\250\213.pdf" deleted file mode 100644 index 7fe754a..0000000 --- "a/bin/x86/Debug/download/BootStrap\345\205\245\351\227\250\346\225\231\347\250\213.pdf" +++ /dev/null Binary files differ diff --git "a/bin/x86/Debug/download/axure7.0\346\225\231\347\250\213\050\345\233\276\346\226\207\346\241\210\344\276\213\051.pdf" "b/bin/x86/Debug/download/axure7.0\346\225\231\347\250\213\050\345\233\276\346\226\207\346\241\210\344\276\213\051.pdf" deleted file mode 100644 index 751a2a4..0000000 --- "a/bin/x86/Debug/download/axure7.0\346\225\231\347\250\213\050\345\233\276\346\226\207\346\241\210\344\276\213\051.pdf" +++ /dev/null Binary files differ diff --git a/bin/x86/Debug/download/temp.xlsx b/bin/x86/Debug/download/temp.xlsx deleted file mode 100644 index 5ccf6c9..0000000 --- a/bin/x86/Debug/download/temp.xlsx +++ /dev/null Binary files differ diff --git a/obj/x86/Debug/DesignTimeResolveAssemblyReferences.cache b/obj/x86/Debug/DesignTimeResolveAssemblyReferences.cache index 2b22f93..2aff211 100644 --- a/obj/x86/Debug/DesignTimeResolveAssemblyReferences.cache +++ b/obj/x86/Debug/DesignTimeResolveAssemblyReferences.cache Binary files differ diff --git a/obj/x86/Debug/EMSCyberpipe.exe b/obj/x86/Debug/EMSCyberpipe.exe index c40cffc..8924ace 100644 --- a/obj/x86/Debug/EMSCyberpipe.exe +++ b/obj/x86/Debug/EMSCyberpipe.exe Binary files differ diff --git a/obj/x86/Debug/EMSCyberpipe.pdb b/obj/x86/Debug/EMSCyberpipe.pdb index eb32a47..1f02683 100644 --- a/obj/x86/Debug/EMSCyberpipe.pdb +++ b/obj/x86/Debug/EMSCyberpipe.pdb Binary files differ