diff --git a/osrepodbmgr.Eto/dlgAdd.xeto b/osrepodbmgr.Eto/dlgAdd.xeto
index 04aadbe..4301f60 100644
--- a/osrepodbmgr.Eto/dlgAdd.xeto
+++ b/osrepodbmgr.Eto/dlgAdd.xeto
@@ -110,24 +110,16 @@
-
-
-
-
-
-
-
-
+
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
diff --git a/osrepodbmgr.Eto/dlgAdd.xeto.cs b/osrepodbmgr.Eto/dlgAdd.xeto.cs
index 03b9c10..b1bb971 100644
--- a/osrepodbmgr.Eto/dlgAdd.xeto.cs
+++ b/osrepodbmgr.Eto/dlgAdd.xeto.cs
@@ -560,7 +560,9 @@ namespace osrepodbmgr.Eto
{
Application.Instance.Invoke(delegate
{
- if(!string.IsNullOrWhiteSpace(inner))
+ if(!string.IsNullOrWhiteSpace(text) && !string.IsNullOrWhiteSpace(inner))
+ lblProgress.Text = string.Format("{0}: {1}", text, inner);
+ else if(!string.IsNullOrWhiteSpace(inner))
lblProgress.Text = inner;
else
lblProgress.Text = text;
@@ -580,7 +582,9 @@ namespace osrepodbmgr.Eto
{
Application.Instance.Invoke(delegate
{
- if(!string.IsNullOrWhiteSpace(inner))
+ if(!string.IsNullOrWhiteSpace(text) && !string.IsNullOrWhiteSpace(inner))
+ lblProgress2.Text = string.Format("{0}: {1}", text, inner);
+ else if(!string.IsNullOrWhiteSpace(inner))
lblProgress2.Text = inner;
else
lblProgress2.Text = text;
@@ -816,6 +820,7 @@ namespace osrepodbmgr.Eto
Context.dbInfo.mdid[4].ToString(),
Context.dbInfo.mdid) + ".zip");
+ lblProgress.Visible = false;
prgProgress.Visible = false;
btnClose.Enabled = true;
});
diff --git a/osrepodbmgr.Eto/frmMain.xeto b/osrepodbmgr.Eto/frmMain.xeto
index f75079b..bd88e31 100644
--- a/osrepodbmgr.Eto/frmMain.xeto
+++ b/osrepodbmgr.Eto/frmMain.xeto
@@ -7,22 +7,18 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/osrepodbmgr.Eto/frmMain.xeto.cs b/osrepodbmgr.Eto/frmMain.xeto.cs
index 414c571..013d0f9 100644
--- a/osrepodbmgr.Eto/frmMain.xeto.cs
+++ b/osrepodbmgr.Eto/frmMain.xeto.cs
@@ -205,7 +205,9 @@ namespace osrepodbmgr.Eto
{
Application.Instance.Invoke(delegate
{
- if(!string.IsNullOrWhiteSpace(inner))
+ if(!string.IsNullOrWhiteSpace(text) && !string.IsNullOrWhiteSpace(inner))
+ lblProgress.Text = string.Format("{0}: {1}", text, inner);
+ else if(!string.IsNullOrWhiteSpace(inner))
lblProgress.Text = inner;
else
lblProgress.Text = text;
@@ -225,7 +227,9 @@ namespace osrepodbmgr.Eto
{
Application.Instance.Invoke(delegate
{
- if(!string.IsNullOrWhiteSpace(inner))
+ if(!string.IsNullOrWhiteSpace(text) && !string.IsNullOrWhiteSpace(inner))
+ lblProgress2.Text = string.Format("{0}: {1}", text, inner);
+ else if(!string.IsNullOrWhiteSpace(inner))
lblProgress2.Text = inner;
else
lblProgress2.Text = text;