From f45f50e9870858dc31a639ea759325d66ea23c03 Mon Sep 17 00:00:00 2001 From: Furtif Date: Sat, 8 Oct 2022 21:50:19 +0200 Subject: [PATCH] .................. --- MediaNavIGO/MainForm.Designer.cs | 60 ++++++++++++++++---------------- MediaNavIGO/MainForm.cs | 11 ++++-- MediaNavIGO/MediaNavIGO.csproj | 4 +-- 3 files changed, 41 insertions(+), 34 deletions(-) diff --git a/MediaNavIGO/MainForm.Designer.cs b/MediaNavIGO/MainForm.Designer.cs index 542613e..4d17878 100644 --- a/MediaNavIGO/MainForm.Designer.cs +++ b/MediaNavIGO/MainForm.Designer.cs @@ -64,6 +64,8 @@ private void InitializeComponent() this.pictureBoxAbout = new System.Windows.Forms.PictureBox(); this.tabControlMain = new System.Windows.Forms.TabControl(); this.tabPageConfig = new System.Windows.Forms.TabPage(); + this.groupBox1 = new System.Windows.Forms.GroupBox(); + this.label4 = new System.Windows.Forms.Label(); this.buttonGenMicomInis = new System.Windows.Forms.Button(); this.progressBarUpdate = new System.Windows.Forms.ProgressBar(); this.buttonStartUpdate = new System.Windows.Forms.Button(); @@ -77,8 +79,6 @@ private void InitializeComponent() this.label1 = new System.Windows.Forms.Label(); this.textBoxUSB = new System.Windows.Forms.TextBox(); this.FolderBrowserDialogBoth = new System.Windows.Forms.FolderBrowserDialog(); - this.groupBox1 = new System.Windows.Forms.GroupBox(); - this.label4 = new System.Windows.Forms.Label(); this.ContextMenuStripUSB.SuspendLayout(); this.StatusStripStats.SuspendLayout(); this.ContextMenuStripLocal.SuspendLayout(); @@ -89,8 +89,8 @@ private void InitializeComponent() ((System.ComponentModel.ISupportInitialize)(this.pictureBoxAbout)).BeginInit(); this.tabControlMain.SuspendLayout(); this.tabPageConfig.SuspendLayout(); - ((System.ComponentModel.ISupportInitialize)(this.fastObjectListViewDevice)).BeginInit(); this.groupBox1.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.fastObjectListViewDevice)).BeginInit(); this.SuspendLayout(); // // ContextMenuStripUSB @@ -426,15 +426,37 @@ private void InitializeComponent() this.tabPageConfig.Text = "Main [config/commands]"; this.tabPageConfig.UseVisualStyleBackColor = true; // + // groupBox1 + // + this.groupBox1.Controls.Add(this.label4); + this.groupBox1.Font = new System.Drawing.Font("Segoe UI", 18F, ((System.Drawing.FontStyle)((System.Drawing.FontStyle.Bold | System.Drawing.FontStyle.Italic))), System.Drawing.GraphicsUnit.Point); + this.groupBox1.Location = new System.Drawing.Point(670, 0); + this.groupBox1.Name = "groupBox1"; + this.groupBox1.Size = new System.Drawing.Size(663, 445); + this.groupBox1.TabIndex = 12; + this.groupBox1.TabStop = false; + this.groupBox1.Text = "Tips:"; + // + // label4 + // + this.label4.AutoSize = true; + this.label4.Font = new System.Drawing.Font("Showcard Gothic", 16.2F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point); + this.label4.ForeColor = System.Drawing.Color.Red; + this.label4.Location = new System.Drawing.Point(17, 60); + this.label4.Name = "label4"; + this.label4.Size = new System.Drawing.Size(295, 35); + this.label4.TabIndex = 0; + this.label4.Text = "Not tips so far....."; + // // buttonGenMicomInis // this.buttonGenMicomInis.Enabled = false; this.buttonGenMicomInis.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point); - this.buttonGenMicomInis.Location = new System.Drawing.Point(534, 449); + this.buttonGenMicomInis.Location = new System.Drawing.Point(511, 449); this.buttonGenMicomInis.Name = "buttonGenMicomInis"; - this.buttonGenMicomInis.Size = new System.Drawing.Size(112, 29); + this.buttonGenMicomInis.Size = new System.Drawing.Size(135, 29); this.buttonGenMicomInis.TabIndex = 11; - this.buttonGenMicomInis.Text = "Micom ini\'s"; + this.buttonGenMicomInis.Text = "Gen Micom ini\'s"; this.buttonGenMicomInis.UseVisualStyleBackColor = true; this.buttonGenMicomInis.Click += new System.EventHandler(this.ButtonGenMicomInis_Click); // @@ -442,7 +464,7 @@ private void InitializeComponent() // this.progressBarUpdate.Location = new System.Drawing.Point(145, 450); this.progressBarUpdate.Name = "progressBarUpdate"; - this.progressBarUpdate.Size = new System.Drawing.Size(383, 27); + this.progressBarUpdate.Size = new System.Drawing.Size(360, 27); this.progressBarUpdate.TabIndex = 10; // // buttonStartUpdate @@ -551,28 +573,6 @@ private void InitializeComponent() this.textBoxUSB.Size = new System.Drawing.Size(371, 27); this.textBoxUSB.TabIndex = 0; // - // groupBox1 - // - this.groupBox1.Controls.Add(this.label4); - this.groupBox1.Font = new System.Drawing.Font("Segoe UI", 18F, ((System.Drawing.FontStyle)((System.Drawing.FontStyle.Bold | System.Drawing.FontStyle.Italic))), System.Drawing.GraphicsUnit.Point); - this.groupBox1.Location = new System.Drawing.Point(670, 0); - this.groupBox1.Name = "groupBox1"; - this.groupBox1.Size = new System.Drawing.Size(663, 445); - this.groupBox1.TabIndex = 12; - this.groupBox1.TabStop = false; - this.groupBox1.Text = "Tips:"; - // - // label4 - // - this.label4.AutoSize = true; - this.label4.Font = new System.Drawing.Font("Showcard Gothic", 16.2F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point); - this.label4.ForeColor = System.Drawing.Color.Red; - this.label4.Location = new System.Drawing.Point(17, 60); - this.label4.Name = "label4"; - this.label4.Size = new System.Drawing.Size(295, 35); - this.label4.TabIndex = 0; - this.label4.Text = "Not tips so far....."; - // // MainForm // this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 20F); @@ -600,9 +600,9 @@ private void InitializeComponent() this.tabControlMain.ResumeLayout(false); this.tabPageConfig.ResumeLayout(false); this.tabPageConfig.PerformLayout(); - ((System.ComponentModel.ISupportInitialize)(this.fastObjectListViewDevice)).EndInit(); this.groupBox1.ResumeLayout(false); this.groupBox1.PerformLayout(); + ((System.ComponentModel.ISupportInitialize)(this.fastObjectListViewDevice)).EndInit(); this.ResumeLayout(false); this.PerformLayout(); diff --git a/MediaNavIGO/MainForm.cs b/MediaNavIGO/MainForm.cs index 9824127..09836f7 100644 --- a/MediaNavIGO/MainForm.cs +++ b/MediaNavIGO/MainForm.cs @@ -470,7 +470,7 @@ private string GetRealName(string fullpath) { if (p > 0) { - real = real.Replace(i, null); + //real = real.Replace(i, null); } } } @@ -485,7 +485,14 @@ private string GetRealName(string fullpath) real = real.Replace("_", null); break; } - real = real.Replace("Extended.", "_Ext."); + if (real.Contains("ext.")) + { + if (!real.Contains("_")) + { + real = real.Replace("ext.", "_ext."); + } + } + real = real.Replace("Extended.", "_ext."); real = real.Replace("Fast.", "Fastest."); real = real.Replace("Short.", "Shortest."); real = real.Replace("Economical.", "Economic."); diff --git a/MediaNavIGO/MediaNavIGO.csproj b/MediaNavIGO/MediaNavIGO.csproj index c48de08..80a9ddc 100644 --- a/MediaNavIGO/MediaNavIGO.csproj +++ b/MediaNavIGO/MediaNavIGO.csproj @@ -2,8 +2,8 @@ WinExe - 1.0.0.3 - Copyright © 2016-2021 + 1.0.0.4 + Copyright © 2016-2022 MediaNavIGO RocketBot MediaNavIGO