summaryrefslogtreecommitdiff
Side-by-side diff
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--noncore/settings/packagemanager/ChangeLog8
-rw-r--r--noncore/settings/packagemanager/README2
-rw-r--r--noncore/settings/packagemanager/TODO18
-rw-r--r--noncore/settings/packagemanager/opie-packagemanager.control2
-rw-r--r--noncore/settings/packagemanager/packageinfodlg.cpp27
-rw-r--r--noncore/settings/packagemanager/packageinfodlg.h45
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 @@
+2004-12-21 Dan Williams <drw@handhelds.org>
+
+ * Released version 0.6.0
+ * Added support for Ipkg 'src/gz' feeds
+ * Improve server and destination tabs UI's in configuration dialog
+ * Fix app linking to link all dependent packages as well as selected packages
+ * Hide 'Retrive File List' button once list is retrieved in Package Info dialog
+
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 @@
/* ========================
-/* Version 0.5.0
+/* Version 0.6.0
/*
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 @@
/* ========================
-/* Version 0.5.0
+/* Version 0.6.0
/*
@@ -11,15 +11,7 @@
-----------------------------------------------
- To-do for Opie-PackageManager - November, 2004
+ To-do for Opie-PackageManager - December, 2004
-----------------------------------------------
-======================
-= Current release =
-======================
-
-1. Re-work package download dialog
-
-======================
-= Future releases =
-======================
-
-1. Re-work server and destination tabs in configuration dialog \ No newline at end of file
+1. Move ipkg-link code from InstallDlg to OIpkg
+2. Code ipkg-link logic directly in OIpkg
+3. Re-work package download dialog
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)
Description: Opie package management client
-Version: 0.5.0$EXTRAVERSION
+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
PackageInfoDlg::PackageInfoDlg( QWidget *parent, OPackageManager *pm, const QString &package )
- : QWidget( 0x0 )
+ : QWidget( 0l )
, m_packman( pm )
@@ -46,2 +46,3 @@ PackageInfoDlg::PackageInfoDlg( QWidget *parent, OPackageManager *pm, const QStr
, m_files( this )
+ , m_retrieveFiles( 0l )
{
@@ -90,14 +91,17 @@ PackageInfoDlg::PackageInfoDlg( QWidget *parent, OPackageManager *pm, const QStr
- QPushButton *btn = new QPushButton( Resource::loadPixmap( "packagemanager/apply" ),
+ // If file list is already cached, display
+ if ( !m_package->files().isNull() )
+ m_files.setText( m_package->files() );
+ else
+ {
+ m_retrieveFiles = new QPushButton( Resource::loadPixmap( "packagemanager/apply" ),
tr( "Retrieve file list" ), filesWidget );
- QWhatsThis::add( btn, tr( "Tap here to retrieve list of files contained in this package." ) );
- filesLayout->addWidget( btn );
- connect( btn, SIGNAL(clicked()), this, SLOT(slotBtnFileScan()) );
- tabWidget->addTab( filesWidget, "binary", tr( "File list" ) );
+ QWhatsThis::add( m_retrieveFiles, tr( "Tap here to retrieve list of files contained in this package." ) );
+ filesLayout->addWidget( m_retrieveFiles );
+ connect( m_retrieveFiles, SIGNAL(clicked()), this, SLOT(slotBtnFileScan()) );
+ }
+ tabWidget->addTab( filesWidget, "binary", tr( "File list" ) );
tabWidget->setCurrentTab( tr( "Information" ) );
- // If file list is already cached, display
- if ( !m_package->files().isNull() )
- m_files.setText( m_package->files() );
}
@@ -117,3 +121,3 @@ PackageInfoDlg::~PackageInfoDlg()
// Cache package file list
- if ( !m_files.text().isNull() )
+ if ( !m_files.text().isEmpty() )
m_package->setFiles( m_files.text() );
@@ -127,2 +131,5 @@ void PackageInfoDlg::slotBtnFileScan()
m_packman->executeCommand( OPackage::Files, list, QString::null, this, SLOT(slotFiles(char*)), true );
+
+ if ( m_retrieveFiles )
+ m_retrieveFiles->hide();
}
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 @@
/*
-                This file is part of the OPIE Project
+ This file is part of the OPIE Project
=. Copyright (c) 2003 Dan Williams <drw@handhelds.org>
-             .=l.
-           .>+-=
- _;:,     .>    :=|. This file is free software; you can
-.> <`_,   >  .   <= redistribute it and/or modify it under
-:`=1 )Y*s>-.--   : the terms of the GNU General Public
-.="- .-=="i,     .._ License as published by the Free Software
- - .   .-<_>     .<> Foundation; either version 2 of the License,
-     ._= =}       : or (at your option) any later version.
-    .%`+i>       _;_.
-    .i_,=:_.      -<s. This file is distributed in the hope that
-     +  .  -:.       = it will be useful, but WITHOUT ANY WARRANTY;
-    : ..    .:,     . . . without even the implied warranty of
-    =_        +     =;=|` MERCHANTABILITY or FITNESS FOR A
-  _.=:.       :    :=>`: PARTICULAR PURPOSE. See the GNU General
-..}^=.=       =       ; Public License for more details.
-++=   -.     .`     .:
- :     =  ...= . :.=- You should have received a copy of the GNU
- -.   .:....=;==+<; General Public License along with this file;
-  -_. . .   )=.  = see the file COPYING. If not, write to the
-    --        :-=` Free Software Foundation, Inc.,
+ .=l.
+ .>+-=
+_;:, .> :=|. This file is free software; you can
+.> <`_, > . <= redistribute it and/or modify it under
+:`=1 )Y*s>-.-- : the terms of the GNU General Public
+.="- .-=="i, .._ License as published by the Free Software
+- . .-<_> .<> Foundation; either version 2 of the License,
+ ._= =} : or (at your option) any later version.
+ .%`+i> _;_.
+ .i_,=:_. -<s. This file is distributed in the hope that
+ + . -:. = it will be useful, but WITHOUT ANY WARRANTY;
+ : .. .:, . . . without even the implied warranty of
+ =_ + =;=|` MERCHANTABILITY or FITNESS FOR A
+ _.=:. : :=>`: PARTICULAR PURPOSE. See the GNU General
+..}^=.= = ; Public License for more details.
+++= -. .` .:
+: = ...= . :.=- You should have received a copy of the GNU
+-. .:....=;==+<; General Public License along with this file;
+ -_. . . )=. = see the file COPYING. If not, write to the
+ -- :-=` Free Software Foundation, Inc.,
59 Temple Place - Suite 330,
@@ -47,3 +47,3 @@ class PackageInfoDlg : public QWidget
public:
- PackageInfoDlg( QWidget *parent = 0x0, OPackageManager *pm = 0x0, const QString &package = QString::null );
+ PackageInfoDlg( QWidget *parent = 0l, OPackageManager *pm = 0l, const QString &package = QString::null );
~PackageInfoDlg();
@@ -57,2 +57,3 @@ private:
QMultiLineEdit m_files; // Multi-line edit to display package file list
+ QPushButton *m_retrieveFiles; // Push button to retrieve file list