Merge pull request #2 from akorb/master

CodeDead · CodeDead · commit 32780ab9cc1b · 2016-01-18T19:31:29.000+01:00
Some more refactoring
diff --git a/DeadLock/Classes/ListViewLocker.cs b/DeadLock/Classes/ListViewLocker.cs
@@ -477,7 +477,7 @@ await Task.Run(() =>
             {
                 if (File.Exists(GetPath()))
                 {
-                    SaveFileDialog sfd = new SaveFileDialog { Filter = @"|*" + Path.GetExtension(GetPath()) };
+                    SaveFileDialog sfd = new SaveFileDialog { Filter = "|*" + Path.GetExtension(GetPath()) };
                     if (sfd.ShowDialog() == DialogResult.OK)
                     {
                         await Unlock();
@@ -514,7 +514,7 @@ await Task.Run(() =>
             }
             else
             {
-                SaveFileDialog sfd = new SaveFileDialog { Filter = @"|*" + Path.GetExtension(GetPath()) };
+                SaveFileDialog sfd = new SaveFileDialog { Filter = "|*" + Path.GetExtension(GetPath()) };
                 if (sfd.ShowDialog() == DialogResult.OK)
                 {
                     await Unlock();
diff --git a/DeadLock/Forms/FrmAbout.Designer.cs b/DeadLock/Forms/FrmAbout.Designer.cs
diff --git a/DeadLock/Forms/FrmAbout.cs b/DeadLock/Forms/FrmAbout.cs
@@ -37,8 +37,8 @@ public FrmAbout(Language language)
         /// </summary>
         private void LoadLanguage()
         {
-            Text = @"DeadLock - " + _language.BarItemAbout;
-            txtAbout.Text = _language.TxtAboutCreated + Environment.NewLine + _language.TxtAboutImages + Environment.NewLine + _language.TxtAboutTheme + Environment.NewLine + Environment.NewLine + _language.TxtAboutCopyright + Environment.NewLine + Environment.NewLine + _language.TxtAboutTranslation + Environment.NewLine + _language.Comment + @" - " + _language.Author;
+            Text = "DeadLock - " + _language.BarItemAbout;
+            txtAbout.Text = _language.TxtAboutCreated + Environment.NewLine + _language.TxtAboutImages + Environment.NewLine + _language.TxtAboutTheme + Environment.NewLine + Environment.NewLine + _language.TxtAboutCopyright + Environment.NewLine + Environment.NewLine + _language.TxtAboutTranslation + Environment.NewLine + _language.Comment + " - " + _language.Author;
             btnClose.Text = _language.BtnClose;
             btnLicense.Text = _language.BtnLicense;
         }
diff --git a/DeadLock/Forms/FrmMain.cs b/DeadLock/Forms/FrmMain.cs
@@ -186,10 +186,7 @@ private async void Update(bool showError, bool showNoUpdates)
                 {
                     if (MessageBoxAdv.Show(l.MsgVersion + " " + _update.GetUpdateVersion() + " " + l.MsgAvailable + Environment.NewLine + l.MsgDownloadNewVersion, "DeadLock", MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.Yes)
                     {
-                        await Task.Run(() =>
-                        {
-                            new FrmUpdater(_update, _languageManager.GetLanguage()).ShowDialog();
-                        });
+                        new FrmUpdater(_update, _languageManager.GetLanguage()).Show();
                     }
                 }
                 else
@@ -250,7 +247,7 @@ private void LoadTheme()
 
         private void FrmMain_Load(object sender, EventArgs e)
         {
-            versionStaticBarItem.Text += @" " + Application.ProductVersion;
+            versionStaticBarItem.Text += " " + Application.ProductVersion;
             try
             {
                 nfiTray.Visible = Properties.Settings.Default.ShowNotifyIcon;
@@ -527,7 +524,7 @@ private async void moveToolStripMenuItem_Click(object sender, EventArgs e)
         {
             if (lsvItems.SelectedItems.Count == 0) return;
 
-            ListViewLocker lvl = (ListViewLocker) lsvItems.SelectedItems[0];
+            ListViewLocker lvl = (ListViewLocker)lsvItems.SelectedItems[0];
             Language l = _languageManager.GetLanguage();
 
             CancelSelectedTask(lvl);
@@ -569,7 +566,7 @@ private async void removeToolStripMenuItem_Click(object sender, EventArgs e)
         {
             if (lsvItems.SelectedItems.Count == 0) return;
 
-            ListViewLocker lvl = (ListViewLocker) lsvItems.SelectedItems[0];
+            ListViewLocker lvl = (ListViewLocker)lsvItems.SelectedItems[0];
             Language l = _languageManager.GetLanguage();
 
             CancelSelectedTask(lvl);
@@ -624,15 +621,15 @@ private async void lsvItems_DoubleClick(object sender, EventArgs e)
             if (lsvItems.SelectedItems.Count == 0) return;
             lsvDetails.Items.Clear();
 
-            ListViewLocker lvl = (ListViewLocker) lsvItems.SelectedItems[0];
+            ListViewLocker lvl = (ListViewLocker)lsvItems.SelectedItems[0];
             Language l = _languageManager.GetLanguage();
 
             try
             {
                 CancelSelectedTask(lvl);
                 await Task.Run(() =>
                 {
-                    while (lvl.IsRunning()){ }
+                    while (lvl.IsRunning()) { }
                 });
                 lvl.SetLocker(new List<ProcessLocker>());
 
@@ -648,7 +645,7 @@ await Task.Run(() =>
 
                 lvl.SetRunning(true);
                 List<ProcessLocker> lockers = await lvl.GetLockerDetails();
-                
+
                 if (!lvl.HasCancelled())
                 {
                     if (lockers.Count == 0)
@@ -665,7 +662,7 @@ await Task.Run(() =>
 
                     foreach (ProcessLocker p in lockers)
                     {
-                        ListViewItem lvi = new ListViewItem {Text = p.GetFileName()};
+                        ListViewItem lvi = new ListViewItem { Text = p.GetFileName() };
                         lvi.SubItems.Add(p.GetFilePath());
                         lvi.SubItems.Add(p.GetProcessId().ToString());
 
@@ -697,7 +694,7 @@ private void lsvItems_SelectedIndexChanged(object sender, EventArgs e)
             lsvDetails.Items.Clear();
             if (lsvItems.SelectedItems.Count == 0) return;
 
-            ListViewLocker lvl = (ListViewLocker) lsvItems.SelectedItems[0];
+            ListViewLocker lvl = (ListViewLocker)lsvItems.SelectedItems[0];
             foreach (ProcessLocker p in lvl.GetLockers())
             {
                 ListViewItem lvi = new ListViewItem { Text = p.GetFileName() };
@@ -711,7 +708,7 @@ private void clearItemsToolStripMenuItem_Click(object sender, EventArgs e)
         {
             foreach (ListViewItem lvi in lsvItems.Items)
             {
-                ListViewLocker lvl = (ListViewLocker) lvi;
+                ListViewLocker lvl = (ListViewLocker)lvi;
                 lvl.CancelTask();
             }
             lsvItems.Items.Clear();
@@ -774,7 +771,7 @@ private void cancelCurrentOperationToolStripMenuItem_Click(object sender, EventA
         {
             if (lsvItems.SelectedItems.Count == 0) return;
 
-            ListViewLocker selected = (ListViewLocker) lsvItems.SelectedItems[0];
+            ListViewLocker selected = (ListViewLocker)lsvItems.SelectedItems[0];
             if (CancelSelectedTask(selected))
             {
                 SetCancelled(selected);
@@ -865,7 +862,7 @@ private void openFileLocationToolStripMenuItem_Click(object sender, EventArgs e)
                 foreach (ListViewItem l in lsvDetails.SelectedItems)
                 {
                     if (!File.Exists(l.SubItems[1].Text)) continue;
-                    Process.Start("explorer.exe", @"/select, " + l.SubItems[1].Text);
+                    Process.Start("explorer.exe", "/select, " + l.SubItems[1].Text);
                 }
             }
             catch (Exception ex)
diff --git a/DeadLock/Forms/FrmSettings.cs b/DeadLock/Forms/FrmSettings.cs
@@ -44,7 +44,7 @@ public FrmSettings(NotifyIcon nfi, Language l)
         /// </summary>
         private void LoadLanguage()
         {
-            Text = @"DeadLock - " + _language.BarItemSettings;
+            Text = "DeadLock - " + _language.BarItemSettings;
 
             tpaGeneral.Text = _language.LblGeneral;
             tpaAppearance.Text = _language.LblAppearance;
@@ -159,7 +159,7 @@ private static bool WindowsExplorerIntegration()
             bool folderExplorerIntegration = false;
             using (RegistryKey key = Registry.ClassesRoot.OpenSubKey(@"*\shell\DeadLock\command"))
             {
-                if (key != null && key.GetValue(@"", "").ToString() == Application.ExecutablePath + " %1")
+                if (key != null && key.GetValue("", "").ToString() == Application.ExecutablePath + " %1")
                 {
                     fileExplorerIntegration = true;
                 }
@@ -168,7 +168,7 @@ private static bool WindowsExplorerIntegration()
 
             using (RegistryKey key = Registry.ClassesRoot.OpenSubKey(@"Directory\shell\DeadLock\command"))
             {
-                if (key != null && key.GetValue(@"", "").ToString() == Application.ExecutablePath + " %1")
+                if (key != null && key.GetValue("", "").ToString() == Application.ExecutablePath + " %1")
                 {
                     folderExplorerIntegration = true;
                 }
@@ -376,7 +376,7 @@ private void btnSave_Click(object sender, EventArgs e)
         private void btnSelectPath_Click(object sender, EventArgs e)
         {
             cboLanguage.SelectedIndex = 2;
-            OpenFileDialog ofd = new OpenFileDialog {Filter = @"XML (*.xml)|*.xml"};
+            OpenFileDialog ofd = new OpenFileDialog {Filter = "XML (*.xml)|*.xml"};
             if (ofd.ShowDialog() == DialogResult.OK)
             {
                 txtLanguagePath.Text = ofd.FileName;
diff --git a/DeadLock/Forms/FrmUpdater.cs b/DeadLock/Forms/FrmUpdater.cs
@@ -43,7 +43,7 @@ public FrmUpdater(Update update, Language language)
         /// </summary>
         private void LoadLanguage()
         {
-            Text = @"DeadLock - " + _language.TxtUpdater;
+            Text = "DeadLock - " + _language.TxtUpdater;
 
             lblPath.Text = _language.LblPath;
             lblProgress.Text = _language.LblProgress;
@@ -55,7 +55,7 @@ private void LoadLanguage()
         private void btnSelectPath_Click(object sender, EventArgs e)
         {
             string extension = _update.UpdateUrl.Substring(_update.UpdateUrl.Length - 4, 4);
-            SaveFileDialog sfd = new SaveFileDialog {Filter = extension.ToUpper() + @" (*" + extension + @")|*" + extension};
+            SaveFileDialog sfd = new SaveFileDialog {Filter = extension.ToUpper() + " (*" + extension + ")|*" + extension};
             if (sfd.ShowDialog() == DialogResult.OK)
             {
                 txtPath.Text = sfd.FileName;

Original file line number	Diff line number	Diff line change
`@@ -477,7 +477,7 @@ await Task.Run(() =>`
`477`	`477`	`{`
`478`	`478`	`if (File.Exists(GetPath()))`
`479`	`479`	`{`
`480`		`- SaveFileDialog sfd = new SaveFileDialog { Filter = @"\|*" + Path.GetExtension(GetPath()) };`
	`480`	`+ SaveFileDialog sfd = new SaveFileDialog { Filter = "\|*" + Path.GetExtension(GetPath()) };`
`481`	`481`	`if (sfd.ShowDialog() == DialogResult.OK)`
`482`	`482`	`{`
`483`	`483`	`await Unlock();`
`@@ -514,7 +514,7 @@ await Task.Run(() =>`
`514`	`514`	`}`
`515`	`515`	`else`
`516`	`516`	`{`
`517`		`- SaveFileDialog sfd = new SaveFileDialog { Filter = @"\|*" + Path.GetExtension(GetPath()) };`
	`517`	`+ SaveFileDialog sfd = new SaveFileDialog { Filter = "\|*" + Path.GetExtension(GetPath()) };`
`518`	`518`	`if (sfd.ShowDialog() == DialogResult.OK)`
`519`	`519`	`{`
`520`	`520`	`await Unlock();`
Original file line number	Diff line number	Diff line change
`@@ -37,8 +37,8 @@ public FrmAbout(Language language)`
`37`	`37`	`/// </summary>`
`38`	`38`	`private void LoadLanguage()`
`39`	`39`	`{`
`40`		`- Text = @"DeadLock - " + _language.BarItemAbout;`
`41`		`- txtAbout.Text = _language.TxtAboutCreated + Environment.NewLine + _language.TxtAboutImages + Environment.NewLine + _language.TxtAboutTheme + Environment.NewLine + Environment.NewLine + _language.TxtAboutCopyright + Environment.NewLine + Environment.NewLine + _language.TxtAboutTranslation + Environment.NewLine + _language.Comment + @" - " + _language.Author;`
	`40`	`+ Text = "DeadLock - " + _language.BarItemAbout;`
	`41`	`+ txtAbout.Text = _language.TxtAboutCreated + Environment.NewLine + _language.TxtAboutImages + Environment.NewLine + _language.TxtAboutTheme + Environment.NewLine + Environment.NewLine + _language.TxtAboutCopyright + Environment.NewLine + Environment.NewLine + _language.TxtAboutTranslation + Environment.NewLine + _language.Comment + " - " + _language.Author;`
`42`	`42`	`btnClose.Text = _language.BtnClose;`
`43`	`43`	`btnLicense.Text = _language.BtnLicense;`
`44`	`44`	`}`
Original file line number	Diff line number	Diff line change
`@@ -186,10 +186,7 @@ private async void Update(bool showError, bool showNoUpdates)`
`186`	`186`	`{`
`187`	`187`	`if (MessageBoxAdv.Show(l.MsgVersion + " " + _update.GetUpdateVersion() + " " + l.MsgAvailable + Environment.NewLine + l.MsgDownloadNewVersion, "DeadLock", MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.Yes)`
`188`	`188`	`{`
`189`		`- await Task.Run(() =>`
`190`		`- {`
`191`		`- new FrmUpdater(_update, _languageManager.GetLanguage()).ShowDialog();`
`192`		`- });`
	`189`	`+ new FrmUpdater(_update, _languageManager.GetLanguage()).Show();`
`193`	`190`	`}`
`194`	`191`	`}`
`195`	`192`	`else`
`@@ -250,7 +247,7 @@ private void LoadTheme()`
`250`	`247`
`251`	`248`	`private void FrmMain_Load(object sender, EventArgs e)`
`252`	`249`	`{`
`253`		`- versionStaticBarItem.Text += @" " + Application.ProductVersion;`
	`250`	`+ versionStaticBarItem.Text += " " + Application.ProductVersion;`
`254`	`251`	`try`
`255`	`252`	`{`
`256`	`253`	`nfiTray.Visible = Properties.Settings.Default.ShowNotifyIcon;`
`@@ -527,7 +524,7 @@ private async void moveToolStripMenuItem_Click(object sender, EventArgs e)`
`527`	`524`	`{`
`528`	`525`	`if (lsvItems.SelectedItems.Count == 0) return;`
`529`	`526`
`530`		`- ListViewLocker lvl = (ListViewLocker) lsvItems.SelectedItems[0];`
	`527`	`+ ListViewLocker lvl = (ListViewLocker)lsvItems.SelectedItems[0];`
`531`	`528`	`Language l = _languageManager.GetLanguage();`
`532`	`529`
`533`	`530`	`CancelSelectedTask(lvl);`
`@@ -569,7 +566,7 @@ private async void removeToolStripMenuItem_Click(object sender, EventArgs e)`
`569`	`566`	`{`
`570`	`567`	`if (lsvItems.SelectedItems.Count == 0) return;`
`571`	`568`
`572`		`- ListViewLocker lvl = (ListViewLocker) lsvItems.SelectedItems[0];`
	`569`	`+ ListViewLocker lvl = (ListViewLocker)lsvItems.SelectedItems[0];`
`573`	`570`	`Language l = _languageManager.GetLanguage();`
`574`	`571`
`575`	`572`	`CancelSelectedTask(lvl);`
`@@ -624,15 +621,15 @@ private async void lsvItems_DoubleClick(object sender, EventArgs e)`
`624`	`621`	`if (lsvItems.SelectedItems.Count == 0) return;`
`625`	`622`	`lsvDetails.Items.Clear();`
`626`	`623`
`627`		`- ListViewLocker lvl = (ListViewLocker) lsvItems.SelectedItems[0];`
	`624`	`+ ListViewLocker lvl = (ListViewLocker)lsvItems.SelectedItems[0];`
`628`	`625`	`Language l = _languageManager.GetLanguage();`
`629`	`626`
`630`	`627`	`try`
`631`	`628`	`{`
`632`	`629`	`CancelSelectedTask(lvl);`
`633`	`630`	`await Task.Run(() =>`
`634`	`631`	`{`
`635`		`- while (lvl.IsRunning()){ }`
	`632`	`+ while (lvl.IsRunning()) { }`
`636`	`633`	`});`
`637`	`634`	`lvl.SetLocker(new List<ProcessLocker>());`
`638`	`635`
`@@ -648,7 +645,7 @@ await Task.Run(() =>`
`648`	`645`
`649`	`646`	`lvl.SetRunning(true);`
`650`	`647`	`List<ProcessLocker> lockers = await lvl.GetLockerDetails();`
`651`		`-`
	`648`	`+`
`652`	`649`	`if (!lvl.HasCancelled())`
`653`	`650`	`{`
`654`	`651`	`if (lockers.Count == 0)`
`@@ -665,7 +662,7 @@ await Task.Run(() =>`
`665`	`662`
`666`	`663`	`foreach (ProcessLocker p in lockers)`
`667`	`664`	`{`
`668`		`- ListViewItem lvi = new ListViewItem {Text = p.GetFileName()};`
	`665`	`+ ListViewItem lvi = new ListViewItem { Text = p.GetFileName() };`
`669`	`666`	`lvi.SubItems.Add(p.GetFilePath());`
`670`	`667`	`lvi.SubItems.Add(p.GetProcessId().ToString());`
`671`	`668`
`@@ -697,7 +694,7 @@ private void lsvItems_SelectedIndexChanged(object sender, EventArgs e)`
`697`	`694`	`lsvDetails.Items.Clear();`
`698`	`695`	`if (lsvItems.SelectedItems.Count == 0) return;`
`699`	`696`
`700`		`- ListViewLocker lvl = (ListViewLocker) lsvItems.SelectedItems[0];`
	`697`	`+ ListViewLocker lvl = (ListViewLocker)lsvItems.SelectedItems[0];`
`701`	`698`	`foreach (ProcessLocker p in lvl.GetLockers())`
`702`	`699`	`{`
`703`	`700`	`ListViewItem lvi = new ListViewItem { Text = p.GetFileName() };`
`@@ -711,7 +708,7 @@ private void clearItemsToolStripMenuItem_Click(object sender, EventArgs e)`
`711`	`708`	`{`
`712`	`709`	`foreach (ListViewItem lvi in lsvItems.Items)`
`713`	`710`	`{`
`714`		`- ListViewLocker lvl = (ListViewLocker) lvi;`
	`711`	`+ ListViewLocker lvl = (ListViewLocker)lvi;`
`715`	`712`	`lvl.CancelTask();`
`716`	`713`	`}`
`717`	`714`	`lsvItems.Items.Clear();`
`@@ -774,7 +771,7 @@ private void cancelCurrentOperationToolStripMenuItem_Click(object sender, EventA`
`774`	`771`	`{`
`775`	`772`	`if (lsvItems.SelectedItems.Count == 0) return;`
`776`	`773`
`777`		`- ListViewLocker selected = (ListViewLocker) lsvItems.SelectedItems[0];`
	`774`	`+ ListViewLocker selected = (ListViewLocker)lsvItems.SelectedItems[0];`
`778`	`775`	`if (CancelSelectedTask(selected))`
`779`	`776`	`{`
`780`	`777`	`SetCancelled(selected);`
`@@ -865,7 +862,7 @@ private void openFileLocationToolStripMenuItem_Click(object sender, EventArgs e)`
`865`	`862`	`foreach (ListViewItem l in lsvDetails.SelectedItems)`
`866`	`863`	`{`
`867`	`864`	`if (!File.Exists(l.SubItems[1].Text)) continue;`
`868`		`- Process.Start("explorer.exe", @"/select, " + l.SubItems[1].Text);`
	`865`	`+ Process.Start("explorer.exe", "/select, " + l.SubItems[1].Text);`
`869`	`866`	`}`
`870`	`867`	`}`
`871`	`868`	`catch (Exception ex)`
Original file line number	Diff line number	Diff line change
`@@ -44,7 +44,7 @@ public FrmSettings(NotifyIcon nfi, Language l)`
`44`	`44`	`/// </summary>`
`45`	`45`	`private void LoadLanguage()`
`46`	`46`	`{`
`47`		`- Text = @"DeadLock - " + _language.BarItemSettings;`
	`47`	`+ Text = "DeadLock - " + _language.BarItemSettings;`
`48`	`48`
`49`	`49`	`tpaGeneral.Text = _language.LblGeneral;`
`50`	`50`	`tpaAppearance.Text = _language.LblAppearance;`
`@@ -159,7 +159,7 @@ private static bool WindowsExplorerIntegration()`
`159`	`159`	`bool folderExplorerIntegration = false;`
`160`	`160`	`using (RegistryKey key = Registry.ClassesRoot.OpenSubKey(@"*\shell\DeadLock\command"))`
`161`	`161`	`{`
`162`		`- if (key != null && key.GetValue(@"", "").ToString() == Application.ExecutablePath + " %1")`
	`162`	`+ if (key != null && key.GetValue("", "").ToString() == Application.ExecutablePath + " %1")`
`163`	`163`	`{`
`164`	`164`	`fileExplorerIntegration = true;`
`165`	`165`	`}`
`@@ -168,7 +168,7 @@ private static bool WindowsExplorerIntegration()`
`168`	`168`
`169`	`169`	`using (RegistryKey key = Registry.ClassesRoot.OpenSubKey(@"Directory\shell\DeadLock\command"))`
`170`	`170`	`{`
`171`		`- if (key != null && key.GetValue(@"", "").ToString() == Application.ExecutablePath + " %1")`
	`171`	`+ if (key != null && key.GetValue("", "").ToString() == Application.ExecutablePath + " %1")`
`172`	`172`	`{`
`173`	`173`	`folderExplorerIntegration = true;`
`174`	`174`	`}`
`@@ -376,7 +376,7 @@ private void btnSave_Click(object sender, EventArgs e)`
`376`	`376`	`private void btnSelectPath_Click(object sender, EventArgs e)`
`377`	`377`	`{`
`378`	`378`	`cboLanguage.SelectedIndex = 2;`
`379`		`- OpenFileDialog ofd = new OpenFileDialog {Filter = @"XML (.xml)\|.xml"};`
	`379`	`+ OpenFileDialog ofd = new OpenFileDialog {Filter = "XML (.xml)\|.xml"};`
`380`	`380`	`if (ofd.ShowDialog() == DialogResult.OK)`
`381`	`381`	`{`
`382`	`382`	`txtLanguagePath.Text = ofd.FileName;`
Original file line number	Diff line number	Diff line change
`@@ -43,7 +43,7 @@ public FrmUpdater(Update update, Language language)`
`43`	`43`	`/// </summary>`
`44`	`44`	`private void LoadLanguage()`
`45`	`45`	`{`
`46`		`- Text = @"DeadLock - " + _language.TxtUpdater;`
	`46`	`+ Text = "DeadLock - " + _language.TxtUpdater;`
`47`	`47`
`48`	`48`	`lblPath.Text = _language.LblPath;`
`49`	`49`	`lblProgress.Text = _language.LblProgress;`
`@@ -55,7 +55,7 @@ private void LoadLanguage()`
`55`	`55`	`private void btnSelectPath_Click(object sender, EventArgs e)`
`56`	`56`	`{`
`57`	`57`	`string extension = _update.UpdateUrl.Substring(_update.UpdateUrl.Length - 4, 4);`
`58`		`- SaveFileDialog sfd = new SaveFileDialog {Filter = extension.ToUpper() + @" (" + extension + @")\|" + extension};`
	`58`	`+ SaveFileDialog sfd = new SaveFileDialog {Filter = extension.ToUpper() + " (" + extension + ")\|" + extension};`
`59`	`59`	`if (sfd.ShowDialog() == DialogResult.OK)`
`60`	`60`	`{`
`61`	`61`	`txtPath.Text = sfd.FileName;`