From 933e63ea92d78cb93885740f05a231e362fc5b36 Mon Sep 17 00:00:00 2001
From: Dragouf <da.laurent@laposte.net>
Date: Thu, 1 Aug 2013 15:36:47 +0800
Subject: [PATCH] cosmetic changes

---
 CbrConverter/MainForm.Designer.cs |  44 +++++++++++++++++++++---------
 CbrConverter/MainForm.cs          |   8 +++---
 Compiled/CbrConverter.exe         | Bin 55808 -> 56320 bytes
 3 files changed, 35 insertions(+), 17 deletions(-)

diff --git a/CbrConverter/MainForm.Designer.cs b/CbrConverter/MainForm.Designer.cs
index 3dcb089..c745529 100644
--- a/CbrConverter/MainForm.Designer.cs
+++ b/CbrConverter/MainForm.Designer.cs
@@ -47,8 +47,10 @@ private void InitializeComponent()
             this.lbl_ProcessingFile = new System.Windows.Forms.Label();
             this.pbar_ActualFile = new System.Windows.Forms.ProgressBar();
             this.label2 = new System.Windows.Forms.Label();
-            this.textBoxLog = new System.Windows.Forms.TextBox();
             this.btn_showlog = new System.Windows.Forms.Button();
+            this.listViewLog = new System.Windows.Forms.ListView();
+            this.columnHeaderNb = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader()));
+            this.columnHeaderInfo = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader()));
             this.groupBox1.SuspendLayout();
             this.groupBox2.SuspendLayout();
             this.SuspendLayout();
@@ -256,15 +258,6 @@ private void InitializeComponent()
             this.label2.TabIndex = 0;
             this.label2.Text = "Processing:";
             // 
-            // textBoxLog
-            // 
-            this.textBoxLog.Location = new System.Drawing.Point(4, 289);
-            this.textBoxLog.Multiline = true;
-            this.textBoxLog.Name = "textBoxLog";
-            this.textBoxLog.ScrollBars = System.Windows.Forms.ScrollBars.Both;
-            this.textBoxLog.Size = new System.Drawing.Size(503, 313);
-            this.textBoxLog.TabIndex = 5;
-            // 
             // btn_showlog
             // 
             this.btn_showlog.FlatAppearance.BorderColor = System.Drawing.SystemColors.Control;
@@ -278,13 +271,37 @@ private void InitializeComponent()
             this.btn_showlog.UseVisualStyleBackColor = true;
             this.btn_showlog.Click += new System.EventHandler(this.btn_showlog_Click);
             // 
+            // listViewLog
+            // 
+            this.listViewLog.Columns.AddRange(new System.Windows.Forms.ColumnHeader[] {
+            this.columnHeaderNb,
+            this.columnHeaderInfo});
+            this.listViewLog.FullRowSelect = true;
+            this.listViewLog.GridLines = true;
+            this.listViewLog.Location = new System.Drawing.Point(3, 289);
+            this.listViewLog.Name = "listViewLog";
+            this.listViewLog.Size = new System.Drawing.Size(503, 322);
+            this.listViewLog.TabIndex = 7;
+            this.listViewLog.UseCompatibleStateImageBehavior = false;
+            this.listViewLog.View = System.Windows.Forms.View.Details;
+            // 
+            // columnHeaderNb
+            // 
+            this.columnHeaderNb.Text = "n°";
+            this.columnHeaderNb.Width = 33;
+            // 
+            // columnHeaderInfo
+            // 
+            this.columnHeaderInfo.Text = "Informations";
+            this.columnHeaderInfo.Width = 460;
+            // 
             // MainForm
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
             this.ClientSize = new System.Drawing.Size(509, 287);
+            this.Controls.Add(this.listViewLog);
             this.Controls.Add(this.btn_showlog);
-            this.Controls.Add(this.textBoxLog);
             this.Controls.Add(this.groupBox2);
             this.Controls.Add(this.groupBox1);
             this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedSingle;
@@ -299,7 +316,6 @@ private void InitializeComponent()
             this.groupBox2.ResumeLayout(false);
             this.groupBox2.PerformLayout();
             this.ResumeLayout(false);
-            this.PerformLayout();
 
         }
 
@@ -320,11 +336,13 @@ private void InitializeComponent()
         private System.Windows.Forms.CheckBox chk_NbPages;
         private System.Windows.Forms.CheckBox chk_pdf2cbr;
         private System.Windows.Forms.CheckBox chk_cbr2pdf;
-        private System.Windows.Forms.TextBox textBoxLog;
         private System.Windows.Forms.CheckBox chk_JoinImages;
         private System.Windows.Forms.Button btn_showlog;
         private System.Windows.Forms.CheckBox chk_SourceFolder;
         private System.Windows.Forms.TextBox tbox_OuputFolder;
+        private System.Windows.Forms.ListView listViewLog;
+        private System.Windows.Forms.ColumnHeader columnHeaderNb;
+        private System.Windows.Forms.ColumnHeader columnHeaderInfo;
     }
 }
 
diff --git a/CbrConverter/MainForm.cs b/CbrConverter/MainForm.cs
index d6af5a8..cfa8cd1 100644
--- a/CbrConverter/MainForm.cs
+++ b/CbrConverter/MainForm.cs
@@ -100,8 +100,8 @@ private void ErrorShowPopup(Extract m, string e)
                 //pbar_TotalProgress.Value = 0;
                 //pbar_ActualFile.Value = 0;
                 //lbl_ProcessingFile.Text =string.Empty;
-
-                this.textBoxLog.Text += e + Environment.NewLine;
+                listViewLog.Items.Add(new ListViewItem(new List<string>{ (listViewLog.Items.Count + 1).ToString(), e}.ToArray()));
+                //this.textBoxLog.Text += e + Environment.NewLine;
                 ShowLog();
             });
             //MessageBox.Show(e, "ERROR!", MessageBoxButtons.OK, MessageBoxIcon.Error);
@@ -189,7 +189,7 @@ private int LogTopPosition
             {
                 Rectangle screenRectangle = RectangleToScreen(this.ClientRectangle);
                 int titleHeight = screenRectangle.Top - this.Top;
-                return this.textBoxLog.Top + titleHeight - 1;
+                return this.listViewLog.Top + titleHeight - 1;
             }
         }
 
@@ -199,7 +199,7 @@ private int LogBottomPosition
             {
                 Rectangle screenRectangle = RectangleToScreen(this.ClientRectangle);
                 int titleHeight = screenRectangle.Top - this.Top;
-                return this.textBoxLog.Bottom + titleHeight + 4;
+                return this.listViewLog.Bottom + titleHeight + 10;
             }
         }
 
diff --git a/Compiled/CbrConverter.exe b/Compiled/CbrConverter.exe
index fb9ea6145c1bfd2136583b2c5d09766ffbe4b8f9..9b70160fe16037a9829115e3d9f3aa63180e1525 100644
GIT binary patch
delta 11625
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
a|ATY#NXPv`(zW|!j(F?&N%vD<3;zXzk;@7I

delta 10954
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