1 files changed, 54 insertions, 10 deletions

diff --git a/noncore/settings/aqpkg/mainwin.h b/noncore/settings/aqpkg/mainwin.h
index ef67cc9..46b5fae 100644
--- a/noncore/settings/aqpkg/mainwin.h
+++ b/noncore/settings/aqpkg/mainwin.h
@@ -18,19 +18,24 @@
 #ifndef MAINWIN_H
 #define MAINWIN_H
 
 #include <qmainwindow.h>
 #include <qpixmap.h>
 
-class QWidgetStack;
-class QPEToolBar;
-class QLineEdit;
-class QAction;
-class ProgressWidget;
-class NetworkPackageManager;
 class DataManager;
+class InstallData;
+
+class QAction;
+class QCheckListItem;
+class QComboBox;
+class QLabel;
+class QLineEdit;
+class QListView;
+class QPEToolBar;
+class QProgressBar;
+class QWidgetStack;
 
 class MainWindow :public  QMainWindow
 {
 	Q_OBJECT
 public:
 
@@ -52,21 +57,51 @@ private:
     QAction    *actionInstalled;
     QAction    *actionUpdated;
     
     QPixmap iconDownload;
     QPixmap iconRemove;
     
-    NetworkPackageManager *networkPkgWindow;
-    ProgressWidget *progressWindow;
-
     int mnuShowUninstalledPkgsId;
     int mnuShowInstalledPkgsId;
     int mnuShowUpgradedPkgsId;
     int mnuFilterByCategory;
     int mnuSetFilterCategory;
 
+    // Main package list widget
+    QWidget   *networkPkgWindow;
+    QComboBox *serversList;
+    QListView *packagesList;
+    QPixmap    installedIcon;
+    QPixmap    updatedIcon;
+    QString    currentlySelectedServer;
+    QString    categoryFilter;
+    QString    stickyOption;
+
+    bool categoryFilterEnabled;
+    bool showJumpTo;
+    bool showUninstalledPkgs;
+    bool showInstalledPkgs;
+    bool showUpgradedPkgs;
+    bool downloadEnabled;
+
+    void initMainWidget();
+    void updateData();
+    void serverSelected( int index, bool showProgress );
+    void searchForPackage( const QString & );
+    bool filterByCategory( bool val );
+    void downloadSelectedPackages();
+    void downloadRemotePackage();
+    InstallData dealWithItem( QCheckListItem *item );
+    
+    // Progress widget
+    QWidget      *progressWindow;
+    QLabel       *m_status;
+    QProgressBar *m_progress;
+    
+    void initProgressWidget();
+    
 public slots:
     void setDocument( const QString &doc );
     void displayHelp();
     void displayFindBar();
     void repeatFind();
     void findPackage( const QString & );
@@ -74,16 +109,25 @@ public slots:
     void displayAbout();
     void displaySettings();
     void filterUninstalledPackages();
     void filterInstalledPackages();
     void filterUpgradedPackages();
     void filterCategory();
-    void setFilterCategory();
+    bool setFilterCategory();
     void raiseMainWidget();
     void raiseProgressWidget();
     void enableUpgrade( bool );
     void enableDownload( bool );
 
 private slots:
     void init();
+    void setProgressSteps( int );
+    void setProgressMessage( const QString & );
+    void updateProgress( int );
+    void serverSelected( int index );
+    void updateServer();
+    void upgradePackages();
+    void downloadPackage();
+    void applyChanges();
+    void letterPushed( QString t );
 };
 #endif