author | drw <drw> | 2004-12-21 20:14:18 (UTC) |
---|---|---|
committer | drw <drw> | 2004-12-21 20:14:18 (UTC) |
commit | 1eaf5e3e1f523e5db31d9d9299169b2e278a4568 (patch) (unidiff) | |
tree | dc825b52f075d786f65f845ce2179f732da5c45c | |
parent | 2e21be2e93866511f55e2a200514b3ce15b14791 (diff) | |
download | opie-1eaf5e3e1f523e5db31d9d9299169b2e278a4568.zip opie-1eaf5e3e1f523e5db31d9d9299169b2e278a4568.tar.gz opie-1eaf5e3e1f523e5db31d9d9299169b2e278a4568.tar.bz2 |
Hide Retrive File List button once list is retrieved in Package Info dialog, bump version up to 0.6.0, update ChangeLog/Todo/etc.
-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 +1,9 @@ | |||
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> |
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 | |||
@@ -4,3 +4,3 @@ | |||
4 | /* ======================== | 4 | /* ======================== |
5 | /* Version 0.5.0 | 5 | /* Version 0.6.0 |
6 | /* | 6 | /* |
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 | |||
@@ -4,3 +4,3 @@ | |||
4 | /* ======================== | 4 | /* ======================== |
5 | /* Version 0.5.0 | 5 | /* Version 0.6.0 |
6 | /* | 6 | /* |
@@ -11,15 +11,7 @@ | |||
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 | |||
@@ -9,2 +9,2 @@ 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 | |||
@@ -42,3 +42,3 @@ _;:, .> :=|. This file is free software; you can | |||
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 ) |
@@ -46,2 +46,3 @@ PackageInfoDlg::PackageInfoDlg( QWidget *parent, OPackageManager *pm, const QStr | |||
46 | , m_files( this ) | 46 | , m_files( this ) |
47 | , m_retrieveFiles( 0l ) | ||
47 | { | 48 | { |
@@ -90,14 +91,17 @@ PackageInfoDlg::PackageInfoDlg( QWidget *parent, OPackageManager *pm, const QStr | |||
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 | } |
@@ -117,3 +121,3 @@ PackageInfoDlg::~PackageInfoDlg() | |||
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() ); |
@@ -127,2 +131,5 @@ void PackageInfoDlg::slotBtnFileScan() | |||
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 | } |
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,25 +1,25 @@ | |||
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, |
@@ -47,3 +47,3 @@ class PackageInfoDlg : public QWidget | |||
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(); |
@@ -57,2 +57,3 @@ private: | |||
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 | ||