From 2ba8bd4b8e381e173e10d69396a744708b2f32e5 Mon Sep 17 00:00:00 2001 From: lg <999544862qq.com> Date: 星期五, 30 八月 2024 11:05:55 +0800 Subject: [PATCH] 用户管理 --- DevApp/Gs.DevApp/Resources/groupbyresource_32x32.png | 0 DevApp/Gs.DevApp/Resources/addfooter_32x32.png | 0 DevApp/Gs.DevApp/Resources/reviewingpane_32x32.png | 0 DevApp/Gs.DevApp/DevFrm/FrmMain.Designer.cs | 2 DevApp/Gs.DevApp/UserControl/PageBar.Designer.cs | 26 DevApp/Gs.DevApp/UserControl/ToolBarMenu.resx | 307 +++++++++++++++ DevApp/Gs.DevApp/Resources/bodepartment_32x32.png | 0 DevApp/Gs.DevApp/Resources/user_16x161.png | 0 DevApp/Gs.DevApp/Resources/checkbox2_32x321.png | 0 DevApp/Gs.DevApp/DevFrm/FrmMain.cs | 65 ++- DevApp/Gs.DevApp/UserControl/ToolBarMenu.cs | 1 DevApp/Gs.DevApp/Resources/publicfix_32x32.png | 0 DevApp/Gs.DevApp/DevFrm/FrmLogin.Designer.cs | 4 DevApp/Gs.DevApp/Resources/bodepartment_16x16.png | 0 DevApp/Gs.DevApp/TestForm/XtraForm1.resx | 120 ++++++ DevApp/Gs.DevApp/Gs.DevApp.csproj | 27 + DevApp/Gs.DevApp/Resources/addcalculatedfield_16x16.png | 0 DevApp/Gs.DevApp/Resources/bouser_16x16.png | 0 DevApp/Gs.DevApp/TestForm/XtraForm1.Designer.cs | 87 ++++ DevApp/Gs.DevApp/Resources/serieslines_32x32.png | 0 DevApp/Gs.DevApp/TestForm/XtraForm1.cs | 21 + DevApp/Gs.DevApp/Properties/Resources1.Designer.cs | 90 ++++ DevApp/Gs.DevApp/Resources/meeting_32x32.png | 0 DevApp/Gs.DevApp/UserControl/ToolBarMenu.Designer.cs | 111 ++++- DevApp/Gs.DevApp/Properties/Resources.resx | 311 ++++++++------- DevApp/Gs.DevApp/Resources/editname_32x32.png | 0 26 files changed, 972 insertions(+), 200 deletions(-) diff --git a/DevApp/Gs.DevApp/DevFrm/FrmLogin.Designer.cs b/DevApp/Gs.DevApp/DevFrm/FrmLogin.Designer.cs index 5778c83..3b3032d 100644 --- a/DevApp/Gs.DevApp/DevFrm/FrmLogin.Designer.cs +++ b/DevApp/Gs.DevApp/DevFrm/FrmLogin.Designer.cs @@ -53,11 +53,11 @@ // this.lbVersion.AutoSize = true; this.lbVersion.BackColor = System.Drawing.Color.Transparent; - this.lbVersion.Font = new System.Drawing.Font("Tahoma", 9F, System.Drawing.FontStyle.Bold); + this.lbVersion.Font = new System.Drawing.Font("Tahoma", 12F, System.Drawing.FontStyle.Bold); this.lbVersion.ForeColor = System.Drawing.Color.White; this.lbVersion.Location = new System.Drawing.Point(12, 9); this.lbVersion.Name = "lbVersion"; - this.lbVersion.Size = new System.Drawing.Size(113, 18); + this.lbVersion.Size = new System.Drawing.Size(150, 24); this.lbVersion.TabIndex = 244; this.lbVersion.Text = "骞挎繁MES-V2.0"; // diff --git a/DevApp/Gs.DevApp/DevFrm/FrmMain.Designer.cs b/DevApp/Gs.DevApp/DevFrm/FrmMain.Designer.cs index 2c251eb..207b9d8 100644 --- a/DevApp/Gs.DevApp/DevFrm/FrmMain.Designer.cs +++ b/DevApp/Gs.DevApp/DevFrm/FrmMain.Designer.cs @@ -122,6 +122,8 @@ // // tab // + this.tab.Appearance.Font = new System.Drawing.Font("Tahoma", 10F); + this.tab.Appearance.Options.UseFont = true; this.tab.ClosePageButtonShowMode = DevExpress.XtraTab.ClosePageButtonShowMode.InActiveTabPageHeader; this.tab.Dock = System.Windows.Forms.DockStyle.Fill; this.tab.Location = new System.Drawing.Point(0, 0); diff --git a/DevApp/Gs.DevApp/DevFrm/FrmMain.cs b/DevApp/Gs.DevApp/DevFrm/FrmMain.cs index c78fca3..56d4fd0 100644 --- a/DevApp/Gs.DevApp/DevFrm/FrmMain.cs +++ b/DevApp/Gs.DevApp/DevFrm/FrmMain.cs @@ -19,8 +19,14 @@ public FrmMain() { InitializeComponent(); - this.Text = this.Text = System.Configuration.ConfigurationSettings.AppSettings.Get("ProductName").ToString(); + this.Text = System.Configuration.ConfigurationSettings.AppSettings.Get("ProductName").ToString(); + tab.CloseButtonClick += Tab_CloseButtonClick; getTree(); + } + + private void Tab_CloseButtonClick(object sender, EventArgs e) + { + RemoveTabPage(tab,e); } private void getTree() @@ -48,6 +54,7 @@ System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(FrmMain)); DataTable dt = JsonConvert.DeserializeObject<DataTable>(array.ToString()); DataRow[] drGrp = dt.Select("upGuid is null"); + int idx = 0; foreach (DataRow _dy in drGrp) { AccordionControlElement _grp = this.acrd.AddGroup(); @@ -55,7 +62,7 @@ _grp.Name = _dy["guid"].ToString(); _grp.Style = DevExpress.XtraBars.Navigation.ElementStyle.Group; _grp.Text = _dy["name"].ToString(); - _grp.Tag = _dy["formPath"].ToString(); + _grp.Tag = _dy["formPath"].ToString();//瀛樿矾寰勶紝绫诲悕 _grp.Click += _grp_Click; DataRow[] drItem = dt.Select("upGuid='" + _dy["guid"].ToString() + "'"); foreach (DataRow _dy2 in drItem) @@ -66,9 +73,19 @@ _itm.Style = DevExpress.XtraBars.Navigation.ElementStyle.Item; _itm.Text = _dy2["name"].ToString(); _itm.Appearance.Normal.Font = new System.Drawing.Font("Tahoma", 10F); - _itm.Tag = _dy2["formPath"].ToString(); + _itm.Tag = _dy2["formPath"].ToString();//瀛樿矾寰勶紝绫诲悕 _itm.Click += _grp_Click; _grp.Elements.Add(_itm); + // + if (idx == 0) { + string tabPageName = _itm.Name + "_page"; + string tabText = _itm.Text;//褰撳墠閫夐」鍗¢〉Text鏍囬 + string newFormName = _itm.Tag.ToString();//瀛樿矾寰勶紝绫诲悕 + Image imgIcon = _itm.Image; + AddTabpage(tab, tabPageName, tabText, newFormName, imgIcon); + } + idx++; + // }; } } @@ -83,8 +100,8 @@ AccordionControlElement _acd = (AccordionControlElement)sender; if (_acd.Elements.Count > 0) return; string tabPageName = _acd.Name + "_page"; - string tabText = _acd.Text; - string newFormName = _acd.Tag.ToString(); + string tabText = _acd.Text;//褰撳墠閫夐」鍗¢〉Text鏍囬 + string newFormName = _acd.Tag.ToString();//瀛樿矾寰勶紝绫诲悕 Image imgIcon = _acd.Image; AddTabpage(tab, tabPageName, tabText, newFormName, imgIcon); } @@ -95,7 +112,7 @@ /// <param name="tabControl">閫夐」鍗℃帶浠�</param> /// <param name="tabPageName">褰撴湡閫夐」鍗¢〉name鍚嶇О</param> /// <param name="tabText">褰撳墠閫夐」鍗¢〉Text鏍囬</param> - /// <param name="newFormName">褰撳墠閫夐」鍗′腑鐨勬柊绐椾綋</param> + /// <param name="newFormName">褰撳墠閫夐」鍗′腑鐨勬柊绐椾綋璺緞锛岀被鍚�</param> public void AddTabpage(XtraTabControl tabControl, string tabPageName, string tabText, string newFormName, Image imgIcon) { if (IsTabpageExsit(tabControl, tabPageName)) @@ -105,11 +122,13 @@ XtraTabPage newPage = new XtraTabPage(); newPage.Name = tabPageName; newPage.Text = tabText; - newPage.Tooltip = (tabText); + newPage.Tooltip = newPage.Name; + newPage.Appearance.Header.Font = (tab.Appearance.Font); newPage.ImageOptions.Image = imgIcon; - if (AddNewForm(newFormName) != null) + Form fm = AddNewForm(newFormName); + if (fm != null) { - newPage.Controls.Add(AddNewForm(newFormName)); + newPage.Controls.Add(fm); tabControl.TabPages.Add(newPage); TabPageDic.Add(tabPageName, newPage); tabControl.SelectedTabPage = newPage; @@ -126,12 +145,10 @@ { DevExpress.XtraTab.ViewInfo.ClosePageButtonEventArgs args = (DevExpress.XtraTab.ViewInfo.ClosePageButtonEventArgs)e; string name = args.Page.Tooltip; - MessageBox.Show(name); foreach (XtraTabPage item in tabControl.TabPages) { if (item.Name == name) { - MessageBox.Show(item.Name); tabControl.TabPages.Remove(item); item.Dispose(); TabPageDic.Remove(name); @@ -165,18 +182,26 @@ /// <param name="form">绐椾綋鍚嶇О</param> private Form AddNewForm(string formName) { - Form newForm = (Form)Assembly.GetExecutingAssembly().CreateInstance(formName); - if (newForm == null) + try + { + Form newForm = (Form)Assembly.GetExecutingAssembly().CreateInstance(formName); + if (newForm == null) + { + Gs.DevApp.ToolBox.MsgHelper.ShowError("璇锋鏌ユ槸鍚﹀紑閫氫簡璇ユā鍧楋紒"); + return null; + } + newForm.FormBorderStyle = FormBorderStyle.None; + newForm.TopLevel = false; + newForm.ControlBox = false; + newForm.Dock = DockStyle.Fill; + newForm.Visible = true; + return newForm; + } + catch (Exception) { Gs.DevApp.ToolBox.MsgHelper.ShowError("璇锋鏌ユ槸鍚﹀紑閫氫簡璇ユā鍧楋紒"); - return null; } - newForm.FormBorderStyle = FormBorderStyle.None; - newForm.TopLevel = false; - newForm.ControlBox = false; - newForm.Dock = DockStyle.Fill; - newForm.Visible = true; - return newForm; + return null; } } } diff --git a/DevApp/Gs.DevApp/Gs.DevApp.csproj b/DevApp/Gs.DevApp/Gs.DevApp.csproj index 71af88c..adaa0cf 100644 --- a/DevApp/Gs.DevApp/Gs.DevApp.csproj +++ b/DevApp/Gs.DevApp/Gs.DevApp.csproj @@ -76,6 +76,18 @@ <Compile Include="DevFrm\User\Organization.Designer.cs"> <DependentUpon>Organization.cs</DependentUpon> </Compile> + <Compile Include="DevFrm\User\Role.cs"> + <SubType>Form</SubType> + </Compile> + <Compile Include="DevFrm\User\Role.Designer.cs"> + <DependentUpon>Role.cs</DependentUpon> + </Compile> + <Compile Include="DevFrm\User\RoleAdd.cs"> + <SubType>Form</SubType> + </Compile> + <Compile Include="DevFrm\User\RoleAdd.Designer.cs"> + <DependentUpon>RoleAdd.cs</DependentUpon> + </Compile> <Compile Include="DevFrm\User\SysMenu.cs"> <SubType>Form</SubType> </Compile> @@ -146,6 +158,12 @@ <EmbeddedResource Include="DevFrm\User\Organization.resx"> <DependentUpon>Organization.cs</DependentUpon> </EmbeddedResource> + <EmbeddedResource Include="DevFrm\User\Role.resx"> + <DependentUpon>Role.cs</DependentUpon> + </EmbeddedResource> + <EmbeddedResource Include="DevFrm\User\RoleAdd.resx"> + <DependentUpon>RoleAdd.cs</DependentUpon> + </EmbeddedResource> <EmbeddedResource Include="DevFrm\User\SysMenu.resx"> <DependentUpon>SysMenu.cs</DependentUpon> </EmbeddedResource> @@ -187,6 +205,7 @@ </Compile> </ItemGroup> <ItemGroup> + <None Include="Resources\user_16x161.png" /> <None Include="Resources\trackingchanges_allmarkup_32x32.png" /> <None Include="Resources\trackingchanges_allmarkup_16x16.png" /> <None Include="Resources\removegroupfooter_32x32.png" /> @@ -227,6 +246,14 @@ <None Include="Resources\login_bg6.png" /> <None Include="Resources\publicfix_32x32.png" /> <None Include="Resources\groupbyresource_32x32.png" /> + <None Include="Resources\meeting_32x32.png" /> + <None Include="Resources\editname_32x32.png" /> + <None Include="Resources\addfooter_32x32.png" /> + <None Include="Resources\addcalculatedfield_16x16.png" /> + <None Include="Resources\serieslines_32x32.png" /> + <None Include="Resources\bodepartment_32x32.png" /> + <None Include="Resources\bodepartment_16x16.png" /> + <None Include="Resources\bouser_16x16.png" /> <Content Include="Resources\user_16x16.png" /> </ItemGroup> <ItemGroup /> diff --git a/DevApp/Gs.DevApp/Properties/Resources.resx b/DevApp/Gs.DevApp/Properties/Resources.resx index 8b33e4a..a419197 100644 --- a/DevApp/Gs.DevApp/Properties/Resources.resx +++ b/DevApp/Gs.DevApp/Properties/Resources.resx @@ -118,20 +118,125 @@ <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> </resheader> <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" /> + <data name="exportfile_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms"> + <value>..\Resources\exportfile_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> + </data> + <data name="forcetesting_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms"> + <value>..\Resources\forcetesting_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> + </data> + <data name="first_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms"> + <value>..\Resources\first_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> + </data> + <data name="trackingchanges_allmarkup_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms"> + <value>..\Resources\trackingchanges_allmarkup_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> + </data> + <data name="linktoprevious_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms"> + <value>..\Resources\linktoprevious_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> + </data> + <data name="checkbox2_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms"> + <value>..\Resources\checkbox2_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> + </data> + <data name="serieslines_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms"> + <value>..\Resources\serieslines_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> + </data> + <data name="show_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms"> + <value>..\Resources\show_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> + </data> + <data name="groupbyresource_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms"> + <value>..\Resources\groupbyresource_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> + </data> + <data name="forcetesting_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms"> + <value>..\Resources\forcetesting_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> + </data> + <data name="area3d_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms"> + <value>..\Resources\area3d_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> + </data> <data name="convert_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms"> <value>..\Resources\convert_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> </data> - <data name="converttorange_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\Resources\converttorange_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> + <data name="bodepartment_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms"> + <value>..\Resources\bodepartment_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> + </data> + <data name="time2_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms"> + <value>..\Resources\time2_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> + </data> + <data name="3dcolumn_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms"> + <value>..\Resources\3dcolumn_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> + </data> + <data name="last_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms"> + <value>..\Resources\last_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> + </data> + <data name="fullstackedcolumn3d_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms"> + <value>..\Resources\fullstackedcolumn3d_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> + </data> + <data name="login_bg222" type="System.Resources.ResXFileRef, System.Windows.Forms"> + <value>..\Resources\login_bg222.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> + </data> + <data name="first_32x321" type="System.Resources.ResXFileRef, System.Windows.Forms"> + <value>..\Resources\first_32x321.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> </data> <data name="checkbox2_32x321" type="System.Resources.ResXFileRef, System.Windows.Forms"> <value>..\Resources\checkbox2_32x321.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> </data> + <data name="usergroup_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms"> + <value>..\Resources\usergroup_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> + </data> + <data name="reviewingpane_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms"> + <value>..\Resources\reviewingpane_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> + </data> + <data name="publicfix_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms"> + <value>..\Resources\publicfix_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> + </data> + <data name="removegroupfooter_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms"> + <value>..\Resources\removegroupfooter_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> + </data> + <data name="addfooter_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms"> + <value>..\Resources\addfooter_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> + </data> <data name="chartsshowlegend_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms"> <value>..\Resources\chartsshowlegend_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> </data> - <data name="checkbox2_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\Resources\checkbox2_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> + <data name="meeting_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms"> + <value>..\Resources\meeting_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> + </data> + <data name="listmultilevel_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms"> + <value>..\Resources\listmultilevel_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> + </data> + <data name="login_bg6" type="System.Resources.ResXFileRef, System.Windows.Forms"> + <value>..\Resources\login_bg6.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> + </data> + <data name="checkbox_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms"> + <value>..\Resources\checkbox_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> + </data> + <data name="trackingchanges_trackchanges_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms"> + <value>..\Resources\trackingchanges_trackchanges_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> + </data> + <data name="renamedatasource_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms"> + <value>..\Resources\renamedatasource_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> + </data> + <data name="exportfile_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms"> + <value>..\Resources\exportfile_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> + </data> + <data name="bodepartment_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms"> + <value>..\Resources\bodepartment_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> + </data> + <data name="area3d_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms"> + <value>..\Resources\area3d_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> + </data> + <data name="user_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms"> + <value>..\Resources\user_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> + </data> + <data name="converttorange_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms"> + <value>..\Resources\converttorange_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> + </data> + <data name="mapit_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms"> + <value>..\Resources\mapit_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> + </data> + <data name="dropandhighlowlines_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms"> + <value>..\Resources\dropandhighlowlines_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> + </data> + <data name="user_16x161" type="System.Resources.ResXFileRef, System.Windows.Forms"> + <value>..\Resources\user_16x161.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> </data> <data name="3dcylinder_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms"> <value>..\Resources\3dcylinder_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> @@ -139,160 +244,82 @@ <data name="login_bg2" type="System.Resources.ResXFileRef, System.Windows.Forms"> <value>..\Resources\login_bg2.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> </data> - <data name="last_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\Resources\last_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> - </data> - <data name="area3d_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\Resources\area3d_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> - </data> - <data name="trackingchanges_allmarkup_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\Resources\trackingchanges_allmarkup_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> - </data> - <data name="renamedatasource_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\Resources\renamedatasource_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> - </data> - <data name="usergroup_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\Resources\usergroup_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> - </data> - <data name="publicfix_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\Resources\publicfix_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> - </data> - <data name="task_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\Resources\task_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> - </data> - <data name="3dcolumn_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\Resources\3dcolumn_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> - </data> - <data name="3dcolumn_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\Resources\3dcolumn_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> - </data> - <data name="login_bg222" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\Resources\login_bg222.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> - </data> <data name="dropandhighlowlines_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms"> <value>..\Resources\dropandhighlowlines_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> - </data> - <data name="forcetesting_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\Resources\forcetesting_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> - </data> - <data name="exportfile_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\Resources\exportfile_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> - </data> - <data name="filledradarwithoutmarkers_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\Resources\filledradarwithoutmarkers_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> - </data> - <data name="reviewingpane_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\Resources\reviewingpane_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> - </data> - <data name="apply_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\Resources\apply_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> - </data> - <data name="3dcylinder_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\Resources\3dcylinder_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> - </data> - <data name="legendnone2_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\Resources\legendnone2_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> - </data> - <data name="time2_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\Resources\time2_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> - </data> - <data name="show_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\Resources\show_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> - </data> - <data name="listmultilevel_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\Resources\listmultilevel_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> - </data> - <data name="doublenext_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\Resources\doublenext_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> - </data> - <data name="trackingchanges_trackchanges_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\Resources\trackingchanges_trackchanges_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> - </data> - <data name="download_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\Resources\download_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> - </data> - <data name="checkbox_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\Resources\checkbox_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> - </data> - <data name="fullstackedcolumn3d_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\Resources\fullstackedcolumn3d_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> - </data> - <data name="mapit_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\Resources\mapit_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> - </data> - <data name="show_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\Resources\show_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> - </data> - <data name="editingfillleft_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\Resources\editingfillleft_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> - </data> - <data name="user_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\Resources\user_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> - </data> - <data name="edit_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\Resources\edit_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> - </data> - <data name="linktoprevious_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\Resources\linktoprevious_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> - </data> - <data name="area3d_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\Resources\area3d_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> - </data> - <data name="renamedatasource_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\Resources\renamedatasource_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> - </data> - <data name="trackingchanges_trackchanges_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\Resources\trackingchanges_trackchanges_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> - </data> - <data name="login_bg6" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\Resources\login_bg6.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> - </data> - <data name="exportfile_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\Resources\exportfile_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> - </data> - <data name="removegroupfooter_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\Resources\removegroupfooter_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> </data> <data name="convert_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms"> <value>..\Resources\convert_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> </data> + <data name="trackingchanges_allmarkup_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms"> + <value>..\Resources\trackingchanges_allmarkup_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> + </data> + <data name="addcalculatedfield_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms"> + <value>..\Resources\addcalculatedfield_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> + </data> <data name="first_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms"> <value>..\Resources\first_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> </data> - <data name="removegroupfooter_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\Resources\removegroupfooter_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> + <data name="editingfillleft_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms"> + <value>..\Resources\editingfillleft_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> </data> - <data name="doubleprev_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\Resources\doubleprev_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> - </data> - <data name="forcetesting_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\Resources\forcetesting_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> - </data> - <data name="trackingchanges_allmarkup_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\Resources\trackingchanges_allmarkup_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> - </data> - <data name="dropandhighlowlines_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\Resources\dropandhighlowlines_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> - </data> - <data name="first_32x321" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\Resources\first_32x321.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> - </data> - <data name="checkbox2_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\Resources\checkbox2_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> - </data> - <data name="first_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\Resources\first_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> - </data> - <data name="converttorange_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\Resources\converttorange_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> + <data name="edit_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms"> + <value>..\Resources\edit_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> </data> <data name="knowledgebasearticle_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms"> <value>..\Resources\knowledgebasearticle_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> </data> + <data name="show_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms"> + <value>..\Resources\show_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> + </data> + <data name="checkbox2_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms"> + <value>..\Resources\checkbox2_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> + </data> + <data name="renamedatasource_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms"> + <value>..\Resources\renamedatasource_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> + </data> + <data name="doublenext_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms"> + <value>..\Resources\doublenext_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> + </data> + <data name="editname_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms"> + <value>..\Resources\editname_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> + </data> + <data name="converttorange_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms"> + <value>..\Resources\converttorange_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> + </data> + <data name="doubleprev_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms"> + <value>..\Resources\doubleprev_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> + </data> + <data name="apply_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms"> + <value>..\Resources\apply_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> + </data> <data name="login_bg1" type="System.Resources.ResXFileRef, System.Windows.Forms"> <value>..\Resources\login_bg1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> </data> - <data name="groupbyresource_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\Resources\groupbyresource_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> + <data name="removegroupfooter_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms"> + <value>..\Resources\removegroupfooter_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> + </data> + <data name="task_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms"> + <value>..\Resources\task_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> + </data> + <data name="3dcolumn_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms"> + <value>..\Resources\3dcolumn_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> + </data> + <data name="legendnone2_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms"> + <value>..\Resources\legendnone2_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> + </data> + <data name="filledradarwithoutmarkers_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms"> + <value>..\Resources\filledradarwithoutmarkers_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> + </data> + <data name="3dcylinder_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms"> + <value>..\Resources\3dcylinder_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> + </data> + <data name="download_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms"> + <value>..\Resources\download_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> + </data> + <data name="trackingchanges_trackchanges_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms"> + <value>..\Resources\trackingchanges_trackchanges_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> + </data> + <data name="bouser_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms"> + <value>..\Resources\bouser_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> </data> </root> \ No newline at end of file diff --git a/DevApp/Gs.DevApp/Properties/Resources1.Designer.cs b/DevApp/Gs.DevApp/Properties/Resources1.Designer.cs index 1a20454..400b9f4 100644 --- a/DevApp/Gs.DevApp/Properties/Resources1.Designer.cs +++ b/DevApp/Gs.DevApp/Properties/Resources1.Designer.cs @@ -103,6 +103,26 @@ /// <summary> /// 鏌ユ壘 System.Drawing.Bitmap 绫诲瀷鐨勬湰鍦板寲璧勬簮銆� /// </summary> + internal static System.Drawing.Bitmap addcalculatedfield_16x16 { + get { + object obj = ResourceManager.GetObject("addcalculatedfield_16x16", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// <summary> + /// 鏌ユ壘 System.Drawing.Bitmap 绫诲瀷鐨勬湰鍦板寲璧勬簮銆� + /// </summary> + internal static System.Drawing.Bitmap addfooter_32x32 { + get { + object obj = ResourceManager.GetObject("addfooter_32x32", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// <summary> + /// 鏌ユ壘 System.Drawing.Bitmap 绫诲瀷鐨勬湰鍦板寲璧勬簮銆� + /// </summary> internal static System.Drawing.Bitmap apply_32x32 { get { object obj = ResourceManager.GetObject("apply_32x32", resourceCulture); @@ -126,6 +146,36 @@ internal static System.Drawing.Bitmap area3d_32x32 { get { object obj = ResourceManager.GetObject("area3d_32x32", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// <summary> + /// 鏌ユ壘 System.Drawing.Bitmap 绫诲瀷鐨勬湰鍦板寲璧勬簮銆� + /// </summary> + internal static System.Drawing.Bitmap bodepartment_16x16 { + get { + object obj = ResourceManager.GetObject("bodepartment_16x16", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// <summary> + /// 鏌ユ壘 System.Drawing.Bitmap 绫诲瀷鐨勬湰鍦板寲璧勬簮銆� + /// </summary> + internal static System.Drawing.Bitmap bodepartment_32x32 { + get { + object obj = ResourceManager.GetObject("bodepartment_32x32", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// <summary> + /// 鏌ユ壘 System.Drawing.Bitmap 绫诲瀷鐨勬湰鍦板寲璧勬簮銆� + /// </summary> + internal static System.Drawing.Bitmap bouser_16x16 { + get { + object obj = ResourceManager.GetObject("bouser_16x16", resourceCulture); return ((System.Drawing.Bitmap)(obj)); } } @@ -286,6 +336,16 @@ internal static System.Drawing.Bitmap editingfillleft_32x32 { get { object obj = ResourceManager.GetObject("editingfillleft_32x32", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// <summary> + /// 鏌ユ壘 System.Drawing.Bitmap 绫诲瀷鐨勬湰鍦板寲璧勬簮銆� + /// </summary> + internal static System.Drawing.Bitmap editname_32x32 { + get { + object obj = ResourceManager.GetObject("editname_32x32", resourceCulture); return ((System.Drawing.Bitmap)(obj)); } } @@ -493,6 +553,16 @@ /// <summary> /// 鏌ユ壘 System.Drawing.Bitmap 绫诲瀷鐨勬湰鍦板寲璧勬簮銆� /// </summary> + internal static System.Drawing.Bitmap meeting_32x32 { + get { + object obj = ResourceManager.GetObject("meeting_32x32", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// <summary> + /// 鏌ユ壘 System.Drawing.Bitmap 绫诲瀷鐨勬湰鍦板寲璧勬簮銆� + /// </summary> internal static System.Drawing.Bitmap publicfix_32x32 { get { object obj = ResourceManager.GetObject("publicfix_32x32", resourceCulture); @@ -546,6 +616,16 @@ internal static System.Drawing.Bitmap reviewingpane_32x32 { get { object obj = ResourceManager.GetObject("reviewingpane_32x32", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// <summary> + /// 鏌ユ壘 System.Drawing.Bitmap 绫诲瀷鐨勬湰鍦板寲璧勬簮銆� + /// </summary> + internal static System.Drawing.Bitmap serieslines_32x32 { + get { + object obj = ResourceManager.GetObject("serieslines_32x32", resourceCulture); return ((System.Drawing.Bitmap)(obj)); } } @@ -643,6 +723,16 @@ /// <summary> /// 鏌ユ壘 System.Drawing.Bitmap 绫诲瀷鐨勬湰鍦板寲璧勬簮銆� /// </summary> + internal static System.Drawing.Bitmap user_16x161 { + get { + object obj = ResourceManager.GetObject("user_16x161", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// <summary> + /// 鏌ユ壘 System.Drawing.Bitmap 绫诲瀷鐨勬湰鍦板寲璧勬簮銆� + /// </summary> internal static System.Drawing.Bitmap usergroup_32x32 { get { object obj = ResourceManager.GetObject("usergroup_32x32", resourceCulture); diff --git a/DevApp/Gs.DevApp/Resources/addcalculatedfield_16x16.png b/DevApp/Gs.DevApp/Resources/addcalculatedfield_16x16.png new file mode 100644 index 0000000..8bcfed8 --- /dev/null +++ b/DevApp/Gs.DevApp/Resources/addcalculatedfield_16x16.png Binary files differ diff --git a/DevApp/Gs.DevApp/Resources/addfooter_32x32.png b/DevApp/Gs.DevApp/Resources/addfooter_32x32.png new file mode 100644 index 0000000..550a346 --- /dev/null +++ b/DevApp/Gs.DevApp/Resources/addfooter_32x32.png Binary files differ diff --git a/DevApp/Gs.DevApp/Resources/bodepartment_16x16.png b/DevApp/Gs.DevApp/Resources/bodepartment_16x16.png new file mode 100644 index 0000000..d7d291e --- /dev/null +++ b/DevApp/Gs.DevApp/Resources/bodepartment_16x16.png Binary files differ diff --git a/DevApp/Gs.DevApp/Resources/bodepartment_32x32.png b/DevApp/Gs.DevApp/Resources/bodepartment_32x32.png new file mode 100644 index 0000000..1b569fe --- /dev/null +++ b/DevApp/Gs.DevApp/Resources/bodepartment_32x32.png Binary files differ diff --git a/DevApp/Gs.DevApp/Resources/bouser_16x16.png b/DevApp/Gs.DevApp/Resources/bouser_16x16.png new file mode 100644 index 0000000..b9d5708 --- /dev/null +++ b/DevApp/Gs.DevApp/Resources/bouser_16x16.png Binary files differ diff --git a/DevApp/Gs.DevApp/Resources/checkbox2_32x321.png b/DevApp/Gs.DevApp/Resources/checkbox2_32x321.png new file mode 100644 index 0000000..370f912 --- /dev/null +++ b/DevApp/Gs.DevApp/Resources/checkbox2_32x321.png Binary files differ diff --git a/DevApp/Gs.DevApp/Resources/editname_32x32.png b/DevApp/Gs.DevApp/Resources/editname_32x32.png new file mode 100644 index 0000000..b959b4e --- /dev/null +++ b/DevApp/Gs.DevApp/Resources/editname_32x32.png Binary files differ diff --git a/DevApp/Gs.DevApp/Resources/groupbyresource_32x32.png b/DevApp/Gs.DevApp/Resources/groupbyresource_32x32.png new file mode 100644 index 0000000..9fb9a04 --- /dev/null +++ b/DevApp/Gs.DevApp/Resources/groupbyresource_32x32.png Binary files differ diff --git a/DevApp/Gs.DevApp/Resources/meeting_32x32.png b/DevApp/Gs.DevApp/Resources/meeting_32x32.png new file mode 100644 index 0000000..80bf7e6 --- /dev/null +++ b/DevApp/Gs.DevApp/Resources/meeting_32x32.png Binary files differ diff --git a/DevApp/Gs.DevApp/Resources/publicfix_32x32.png b/DevApp/Gs.DevApp/Resources/publicfix_32x32.png new file mode 100644 index 0000000..444313b --- /dev/null +++ b/DevApp/Gs.DevApp/Resources/publicfix_32x32.png Binary files differ diff --git a/DevApp/Gs.DevApp/Resources/reviewingpane_32x32.png b/DevApp/Gs.DevApp/Resources/reviewingpane_32x32.png new file mode 100644 index 0000000..2b489fc --- /dev/null +++ b/DevApp/Gs.DevApp/Resources/reviewingpane_32x32.png Binary files differ diff --git a/DevApp/Gs.DevApp/Resources/serieslines_32x32.png b/DevApp/Gs.DevApp/Resources/serieslines_32x32.png new file mode 100644 index 0000000..5d948d3 --- /dev/null +++ b/DevApp/Gs.DevApp/Resources/serieslines_32x32.png Binary files differ diff --git a/DevApp/Gs.DevApp/Resources/user_16x161.png b/DevApp/Gs.DevApp/Resources/user_16x161.png new file mode 100644 index 0000000..a683dec --- /dev/null +++ b/DevApp/Gs.DevApp/Resources/user_16x161.png Binary files differ diff --git a/DevApp/Gs.DevApp/TestForm/XtraForm1.Designer.cs b/DevApp/Gs.DevApp/TestForm/XtraForm1.Designer.cs new file mode 100644 index 0000000..120a7f7 --- /dev/null +++ b/DevApp/Gs.DevApp/TestForm/XtraForm1.Designer.cs @@ -0,0 +1,87 @@ +锘� +namespace Gs.DevApp.TestForm +{ + partial class XtraForm1 + { + /// <summary> + /// Required designer variable. + /// </summary> + private System.ComponentModel.IContainer components = null; + + /// <summary> + /// Clean up any resources being used. + /// </summary> + /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param> + protected override void Dispose(bool disposing) + { + if (disposing && (components != null)) + { + components.Dispose(); + } + base.Dispose(disposing); + } + + #region Windows Form Designer generated code + + /// <summary> + /// Required method for Designer support - do not modify + /// the contents of this method with the code editor. + /// </summary> + private void InitializeComponent() + { + this.button1 = new System.Windows.Forms.Button(); + this.pageBar1 = new UserControls.Data.PageBar(); + this.simpleButton1 = new DevExpress.XtraEditors.SimpleButton(); + this.SuspendLayout(); + // + // button1 + // + this.button1.Location = new System.Drawing.Point(151, 89); + this.button1.Name = "button1"; + this.button1.Size = new System.Drawing.Size(75, 23); + this.button1.TabIndex = 0; + this.button1.Text = "button1"; + this.button1.UseVisualStyleBackColor = true; + // + // pageBar1 + // + this.pageBar1.CurrentPage = 0; + this.pageBar1.Location = new System.Drawing.Point(12, 266); + this.pageBar1.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); + this.pageBar1.Name = "pageBar1"; + this.pageBar1.RecordCount = 0; + this.pageBar1.RowsCount = 0; + this.pageBar1.Size = new System.Drawing.Size(954, 40); + this.pageBar1.TabIndex = 2; + this.pageBar1.TotalPages = 0; + // + // simpleButton1 + // + this.simpleButton1.ImageOptions.Image = global::Gs.DevApp.Properties.Resources.bouser_16x16; + this.simpleButton1.Location = new System.Drawing.Point(472, 102); + this.simpleButton1.Name = "simpleButton1"; + this.simpleButton1.Size = new System.Drawing.Size(94, 29); + this.simpleButton1.TabIndex = 1; + this.simpleButton1.Text = "simpleButton1"; + // + // XtraForm1 + // + this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.ClientSize = new System.Drawing.Size(842, 424); + this.Controls.Add(this.pageBar1); + this.Controls.Add(this.simpleButton1); + this.Controls.Add(this.button1); + this.Name = "XtraForm1"; + this.Text = "XtraForm1"; + this.ResumeLayout(false); + + } + + #endregion + + private System.Windows.Forms.Button button1; + private DevExpress.XtraEditors.SimpleButton simpleButton1; + private UserControls.Data.PageBar pageBar1; + } +} \ No newline at end of file diff --git a/DevApp/Gs.DevApp/TestForm/XtraForm1.cs b/DevApp/Gs.DevApp/TestForm/XtraForm1.cs new file mode 100644 index 0000000..0e083e6 --- /dev/null +++ b/DevApp/Gs.DevApp/TestForm/XtraForm1.cs @@ -0,0 +1,21 @@ +锘縰sing DevExpress.XtraEditors; +using System; +using System.Collections.Generic; +using System.ComponentModel; +using System.Data; +using System.Drawing; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using System.Windows.Forms; + +namespace Gs.DevApp.TestForm +{ + public partial class XtraForm1 : DevExpress.XtraEditors.XtraForm + { + public XtraForm1() + { + InitializeComponent(); + } + } +} \ No newline at end of file diff --git a/DevApp/Gs.DevApp/TestForm/XtraForm1.resx b/DevApp/Gs.DevApp/TestForm/XtraForm1.resx new file mode 100644 index 0000000..1af7de1 --- /dev/null +++ b/DevApp/Gs.DevApp/TestForm/XtraForm1.resx @@ -0,0 +1,120 @@ +锘�<?xml version="1.0" encoding="utf-8"?> +<root> + <!-- + Microsoft ResX Schema + + Version 2.0 + + The primary goals of this format is to allow a simple XML format + that is mostly human readable. The generation and parsing of the + various data types are done through the TypeConverter classes + associated with the data types. + + Example: + + ... ado.net/XML headers & schema ... + <resheader name="resmimetype">text/microsoft-resx</resheader> + <resheader name="version">2.0</resheader> + <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader> + <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader> + <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data> + <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data> + <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64"> + <value>[base64 mime encoded serialized .NET Framework object]</value> + </data> + <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64"> + <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value> + <comment>This is a comment</comment> + </data> + + There are any number of "resheader" rows that contain simple + name/value pairs. + + Each data row contains a name, and value. The row also contains a + type or mimetype. Type corresponds to a .NET class that support + text/value conversion through the TypeConverter architecture. + Classes that don't support this are serialized and stored with the + mimetype set. + + The mimetype is used for serialized objects, and tells the + ResXResourceReader how to depersist the object. This is currently not + extensible. For a given mimetype the value must be set accordingly: + + Note - application/x-microsoft.net.object.binary.base64 is the format + that the ResXResourceWriter will generate, however the reader can + read any of the formats listed below. + + mimetype: application/x-microsoft.net.object.binary.base64 + value : The object must be serialized with + : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter + : and then encoded with base64 encoding. + + mimetype: application/x-microsoft.net.object.soap.base64 + value : The object must be serialized with + : System.Runtime.Serialization.Formatters.Soap.SoapFormatter + : and then encoded with base64 encoding. + + mimetype: application/x-microsoft.net.object.bytearray.base64 + value : The object must be serialized into a byte array + : using a System.ComponentModel.TypeConverter + : and then encoded with base64 encoding. + --> + <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata"> + <xsd:import namespace="http://www.w3.org/XML/1998/namespace" /> + <xsd:element name="root" msdata:IsDataSet="true"> + <xsd:complexType> + <xsd:choice maxOccurs="unbounded"> + <xsd:element name="metadata"> + <xsd:complexType> + <xsd:sequence> + <xsd:element name="value" type="xsd:string" minOccurs="0" /> + </xsd:sequence> + <xsd:attribute name="name" use="required" type="xsd:string" /> + <xsd:attribute name="type" type="xsd:string" /> + <xsd:attribute name="mimetype" type="xsd:string" /> + <xsd:attribute ref="xml:space" /> + </xsd:complexType> + </xsd:element> + <xsd:element name="assembly"> + <xsd:complexType> + <xsd:attribute name="alias" type="xsd:string" /> + <xsd:attribute name="name" type="xsd:string" /> + </xsd:complexType> + </xsd:element> + <xsd:element name="data"> + <xsd:complexType> + <xsd:sequence> + <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" /> + <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" /> + </xsd:sequence> + <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" /> + <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" /> + <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" /> + <xsd:attribute ref="xml:space" /> + </xsd:complexType> + </xsd:element> + <xsd:element name="resheader"> + <xsd:complexType> + <xsd:sequence> + <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" /> + </xsd:sequence> + <xsd:attribute name="name" type="xsd:string" use="required" /> + </xsd:complexType> + </xsd:element> + </xsd:choice> + </xsd:complexType> + </xsd:element> + </xsd:schema> + <resheader name="resmimetype"> + <value>text/microsoft-resx</value> + </resheader> + <resheader name="version"> + <value>2.0</value> + </resheader> + <resheader name="reader"> + <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> + </resheader> + <resheader name="writer"> + <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> + </resheader> +</root> \ No newline at end of file diff --git a/DevApp/Gs.DevApp/UserControl/PageBar.Designer.cs b/DevApp/Gs.DevApp/UserControl/PageBar.Designer.cs index c17a5f4..c67ab85 100644 --- a/DevApp/Gs.DevApp/UserControl/PageBar.Designer.cs +++ b/DevApp/Gs.DevApp/UserControl/PageBar.Designer.cs @@ -117,7 +117,7 @@ | System.Windows.Forms.AnchorStyles.Right))); this.lbTotalRows.Appearance.Font = new System.Drawing.Font("Tahoma", 10F); this.lbTotalRows.Appearance.Options.UseFont = true; - this.lbTotalRows.Location = new System.Drawing.Point(586, 2); + this.lbTotalRows.Location = new System.Drawing.Point(635, 2); this.lbTotalRows.Name = "lbTotalRows"; this.lbTotalRows.Size = new System.Drawing.Size(96, 28); this.lbTotalRows.StyleController = this.layoutControl1; @@ -245,7 +245,7 @@ | System.Windows.Forms.AnchorStyles.Right))); this.labelControl2.Appearance.Font = new System.Drawing.Font("Tahoma", 10F); this.labelControl2.Appearance.Options.UseFont = true; - this.labelControl2.Location = new System.Drawing.Point(716, 2); + this.labelControl2.Location = new System.Drawing.Point(765, 2); this.labelControl2.Name = "labelControl2"; this.labelControl2.Size = new System.Drawing.Size(77, 26); this.labelControl2.StyleController = this.layoutControl1; @@ -258,7 +258,7 @@ | System.Windows.Forms.AnchorStyles.Left) | System.Windows.Forms.AnchorStyles.Right))); this.cbxRowCount.EditValue = "20"; - this.cbxRowCount.Location = new System.Drawing.Point(797, 2); + this.cbxRowCount.Location = new System.Drawing.Point(846, 2); this.cbxRowCount.Margin = new System.Windows.Forms.Padding(3, 6, 3, 0); this.cbxRowCount.Name = "cbxRowCount"; this.cbxRowCount.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F); @@ -328,7 +328,7 @@ this.lbTotalPages.Appearance.Options.UseFont = true; this.lbTotalPages.Location = new System.Drawing.Point(505, 2); this.lbTotalPages.Name = "lbTotalPages"; - this.lbTotalPages.Size = new System.Drawing.Size(47, 26); + this.lbTotalPages.Size = new System.Drawing.Size(96, 26); this.lbTotalPages.StyleController = this.layoutControl1; this.lbTotalPages.TabIndex = 3; this.lbTotalPages.Text = "鎬婚〉鏁�"; @@ -483,7 +483,7 @@ // emptySpaceItem4 // this.emptySpaceItem4.AllowHotTrack = false; - this.emptySpaceItem4.Location = new System.Drawing.Point(684, 0); + this.emptySpaceItem4.Location = new System.Drawing.Point(733, 0); this.emptySpaceItem4.MaxSize = new System.Drawing.Size(30, 32); this.emptySpaceItem4.MinSize = new System.Drawing.Size(30, 32); this.emptySpaceItem4.Name = "emptySpaceItem4"; @@ -494,7 +494,7 @@ // layoutControlItem7 // this.layoutControlItem7.Control = this.labelControl2; - this.layoutControlItem7.Location = new System.Drawing.Point(714, 0); + this.layoutControlItem7.Location = new System.Drawing.Point(763, 0); this.layoutControlItem7.MaxSize = new System.Drawing.Size(81, 30); this.layoutControlItem7.MinSize = new System.Drawing.Size(81, 30); this.layoutControlItem7.Name = "layoutControlItem7"; @@ -506,11 +506,11 @@ // layoutControlItem6 // this.layoutControlItem6.Control = this.cbxRowCount; - this.layoutControlItem6.Location = new System.Drawing.Point(795, 0); + this.layoutControlItem6.Location = new System.Drawing.Point(844, 0); this.layoutControlItem6.MaxSize = new System.Drawing.Size(66, 32); this.layoutControlItem6.MinSize = new System.Drawing.Size(66, 32); this.layoutControlItem6.Name = "layoutControlItem6"; - this.layoutControlItem6.Size = new System.Drawing.Size(159, 40); + this.layoutControlItem6.Size = new System.Drawing.Size(110, 40); this.layoutControlItem6.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom; this.layoutControlItem6.TextSize = new System.Drawing.Size(0, 0); this.layoutControlItem6.TextVisible = false; @@ -531,10 +531,10 @@ // this.layoutControlItem2.Control = this.lbTotalPages; this.layoutControlItem2.Location = new System.Drawing.Point(503, 0); - this.layoutControlItem2.MaxSize = new System.Drawing.Size(51, 30); - this.layoutControlItem2.MinSize = new System.Drawing.Size(51, 30); + this.layoutControlItem2.MaxSize = new System.Drawing.Size(100, 30); + this.layoutControlItem2.MinSize = new System.Drawing.Size(100, 30); this.layoutControlItem2.Name = "layoutControlItem2"; - this.layoutControlItem2.Size = new System.Drawing.Size(51, 40); + this.layoutControlItem2.Size = new System.Drawing.Size(100, 40); this.layoutControlItem2.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom; this.layoutControlItem2.TextSize = new System.Drawing.Size(0, 0); this.layoutControlItem2.TextVisible = false; @@ -542,7 +542,7 @@ // layoutControlItem12 // this.layoutControlItem12.Control = this.lbTotalRows; - this.layoutControlItem12.Location = new System.Drawing.Point(584, 0); + this.layoutControlItem12.Location = new System.Drawing.Point(633, 0); this.layoutControlItem12.MaxSize = new System.Drawing.Size(100, 32); this.layoutControlItem12.MinSize = new System.Drawing.Size(100, 32); this.layoutControlItem12.Name = "layoutControlItem12"; @@ -554,7 +554,7 @@ // emptySpaceItem1 // this.emptySpaceItem1.AllowHotTrack = false; - this.emptySpaceItem1.Location = new System.Drawing.Point(554, 0); + this.emptySpaceItem1.Location = new System.Drawing.Point(603, 0); this.emptySpaceItem1.MaxSize = new System.Drawing.Size(30, 32); this.emptySpaceItem1.MinSize = new System.Drawing.Size(30, 32); this.emptySpaceItem1.Name = "emptySpaceItem1"; diff --git a/DevApp/Gs.DevApp/UserControl/ToolBarMenu.Designer.cs b/DevApp/Gs.DevApp/UserControl/ToolBarMenu.Designer.cs index 2213bb1..9de23ef 100644 --- a/DevApp/Gs.DevApp/UserControl/ToolBarMenu.Designer.cs +++ b/DevApp/Gs.DevApp/UserControl/ToolBarMenu.Designer.cs @@ -30,6 +30,7 @@ private void InitializeComponent() { this.components = new System.ComponentModel.Container(); + System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(ToolBarMenu)); this.bar4 = new DevExpress.XtraBars.Bar(); this.bar1 = new DevExpress.XtraBars.Bar(); this.barButtonItem2 = new DevExpress.XtraBars.BarButtonItem(); @@ -44,9 +45,12 @@ this.btnView = new DevExpress.XtraBars.BarLargeButtonItem(); this.barLargeButtonItem6 = new DevExpress.XtraBars.BarLargeButtonItem(); this.btnLoad = new DevExpress.XtraBars.BarLargeButtonItem(); - this.barLargeButtonItem8 = new DevExpress.XtraBars.BarLargeButtonItem(); this.barLargeButtonItem9 = new DevExpress.XtraBars.BarLargeButtonItem(); this.barLargeButtonItem10 = new DevExpress.XtraBars.BarLargeButtonItem(); + this.barLargeButtonItem1 = new DevExpress.XtraBars.BarLargeButtonItem(); + this.barLargeButtonItem2 = new DevExpress.XtraBars.BarLargeButtonItem(); + this.barLargeButtonItem8 = new DevExpress.XtraBars.BarLargeButtonItem(); + this.barLargeButtonItem3 = new DevExpress.XtraBars.BarLargeButtonItem(); this.barDockControlTop = new DevExpress.XtraBars.BarDockControl(); this.barDockControlBottom = new DevExpress.XtraBars.BarDockControl(); this.barDockControlRight = new DevExpress.XtraBars.BarDockControl(); @@ -85,9 +89,9 @@ // this.barDockControlLeft.CausesValidation = false; this.barDockControlLeft.Dock = System.Windows.Forms.DockStyle.Left; - this.barDockControlLeft.Location = new System.Drawing.Point(0, 71); + this.barDockControlLeft.Location = new System.Drawing.Point(0, 74); this.barDockControlLeft.Manager = this.barManager1; - this.barDockControlLeft.Size = new System.Drawing.Size(0, 79); + this.barDockControlLeft.Size = new System.Drawing.Size(0, 0); // // barManager1 // @@ -110,9 +114,12 @@ this.barButtonItem2, this.barLargeButtonItem8, this.barLargeButtonItem9, - this.barLargeButtonItem10}); + this.barLargeButtonItem10, + this.barLargeButtonItem1, + this.barLargeButtonItem2, + this.barLargeButtonItem3}); this.barManager1.MainMenu = this.bar2; - this.barManager1.MaxItemId = 15; + this.barManager1.MaxItemId = 18; // // bar2 // @@ -128,9 +135,12 @@ new DevExpress.XtraBars.LinkPersistInfo(DevExpress.XtraBars.BarLinkUserDefines.PaintStyle, this.btnView, DevExpress.XtraBars.BarItemPaintStyle.CaptionGlyph), new DevExpress.XtraBars.LinkPersistInfo(this.barLargeButtonItem6), new DevExpress.XtraBars.LinkPersistInfo(this.btnLoad), - new DevExpress.XtraBars.LinkPersistInfo(this.barLargeButtonItem8), new DevExpress.XtraBars.LinkPersistInfo(this.barLargeButtonItem9), - new DevExpress.XtraBars.LinkPersistInfo(this.barLargeButtonItem10)}); + new DevExpress.XtraBars.LinkPersistInfo(this.barLargeButtonItem10), + new DevExpress.XtraBars.LinkPersistInfo(this.barLargeButtonItem1), + new DevExpress.XtraBars.LinkPersistInfo(this.barLargeButtonItem2), + new DevExpress.XtraBars.LinkPersistInfo(this.barLargeButtonItem8), + new DevExpress.XtraBars.LinkPersistInfo(this.barLargeButtonItem3)}); this.bar2.OptionsBar.MultiLine = true; this.bar2.OptionsBar.UseWholeRow = true; this.bar2.Text = "Main menu"; @@ -141,6 +151,10 @@ this.btnAdd.Id = 3; this.btnAdd.ImageOptions.Image = global::Gs.DevApp.Properties.Resources.trackingchanges_allmarkup_16x16; this.btnAdd.ImageOptions.LargeImage = global::Gs.DevApp.Properties.Resources.trackingchanges_allmarkup_32x32; + this.btnAdd.ItemAppearance.Normal.Font = new System.Drawing.Font("Tahoma", 10F); + this.btnAdd.ItemAppearance.Normal.Options.UseFont = true; + this.btnAdd.ItemInMenuAppearance.Normal.Font = new System.Drawing.Font("Tahoma", 12F); + this.btnAdd.ItemInMenuAppearance.Normal.Options.UseFont = true; this.btnAdd.Name = "btnAdd"; // // btnDel @@ -149,6 +163,8 @@ this.btnDel.Id = 4; this.btnDel.ImageOptions.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16; this.btnDel.ImageOptions.LargeImage = global::Gs.DevApp.Properties.Resources.removegroupfooter_32x32; + this.btnDel.ItemAppearance.Normal.Font = new System.Drawing.Font("Tahoma", 10F); + this.btnDel.ItemAppearance.Normal.Options.UseFont = true; this.btnDel.Name = "btnDel"; // // btnEdit @@ -157,6 +173,8 @@ this.btnEdit.Id = 5; this.btnEdit.ImageOptions.Image = global::Gs.DevApp.Properties.Resources.trackingchanges_trackchanges_16x16; this.btnEdit.ImageOptions.LargeImage = global::Gs.DevApp.Properties.Resources.trackingchanges_trackchanges_32x32; + this.btnEdit.ItemAppearance.Normal.Font = new System.Drawing.Font("Tahoma", 10F); + this.btnEdit.ItemAppearance.Normal.Options.UseFont = true; this.btnEdit.Name = "btnEdit"; // // btnSave @@ -165,6 +183,8 @@ this.btnSave.Id = 6; this.btnSave.ImageOptions.Image = global::Gs.DevApp.Properties.Resources.exportfile_16x16; this.btnSave.ImageOptions.LargeImage = global::Gs.DevApp.Properties.Resources.exportfile_32x32; + this.btnSave.ItemAppearance.Normal.Font = new System.Drawing.Font("Tahoma", 10F); + this.btnSave.ItemAppearance.Normal.Options.UseFont = true; this.btnSave.Name = "btnSave"; // // btnView @@ -173,14 +193,18 @@ this.btnView.Id = 7; this.btnView.ImageOptions.Image = global::Gs.DevApp.Properties.Resources.show_16x16; this.btnView.ImageOptions.LargeImage = global::Gs.DevApp.Properties.Resources.show_32x32; + this.btnView.ItemAppearance.Normal.Font = new System.Drawing.Font("Tahoma", 10F); + this.btnView.ItemAppearance.Normal.Options.UseFont = true; this.btnView.Name = "btnView"; // // barLargeButtonItem6 // this.barLargeButtonItem6.Caption = "鍙栨秷"; this.barLargeButtonItem6.Id = 9; - this.barLargeButtonItem6.ImageOptions.Image = global::Gs.DevApp.Properties.Resources.renamedatasource_16x16; - this.barLargeButtonItem6.ImageOptions.LargeImage = global::Gs.DevApp.Properties.Resources.renamedatasource_32x32; + this.barLargeButtonItem6.ImageOptions.Image = ((System.Drawing.Image)(resources.GetObject("barLargeButtonItem6.ImageOptions.Image"))); + this.barLargeButtonItem6.ImageOptions.LargeImage = ((System.Drawing.Image)(resources.GetObject("barLargeButtonItem6.ImageOptions.LargeImage"))); + this.barLargeButtonItem6.ItemAppearance.Normal.Font = new System.Drawing.Font("Tahoma", 10F); + this.barLargeButtonItem6.ItemAppearance.Normal.Options.UseFont = true; this.barLargeButtonItem6.Name = "barLargeButtonItem6"; // // btnLoad @@ -189,16 +213,9 @@ this.btnLoad.Id = 10; this.btnLoad.ImageOptions.Image = global::Gs.DevApp.Properties.Resources.convert_16x16; this.btnLoad.ImageOptions.LargeImage = global::Gs.DevApp.Properties.Resources.convert_32x32; + this.btnLoad.ItemAppearance.Normal.Font = new System.Drawing.Font("Tahoma", 10F); + this.btnLoad.ItemAppearance.Normal.Options.UseFont = true; this.btnLoad.Name = "btnLoad"; - // - // barLargeButtonItem8 - // - this.barLargeButtonItem8.Caption = "瀵煎嚭"; - this.barLargeButtonItem8.Description = "瀵煎嚭"; - this.barLargeButtonItem8.Id = 12; - this.barLargeButtonItem8.ImageOptions.Image = global::Gs.DevApp.Properties.Resources.converttorange_16x16; - this.barLargeButtonItem8.ImageOptions.LargeImage = global::Gs.DevApp.Properties.Resources.converttorange_32x32; - this.barLargeButtonItem8.Name = "barLargeButtonItem8"; // // barLargeButtonItem9 // @@ -206,6 +223,8 @@ this.barLargeButtonItem9.Id = 13; this.barLargeButtonItem9.ImageOptions.Image = global::Gs.DevApp.Properties.Resources.checkbox2_16x16; this.barLargeButtonItem9.ImageOptions.LargeImage = global::Gs.DevApp.Properties.Resources.checkbox2_32x32; + this.barLargeButtonItem9.ItemAppearance.Normal.Font = new System.Drawing.Font("Tahoma", 10F); + this.barLargeButtonItem9.ItemAppearance.Normal.Options.UseFont = true; this.barLargeButtonItem9.Name = "barLargeButtonItem9"; // // barLargeButtonItem10 @@ -214,7 +233,50 @@ this.barLargeButtonItem10.Id = 14; this.barLargeButtonItem10.ImageOptions.Image = global::Gs.DevApp.Properties.Resources.forcetesting_16x16; this.barLargeButtonItem10.ImageOptions.LargeImage = global::Gs.DevApp.Properties.Resources.forcetesting_32x32; + this.barLargeButtonItem10.ItemAppearance.Normal.Font = new System.Drawing.Font("Tahoma", 10F); + this.barLargeButtonItem10.ItemAppearance.Normal.Options.UseFont = true; this.barLargeButtonItem10.Name = "barLargeButtonItem10"; + // + // barLargeButtonItem1 + // + this.barLargeButtonItem1.Caption = "鎵撳嵃"; + this.barLargeButtonItem1.Id = 15; + this.barLargeButtonItem1.ImageOptions.Image = ((System.Drawing.Image)(resources.GetObject("barLargeButtonItem1.ImageOptions.Image"))); + this.barLargeButtonItem1.ImageOptions.LargeImage = ((System.Drawing.Image)(resources.GetObject("barLargeButtonItem1.ImageOptions.LargeImage"))); + this.barLargeButtonItem1.ItemAppearance.Normal.Font = new System.Drawing.Font("Tahoma", 10F); + this.barLargeButtonItem1.ItemAppearance.Normal.Options.UseFont = true; + this.barLargeButtonItem1.Name = "barLargeButtonItem1"; + // + // barLargeButtonItem2 + // + this.barLargeButtonItem2.Caption = "鍚堝苟"; + this.barLargeButtonItem2.Id = 16; + this.barLargeButtonItem2.ImageOptions.Image = ((System.Drawing.Image)(resources.GetObject("barLargeButtonItem2.ImageOptions.Image"))); + this.barLargeButtonItem2.ImageOptions.LargeImage = ((System.Drawing.Image)(resources.GetObject("barLargeButtonItem2.ImageOptions.LargeImage"))); + this.barLargeButtonItem2.ItemAppearance.Normal.Font = new System.Drawing.Font("Tahoma", 10F); + this.barLargeButtonItem2.ItemAppearance.Normal.Options.UseFont = true; + this.barLargeButtonItem2.Name = "barLargeButtonItem2"; + // + // barLargeButtonItem8 + // + this.barLargeButtonItem8.Caption = "瀵煎嚭"; + this.barLargeButtonItem8.Description = "瀵煎嚭"; + this.barLargeButtonItem8.Id = 12; + this.barLargeButtonItem8.ImageOptions.Image = ((System.Drawing.Image)(resources.GetObject("barLargeButtonItem8.ImageOptions.Image"))); + this.barLargeButtonItem8.ImageOptions.LargeImage = ((System.Drawing.Image)(resources.GetObject("barLargeButtonItem8.ImageOptions.LargeImage"))); + this.barLargeButtonItem8.ItemAppearance.Normal.Font = new System.Drawing.Font("Tahoma", 10F); + this.barLargeButtonItem8.ItemAppearance.Normal.Options.UseFont = true; + this.barLargeButtonItem8.Name = "barLargeButtonItem8"; + // + // barLargeButtonItem3 + // + this.barLargeButtonItem3.Caption = "瀵煎叆"; + this.barLargeButtonItem3.Id = 17; + this.barLargeButtonItem3.ImageOptions.Image = ((System.Drawing.Image)(resources.GetObject("barLargeButtonItem3.ImageOptions.Image"))); + this.barLargeButtonItem3.ImageOptions.LargeImage = ((System.Drawing.Image)(resources.GetObject("barLargeButtonItem3.ImageOptions.LargeImage"))); + this.barLargeButtonItem3.ItemAppearance.Normal.Font = new System.Drawing.Font("Tahoma", 10F); + this.barLargeButtonItem3.ItemAppearance.Normal.Options.UseFont = true; + this.barLargeButtonItem3.Name = "barLargeButtonItem3"; // // barDockControlTop // @@ -222,13 +284,13 @@ this.barDockControlTop.Dock = System.Windows.Forms.DockStyle.Top; this.barDockControlTop.Location = new System.Drawing.Point(0, 0); this.barDockControlTop.Manager = this.barManager1; - this.barDockControlTop.Size = new System.Drawing.Size(926, 71); + this.barDockControlTop.Size = new System.Drawing.Size(926, 74); // // barDockControlBottom // this.barDockControlBottom.CausesValidation = false; this.barDockControlBottom.Dock = System.Windows.Forms.DockStyle.Bottom; - this.barDockControlBottom.Location = new System.Drawing.Point(0, 150); + this.barDockControlBottom.Location = new System.Drawing.Point(0, 72); this.barDockControlBottom.Manager = this.barManager1; this.barDockControlBottom.Size = new System.Drawing.Size(926, 0); // @@ -236,9 +298,9 @@ // this.barDockControlRight.CausesValidation = false; this.barDockControlRight.Dock = System.Windows.Forms.DockStyle.Right; - this.barDockControlRight.Location = new System.Drawing.Point(926, 71); + this.barDockControlRight.Location = new System.Drawing.Point(926, 74); this.barDockControlRight.Manager = this.barManager1; - this.barDockControlRight.Size = new System.Drawing.Size(0, 79); + this.barDockControlRight.Size = new System.Drawing.Size(0, 0); // // bar3 // @@ -261,7 +323,7 @@ this.Controls.Add(this.barDockControlBottom); this.Controls.Add(this.barDockControlTop); this.Name = "ToolBarMenu"; - this.Size = new System.Drawing.Size(926, 150); + this.Size = new System.Drawing.Size(926, 72); ((System.ComponentModel.ISupportInitialize)(this.barManager1)).EndInit(); this.ResumeLayout(false); this.PerformLayout(); @@ -291,5 +353,8 @@ private DevExpress.XtraBars.BarDockControl barDockControlBottom; private DevExpress.XtraBars.BarDockControl barDockControlRight; private DevExpress.XtraBars.Bar bar3; + private DevExpress.XtraBars.BarLargeButtonItem barLargeButtonItem1; + private DevExpress.XtraBars.BarLargeButtonItem barLargeButtonItem2; + private DevExpress.XtraBars.BarLargeButtonItem barLargeButtonItem3; } } diff --git a/DevApp/Gs.DevApp/UserControl/ToolBarMenu.cs b/DevApp/Gs.DevApp/UserControl/ToolBarMenu.cs index aa7e283..2bdca7d 100644 --- a/DevApp/Gs.DevApp/UserControl/ToolBarMenu.cs +++ b/DevApp/Gs.DevApp/UserControl/ToolBarMenu.cs @@ -1,4 +1,5 @@ 锘縰sing DevExpress.XtraEditors; +using Gs.DevApp.ToolBox; using System; diff --git a/DevApp/Gs.DevApp/UserControl/ToolBarMenu.resx b/DevApp/Gs.DevApp/UserControl/ToolBarMenu.resx index 52e53df..f2f7c7c 100644 --- a/DevApp/Gs.DevApp/UserControl/ToolBarMenu.resx +++ b/DevApp/Gs.DevApp/UserControl/ToolBarMenu.resx @@ -120,4 +120,311 @@ <metadata name="barManager1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"> <value>17, 17</value> </metadata> + <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" /> + <data name="barLargeButtonItem6.ImageOptions.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64"> + <value> + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAABZ0RVh0VGl0 + bGUAQmFja2dyb3VuZDtGaWxsO7QwF3QAAAMCSURBVDhPnZJrSJNRGMffLMOy1L6Yol2EbmShmQZJBSVh + F/oiReA1rEQ0tdllotbmiqwcanmbChmJBjqt1AqtnKjllaIPRRJ5S526m1vbu71zr//O2TKkjz3w4xwO + PL9znuc8TFtOONMmCWdILCM4EVYQnJesi6z8B3q2jGnJDLNTFLYZ7c1vJ9/Ka9AqE6NrcAwNrUO4X9mH + uxX9hF7klvchV9aDO7JeSIo7Ou2SxvRDDABGHOqzT3rAF4r8C4BNiZ4nOeA4DjzPY2FhAfwivANJUTeI + wIVgf/qKsnN7k9/cO4ecIE/87H8K3jwKRXkW5vRGGFkOBiOHX6wNBoLVxkNU0EkFq6nAuSgyIKkxIwKD + 9TI0iS9CuMMdmoF46EfbUX47GIXvg/Diy3VMa7XQGa3g5nlkSRVU4MpII/yTFQ8TwXOzsLHjYEceQtUb + iR+1p/BRvB/DbYXIy9gGYfN6VH44jxmdCRaOx9Xcdw5BccROjUk1hAWrjiSXYLY7At+rjqLnWgA+SYLx + OG4XXlaVIbbSHQm16zAypYTJYoPgVisVrGFuHvHL7igTwTRcAqXiOL6WHoAicSv6M3aj5PQWND0qw8j4 + FMJELjhbugrfxsZgNM8jRfyKCtYSmDXC0A23moWB+Jwfgtcxm9Cdth15JzdCXlGMGdUcRiZU8L/ohFhp + IIYn1NCbrEi60UIFblRAh8ftUpBXnuyYL1rj/SA57I3a4kJMz2qhmjNjeFKDE2kHUd1Sh/FpA/TGeSRk + NlGBOyMJ9VmUeEsFAtw/HoDqBwVQkuRZHUs6b8aEykRq12JsSk/2LLS/OMQLnzkEomAvRhTiTSVu1Q0D + UKs1mFHrSbdZKDUWghlThEk1a2dCZYHGwCHuSgMVeDDZezztkHCNFz6HlfwxbZKBJZjm7fXqyJPprVqS + qDZYSVkWRAvqHQI6xhQSLlGpNR3UHJvegJh0OWIEckSlyRF9ud5Baj0iCVEpdTiTUNVFL10qoH2gs02/ + xn0JHn9Y9w+uhOV/Bf8HmN+Yo1PuV+DdyAAAAABJRU5ErkJggg== +</value> + </data> + <data name="barLargeButtonItem6.ImageOptions.LargeImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64"> + <value> + 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 +</value> + </data> + <data name="barLargeButtonItem1.ImageOptions.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64"> + <value> + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAABx0RVh0VGl0 + bGUAUHJpbnRMYXlvdXRWaWV3O1ByaW50OyLF4Y0AAAM1SURBVDhPVZP9Txt1HMfvfzAx/uA/5K86dQ7r + nM5EnahMnIQly5gDCn2CUiilPI7CyOYYBZMlJktkm5vZNA7alVLKYNAn2l57d732+gB5+b0zmnjJJ3f5 + 5vt+uPf3/ZUml36+H7y5RnBxjYnFVQILYQKhMOPzK/jnlxmbu8Po7E/4Zm7jnb6Fd2qJ4eASnolFPIGF + +5IJbjRb1OtNqrU6etVAq9RQNZ2yUkEuqxTkshgVpVJF1Q3xNiiLPW5/CMlUbjRaFrhrMSFmmx9CcS6J + 6byxJSbGxdkXdMxEyebl/8AlrYbTfwPJtF0XBBW9ZoFbJyfUWyfo9WPUWgtZb3Kk1vlmOsJBOmeBywJc + 0qo4RudMgrCw37IsX1qIYzSO8azu/G9SskH75Cb7B1kLLKtViqrOgG8WKbCwgiH+v6RofC9sV4xjFL1F + sdIgI9fYP9JJZlQ+H/uDePIlBTMXAS4qOnbvNJJ//i6G0UQuKXTOb1GuNi1V98o254af8PHQE856HmNz + PuJDxyPSR0VBolMo6/QPT5kEy9QEQb5Q4uJcjLzaIC2UdzNlCyxXhButJXJo0jb4kNjOS16lcmQLCn1D + QSTznKtGg1yuSMdslFSxhmtqjc+6x7G5HlvArNLkUG5w2v6A09866fHeJPkqRa9nAsksiV4Tqtm8lfRe + TuP85QDmY3P+RpvjIWeEsgW2r1vr77cPEEvscd0dQDIbVqnWORS2vp7aJJ5S+LR7zNr45vlVLoc1upcV + 2ucyvHbmFg+eRnn3Qj+R7V1+dI0jjYh6aoIglT7iq+CGSPsZn3T9Q/B2/zpvnL3L67Y7Anybt678wvrT + CKe+7GVja4drDj+S2W2znnJZE+ec4Xkkxrkun0WwL1ztirWdvTSx5AHRxD6//r7JO1/08mckTo9jFGlI + XAyznopVzyqHmTzOyTAfdXqxfTdEW4eLD0Rw77XbOXWhT6j30TMc4nkswdUBk0Dcqn/raTYsV1TYFQlv + idJEE0k2hdUNsfmvaFyoxni28UJ8b7OXzguCESR3IHTPPR6yLobZ7UHfjNUwsyR9Q5PWUV13BazArjn9 + 9AyOWcpXB3xcsY/c+xvJRDliKSBA7QAAAABJRU5ErkJggg== +</value> + </data> + <data name="barLargeButtonItem1.ImageOptions.LargeImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64"> + <value> + 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 +</value> + </data> + <data name="barLargeButtonItem2.ImageOptions.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64"> + <value> + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m + dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAAbdEVYdFRpdGxlAE1vZGVsO0NvcHk7Q29weU1vZGVs + O4ktWcsAAAJgSURBVDhPjdFdSFNhHMfx1XQvbhokvdx00X3ddlEEQRB0WzeRvYBFkESRWVgstZpz5ZL5 + Oo0CaysbFBlWSos2hroU1wsWmFA3WelyO9s82862s/36P4+4zqKLDnyQB5//9zx7jgpAgdFoVHc6g75u + 11t0ud6RIDqcQbQz96ZgJ7bb437ap1mZ+TtQ2uGcQj4PkudyTG6ZTG7emQTt0xcC9KwialKi1WoNg54Z + SJIEIZrgwkICkWgKMTGDdDaHG30BFihTBtSW3oDP2vcGLb0TJACLYwzNjgDM5FrPGG4NBBESREiZHCw9 + oyxgUAZKmx2jRcdWHp0du9Hux49fUaTSMpra/SxgVAY0VztZIA8xmeWWkjIXF2V+bJPNi2/zAhKSDFOb + lwXKlQFtfauXvzGWyCLKiFkISxmOvfWs+SW+zC0iTv+7YPWwQIUyoDvf4uHHZQMRuqwI/Y1RRExl6XfL + ePZ6BqFwHIlUBi98n6HX6ytproSwy1eVnWp8jqycRyiaJhIWBInelsHcyCBmG2oKPpj3I9C6owgLGE6a + hiiQwzwNRuJpGk4jHEti9nIN4HVxKdd1DBzaDAgPufi0ma954PjFp8jQZf2MLH/vu8OfcODKSMEJ+znU + 9W8p8n346J9Add0Tfttx9hUSEvaccWNCBOeeDmFf/SYsop8b/9rE18qArur0fd+R2sc4XPsI7qH3PNDw + aoGr7p7gA86PO7lLD7byddfejbDuXm9jgdVETyrIGrLhfwK0by3R8G+pRI9uW5UDSruOrSuy/WBlGx9m + zz8CKycyKpQrsLWW0D6V6jdzUIrq8TztCAAAAABJRU5ErkJggg== +</value> + </data> + <data name="barLargeButtonItem2.ImageOptions.LargeImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64"> + <value> + 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 + RU5ErkJggg== +</value> + </data> + <data name="barLargeButtonItem8.ImageOptions.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64"> + <value> + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAB10RVh0VGl0 + bGUARXhwb3J0O1hscztFeHBvcnRUb1hscztMoJn+AAACZklEQVQ4T2WTWWsTYRSGszdtg1r/Rk3Tmv4S + RWhUEAQFJVqLF7FNmqSpXdKqRazQDW/0pimBghKsuMRWaNJ7b70UsWaZJTOTmSSv5/tmGqY68CQzgfc5 + 3zln4qDLSbgIN+Gx8Nrw/QP7zQnAwWCXK7tZKi5vHYGxtFVGdrOMJWJx44goYWG9jIW1Q8yvlZBZLe4z + iV3gyW6U0aEnDn2YdDjtE9ommRffWMpvF3jn1g95SNVaUIiGaiIrBkdSWhAJvdVGamWfpfrsAh+zMoGs + moGTEA/KLQgNA3WiabQRf/KFpfpPCVIrX/lxJUWH1NCpmtENMWqyjiqhNdv4cPDjP0HPFFlZnwIFJ3JX + MDrfg9E5hg/hxz5cnGV4MTLjxXCaSHkQSroRSrjzTOCPLX7kgpps8HBTNxAmgarpCFO4oerd8PO9JOqi + hpqoIphw8SP0TszuoUUTrko6CXzQaJCsskIzGcn4eFvDaQ+vXJc0DE27MUTh4JQliKYKXHBcb/LKLz/P + 8PDqpzRV9kBsNLvHXnmfRFVQEIy7SeDkgr47ibcwWh38rmu2yl7ILEiVRVkze7YqPy1M47iq4MKkKei/ + PbkLg1b0q6rxgSm0DdazRIIQVRasnp9RsFJTeXj5XRyDj0xB4GZsFzoJflZURN9ctgZm9swqd3uOu6gq + w0lhBwZjDr6FwI2Hef6SiLRzgQZWp53z3Ys6KoKOP4JG89F4i/nCd1Z1wP4e+CN3XxevP9jB1fEdsO9r + 4zlE7ufoeRuRe3QfNRmLbuPSrVcHlDn1IrG/ci9xhjhLnLMYsHHegt0HCLcpgOMvLlVmbi0MtN8AAAAA + SUVORK5CYII= +</value> + </data> + <data name="barLargeButtonItem8.ImageOptions.LargeImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64"> + <value> + iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABGdBTUEAALGPC/xhBQAAAB10RVh0VGl0 + bGUARXhwb3J0O1hscztFeHBvcnRUb1hscztMoJn+AAAIXUlEQVRYR8WXeVSU1xnG2SGmSkia9Nictqfp + Hz0JcUFQwBVEWcQQREUEVJaBKI0EEAYG2RFcUARRE1ojDWrSVqNWo2kbMdVq7DEJGo5VWVxA1lnYmRkY + 4On73pkhGAbT//qd85w7fHPme37vdr+LGQCznJycMdFlbpCFQZbPkJUJ8X3z8c+cTOxtCsCi9I/XL5dW + foUDH32FUlbFdRyo0K8lJP16DSVHr2H/h9dQTGvxh/8Sytl3Mc8AwvDPBJkAwD8gWbLpj12Dgzr0qwfR + 3aNGh7IXj5904uuaZlRdr0fazjP59BxrkoC4W9c+IVAW3zMFYFXy0XX2gG5kFDrdCK0jGNKNCg3S3yy1 + Roe+gUF09mjQpuhDQ6MKRX+4gtFR4Nylu0jIObmDnmVDEhDjfYzie6YBKKV8DZERy2g6OEQAQyPQGqTW + DKK3fxAK1QAeNCqw49AlAdCn1uHMP+5gs+x4AT3PlmSyLyYDsL5R3SgA2HCIjPTmelOxDo5AQyXQGsqg + 7FajvlGJzL0XBYCavmeIUxe+Q1Ti0UJ6ph1pAsQYwNydtlUuhXZwKbCF8w5bzMm3EXLKI+VYY3aOFWZl + WWNmliVmZlhhRoYlIo8sJSMd1FodVNQH9Y8USC44KwC4VBoBMYw/natGWNz7JiHGAFwKbbHqhAMCj9lj + ZaU9/CumwffoNHgf+QmW/X4KvMqnwPN9O3gcssPiMlssKrXBm+kWwrxfO4SuXg3qHimxNeskPQ4CYniE + QIYZZBgfn7mJYEkpQ4iemADgTJEHHHOg9Oqw8NBz0NBD55fZYUAzBPdSW7jvt8XBK9no7tUKM5ciS7wp + s0A/fd9PzdhF9x+1diGj6DxiU09AknIckuTjiN7GOkaluEXl+ZzczKZwFkwCcORa7TAWHLQTHT7/gB11 + OQHst4FrsQ26+7Rw2WstzF32WMJRZi4AemkSekgdnQNoaOrE7futuFnTiBvVj3H15kNcvlGPq/9uMAJM + NQnA9ea0l9/IE+YfXMsVkfPD2XzePmuUfZlNI6eGM5k777KAY5o5etVDVGeaBFo5C4ou2hNoIlrlfWhq + 6cYDAqp9qKAJUSJ99wUGmEaymghAzeZHNTdG3k/GbiUE0K+FK5nP20tRU+QlVZlQdKoxp9ACb6TqAXpY + NIqcIV67aO1kGJqMdlU/Wjp6aaPqQ9ru8wxgbxLAKdcavtRwanoYR84bjBtF3mOoeenlLKi6NMK8+IsM + ODGA1BzdZNjTR+YCQK8uo+i3coJoo4xw5qQFAuAFkwCzCcCbup3N3Ups4MZ1F5F/X3Pn3RYi8jkFFnAq + MNcDPGU4CBWtKl57tFAa1EFl4Uwm559lAAeTALNyrD6flc2zboWZmSSa8xnbqdNp1LjbHVlUc0dKO6f+ + DakZIsu9xyJlc15VJKOxkrZoRbdefZTZbfmnGeBFkwDGG3TxRjH1S+rcURpmUVtjmkWkbGYwNHwWjUcT + wPVmtRnUqugVapH30u81+OxSDQNMJz1P4releD+YApjGI8MAxtoaI+UIjeIo5WRcePgUJKllCJVkIy23 + HCnZh5GUXoatacXYklQESXwhNm3JQ5gkEyvWxCMoIgMB4alXycfaFACT2ctoZEYYgIzHmwqNpViLFoow + WlqK/H2VWBeZAXnXgMiGPiMDogFblSzKCMk7cAvS8srxVpiUs/HcZAAvpO36DCP0KuaGUnK0rDFjfV3l + 9Lm5owcRSfuQu6cCazbKhPGdh0rUNCjwXYMct+vl+O2M5Xh9pg++re2A10oJQmOysWJdEgM8PxmAg7Tw + r3oANiRzBa0KNjaad/OIadDU1onw+N3I3HkEgaEpImo2v03mt+rkqK6Vw9HJD+4eG9Cs6McS3wiERGfC + e3U8A0ydDODFlB1nBIDemDcVFhvr1cGifeFRiwLr4wogy6e0BieINN+qUwhzjvgb0mzXVVjsF4MntDsu + XL4BwZHb4fV2HAPYmwLgY9RLSbmn6W02+gND6nYybSeJVaWmU5AcwbG5SMk5DN+g3wmA6roOfHufzElf + k27ea0cTb80dfXD3DBWl8vCPZQCHyQB+mpD96RgAmxnF5mzMaiXVPm7H6qgsJGYcxLKAd7DUPwaeK6Kx + xCcSi302YeGycMz3CiPj9XDzCIHrknUICk/FIp9oBnjpKQC6xGmI9PJ7macEgD5SMicZTYWUarSQ7j1o + Q+DGdMSnlSBscx5C38nD+tgchFCjrYvOQjDVe21EOlZvkiFoQyoCqfsDQ6VYsGwTA7w8KcC7GX+Bjk4U + bM5iw1beXAzjxObNtN6pe4KV1HxxKcUIoX3gxy5/6pOAkBS4eYYzwM/o1gQAPrG8EifTAwhjg9i0hTqZ + xR3NqqlthG9wEmIS9mANNRdfxr1CRROjohLqm1hD50YNvKn5/NcmYd7iUAaYbgpA9MDmtE/oOEWnXjpy + DfCxi17TevH7nw4hLDqsNDxuhndQPKLfLURguFQAGEdViEoop+ZlcRN7+EngtzoRzguCGeBVUwBiJ4xK + OHolVnoCMSmkZDpikaKTj4kjVhQdsaKSSImVqPikCksD4mirzRfpzTxXi+1n7yP19D0kn7yHhD/fxdaP + /4O4E3REr7yDhV4b4bPqPTi5r2GAXzwFYIDgfyL4HM8Hh1dI/PL4uUGvmtAcjxWxtLvlivQWXW3Hrn+2 + oaCqFblftCDjb82QXXgC6bkmbCO5LgmlLMTS3hDEAL80BcBZYAjOBPcDwzxL0109Qr5ZsDyCxk+CwNwq + vJV1CX6yv8NbehGeieexaOtZuG/+FHNjTsJl/lrMXbQer8/yqabfPj0F40UXg/wvEj1D+hXp1+P02jj9 + 5gfi7zm7378N/3+C2X8Bg3DBnOf3rOsAAAAASUVORK5CYII= +</value> + </data> + <data name="barLargeButtonItem3.ImageOptions.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64"> + <value> + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAA50RVh0VGl0 + bGUAWGxzO1NlbmRxQ3oaAAACiElEQVQ4T3WQ2U8TYRTFhxYKuP4hCBXhD/HBV5cXFawkqJgCXYSyRCWF + EMGkSX0gKgKxYWklBdkqJqaEQFQwhspSKoHQhek2nZbC8X7TOtIEJzmZb+Z+53fuvRyAHFW2F9pIqGxj + UqGiVYUrLUwFKG8uwOUm0pN8qI1KqPVK22kAJFOHqCBAQkyhgszxREo2d08YwUdEHEQSKNUrcs0ZgAqi + mJaShcQhyk0qROMpMudLyXxURJlBiTIylzaeAmDJvTPNkrlnuomS8xGJJ+W2u5xGhMICSnVKAuSBo0eR + lZLpX3IBYsxIyZGYmJk5m2weN8AfEnCpgQCWfvfsq6FFWAcXsbSyIy1MEDIzRwmgpuRwduZOMgYPEpK5 + w6FDST0BdM+d8O3yODo6Rjp9jIcD17ILy8zMkuWZdQpKZcojM4cSLWfj2nrmMDa1gg/TqxIkmTqCmEzL + Yt/s//KKF/PuNXxa2GRzF/7dGdfyYo7aE+Gc+wmzZQpxISm1HggKiMboTPPXmV7D8tYFj/cAevNHBiiS + AU3dswjyCaz7eLwf/4ZHpiFs/Q5SDVjf2scNTS9e9rnw45cf69th1D+bZIBiGWDsnEGAF/F50YcJlwdb + vhCazcO4eqsLtYY+LCxvYnRiFfNUX/PyeNzuZIAzMqCxYwqrHj8G7V8RjqWkbja2g1j67iN5qZuQ9J/V + vyzv4IFpnAHOygDt00lYB9wIkdEfyipw4pwVq1vfuVFjdDDAeRlQ1+rEfjCOPVraXiCO3UDuWxbV2b3q + xtFcwPWaN7P3DQ5oDHZo9HbcI1XrxujiGKroclXDCO7Wj+COdgS3tcO4WdvvylkiPUWkc6QL/9HFE2Lf + xSRFBgDuD6syoJrXuXr4AAAAAElFTkSuQmCC +</value> + </data> + <data name="barLargeButtonItem3.ImageOptions.LargeImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64"> + <value> + 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 + gCow0mM+bAAAAABJRU5ErkJggg== +</value> + </data> </root> \ No newline at end of file -- Gitblit v1.9.3