DevApp/Gs.DevApp/App.config | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
DevApp/Gs.DevApp/DevFrm/Sys/EasyCode.Designer.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
DevApp/Gs.DevApp/DevFrm/Sys/EasyCode.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
DevApp/Gs.DevApp/DevFrm/Sys/EasyRpt.Designer.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
DevApp/Gs.DevApp/DevFrm/Sys/EasyRpt.resx | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
DevApp/Gs.DevApp/Gs.DevApp.csproj | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
DevApp/Gs.Setup/Gs.Setup.vdproj | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
DevApp/GsDevSolution.sln | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
DevApp/Gs.DevApp/App.config
@@ -1,48 +1,60 @@ <?xml version="1.0" encoding="utf-8"?> <configuration> <configSections> <sectionGroup name="applicationSettings" type="System.Configuration.ApplicationSettingsGroup, System"> <section name="DevExpress.LookAndFeel.Design.AppSettings" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" requirePermission="false" /> </sectionGroup> <sectionGroup name="userSettings" type="System.Configuration.UserSettingsGroup, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" > <section name="Gs.DevApp.Properties.Settings" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowExeDefinition="MachineToLocalUser" requirePermission="false" /> </sectionGroup> </configSections> <applicationSettings> <DevExpress.LookAndFeel.Design.AppSettings> <setting name="DPIAwarenessMode" serializeAs="String"> <value>System</value> </setting> <setting name="RegisterBonusSkins" serializeAs="String"> <value>True</value> </setting> </DevExpress.LookAndFeel.Design.AppSettings> </applicationSettings> <startup> <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8" /> </startup> <appSettings> <add key="WebApiUrl" value="http://localhost:5263/"/> <add key="LogPath" value="logs"/> <add key="ProductName" value="å¹¿æ·±ç§æ G-MES V2.0"/> <add key="PageSize" value="50"/> <add key="Version" value="0.2"/> <add key="AutoUpdaterXml" value="https://dianbei.top/AutoUpdater/AutoUpdater.xml"/> </appSettings> <userSettings> <Gs.DevApp.Properties.Settings> <setting name="userName" serializeAs="String"> <value /> </setting> <setting name="userPwd" serializeAs="String"> <value /> </setting> <setting name="remember" serializeAs="String"> <value>False</value> </setting> <setting name="orgGuid" serializeAs="String"> <value /> </setting> </Gs.DevApp.Properties.Settings> </userSettings> <configSections> <sectionGroup name="applicationSettings" type="System.Configuration.ApplicationSettingsGroup, System"> <section name="DevExpress.LookAndFeel.Design.AppSettings" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" requirePermission="false" /> </sectionGroup> <sectionGroup name="userSettings" type="System.Configuration.UserSettingsGroup, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> <section name="Gs.DevApp.Properties.Settings" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowExeDefinition="MachineToLocalUser" requirePermission="false" /> </sectionGroup> </configSections> <applicationSettings> <DevExpress.LookAndFeel.Design.AppSettings> <setting name="DPIAwarenessMode" serializeAs="String"> <value>System</value> </setting> <setting name="RegisterBonusSkins" serializeAs="String"> <value>True</value> </setting> </DevExpress.LookAndFeel.Design.AppSettings> </applicationSettings> <startup> <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8" /> </startup> <appSettings> <add key="WebApiUrl" value="http://localhost:5263/" /> <add key="LogPath" value="logs" /> <add key="ProductName" value="å¹¿æ·±ç§æ G-MES V2.0" /> <add key="PageSize" value="50" /> <add key="Version" value="3.0" /> <add key="AutoUpdaterXml" value="https://dianbei.top/AutoUpdater/AutoUpdater.xml" /> </appSettings> <userSettings> <Gs.DevApp.Properties.Settings> <setting name="userName" serializeAs="String"> <value /> </setting> <setting name="userPwd" serializeAs="String"> <value /> </setting> <setting name="remember" serializeAs="String"> <value>False</value> </setting> <setting name="orgGuid" serializeAs="String"> <value /> </setting> </Gs.DevApp.Properties.Settings> </userSettings> <system.web> <membership defaultProvider="ClientAuthenticationMembershipProvider"> <providers> <add name="ClientAuthenticationMembershipProvider" type="System.Web.ClientServices.Providers.ClientFormsAuthenticationMembershipProvider, System.Web.Extensions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" serviceUri="" /> </providers> </membership> <roleManager defaultProvider="ClientRoleProvider" enabled="true"> <providers> <add name="ClientRoleProvider" type="System.Web.ClientServices.Providers.ClientRoleProvider, System.Web.Extensions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" serviceUri="" cacheTimeout="86400" /> </providers> </roleManager> </system.web> </configuration> DevApp/Gs.DevApp/DevFrm/Sys/EasyCode.Designer.cs
@@ -45,11 +45,21 @@ this.label1 = new System.Windows.Forms.Label(); this.xtraTabPage2 = new DevExpress.XtraTab.XtraTabPage(); this.button1 = new System.Windows.Forms.Button(); this.xtraTabPage3 = new DevExpress.XtraTab.XtraTabPage(); this.panelControl1 = new DevExpress.XtraEditors.PanelControl(); this.progressBar1 = new System.Windows.Forms.ProgressBar(); this.btnUp = new DevExpress.XtraEditors.SimpleButton(); this.btnUpSelect = new System.Windows.Forms.Button(); this.txtUpUrl = new System.Windows.Forms.TextBox(); this.label7 = new System.Windows.Forms.Label(); ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit(); this.xtraTabControl1.SuspendLayout(); this.xtraTabPage1.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.txt_sqlconn.Properties)).BeginInit(); this.xtraTabPage2.SuspendLayout(); this.xtraTabPage3.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.panelControl1)).BeginInit(); this.panelControl1.SuspendLayout(); this.SuspendLayout(); // // xtraTabControl1 @@ -62,7 +72,8 @@ this.xtraTabControl1.TabIndex = 0; this.xtraTabControl1.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] { this.xtraTabPage1, this.xtraTabPage2}); this.xtraTabPage2, this.xtraTabPage3}); // // xtraTabPage1 // @@ -119,7 +130,6 @@ this.btnToPath.TabIndex = 265; this.btnToPath.Text = "éæ©è·¯å¾"; this.btnToPath.UseVisualStyleBackColor = true; this.btnToPath.Click += new System.EventHandler(this.btnToPath_Click_1); // // txtCreateDBPath // @@ -209,13 +219,75 @@ // // button1 // this.button1.Location = new System.Drawing.Point(39, 70); this.button1.Location = new System.Drawing.Point(113, 81); this.button1.Name = "button1"; this.button1.Size = new System.Drawing.Size(194, 41); this.button1.TabIndex = 1; this.button1.Text = "ç¨æ·æéæ¥è¡¨"; this.button1.UseVisualStyleBackColor = true; this.button1.Click += new System.EventHandler(this.button1_Click); // // xtraTabPage3 // this.xtraTabPage3.Controls.Add(this.panelControl1); this.xtraTabPage3.Name = "xtraTabPage3"; this.xtraTabPage3.Size = new System.Drawing.Size(887, 492); this.xtraTabPage3.Text = "Devæä»¶ä¸ä¼ "; // // panelControl1 // this.panelControl1.Controls.Add(this.progressBar1); this.panelControl1.Controls.Add(this.btnUp); this.panelControl1.Controls.Add(this.btnUpSelect); this.panelControl1.Controls.Add(this.txtUpUrl); this.panelControl1.Controls.Add(this.label7); this.panelControl1.Location = new System.Drawing.Point(106, 83); this.panelControl1.Name = "panelControl1"; this.panelControl1.Size = new System.Drawing.Size(609, 331); this.panelControl1.TabIndex = 0; // // progressBar1 // this.progressBar1.Location = new System.Drawing.Point(84, 271); this.progressBar1.Name = "progressBar1"; this.progressBar1.Size = new System.Drawing.Size(100, 23); this.progressBar1.TabIndex = 271; // // btnUp // this.btnUp.Location = new System.Drawing.Point(157, 179); this.btnUp.Name = "btnUp"; this.btnUp.Size = new System.Drawing.Size(94, 29); this.btnUp.TabIndex = 270; this.btnUp.Text = "ç¡®å®ä¸ä¼ "; // // btnUpSelect // this.btnUpSelect.Location = new System.Drawing.Point(472, 97); this.btnUpSelect.Margin = new System.Windows.Forms.Padding(4); this.btnUpSelect.Name = "btnUpSelect"; this.btnUpSelect.Size = new System.Drawing.Size(79, 26); this.btnUpSelect.TabIndex = 269; this.btnUpSelect.Text = "éæ©è·¯å¾"; this.btnUpSelect.UseVisualStyleBackColor = true; // // txtUpUrl // this.txtUpUrl.Location = new System.Drawing.Point(157, 97); this.txtUpUrl.Margin = new System.Windows.Forms.Padding(4); this.txtUpUrl.Name = "txtUpUrl"; this.txtUpUrl.Size = new System.Drawing.Size(307, 26); this.txtUpUrl.TabIndex = 268; // // label7 // this.label7.AutoSize = true; this.label7.Location = new System.Drawing.Point(44, 101); this.label7.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label7.Name = "label7"; this.label7.Size = new System.Drawing.Size(83, 18); this.label7.TabIndex = 267; this.label7.Text = "éæ©æä»¶ï¼"; // // EasyCode // @@ -231,6 +303,10 @@ this.xtraTabPage1.PerformLayout(); ((System.ComponentModel.ISupportInitialize)(this.txt_sqlconn.Properties)).EndInit(); this.xtraTabPage2.ResumeLayout(false); this.xtraTabPage3.ResumeLayout(false); ((System.ComponentModel.ISupportInitialize)(this.panelControl1)).EndInit(); this.panelControl1.ResumeLayout(false); this.panelControl1.PerformLayout(); this.ResumeLayout(false); } @@ -253,5 +329,12 @@ private System.Windows.Forms.Label lbMsg; private DevExpress.XtraTab.XtraTabPage xtraTabPage2; private System.Windows.Forms.Button button1; private DevExpress.XtraTab.XtraTabPage xtraTabPage3; private DevExpress.XtraEditors.PanelControl panelControl1; private System.Windows.Forms.Button btnUpSelect; private System.Windows.Forms.TextBox txtUpUrl; private System.Windows.Forms.Label label7; private DevExpress.XtraEditors.SimpleButton btnUp; private System.Windows.Forms.ProgressBar progressBar1; } } DevApp/Gs.DevApp/DevFrm/Sys/EasyCode.cs
@@ -5,7 +5,10 @@ using System.Data; using System.Data.SqlClient; using System.Drawing; using System.IO; using System.Linq; using System.Net; using System.Net.Http; using System.Text; using System.Threading.Tasks; using System.Windows.Forms; @@ -17,47 +20,30 @@ public EasyCode() { InitializeComponent(); this.txt_sqlconn.Text = "Data Source=2kn4sh70028.vicp.fun,26144;Initial Catalog=gs_Mes;User ID=sa;Password =admin110"; //this.txt_sqlconn.Text = "Data Source=2kn4sh70028.vicp.fun,26144;Initial Catalog=gs_Mes;User ID=sa;Password =admin110"; this.txt_sqlconn.Text = "Data Source=.;Initial Catalog=gs_Mes;User ID=sa;Password =admin110"; getTable(); } /// <summary> /// è¯»åæ°æ®åºè¡¨ /// </summary> private void getTable() { string strConn = txt_sqlconn.Text.Trim(); DataSet dset = new DataSet(); using (SqlConnection connection = new SqlConnection(strConn)) { connection.Open(); SqlCommand cmd = new SqlCommand(); cmd.Connection = connection; cmd.CommandText = "SELECT '--è¯·éæ©--' as TABLE_NAME union all SELECT TABLE_NAME FROM INFORMATION_SCHEMA.TABLES WHERE TABLE_TYPE = 'BASE TABLE' order by TABLE_NAME desc"; using (SqlDataAdapter dt = new SqlDataAdapter(cmd)) { dt.Fill(dset, "0"); } } if (dset != null && dset.Tables.Count > 0) { txt_table.DataSource = dset.Tables[0]; txt_table.DisplayMember = "TABLE_NAME"; txt_table.ValueMember = "TABLE_NAME"; txt_category.SelectedIndex = txt_table.SelectedIndex = 0; } this.btnToPath.Click += BtnToPath_Click; this.btnUpSelect.Click += BtnUpSelect_Click; this.btnUp.Click += BtnUp_Click; } /// <summary> /// éæ©çæè·¯å¾ /// </summary> /// <param name="sender"></param> /// <param name="e"></param> private void btnToPath_Click(object sender, EventArgs e) private void BtnToPath_Click(object sender, EventArgs e) { string _GetfilePath = FileSelector.BrowseFilePathForSave(); txtCreateDBPath.Text = _GetfilePath; } /// <summary> /// ç¡®å®çæ /// </summary> /// <param name="sender"></param> /// <param name="e"></param> private void btnOk_Click(object sender, EventArgs e) { if (txt_sqlconn.Text.Trim() == "") @@ -87,6 +73,32 @@ ReadResxFile(dt, _strName); string path = txtCreateDBPath.Text; lbMsg.Text = "çææåï¼è·¯å¾ï¼" + path; } /// <summary> /// è¯»åæ°æ®åºè¡¨ /// </summary> private void getTable() { string strConn = txt_sqlconn.Text.Trim(); DataSet dset = new DataSet(); using (SqlConnection connection = new SqlConnection(strConn)) { connection.Open(); SqlCommand cmd = new SqlCommand(); cmd.Connection = connection; cmd.CommandText = "SELECT '--è¯·éæ©--' as TABLE_NAME union all SELECT TABLE_NAME FROM INFORMATION_SCHEMA.TABLES WHERE TABLE_TYPE = 'BASE TABLE' order by TABLE_NAME desc"; using (SqlDataAdapter dt = new SqlDataAdapter(cmd)) { dt.Fill(dset, "0"); } } if (dset != null && dset.Tables.Count > 0) { txt_table.DataSource = dset.Tables[0]; txt_table.DisplayMember = "TABLE_NAME"; txt_table.ValueMember = "TABLE_NAME"; txt_category.SelectedIndex = txt_table.SelectedIndex = 0; } } /// <summary> /// 读ååå @@ -293,17 +305,72 @@ sw.Close(); sw.Dispose(); } private void btnToPath_Click_1(object sender, EventArgs e) { string _GetfilePath = FileSelector.BrowseFilePathForSave(); txtCreateDBPath.Text = _GetfilePath; } /// <summary> /// æ¥è¡¨è®¾è®¡ /// </summary> /// <param name="sender"></param> /// <param name="e"></param> private void button1_Click(object sender, EventArgs e) { EasyRpt frm = new EasyRpt("001"); frm.Show(); } /// <summary> /// éæ©ä¸ä¼ æä»¶ /// </summary> /// <param name="sender"></param> /// <param name="e"></param> private void BtnUpSelect_Click(object sender, EventArgs e) { OpenFileDialog openFileDialog = new OpenFileDialog(); // 设置åå§ç®å½ openFileDialog.InitialDirectory = "c:\\"; // 设置æä»¶è¿æ»¤é项ï¼å¦ï¼"ææ¬æä»¶ (*.txt)|*.txt|æææä»¶ (*.*)|*.*" openFileDialog.Filter = "ææ¬æä»¶ (*.txt)|*.txt|æææä»¶ (*.*)|*.*"; // 设置æ é¢ openFileDialog.Title = "éæ©æä»¶"; // æ¾ç¤ºå¯¹è¯æ¡ DialogResult result = openFileDialog.ShowDialog(); // ç¡®è®¤ç¨æ·æ²¡æåæ¶æä½ if (result == DialogResult.OK) { // è·åéä¸çæä»¶è·¯å¾ string filePath = openFileDialog.FileName; Console.WriteLine($"éä¸çæä»¶: {filePath}"); txtUpUrl.Text = filePath; } } private async void BtnUp_Click(object sender, EventArgs e) { string WebApiUrl = System.Configuration.ConfigurationSettings.AppSettings.Get("WebApiUrl").ToString(); string address = WebApiUrl + "Upload/UploadFile"; string filePath = txtUpUrl.Text.Trim(); string apiUrl = address; // æ¿æ¢ä¸ºä½ çAPIå°å await UploadFileAsync(apiUrl, filePath); } private async Task UploadFileAsync(string url, string filePath) { using (var httpClient = new HttpClient()) using (var form = new MultipartFormDataContent()) { httpClient.DefaultRequestHeaders.Add("token", ToolBox.UtilityHelper.GetBasicAuthTicket()); using (var fs = File.OpenRead(filePath)) using (var streamContent = new StreamContent(fs)) { form.Add(streamContent, "file", Path.GetFileName(filePath)); var response = await httpClient.PostAsync(url, form); string responseString = await response.Content.ReadAsStringAsync(); MessageBox.Show(responseString); } } } } } } DevApp/Gs.DevApp/DevFrm/Sys/EasyRpt.Designer.cs
@@ -87,6 +87,7 @@ this.Controls.Add(this.panel2); this.Name = "EasyRpt"; this.Text = "EasyRpt"; this.WindowState = System.Windows.Forms.FormWindowState.Maximized; ((System.ComponentModel.ISupportInitialize)(this.designerControl1)).EndInit(); this.ResumeLayout(false); DevApp/Gs.DevApp/DevFrm/Sys/EasyRpt.resx
@@ -121,7 +121,7 @@ <value>17, 17</value> </metadata> <data name="designerControl1.LayoutState" xml:space="preserve"> <value><?xml version="1.0" encoding="utf-8"?><Config><Designer><DockNew Text="&lt;dotnetbarlayout version=&quot;6&quot; zorder=&quot;3,4,1,2&quot;&gt;&lt;docksite size=&quot;0&quot; dockingside=&quot;Top&quot; originaldocksitesize=&quot;0&quot; /&gt;&lt;docksite size=&quot;0&quot; dockingside=&quot;Bottom&quot; originaldocksitesize=&quot;0&quot;&gt;&lt;dockcontainer orientation=&quot;1&quot; w=&quot;0&quot; h=&quot;0&quot;&gt;&lt;barcontainer w=&quot;0&quot; h=&quot;95&quot;&gt;&lt;bar name=&quot;MessagesWindowBar&quot; dockline=&quot;0&quot; layout=&quot;2&quot; dockoffset=&quot;0&quot; state=&quot;2&quot; dockside=&quot;4&quot; visible=&quot;false&quot;&gt;&lt;items&gt;&lt;item name=&quot;MessagesWindow&quot; origBar=&quot;&quot; origPos=&quot;-1&quot; pos=&quot;0&quot; visible=&quot;false&quot; /&gt;&lt;/items&gt;&lt;/bar&gt;&lt;/barcontainer&gt;&lt;/dockcontainer&gt;&lt;/docksite&gt;&lt;docksite size=&quot;0&quot; dockingside=&quot;Left&quot; originaldocksitesize=&quot;0&quot; /&gt;&lt;docksite size=&quot;250&quot; dockingside=&quot;Right&quot; originaldocksitesize=&quot;0&quot;&gt;&lt;dockcontainer orientation=&quot;1&quot; w=&quot;0&quot; h=&quot;0&quot;&gt;&lt;barcontainer w=&quot;247&quot; h=&quot;182&quot;&gt;&lt;bar name=&quot;DictionaryWindowBar&quot; dockline=&quot;0&quot; layout=&quot;2&quot; dockoffset=&quot;0&quot; state=&quot;2&quot; dockside=&quot;2&quot; visible=&quot;true&quot; seldocktab=&quot;0&quot;&gt;&lt;items&gt;&lt;item name=&quot;DictionaryWindow&quot; origBar=&quot;&quot; origPos=&quot;-1&quot; pos=&quot;0&quot; /&gt;&lt;item name=&quot;ReportTreeWindow&quot; origBar=&quot;&quot; origPos=&quot;-1&quot; pos=&quot;1&quot; /&gt;&lt;/items&gt;&lt;/bar&gt;&lt;/barcontainer&gt;&lt;barcontainer w=&quot;247&quot; h=&quot;-86&quot;&gt;&lt;bar name=&quot;PropertiesWindowBar&quot; dockline=&quot;0&quot; layout=&quot;2&quot; dockoffset=&quot;64&quot; state=&quot;2&quot; dockside=&quot;2&quot; visible=&quot;true&quot;&gt;&lt;items&gt;&lt;item name=&quot;PropertiesWindow&quot; origBar=&quot;&quot; origPos=&quot;-1&quot; pos=&quot;0&quot; /&gt;&lt;/items&gt;&lt;/bar&gt;&lt;/barcontainer&gt;&lt;/dockcontainer&gt;&lt;/docksite&gt;&lt;bars&gt;&lt;bar name=&quot;StandardToolbar&quot; dockline=&quot;0&quot; layout=&quot;0&quot; dockoffset=&quot;0&quot; state=&quot;2&quot; dockside=&quot;3&quot; visible=&quot;true&quot; /&gt;&lt;bar name=&quot;TextToolbar&quot; dockline=&quot;1&quot; layout=&quot;0&quot; dockoffset=&quot;0&quot; state=&quot;2&quot; dockside=&quot;3&quot; visible=&quot;true&quot; /&gt;&lt;bar name=&quot;BorderToolbar&quot; dockline=&quot;1&quot; layout=&quot;0&quot; dockoffset=&quot;152&quot; state=&quot;2&quot; dockside=&quot;3&quot; visible=&quot;true&quot; /&gt;&lt;bar name=&quot;StyleToolbar&quot; dockline=&quot;2&quot; layout=&quot;0&quot; dockoffset=&quot;0&quot; state=&quot;2&quot; dockside=&quot;3&quot; visible=&quot;false&quot; /&gt;&lt;bar name=&quot;LayoutToolbar&quot; dockline=&quot;2&quot; layout=&quot;0&quot; dockoffset=&quot;0&quot; state=&quot;2&quot; dockside=&quot;3&quot; visible=&quot;false&quot; /&gt;&lt;bar name=&quot;ObjectsToolbar&quot; dockline=&quot;0&quot; layout=&quot;0&quot; dockoffset=&quot;0&quot; state=&quot;2&quot; dockside=&quot;1&quot; visible=&quot;true&quot; /&gt;&lt;/bars&gt;&lt;/dotnetbarlayout&gt;"/></Designer></Config></value> <value><?xml version="1.0" encoding="utf-8"?><Config><Designer><DockNew Text="&lt;dotnetbarlayout version=&quot;6&quot; zorder=&quot;3,4,1,2&quot;&gt;&lt;docksite size=&quot;0&quot; dockingside=&quot;Top&quot; originaldocksitesize=&quot;0&quot; /&gt;&lt;docksite size=&quot;0&quot; dockingside=&quot;Bottom&quot; originaldocksitesize=&quot;0&quot;&gt;&lt;dockcontainer orientation=&quot;1&quot; w=&quot;0&quot; h=&quot;0&quot;&gt;&lt;barcontainer w=&quot;0&quot; h=&quot;95&quot;&gt;&lt;bar name=&quot;MessagesWindowBar&quot; dockline=&quot;0&quot; layout=&quot;2&quot; dockoffset=&quot;0&quot; state=&quot;2&quot; dockside=&quot;4&quot; visible=&quot;false&quot;&gt;&lt;items&gt;&lt;item name=&quot;MessagesWindow&quot; origBar=&quot;&quot; origPos=&quot;-1&quot; pos=&quot;0&quot; visible=&quot;false&quot; /&gt;&lt;/items&gt;&lt;/bar&gt;&lt;/barcontainer&gt;&lt;/dockcontainer&gt;&lt;/docksite&gt;&lt;docksite size=&quot;0&quot; dockingside=&quot;Left&quot; originaldocksitesize=&quot;0&quot; /&gt;&lt;docksite size=&quot;250&quot; dockingside=&quot;Right&quot; originaldocksitesize=&quot;0&quot;&gt;&lt;dockcontainer orientation=&quot;1&quot; w=&quot;0&quot; h=&quot;0&quot;&gt;&lt;barcontainer w=&quot;247&quot; h=&quot;92&quot;&gt;&lt;bar name=&quot;DictionaryWindowBar&quot; dockline=&quot;0&quot; layout=&quot;2&quot; dockoffset=&quot;0&quot; state=&quot;2&quot; dockside=&quot;2&quot; visible=&quot;true&quot; seldocktab=&quot;0&quot;&gt;&lt;items&gt;&lt;item name=&quot;DictionaryWindow&quot; origBar=&quot;&quot; origPos=&quot;-1&quot; pos=&quot;0&quot; /&gt;&lt;item name=&quot;ReportTreeWindow&quot; origBar=&quot;&quot; origPos=&quot;-1&quot; pos=&quot;1&quot; /&gt;&lt;/items&gt;&lt;/bar&gt;&lt;/barcontainer&gt;&lt;barcontainer w=&quot;247&quot; h=&quot;4&quot;&gt;&lt;bar name=&quot;PropertiesWindowBar&quot; dockline=&quot;0&quot; layout=&quot;2&quot; dockoffset=&quot;64&quot; state=&quot;2&quot; dockside=&quot;2&quot; visible=&quot;true&quot;&gt;&lt;items&gt;&lt;item name=&quot;PropertiesWindow&quot; origBar=&quot;&quot; origPos=&quot;-1&quot; pos=&quot;0&quot; /&gt;&lt;/items&gt;&lt;/bar&gt;&lt;/barcontainer&gt;&lt;/dockcontainer&gt;&lt;/docksite&gt;&lt;bars&gt;&lt;bar name=&quot;StandardToolbar&quot; dockline=&quot;0&quot; layout=&quot;0&quot; dockoffset=&quot;0&quot; state=&quot;2&quot; dockside=&quot;3&quot; visible=&quot;true&quot; /&gt;&lt;bar name=&quot;TextToolbar&quot; dockline=&quot;1&quot; layout=&quot;0&quot; dockoffset=&quot;0&quot; state=&quot;2&quot; dockside=&quot;3&quot; visible=&quot;true&quot; /&gt;&lt;bar name=&quot;BorderToolbar&quot; dockline=&quot;1&quot; layout=&quot;0&quot; dockoffset=&quot;152&quot; state=&quot;2&quot; dockside=&quot;3&quot; visible=&quot;true&quot; /&gt;&lt;bar name=&quot;LayoutToolbar&quot; dockline=&quot;2&quot; layout=&quot;0&quot; dockoffset=&quot;0&quot; state=&quot;2&quot; dockside=&quot;3&quot; visible=&quot;false&quot; /&gt;&lt;bar name=&quot;StyleToolbar&quot; dockline=&quot;2&quot; layout=&quot;0&quot; dockoffset=&quot;0&quot; state=&quot;2&quot; dockside=&quot;3&quot; visible=&quot;false&quot; /&gt;&lt;bar name=&quot;ObjectsToolbar&quot; dockline=&quot;0&quot; layout=&quot;0&quot; dockoffset=&quot;0&quot; state=&quot;2&quot; dockside=&quot;1&quot; visible=&quot;true&quot; /&gt;&lt;/bars&gt;&lt;/dotnetbarlayout&gt;"/></Designer></Config></value> </data> <metadata name="environmentSettings1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"> <value>202, 17</value> DevApp/Gs.DevApp/Gs.DevApp.csproj
@@ -51,6 +51,9 @@ <PropertyGroup> <ApplicationIcon>logo_ico.ico</ApplicationIcon> </PropertyGroup> <PropertyGroup> <NoWin32Manifest>true</NoWin32Manifest> </PropertyGroup> <ItemGroup> <Reference Include="AutoUpdater.NET, Version=1.9.2.0, Culture=neutral, PublicKeyToken=501435c91b35f4bc, processorArchitecture=MSIL"> <HintPath>..\packages\Autoupdater.NET.Official.1.9.2\lib\net462\AutoUpdater.NET.dll</HintPath> @@ -102,7 +105,9 @@ <HintPath>..\packages\System.Configuration.ConfigurationManager.8.0.0\lib\net462\System.Configuration.ConfigurationManager.dll</HintPath> </Reference> <Reference Include="System.Core" /> <Reference Include="System.Net.Http" /> <Reference Include="System.Runtime.Serialization" /> <Reference Include="System.Web.Extensions" /> <Reference Include="System.Xaml" /> <Reference Include="System.Xml.Linq" /> <Reference Include="System.Data.DataSetExtensions" /> DevApp/Gs.Setup/Gs.Setup.vdproj
ÎļþÒÑɾ³ý DevApp/GsDevSolution.sln
@@ -5,7 +5,7 @@ MinimumVisualStudioVersion = 10.0.40219.1 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Gs.DevApp", "Gs.DevApp\Gs.DevApp.csproj", "{A7EB5F78-699E-4514-8905-30842765E673}" EndProject Project("{54435603-DBB4-11D2-8724-00A0C9A8B90C}") = "Gs.Setup", "Gs.Setup\Gs.Setup.vdproj", "{717C4163-DFD5-4109-869B-C8D9823B49A2}" Project("{54435603-DBB4-11D2-8724-00A0C9A8B90C}") = "Gs.Setup", "Gs.Setup\Gs.Setup.vdproj", "{B9A60949-146C-450F-BE6B-FCE71859ED1A}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -17,8 +17,8 @@ {A7EB5F78-699E-4514-8905-30842765E673}.Debug|Any CPU.Build.0 = Debug|Any CPU {A7EB5F78-699E-4514-8905-30842765E673}.Release|Any CPU.ActiveCfg = Release|Any CPU {A7EB5F78-699E-4514-8905-30842765E673}.Release|Any CPU.Build.0 = Release|Any CPU {717C4163-DFD5-4109-869B-C8D9823B49A2}.Debug|Any CPU.ActiveCfg = Debug {717C4163-DFD5-4109-869B-C8D9823B49A2}.Release|Any CPU.ActiveCfg = Release {B9A60949-146C-450F-BE6B-FCE71859ED1A}.Debug|Any CPU.ActiveCfg = Debug {B9A60949-146C-450F-BE6B-FCE71859ED1A}.Release|Any CPU.ActiveCfg = Release EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE