4 files changed, 40 insertions, 13 deletions

diff --git a/noncore/settings/aqpkg/networkpkgmgr.cpp b/noncore/settings/aqpkg/networkpkgmgr.cpp
index ed5bf75..3aee7bd 100644
--- a/noncore/settings/aqpkg/networkpkgmgr.cpp
+++ b/noncore/settings/aqpkg/networkpkgmgr.cpp
@@ -1,201 +1,206 @@
 /***************************************************************************
                           networkpkgmgr.cpp  -  description
                              -------------------
     begin                : Mon Aug 26 13:32:30 BST 2002
     copyright            : (C) 2002 by Andy Qua
     email                : andy.qua@blueyonder.co.uk
  ***************************************************************************/
 
 /***************************************************************************
  *                                                                         *
  *   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.                                   *
  *                                                                         *
  ***************************************************************************/
 
 #include <fstream>
 #include <iostream>
 using namespace std;
 
 #include <unistd.h>
 #include <stdlib.h>
 #include <linux/limits.h>
 
 #ifdef QWS
 #include <qpe/qpeapplication.h>
 #include <qpe/qcopenvelope_qws.h>
 #include <qpe/config.h>
 #else
 #include <qapplication.h>
 #endif
 #include <qlabel.h>
 #include <qfile.h>
 #include <qmessagebox.h>
 
 #include "datamgr.h"
 #include "networkpkgmgr.h"
 #include "installdlgimpl.h"
 #include "ipkg.h"
 #include "inputdlg.h"
 #include "letterpushbutton.h"
 
 #include "global.h"
 
 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
     
 
     initGui();
     setupConnections();
 
     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
         if ( activeItem != -1 )
                 serversList->setCurrentItem( activeItem );
     serverSelected( 0 );
 }
 
 
 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" );
     QHBoxLayout *hbox1 = new QHBoxLayout( vbox, -1, "HBox1" );
     hbox1->addWidget( l );
     hbox1->addWidget( serversList );
 
     QHBoxLayout *hbox3 = new QHBoxLayout( vbox, -1, "HBox1" );
     QHBoxLayout *hbox4 = new QHBoxLayout( vbox, -1, "HBox1" );
 
-    char text[2];
-    text[1] = '\0';
-    for ( int i = 0 ; i < 26 ; ++i )
-    {
-        text[0] = 'A' + i;
-        LetterPushButton *b = new LetterPushButton( text, this );
-        connect( b, SIGNAL( released( QString ) ), this, SLOT( letterPushed( QString ) ) );
-        if ( i < 16 )
-            hbox3->addWidget( b );
-        else
-            hbox4->addWidget( b );
+
+    if ( showJumpTo )
+    {    
+        char text[2];
+        text[1] = '\0';
+        for ( int i = 0 ; i < 26 ; ++i )
+        {
+                text[0] = 'A' + i;
+                LetterPushButton *b = new LetterPushButton( text, this );
+                connect( b, SIGNAL( released( QString ) ), this, SLOT( letterPushed( QString ) ) );
+                if ( i < 16 )
+                hbox3->addWidget( b );
+                else
+                hbox4->addWidget( b );
+        }
     }
 
     vbox->addWidget( packagesList );
     packagesList->addColumn( "Packages" );
 
     QHBoxLayout *hbox2 = new QHBoxLayout( vbox, -1, "HBox2" );
     hbox2->addWidget( update );
     hbox2->addWidget( download );
     hbox2->addWidget( upgrade );
     hbox2->addWidget( apply );
 }
 
 void NetworkPackageManager :: setupConnections()
 {
     connect( serversList, SIGNAL(activated( int )), this, SLOT(serverSelected( int )));
     connect( apply, SIGNAL(released()), this, SLOT(applyChanges()) );
     connect( download, SIGNAL(released()), this, SLOT(downloadPackage()) );
     connect( upgrade, SIGNAL( released()), this, SLOT(upgradePackages()) );
     connect( update, SIGNAL(released()), this, SLOT(updateServer()) );
 }
 
 void NetworkPackageManager :: showProgressDialog( char *initialText )
 {
     if ( !progressDlg )
         progressDlg = new ProgressDlg( this, "Progress", false );
     progressDlg->setText( initialText );
     progressDlg->show();
 }
 
 
 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 );
 //    dataMgr->setActiveServer( 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;
 
         text += it->getPackageName();
         if ( it->isInstalled() )
         {
             text += " (installed)";
 
             // If a different version of package is available, postfix it with an *
diff --git a/noncore/settings/aqpkg/networkpkgmgr.h b/noncore/settings/aqpkg/networkpkgmgr.h
index 7efa42c..fba8155 100644
--- a/noncore/settings/aqpkg/networkpkgmgr.h
+++ b/noncore/settings/aqpkg/networkpkgmgr.h
@@ -1,76 +1,77 @@
 /***************************************************************************
                           networkpkgmgr.h  -  description
                              -------------------
     begin                : Mon Aug 26 13:32:30 BST 2002
     copyright            : (C) 2002 by Andy Qua
     email                : andy.qua@blueyonder.co.uk
  ***************************************************************************/
 
 /***************************************************************************
  *                                                                         *
  *   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.                                   *
  *                                                                         *
  ***************************************************************************/
 
 #ifndef NETWORKPKGMGR_H
 #define NETWORKPKGMGR_H
 
 #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 updateData();
 
 private:
     DataManager *dataMgr;
 
     QComboBox *serversList;
     QListView *packagesList;
     QPushButton *update;
     QPushButton *upgrade;
     QPushButton *download;
     QPushButton *apply;
 
     ProgressDlg *progressDlg;
     QString currentlySelectedServer;
 
+    bool showJumpTo;
     int timerId;
 
     void timerEvent ( QTimerEvent * );
 
     void initGui();
     void setupConnections();
     void showProgressDialog( char *initialText );
     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
diff --git a/noncore/settings/aqpkg/settingsimpl.cpp b/noncore/settings/aqpkg/settingsimpl.cpp
index 9ee3a33..a18a178 100644
--- a/noncore/settings/aqpkg/settingsimpl.cpp
+++ b/noncore/settings/aqpkg/settingsimpl.cpp
@@ -5,139 +5,146 @@
     copyright            : (C) 2002 by Andy Qua
     email                : andy.qua@blueyonder.co.uk
  ***************************************************************************/
 
 /***************************************************************************
  *                                                                         *
  *   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.                                   *
  *                                                                         *
  ***************************************************************************/
 
 #include <fstream>
 using namespace std;
 
 #include <qlistbox.h>
 #include <qlineedit.h>
 #include <qpushbutton.h>
 #include <qtabwidget.h>
 #include <qcheckbox.h>
 
 #ifdef QWS
 #include <qpe/config.h>
 #endif
 
 #include "settingsimpl.h"
 
 #include "global.h"
 
 SettingsImpl :: SettingsImpl( DataManager *dataManager, QWidget * parent, const char* name, bool modal, WFlags fl )
     : SettingsBase( parent, name, modal, fl )
 {
     dataMgr = dataManager;
 
     setupData();
     changed = false;
     newserver = false;
     newdestination = false;
 }
 
 SettingsImpl :: ~SettingsImpl()
 {
 
 }
 
 bool SettingsImpl :: showDlg( int i )
 {
         TabWidget->setCurrentPage( i );
         showMaximized();
         exec();
 
         if ( changed )
                 dataMgr->writeOutIpkgConf();
 
         return changed;
 }
 
 void SettingsImpl :: setupData()
 {
     // add servers
     vector<Server>::iterator it;
     for ( it = dataMgr->getServerList().begin() ; it != dataMgr->getServerList().end() ; ++it )
         {
-                if ( it->getServerName() == LOCAL_SERVER || it->getServerName() == LOCAL_IPKGS )
-                        continue;
+        if ( it->getServerName() == LOCAL_SERVER || it->getServerName() == LOCAL_IPKGS )
+            continue;
 
         servers->insertItem( it->getServerName() );
         }
 
     // add destinations
     vector<Destination>::iterator it2;
     for ( it2 = dataMgr->getDestinationList().begin() ; it2 != dataMgr->getDestinationList().end() ; ++it2 )
         destinations->insertItem( it2->getDestinationName() );
 
+#ifdef QWS
+    Config cfg( "aqpkg" );
+    cfg.setGroup( "settings" );
+    jumpTo->setChecked( cfg.readBoolEntry( "showJumpTo", "true" ) );
+#else
+    jumpTo->setChecked( true );
+#endif
 }
 
 //------------------ Servers tab ----------------------
 
 void SettingsImpl :: editServer( int sel )
 {
         currentSelectedServer = sel;
     Server *s = dataMgr->getServer( servers->currentText() );
     serverName = s->getServerName();
     servername->setText( s->getServerName() );
     serverurl->setText( s->getServerUrl() );
     active->setChecked( s->isServerActive() );
 }
 
 void SettingsImpl :: newServer()
 {
         newserver = true;
         servername->setText( "" );
         serverurl->setText( "" );
         servername->setFocus();
     active->setChecked( true );
 }
 
 void SettingsImpl :: removeServer()
 {
         changed = true;
     Server *s = dataMgr->getServer( servers->currentText() );
         dataMgr->getServerList().erase( s );
         servers->removeItem( currentSelectedServer );
 }
 
 void SettingsImpl :: changeServerDetails()
 {
         changed = true;
 
         QString newName = servername->text();
         if ( !newserver )
         {
                 Server *s = dataMgr->getServer( serverName );
 
                 // Update url
                 s->setServerUrl( serverurl->text() );
         s->setActive( active->isChecked() );
 
 
                 // Check if server name has changed, if it has then we need to replace the key in the map
                 if ( serverName != newName )
                 {
                         // Update server name
                         s->setServerName( newName );
 
                         // See if this server is the active server
         //              if ( dataMgr->getActiveServer() == serverName )
         //                      dataMgr->setActiveServer( newName );
 
                         // Update list box
                         servers->changeItem( newName, currentSelectedServer );
                 }
         }
         else
         {
         Server s( newName, serverurl->text() );
         dataMgr->getServerList().push_back( Server( newName, serverurl->text() ) );
         dataMgr->getServerList().end()->setActive( active->isChecked() );
@@ -163,64 +170,76 @@ void SettingsImpl :: newDestination()
 {
         newdestination = true;
         destinationname->setText( "" );
         destinationurl->setText( "" );
         destinationname->setFocus();
     linkToRoot->setChecked( true );
 }
 
 void SettingsImpl :: removeDestination()
 {
         changed = true;
     Destination *d = dataMgr->getDestination( destinations->currentText() );
         dataMgr->getDestinationList().erase( d );
         destinations->removeItem( currentSelectedDestination );
 }
 
 void SettingsImpl :: changeDestinationDetails()
 {
         changed = true;
 
 #ifdef QWS
     Config cfg( "aqpkg" );
     cfg.setGroup( "destinations" );
 #endif
 
     QString newName = destinationname->text();
         if ( !newdestination )
         {
                 Destination *d = dataMgr->getDestination( destinationName );
 
                 // Update url
                 d->setDestinationPath( destinationurl->text() );
         d->linkToRoot( linkToRoot->isChecked() );
 
                 // Check if server name has changed, if it has then we need to replace the key in the map
                 if ( destinationName != newName )
                 {
                         // Update server name
                         d->setDestinationName( newName );
 
                         // Update list box
                         destinations->changeItem( newName, currentSelectedDestination );
                 }
 #ifdef QWS
         QString key = newName;
         key += "_linkToRoot";
         int val = d->linkToRoot();
         cfg.writeEntry( key, val );
 #endif        
         }
         else
         {
                 dataMgr->getDestinationList().push_back( Destination( newName, destinationurl->text() ) );
                 destinations->insertItem( newName );
                 destinations->setCurrentItem( destinations->count() );
                 newdestination = false;
 
 #ifdef QWS
         QString key = newName;
         key += "_linkToRoot";
         cfg.writeEntry( key, true );
 #endif
         }
 }
+
+//------------------ General tab ----------------------
+
+void SettingsImpl :: toggleJumpTo( bool val )
+{
+#ifdef QWS
+    Config cfg( "aqpkg" );
+    cfg.setGroup( "settings" );
+    cfg.writeEntry( "showJumpTo", val );
+#endif
+}
+
diff --git a/noncore/settings/aqpkg/settingsimpl.h b/noncore/settings/aqpkg/settingsimpl.h
index bc231a1..971516b 100644
--- a/noncore/settings/aqpkg/settingsimpl.h
+++ b/noncore/settings/aqpkg/settingsimpl.h
@@ -1,52 +1,54 @@
 /***************************************************************************
                           settingsimpl.h  -  description
                              -------------------
     begin                : Thu Aug 29 2002
     copyright            : (C) 2002 by Andy Qua
     email                : andy.qua@blueyonder.co.uk
  ***************************************************************************/
 
 /***************************************************************************
  *                                                                         *
  *   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.                                   *
  *                                                                         *
  ***************************************************************************/
 
 #include "settings.h"
 
 #include "datamgr.h"
 
 class SettingsImpl : public SettingsBase
 {
 public:
      SettingsImpl( DataManager *dataManager, QWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 );
     ~SettingsImpl();
 
         bool showDlg( int i );
 
 private:
     DataManager *dataMgr;
     QString serverName;
     QString destinationName;
     int currentSelectedServer;
     int currentSelectedDestination;
     bool changed;
     bool newserver;
     bool newdestination;
 
     void setupConnections();
     void setupData();
 
     void editServer( int s );
     void changeServerDetails();
         void newServer();
         void removeServer();
 
     void editDestination( int s );
     void changeDestinationDetails();
         void newDestination();
         void removeDestination();
+
+    void toggleJumpTo( bool val );
 };