diff --git a/.vs/Mip_v1/v16/.suo b/.vs/Mip_v1/v16/.suo index fd191b6..27cbc7f 100644 Binary files a/.vs/Mip_v1/v16/.suo and b/.vs/Mip_v1/v16/.suo differ diff --git a/Mip/Properties/AssemblyInfo.cs b/Mip/Properties/AssemblyInfo.cs index 65c0b68..0011ea9 100644 --- a/Mip/Properties/AssemblyInfo.cs +++ b/Mip/Properties/AssemblyInfo.cs @@ -32,5 +32,5 @@ using System.Runtime.InteropServices; // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.1.4.0")] -[assembly: AssemblyFileVersion("1.1.4.0")] +[assembly: AssemblyVersion("1.1.6.0")] +[assembly: AssemblyFileVersion("1.1.6.0")] diff --git a/Mip/classSQL.cs b/Mip/classSQL.cs index e7a0a4d..0a596bd 100644 --- a/Mip/classSQL.cs +++ b/Mip/classSQL.cs @@ -374,8 +374,11 @@ namespace Mip string cmd = Command.ToString(); if (cmd.Substring(0, 6).ToUpper() == "SELECT") { - if (cmd.EndsWith(";")) cmd = cmd.Remove(cmd.Length - 1, 1) + " LIMIT " + classUser.LimitSqlPrikazu.ToString() + ";"; - else cmd = cmd + " LIMIT " + classUser.LimitSqlPrikazu.ToString() + ";"; + if (!cmd.Contains("LIMIT")) + { + if (cmd.EndsWith(";")) cmd = cmd.Remove(cmd.Length - 1, 1) + " LIMIT " + classUser.LimitSqlPrikazu.ToString() + ";"; + else cmd = cmd + " LIMIT " + classUser.LimitSqlPrikazu.ToString() + ";"; + } } Command = cmd; diff --git a/Mip/frmMain.Designer.cs b/Mip/frmMain.Designer.cs index 1001246..5bb6b0a 100644 --- a/Mip/frmMain.Designer.cs +++ b/Mip/frmMain.Designer.cs @@ -29,19 +29,19 @@ private void InitializeComponent() { System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(frmMain)); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle7 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle8 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataVisualization.Charting.ChartArea chartArea7 = new System.Windows.Forms.DataVisualization.Charting.ChartArea(); - System.Windows.Forms.DataVisualization.Charting.Legend legend7 = new System.Windows.Forms.DataVisualization.Charting.Legend(); - System.Windows.Forms.DataVisualization.Charting.Series series10 = new System.Windows.Forms.DataVisualization.Charting.Series(); - System.Windows.Forms.DataVisualization.Charting.Series series11 = new System.Windows.Forms.DataVisualization.Charting.Series(); - System.Windows.Forms.DataVisualization.Charting.ChartArea chartArea8 = new System.Windows.Forms.DataVisualization.Charting.ChartArea(); - System.Windows.Forms.DataVisualization.Charting.Legend legend8 = new System.Windows.Forms.DataVisualization.Charting.Legend(); - System.Windows.Forms.DataVisualization.Charting.Series series12 = new System.Windows.Forms.DataVisualization.Charting.Series(); - System.Windows.Forms.DataVisualization.Charting.DataPoint dataPoint13 = new System.Windows.Forms.DataVisualization.Charting.DataPoint(1D, 9.5D); - System.Windows.Forms.DataVisualization.Charting.DataPoint dataPoint14 = new System.Windows.Forms.DataVisualization.Charting.DataPoint(2D, 9.25D); - System.Windows.Forms.DataVisualization.Charting.DataPoint dataPoint15 = new System.Windows.Forms.DataVisualization.Charting.DataPoint(3D, 8.84D); - System.Windows.Forms.DataVisualization.Charting.DataPoint dataPoint16 = new System.Windows.Forms.DataVisualization.Charting.DataPoint(4D, 8.67D); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataVisualization.Charting.ChartArea chartArea1 = new System.Windows.Forms.DataVisualization.Charting.ChartArea(); + System.Windows.Forms.DataVisualization.Charting.Legend legend1 = new System.Windows.Forms.DataVisualization.Charting.Legend(); + System.Windows.Forms.DataVisualization.Charting.Series series1 = new System.Windows.Forms.DataVisualization.Charting.Series(); + System.Windows.Forms.DataVisualization.Charting.Series series2 = new System.Windows.Forms.DataVisualization.Charting.Series(); + System.Windows.Forms.DataVisualization.Charting.ChartArea chartArea2 = new System.Windows.Forms.DataVisualization.Charting.ChartArea(); + System.Windows.Forms.DataVisualization.Charting.Legend legend2 = new System.Windows.Forms.DataVisualization.Charting.Legend(); + System.Windows.Forms.DataVisualization.Charting.Series series3 = new System.Windows.Forms.DataVisualization.Charting.Series(); + System.Windows.Forms.DataVisualization.Charting.DataPoint dataPoint1 = new System.Windows.Forms.DataVisualization.Charting.DataPoint(1D, 9.5D); + System.Windows.Forms.DataVisualization.Charting.DataPoint dataPoint2 = new System.Windows.Forms.DataVisualization.Charting.DataPoint(2D, 9.25D); + System.Windows.Forms.DataVisualization.Charting.DataPoint dataPoint3 = new System.Windows.Forms.DataVisualization.Charting.DataPoint(3D, 8.84D); + System.Windows.Forms.DataVisualization.Charting.DataPoint dataPoint4 = new System.Windows.Forms.DataVisualization.Charting.DataPoint(4D, 8.67D); this.checkBox65 = new System.Windows.Forms.CheckBox(); this.checkBox66 = new System.Windows.Forms.CheckBox(); this.checkBox67 = new System.Windows.Forms.CheckBox(); @@ -548,6 +548,7 @@ this.button98 = new System.Windows.Forms.Button(); this.dataGridView7 = new System.Windows.Forms.DataGridView(); this.tabPage13 = new System.Windows.Forms.TabPage(); + this.button205 = new System.Windows.Forms.Button(); this.button181 = new System.Windows.Forms.Button(); this.dataGridViewVyhodnocovanie = new System.Windows.Forms.DataGridView(); this.tabPage14 = new System.Windows.Forms.TabPage(); @@ -906,7 +907,6 @@ this.pictureBox4 = new System.Windows.Forms.PictureBox(); this.label175 = new System.Windows.Forms.Label(); this.label182 = new System.Windows.Forms.Label(); - this.button205 = new System.Windows.Forms.Button(); this.tabControl1.SuspendLayout(); this.tabPage1.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.numericUpDown1)).BeginInit(); @@ -1889,12 +1889,12 @@ this.dataGridView1.ReadOnly = true; this.dataGridView1.RowHeadersVisible = false; this.dataGridView1.RowHeadersWidthSizeMode = System.Windows.Forms.DataGridViewRowHeadersWidthSizeMode.DisableResizing; - dataGridViewCellStyle7.BackColor = System.Drawing.Color.AliceBlue; - dataGridViewCellStyle7.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238))); - dataGridViewCellStyle7.ForeColor = System.Drawing.Color.Black; - dataGridViewCellStyle7.SelectionBackColor = System.Drawing.Color.Green; - dataGridViewCellStyle7.SelectionForeColor = System.Drawing.Color.Yellow; - this.dataGridView1.RowsDefaultCellStyle = dataGridViewCellStyle7; + dataGridViewCellStyle1.BackColor = System.Drawing.Color.AliceBlue; + dataGridViewCellStyle1.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238))); + dataGridViewCellStyle1.ForeColor = System.Drawing.Color.Black; + dataGridViewCellStyle1.SelectionBackColor = System.Drawing.Color.Green; + dataGridViewCellStyle1.SelectionForeColor = System.Drawing.Color.Yellow; + this.dataGridView1.RowsDefaultCellStyle = dataGridViewCellStyle1; this.dataGridView1.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect; this.dataGridView1.Size = new System.Drawing.Size(1704, 215); this.dataGridView1.TabIndex = 0; @@ -2471,14 +2471,14 @@ this.dGVVydajMat.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) | System.Windows.Forms.AnchorStyles.Left) | System.Windows.Forms.AnchorStyles.Right))); - dataGridViewCellStyle8.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - dataGridViewCellStyle8.BackColor = System.Drawing.SystemColors.Control; - dataGridViewCellStyle8.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238))); - dataGridViewCellStyle8.ForeColor = System.Drawing.SystemColors.WindowText; - dataGridViewCellStyle8.SelectionBackColor = System.Drawing.SystemColors.Highlight; - dataGridViewCellStyle8.SelectionForeColor = System.Drawing.SystemColors.HighlightText; - dataGridViewCellStyle8.WrapMode = System.Windows.Forms.DataGridViewTriState.True; - this.dGVVydajMat.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle8; + dataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + dataGridViewCellStyle2.BackColor = System.Drawing.SystemColors.Control; + dataGridViewCellStyle2.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238))); + dataGridViewCellStyle2.ForeColor = System.Drawing.SystemColors.WindowText; + dataGridViewCellStyle2.SelectionBackColor = System.Drawing.SystemColors.Highlight; + dataGridViewCellStyle2.SelectionForeColor = System.Drawing.SystemColors.HighlightText; + dataGridViewCellStyle2.WrapMode = System.Windows.Forms.DataGridViewTriState.True; + this.dGVVydajMat.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle2; this.dGVVydajMat.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; this.dGVVydajMat.Location = new System.Drawing.Point(1, 43); this.dGVVydajMat.MultiSelect = false; @@ -4963,27 +4963,27 @@ this.chart1.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) | System.Windows.Forms.AnchorStyles.Left) | System.Windows.Forms.AnchorStyles.Right))); - chartArea7.Area3DStyle.IsRightAngleAxes = false; - chartArea7.Area3DStyle.Perspective = 25; - chartArea7.Name = "ChartArea1"; - this.chart1.ChartAreas.Add(chartArea7); - legend7.DockedToChartArea = "ChartArea1"; - legend7.Name = "Legend1"; - this.chart1.Legends.Add(legend7); + chartArea1.Area3DStyle.IsRightAngleAxes = false; + chartArea1.Area3DStyle.Perspective = 25; + chartArea1.Name = "ChartArea1"; + this.chart1.ChartAreas.Add(chartArea1); + legend1.DockedToChartArea = "ChartArea1"; + legend1.Name = "Legend1"; + this.chart1.Legends.Add(legend1); this.chart1.Location = new System.Drawing.Point(4, 4); this.chart1.Name = "chart1"; - series10.ChartArea = "ChartArea1"; - series10.Enabled = false; - series10.IsValueShownAsLabel = true; - series10.Legend = "Legend1"; - series10.Name = "Priemerná zmätkovitosť"; - series11.ChartArea = "ChartArea1"; - series11.Enabled = false; - series11.IsValueShownAsLabel = true; - series11.Legend = "Legend1"; - series11.Name = "Priemer zmätkovitostí"; - this.chart1.Series.Add(series10); - this.chart1.Series.Add(series11); + series1.ChartArea = "ChartArea1"; + series1.Enabled = false; + series1.IsValueShownAsLabel = true; + series1.Legend = "Legend1"; + series1.Name = "Priemerná zmätkovitosť"; + series2.ChartArea = "ChartArea1"; + series2.Enabled = false; + series2.IsValueShownAsLabel = true; + series2.Legend = "Legend1"; + series2.Name = "Priemer zmätkovitostí"; + this.chart1.Series.Add(series1); + this.chart1.Series.Add(series2); this.chart1.Size = new System.Drawing.Size(971, 512); this.chart1.TabIndex = 0; this.chart1.Text = "chart1"; @@ -7536,6 +7536,16 @@ this.tabPage13.UseVisualStyleBackColor = true; this.tabPage13.Enter += new System.EventHandler(this.tabPage13_Enter); // + // button205 + // + this.button205.Location = new System.Drawing.Point(88, 0); + this.button205.Name = "button205"; + this.button205.Size = new System.Drawing.Size(89, 43); + this.button205.TabIndex = 8; + this.button205.Text = "Editovať vyhodnotenie"; + this.button205.UseVisualStyleBackColor = true; + this.button205.Click += new System.EventHandler(this.button205_Click); + // // button181 // this.button181.Location = new System.Drawing.Point(0, 0); @@ -8737,22 +8747,22 @@ this.chart2.BackColor = System.Drawing.Color.DarkGray; this.chart2.BorderlineColor = System.Drawing.Color.Black; this.chart2.BorderlineDashStyle = System.Windows.Forms.DataVisualization.Charting.ChartDashStyle.Solid; - chartArea8.Name = "ChartArea1"; - this.chart2.ChartAreas.Add(chartArea8); + chartArea2.Name = "ChartArea1"; + this.chart2.ChartAreas.Add(chartArea2); this.chart2.Dock = System.Windows.Forms.DockStyle.Bottom; - legend8.Name = "Legend1"; - this.chart2.Legends.Add(legend8); + legend2.Name = "Legend1"; + this.chart2.Legends.Add(legend2); this.chart2.Location = new System.Drawing.Point(0, 287); this.chart2.Name = "chart2"; - series12.ChartArea = "ChartArea1"; - series12.IsValueShownAsLabel = true; - series12.Legend = "Legend1"; - series12.Name = "Rozmer"; - series12.Points.Add(dataPoint13); - series12.Points.Add(dataPoint14); - series12.Points.Add(dataPoint15); - series12.Points.Add(dataPoint16); - this.chart2.Series.Add(series12); + series3.ChartArea = "ChartArea1"; + series3.IsValueShownAsLabel = true; + series3.Legend = "Legend1"; + series3.Name = "Rozmer"; + series3.Points.Add(dataPoint1); + series3.Points.Add(dataPoint2); + series3.Points.Add(dataPoint3); + series3.Points.Add(dataPoint4); + this.chart2.Series.Add(series3); this.chart2.Size = new System.Drawing.Size(407, 203); this.chart2.TabIndex = 2; this.chart2.Text = "chart2"; @@ -11900,7 +11910,7 @@ this.lblVerzia.Name = "lblVerzia"; this.lblVerzia.Size = new System.Drawing.Size(34, 13); this.lblVerzia.TabIndex = 13; - this.lblVerzia.Text = "1,005"; + this.lblVerzia.Text = "1,006"; this.lblVerzia.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; // // label50 @@ -12207,16 +12217,6 @@ this.label182.Text = "↗"; this.label182.Click += new System.EventHandler(this.label182_Click); // - // button205 - // - this.button205.Location = new System.Drawing.Point(88, 0); - this.button205.Name = "button205"; - this.button205.Size = new System.Drawing.Size(89, 43); - this.button205.TabIndex = 8; - this.button205.Text = "Editovať vyhodnotenie"; - this.button205.UseVisualStyleBackColor = true; - this.button205.Click += new System.EventHandler(this.button205_Click); - // // frmMain // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); diff --git a/Mip/frmNacenovanie.cs b/Mip/frmNacenovanie.cs index 08c9577..a2a96bf 100644 --- a/Mip/frmNacenovanie.cs +++ b/Mip/frmNacenovanie.cs @@ -139,7 +139,8 @@ namespace Mip objObjectPocty.SetDataToForm(this); string strIDVykres = ""; - classSQL.SQL("SELECT `IDVykres` FROM `mip`.`tabvykres` WHERE IDVyrobok = " + IDV.ToString() + " AND IndexVykresu = 1", out strIDVykres); + var commandSQL = $@"SELECT `IDVykres` FROM `mip`.`tabvykres` WHERE IDVyrobok = {IDV.ToString()} order by IndexVykresu asc LIMIT 1;"; + classSQL.SQL(commandSQL, out strIDVykres); IDVykres = Convert.ToInt32(strIDVykres); Image setImage = classSQL.VykresZSQLDoPictureBox(IDVykres); diff --git a/Mip/obj/Debug/Mip.csproj.ResolveComReference.cache b/Mip/obj/Debug/Mip.csproj.ResolveComReference.cache index e2d66fc..70bf029 100644 Binary files a/Mip/obj/Debug/Mip.csproj.ResolveComReference.cache and b/Mip/obj/Debug/Mip.csproj.ResolveComReference.cache differ diff --git a/MipInstaller/MipInstaller.vdproj b/MipInstaller/MipInstaller.vdproj index d1b7ae0..9d2f860 100644 --- a/MipInstaller/MipInstaller.vdproj +++ b/MipInstaller/MipInstaller.vdproj @@ -15,7 +15,49 @@ { "Entry" { - "MsmKey" = "8:_2282574CEC529775C09EFA72207A8394" + "MsmKey" = "8:_143DC01043004BDAB7063DEF30B3AF42" + "OwnerKey" = "8:_DF4DF5614F534F54B59021BDE12D5BB1" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_1C1FA7A874FD17FDF678B115E7DEA9FA" + "OwnerKey" = "8:_DF4DF5614F534F54B59021BDE12D5BB1" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_1C1FA7A874FD17FDF678B115E7DEA9FA" + "OwnerKey" = "8:_CA144385826D77ECA7AB24D7B09F056E" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_2031DBE1BCCCCD2740B49963F05431CF" + "OwnerKey" = "8:_DF4DF5614F534F54B59021BDE12D5BB1" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_2411BC6BB72BB1A300BF59D588C5D2FB" + "OwnerKey" = "8:_6B0AA5AACC5751C10AE8FF6933F0938C" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_2411BC6BB72BB1A300BF59D588C5D2FB" + "OwnerKey" = "8:_DF4DF5614F534F54B59021BDE12D5BB1" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_358BCC0B3B4A85C99AE7A5507212FA51" + "OwnerKey" = "8:_6B0AA5AACC5751C10AE8FF6933F0938C" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_358BCC0B3B4A85C99AE7A5507212FA51" "OwnerKey" = "8:_DF4DF5614F534F54B59021BDE12D5BB1" "MsmSig" = "8:_UNDEFINED" } @@ -27,37 +69,31 @@ } "Entry" { - "MsmKey" = "8:_5337F059BB86E73FCB386507FC8ECC2E" + "MsmKey" = "8:_6B0AA5AACC5751C10AE8FF6933F0938C" "OwnerKey" = "8:_DF4DF5614F534F54B59021BDE12D5BB1" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_5337F059BB86E73FCB386507FC8ECC2E" - "OwnerKey" = "8:_E2134F16CD8C975272DF7EB26BA09020" + "MsmKey" = "8:_754FD60E24B3F404402A8AFB95AF0FD0" + "OwnerKey" = "8:_358BCC0B3B4A85C99AE7A5507212FA51" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_762E532DE989BC199CE6FCC3B93C0D16" - "OwnerKey" = "8:_A36491C2E084BBC2D9CB35A2E30A3A86" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_762E532DE989BC199CE6FCC3B93C0D16" + "MsmKey" = "8:_754FD60E24B3F404402A8AFB95AF0FD0" "OwnerKey" = "8:_DF4DF5614F534F54B59021BDE12D5BB1" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_8959F6059840D2EED306A258C4BB535B" + "MsmKey" = "8:_88BA7D22227A4C1FD6976D0407DA89B2" "OwnerKey" = "8:_DF4DF5614F534F54B59021BDE12D5BB1" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_A36491C2E084BBC2D9CB35A2E30A3A86" + "MsmKey" = "8:_CA144385826D77ECA7AB24D7B09F056E" "OwnerKey" = "8:_DF4DF5614F534F54B59021BDE12D5BB1" "MsmSig" = "8:_UNDEFINED" } @@ -69,96 +105,6 @@ } "Entry" { - "MsmKey" = "8:_E2134F16CD8C975272DF7EB26BA09020" - "OwnerKey" = "8:_DF4DF5614F534F54B59021BDE12D5BB1" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_E2134F16CD8C975272DF7EB26BA09020" - "OwnerKey" = "8:_A36491C2E084BBC2D9CB35A2E30A3A86" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_E3A1CB7C126E96889D733CA72744D00D" - "OwnerKey" = "8:_DF4DF5614F534F54B59021BDE12D5BB1" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_E3A1CB7C126E96889D733CA72744D00D" - "OwnerKey" = "8:_8959F6059840D2EED306A258C4BB535B" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_FD506AE2787A39200FA3CA8E8BFC8A53" - "OwnerKey" = "8:_DF4DF5614F534F54B59021BDE12D5BB1" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_FE368536F3EA18C760584D712F360826" - "OwnerKey" = "8:_DF4DF5614F534F54B59021BDE12D5BB1" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_2282574CEC529775C09EFA72207A8394" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_FD506AE2787A39200FA3CA8E8BFC8A53" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_8959F6059840D2EED306A258C4BB535B" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_E3A1CB7C126E96889D733CA72744D00D" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_FE368536F3EA18C760584D712F360826" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_762E532DE989BC199CE6FCC3B93C0D16" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_A36491C2E084BBC2D9CB35A2E30A3A86" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_E2134F16CD8C975272DF7EB26BA09020" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_5337F059BB86E73FCB386507FC8ECC2E" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { "MsmKey" = "8:_UNDEFINED" "OwnerKey" = "8:_DF4DF5614F534F54B59021BDE12D5BB1" "MsmSig" = "8:_UNDEFINED" @@ -166,9 +112,63 @@ "Entry" { "MsmKey" = "8:_UNDEFINED" + "OwnerKey" = "8:_143DC01043004BDAB7063DEF30B3AF42" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_UNDEFINED" + "OwnerKey" = "8:_88BA7D22227A4C1FD6976D0407DA89B2" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_UNDEFINED" + "OwnerKey" = "8:_CA144385826D77ECA7AB24D7B09F056E" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_UNDEFINED" + "OwnerKey" = "8:_1C1FA7A874FD17FDF678B115E7DEA9FA" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_UNDEFINED" + "OwnerKey" = "8:_2031DBE1BCCCCD2740B49963F05431CF" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_UNDEFINED" "OwnerKey" = "8:_36B97FFE31849B72D6493D6218848D7A" "MsmSig" = "8:_UNDEFINED" } + "Entry" + { + "MsmKey" = "8:_UNDEFINED" + "OwnerKey" = "8:_6B0AA5AACC5751C10AE8FF6933F0938C" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_UNDEFINED" + "OwnerKey" = "8:_2411BC6BB72BB1A300BF59D588C5D2FB" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_UNDEFINED" + "OwnerKey" = "8:_358BCC0B3B4A85C99AE7A5507212FA51" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_UNDEFINED" + "OwnerKey" = "8:_754FD60E24B3F404402A8AFB95AF0FD0" + "MsmSig" = "8:_UNDEFINED" + } } "Configurations" { @@ -264,14 +264,14 @@ } "File" { - "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_2282574CEC529775C09EFA72207A8394" + "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_143DC01043004BDAB7063DEF30B3AF42" { "AssemblyRegister" = "3:1" "AssemblyIsInGAC" = "11:FALSE" "AssemblyAsmDisplayName" = "8:MyTools, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL" "ScatterAssemblies" { - "_2282574CEC529775C09EFA72207A8394" + "_143DC01043004BDAB7063DEF30B3AF42" { "Name" = "8:MyTools.dll" "Attributes" = "3:512" @@ -295,6 +295,130 @@ "IsDependency" = "11:TRUE" "IsolateTo" = "8:" } + "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_1C1FA7A874FD17FDF678B115E7DEA9FA" + { + "AssemblyRegister" = "3:1" + "AssemblyIsInGAC" = "11:FALSE" + "AssemblyAsmDisplayName" = "8:GMap.NET.Core, Version=1.7.0.0, Culture=neutral, PublicKeyToken=b85b9027b614afef, processorArchitecture=MSIL" + "ScatterAssemblies" + { + "_1C1FA7A874FD17FDF678B115E7DEA9FA" + { + "Name" = "8:GMap.NET.Core.dll" + "Attributes" = "3:512" + } + } + "SourcePath" = "8:GMap.NET.Core.dll" + "TargetName" = "8:" + "Tag" = "8:" + "Folder" = "8:_DC8609E7010540EC9CC4B5D8F85195BA" + "Condition" = "8:" + "Transitive" = "11:FALSE" + "Vital" = "11:TRUE" + "ReadOnly" = "11:FALSE" + "Hidden" = "11:FALSE" + "System" = "11:FALSE" + "Permanent" = "11:FALSE" + "SharedLegacy" = "11:FALSE" + "PackageAs" = "3:1" + "Register" = "3:1" + "Exclude" = "11:FALSE" + "IsDependency" = "11:TRUE" + "IsolateTo" = "8:" + } + "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_2031DBE1BCCCCD2740B49963F05431CF" + { + "AssemblyRegister" = "3:1" + "AssemblyIsInGAC" = "11:FALSE" + "AssemblyAsmDisplayName" = "8:MonthCalendar, Version=1.0.1.140, Culture=neutral, processorArchitecture=MSIL" + "ScatterAssemblies" + { + "_2031DBE1BCCCCD2740B49963F05431CF" + { + "Name" = "8:MonthCalendar.dll" + "Attributes" = "3:512" + } + } + "SourcePath" = "8:MonthCalendar.dll" + "TargetName" = "8:" + "Tag" = "8:" + "Folder" = "8:_DC8609E7010540EC9CC4B5D8F85195BA" + "Condition" = "8:" + "Transitive" = "11:FALSE" + "Vital" = "11:TRUE" + "ReadOnly" = "11:FALSE" + "Hidden" = "11:FALSE" + "System" = "11:FALSE" + "Permanent" = "11:FALSE" + "SharedLegacy" = "11:FALSE" + "PackageAs" = "3:1" + "Register" = "3:1" + "Exclude" = "11:FALSE" + "IsDependency" = "11:TRUE" + "IsolateTo" = "8:" + } + "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_2411BC6BB72BB1A300BF59D588C5D2FB" + { + "AssemblyRegister" = "3:1" + "AssemblyIsInGAC" = "11:FALSE" + "AssemblyAsmDisplayName" = "8:Syncfusion.Shared.Base, Version=18.3450.0.35, Culture=neutral, PublicKeyToken=3d67ed1f87d44c89, processorArchitecture=MSIL" + "ScatterAssemblies" + { + "_2411BC6BB72BB1A300BF59D588C5D2FB" + { + "Name" = "8:Syncfusion.Shared.Base.dll" + "Attributes" = "3:512" + } + } + "SourcePath" = "8:Syncfusion.Shared.Base.dll" + "TargetName" = "8:" + "Tag" = "8:" + "Folder" = "8:_DC8609E7010540EC9CC4B5D8F85195BA" + "Condition" = "8:" + "Transitive" = "11:FALSE" + "Vital" = "11:TRUE" + "ReadOnly" = "11:FALSE" + "Hidden" = "11:FALSE" + "System" = "11:FALSE" + "Permanent" = "11:FALSE" + "SharedLegacy" = "11:FALSE" + "PackageAs" = "3:1" + "Register" = "3:1" + "Exclude" = "11:FALSE" + "IsDependency" = "11:TRUE" + "IsolateTo" = "8:" + } + "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_358BCC0B3B4A85C99AE7A5507212FA51" + { + "AssemblyRegister" = "3:1" + "AssemblyIsInGAC" = "11:FALSE" + "AssemblyAsmDisplayName" = "8:Syncfusion.Pdf.Base, Version=18.3450.0.35, Culture=neutral, PublicKeyToken=3d67ed1f87d44c89, processorArchitecture=MSIL" + "ScatterAssemblies" + { + "_358BCC0B3B4A85C99AE7A5507212FA51" + { + "Name" = "8:Syncfusion.Pdf.Base.dll" + "Attributes" = "3:512" + } + } + "SourcePath" = "8:Syncfusion.Pdf.Base.dll" + "TargetName" = "8:" + "Tag" = "8:" + "Folder" = "8:_DC8609E7010540EC9CC4B5D8F85195BA" + "Condition" = "8:" + "Transitive" = "11:FALSE" + "Vital" = "11:TRUE" + "ReadOnly" = "11:FALSE" + "Hidden" = "11:FALSE" + "System" = "11:FALSE" + "Permanent" = "11:FALSE" + "SharedLegacy" = "11:FALSE" + "PackageAs" = "3:1" + "Register" = "3:1" + "Exclude" = "11:FALSE" + "IsDependency" = "11:TRUE" + "IsolateTo" = "8:" + } "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_36B97FFE31849B72D6493D6218848D7A" { "AssemblyRegister" = "3:1" @@ -326,102 +450,14 @@ "IsDependency" = "11:TRUE" "IsolateTo" = "8:" } - "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_5337F059BB86E73FCB386507FC8ECC2E" - { - "AssemblyRegister" = "3:1" - "AssemblyIsInGAC" = "11:FALSE" - "AssemblyAsmDisplayName" = "8:Syncfusion.Compression.Base, Version=18.3450.0.35, Culture=neutral, PublicKeyToken=3d67ed1f87d44c89, processorArchitecture=MSIL" - "ScatterAssemblies" - { - } - "SourcePath" = "8:Syncfusion.Compression.Base.dll" - "TargetName" = "8:" - "Tag" = "8:" - "Folder" = "8:_DC8609E7010540EC9CC4B5D8F85195BA" - "Condition" = "8:" - "Transitive" = "11:FALSE" - "Vital" = "11:TRUE" - "ReadOnly" = "11:FALSE" - "Hidden" = "11:FALSE" - "System" = "11:FALSE" - "Permanent" = "11:FALSE" - "SharedLegacy" = "11:FALSE" - "PackageAs" = "3:1" - "Register" = "3:1" - "Exclude" = "11:FALSE" - "IsDependency" = "11:TRUE" - "IsolateTo" = "8:" - } - "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_762E532DE989BC199CE6FCC3B93C0D16" - { - "AssemblyRegister" = "3:1" - "AssemblyIsInGAC" = "11:FALSE" - "AssemblyAsmDisplayName" = "8:Syncfusion.Shared.Base, Version=18.3450.0.35, Culture=neutral, PublicKeyToken=3d67ed1f87d44c89, processorArchitecture=MSIL" - "ScatterAssemblies" - { - "_762E532DE989BC199CE6FCC3B93C0D16" - { - "Name" = "8:Syncfusion.Shared.Base.dll" - "Attributes" = "3:512" - } - } - "SourcePath" = "8:Syncfusion.Shared.Base.dll" - "TargetName" = "8:" - "Tag" = "8:" - "Folder" = "8:_DC8609E7010540EC9CC4B5D8F85195BA" - "Condition" = "8:" - "Transitive" = "11:FALSE" - "Vital" = "11:TRUE" - "ReadOnly" = "11:FALSE" - "Hidden" = "11:FALSE" - "System" = "11:FALSE" - "Permanent" = "11:FALSE" - "SharedLegacy" = "11:FALSE" - "PackageAs" = "3:1" - "Register" = "3:1" - "Exclude" = "11:FALSE" - "IsDependency" = "11:TRUE" - "IsolateTo" = "8:" - } - "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_8959F6059840D2EED306A258C4BB535B" - { - "AssemblyRegister" = "3:1" - "AssemblyIsInGAC" = "11:FALSE" - "AssemblyAsmDisplayName" = "8:GMap.NET.WindowsForms, Version=1.7.0.0, Culture=neutral, PublicKeyToken=b85b9027b614afef, processorArchitecture=MSIL" - "ScatterAssemblies" - { - "_8959F6059840D2EED306A258C4BB535B" - { - "Name" = "8:GMap.NET.WindowsForms.dll" - "Attributes" = "3:512" - } - } - "SourcePath" = "8:GMap.NET.WindowsForms.dll" - "TargetName" = "8:" - "Tag" = "8:" - "Folder" = "8:_DC8609E7010540EC9CC4B5D8F85195BA" - "Condition" = "8:" - "Transitive" = "11:FALSE" - "Vital" = "11:TRUE" - "ReadOnly" = "11:FALSE" - "Hidden" = "11:FALSE" - "System" = "11:FALSE" - "Permanent" = "11:FALSE" - "SharedLegacy" = "11:FALSE" - "PackageAs" = "3:1" - "Register" = "3:1" - "Exclude" = "11:FALSE" - "IsDependency" = "11:TRUE" - "IsolateTo" = "8:" - } - "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_A36491C2E084BBC2D9CB35A2E30A3A86" + "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_6B0AA5AACC5751C10AE8FF6933F0938C" { "AssemblyRegister" = "3:1" "AssemblyIsInGAC" = "11:FALSE" "AssemblyAsmDisplayName" = "8:Syncfusion.PdfViewer.Windows, Version=18.3450.0.35, Culture=neutral, PublicKeyToken=3d67ed1f87d44c89, processorArchitecture=MSIL" "ScatterAssemblies" { - "_A36491C2E084BBC2D9CB35A2E30A3A86" + "_6B0AA5AACC5751C10AE8FF6933F0938C" { "Name" = "8:Syncfusion.PdfViewer.Windows.dll" "Attributes" = "3:512" @@ -445,20 +481,20 @@ "IsDependency" = "11:TRUE" "IsolateTo" = "8:" } - "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_E2134F16CD8C975272DF7EB26BA09020" + "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_754FD60E24B3F404402A8AFB95AF0FD0" { "AssemblyRegister" = "3:1" "AssemblyIsInGAC" = "11:FALSE" - "AssemblyAsmDisplayName" = "8:Syncfusion.Pdf.Base, Version=18.3450.0.35, Culture=neutral, PublicKeyToken=3d67ed1f87d44c89, processorArchitecture=MSIL" + "AssemblyAsmDisplayName" = "8:Syncfusion.Compression.Base, Version=18.3450.0.35, Culture=neutral, PublicKeyToken=3d67ed1f87d44c89, processorArchitecture=MSIL" "ScatterAssemblies" { - "_E2134F16CD8C975272DF7EB26BA09020" + "_754FD60E24B3F404402A8AFB95AF0FD0" { - "Name" = "8:Syncfusion.Pdf.Base.dll" + "Name" = "8:Syncfusion.Compression.Base.dll" "Attributes" = "3:512" } } - "SourcePath" = "8:Syncfusion.Pdf.Base.dll" + "SourcePath" = "8:Syncfusion.Compression.Base.dll" "TargetName" = "8:" "Tag" = "8:" "Folder" = "8:_DC8609E7010540EC9CC4B5D8F85195BA" @@ -476,45 +512,14 @@ "IsDependency" = "11:TRUE" "IsolateTo" = "8:" } - "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_E3A1CB7C126E96889D733CA72744D00D" - { - "AssemblyRegister" = "3:1" - "AssemblyIsInGAC" = "11:FALSE" - "AssemblyAsmDisplayName" = "8:GMap.NET.Core, Version=1.7.0.0, Culture=neutral, PublicKeyToken=b85b9027b614afef, processorArchitecture=MSIL" - "ScatterAssemblies" - { - "_E3A1CB7C126E96889D733CA72744D00D" - { - "Name" = "8:GMap.NET.Core.dll" - "Attributes" = "3:512" - } - } - "SourcePath" = "8:GMap.NET.Core.dll" - "TargetName" = "8:" - "Tag" = "8:" - "Folder" = "8:_DC8609E7010540EC9CC4B5D8F85195BA" - "Condition" = "8:" - "Transitive" = "11:FALSE" - "Vital" = "11:TRUE" - "ReadOnly" = "11:FALSE" - "Hidden" = "11:FALSE" - "System" = "11:FALSE" - "Permanent" = "11:FALSE" - "SharedLegacy" = "11:FALSE" - "PackageAs" = "3:1" - "Register" = "3:1" - "Exclude" = "11:FALSE" - "IsDependency" = "11:TRUE" - "IsolateTo" = "8:" - } - "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_FD506AE2787A39200FA3CA8E8BFC8A53" + "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_88BA7D22227A4C1FD6976D0407DA89B2" { "AssemblyRegister" = "3:1" "AssemblyIsInGAC" = "11:FALSE" "AssemblyAsmDisplayName" = "8:MySql.Data, Version=6.5.4.0, Culture=neutral, PublicKeyToken=c5687fc88969c44d, processorArchitecture=MSIL" "ScatterAssemblies" { - "_FD506AE2787A39200FA3CA8E8BFC8A53" + "_88BA7D22227A4C1FD6976D0407DA89B2" { "Name" = "8:MySql.Data.dll" "Attributes" = "3:512" @@ -538,20 +543,20 @@ "IsDependency" = "11:TRUE" "IsolateTo" = "8:" } - "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_FE368536F3EA18C760584D712F360826" + "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_CA144385826D77ECA7AB24D7B09F056E" { "AssemblyRegister" = "3:1" "AssemblyIsInGAC" = "11:FALSE" - "AssemblyAsmDisplayName" = "8:MonthCalendar, Version=1.0.1.140, Culture=neutral, processorArchitecture=MSIL" + "AssemblyAsmDisplayName" = "8:GMap.NET.WindowsForms, Version=1.7.0.0, Culture=neutral, PublicKeyToken=b85b9027b614afef, processorArchitecture=MSIL" "ScatterAssemblies" { - "_FE368536F3EA18C760584D712F360826" + "_CA144385826D77ECA7AB24D7B09F056E" { - "Name" = "8:MonthCalendar.dll" + "Name" = "8:GMap.NET.WindowsForms.dll" "Attributes" = "3:512" } } - "SourcePath" = "8:MonthCalendar.dll" + "SourcePath" = "8:GMap.NET.WindowsForms.dll" "TargetName" = "8:" "Tag" = "8:" "Folder" = "8:_DC8609E7010540EC9CC4B5D8F85195BA" @@ -625,15 +630,15 @@ { "Name" = "8:Microsoft Visual Studio" "ProductName" = "8:Mip1.1" - "ProductCode" = "8:{58D47403-2BAF-4B5F-AD43-038E27486A65}" - "PackageCode" = "8:{D5F978B3-C18D-480C-B4BD-EADDDC62FF5F}" + "ProductCode" = "8:{77282D18-5DD6-4471-AACD-CFACA28746FA}" + "PackageCode" = "8:{51DE15E8-AC04-4CFE-9ECC-14BFE630E5B4}" "UpgradeCode" = "8:{96C5136E-DF0B-48C4-9031-F8CA75E3E3E6}" "AspNetVersion" = "8:4.0.30319.0" "RestartWWWService" = "11:FALSE" "RemovePreviousVersions" = "11:TRUE" "DetectNewerInstalledVersion" = "11:TRUE" "InstallAllUsers" = "11:FALSE" - "ProductVersion" = "8:1.1.4" + "ProductVersion" = "8:1.1.5" "Manufacturer" = "8:Kompozitum" "ARPHELPTELEPHONE" = "8:" "ARPHELPLINK" = "8:" diff --git a/MipInstaller/Release/MipInstaller.msi b/MipInstaller/Release/MipInstaller.msi index 7e4b029..9979076 100644 Binary files a/MipInstaller/Release/MipInstaller.msi and b/MipInstaller/Release/MipInstaller.msi differ diff --git a/MipInstaller/Release/setup.exe b/MipInstaller/Release/setup.exe index 9509982..7e44825 100644 Binary files a/MipInstaller/Release/setup.exe and b/MipInstaller/Release/setup.exe differ