[zypp-commit] r6036 - in /trunk/updater-kde/updater: MainWindow.cpp simpleview.cpp simpleview.h

Author: tgoettlicher Date: Tue Jul 17 10:57:23 2007 New Revision: 6036 URL: http://svn.opensuse.org/viewcvs/zypp?rev=6036&view=rev Log: added progressbar to simpleview Modified: trunk/updater-kde/updater/MainWindow.cpp trunk/updater-kde/updater/simpleview.cpp trunk/updater-kde/updater/simpleview.h Modified: trunk/updater-kde/updater/MainWindow.cpp URL: http://svn.opensuse.org/viewcvs/zypp/trunk/updater-kde/updater/MainWindow.cpp?rev=6036&r1=6035&r2=6036&view=diff ============================================================================== --- trunk/updater-kde/updater/MainWindow.cpp (original) +++ trunk/updater-kde/updater/MainWindow.cpp Tue Jul 17 10:57:23 2007 @@ -348,12 +348,21 @@ progressPopup->setTotalSteps(totalSteps); progressPopup->setProgress(step); progressPopup->setText(text); + + _simple->setTotalSteps(totalSteps); + _simple->setProgress(step); + _simple->setText(text); + + } void MainWindow::slotSetProgressNextStep(QString text) { progressPopup->nextStep(); progressPopup->setText(text); + + _simple->nextStep(); + _simple->setText(text); } Modified: trunk/updater-kde/updater/simpleview.cpp URL: http://svn.opensuse.org/viewcvs/zypp/trunk/updater-kde/updater/simpleview.cpp?rev=6036&r1=6035&r2=6036&view=diff ============================================================================== --- trunk/updater-kde/updater/simpleview.cpp (original) +++ trunk/updater-kde/updater/simpleview.cpp Tue Jul 17 10:57:23 2007 @@ -48,8 +48,12 @@ recommended = new QCheckBox(i18n("install %1 recommeded updates additionally").arg(42), centralWidget); norestart = new QCheckBox(i18n("Don't install updates that require a restart"), centralWidget); + bar = new QProgressBar(centralWidget); + + layout->addMultiCellWidget(title,1,1,1,3); layout->addMultiCellWidget(recommended,3,3,1,3); + layout->addMultiCellWidget(bar,3,3,1,3); layout->addMultiCellWidget(norestart,5,5,1,3); // -------------------- Buttons ------------------------ @@ -147,6 +151,7 @@ ok->show(); details->hide(); cancel->hide(); + bar->hide(); break; case APPLET_PROBLEM: @@ -158,6 +163,7 @@ ok->show(); details->hide(); cancel->hide(); + bar->hide(); break; case APPLET_NO_UPDATES: @@ -169,6 +175,7 @@ ok->show(); details->hide(); cancel->hide(); + bar->hide(); break; case APPLET_UPDATES: @@ -191,6 +198,7 @@ ok->hide(); details->show(); cancel->show(); + bar->hide(); break; case APPLET_INSTALLING: @@ -202,6 +210,7 @@ ok->show(); details->hide(); cancel->hide(); + bar->show(); break; } @@ -218,4 +227,27 @@ { securityCount=count; } + + +void SimpleView::setProgress(int progress) +{ + bar->setProgress(progress); +} + +void SimpleView::setText(QString text) +{ + title->setText(text); +} + +void SimpleView::setTotalSteps(int steps) +{ + bar->setTotalSteps(steps); +} + +void SimpleView::nextStep() +{ + bar->setProgress(bar->progress() + 1); +} + + #include "simpleview.moc" Modified: trunk/updater-kde/updater/simpleview.h URL: http://svn.opensuse.org/viewcvs/zypp/trunk/updater-kde/updater/simpleview.h?rev=6036&r1=6035&r2=6036&view=diff ============================================================================== --- trunk/updater-kde/updater/simpleview.h (original) +++ trunk/updater-kde/updater/simpleview.h Tue Jul 17 10:57:23 2007 @@ -2,6 +2,7 @@ #include #include #include +#include #ifndef SIMPLEVIEW_H #define SIMPLEVIEW_H @@ -24,6 +25,7 @@ KPushButton *details; KPushButton *cancel; KPushButton *ok; + QProgressBar *bar; int recommendedCount; int securityCount; @@ -34,6 +36,10 @@ void setState(int state, const QString &description = QString() ); void setRecommendedCount(int count); void setSecurityCount(int count); + void setProgress(int step); + void nextStep(); + void setTotalSteps(int steps); + void setText(QString text); -- To unsubscribe, e-mail: zypp-commit+unsubscribe@opensuse.org For additional commands, e-mail: zypp-commit+help@opensuse.org