summaryrefslogtreecommitdiff
authordrw <drw>2003-03-04 01:15:19 (UTC)
committer drw <drw>2003-03-04 01:15:19 (UTC)
commit7cf53b4030437bdbd405b8b16684ba9f68e2891d (patch) (side-by-side diff)
tree5dd4474a127422a837f886b83947ab494806225e
parentc0045eaf96fc06316bfab1ac2f5c4fade050c088 (diff)
downloadopie-7cf53b4030437bdbd405b8b16684ba9f68e2891d.zip
opie-7cf53b4030437bdbd405b8b16684ba9f68e2891d.tar.gz
opie-7cf53b4030437bdbd405b8b16684ba9f68e2891d.tar.bz2
Remove AQPkg's own help window, use standard help system
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
@@ -6,33 +6,31 @@ HEADERS = global.h \
settingsimpl.h \
ipkg.h \
package.h \
installdlgimpl.h \
instoptionsimpl.h \
destination.h \
utils.h \
server.h \
- helpwindow.h \
letterpushbutton.h \
inputdlg.h \
categoryfilterimpl.h
SOURCES = mainwin.cpp \
datamgr.cpp \
mem.cpp \
settingsimpl.cpp \
ipkg.cpp \
main.cpp \
package.cpp \
installdlgimpl.cpp \
instoptionsimpl.cpp \
destination.cpp \
utils.cpp \
server.cpp \
- helpwindow.cpp \
letterpushbutton.cpp \
inputdlg.cpp \
version.cpp \
categoryfilterimpl.cpp
INTERFACES =
TARGET = aqpkg
INCLUDEPATH += $(OPIEDIR)/include
DEPENDPATH += $(OPIEDIR)/include
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 @@
-<qt><h1>Documentation for AQPkg</h1><p>
-AQPkg is a package manager for the Sharp Zaurus.<br>
-Basic Instructions:<br>
-On startup, you will be shown a window. The main part of the window is taken up
-by a list box showing packages. The packages shown will depend on the server selected.<br>
-The servers list contains network servers containing feeds of packages that can be downloaded
-and installed onto your Zaurus. These are held in the file /etc/ipkg.conf and can be maintained
-using AQPkg. In addition to the servers defined in ipkg.conf file, there are two other servers -
-local and local IPKGs. These are not network servers but views of yours Zaurus.<br>
-The local server shows all installed packages, and the local IPKGs server shows all ipks
-that are stored on your Zaurus.<br>
-On the local server, you can only remove packages. On the local IPKGs server you can only
-install and delete packages - removing installed packages is currently not working. On all other
-servers you can install, uninstall, upgrade and download packages.<br>
-To get the latest package list for a server (or refresh the view), select the server you
-wish to update and click the Refresh List button.<br>
-To download a package from a remote server, select the server (any except local and local IPKGs),
-then select the package(s) you wish to download (by tapping in the box next to the package
-name so that a tick appears in the box) and click the Download button. Enter the path where you
-want the package to be downloaded to and click OK to download the package.<br>
-To install, upgrade or remove a package select the packages you wish to install and click the Apply
-button. You will then be shown a dialog which allows you to select which destination you wish
-to install the package to, which packages will be installed, removed and upgraded. You can also
-set various options. (for the moment, see the documentation for IPKG for more details on these
-options). To start the process, click Start. This will perform the necessary operations and
-will show you what is happening. Once everything has completed click the Close button.<br>
-Note: Currently, the operation to perform for a package is automatically decided based on the
-following rules:<br>
-If a package isn't installed, then it will be installed.<br>
-If a package is installed and there isn't a later version available then it will be removed.<br>
-If a package is installed and a different version is available then it will be upgraded. (Note,
-I haven't yet found a way to determine if an available package is newer or older than the one
-currently installed so it is possible that a package may be downgraded).<br>
-As previously mentioned, a package can be explicitly removed by using the local server.<br><br>
-A couple of last notes, in the main window, the following may be useful:<br>
-If a package is installed then it will have (installed) after it.<br>
-If a different version is available then it will have a * after the package name.<br>
-You can view details of a package by tapping twice (quickly) on the package name (NOT the
-box next to the package name). This will show you a brief description of the package, the
-version installed (if it is installed), and the version available for download/installation
-(if a different on is available).<br><br><br>
-Well, hope you enjoy using this program. If you have any ideas/suggestions/ideas for improvements
-then please let me know at andy.qua@blueyonder.co.uk.<br><br>
-Thanks for using this.
-Andy.
-</p></qt>
-
-
-
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 @@
-/***************************************************************************
- helpwindow.cpp - description
- -------------------
- begin : Sun Sep 8 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 <qwidget.h>
-#include <qlayout.h>
-#include <qstring.h>
-#include <qtextview.h>
-
-#include "helpwindow.h"
-#include "global.h"
-
-
-#define HELP_TEXT \
-"<qt><h1>Documentation for AQPkg</h1><p> " \
-"AQPkg is a package manager for the Sharp Zaurus.<br><br> " \
-"Basic Instructions:<br><br> " \
-"On startup, you will be shown a window. The main part of the window is taken up " \
-"by a list box showing packages. The packages shown will depend on the server selected.<br><br> " \
-"The servers list contains network servers containing feeds of packages that can be downloaded " \
-"and installed onto your Zaurus. These are held in the file /etc/ipkg.conf and can be maintained " \
-"using AQPkg. In addition to the servers defined in ipkg.conf file, there are two other servers - " \
-"local and local IPKGs. These are not network servers but views of yours Zaurus.<br><br> " \
-"The local server shows all installed packages, and the local IPKGs server shows all ipks " \
-"that are stored on your Zaurus.<br><br> " \
-"On the local server, you can only remove packages. On the local IPKGs server you can only " \
-"install and delete packages - removing installed packages is currently not working. On all other " \
-"servers you can install, uninstall, upgrade and download packages.<br><br> " \
-"To get the latest package list for a server (or refresh the view), select the server you " \
-"wish to update and click the Refresh List button.<br><br> " \
-"To download a package from a remote server, select the server (any except local and local IPKGs), " \
-"then select the package(s) you wish to download (by tapping in the box next to the package " \
-"name so that a tick appears in the box) and click the Download button. Enter the path where you " \
-"want the package to be downloaded to and click OK to download the package.<br><br> " \
-"To install, upgrade or remove a package select the packages you wish to install and click the Apply " \
-"button. You will then be shown a dialog which allows you to select which destination you wish " \
-"to install the package to, which packages will be installed, removed and upgraded. You can also " \
-"set various options. (for the moment, see the documentation for IPKG for more details on these " \
-"options). To start the process, click Start. This will perform the necessary operations and " \
-"will show you what is happening. Once everything has completed click the Close button.<br><br> " \
-"Note: Currently, the operation to perform for a package is automatically decided based on the " \
-"following rules:<br><br> " \
-" If a package isn't installed, then it will be installed.<br> " \
-" If a package is installed and there isn't a later version available then it will be removed.<br> " \
-" If a package is installed and a different version is available then it will be upgraded. (Note, " \
-"I haven't yet found a way to determine if an available package is newer or older than the one " \
-"currently installed so it is possible that a package may be downgraded).<br><br> " \
-"As previously mentioned, a package can be explicitly removed by using the local server.<br><br> " \
-"A couple of last notes, in the main window, the following may be useful:<br><br> " \
-"If a package is installed then it will have (installed) after it.<br><br> " \
-"If a different version is available then it will have a * after the package name.<br><br> " \
-"You can view details of a package by tapping twice (quickly) on the package name (NOT the " \
-"box next to the package name). This will show you a brief description of the package, the " \
-"version installed (if it is installed), and the version available for download or installation " \
-"(if a different on is available).<br><br> " \
-"Well, hope you enjoy using this program. If you have any ideas/suggestions/ideas for improvements " \
-"then please let me know at andy.qua@blueyonder.co.uk.<br><br> " \
-"Thanks for using this. " \
-"Andy. " \
-"</p></qt>"
-
-
-HelpWindow::HelpWindow( QWidget *parent, const char *name, bool modal, WFlags flags )
- : QDialog( parent, name, modal, flags )
-{
-// resize( 230, 280 );
-
- setCaption( "Help for AQPkg" );
-
- QVBoxLayout *layout = new QVBoxLayout( this );
- QString text = HELP_TEXT;;
- QTextView *view = new QTextView( text, 0, this, "view" );
- layout->insertSpacing( -1, 5 );
- layout->insertWidget( -1, view );
- layout->insertSpacing( -1, 5 );
-
- showMaximized();
-}
-
-HelpWindow::~HelpWindow()
-{
-}
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 @@
-/***************************************************************************
- helpwindow.h - description
- -------------------
- begin : Sun Sep 8 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 HELPWINDOW_H
-#define HELPWINDOW_H
-
-#include <qdialog.h>
-
-/**
- *@author Andy Qua
- */
-
-class HelpWindow : public QDialog
-{
-public:
- HelpWindow( QWidget *parent = 0, const char *name = 0, bool modal = true, WFlags flags = 0 );
- ~HelpWindow();
-};
-
-#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
@@ -38,17 +38,16 @@
#include <qprogressbar.h>
#include <qtimer.h>
#include <qwhatsthis.h>
#include <qwidgetstack.h>
#include "categoryfilterimpl.h"
#include "datamgr.h"
#include "global.h"
-#include "helpwindow.h"
#include "inputdlg.h"
#include "ipkg.h"
#include "installdlgimpl.h"
#include "letterpushbutton.h"
#include "mainwin.h"
#include "settingsimpl.h"
#include "utils.h"
@@ -199,28 +198,16 @@ MainWindow :: MainWindow()
// Options menu
popup = new QPopupMenu( this );
a = new QAction( tr( "Configure" ), Resource::loadPixmap( "aqpkg/config" ), QString::null, 0, this, 0 );
a->setWhatsThis( tr( "Click here to configure this application." ) );
connect( a, SIGNAL( activated() ), this, SLOT( displaySettings() ) );
a->addTo( popup );
- popup->insertSeparator();
-
- a = new QAction( tr( "Help" ), Resource::loadPixmap( "help_icon" ), QString::null, 0, this, 0 );
- a->setWhatsThis( tr( "Click here for help." ) );
- connect( a, SIGNAL( activated() ), this, SLOT( displayHelp() ) );
- a->addTo( popup );
-
- a = new QAction( tr( "About" ), Resource::loadPixmap( "UtilsIcon" ), QString::null, 0, this, 0 );
- a->setWhatsThis( tr( "Click here for software version information." ) );
- connect( a, SIGNAL( activated() ), this, SLOT( displayAbout() ) );
- a->addTo( popup );
-
mb->insertItem( tr( "Options" ), popup );
// Finish find toolbar creation
a = new QAction( QString::null, Resource::loadPixmap( "close" ), QString::null, 0, this, 0 );
a->setWhatsThis( tr( "Click here to hide the find toolbar." ) );
connect( a, SIGNAL( activated() ), this, SLOT( hideFindBar() ) );
a->addTo( findBar );
findBar->hide();
@@ -348,23 +335,16 @@ void MainWindow :: displaySettings()
if ( dlg->showDlg() )
{
stack->raiseWidget( progressWindow );
updateData();
stack->raiseWidget( networkPkgWindow );
}
delete dlg;
}
-
-void MainWindow :: displayHelp()
-{
- HelpWindow *dlg = new HelpWindow( this );
- dlg->exec();
- delete dlg;
-}
void MainWindow :: displayFindBar()
{
findBar->show();
findEdit->setFocus();
}
void MainWindow :: displayJumpBar()
@@ -388,21 +368,16 @@ void MainWindow :: hideFindBar()
findBar->hide();
}
void MainWindow :: hideJumpBar()
{
jumpBar->hide();
}
-void MainWindow :: displayAbout()
-{
- QMessageBox::about( this, tr( "About AQPkg" ), tr( VERSION_TEXT ) );
-}
-
void MainWindow :: filterUninstalledPackages()
{
showUninstalledPkgs = actionUninstalled->isOn();
if ( showUninstalledPkgs )
{
showInstalledPkgs = FALSE;
showUpgradedPkgs = FALSE;
}
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
@@ -98,24 +98,22 @@ private:
QWidget *progressWindow;
QLabel *m_status;
QProgressBar *m_progress;
void initProgressWidget();
public slots:
// void setDocument( const QString &doc );
- void displayHelp();
void displayFindBar();
void displayJumpBar();
void repeatFind();
void findPackage( const QString & );
void hideFindBar();
void hideJumpBar();
- void displayAbout();
void displaySettings();
void filterUninstalledPackages();
void filterInstalledPackages();
void filterUpgradedPackages();
void filterCategory();
bool setFilterCategory();
void raiseMainWidget();
void raiseProgressWidget();