[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [kraft] src: SetupAssistant: Properly show an ok icon after successful update.
From:       Klaas Freitag <freitag () kde ! org>
Date:       2015-05-31 19:59:23
Message-ID: E1Yz9OF-0000BI-Jk () scm ! kde ! org
[Download RAW message or body]

Git commit 84e7b47d4789a9cbb85dbbc1abaf6f91b5a1e53c by Klaas Freitag.
Committed on 31/05/2015 at 19:58.
Pushed by freitag into branch 'master'.

SetupAssistant: Properly show an ok icon after successful update.

M  +25   -10   src/setupassistant.cpp

http://commits.kde.org/kraft/84e7b47d4789a9cbb85dbbc1abaf6f91b5a1e53c

diff --git a/src/setupassistant.cpp b/src/setupassistant.cpp
index 47331f4..5993d34 100644
--- a/src/setupassistant.cpp
+++ b/src/setupassistant.cpp
@@ -187,6 +187,9 @@ CreateDbPage::CreateDbPage(QWidget *parent)
   ui.mCreateCounter->setMinimumWidth(len+2);
   ui.mCreateCounter->setAlignment(Qt::AlignRight);
   ui.mFillCounter->setAlignment(Qt::AlignRight);
+
+  ui.mCreateIcon->setText(QString());
+  ui.mFillIcon->setText(QString());
 }
 
 void CreateDbPage::setStatusText( const QString& t )
@@ -205,6 +208,12 @@ void CreateDbPage::setFillCmdsCount( int cnt )
 void CreateDbPage::setFillCmdsCurrent( int cnt )
 {
     ui.mFillProgress->setValue( cnt );
+    ui.mFillCounter->setText( i18n("%1/%2").arg(mFills).arg( ui.mFillProgress->maximum() ) );
+
+    if( cnt == ui.mFillProgress->maximum() ) {
+        ui.mFillIcon->setVisible(true);
+        ui.mFillIcon->setPixmap( SmallIcon("dialog-ok"));
+    }
 }
 
 void CreateDbPage::setCreateCmdsCount( int cnt )
@@ -218,6 +227,11 @@ void CreateDbPage::setCreateCmdsCount( int cnt )
 void CreateDbPage::setCreateCmdsCurrent( int cnt )
 {
   ui.mCreateProgress->setValue( cnt );
+  ui.mCreateCounter->setText( i18n("%1/%2").arg(mCreates).arg( ui.mCreateProgress->maximum() ) );
+  if( cnt == ui.mCreateProgress->maximum() ) {
+      ui.mCreateIcon->setVisible(true);
+      ui.mCreateIcon->setPixmap( SmallIcon("dialog-ok"));
+  }
 }
 
 void CreateDbPage::slotStatusMessage( const QString& msg )
@@ -229,19 +243,15 @@ void CreateDbPage::slotStatusMessage( const QString& msg )
 void CreateDbPage::slotCountCreateProgress( bool res )
 {
   if( res ) {
-      mCreates++;
-      ui.mCreateProgress->setValue( mCreates );
-      ui.mCreateCounter->setText( i18n("%1/%2").arg(mCreates).arg( ui.mCreateProgress->maximum() ) );
+      setCreateCmdsCurrent(++mCreates);
   }
 }
 
 void CreateDbPage::slotCountFillProgress( bool res )
 {
-  if( res ) {
-      mFills++;
-    ui.mFillProgress->setValue( mFills );
-    ui.mFillCounter->setText( i18n("%1/%2").arg(mFills).arg( ui.mFillProgress->maximum() ) );
-  }
+    if( res ) {
+        setFillCmdsCurrent(++mFills);
+    }
 }
 
 // ---------------------------------------------------------------------------
@@ -264,6 +274,8 @@ UpgradeDbPage::UpgradeDbPage(QWidget *parent)
   ui.mUpgradeCounter->setMinimumWidth(len+2);
   ui.mUpgradeCounter->setAlignment(Qt::AlignRight);
 
+  ui.mCreateIcon->setText(QString());
+
 }
 
 void UpgradeDbPage::slotSetStatusText( const QString& txt )
@@ -281,14 +293,17 @@ void UpgradeDbPage::slotSetOverallCount( int cnt )
 
 void UpgradeDbPage::updateCounter()
 {
-  ui.mUpgradeCounter->setText( i18n("%1/%2").arg(mUpgrades).arg( ui.mUpgradeProgress->maximum() ));
+    ui.mUpgradeProgress->setValue( mUpgrades );
+    ui.mUpgradeCounter->setText( i18n("%1/%2").arg(mUpgrades).arg( ui.mUpgradeProgress->maximum() ));
+    if( mUpgrades == ui.mUpgradeProgress->maximum() ) {
+        ui.mCreateIcon->setPixmap(SmallIcon("dialog-ok"));
+    }
 }
 
 void UpgradeDbPage::slotCountFillProgress( bool res )
 {
   if( res ) {
     mUpgrades++;
-    ui.mUpgradeProgress->setValue( mUpgrades );
     updateCounter();
   }
 }
[prev in list] [next in list] [prev in thread] [next in thread]