4 files changed, 145 insertions, 17 deletions

diff --git a/noncore/settings/aqpkg/mainwin.cpp b/noncore/settings/aqpkg/mainwin.cpp
index 3c72f2b..4e9cc12 100644
--- a/noncore/settings/aqpkg/mainwin.cpp
+++ b/noncore/settings/aqpkg/mainwin.cpp
@@ -16,64 +16,69 @@
  ***************************************************************************/

 

 #include <qmenubar.h>

 #include <qpopupmenu.h>

 #include <qmessagebox.h>

 

 #include "mainwin.h"

 #include "datamgr.h"

 #include "networkpkgmgr.h"

 #include "settingsimpl.h"

 #include "helpwindow.h"

 #include "utils.h"

 #include "global.h"

 

 MainWindow :: MainWindow( QWidget *p, char *name )

                 :QMainWindow( p, name )

 {

 #ifdef QWS

     showMaximized();

 #endif

 

     setCaption( "AQPkg - Package Manager" );

 

     // Create our menu

-        QPopupMenu *help = new QPopupMenu( this );

-

-        help->insertItem( "&General", this, SLOT(displayHelp()), Qt::CTRL+Qt::Key_H );

+    help = new QPopupMenu( this );

+        help->insertItem( "&General", this, SLOT(displayHelp()), Qt::CTRL+Qt::Key_G );

         help->insertItem( "&About", this, SLOT(displayAbout()), Qt::CTRL+Qt::Key_A );

 

-    QPopupMenu *settings = new QPopupMenu( this );

+    settings = new QPopupMenu( this );

         settings->insertItem( "&Settings", this, SLOT(displaySettings()), Qt::CTRL+Qt::Key_S );

 

-    QPopupMenu *edit = new QPopupMenu( this );

-        edit->insertItem( "&Find", this, SLOT(searchForPackage()), Qt::CTRL+Qt::Key_F );

-        edit->insertItem( "&Find Next", this, SLOT(repeatSearchForPackage()), Qt::CTRL+Qt::Key_R );

+    edit = new QPopupMenu( this );

+        edit->insertItem( "&Find", this, SLOT(searchForPackage()), Qt::CTRL+Qt::Key_I );

+        edit->insertItem( "Find &Next", this, SLOT(repeatSearchForPackage()), Qt::CTRL+Qt::Key_N );

 

+    filter = new QPopupMenu( this );

+        mnuShowUninstalledPkgsId = filter->insertItem( "Show &Uninstalled Packages", this, SLOT(filterUninstalledPackages()), Qt::CTRL+Qt::Key_U );

+        mnuShowInstalledPkgsId = filter->insertItem( "Show In&stalled Packages", this, SLOT(filterInstalledPackages()), Qt::CTRL+Qt::Key_S );

+        mnuShowUpgradedPkgsId = filter->insertItem( "Show U&pdated Packages", this, SLOT(filterUpgradedPackages()), Qt::CTRL+Qt::Key_P );

+    

         // Create the main menu

-        QMenuBar *menu = menuBar();  //new QMenuBar( this );

+        menu = menuBar();  //new QMenuBar( this );

         menu->insertItem( "&Settings", settings );

         menu->insertItem( "&Edit", edit );

+        menu->insertItem( "&Filter", filter );

         menu->insertItem( "&Help", help );

 

     mgr = new DataManager();

     mgr->loadServers();

 

         stack = new QWidgetStack( this );

 

         networkPkgWindow = new NetworkPackageManager( mgr, stack );

         stack->addWidget( networkPkgWindow, 1 );

 

         setCentralWidget( stack );

         stack->raiseWidget( networkPkgWindow );

 }

 

 MainWindow :: ~MainWindow()

 {

         delete networkPkgWindow;

 }

 

 void MainWindow :: setDocument( const QString &doc )

 {

     // Remove path from package

     QString package = Utils::getPackageNameFromIpkFilename( doc );

     cout << "Selecting package " << package << endl;

@@ -88,24 +93,92 @@ void MainWindow :: displaySettings()
     delete dlg;

 }

 

 void MainWindow :: displayHelp()

 {

     HelpWindow *dlg = new HelpWindow( this );

     dlg->exec();

     delete dlg;    

 }

 

 void MainWindow :: searchForPackage()

 {

     networkPkgWindow->searchForPackage( false );

 }

 

 void MainWindow :: repeatSearchForPackage()

 {

     networkPkgWindow->searchForPackage( true );

 }

 

 void MainWindow :: displayAbout()

 {

     QMessageBox::about( this, "About AQPkg", VERSION_TEXT );

 }

+

+

+void MainWindow :: filterUninstalledPackages()

+{

+    bool val;

+    if ( filter->isItemChecked( mnuShowUninstalledPkgsId ) )

+    {

+        val = false;

+        filter->setItemChecked( mnuShowUninstalledPkgsId, false );

+    }

+    else

+    {

+        val = true;

+        filter->setItemChecked( mnuShowUninstalledPkgsId, true );

+    }

+

+    filter->setItemChecked( mnuShowInstalledPkgsId, false );

+    networkPkgWindow->showOnlyInstalledPackages( false );

+    filter->setItemChecked( mnuShowUpgradedPkgsId, false );

+    networkPkgWindow->showUpgradedPackages( false );

+    

+    networkPkgWindow->showOnlyUninstalledPackages( val );

+    

+}

+

+void MainWindow :: filterInstalledPackages()

+{

+    bool val;

+    if ( filter->isItemChecked( mnuShowInstalledPkgsId ) )

+    {

+        val = false;

+        filter->setItemChecked( mnuShowInstalledPkgsId, false );

+    }

+    else

+    {

+        val = true;

+        filter->setItemChecked( mnuShowInstalledPkgsId, true );

+    }

+

+    filter->setItemChecked( mnuShowUninstalledPkgsId, false );

+    networkPkgWindow->showOnlyUninstalledPackages( false );

+    filter->setItemChecked( mnuShowUpgradedPkgsId, false );

+    networkPkgWindow->showUpgradedPackages( false );

+   

+    networkPkgWindow->showOnlyInstalledPackages( val );

+}

+

+void MainWindow :: filterUpgradedPackages()

+{

+    bool val;

+    if ( filter->isItemChecked( mnuShowUpgradedPkgsId ) )

+    {

+        val = false;

+        filter->setItemChecked( mnuShowUpgradedPkgsId, false );

+    }

+    else

+    {

+        val = true;

+        filter->setItemChecked( mnuShowUpgradedPkgsId, true );

+    }

+

+    filter->setItemChecked( mnuShowUninstalledPkgsId, false );

+    networkPkgWindow->showOnlyUninstalledPackages( false );

+    filter->setItemChecked( mnuShowInstalledPkgsId, false );

+    networkPkgWindow->showOnlyInstalledPackages( false );

+

+    networkPkgWindow->showUpgradedPackages( val );

+}

diff --git a/noncore/settings/aqpkg/mainwin.h b/noncore/settings/aqpkg/mainwin.h
index 267233f..7b6e0ba 100644
--- a/noncore/settings/aqpkg/mainwin.h
+++ b/noncore/settings/aqpkg/mainwin.h
@@ -15,36 +15,49 @@
  *                                                                         *

  ***************************************************************************/

 

 #ifndef MAINWIN_H

 #define MAINWIN_H

 

 #include <qmainwindow.h>

 #include <qwidgetstack.h>

 

 

 class NetworkPackageManager;

 class DataManager;

 

 class MainWindow :public  QMainWindow

 {

         Q_OBJECT

 public:

 

         MainWindow( QWidget *p = 0, char *name = 0 );

         ~MainWindow();

 

 private:

     DataManager *mgr;

 

+    QMenuBar *menu;

+    QPopupMenu *help;

+    QPopupMenu *settings;

+    QPopupMenu *edit;

+    QPopupMenu *filter;

         QWidgetStack *stack;

-        NetworkPackageManager *networkPkgWindow;

+

+    NetworkPackageManager *networkPkgWindow;

+

+    int mnuShowUninstalledPkgsId;

+    int mnuShowInstalledPkgsId;

+    int mnuShowUpgradedPkgsId;

 

 public slots:

     void setDocument( const QString &doc );

     void displayHelp();

     void searchForPackage();

     void repeatSearchForPackage();

     void displayAbout();

     void displaySettings();

+    void filterUninstalledPackages();

+    void filterInstalledPackages();

+    void filterUpgradedPackages();

 };

 #endif

diff --git a/noncore/settings/aqpkg/networkpkgmgr.cpp b/noncore/settings/aqpkg/networkpkgmgr.cpp
index 76c7a9c..d43c6ac 100644
--- a/noncore/settings/aqpkg/networkpkgmgr.cpp
+++ b/noncore/settings/aqpkg/networkpkgmgr.cpp
@@ -35,72 +35,72 @@ using namespace std;
 #include <qmessagebox.h>
 
 #include "datamgr.h"
 #include "networkpkgmgr.h"
 #include "installdlgimpl.h"
 #include "ipkg.h"
 #include "inputdlg.h"
 #include "letterpushbutton.h"
 
 #include "global.h"
 
 extern int compareVersions( const char *v1, const char *v2 );
 
 NetworkPackageManager::NetworkPackageManager( DataManager *dataManager, QWidget *parent, const char *name)
   : QWidget(parent, name)
 {
     dataMgr = dataManager;
 
 #ifdef QWS
         // read download directory from config file
         Config cfg( "aqpkg" );
         cfg.setGroup( "settings" );
         currentlySelectedServer = cfg.readEntry( "selectedServer", "local" );
         showJumpTo = cfg.readBoolEntry( "showJumpTo", "true" );
+
 #endif
+
+    showUninstalledPkgs = false;
+    showInstalledPkgs = false;
+    showUpgradedPkgs = false;
     
 
     initGui();
     setupConnections();
 
     updateData();
-//    progressDlg = 0;
-//    timerId = startTimer( 100 );
 }
 
 NetworkPackageManager::~NetworkPackageManager()
 {
 }
 
 void NetworkPackageManager :: timerEvent ( QTimerEvent * )
 {
     killTimer( timerId );
 
-//    showProgressDialog();
     // Add server names to listbox
     updateData();
-
-//    progressDlg->hide();
 }
 
 void NetworkPackageManager :: updateData()
 {
         serversList->clear();
     packagesList->clear();
 
     
     vector<Server>::iterator it;
     int activeItem = -1;
     int i;
     for ( i = 0, it = dataMgr->getServerList().begin() ; it != dataMgr->getServerList().end() ; ++it, ++i )
     {
         if ( !it->isServerActive() )
         {
             i--;
             continue;
         }
         serversList->insertItem( it->getServerName() );
         if ( it->getServerName() == currentlySelectedServer )
                 activeItem = i;
         }
 
         // set selected server to be active server
@@ -202,51 +202,68 @@ void NetworkPackageManager :: showProgressDialog( char *initialText )
 void NetworkPackageManager :: serverSelected( int )
 {
     packagesList->clear();
 
     // display packages
     QString serverName = serversList->currentText();
     currentlySelectedServer = serverName;
 
 #ifdef QWS
         // read download directory from config file
         Config cfg( "aqpkg" );
         cfg.setGroup( "settings" );
         cfg.writeEntry( "selectedServer", currentlySelectedServer );
 #endif
 
     Server *s = dataMgr->getServer( serverName );
 
     vector<Package> &list = s->getPackageList();
     vector<Package>::iterator it;
     for ( it = list.begin() ; it != list.end() ; ++it )
     {
 
         QString text = "";
 
-                // If the local server, only display installed packages
-                if ( serverName == LOCAL_SERVER && !it->isInstalled() )
-                        continue;
+        // Apply show only uninstalled packages filter
+        if ( showUninstalledPkgs && it->isInstalled() )
+            continue;
+
+        // Apply show only installed packages filter
+        if ( showInstalledPkgs && !it->isInstalled() )
+            continue;
+
+        // Apply show only new installed packages filter
+        if ( showUpgradedPkgs )
+        {
+            if ( !it->isInstalled() ||
+                 compareVersions( it->getInstalledVersion(), it->getVersion() ) != 1 )
+                continue;
+        }
+
+        // If the local server, only display installed packages
+        if ( serverName == LOCAL_SERVER && !it->isInstalled() )
+            continue;
+
 
         text += it->getPackageName();
         if ( it->isInstalled() )
         {
             text += " (installed)";
 
             // If a different version of package is available, postfix it with an *
             if ( it->getVersion() != it->getInstalledVersion() )
             {
 
                 if ( compareVersions( it->getInstalledVersion(), it->getVersion() ) == 1 )
                     text += "*";
             }
         }
 
         QCheckListItem *item = new QCheckListItem( packagesList, text, QCheckListItem::CheckBox );
 
         if ( it->isInstalled() )
         {
             QString destName = "";
             if ( it->getLocalPackage() )
             {
                 if ( it->getLocalPackage()->getInstalledTo() )
                     destName = it->getLocalPackage()->getInstalledTo()->getDestinationName();
@@ -748,24 +765,42 @@ void NetworkPackageManager :: searchForPackage( bool findNext )
         cout << "searching for " << lastSearchText << endl;
         // look through package list for text startng at current position
         vector<InstallData> workingPackages;
         QCheckListItem *start = (QCheckListItem *)packagesList->currentItem();
         if ( start != 0 )
             start = (QCheckListItem *)start->nextSibling();
         
         if ( start == 0 )
             start = (QCheckListItem *)packagesList->firstChild();
         
         for ( QCheckListItem *item = start; item != 0 ;
               item = (QCheckListItem *)item->nextSibling() )
         {
             cout << "checking " << item->text().lower() << endl;
             if ( item->text().lower().find( lastSearchText ) != -1 )
             {
                 cout << "matched " << item->text() << endl;
                 packagesList->ensureItemVisible( item );
                 packagesList->setCurrentItem( item );
                 break;
             }
         }   
     }
 }
+
+void NetworkPackageManager :: showOnlyUninstalledPackages( bool val )
+{
+    showUninstalledPkgs = val;
+    serverSelected( -1 );
+}
+
+void NetworkPackageManager :: showOnlyInstalledPackages( bool val )
+{
+    showInstalledPkgs = val;
+    serverSelected( -1 );
+}
+
+void NetworkPackageManager :: showUpgradedPackages( bool val )
+{
+    showUpgradedPkgs = val;
+    serverSelected( -1 );
+}
diff --git a/noncore/settings/aqpkg/networkpkgmgr.h b/noncore/settings/aqpkg/networkpkgmgr.h
index 66a8903..937c9b4 100644
--- a/noncore/settings/aqpkg/networkpkgmgr.h
+++ b/noncore/settings/aqpkg/networkpkgmgr.h
@@ -20,62 +20,69 @@
 
 #include <qlayout.h>
 #include <qpushbutton.h>
 #include <qwidget.h>
 #include <qcombobox.h>
 #include <qlistview.h>
 
 #include "datamgr.h"
 #include "progressdlg.h"
 class InstallData;
 
 /** NetworkPackageManager is the base class of the project */
 class NetworkPackageManager : public QWidget
 {
   Q_OBJECT
 public:
     /** construtor */
     NetworkPackageManager( DataManager *dataManager, QWidget* parent=0, const char *name=0);
     /** destructor */
     ~NetworkPackageManager();
 
     void selectLocalPackage( const QString &pkg );
     void updateData();
     void searchForPackage( bool findNext );
+    void showOnlyUninstalledPackages( bool val );
+    void showOnlyInstalledPackages( bool val );
+    void showUpgradedPackages( bool val );
+    
 private:
     DataManager *dataMgr;
 
     QComboBox *serversList;
     QListView *packagesList;
     QPushButton *update;
     QPushButton *upgrade;
     QPushButton *download;
     QPushButton *apply;
 
     ProgressDlg *progressDlg;
     QString currentlySelectedServer;
     QString lastSearchText;
 
     bool showJumpTo;
+    bool showUninstalledPkgs;
+    bool showInstalledPkgs;
+    bool showUpgradedPkgs;
     int timerId;
 
     void timerEvent ( QTimerEvent * );
 
     void initGui();
     void setupConnections();
     void showProgressDialog( char *initialText );
     void downloadSelectedPackages();
     void downloadRemotePackage();
     InstallData dealWithItem( QCheckListItem *item );
     QString stickyOption;
 
 public slots:
     void serverSelected( int index );
     void applyChanges();
     void upgradePackages();
     void downloadPackage();
     void updateServer();
     void displayText( const QString &t );
     void letterPushed( QString t );
 };
 
 #endif