-rw-r--r-- | noncore/settings/packagemanager/ChangeLog | 8 | ||||
-rw-r--r-- | noncore/settings/packagemanager/README | 2 | ||||
-rw-r--r-- | noncore/settings/packagemanager/TODO | 18 | ||||
-rw-r--r-- | noncore/settings/packagemanager/opie-packagemanager.control | 2 | ||||
-rw-r--r-- | noncore/settings/packagemanager/packageinfodlg.cpp | 27 | ||||
-rw-r--r-- | noncore/settings/packagemanager/packageinfodlg.h | 45 |
6 files changed, 55 insertions, 47 deletions
diff --git a/noncore/settings/packagemanager/ChangeLog b/noncore/settings/packagemanager/ChangeLog index 7799136..c776ce5 100644 --- a/noncore/settings/packagemanager/ChangeLog +++ b/noncore/settings/packagemanager/ChangeLog | |||
@@ -1,4 +1,12 @@ | |||
1 | 2004-12-21 Dan Williams <drw@handhelds.org> | ||
2 | |||
3 | * Released version 0.6.0 | ||
4 | * Added support for Ipkg 'src/gz' feeds | ||
5 | * Improve server and destination tabs UI's in configuration dialog | ||
6 | * Fix app linking to link all dependent packages as well as selected packages | ||
7 | * Hide 'Retrive File List' button once list is retrieved in Package Info dialog | ||
8 | |||
1 | 2004-11-18 Dan Williams <drw@handhelds.org> | 9 | 2004-11-18 Dan Williams <drw@handhelds.org> |
2 | 10 | ||
3 | * Released version 0.5.0 | 11 | * Released version 0.5.0 |
4 | * All v1.0 functionality implemented | 12 | * All v1.0 functionality implemented |
diff --git a/noncore/settings/packagemanager/README b/noncore/settings/packagemanager/README index c34a6af..ff6d113 100644 --- a/noncore/settings/packagemanager/README +++ b/noncore/settings/packagemanager/README | |||
@@ -1,9 +1,9 @@ | |||
1 | /************************************************************************ | 1 | /************************************************************************ |
2 | /* | 2 | /* |
3 | /* Opie - Package Manager | 3 | /* Opie - Package Manager |
4 | /* ======================== | 4 | /* ======================== |
5 | /* Version 0.5.0 | 5 | /* Version 0.6.0 |
6 | /* | 6 | /* |
7 | /* A package management client for Opie | 7 | /* A package management client for Opie |
8 | /* | 8 | /* |
9 | /************************************************************************ | 9 | /************************************************************************ |
diff --git a/noncore/settings/packagemanager/TODO b/noncore/settings/packagemanager/TODO index 265beda..744ad95 100644 --- a/noncore/settings/packagemanager/TODO +++ b/noncore/settings/packagemanager/TODO | |||
@@ -1,25 +1,17 @@ | |||
1 | /************************************************************************ | 1 | /************************************************************************ |
2 | /* | 2 | /* |
3 | /* Opie - Package Manager | 3 | /* Opie - Package Manager |
4 | /* ======================== | 4 | /* ======================== |
5 | /* Version 0.5.0 | 5 | /* Version 0.6.0 |
6 | /* | 6 | /* |
7 | /* A package management client for Opie | 7 | /* A package management client for Opie |
8 | /* | 8 | /* |
9 | /************************************************************************ | 9 | /************************************************************************ |
10 | 10 | ||
11 | ----------------------------------------------- | 11 | ----------------------------------------------- |
12 | To-do for Opie-PackageManager - November, 2004 | 12 | To-do for Opie-PackageManager - December, 2004 |
13 | ----------------------------------------------- | 13 | ----------------------------------------------- |
14 | 14 | ||
15 | ====================== | 15 | 1. Move ipkg-link code from InstallDlg to OIpkg |
16 | = Current release = | 16 | 2. Code ipkg-link logic directly in OIpkg |
17 | ====================== | 17 | 3. Re-work package download dialog |
18 | |||
19 | 1. Re-work package download dialog | ||
20 | |||
21 | ====================== | ||
22 | = Future releases = | ||
23 | ====================== | ||
24 | |||
25 | 1. Re-work server and destination tabs in configuration dialog \ No newline at end of file | ||
diff --git a/noncore/settings/packagemanager/opie-packagemanager.control b/noncore/settings/packagemanager/opie-packagemanager.control index aacd0ca..cdf419c 100644 --- a/noncore/settings/packagemanager/opie-packagemanager.control +++ b/noncore/settings/packagemanager/opie-packagemanager.control | |||
@@ -6,5 +6,5 @@ Depends: task-opie-minimal, libopiecore2, libopieui2, libipkg (>=0.99.120), ipkg | |||
6 | Replaces: packagemanager | 6 | Replaces: packagemanager |
7 | Architecture: arm | 7 | Architecture: arm |
8 | Maintainer: Dan Williams (drw@handhelds.org) | 8 | Maintainer: Dan Williams (drw@handhelds.org) |
9 | Description: Opie package management client | 9 | Description: Opie package management client |
10 | Version: 0.5.0$EXTRAVERSION | 10 | Version: 0.6.0$EXTRAVERSION |
diff --git a/noncore/settings/packagemanager/packageinfodlg.cpp b/noncore/settings/packagemanager/packageinfodlg.cpp index c5924fd..5f72a67 100644 --- a/noncore/settings/packagemanager/packageinfodlg.cpp +++ b/noncore/settings/packagemanager/packageinfodlg.cpp | |||
@@ -39,12 +39,13 @@ _;:, .> :=|. This file is free software; you can | |||
39 | #include <qpushbutton.h> | 39 | #include <qpushbutton.h> |
40 | #include <qwhatsthis.h> | 40 | #include <qwhatsthis.h> |
41 | 41 | ||
42 | PackageInfoDlg::PackageInfoDlg( QWidget *parent, OPackageManager *pm, const QString &package ) | 42 | PackageInfoDlg::PackageInfoDlg( QWidget *parent, OPackageManager *pm, const QString &package ) |
43 | : QWidget( 0x0 ) | 43 | : QWidget( 0l ) |
44 | , m_packman( pm ) | 44 | , m_packman( pm ) |
45 | , m_information( this ) | 45 | , m_information( this ) |
46 | , m_files( this ) | 46 | , m_files( this ) |
47 | , m_retrieveFiles( 0l ) | ||
47 | { | 48 | { |
48 | // Initialize UI | 49 | // Initialize UI |
49 | if ( parent ) | 50 | if ( parent ) |
50 | parent->setCaption( package ); | 51 | parent->setCaption( package ); |
@@ -87,20 +88,23 @@ PackageInfoDlg::PackageInfoDlg( QWidget *parent, OPackageManager *pm, const QStr | |||
87 | m_files.reparent( filesWidget, QPoint( 0, 0 ) ); | 88 | m_files.reparent( filesWidget, QPoint( 0, 0 ) ); |
88 | m_files.setReadOnly( true ); | 89 | m_files.setReadOnly( true ); |
89 | filesLayout->addWidget( &m_files ); | 90 | filesLayout->addWidget( &m_files ); |
90 | 91 | ||
91 | QPushButton *btn = new QPushButton( Resource::loadPixmap( "packagemanager/apply" ), | 92 | // If file list is already cached, display |
93 | if ( !m_package->files().isNull() ) | ||
94 | m_files.setText( m_package->files() ); | ||
95 | else | ||
96 | { | ||
97 | m_retrieveFiles = new QPushButton( Resource::loadPixmap( "packagemanager/apply" ), | ||
92 | tr( "Retrieve file list" ), filesWidget ); | 98 | tr( "Retrieve file list" ), filesWidget ); |
93 | QWhatsThis::add( btn, tr( "Tap here to retrieve list of files contained in this package." ) ); | 99 | QWhatsThis::add( m_retrieveFiles, tr( "Tap here to retrieve list of files contained in this package." ) ); |
94 | filesLayout->addWidget( btn ); | 100 | filesLayout->addWidget( m_retrieveFiles ); |
95 | connect( btn, SIGNAL(clicked()), this, SLOT(slotBtnFileScan()) ); | 101 | connect( m_retrieveFiles, SIGNAL(clicked()), this, SLOT(slotBtnFileScan()) ); |
96 | tabWidget->addTab( filesWidget, "binary", tr( "File list" ) ); | 102 | } |
97 | 103 | ||
104 | tabWidget->addTab( filesWidget, "binary", tr( "File list" ) ); | ||
98 | tabWidget->setCurrentTab( tr( "Information" ) ); | 105 | tabWidget->setCurrentTab( tr( "Information" ) ); |
99 | 106 | ||
100 | // If file list is already cached, display | ||
101 | if ( !m_package->files().isNull() ) | ||
102 | m_files.setText( m_package->files() ); | ||
103 | } | 107 | } |
104 | else | 108 | else |
105 | m_files.hide(); | 109 | m_files.hide(); |
106 | } | 110 | } |
@@ -114,9 +118,9 @@ PackageInfoDlg::~PackageInfoDlg() | |||
114 | if ( !m_information.text().isNull() ) | 118 | if ( !m_information.text().isNull() ) |
115 | m_package->setInformation( m_information.text() ); | 119 | m_package->setInformation( m_information.text() ); |
116 | 120 | ||
117 | // Cache package file list | 121 | // Cache package file list |
118 | if ( !m_files.text().isNull() ) | 122 | if ( !m_files.text().isEmpty() ) |
119 | m_package->setFiles( m_files.text() ); | 123 | m_package->setFiles( m_files.text() ); |
120 | } | 124 | } |
121 | 125 | ||
122 | void PackageInfoDlg::slotBtnFileScan() | 126 | void PackageInfoDlg::slotBtnFileScan() |
@@ -124,8 +128,11 @@ void PackageInfoDlg::slotBtnFileScan() | |||
124 | m_files.clear(); | 128 | m_files.clear(); |
125 | 129 | ||
126 | QStringList list( m_package->name() ); | 130 | QStringList list( m_package->name() ); |
127 | m_packman->executeCommand( OPackage::Files, list, QString::null, this, SLOT(slotFiles(char*)), true ); | 131 | m_packman->executeCommand( OPackage::Files, list, QString::null, this, SLOT(slotFiles(char*)), true ); |
132 | |||
133 | if ( m_retrieveFiles ) | ||
134 | m_retrieveFiles->hide(); | ||
128 | } | 135 | } |
129 | 136 | ||
130 | void PackageInfoDlg::slotInfo( char *info ) | 137 | void PackageInfoDlg::slotInfo( char *info ) |
131 | { | 138 | { |
diff --git a/noncore/settings/packagemanager/packageinfodlg.h b/noncore/settings/packagemanager/packageinfodlg.h index ec031e1..d1830de 100644 --- a/noncore/settings/packagemanager/packageinfodlg.h +++ b/noncore/settings/packagemanager/packageinfodlg.h | |||
@@ -1,28 +1,28 @@ | |||
1 | /* | 1 | /* |
2 | This file is part of the OPIE Project | 2 | This file is part of the OPIE Project |
3 | 3 | ||
4 | =. Copyright (c) 2003 Dan Williams <drw@handhelds.org> | 4 | =. Copyright (c) 2003 Dan Williams <drw@handhelds.org> |
5 | .=l. | 5 | .=l. |
6 | .>+-= | 6 | .>+-= |
7 | _;:, .> :=|. This file is free software; you can | 7 | _;:, .> :=|. This file is free software; you can |
8 | .> <`_, > . <= redistribute it and/or modify it under | 8 | .> <`_, > . <= redistribute it and/or modify it under |
9 | :`=1 )Y*s>-.-- : the terms of the GNU General Public | 9 | :`=1 )Y*s>-.-- : the terms of the GNU General Public |
10 | .="- .-=="i, .._ License as published by the Free Software | 10 | .="- .-=="i, .._ License as published by the Free Software |
11 | - . .-<_> .<> Foundation; either version 2 of the License, | 11 | - . .-<_> .<> Foundation; either version 2 of the License, |
12 | ._= =} : or (at your option) any later version. | 12 | ._= =} : or (at your option) any later version. |
13 | .%`+i> _;_. | 13 | .%`+i> _;_. |
14 | .i_,=:_. -<s. This file is distributed in the hope that | 14 | .i_,=:_. -<s. This file is distributed in the hope that |
15 | + . -:. = it will be useful, but WITHOUT ANY WARRANTY; | 15 | + . -:. = it will be useful, but WITHOUT ANY WARRANTY; |
16 | : .. .:, . . . without even the implied warranty of | 16 | : .. .:, . . . without even the implied warranty of |
17 | =_ + =;=|` MERCHANTABILITY or FITNESS FOR A | 17 | =_ + =;=|` MERCHANTABILITY or FITNESS FOR A |
18 | _.=:. : :=>`: PARTICULAR PURPOSE. See the GNU General | 18 | _.=:. : :=>`: PARTICULAR PURPOSE. See the GNU General |
19 | ..}^=.= = ; Public License for more details. | 19 | ..}^=.= = ; Public License for more details. |
20 | ++= -. .` .: | 20 | ++= -. .` .: |
21 | : = ...= . :.=- You should have received a copy of the GNU | 21 | : = ...= . :.=- You should have received a copy of the GNU |
22 | -. .:....=;==+<; General Public License along with this file; | 22 | -. .:....=;==+<; General Public License along with this file; |
23 | -_. . . )=. = see the file COPYING. If not, write to the | 23 | -_. . . )=. = see the file COPYING. If not, write to the |
24 | -- :-=` Free Software Foundation, Inc., | 24 | -- :-=` Free Software Foundation, Inc., |
25 | 59 Temple Place - Suite 330, | 25 | 59 Temple Place - Suite 330, |
26 | Boston, MA 02111-1307, USA. | 26 | Boston, MA 02111-1307, USA. |
27 | 27 | ||
28 | */ | 28 | */ |
@@ -44,9 +44,9 @@ class PackageInfoDlg : public QWidget | |||
44 | { | 44 | { |
45 | Q_OBJECT | 45 | Q_OBJECT |
46 | 46 | ||
47 | public: | 47 | public: |
48 | PackageInfoDlg( QWidget *parent = 0x0, OPackageManager *pm = 0x0, const QString &package = QString::null ); | 48 | PackageInfoDlg( QWidget *parent = 0l, OPackageManager *pm = 0l, const QString &package = QString::null ); |
49 | ~PackageInfoDlg(); | 49 | ~PackageInfoDlg(); |
50 | 50 | ||
51 | private: | 51 | private: |
52 | OPackageManager *m_packman; // Pointer to application instance of package manager | 52 | OPackageManager *m_packman; // Pointer to application instance of package manager |
@@ -54,8 +54,9 @@ private: | |||
54 | 54 | ||
55 | // UI controls | 55 | // UI controls |
56 | QMultiLineEdit m_information; // Multi-line edit to display package information | 56 | QMultiLineEdit m_information; // Multi-line edit to display package information |
57 | QMultiLineEdit m_files; // Multi-line edit to display package file list | 57 | QMultiLineEdit m_files; // Multi-line edit to display package file list |
58 | QPushButton *m_retrieveFiles; // Push button to retrieve file list | ||
58 | 59 | ||
59 | private slots: | 60 | private slots: |
60 | void slotBtnFileScan(); | 61 | void slotBtnFileScan(); |
61 | void slotInfo( char *info ); | 62 | void slotInfo( char *info ); |