4 files changed, 40 insertions, 2 deletions

diff --git a/noncore/settings/aqpkg/mainwin.cpp b/noncore/settings/aqpkg/mainwin.cpp
index 206d11c..9f19dfa 100644
--- a/noncore/settings/aqpkg/mainwin.cpp
+++ b/noncore/settings/aqpkg/mainwin.cpp
@@ -15,24 +15,25 @@
  *                                                                         *

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

 

 #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

@@ -56,24 +57,32 @@ MainWindow :: MainWindow( QWidget *p, char *name )
 	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;

+    networkPkgWindow->selectLocalPackage( package );

+}

+

 void MainWindow :: displaySettings()

 {

     SettingsImpl *dlg = new SettingsImpl( mgr, this, "Settings", true );

     if ( dlg->showDlg( 0 ) )

     	networkPkgWindow->updateData();

     delete dlg;

 }

 

 void MainWindow :: displayHelp()

 {

     HelpWindow *dlg = new HelpWindow( this );

     dlg->exec();

diff --git a/noncore/settings/aqpkg/mainwin.h b/noncore/settings/aqpkg/mainwin.h
index 2a182fc..a9e290c 100644
--- a/noncore/settings/aqpkg/mainwin.h
+++ b/noncore/settings/aqpkg/mainwin.h
@@ -31,17 +31,18 @@ class MainWindow :public  QMainWindow
 public:

 

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

 	~MainWindow();

 

 private:

     DataManager *mgr;

 

 	QWidgetStack *stack;

 	NetworkPackageManager *networkPkgWindow;

 

 public slots:

+    void setDocument( const QString &doc );

     void displayHelp();

     void displayAbout();

     void displaySettings();

 };

 #endif

diff --git a/noncore/settings/aqpkg/networkpkgmgr.cpp b/noncore/settings/aqpkg/networkpkgmgr.cpp
index 6874ded..a374266 100644
--- a/noncore/settings/aqpkg/networkpkgmgr.cpp
+++ b/noncore/settings/aqpkg/networkpkgmgr.cpp
@@ -51,26 +51,27 @@ NetworkPackageManager::NetworkPackageManager( DataManager *dataManager, QWidget
 #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
     
 
     initGui();
     setupConnections();
 
-    progressDlg = 0;
-    timerId = startTimer( 100 );
+    updateData();
+//    progressDlg = 0;
+//    timerId = startTimer( 100 );
 }
 
 NetworkPackageManager::~NetworkPackageManager()
 {
 }
 
 void NetworkPackageManager :: timerEvent ( QTimerEvent * )
 {
     killTimer( timerId );
 
 //    showProgressDialog();
     // Add server names to listbox
@@ -97,24 +98,50 @@ void NetworkPackageManager :: updateData()
         }
         serversList->insertItem( it->getServerName() );
         if ( it->getServerName() == currentlySelectedServer )
         	activeItem = i;
 	}
 
 	// set selected server to be active server
 	if ( activeItem != -1 )
 		serversList->setCurrentItem( activeItem );
     serverSelected( 0 );
 }
 
+void NetworkPackageManager :: selectLocalPackage( const QString &pkg )
+{
+    // First select local server
+    for ( int i = 0 ; i < serversList->count() ; ++i )
+    {
+        if ( serversList->text( i ) == LOCAL_IPKGS )
+        {
+            serversList->setCurrentItem( i );
+            break;
+        }
+    }
+    serverSelected( 0 );
+
+    // Now set the check box of the selected package
+    for ( QCheckListItem *item = (QCheckListItem *)packagesList->firstChild();
+          item != 0 ;
+          item = (QCheckListItem *)item->nextSibling() )
+    {
+        if ( item->text().startsWith( pkg ) )
+        {
+            item->setOn( true );
+            break;
+        }
+    }
+}
+
 
 void NetworkPackageManager :: initGui()
 {
     QLabel *l = new QLabel( "Servers", this );
     serversList = new QComboBox( this );
     packagesList = new QListView( this );
     update = new QPushButton( "Refresh List", this );
     download = new QPushButton( "Download", this );
     upgrade = new QPushButton( "Upgrade", this );
     apply = new QPushButton( "Apply", this );
 
     QVBoxLayout *vbox = new QVBoxLayout( this, 0, -1, "VBox" );
diff --git a/noncore/settings/aqpkg/networkpkgmgr.h b/noncore/settings/aqpkg/networkpkgmgr.h
index fba8155..3c437b4 100644
--- a/noncore/settings/aqpkg/networkpkgmgr.h
+++ b/noncore/settings/aqpkg/networkpkgmgr.h
@@ -29,24 +29,25 @@
 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();
 
 private:
     DataManager *dataMgr;
 
     QComboBox *serversList;
     QListView *packagesList;
     QPushButton *update;
     QPushButton *upgrade;
     QPushButton *download;
     QPushButton *apply;