From 84661014e87d312cdec92c28ca01c252751512f9 Mon Sep 17 00:00:00 2001
From: Roman Telezhynskyi <kroluku@gmail.com>
Date: Wed, 6 May 2015 15:49:27 +0300
Subject: [PATCH] Show label with information in progress dialog.

--HG--
branch : develop
---
 src/app/dialogs/app/dialoglayoutprogress.cpp |  7 +++++--
 src/app/dialogs/app/dialoglayoutprogress.h   |  3 ++-
 src/app/dialogs/app/dialoglayoutprogress.ui  | 21 +++++++++++++++-----
 3 files changed, 23 insertions(+), 8 deletions(-)

diff --git a/src/app/dialogs/app/dialoglayoutprogress.cpp b/src/app/dialogs/app/dialoglayoutprogress.cpp
index bdfe9be34..926476ec0 100644
--- a/src/app/dialogs/app/dialoglayoutprogress.cpp
+++ b/src/app/dialogs/app/dialoglayoutprogress.cpp
@@ -36,15 +36,17 @@
 
 //---------------------------------------------------------------------------------------------------------------------
 DialogLayoutProgress::DialogLayoutProgress(int count, QWidget *parent)
-    :QDialog(parent), ui(new Ui::DialogLayoutProgress)
+    :QDialog(parent), ui(new Ui::DialogLayoutProgress), maxCount(count)
 {
     ui->setupUi(this);
 
     qApp->getSettings()->GetOsSeparator() ? setLocale(QLocale::system()) : setLocale(QLocale(QLocale::C));
 
-    ui->progressBar->setMaximum(count);
+    ui->progressBar->setMaximum(maxCount);
     ui->progressBar->setValue(0);
 
+    ui->labelMessage->setText(tr("Arranged: %1 from %2").arg(0).arg(count));
+
     QPushButton *bCancel = ui->buttonBox->button(QDialogButtonBox::Cancel);
     SCASSERT(bCancel != nullptr);
     connect(bCancel, &QPushButton::clicked, this, &DialogLayoutProgress::StopWorking);
@@ -69,6 +71,7 @@ void DialogLayoutProgress::Start()
 void DialogLayoutProgress::Arranged(int count)
 {
     ui->progressBar->setValue(count);
+    ui->labelMessage->setText(tr("Arranged: %1 from %2").arg(count).arg(maxCount));
 }
 
 //---------------------------------------------------------------------------------------------------------------------
diff --git a/src/app/dialogs/app/dialoglayoutprogress.h b/src/app/dialogs/app/dialoglayoutprogress.h
index 3d761c3d3..c89944bf5 100644
--- a/src/app/dialogs/app/dialoglayoutprogress.h
+++ b/src/app/dialogs/app/dialoglayoutprogress.h
@@ -43,7 +43,7 @@ class DialogLayoutProgress : public QDialog
     Q_OBJECT
 
 public:
-    explicit DialogLayoutProgress(int count, QWidget *parent = 0);
+    DialogLayoutProgress(int count, QWidget *parent = 0);
     ~DialogLayoutProgress();
 
 signals:
@@ -59,6 +59,7 @@ public slots:
 private:
     Q_DISABLE_COPY(DialogLayoutProgress)
     Ui::DialogLayoutProgress *ui;
+    int maxCount;
 };
 
 #endif // DIALOGLAYOUTPROGRESS_H
diff --git a/src/app/dialogs/app/dialoglayoutprogress.ui b/src/app/dialogs/app/dialoglayoutprogress.ui
index af18268af..f5459a0df 100644
--- a/src/app/dialogs/app/dialoglayoutprogress.ui
+++ b/src/app/dialogs/app/dialoglayoutprogress.ui
@@ -63,11 +63,22 @@
     </widget>
    </item>
    <item>
-    <widget class="QDialogButtonBox" name="buttonBox">
-     <property name="standardButtons">
-      <set>QDialogButtonBox::Cancel</set>
-     </property>
-    </widget>
+    <layout class="QHBoxLayout" name="horizontalLayout">
+     <item>
+      <widget class="QLabel" name="labelMessage">
+       <property name="text">
+        <string notr="true">Arranged:</string>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QDialogButtonBox" name="buttonBox">
+       <property name="standardButtons">
+        <set>QDialogButtonBox::Cancel</set>
+       </property>
+      </widget>
+     </item>
+    </layout>
    </item>
   </layout>
  </widget>