Added ErrorCode and StatusChanged strings to PkStrings

7 files changed, 274 insertions, 99 deletions

diff --git a/gui/ui/AddRm/CMakeLists.txt b/gui/ui/AddRm/CMakeLists.txt
index 60c7291..06f5739 100644
--- a/gui/ui/AddRm/CMakeLists.txt
+++ b/gui/ui/AddRm/CMakeLists.txt
@@ -6,6 +6,7 @@ set(kpk_addrm_SRCS
     PkReviewChanges.cpp
     PkTransaction.cpp
     PkRequirements.cpp
+    ../Common/PkStrings.cpp
 )
 
 kde4_add_ui_files(kpk_addrm_SRCS
diff --git a/gui/ui/AddRm/PkAddRm.cpp b/gui/ui/AddRm/PkAddRm.cpp
index 7a9327a..fa30a71 100755
--- a/gui/ui/AddRm/PkAddRm.cpp
+++ b/gui/ui/AddRm/PkAddRm.cpp
@@ -27,6 +27,7 @@
 
 #include "PkReviewChanges.h"
 #include "PkAddRm.h"
+#include "../Common/PkStrings.h"
 
 #define UNIVERSAL_PADDING 6
 
@@ -44,38 +45,34 @@ PkAddRm::PkAddRm( QWidget *parent )
     packageView->viewport()->setAttribute(Qt::WA_Hover);
 
     // check to see if the backend support these actions
-//     if ( m_daemon->getActions() & Actions::Install_package || m_daemon->getActions() & Actions::Remove_packages)
+    if ( m_daemon->getActions() & Actions::Install_packages || m_daemon->getActions() & Actions::Remove_packages)
         connect( m_pkg_model_main, SIGNAL( changed(bool) ), this, SIGNAL( changed(bool) ) );
-qDebug() << "actions" << m_daemon->getActions();
-qDebug() << "details" << Actions::Get_details;
-// if ( m_daemon->getActions() & Actions::Search_group )
-// qDebug() << "ok";
-// else
-// qDebug() << "no";
-
-//     if ( !(m_daemon->getActions() & Actions::Get_details) )
-//         tabWidget->setTabEnabled(0, false);
-//
-//     if ( !(m_daemon->getActions() & Actions::Get_requires) )
-//         tabWidget->setTabEnabled(1, false);
-//
-//     if ( !(m_daemon->getActions() & Actions::Get_depends) )
-//         tabWidget->setTabEnabled(2, false);
-//
-//     if ( !(m_daemon->getActions() & Actions::Get_files) )
-//         tabWidget->setTabEnabled(3, false);
-//
-//     if ( !(m_daemon->getActions() & Actions::Search_name) )
-//         searchPB->setEnabled(false);
-//
-//     if ( !(m_daemon->getActions() & Actions::Search_group) )
-//         groupsCB->setEnabled(false);
+
+    if ( !m_daemon->getActions() & Actions::Get_details )
+        tabWidget->setTabEnabled(0, false);
+
+    if ( !m_daemon->getActions() & Actions::Get_requires )
+        tabWidget->setTabEnabled(1, false);
+
+    if ( !m_daemon->getActions() & Actions::Get_depends )
+        tabWidget->setTabEnabled(2, false);
+
+    if ( !m_daemon->getActions() & Actions::Get_files )
+        tabWidget->setTabEnabled(3, false);
+
+    if ( !m_daemon->getActions() & Actions::Search_name )
+        searchPB->setEnabled(false);
+
+    if ( !m_daemon->getActions() & Actions::Search_group )
+        groupsCB->setEnabled(false);
 
     // create the main transaction
     m_pkClient_main = m_daemon->newTransaction();
     connect( m_pkClient_main, SIGNAL( GotPackage(Package *)), m_pkg_model_main, SLOT( addPackage(Package *)) );
     connect( m_pkClient_main, SIGNAL( Finished(Exit::Value, uint)), this, SLOT( Finished(Exit::Value, uint)) );
+    connect( m_pkClient_main, SIGNAL( ErrorCode(Error::Value, const QString&) ), this, SLOT( ErrorCode(Error::Value, const QString&) ) );
     connect( m_pkClient_main, SIGNAL( Message(const QString&, const QString&) ), this, SLOT( Message(const QString&, const QString&) ) );
+    connect( m_pkClient_main, SIGNAL( StatusChanged(Status::Value) ), this, SLOT( StatusChanged(Status::Value) ) );
 
     //initialize the groups
     //TODO map everything and fix search group.
@@ -132,6 +129,17 @@ qDebug() << "details" << Actions::Get_details;
     infoHide();
 }
 
+void PkAddRm::StatusChanged(Status::Value v)
+{
+    notifyF->show();
+    notifyL->setText( PkStrings::StatusChanged(v) );
+}
+
+void PkAddRm::ErrorCode(Error::Value v, const QString &details)
+{
+    KMessageBox::detailedSorry( this, PkStrings::ErrorCode(v), details, i18n("Erro PackageKit"), KMessageBox::Notify );
+}
+
 void PkAddRm::resizeEvent ( QResizeEvent * event )
 {
     QWidget::resizeEvent(event);
@@ -240,22 +248,9 @@ void PkAddRm::on_packageView_pressed( const QModelIndex & index )
 
 void PkAddRm::save()
 {
-// KMessageBox::detailedSorry( this, "oi", "oi", i18n("Error PackageKit"), KMessageBox::Notify );
     PkReviewChanges *frm = new PkReviewChanges( m_pkg_model_main->packagesChanges(), this);
     frm->exec();
     delete frm;
-
-//     Transaction *trans = m_daemon->newTransaction();
-//     if (m_daemon->getActions().contains("get-depends") ) {
-//         trans->getDepends("~installed", m_currPkg, true);
-// //     connect( m_pkClient_req, SIGNAL( GotPackage(Package *) ), m_pkg_model_req, SLOT( addPackage(Package *) ) );
-// //     connect( m_pkClient_req, SIGNAL( Finished(Exit::Value, uint) ), this, SLOT( reqFinished(Exit::Value, uint) ) );
-//     }
-//         
-//     PkAddRmTransaction *frm = new PkAddRmTransaction(, this);
-//     frm->exec();
-//     delete frm;
-//     qDebug() << "mainEXEC()";
 }
 
 void PkAddRm::load()
diff --git a/gui/ui/AddRm/PkAddRm.h b/gui/ui/AddRm/PkAddRm.h
index 90f1de3..dd75c68 100755
--- a/gui/ui/AddRm/PkAddRm.h
+++ b/gui/ui/AddRm/PkAddRm.h
@@ -47,6 +47,8 @@ public slots:
     void Files(Package *p, QStringList files);
     void Finished(Exit::Value status, uint runtime);
     void Message(const QString &one, const QString &two);
+    void ErrorCode(Error::Value v, const QString &details);
+    void StatusChanged(Status::Value v);
     void load();
     void save();
 
diff --git a/gui/ui/AddRm/PkReviewChanges.cpp b/gui/ui/AddRm/PkReviewChanges.cpp
index 4425ed6..58a6607 100755
--- a/gui/ui/AddRm/PkReviewChanges.cpp
+++ b/gui/ui/AddRm/PkReviewChanges.cpp
@@ -121,7 +121,7 @@ void PkReviewChanges::checkTask()
 	    KMessageBox::error( this, i18n("Sorry, your backend does not support removing packages"), i18n("Erro KPackageKit") );
     }
     else if ( !m_addPackages.isEmpty() ) {
-        if ( m_daemon->getActions() & Actions::Install_package ) {
+        if ( m_daemon->getActions() & Actions::Install_packages ) {
 	    if ( m_daemon->getActions() & Actions::Get_depends ) {
 	        m_reqDepPackages = m_addPackages;
 		// Create the depends transaction and it's model
diff --git a/gui/ui/AddRm/PkTransaction.cpp b/gui/ui/AddRm/PkTransaction.cpp
index 70bc71d..9de2ded 100755
--- a/gui/ui/AddRm/PkTransaction.cpp
+++ b/gui/ui/AddRm/PkTransaction.cpp
@@ -24,7 +24,7 @@
 
 // #include <QPalette>
 // #include <QColor>
-// #include "PkRequirements.h"
+#include "../Common/PkStrings.h"
 #include "PkTransaction.h"
 
 PkTransaction::PkTransaction( Transaction *trans, QString caption, QWidget *parent )
@@ -93,65 +93,7 @@ PkTransaction::~PkTransaction()
 
 void PkTransaction::StatusChanged(Status::Value v)
 {
-    switch (v) {
-        case Status::Setup : 
-	    currentL->setText( i18n("Waiting for service to start") );
-	    break;
-        case Status::Wait :
-	    currentL->setText( i18n("Waiting for other tasks") );
-	    break;
-        case Status::Query :
-	    currentL->setText( i18n("Querying") );
-	    break;
-        case Status::Info :
-	    currentL->setText( i18n("Getting information") );
-	    break;
-        case Status::Remove :
-	    currentL->setText( i18n("Removing") );
-	    break;
-        case Status::Refresh_cache :
-	    currentL->setText( i18n("Refreshing software list") );
-	    break;
-        case Status::Download :
-	    currentL->setText( i18n("Downloading") );
-	    break;
-        case Status::Install :
-	    currentL->setText( i18n("Installing") );
-	    break;
-        case Status::Update :
-	    currentL->setText( i18n("Updating") );
-	    break;
-        case Status::Cleanup :
-	    currentL->setText( i18n("Cleaning Up") );
-	    break;
-        case Status::Obsolete :
-	    currentL->setText( i18n("Obsoletiong") );
-	    break;
-        case Status::Dep_resolve :
-	    currentL->setText( i18n("Resolving dependencies") );
-	    break;
-        case Status::Rollback :
-	    currentL->setText( i18n("Rolling back") );
-	    break;
-        case Status::Commit :
-	    currentL->setText( i18n("Committing changes") );
-	    break;
-        case Status::Request :
-	    currentL->setText( i18n("Requesting data") );
-	    break;
-        case Status::Finished :
-	    currentL->setText( i18n("Finished") );
-	    break;
-        case Status::Cancel :
-	    currentL->setText( i18n("Cancelling") );
-	    break;
-        case Status::Unknown :
-	    currentL->setText( i18n("Unknown state") );
-	    break;
-	default :
-	    currentL->setText( i18n("Running task") );
-	    break;
-    }
+    currentL->setText( PkStrings::StatusChanged(v) );
 }
 
 void PkTransaction::ErrorCode(const QString &one, const QString &two)
diff --git a/gui/ui/Common/PkStrings.cpp b/gui/ui/Common/PkStrings.cpp
new file mode 100755
index 0000000..99834e3
--- /dev/null
+++ b/gui/ui/Common/PkStrings.cpp
@@ -0,0 +1,193 @@
+/***************************************************************************
+ *   Copyright (C) 2008 by Daniel Nicoletti   *
+ *   mirttex85-pk@yahoo.com.br   *
+ *                                                                         *
+ *   This program is free software; you can redistribute it and/or modify  *
+ *   it under the terms of the GNU General Public License as published by  *
+ *   the Free Software Foundation; either version 2 of the License, or     *
+ *   (at your option) any later version.                                   *
+ *                                                                         *
+ *   This program is distributed in the hope that it will be useful,       *
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
+ *   GNU General Public License for more details.                          *
+ *                                                                         *
+ *   You should have received a copy of the GNU General Public License     *
+ *   along with this program; if not, write to the                         *
+ *   Free Software Foundation, Inc.,                                       *
+ *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
+ ***************************************************************************/
+
+#include <KLocale>
+
+#include <KMessageBox>
+
+#include "PkStrings.h"
+
+PkStrings::PkStrings( QObject *parent )
+ : QObject(parent)
+{
+}
+
+PkStrings::~PkStrings()
+{
+}
+
+QString PkStrings::StatusChanged(Status::Value v)
+{
+    switch (v) {
+        case Status::Setup :
+	    return i18n("Waiting for service to start");
+        case Status::Wait :
+	    return i18n("Waiting for other tasks");
+        case Status::Query :
+	    return i18n("Querying");
+        case Status::Info :
+	    return i18n("Getting information");
+        case Status::Remove :
+	    return i18n("Removing");
+        case Status::Refresh_cache :
+	    return i18n("Refreshing software list");
+        case Status::Download :
+	    return i18n("Downloading");
+        case Status::Install :
+	    return i18n("Installing");
+        case Status::Update :
+	    return i18n("Updating");
+        case Status::Cleanup :
+	    return i18n("Cleaning Up");
+        case Status::Obsolete :
+	    return i18n("Obsoletiong");
+        case Status::Dep_resolve :
+	    return i18n("Resolving dependencies");
+        case Status::Rollback :
+	    return i18n("Rolling back");
+        case Status::Commit :
+	    return i18n("Committing changes");
+        case Status::Request :
+	    return i18n("Requesting data");
+        case Status::Finished :
+	    return i18n("Finished");
+        case Status::Cancel :
+	    return i18n("Cancelling");
+        case Status::Unknown :
+	    return i18n("Unknown state");
+	default :
+	    return i18n("Running task");
+    }
+}
+
+QString PkStrings::ErrorCode(Error::Value v)
+{
+    switch (v) {
+	case Error::Oom :
+	    return i18n("Waiting for service to start");
+	case Error::No_network :
+	    return i18n("Waiting for service to start");
+	case Error::Not_supported :
+	    return i18n("Waiting for service to start");
+	case Error::Internal_error :
+	    return i18n("Waiting for service to start");
+	case Error::Gpg_failure :
+	    return i18n("Waiting for service to start");
+	case Error::Package_id_invalid :
+	    return i18n("Waiting for service to start");
+	case Error::Package_not_installed :
+	    return i18n("Waiting for service to start");
+	case Error::Package_not_found :
+	    return i18n("Waiting for service to start");
+	case Error::Package_already_installed :
+	    return i18n("Waiting for service to start");
+	case Error::Package_download_failed :
+	    return i18n("Waiting for service to start");
+	case Error::Group_not_found :
+	    return i18n("Waiting for service to start");
+	case Error::Group_list_invalid :
+	    return i18n("Waiting for service to start");
+	case Error::Dep_resolution_failed :
+	    return i18n("Waiting for service to start");
+	case Error::Filter_invalid :
+	    return i18n("Waiting for service to start");
+	case Error::Create_thread_failed :
+	    return i18n("Waiting for service to start");
+	case Error::Transaction_error :
+	    return i18n("Waiting for service to start");
+	case Error::Transaction_cancelled :
+	    return i18n("Waiting for service to start");
+	case Error::No_cache :
+	    return i18n("Waiting for service to start");
+	case Error::Repo_not_found :
+	    return i18n("Waiting for service to start");
+	case Error::Cannot_remove_system_package :
+	    return i18n("Waiting for service to start");
+	case Error::Process_kill :
+	    return i18n("Waiting for service to start");
+	case Error::Failed_initialization :
+	    return i18n("Waiting for service to start");
+	case Error::Failed_finalise :
+	    return i18n("Waiting for service to start");
+	case Error::Failed_config_parsing :
+	    return i18n("Waiting for service to start");
+	case Error::Cannot_cancel :
+	    return i18n("Waiting for service to start");
+	case Error::Cannot_getLock :
+	    return i18n("Waiting for service to start");
+	case Error::No_packages_to_update :
+	    return i18n("Waiting for service to start");
+	case Error::Cannot_write_repo_config :
+	    return i18n("Waiting for service to start");
+	case Error::Local_install_failed :
+	    return i18n("Waiting for service to start");
+	case Error::Bad_gpg_signature :
+	    return i18n("Waiting for service to start");
+	case Error::Missing_gpg_signature :
+	    return i18n("Waiting for service to start");
+	case Error::Cannot_install_source_package :
+	    return i18n("Waiting for service to start");
+	case Error::Repo_configuration_error :
+	    return i18n("Waiting for service to start");
+	case Error::No_license_agreement :
+	    return i18n("Waiting for service to start");
+	case Error::File_conflicts :
+	    return i18n("Waiting for service to start");
+	case Error::Repo_not_available :
+	    return i18n("Waiting for service to start");
+	case Error::Invalid_package_file :
+	    return i18n("Waiting for service to start");
+	case Error::Package_install_blocked :
+	    return i18n("Waiting for service to start");
+	case Error::Package_corrupt :
+	    return i18n("Waiting for service to start");
+	case Error::Unknown :
+	    return i18n("Waiting for service to start");
+	default :
+	    return i18n("Unknown Error");
+    }
+}
+
+// void PkTransaction::ErrorCode(const QString &one, const QString &two)
+// {
+//     KMessageBox::detailedSorry( this, one, two, i18n("Erro PackageKit"), KMessageBox::Notify );
+// }
+
+// void PkTransaction::Finished(Exit::Value status, uint /*runtime*/)
+// {
+//     qDebug() << "trans finished: " << status ;
+//     switch(status) {
+//         case Exit::Success :
+// 	    qDebug() << "trans succes: ";
+// 	    break;
+// 	case Exit::Failed :
+// 	    qDebug() << "trans failed: ";
+//             m_notifyT.start(50);
+// 	    break;
+// 	case Exit::Kill :
+//             qDebug() << "trans quit: ";
+//             break;
+// 	case Exit::Unknown :
+//             qDebug() << "trans quit: ";
+//             break;
+//     }
+// }
+
+#include "PkStrings.moc"
diff --git a/gui/ui/Common/PkStrings.h b/gui/ui/Common/PkStrings.h
new file mode 100755
index 0000000..21a8a95
--- /dev/null
+++ b/gui/ui/Common/PkStrings.h
@@ -0,0 +1,42 @@
+/***************************************************************************
+ *   Copyright (C) 2008 by Daniel Nicoletti   *
+ *   mirttex85-pk@yahoo.com.br   *
+ *                                                                         *
+ *   This program is free software; you can redistribute it and/or modify  *
+ *   it under the terms of the GNU General Public License as published by  *
+ *   the Free Software Foundation; either version 2 of the License, or     *
+ *   (at your option) any later version.                                   *
+ *                                                                         *
+ *   This program is distributed in the hope that it will be useful,       *
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
+ *   GNU General Public License for more details.                          *
+ *                                                                         *
+ *   You should have received a copy of the GNU General Public License     *
+ *   along with this program; if not, write to the                         *
+ *   Free Software Foundation, Inc.,                                       *
+ *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
+ ***************************************************************************/
+
+#ifndef PKSTRINGS_H
+#define PKSTRINGS_H
+
+#include <QObject>
+
+#include "../../../lib/QPackageKit.h"
+
+using namespace PackageKit;
+
+class PkStrings : public QObject
+{
+    Q_OBJECT
+public:
+    PkStrings( QObject *parent=0);
+    ~PkStrings();
+
+    static QString Finished(Exit::Value status);
+    static QString ErrorCode(Error::Value v);
+    static QString StatusChanged(Status::Value v);
+};
+
+#endif