From 3c5c10f75a3127aecc298cc21bedef758ffd409a Mon Sep 17 00:00:00 2001
From: Natalia Portillo <claunia@claunia.com>
Date: Wed, 17 May 2017 06:26:20 +0100
Subject: [PATCH] Correct progress position and text.

---
 osrepodbmgr.Eto/dlgAdd.xeto     | 24 ++++++++----------------
 osrepodbmgr.Eto/dlgAdd.xeto.cs  |  9 +++++++--
 osrepodbmgr.Eto/frmMain.xeto    | 28 ++++++++++++----------------
 osrepodbmgr.Eto/frmMain.xeto.cs |  8 ++++++--
 4 files changed, 33 insertions(+), 36 deletions(-)

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 @@
 			</StackLayout>
 		</StackLayoutItem>
 		<StackLayoutItem HorizontalAlignment="Stretch">
-			<StackLayout Orientation="Horizontal">
-				<StackLayoutItem HorizontalAlignment="Left">
-					<Label ID="lblProgress" Visible="False">Progress</Label>
-				</StackLayoutItem>
-				<StackLayoutItem Expand="True" HorizontalAlignment="Right">
-					<ProgressBar ID="prgProgress" Visible="False" />
-				</StackLayoutItem>
-			</StackLayout>
+			<Label ID="lblProgress" Visible="False">Progress</Label>
 		</StackLayoutItem>
 		<StackLayoutItem HorizontalAlignment="Stretch">
-			<StackLayout Orientation="Horizontal">
-				<StackLayoutItem HorizontalAlignment="Left">
-					<Label ID="lblProgress2" Visible="False">Progress2</Label>
-				</StackLayoutItem>
-				<StackLayoutItem Expand="True" HorizontalAlignment="Right">
-					<ProgressBar ID="prgProgress2" Visible="False" />
-				</StackLayoutItem>
-			</StackLayout>
+			<ProgressBar ID="prgProgress" Visible="False" />
+		</StackLayoutItem>
+		<StackLayoutItem HorizontalAlignment="Stretch">
+			<Label ID="lblProgress2" Visible="False">Progress2</Label>
+		</StackLayoutItem>
+		<StackLayoutItem HorizontalAlignment="Stretch">
+			<ProgressBar ID="prgProgress2" Visible="False" />
 		</StackLayoutItem>
 		<StackLayoutItem HorizontalAlignment="Center">
 			<StackLayout Orientation="Horizontal">
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 @@
 				</GridView>
 			</GroupBox>
 		</StackLayoutItem>
-		<StackLayout Orientation="Horizontal">
-			<StackLayoutItem Expand="True" HorizontalAlignment="Left">
-				<Label ID="lblProgress">lblProgress</Label>
-			</StackLayoutItem>
-			<StackLayoutItem Expand="True" HorizontalAlignment="Stretch">
-				<ProgressBar ID="prgProgress" />
-			</StackLayoutItem>
-		</StackLayout>
-		<StackLayout Orientation="Horizontal">
-			<StackLayoutItem Expand="True" HorizontalAlignment="Left">
-				<Label ID="lblProgress2" Visible="False">lblProgress2</Label>
-			</StackLayoutItem>
-			<StackLayoutItem Expand="True" HorizontalAlignment="Stretch">
-				<ProgressBar ID="prgProgress2" Visible="False" />
-			</StackLayoutItem>
-		</StackLayout>
+		<StackLayoutItem HorizontalAlignment="Stretch">
+			<Label ID="lblProgress">lblProgress</Label>
+		</StackLayoutItem>
+		<StackLayoutItem HorizontalAlignment="Stretch">
+			<ProgressBar ID="prgProgress" />
+		</StackLayoutItem>
+		<StackLayoutItem HorizontalAlignment="Stretch">
+			<Label ID="lblProgress2" Visible="False">lblProgress2</Label>
+		</StackLayoutItem>
+		<StackLayoutItem HorizontalAlignment="Stretch">
+			<ProgressBar ID="prgProgress2" Visible="False" />
+		</StackLayoutItem>
 		<StackLayoutItem HorizontalAlignment="Center">
 			<StackLayout Orientation="Horizontal">
 				<Button x:Name="btnAdd" Click="OnBtnAddClicked" Visible="False">Add</Button>
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;