diff --git a/Mk0.Software.Bildduplikate/Main.Designer.cs b/Mk0.Software.Bildduplikate/Main.Designer.cs index d514533..aff590e 100644 --- a/Mk0.Software.Bildduplikate/Main.Designer.cs +++ b/Mk0.Software.Bildduplikate/Main.Designer.cs @@ -260,7 +260,7 @@ namespace Mk0.Software.Bildduplikate this.MinimumSize = new System.Drawing.Size(1000, 590); this.Name = "Main"; this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen; - this.Text = "Bildduplikate v1.5 by kmpr.at"; + this.Text = "Bildduplikate v1.6 by kmpr.at"; this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.Main_FormClosing); this.Shown += new System.EventHandler(this.Main_Shown); this.KeyDown += new System.Windows.Forms.KeyEventHandler(this.Form1_KeyDown); diff --git a/Mk0.Software.Bildduplikate/Main.cs b/Mk0.Software.Bildduplikate/Main.cs index f090d78..f8fafed 100644 --- a/Mk0.Software.Bildduplikate/Main.cs +++ b/Mk0.Software.Bildduplikate/Main.cs @@ -122,12 +122,12 @@ namespace Mk0.Software.Bildduplikate dup2++; } - string filePath1 = Path.GetDirectoryName(Duplicates.ElementAt(lineDup).Path1); - string filePath2 = Path.GetDirectoryName(Duplicates.ElementAt(lineDup).Path2); + string filePath1 = GetRtfUnicodeEscapedString(Path.GetDirectoryName(Duplicates.ElementAt(lineDup).Path1)); + string filePath2 = GetRtfUnicodeEscapedString(Path.GetDirectoryName(Duplicates.ElementAt(lineDup).Path2)); if (filePath1 == filePath2) { - filePath1 = @"\b " + GetRtfUnicodeEscapedString(filePath1) + @" \b0 "; - filePath2 = @"\b " + GetRtfUnicodeEscapedString(filePath2) + @" \b0 "; + filePath1 = @"\b " + filePath1 + @" \b0 "; + filePath2 = @"\b " + filePath2 + @" \b0 "; dup1++; dup2++; } @@ -247,8 +247,8 @@ namespace Mk0.Software.Bildduplikate dup2++; } - richTextBoxDesc1.Rtf = @"{\rtf1\utf-8 " + filePath1 + @"\line " + fileName1 + @"\line " + size1 + @"\line " + lastTime1str + @"\line " + res1str + " }"; - richTextBoxDesc2.Rtf = @"{\rtf1\utf-8 " + filePath2 + @"\line " + fileName2 + @"\line " + size2 + @"\line " + lastTime2str + @"\line " + res2str + " }"; + richTextBoxDesc1.Rtf = @"{\rtf1\ansi " + filePath1 + @" \line " + fileName1 + @" \line " + size1 + @" \line " + lastTime1str + @" \line " + res1str + " }"; + richTextBoxDesc2.Rtf = @"{\rtf1\ansi " + filePath2 + @" \line " + fileName2 + @" \line " + size2 + @" \line " + lastTime2str + @" \line " + res2str + " }"; richTextBoxDesc1.SelectAll(); richTextBoxDesc1.SelectionAlignment = HorizontalAlignment.Right; label3.Text = total + " Duplikate"; diff --git a/Mk0.Software.Bildduplikate/Mk0.Software.Bildduplikate.csproj b/Mk0.Software.Bildduplikate/Mk0.Software.Bildduplikate.csproj index 193e042..04ef21d 100644 --- a/Mk0.Software.Bildduplikate/Mk0.Software.Bildduplikate.csproj +++ b/Mk0.Software.Bildduplikate/Mk0.Software.Bildduplikate.csproj @@ -24,7 +24,7 @@ false true 0 - 1.5.0.0 + 1.6.0.0 false true true diff --git a/Mk0.Software.Bildduplikate/Properties/AssemblyInfo.cs b/Mk0.Software.Bildduplikate/Properties/AssemblyInfo.cs index 708a200..47d8a71 100644 --- a/Mk0.Software.Bildduplikate/Properties/AssemblyInfo.cs +++ b/Mk0.Software.Bildduplikate/Properties/AssemblyInfo.cs @@ -32,5 +32,5 @@ using System.Runtime.InteropServices; // Sie können alle Werte angeben oder Standardwerte für die Build- und Revisionsnummern verwenden, // indem Sie "*" wie unten gezeigt eingeben: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.5.0.0")] -[assembly: AssemblyFileVersion("1.5.0.0")] +[assembly: AssemblyVersion("1.6.0.0")] +[assembly: AssemblyFileVersion("1.6.0.0")]