kamp/Mk0.Software.Bildduplikate
1
0
Fork 0
Code Issues 2 Pull Requests Packages Releases 11 Activity

fixed rtf issue with path #23

Browse Source
This commit is contained in:
Manuel Kamper 2022-10-31 20:03:26 +01:00
parent 73dec49ac7
commit 7ebf9eea1d
4 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Mk0.Software.Bildduplikate/Main.Designer.cs generated
View File

@ -260,7 +260,7 @@ namespace Mk0.Software.Bildduplikate
this.MinimumSize = new System.Drawing.Size(1000, 590); this.MinimumSize = new System.Drawing.Size(1000, 590);
this.Name = "Main"; this.Name = "Main";
this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen; 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.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.Main_FormClosing);
this.Shown += new System.EventHandler(this.Main_Shown); this.Shown += new System.EventHandler(this.Main_Shown);
this.KeyDown += new System.Windows.Forms.KeyEventHandler(this.Form1_KeyDown); this.KeyDown += new System.Windows.Forms.KeyEventHandler(this.Form1_KeyDown);

12
Mk0.Software.Bildduplikate/Main.cs
View File

@ -122,12 +122,12 @@ namespace Mk0.Software.Bildduplikate
dup2++; dup2++;
} }
string filePath1 = Path.GetDirectoryName(Duplicates.ElementAt(lineDup).Path1); string filePath1 = GetRtfUnicodeEscapedString(Path.GetDirectoryName(Duplicates.ElementAt(lineDup).Path1));
string filePath2 = Path.GetDirectoryName(Duplicates.ElementAt(lineDup).Path2); string filePath2 = GetRtfUnicodeEscapedString(Path.GetDirectoryName(Duplicates.ElementAt(lineDup).Path2));
if (filePath1 == filePath2) if (filePath1 == filePath2)
{ {
filePath1 = @"\b " + GetRtfUnicodeEscapedString(filePath1) + @" \b0 "; filePath1 = @"\b " + filePath1 + @" \b0 ";
filePath2 = @"\b " + GetRtfUnicodeEscapedString(filePath2) + @" \b0 "; filePath2 = @"\b " + filePath2 + @" \b0 ";
dup1++; dup1++;
dup2++; dup2++;
} }
@ -247,8 +247,8 @@ namespace Mk0.Software.Bildduplikate
dup2++; dup2++;
} }
richTextBoxDesc1.Rtf = @"{\rtf1\utf-8 " + filePath1 + @"\line " + fileName1 + @"\line " + size1 + @"\line " + lastTime1str + @"\line " + res1str + " }"; richTextBoxDesc1.Rtf = @"{\rtf1\ansi " + filePath1 + @" \line " + fileName1 + @" \line " + size1 + @" \line " + lastTime1str + @" \line " + res1str + " }";
richTextBoxDesc2.Rtf = @"{\rtf1\utf-8 " + filePath2 + @"\line " + fileName2 + @"\line " + size2 + @"\line " + lastTime2str + @"\line " + res2str + " }"; richTextBoxDesc2.Rtf = @"{\rtf1\ansi " + filePath2 + @" \line " + fileName2 + @" \line " + size2 + @" \line " + lastTime2str + @" \line " + res2str + " }";
richTextBoxDesc1.SelectAll(); richTextBoxDesc1.SelectAll();
richTextBoxDesc1.SelectionAlignment = HorizontalAlignment.Right; richTextBoxDesc1.SelectionAlignment = HorizontalAlignment.Right;
label3.Text = total + " Duplikate"; label3.Text = total + " Duplikate";

2
Mk0.Software.Bildduplikate/Mk0.Software.Bildduplikate.csproj
View File

@ -24,7 +24,7 @@
<UpdateRequired>false</UpdateRequired> <UpdateRequired>false</UpdateRequired>
<MapFileExtensions>true</MapFileExtensions> <MapFileExtensions>true</MapFileExtensions>
<ApplicationRevision>0</ApplicationRevision> <ApplicationRevision>0</ApplicationRevision>
<ApplicationVersion>1.5.0.0</ApplicationVersion> <ApplicationVersion>1.6.0.0</ApplicationVersion>
<UseApplicationTrust>false</UseApplicationTrust> <UseApplicationTrust>false</UseApplicationTrust>
<PublishWizardCompleted>true</PublishWizardCompleted> <PublishWizardCompleted>true</PublishWizardCompleted>
<BootstrapperEnabled>true</BootstrapperEnabled> <BootstrapperEnabled>true</BootstrapperEnabled>

4
Mk0.Software.Bildduplikate/Properties/AssemblyInfo.cs
View File

@ -32,5 +32,5 @@ using System.Runtime.InteropServices;
// Sie können alle Werte angeben oder Standardwerte für die Build- und Revisionsnummern verwenden, // Sie können alle Werte angeben oder Standardwerte für die Build- und Revisionsnummern verwenden,
// indem Sie "*" wie unten gezeigt eingeben: // indem Sie "*" wie unten gezeigt eingeben:
// [assembly: AssemblyVersion("1.0.*")] // [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("1.5.0.0")] [assembly: AssemblyVersion("1.6.0.0")]
[assembly: AssemblyFileVersion("1.5.0.0")] [assembly: AssemblyFileVersion("1.6.0.0")]