From kde-commits  Tue Dec 01 00:02:00 2009
From: Dario Freddi <drf () kde ! org>
Date: Tue, 01 Dec 2009 00:02:00 +0000
To: kde-commits
Subject: playground/sysadmin/shaman
Message-Id: <1259625720.750746.7602.nullmailer () svn ! kde ! org>
X-MARC-Message: https://marc.info/?l=kde-commits&m=125962573332123

SVN commit 1056838 by dafre:

Fixes and polishing everywhere

Signed-off-by: Dario Freddi <drf@kde.org>

 M  +1 -0      libshaman/BackendInterface.h  
 M  +1 -0      libshaman/TransactionInterface.cpp  
 M  +9 -9      libshaman/TransactionInterface.h  
 M  +1 -0      shaman/src/MainWindow.cpp  
 M  +2 -0      shaman/src/QueueSerializer.cpp  
 M  +4 -3      shaman/src/processqueue/ProcessQueueDialog.cpp  


--- trunk/playground/sysadmin/shaman/libshaman/BackendInterface.h #1056837:1056838
@@ -108,6 +108,7 @@
 class SHAMAN_EXPORT BackendInterface : public QObject
 {
     Q_OBJECT
+    Q_DISABLE_COPY(BackendInterface)
     Q_ENUMS(State)
     Q_ENUMS(Error)
     Q_ENUMS(SearchType)
--- trunk/playground/sysadmin/shaman/libshaman/TransactionInterface.cpp #1056837:1056838
@@ -54,6 +54,7 @@
 
 void TransactionInterface::Private::setPackages(const Shaman::Package::List& newpackages)
 {
+    transactionMessages.clear();
     packages = newpackages;
     totalDownloadSize = 0;
     totalDownloaded = 0;
--- trunk/playground/sysadmin/shaman/libshaman/TransactionInterface.h #1056837:1056838
@@ -107,13 +107,13 @@
              */
             UnknownError = 256
         };
-        
+
         enum MessageLevel {
             TransactionStatusLevel = 0,
             HookMessageLevel = 1,
             BackendMessageLevel = 2
         };
-        
+
         enum TransactionQuestionAnswer {
             UnknownAnswer = 0,
             AnswerYes = 1,
@@ -134,7 +134,7 @@
          * The descructor of the TransactionInterface.
          */
         ~TransactionInterface();
-        
+
         /**
          * @returns the current State of the TransactionInterface
          */
@@ -159,16 +159,16 @@
          * @returns the total Progress of the Transaction in percent
          */
         int downloadProgressAsPercentage() const;
-        
+
         QPair<qint64, qint64> downloadProgressAsBytes() const;
-        
+
         Shaman::Package::List downloadedPackages() const;
 
         /**
          * @returns the progress of the current Package in percent
          */
         int transactionProgress() const;
-        
+
         Shaman::Package::List processedPackages() const;
 
         /**
@@ -185,12 +185,12 @@
          * @returns the remaining time of the Transaction
          */
         QTime remainingTime() const;
-        
+
         QList< QPair<QString, TransactionInterface::MessageLevel> > transactionMessages() const;
-        
+
         QHash<int, QPair<QString, TransactionInterface::TransactionQuestionAnswers> > transactionQuestions() const;
 
-    public Q_SLOTS:        
+    public Q_SLOTS:
         void setTransactionQuestionAnswer(int questionId, TransactionQuestionAnswer answer);
 
     Q_SIGNALS:
--- trunk/playground/sysadmin/shaman/shaman/src/MainWindow.cpp #1056837:1056838
@@ -274,6 +274,7 @@
                 KConfigGroup queue(KGlobal::config(), "LastQueue");
                 QueueSerializer::loadQueueFromConfigGroup(queue);
             }
+            m_isFirstReload = false;
         }
         m_isReloading = false;
     }
--- trunk/playground/sysadmin/shaman/shaman/src/QueueSerializer.cpp #1056837:1056838
@@ -41,6 +41,8 @@
 void QueueSerializer::saveQueueToConfigGroup(KConfigGroup *group)
 {
     QHash< QString, int > serialized = queueSerialized();
+    // Clean the group first
+    group->deleteGroup();
 
     QHash< QString, int >::const_iterator i;
     for (i = serialized.constBegin(); i != serialized.constEnd(); ++i) {
--- trunk/playground/sysadmin/shaman/shaman/src/processqueue/ProcessQueueDialog.cpp #1056837:1056838
@@ -52,7 +52,7 @@
     m_postHooksLabel->setPixmap(KIcon("edit-clear-history").pixmap(32));
     m_progressBar = ui.progressBar;
     setMainWidget(widget);
-    
+
     connect(m_transactionInterface, SIGNAL(stateChanged(TransactionInterface::State)), SLOT(stateChanged()));
     connect(m_transactionInterface, SIGNAL(errorTriggered(TransactionInterface::Error, QString)), SLOT(errorTriggered(TransactionInterface::Error, QString)));
     connect(m_transactionInterface, SIGNAL(transactionProgressChanged(int)), m_progressBar, SLOT(setValue(int)));
@@ -85,6 +85,7 @@
         case TransactionInterface::RunningPreHooks:
             m_preHooksLabel->setPixmap(KIcon("edit-redo").pixmap(32));//TODO
             m_progressBar->setRange(0,0);
+            break;
         case TransactionInterface::Downloading:
             m_preHooksLabel->setPixmap(KIcon("dialog-ok").pixmap(32));
             m_downloadLabel->setPixmap(KIcon("kget").pixmap(32));
@@ -175,9 +176,9 @@
         dialog->setButtonGuiItem(KDialog::User3, item);
         //dialog->enableButton(KDialog::User3, true);
     }
-    
+
     int result = dialog->exec();
-    
+
     TransactionInterface::TransactionQuestionAnswer answer = TransactionInterface::UnknownAnswer;
     switch (result) {
     case KDialog::Yes: