claunia/apprepodbmgr
1
0
Fork 0
mirror of https://github.com/claunia/apprepodbmgr.git synced 2025-12-16 19:24:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

Corrected GUI behaviour.

Browse Source
This commit is contained in:
Natalia Portillo
2017-05-19 03:25:03 +01:00
parent faef050858
commit c31daeea01
7 changed files with 29 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
osrepodbmgr.Eto/ChangeLog
View File

@@ -1,3 +1,9 @@
2017-05-19 Natalia Portillo <claunia@claunia.com>
* dlgAdd.xeto.cs:
* frmMain.xeto.cs:
Corrected GUI behaviour.
2017-05-19 Natalia Portillo <claunia@claunia.com>
* frmMain.xeto.cs:

5
osrepodbmgr.Eto/dlgAdd.xeto.cs
View File

@@ -336,7 +336,7 @@ namespace osrepodbmgr.Eto
Workers.UpdateProgress2 -= UpdateProgress2;
thdHashFiles = null;
lblProgress.Visible = false;
lblProgress.Visible = true;
prgProgress.Visible = true;
thdCheckFiles = new Thread(Workers.CheckDbForFiles);
@@ -1104,8 +1104,7 @@ namespace osrepodbmgr.Eto
Workers.UpdateProgress2 -= UpdateProgress2;
prgProgress.Indeterminate = true;
if(thdExtractArchive != null)
thdExtractArchive.Abort();
thdExtractArchive = null;
thdFindFiles = new Thread(Workers.FindFiles);
Workers.Failed += FindFilesFailed;
Workers.Finished += FindFilesFinished;

2
osrepodbmgr.Eto/frmMain.xeto.cs
View File

@@ -747,7 +747,6 @@ namespace osrepodbmgr.Eto
{
Application.Instance.Invoke(delegate
{
MessageBox.Show(text, MessageBoxType.Error);
treeFiles.Enabled = true;
btnToggleCrack.Enabled = true;
btnScanWithClamd.Enabled = true;
@@ -759,6 +758,7 @@ namespace osrepodbmgr.Eto
lblProgressFiles1.Text = "";
if(thdScanFile != null)
thdScanFile = null;
MessageBox.Show(text, MessageBoxType.Error);
});
}

7
osrepodbmgr/ChangeLog
View File

@@ -1,3 +1,10 @@
2017-05-19 Natalia Portillo <claunia@claunia.com>
* dlgAdd.cs:
* frmMain.cs:
* gtk-gui/osrepodbmgr.dlgSettings.cs:
Corrected GUI behaviour.
2017-05-19 Natalia Portillo <claunia@claunia.com>
* frmMain.cs:

2
osrepodbmgr/dlgAdd.cs
View File

@@ -1141,7 +1141,7 @@ public partial class dlgAdd : Dialog
Workers.UpdateProgress -= UpdateProgress;
Workers.UpdateProgress2 -= UpdateProgress2;
if(thdExtractArchive != null)
thdExtractArchive.Abort();
thdExtractArchive = null;
if(thdPulseProgress != null)
thdPulseProgress.Abort();
thdPulseProgress = new Thread(() =>

6
osrepodbmgr/frmMain.cs
View File

@@ -792,9 +792,6 @@ namespace osrepodbmgr
{
Application.Invoke(delegate
{
MessageDialog dlgMsg = new MessageDialog(this, DialogFlags.Modal, MessageType.Error, ButtonsType.Ok, text);
dlgMsg.Run();
dlgMsg.Destroy();
treeFiles.Sensitive = true;
btnToggleCrack.Sensitive = true;
btnScanWithClamd.Sensitive = true;
@@ -814,6 +811,9 @@ namespace osrepodbmgr
thdScanFile.Abort();
thdScanFile = null;
}
MessageDialog dlgMsg = new MessageDialog(this, DialogFlags.Modal, MessageType.Error, ButtonsType.Ok, text);
dlgMsg.Run();
dlgMsg.Destroy();
});
}

18
osrepodbmgr/gtk-gui/osrepodbmgr.dlgSettings.cs
View File

@@ -78,7 +78,7 @@ namespace osrepodbmgr
private global::Gtk.Label GtkLabel8;
private global::Gtk.Frame frame2;
private global::Gtk.Frame frmVirusTotal;
private global::Gtk.Alignment GtkAlignment7;
@@ -467,10 +467,10 @@ namespace osrepodbmgr
w39.Expand = false;
w39.Fill = false;
// Container child vbox4.Gtk.Box+BoxChild
this.frame2 = new global::Gtk.Frame();
this.frame2.Name = "frame2";
this.frame2.ShadowType = ((global::Gtk.ShadowType)(0));
// Container child frame2.Gtk.Container+ContainerChild
this.frmVirusTotal = new global::Gtk.Frame();
this.frmVirusTotal.Name = "frmVirusTotal";
this.frmVirusTotal.ShadowType = ((global::Gtk.ShadowType)(0));
// Container child frmVirusTotal.Gtk.Container+ContainerChild
this.GtkAlignment7 = new global::Gtk.Alignment(0F, 0F, 1F, 1F);
this.GtkAlignment7.Name = "GtkAlignment7";
this.GtkAlignment7.LeftPadding = ((uint)(12));
@@ -540,14 +540,14 @@ namespace osrepodbmgr
w45.Expand = false;
w45.Fill = false;
this.GtkAlignment7.Add(this.vbox7);
this.frame2.Add(this.GtkAlignment7);
this.frmVirusTotal.Add(this.GtkAlignment7);
this.GtkLabel12 = new global::Gtk.Label();
this.GtkLabel12.Name = "GtkLabel12";
this.GtkLabel12.LabelProp = global::Mono.Unix.Catalog.GetString("<b>VirusTotal</b>");
this.GtkLabel12.UseMarkup = true;
this.frame2.LabelWidget = this.GtkLabel12;
this.vbox4.Add(this.frame2);
global::Gtk.Box.BoxChild w48 = ((global::Gtk.Box.BoxChild)(this.vbox4[this.frame2]));
this.frmVirusTotal.LabelWidget = this.GtkLabel12;
this.vbox4.Add(this.frmVirusTotal);
global::Gtk.Box.BoxChild w48 = ((global::Gtk.Box.BoxChild)(this.vbox4[this.frmVirusTotal]));
w48.Position = 2;
w48.Expand = false;
w48.Fill = false;