Redo the getGroups, make the groupsEnum a single enum not 2^

Fixed the ui to  use the getGroups correctly
Reorgized the gui dirs...

58 files changed, 131 insertions, 113 deletions

diff --git a/gui/ui/AddRm/CMakeLists.txt b/gui/AddRm/CMakeLists.txt
index 06f5739..06f5739 100644
--- a/gui/ui/AddRm/CMakeLists.txt
+++ b/gui/AddRm/CMakeLists.txt
diff --git a/gui/ui/AddRm/PkAddRm.cpp b/gui/AddRm/PkAddRm.cpp
index 5a154ef..116383a 100755
--- a/gui/ui/AddRm/PkAddRm.cpp
+++ b/gui/AddRm/PkAddRm.cpp
@@ -50,7 +50,6 @@ PkAddRm::PkAddRm( QWidget *parent )
     if ( actions & Actions::Install_packages || actions & Actions::Remove_packages)
         connect( m_pkg_model_main, SIGNAL( changed(bool) ), this, SIGNAL( changed(bool) ) );
 
-    
     if ( !(actions & Actions::Get_details) )
         tabWidget->setTabEnabled(0, false);
 
@@ -80,34 +79,12 @@ PkAddRm::PkAddRm( QWidget *parent )
     connect( m_pkClient_main, SIGNAL( ProgressChanged(uint, uint, uint, uint) ), this, SLOT( ProgressChanged(uint, uint, uint, uint) ) );
 
     //initialize the groups
-    //TODO map everything and fix search group.
-    qDebug() << m_daemon->getGroups();
-    
-//     QMetaObject const* mo = m_daemon->getGroups()->metaObject();
-//     QMetaEnum me = mo->enumerator(mo->indexOfEnumerator("Groups::Value"));
-//     for (int i = 0; i < me.keyCount(); ++i) {
-//         qDebug() << "Next MyEnum value is" << me.key(i) << me.value(i);
-//     }
-//     for (int i = 0; i < m_daemon->getGroups().size(); ++i) {
-//         if ( m_daemon->getGroups().at(i) == "accessories" )
-// 	    groupsCB->addItem(KIcon("applications-accessories"), i18n("Accessories"));
-// 	else if ( m_daemon->getGroups().at(i) == "games" )
-// 	    groupsCB->addItem(KIcon("applications-games"), i18n("Games"));
-// 	else if ( m_daemon->getGroups().at(i) == "graphics" )
-// 	    groupsCB->addItem(KIcon("applications-graphics"), i18n("Graphics"));
-// 	else if ( m_daemon->getGroups().at(i) == "internet" )
-// 	    groupsCB->addItem(KIcon("applications-internet"), i18n("Internet"));
-// 	else if ( m_daemon->getGroups().at(i) == "office" )
-// 	    groupsCB->addItem(KIcon("applications-office"), i18n("Office"));
-// 	else if ( m_daemon->getGroups().at(i) == "other" )
-// 	    groupsCB->addItem(KIcon("applications-other"), i18n("Other"));
-// 	else if ( m_daemon->getGroups().at(i) == "programming" )
-// 	    groupsCB->addItem(KIcon("applications-development"), i18n("Development"));
-// 	else if ( m_daemon->getGroups().at(i) == "multimedia" )
-// 	    groupsCB->addItem(KIcon("applications-multimedia"), i18n("Multimedia"));
-// 	else if ( m_daemon->getGroups().at(i) == "system" )
-// 	    groupsCB->addItem(KIcon("applications-system"), i18n("System"));
-//     }
+    QStringList groups = m_daemon->getGroups();
+    for (int i = 0; i < groups.size(); ++i) {
+	Groups::Value v = (Groups::Value)EnumFromString<Groups>( groups.at(i) );
+	groupsCB->addItem( PkStrings::GroupsIcon(v), PkStrings::Groups(v), v );
+    }
+
     // install the backend filters
     FilterMenu( m_daemon->getFilters() );
 
@@ -146,6 +123,7 @@ void PkAddRm::StatusChanged(Status::Value v)
 {
     notifyF->show();
     notifyL->setText( PkStrings::StatusChanged(v) );
+    busyPB->setMaximum(0);
     m_busyT.start(10);
 }
 
@@ -156,7 +134,7 @@ void PkAddRm::ProgressChanged(uint percentage, uint /*subpercentage*/, uint /*el
 }
 
 void PkAddRm::updateProgress()
-{    
+{
     if ( busyPB->maximum() == 0 )
         busyPB->setValue(busyPB->value() + 1);
     else
@@ -240,12 +218,12 @@ void PkAddRm::on_findPB_clicked()
     }
 }
 
-void PkAddRm::on_groupsCB_currentIndexChanged( const QString & text )
+void PkAddRm::on_groupsCB_currentIndexChanged( int index )
 {
-    //TODO fix this mapping
-    qDebug() << "Search Group " << text.toLower();
-    m_pkClient_main->searchGroup( filters(), Groups::Office );
-    search();
+    if ( groupsCB->itemData( index, Qt::UserRole ).isValid() ) {
+	m_pkClient_main->searchGroup( filters(), (Groups::Value)groupsCB->itemData( index, Qt::UserRole ).toUInt() );
+	search();
+    }
 }
 
 void PkAddRm::search()
@@ -388,7 +366,8 @@ void PkAddRm::Description(Package *p, const QString& license, const QString& gro
     if ( !license.isEmpty() && license != "unknown" )
         description += "<b>" + i18n("License") + ":</b> " + license + "<br />";
     if ( !group.isEmpty() && group != "unknown" )
-        description += "<b>" + i18n("Group") + ":</b> " + group + "<br />";
+        description += "<b>" + i18n("Group") + ":</b> " +
+	PkStrings::Groups( (Groups::Value)EnumFromString<Groups>(group) ) + "<br />";
     if ( !detail.isEmpty() )
         description += "<b>" + i18n("Details") + ":</b> " + detail + "<br />";
     if ( !url.isEmpty() )
diff --git a/gui/ui/AddRm/PkAddRm.h b/gui/AddRm/PkAddRm.h
index 1fc1e57..2f8a410 100755
--- a/gui/ui/AddRm/PkAddRm.h
+++ b/gui/AddRm/PkAddRm.h
@@ -29,7 +29,7 @@
 #include "PkAddRm_Model.h"
 #include "PkDelegate.h"
 
-#include "../../../lib/QPackageKit.h"
+#include "../../lib/QPackageKit.h"
 #include "ui_PkAddRm.h"
 
 using namespace PackageKit;
@@ -43,14 +43,14 @@ public:
 
 public slots:
     void on_findPB_clicked();
-    void on_groupsCB_currentIndexChanged( const QString &text );
+    void on_groupsCB_currentIndexChanged( int index );
     void on_packageView_pressed( const QModelIndex &index );
-    void Description(Package *p, const QString &license, const QString &group, const QString &detail, const QString &url, qulonglong size);
-    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 Description( Package *p, const QString &license, const QString &group, const QString &detail, const QString &url, qulonglong size );
+    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/PkAddRm.ui b/gui/AddRm/PkAddRm.ui
index 2d69642..2d69642 100644
--- a/gui/ui/AddRm/PkAddRm.ui
+++ b/gui/AddRm/PkAddRm.ui
diff --git a/gui/ui/AddRm/PkAddRm_Model.cpp b/gui/AddRm/PkAddRm_Model.cpp
index dd70646..dd70646 100644
--- a/gui/ui/AddRm/PkAddRm_Model.cpp
+++ b/gui/AddRm/PkAddRm_Model.cpp
diff --git a/gui/ui/AddRm/PkAddRm_Model.h b/gui/AddRm/PkAddRm_Model.h
index a74aca8..c49b22d 100644
--- a/gui/ui/AddRm/PkAddRm_Model.h
+++ b/gui/AddRm/PkAddRm_Model.h
@@ -4,7 +4,7 @@
 #include <QAbstractTableModel>
 #include <KIcon>
 
-#include "../../../lib/QPackageKit.h"
+#include "../../lib/QPackageKit.h"
 
 using namespace PackageKit;
 
diff --git a/gui/ui/AddRm/PkDelegate.cpp b/gui/AddRm/PkDelegate.cpp
index e429af7..e429af7 100644
--- a/gui/ui/AddRm/PkDelegate.cpp
+++ b/gui/AddRm/PkDelegate.cpp
diff --git a/gui/ui/AddRm/PkDelegate.h b/gui/AddRm/PkDelegate.h
index a7244e6..a7244e6 100644
--- a/gui/ui/AddRm/PkDelegate.h
+++ b/gui/AddRm/PkDelegate.h
diff --git a/gui/ui/AddRm/PkRequirements.cpp b/gui/AddRm/PkRequirements.cpp
index 8cc0704..8cc0704 100755
--- a/gui/ui/AddRm/PkRequirements.cpp
+++ b/gui/AddRm/PkRequirements.cpp
diff --git a/gui/ui/AddRm/PkRequirements.h b/gui/AddRm/PkRequirements.h
index 691ed9b..691ed9b 100755
--- a/gui/ui/AddRm/PkRequirements.h
+++ b/gui/AddRm/PkRequirements.h
diff --git a/gui/ui/AddRm/PkRequirements.ui b/gui/AddRm/PkRequirements.ui
index 5d169ff..5d169ff 100644
--- a/gui/ui/AddRm/PkRequirements.ui
+++ b/gui/AddRm/PkRequirements.ui
diff --git a/gui/ui/AddRm/PkReviewChanges.cpp b/gui/AddRm/PkReviewChanges.cpp
index 58a6607..58a6607 100755
--- a/gui/ui/AddRm/PkReviewChanges.cpp
+++ b/gui/AddRm/PkReviewChanges.cpp
diff --git a/gui/ui/AddRm/PkReviewChanges.h b/gui/AddRm/PkReviewChanges.h
index d5bdc16..5bfc93e 100755
--- a/gui/ui/AddRm/PkReviewChanges.h
+++ b/gui/AddRm/PkReviewChanges.h
@@ -28,7 +28,7 @@
 #include "PkDelegate.h"
 #include "PkAddRm_Model.h"
 #include "ui_PkReviewChanges.h"
-#include "../../../lib/QPackageKit.h"
+#include "../../lib/QPackageKit.h"
 
 using namespace PackageKit;
 
diff --git a/gui/ui/AddRm/PkReviewChanges.ui b/gui/AddRm/PkReviewChanges.ui
index f992070..f992070 100644
--- a/gui/ui/AddRm/PkReviewChanges.ui
+++ b/gui/AddRm/PkReviewChanges.ui
diff --git a/gui/ui/AddRm/PkTransaction.cpp b/gui/AddRm/PkTransaction.cpp
index 5d0f2f6..5d0f2f6 100755
--- a/gui/ui/AddRm/PkTransaction.cpp
+++ b/gui/AddRm/PkTransaction.cpp
diff --git a/gui/ui/AddRm/PkTransaction.h b/gui/AddRm/PkTransaction.h
index 7e3446f..0e79ab1 100755
--- a/gui/ui/AddRm/PkTransaction.h
+++ b/gui/AddRm/PkTransaction.h
@@ -24,7 +24,7 @@
 #include <KDialog>
 
 #include "ui_PkTransaction.h"
-#include "../../../lib/QPackageKit.h"
+#include "../../lib/QPackageKit.h"
 
 using namespace PackageKit;
 
diff --git a/gui/ui/AddRm/PkTransaction.ui b/gui/AddRm/PkTransaction.ui
index 399644a..399644a 100644
--- a/gui/ui/AddRm/PkTransaction.ui
+++ b/gui/AddRm/PkTransaction.ui
diff --git a/gui/ui/AddRm/kpk-addrm.cpp b/gui/AddRm/kpk-addrm.cpp
index 041d760..041d760 100644
--- a/gui/ui/AddRm/kpk-addrm.cpp
+++ b/gui/AddRm/kpk-addrm.cpp
diff --git a/gui/ui/AddRm/kpk-addrm.h b/gui/AddRm/kpk-addrm.h
index d4a5674..d4a5674 100644
--- a/gui/ui/AddRm/kpk-addrm.h
+++ b/gui/AddRm/kpk-addrm.h
diff --git a/gui/CMakeLists.txt b/gui/CMakeLists.txt
index f149efd..ffdf813 100644
--- a/gui/CMakeLists.txt
+++ b/gui/CMakeLists.txt
@@ -10,4 +10,8 @@ link_directories( ../lib/ )
 add_definitions(${QT_DEFINITIONS} ${KDE_DEFINITIONS})
 include_directories( ${CMAKE_SOURCE_DIR} ${CMAKE_BINARY_DIR} ${KDE4_INCLUDES} ${KDE4_KIO_INCLUDES})
 
-add_subdirectory( ui )
+add_subdirectory( AddRm )
+add_subdirectory( Settings )
+add_subdirectory( Updater )
+add_subdirectory( KPackageKitD )
+add_subdirectory( Desktop )
diff --git a/gui/ui/Common/PkStrings.cpp b/gui/Common/PkStrings.cpp
index 1aa2d8b..1aa2d8b 100755
--- a/gui/ui/Common/PkStrings.cpp
+++ b/gui/Common/PkStrings.cpp
diff --git a/gui/ui/Common/PkStrings.h b/gui/Common/PkStrings.h
index 0b49515..b05f2ef 100755
--- a/gui/ui/Common/PkStrings.h
+++ b/gui/Common/PkStrings.h
@@ -24,7 +24,7 @@
 #include <QObject>
 #include <KIcon>
 
-#include "../../../lib/QPackageKit.h"
+#include "../../lib/QPackageKit.h"
 
 using namespace PackageKit;
 
diff --git a/gui/ui/desktop/CMakeLists.txt b/gui/Desktop/CMakeLists.txt
index d623c05..d623c05 100644
--- a/gui/ui/desktop/CMakeLists.txt
+++ b/gui/Desktop/CMakeLists.txt
diff --git a/gui/ui/desktop/kpackagekitd.desktop b/gui/Desktop/kpackagekitd.desktop
index 3d4b2f5..3d4b2f5 100644
--- a/gui/ui/desktop/kpackagekitd.desktop
+++ b/gui/Desktop/kpackagekitd.desktop
diff --git a/gui/ui/desktop/kpk_addrm.desktop b/gui/Desktop/kpk_addrm.desktop
index 8867d67..8867d67 100644
--- a/gui/ui/desktop/kpk_addrm.desktop
+++ b/gui/Desktop/kpk_addrm.desktop
diff --git a/gui/ui/desktop/kpk_settings.desktop b/gui/Desktop/kpk_settings.desktop
index 60175de..60175de 100644
--- a/gui/ui/desktop/kpk_settings.desktop
+++ b/gui/Desktop/kpk_settings.desktop
diff --git a/gui/ui/desktop/kpk_update.desktop b/gui/Desktop/kpk_update.desktop
index 6ae6626..6ae6626 100644
--- a/gui/ui/desktop/kpk_update.desktop
+++ b/gui/Desktop/kpk_update.desktop
diff --git a/gui/ui/desktop/settings-add-and-remove-software.desktop b/gui/Desktop/settings-add-and-remove-software.desktop
index f48303c..f48303c 100644
--- a/gui/ui/desktop/settings-add-and-remove-software.desktop
+++ b/gui/Desktop/settings-add-and-remove-software.desktop
diff --git a/gui/ui/KPackageKitD/CMakeLists.txt b/gui/KPackageKitD/CMakeLists.txt
index 9d5ad2a..9d5ad2a 100644
--- a/gui/ui/KPackageKitD/CMakeLists.txt
+++ b/gui/KPackageKitD/CMakeLists.txt
diff --git a/gui/ui/KPackageKitD/kpackagekitd.cpp b/gui/KPackageKitD/kpackagekitd.cpp
index adc3d22..adc3d22 100644
--- a/gui/ui/KPackageKitD/kpackagekitd.cpp
+++ b/gui/KPackageKitD/kpackagekitd.cpp
diff --git a/gui/ui/KPackageKitD/kpackagekitd.h b/gui/KPackageKitD/kpackagekitd.h
index 879b472..879b472 100644
--- a/gui/ui/KPackageKitD/kpackagekitd.h
+++ b/gui/KPackageKitD/kpackagekitd.h
diff --git a/gui/ui/Settings/CMakeLists.txt b/gui/Settings/CMakeLists.txt
index 13cf891..13cf891 100644
--- a/gui/ui/Settings/CMakeLists.txt
+++ b/gui/Settings/CMakeLists.txt
diff --git a/gui/Settings/PkConfigSkell.cpp b/gui/Settings/PkConfigSkell.cpp
new file mode 100644
index 0000000..2aa1b63
--- /dev/null
+++ b/gui/Settings/PkConfigSkell.cpp
@@ -0,0 +1,28 @@
+/***************************************************************************
+ *   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 "PkConfigSkell.h"
+
+PkConfigSkell::PkConfigSkell()
+{
+    setCurrentGroup("SmartIcon");
+    addItemBool("notify", notify, true);
+    addItemBool("longTask", longTask, true);
+}
diff --git a/gui/Settings/PkConfigSkell.h b/gui/Settings/PkConfigSkell.h
new file mode 100644
index 0000000..43ec54f
--- /dev/null
+++ b/gui/Settings/PkConfigSkell.h
@@ -0,0 +1,33 @@
+/***************************************************************************
+ *   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 <KConfigSkeleton>
+
+#ifndef PKCONFIGSKELL_H
+#define PKCONFIGSKELL_H
+
+class PkConfigSkell : public KConfigSkeleton
+{
+public:
+    PkConfigSkell();
+    bool notify, longTask;
+};
+
+#endif
diff --git a/gui/ui/Settings/PkSettings.cpp b/gui/Settings/PkSettings.cpp
index 100e852..100e852 100755
--- a/gui/ui/Settings/PkSettings.cpp
+++ b/gui/Settings/PkSettings.cpp
diff --git a/gui/ui/Settings/PkSettings.h b/gui/Settings/PkSettings.h
index 4d90ecc..4d90ecc 100755
--- a/gui/ui/Settings/PkSettings.h
+++ b/gui/Settings/PkSettings.h
diff --git a/gui/ui/Settings/PkSettings.ui b/gui/Settings/PkSettings.ui
index c6f49a5..c6f49a5 100644
--- a/gui/ui/Settings/PkSettings.ui
+++ b/gui/Settings/PkSettings.ui
diff --git a/gui/ui/Settings/kpk-settings.cpp b/gui/Settings/kpk-settings.cpp
index f678e64..f678e64 100644
--- a/gui/ui/Settings/kpk-settings.cpp
+++ b/gui/Settings/kpk-settings.cpp
diff --git a/gui/ui/Settings/kpk-settings.h b/gui/Settings/kpk-settings.h
index 5703254..5703254 100644
--- a/gui/ui/Settings/kpk-settings.h
+++ b/gui/Settings/kpk-settings.h
diff --git a/gui/ui/Updater/CMakeLists.txt b/gui/Updater/CMakeLists.txt
index 47a05c4..47a05c4 100644
--- a/gui/ui/Updater/CMakeLists.txt
+++ b/gui/Updater/CMakeLists.txt
diff --git a/gui/ui/Updater/PkAddRm_Delegate.cpp b/gui/Updater/PkAddRm_Delegate.cpp
index b6ec7f9..b6ec7f9 100644
--- a/gui/ui/Updater/PkAddRm_Delegate.cpp
+++ b/gui/Updater/PkAddRm_Delegate.cpp
diff --git a/gui/ui/Updater/PkAddRm_Delegate.h b/gui/Updater/PkAddRm_Delegate.h
index 4d2b84a..4d2b84a 100644
--- a/gui/ui/Updater/PkAddRm_Delegate.h
+++ b/gui/Updater/PkAddRm_Delegate.h
diff --git a/gui/ui/Updater/PkAddRm_Model.cpp b/gui/Updater/PkAddRm_Model.cpp
index 638542f..638542f 100644
--- a/gui/ui/Updater/PkAddRm_Model.cpp
+++ b/gui/Updater/PkAddRm_Model.cpp
diff --git a/gui/ui/Updater/PkAddRm_Model.h b/gui/Updater/PkAddRm_Model.h
index 478648a..179ef75 100644
--- a/gui/ui/Updater/PkAddRm_Model.h
+++ b/gui/Updater/PkAddRm_Model.h
@@ -5,7 +5,7 @@
 #include <KIcon>
 
 #include "pkg_item.h"
-#include "../../../lib/QPackageKit.h"
+#include "../../lib/QPackageKit.h"
 
 using namespace PackageKit;
 
diff --git a/gui/ui/Updater/PkUpdate.cpp b/gui/Updater/PkUpdate.cpp
index 274b8ce..274b8ce 100755
--- a/gui/ui/Updater/PkUpdate.cpp
+++ b/gui/Updater/PkUpdate.cpp
diff --git a/gui/ui/Updater/PkUpdate.h b/gui/Updater/PkUpdate.h
index cbdb25b..8186da6 100755
--- a/gui/ui/Updater/PkUpdate.h
+++ b/gui/Updater/PkUpdate.h
@@ -24,7 +24,7 @@
 #include "PkAddRm_Model.h"
 #include "PkAddRm_Delegate.h"
 #include "ui_PkUpdate.h"
-#include "../../../lib/QPackageKit.h"
+#include "../../lib/QPackageKit.h"
 
 using namespace PackageKit;
  
diff --git a/gui/ui/Updater/PkUpdate.ui b/gui/Updater/PkUpdate.ui
index a006228..a006228 100644
--- a/gui/ui/Updater/PkUpdate.ui
+++ b/gui/Updater/PkUpdate.ui
diff --git a/gui/ui/Updater/kpk-update.cpp b/gui/Updater/kpk-update.cpp
index 2fc3726..2fc3726 100644
--- a/gui/ui/Updater/kpk-update.cpp
+++ b/gui/Updater/kpk-update.cpp
diff --git a/gui/ui/Updater/kpk-update.h b/gui/Updater/kpk-update.h
index b1ab064..b1ab064 100644
--- a/gui/ui/Updater/kpk-update.h
+++ b/gui/Updater/kpk-update.h
diff --git a/gui/ui/Updater/pkg_item.cpp b/gui/Updater/pkg_item.cpp
index 95b6111..95b6111 100644
--- a/gui/ui/Updater/pkg_item.cpp
+++ b/gui/Updater/pkg_item.cpp
diff --git a/gui/ui/Updater/pkg_item.h b/gui/Updater/pkg_item.h
index 187d59f..e752022 100644
--- a/gui/ui/Updater/pkg_item.h
+++ b/gui/Updater/pkg_item.h
@@ -20,7 +20,7 @@
 #ifndef PACKAGE_ITEM_H
 #define PACKAGE_ITEM_H
 
-#include "../../../lib/QPackageKit.h"
+#include "../../lib/QPackageKit.h"
 
 #include <QList>
 #include <QVariant>
diff --git a/gui/ui/CMakeLists.txt b/gui/ui/CMakeLists.txt
deleted file mode 100644
index 83545ba..0000000
--- a/gui/ui/CMakeLists.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-add_subdirectory( AddRm )
-add_subdirectory( Settings )
-add_subdirectory( Updater )
-add_subdirectory( KPackageKitD )
-add_subdirectory( desktop )
\ No newline at end of file
diff --git a/gui/ui/desktop/kpackagekit.desktop b/gui/ui/desktop/kpackagekit.desktop
deleted file mode 100644
index 3dd523f..0000000
--- a/gui/ui/desktop/kpackagekit.desktop
+++ /dev/null
@@ -1,15 +0,0 @@
-[Desktop Entry]
-DocPath=kcontrol/index.html
-Encoding=UTF-8
-Exec=kcmshell4 kpk_addrm kpk_settings kpk_update
-Icon=applications-other
-ServiceTypes=KCModule,KCModuleInit
-Type=Service
-X-KDE-ParentApp=kcontrol
-X-KDE-System-Settings-Parent-Category=application
-
-Name=KPackagekit
-
-Comment=Add and Remove Software
-
-X-KDE-Keywords=application,software,package,install,remove,update,upgrade
\ No newline at end of file
diff --git a/lib/Daemon.cpp b/lib/Daemon.cpp
index 22dcd9a..f0a5a03 100644
--- a/lib/Daemon.cpp
+++ b/lib/Daemon.cpp
@@ -45,17 +45,11 @@ void Daemon::getBackendDetails(QString &name, QString &author) {
 }
 
 QStringList Daemon::getFilters() {
-	QString filters = proxy->GetFilters();
-	return filters.split(";");
+	return QString(proxy->GetFilters()).split(";");
 }
 
-Groups::Value Daemon::getGroups() {
-	QStringList groups = QString(proxy->GetGroups()).split(";");
-	unsigned int ret = 0;
-	for(int i = 0 ; i < groups.size() ; ++i) {
-		ret |= EnumFromString<Groups>(groups.at(i));
-	}
-	return (Groups::Value) ret;
+QStringList Daemon::getGroups() {
+	return QString(proxy->GetGroups()).split(";");
 }
 
 QStringList Daemon::getTransactionList() {
diff --git a/lib/Daemon.h b/lib/Daemon.h
index a76df94..6a1ad49 100644
--- a/lib/Daemon.h
+++ b/lib/Daemon.h
@@ -37,7 +37,7 @@ public:
 	unsigned int getActions();
 	void getBackendDetails(QString &name, QString &author);
 	QStringList getFilters();
-	Groups::Value getGroups();
+	QStringList getGroups();
 	QStringList getTransactionList();
 
 	uint getTimeSinceAction(Role::Value role);
diff --git a/lib/Groups.h b/lib/Groups.h
index 8f63d17..fe4e28f 100644
--- a/lib/Groups.h
+++ b/lib/Groups.h
@@ -25,35 +25,35 @@ class Groups : public QObject {
 
 public:
 typedef enum {
-	Accessibility		= 1 << 0,
-	Accessories		= 1 << 1,
-	Admin_tools		= 1 << 2,
-	Communication		= 1 << 3,
-	Desktop_gnome		= 1 << 4,
-	Desktop_kde		= 1 << 5,
-	Desktop_other		= 1 << 6,
-	Desktop_xfce		= 1 << 7,
-	Education		= 1 << 8,
-	Fonts			= 1 << 9,
-	Games			= 1 << 10,
-	Graphics		= 1 << 11,
-	Internet		= 1 << 12,
-	Legacy			= 1 << 13,
-	Localization		= 1 << 14,
-	Maps			= 1 << 15,
-	Multimedia		= 1 << 16,
-	Network			= 1 << 17,
-	Office			= 1 << 18,
-	Other			= 1 << 19,
-	Power_management	= 1 << 20,
-	Programming		= 1 << 21,
-	Publishing		= 1 << 22,
-	Repos			= 1 << 23,
-	Security		= 1 << 24,
-	Servers			= 1 << 25,
-	System			= 1 << 26,
-	Virtualization		= 1 << 27,
-	Unknown			= 1 << 28
+	Accessibility,
+	Accessories,
+	Admin_tools,
+	Communication,
+	Desktop_gnome,
+	Desktop_kde,
+	Desktop_other,
+	Desktop_xfce,
+	Education,
+	Fonts,
+	Games,
+	Graphics,
+	Internet,
+	Legacy,
+	Localization,
+	Maps,
+	Multimedia,
+	Network,
+	Office,
+	Other,
+	Power_management,
+	Programming,
+	Publishing,
+	Repos,
+	Security,
+	Servers,
+	System,
+	Virtualization,
+	Unknown
 } Value;
 
 };
diff --git a/lib/Transaction.cpp b/lib/Transaction.cpp
index 9e34c22..498fba8 100644
--- a/lib/Transaction.cpp
+++ b/lib/Transaction.cpp
@@ -278,7 +278,7 @@ void Transaction::Package_cb(const QString &info, const QString &package_id, con
 }
 
 void Transaction::Details_cb(const QString &package_id, const QString &license, const QString &group, const QString &detail, const QString &url, qulonglong size) {
-	emit Details(new Package(package_id), license, (Groups::Value)EnumFromString<Groups>(group), detail, url, size);
+	emit Details(new Package(package_id), license, group, detail, url, size);
 }
 
 void Transaction::Files_cb(const QString &pid, const QString &file_list) {
diff --git a/lib/Transaction.h b/lib/Transaction.h
index f331726..b6a49b6 100644
--- a/lib/Transaction.h
+++ b/lib/Transaction.h
@@ -83,7 +83,7 @@ public:
 
 signals:
 	void GotPackage(Package *p);
-	void Details(Package *p, const QString& license, Groups::Value group, const QString& detail, const QString& url, qulonglong size);
+	void Details(Package *p, const QString &license, const QString &group, const QString &detail, const QString &url, qulonglong size);
 	void Files(Package *p, QStringList files);
 	void Finished(Exit::Value status, uint runtime);
 	void ProgressChanged(uint percentage, uint subpercentage, uint elapsed, uint remaining);