summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/settings/aqpkg/aqpkg.pro2
-rw-r--r--noncore/settings/aqpkg/doc.txt49
-rw-r--r--noncore/settings/aqpkg/helpwindow.cpp95
-rw-r--r--noncore/settings/aqpkg/helpwindow.h34
-rw-r--r--noncore/settings/aqpkg/mainwin.cpp25
-rw-r--r--noncore/settings/aqpkg/mainwin.h2
6 files changed, 0 insertions, 207 deletions
diff --git a/noncore/settings/aqpkg/aqpkg.pro b/noncore/settings/aqpkg/aqpkg.pro
index 6b4fb30..e4076f5 100644
--- a/noncore/settings/aqpkg/aqpkg.pro
+++ b/noncore/settings/aqpkg/aqpkg.pro
@@ -1,54 +1,52 @@
1 TEMPLATE= app 1 TEMPLATE= app
2 CONFIG = qt warn_on release 2 CONFIG = qt warn_on release
3 HEADERS = global.h \ 3 HEADERS = global.h \
4 mainwin.h \ 4 mainwin.h \
5 datamgr.h \ 5 datamgr.h \
6 settingsimpl.h \ 6 settingsimpl.h \
7 ipkg.h \ 7 ipkg.h \
8 package.h \ 8 package.h \
9 installdlgimpl.h \ 9 installdlgimpl.h \
10 instoptionsimpl.h \ 10 instoptionsimpl.h \
11 destination.h \ 11 destination.h \
12 utils.h \ 12 utils.h \
13 server.h \ 13 server.h \
14 helpwindow.h \
15 letterpushbutton.h \ 14 letterpushbutton.h \
16 inputdlg.h \ 15 inputdlg.h \
17 categoryfilterimpl.h 16 categoryfilterimpl.h
18 SOURCES = mainwin.cpp \ 17 SOURCES = mainwin.cpp \
19 datamgr.cpp \ 18 datamgr.cpp \
20 mem.cpp \ 19 mem.cpp \
21 settingsimpl.cpp \ 20 settingsimpl.cpp \
22 ipkg.cpp \ 21 ipkg.cpp \
23 main.cpp \ 22 main.cpp \
24 package.cpp \ 23 package.cpp \
25 installdlgimpl.cpp \ 24 installdlgimpl.cpp \
26 instoptionsimpl.cpp \ 25 instoptionsimpl.cpp \
27 destination.cpp \ 26 destination.cpp \
28 utils.cpp \ 27 utils.cpp \
29 server.cpp \ 28 server.cpp \
30 helpwindow.cpp \
31 letterpushbutton.cpp \ 29 letterpushbutton.cpp \
32 inputdlg.cpp \ 30 inputdlg.cpp \
33 version.cpp \ 31 version.cpp \
34 categoryfilterimpl.cpp 32 categoryfilterimpl.cpp
35 INTERFACES= 33 INTERFACES=
36 TARGET = aqpkg 34 TARGET = aqpkg
37INCLUDEPATH += $(OPIEDIR)/include 35INCLUDEPATH += $(OPIEDIR)/include
38DEPENDPATH += $(OPIEDIR)/include 36DEPENDPATH += $(OPIEDIR)/include
39LIBS += -lqpe -lopie -lstdc++ 37LIBS += -lqpe -lopie -lstdc++
40DESTDIR = $(OPIEDIR)/bin 38DESTDIR = $(OPIEDIR)/bin
41 39
42TRANSLATIONS = ../../../i18n/de/aqpkg.ts \ 40TRANSLATIONS = ../../../i18n/de/aqpkg.ts \
43 ../../../i18n/xx/aqpkg.ts \ 41 ../../../i18n/xx/aqpkg.ts \
44 ../../../i18n/en/aqpkg.ts \ 42 ../../../i18n/en/aqpkg.ts \
45 ../../../i18n/es/aqpkg.ts \ 43 ../../../i18n/es/aqpkg.ts \
46 ../../../i18n/fr/aqpkg.ts \ 44 ../../../i18n/fr/aqpkg.ts \
47 ../../../i18n/hu/aqpkg.ts \ 45 ../../../i18n/hu/aqpkg.ts \
48 ../../../i18n/ja/aqpkg.ts \ 46 ../../../i18n/ja/aqpkg.ts \
49 ../../../i18n/ko/aqpkg.ts \ 47 ../../../i18n/ko/aqpkg.ts \
50 ../../../i18n/no/aqpkg.ts \ 48 ../../../i18n/no/aqpkg.ts \
51 ../../../i18n/pl/aqpkg.ts \ 49 ../../../i18n/pl/aqpkg.ts \
52 ../../../i18n/pt/aqpkg.ts \ 50 ../../../i18n/pt/aqpkg.ts \
53 ../../../i18n/pt_BR/aqpkg.ts \ 51 ../../../i18n/pt_BR/aqpkg.ts \
54 ../../../i18n/sl/aqpkg.ts \ 52 ../../../i18n/sl/aqpkg.ts \
diff --git a/noncore/settings/aqpkg/doc.txt b/noncore/settings/aqpkg/doc.txt
deleted file mode 100644
index 7722c07..0000000
--- a/noncore/settings/aqpkg/doc.txt
+++ b/dev/null
@@ -1,49 +0,0 @@
1<qt><h1>Documentation for AQPkg</h1><p>
2AQPkg is a package manager for the Sharp Zaurus.<br>
3Basic Instructions:<br>
4On startup, you will be shown a window. The main part of the window is taken up
5by a list box showing packages. The packages shown will depend on the server selected.<br>
6The servers list contains network servers containing feeds of packages that can be downloaded
7and installed onto your Zaurus. These are held in the file /etc/ipkg.conf and can be maintained
8using AQPkg. In addition to the servers defined in ipkg.conf file, there are two other servers -
9local and local IPKGs. These are not network servers but views of yours Zaurus.<br>
10The local server shows all installed packages, and the local IPKGs server shows all ipks
11that are stored on your Zaurus.<br>
12On the local server, you can only remove packages. On the local IPKGs server you can only
13install and delete packages - removing installed packages is currently not working. On all other
14servers you can install, uninstall, upgrade and download packages.<br>
15To get the latest package list for a server (or refresh the view), select the server you
16wish to update and click the Refresh List button.<br>
17To download a package from a remote server, select the server (any except local and local IPKGs),
18then select the package(s) you wish to download (by tapping in the box next to the package
19name so that a tick appears in the box) and click the Download button. Enter the path where you
20want the package to be downloaded to and click OK to download the package.<br>
21To install, upgrade or remove a package select the packages you wish to install and click the Apply
22button. You will then be shown a dialog which allows you to select which destination you wish
23to install the package to, which packages will be installed, removed and upgraded. You can also
24set various options. (for the moment, see the documentation for IPKG for more details on these
25options). To start the process, click Start. This will perform the necessary operations and
26will show you what is happening. Once everything has completed click the Close button.<br>
27Note: Currently, the operation to perform for a package is automatically decided based on the
28following rules:<br>
29If a package isn't installed, then it will be installed.<br>
30If a package is installed and there isn't a later version available then it will be removed.<br>
31If a package is installed and a different version is available then it will be upgraded. (Note,
32I haven't yet found a way to determine if an available package is newer or older than the one
33currently installed so it is possible that a package may be downgraded).<br>
34As previously mentioned, a package can be explicitly removed by using the local server.<br><br>
35A couple of last notes, in the main window, the following may be useful:<br>
36If a package is installed then it will have (installed) after it.<br>
37If a different version is available then it will have a * after the package name.<br>
38You can view details of a package by tapping twice (quickly) on the package name (NOT the
39box next to the package name). This will show you a brief description of the package, the
40version installed (if it is installed), and the version available for download/installation
41(if a different on is available).<br><br><br>
42Well, hope you enjoy using this program. If you have any ideas/suggestions/ideas for improvements
43then please let me know at andy.qua@blueyonder.co.uk.<br><br>
44Thanks for using this.
45Andy.
46</p></qt>
47
48
49
diff --git a/noncore/settings/aqpkg/helpwindow.cpp b/noncore/settings/aqpkg/helpwindow.cpp
deleted file mode 100644
index 0302b3f..0000000
--- a/noncore/settings/aqpkg/helpwindow.cpp
+++ b/dev/null
@@ -1,95 +0,0 @@
1/***************************************************************************
2 helpwindow.cpp - description
3 -------------------
4 begin : Sun Sep 8 2002
5 copyright : (C) 2002 by Andy Qua
6 email : andy.qua@blueyonder.co.uk
7 ***************************************************************************/
8
9/***************************************************************************
10 * *
11 * This program is free software; you can redistribute it and/or modify *
12 * it under the terms of the GNU General Public License as published by *
13 * the Free Software Foundation; either version 2 of the License, or *
14 * (at your option) any later version. *
15 * *
16 ***************************************************************************/
17
18#include <qwidget.h>
19#include <qlayout.h>
20#include <qstring.h>
21#include <qtextview.h>
22
23#include "helpwindow.h"
24#include "global.h"
25
26
27#define HELP_TEXT \
28"<qt><h1>Documentation for AQPkg</h1><p> " \
29"AQPkg is a package manager for the Sharp Zaurus.<br><br> " \
30"Basic Instructions:<br><br> " \
31"On startup, you will be shown a window. The main part of the window is taken up " \
32"by a list box showing packages. The packages shown will depend on the server selected.<br><br> " \
33"The servers list contains network servers containing feeds of packages that can be downloaded " \
34"and installed onto your Zaurus. These are held in the file /etc/ipkg.conf and can be maintained " \
35"using AQPkg. In addition to the servers defined in ipkg.conf file, there are two other servers - " \
36"local and local IPKGs. These are not network servers but views of yours Zaurus.<br><br> " \
37"The local server shows all installed packages, and the local IPKGs server shows all ipks " \
38"that are stored on your Zaurus.<br><br> " \
39"On the local server, you can only remove packages. On the local IPKGs server you can only " \
40"install and delete packages - removing installed packages is currently not working. On all other " \
41"servers you can install, uninstall, upgrade and download packages.<br><br> " \
42"To get the latest package list for a server (or refresh the view), select the server you " \
43"wish to update and click the Refresh List button.<br><br> " \
44"To download a package from a remote server, select the server (any except local and local IPKGs), " \
45"then select the package(s) you wish to download (by tapping in the box next to the package " \
46"name so that a tick appears in the box) and click the Download button. Enter the path where you " \
47"want the package to be downloaded to and click OK to download the package.<br><br> " \
48"To install, upgrade or remove a package select the packages you wish to install and click the Apply " \
49"button. You will then be shown a dialog which allows you to select which destination you wish " \
50"to install the package to, which packages will be installed, removed and upgraded. You can also " \
51"set various options. (for the moment, see the documentation for IPKG for more details on these " \
52"options). To start the process, click Start. This will perform the necessary operations and " \
53"will show you what is happening. Once everything has completed click the Close button.<br><br> " \
54"Note: Currently, the operation to perform for a package is automatically decided based on the " \
55"following rules:<br><br> " \
56" If a package isn't installed, then it will be installed.<br> " \
57" If a package is installed and there isn't a later version available then it will be removed.<br> " \
58" If a package is installed and a different version is available then it will be upgraded. (Note, " \
59"I haven't yet found a way to determine if an available package is newer or older than the one " \
60"currently installed so it is possible that a package may be downgraded).<br><br> " \
61"As previously mentioned, a package can be explicitly removed by using the local server.<br><br> " \
62"A couple of last notes, in the main window, the following may be useful:<br><br> " \
63"If a package is installed then it will have (installed) after it.<br><br> " \
64"If a different version is available then it will have a * after the package name.<br><br> " \
65"You can view details of a package by tapping twice (quickly) on the package name (NOT the " \
66"box next to the package name). This will show you a brief description of the package, the " \
67"version installed (if it is installed), and the version available for download or installation " \
68"(if a different on is available).<br><br> " \
69"Well, hope you enjoy using this program. If you have any ideas/suggestions/ideas for improvements " \
70"then please let me know at andy.qua@blueyonder.co.uk.<br><br> " \
71"Thanks for using this. " \
72"Andy. " \
73"</p></qt>"
74
75
76HelpWindow::HelpWindow( QWidget *parent, const char *name, bool modal, WFlags flags )
77 : QDialog( parent, name, modal, flags )
78{
79// resize( 230, 280 );
80
81 setCaption( "Help for AQPkg" );
82
83 QVBoxLayout *layout = new QVBoxLayout( this );
84 QString text = HELP_TEXT;;
85 QTextView *view = new QTextView( text, 0, this, "view" );
86 layout->insertSpacing( -1, 5 );
87 layout->insertWidget( -1, view );
88 layout->insertSpacing( -1, 5 );
89
90 showMaximized();
91}
92
93HelpWindow::~HelpWindow()
94{
95}
diff --git a/noncore/settings/aqpkg/helpwindow.h b/noncore/settings/aqpkg/helpwindow.h
deleted file mode 100644
index edc1b6e..0000000
--- a/noncore/settings/aqpkg/helpwindow.h
+++ b/dev/null
@@ -1,34 +0,0 @@
1/***************************************************************************
2 helpwindow.h - description
3 -------------------
4 begin : Sun Sep 8 2002
5 copyright : (C) 2002 by Andy Qua
6 email : andy.qua@blueyonder.co.uk
7 ***************************************************************************/
8
9/***************************************************************************
10 * *
11 * This program is free software; you can redistribute it and/or modify *
12 * it under the terms of the GNU General Public License as published by *
13 * the Free Software Foundation; either version 2 of the License, or *
14 * (at your option) any later version. *
15 * *
16 ***************************************************************************/
17
18#ifndef HELPWINDOW_H
19#define HELPWINDOW_H
20
21#include <qdialog.h>
22
23/**
24 *@author Andy Qua
25 */
26
27class HelpWindow : public QDialog
28{
29public:
30 HelpWindow( QWidget *parent = 0, const char *name = 0, bool modal = true, WFlags flags = 0 );
31 ~HelpWindow();
32};
33
34#endif
diff --git a/noncore/settings/aqpkg/mainwin.cpp b/noncore/settings/aqpkg/mainwin.cpp
index 8ae5815..392d04d 100644
--- a/noncore/settings/aqpkg/mainwin.cpp
+++ b/noncore/settings/aqpkg/mainwin.cpp
@@ -22,49 +22,48 @@
22#include <qpe/qpemenubar.h> 22#include <qpe/qpemenubar.h>
23#include <qpe/qpeapplication.h> 23#include <qpe/qpeapplication.h>
24#include <qpe/qpetoolbar.h> 24#include <qpe/qpetoolbar.h>
25#include <qpe/config.h> 25#include <qpe/config.h>
26#include <qpe/resource.h> 26#include <qpe/resource.h>
27 27
28#include <qaction.h> 28#include <qaction.h>
29#include <qcombobox.h> 29#include <qcombobox.h>
30#include <qfile.h> 30#include <qfile.h>
31#include <qlabel.h> 31#include <qlabel.h>
32#include <qlayout.h> 32#include <qlayout.h>
33#include <qlineedit.h> 33#include <qlineedit.h>
34#include <qlistview.h> 34#include <qlistview.h>
35#include <qmenubar.h> 35#include <qmenubar.h>
36#include <qmessagebox.h> 36#include <qmessagebox.h>
37#include <qpopupmenu.h> 37#include <qpopupmenu.h>
38#include <qprogressbar.h> 38#include <qprogressbar.h>
39#include <qtimer.h> 39#include <qtimer.h>
40#include <qwhatsthis.h> 40#include <qwhatsthis.h>
41#include <qwidgetstack.h> 41#include <qwidgetstack.h>
42 42
43#include "categoryfilterimpl.h" 43#include "categoryfilterimpl.h"
44#include "datamgr.h" 44#include "datamgr.h"
45#include "global.h" 45#include "global.h"
46#include "helpwindow.h"
47#include "inputdlg.h" 46#include "inputdlg.h"
48#include "ipkg.h" 47#include "ipkg.h"
49#include "installdlgimpl.h" 48#include "installdlgimpl.h"
50#include "letterpushbutton.h" 49#include "letterpushbutton.h"
51#include "mainwin.h" 50#include "mainwin.h"
52#include "settingsimpl.h" 51#include "settingsimpl.h"
53#include "utils.h" 52#include "utils.h"
54 53
55extern int compareVersions( const char *v1, const char *v2 ); 54extern int compareVersions( const char *v1, const char *v2 );
56 55
57MainWindow :: MainWindow() 56MainWindow :: MainWindow()
58 :QMainWindow( 0x0, 0x0, WStyle_ContextHelp ) 57 :QMainWindow( 0x0, 0x0, WStyle_ContextHelp )
59{ 58{
60 setCaption( tr( "AQPkg - Package Manager" ) ); 59 setCaption( tr( "AQPkg - Package Manager" ) );
61 60
62 // Create UI widgets 61 // Create UI widgets
63 initMainWidget(); 62 initMainWidget();
64 initProgressWidget(); 63 initProgressWidget();
65 64
66 // Build menu and tool bars 65 // Build menu and tool bars
67 setToolBarsMovable( FALSE ); 66 setToolBarsMovable( FALSE );
68 67
69 QPEToolBar *bar = new QPEToolBar( this ); 68 QPEToolBar *bar = new QPEToolBar( this );
70 bar->setHorizontalStretchable( TRUE ); 69 bar->setHorizontalStretchable( TRUE );
@@ -183,60 +182,48 @@ MainWindow :: MainWindow()
183 actionFindNext->setWhatsThis( tr( "Click here to find the next package name containing the text you are searching for." ) ); 182 actionFindNext->setWhatsThis( tr( "Click here to find the next package name containing the text you are searching for." ) );
184 connect( actionFindNext, SIGNAL( activated() ), this, SLOT( repeatFind() ) ); 183 connect( actionFindNext, SIGNAL( activated() ), this, SLOT( repeatFind() ) );
185 actionFindNext->addTo( popup ); 184 actionFindNext->addTo( popup );
186 actionFindNext->addTo( findBar ); 185 actionFindNext->addTo( findBar );
187 186
188 187
189 popup->insertSeparator(); 188 popup->insertSeparator();
190 189
191 a = new QAction( tr( "Quick Jump keypad" ), Resource::loadPixmap( "aqpkg/keyboard" ), QString::null, 0, this, 0 ); 190 a = new QAction( tr( "Quick Jump keypad" ), Resource::loadPixmap( "aqpkg/keyboard" ), QString::null, 0, this, 0 );
192 a->setWhatsThis( tr( "Click here to display/hide keypad to allow quick movement through the package list." ) ); 191 a->setWhatsThis( tr( "Click here to display/hide keypad to allow quick movement through the package list." ) );
193 connect( a, SIGNAL( activated() ), this, SLOT( displayJumpBar() ) ); 192 connect( a, SIGNAL( activated() ), this, SLOT( displayJumpBar() ) );
194 a->addTo( popup ); 193 a->addTo( popup );
195 194
196 mb->insertItem( tr( "View" ), popup ); 195 mb->insertItem( tr( "View" ), popup );
197 196
198 197
199 // Options menu 198 // Options menu
200 popup = new QPopupMenu( this ); 199 popup = new QPopupMenu( this );
201 200
202 a = new QAction( tr( "Configure" ), Resource::loadPixmap( "aqpkg/config" ), QString::null, 0, this, 0 ); 201 a = new QAction( tr( "Configure" ), Resource::loadPixmap( "aqpkg/config" ), QString::null, 0, this, 0 );
203 a->setWhatsThis( tr( "Click here to configure this application." ) ); 202 a->setWhatsThis( tr( "Click here to configure this application." ) );
204 connect( a, SIGNAL( activated() ), this, SLOT( displaySettings() ) ); 203 connect( a, SIGNAL( activated() ), this, SLOT( displaySettings() ) );
205 a->addTo( popup ); 204 a->addTo( popup );
206 205
207 popup->insertSeparator();
208
209 a = new QAction( tr( "Help" ), Resource::loadPixmap( "help_icon" ), QString::null, 0, this, 0 );
210 a->setWhatsThis( tr( "Click here for help." ) );
211 connect( a, SIGNAL( activated() ), this, SLOT( displayHelp() ) );
212 a->addTo( popup );
213
214 a = new QAction( tr( "About" ), Resource::loadPixmap( "UtilsIcon" ), QString::null, 0, this, 0 );
215 a->setWhatsThis( tr( "Click here for software version information." ) );
216 connect( a, SIGNAL( activated() ), this, SLOT( displayAbout() ) );
217 a->addTo( popup );
218
219 mb->insertItem( tr( "Options" ), popup ); 206 mb->insertItem( tr( "Options" ), popup );
220 207
221 // Finish find toolbar creation 208 // Finish find toolbar creation
222 a = new QAction( QString::null, Resource::loadPixmap( "close" ), QString::null, 0, this, 0 ); 209 a = new QAction( QString::null, Resource::loadPixmap( "close" ), QString::null, 0, this, 0 );
223 a->setWhatsThis( tr( "Click here to hide the find toolbar." ) ); 210 a->setWhatsThis( tr( "Click here to hide the find toolbar." ) );
224 connect( a, SIGNAL( activated() ), this, SLOT( hideFindBar() ) ); 211 connect( a, SIGNAL( activated() ), this, SLOT( hideFindBar() ) );
225 a->addTo( findBar ); 212 a->addTo( findBar );
226 findBar->hide(); 213 findBar->hide();
227 214
228 // Create widget stack and add UI widgets 215 // Create widget stack and add UI widgets
229 stack = new QWidgetStack( this ); 216 stack = new QWidgetStack( this );
230 stack->addWidget( progressWindow, 2 ); 217 stack->addWidget( progressWindow, 2 );
231 stack->addWidget( networkPkgWindow, 1 ); 218 stack->addWidget( networkPkgWindow, 1 );
232 setCentralWidget( stack ); 219 setCentralWidget( stack );
233 stack->raiseWidget( progressWindow ); 220 stack->raiseWidget( progressWindow );
234 221
235 // Delayed call to finish initialization 222 // Delayed call to finish initialization
236 QTimer::singleShot( 100, this, SLOT( init() ) ); 223 QTimer::singleShot( 100, this, SLOT( init() ) );
237} 224}
238 225
239MainWindow :: ~MainWindow() 226MainWindow :: ~MainWindow()
240{ 227{
241 delete mgr; 228 delete mgr;
242} 229}
@@ -332,93 +319,81 @@ void MainWindow :: setDocument( const QString &doc )
332 // Now set the check box of the selected package 319 // Now set the check box of the selected package
333 for ( QCheckListItem *item = (QCheckListItem *)packagesList->firstChild(); 320 for ( QCheckListItem *item = (QCheckListItem *)packagesList->firstChild();
334 item != 0 ; 321 item != 0 ;
335 item = (QCheckListItem *)item->nextSibling() ) 322 item = (QCheckListItem *)item->nextSibling() )
336 { 323 {
337 if ( item->text().startsWith( package ) ) 324 if ( item->text().startsWith( package ) )
338 { 325 {
339 item->setOn( true ); 326 item->setOn( true );
340 break; 327 break;
341 } 328 }
342 } 329 }
343} 330}
344*/ 331*/
345void MainWindow :: displaySettings() 332void MainWindow :: displaySettings()
346{ 333{
347 SettingsImpl *dlg = new SettingsImpl( mgr, this, "Settings", true ); 334 SettingsImpl *dlg = new SettingsImpl( mgr, this, "Settings", true );
348 if ( dlg->showDlg() ) 335 if ( dlg->showDlg() )
349 { 336 {
350 stack->raiseWidget( progressWindow ); 337 stack->raiseWidget( progressWindow );
351 updateData(); 338 updateData();
352 stack->raiseWidget( networkPkgWindow ); 339 stack->raiseWidget( networkPkgWindow );
353 } 340 }
354 delete dlg; 341 delete dlg;
355} 342}
356
357void MainWindow :: displayHelp()
358{
359 HelpWindow *dlg = new HelpWindow( this );
360 dlg->exec();
361 delete dlg;
362}
363 343
364void MainWindow :: displayFindBar() 344void MainWindow :: displayFindBar()
365{ 345{
366 findBar->show(); 346 findBar->show();
367 findEdit->setFocus(); 347 findEdit->setFocus();
368} 348}
369 349
370void MainWindow :: displayJumpBar() 350void MainWindow :: displayJumpBar()
371{ 351{
372 jumpBar->show(); 352 jumpBar->show();
373} 353}
374 354
375void MainWindow :: repeatFind() 355void MainWindow :: repeatFind()
376{ 356{
377 searchForPackage( findEdit->text() ); 357 searchForPackage( findEdit->text() );
378} 358}
379 359
380void MainWindow :: findPackage( const QString &text ) 360void MainWindow :: findPackage( const QString &text )
381{ 361{
382 actionFindNext->setEnabled( !text.isEmpty() ); 362 actionFindNext->setEnabled( !text.isEmpty() );
383 searchForPackage( text ); 363 searchForPackage( text );
384} 364}
385 365
386void MainWindow :: hideFindBar() 366void MainWindow :: hideFindBar()
387{ 367{
388 findBar->hide(); 368 findBar->hide();
389} 369}
390 370
391void MainWindow :: hideJumpBar() 371void MainWindow :: hideJumpBar()
392{ 372{
393 jumpBar->hide(); 373 jumpBar->hide();
394} 374}
395 375
396void MainWindow :: displayAbout()
397{
398 QMessageBox::about( this, tr( "About AQPkg" ), tr( VERSION_TEXT ) );
399}
400
401void MainWindow :: filterUninstalledPackages() 376void MainWindow :: filterUninstalledPackages()
402{ 377{
403 showUninstalledPkgs = actionUninstalled->isOn(); 378 showUninstalledPkgs = actionUninstalled->isOn();
404 if ( showUninstalledPkgs ) 379 if ( showUninstalledPkgs )
405 { 380 {
406 showInstalledPkgs = FALSE; 381 showInstalledPkgs = FALSE;
407 showUpgradedPkgs = FALSE; 382 showUpgradedPkgs = FALSE;
408 } 383 }
409 serverSelected( -1 ); 384 serverSelected( -1 );
410 385
411 actionInstalled->setOn( FALSE ); 386 actionInstalled->setOn( FALSE );
412 actionUpdated->setOn( FALSE ); 387 actionUpdated->setOn( FALSE );
413} 388}
414 389
415void MainWindow :: filterInstalledPackages() 390void MainWindow :: filterInstalledPackages()
416{ 391{
417 showInstalledPkgs = actionInstalled->isOn(); 392 showInstalledPkgs = actionInstalled->isOn();
418 if ( showInstalledPkgs ) 393 if ( showInstalledPkgs )
419 { 394 {
420 showUninstalledPkgs = FALSE; 395 showUninstalledPkgs = FALSE;
421 showUpgradedPkgs = FALSE; 396 showUpgradedPkgs = FALSE;
422 } 397 }
423 serverSelected( -1 ); 398 serverSelected( -1 );
424 399
diff --git a/noncore/settings/aqpkg/mainwin.h b/noncore/settings/aqpkg/mainwin.h
index db06e16..d75e5d2 100644
--- a/noncore/settings/aqpkg/mainwin.h
+++ b/noncore/settings/aqpkg/mainwin.h
@@ -82,56 +82,54 @@ private:
82 bool showJumpTo; 82 bool showJumpTo;
83 bool showUninstalledPkgs; 83 bool showUninstalledPkgs;
84 bool showInstalledPkgs; 84 bool showInstalledPkgs;
85 bool showUpgradedPkgs; 85 bool showUpgradedPkgs;
86 bool downloadEnabled; 86 bool downloadEnabled;
87 87
88 void initMainWidget(); 88 void initMainWidget();
89 void updateData(); 89 void updateData();
90 void serverSelected( int index, bool showProgress ); 90 void serverSelected( int index, bool showProgress );
91 void searchForPackage( const QString & ); 91 void searchForPackage( const QString & );
92 bool filterByCategory( bool val ); 92 bool filterByCategory( bool val );
93 void downloadSelectedPackages(); 93 void downloadSelectedPackages();
94 void downloadRemotePackage(); 94 void downloadRemotePackage();
95 InstallData *dealWithItem( QCheckListItem *item ); 95 InstallData *dealWithItem( QCheckListItem *item );
96 96
97 // Progress widget 97 // Progress widget
98 QWidget *progressWindow; 98 QWidget *progressWindow;
99 QLabel *m_status; 99 QLabel *m_status;
100 QProgressBar *m_progress; 100 QProgressBar *m_progress;
101 101
102 void initProgressWidget(); 102 void initProgressWidget();
103 103
104public slots: 104public slots:
105// void setDocument( const QString &doc ); 105// void setDocument( const QString &doc );
106 void displayHelp();
107 void displayFindBar(); 106 void displayFindBar();
108 void displayJumpBar(); 107 void displayJumpBar();
109 void repeatFind(); 108 void repeatFind();
110 void findPackage( const QString & ); 109 void findPackage( const QString & );
111 void hideFindBar(); 110 void hideFindBar();
112 void hideJumpBar(); 111 void hideJumpBar();
113 void displayAbout();
114 void displaySettings(); 112 void displaySettings();
115 void filterUninstalledPackages(); 113 void filterUninstalledPackages();
116 void filterInstalledPackages(); 114 void filterInstalledPackages();
117 void filterUpgradedPackages(); 115 void filterUpgradedPackages();
118 void filterCategory(); 116 void filterCategory();
119 bool setFilterCategory(); 117 bool setFilterCategory();
120 void raiseMainWidget(); 118 void raiseMainWidget();
121 void raiseProgressWidget(); 119 void raiseProgressWidget();
122 void enableUpgrade( bool ); 120 void enableUpgrade( bool );
123 void enableDownload( bool ); 121 void enableDownload( bool );
124 void reloadData( InstallDlgImpl * ); 122 void reloadData( InstallDlgImpl * );
125 123
126private slots: 124private slots:
127 void init(); 125 void init();
128 void setProgressSteps( int ); 126 void setProgressSteps( int );
129 void setProgressMessage( const QString & ); 127 void setProgressMessage( const QString & );
130 void updateProgress( int ); 128 void updateProgress( int );
131 void serverSelected( int index ); 129 void serverSelected( int index );
132 void updateServer(); 130 void updateServer();
133 void upgradePackages(); 131 void upgradePackages();
134 void downloadPackage(); 132 void downloadPackage();
135 void applyChanges(); 133 void applyChanges();
136 void letterPushed( QString t ); 134 void letterPushed( QString t );
137}; 135};