summaryrefslogtreecommitdiff
authortille <tille>2002-05-26 12:17:56 (UTC)
committer tille <tille>2002-05-26 12:17:56 (UTC)
commit602e52f454a3d3a5cd973f3d7957d2d96f86464e (patch) (side-by-side diff)
treeeff9aabdbf44804c1dcc42639eaa00fa92dd200c
parent26eb036407dbade370032dcca6af49d682f0ebf3 (diff)
downloadopie-602e52f454a3d3a5cd973f3d7957d2d96f86464e.zip
opie-602e52f454a3d3a5cd973f3d7957d2d96f86464e.tar.gz
opie-602e52f454a3d3a5cd973f3d7957d2d96f86464e.tar.bz2
do not close update windows when not successful
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/unsupported/oipkg/mainwindow.cpp2
-rw-r--r--noncore/unsupported/oipkg/package.cpp2
-rw-r--r--noncore/unsupported/oipkg/pmipkg.cpp5
3 files changed, 5 insertions, 4 deletions
diff --git a/noncore/unsupported/oipkg/mainwindow.cpp b/noncore/unsupported/oipkg/mainwindow.cpp
index 9c4c752..27c9f4c 100644
--- a/noncore/unsupported/oipkg/mainwindow.cpp
+++ b/noncore/unsupported/oipkg/mainwindow.cpp
@@ -138,9 +138,8 @@ void MainWindow::makeMenu()
addToolBar( sectionBar, "Section", QMainWindow::Top, TRUE );
sectionBar->setHorizontalStretchable( true );
QLabel *label = new QLabel( tr("Section: "), sectionBar );
label->setBackgroundColor( sectionBar->backgroundColor() );
- sectionBar->setStretchableWidget( label );
section = new QComboBox( false, sectionBar );
label = new QLabel( " / ", sectionBar );
label->setBackgroundColor( sectionBar->backgroundColor() );
subsection = new QComboBox( false, sectionBar );
@@ -152,8 +151,9 @@ void MainWindow::makeMenu()
sectionAction = new QAction( tr( "Sections" ), QString::null, 0, this, 0 );
connect( sectionAction, SIGNAL( toggled(bool) ), this, SLOT( sectionShow(bool) ) );
sectionAction->setToggleAction( true );
sectionAction->addTo( viewMenu );
+ sectionBar->setStretchableWidget( section );
//FIND
findBar = new QPEToolBar(this);
addToolBar( findBar, "Filter", QMainWindow::Top, TRUE );
diff --git a/noncore/unsupported/oipkg/package.cpp b/noncore/unsupported/oipkg/package.cpp
index 8c5f0ea..bfb48b3 100644
--- a/noncore/unsupported/oipkg/package.cpp
+++ b/noncore/unsupported/oipkg/package.cpp
@@ -49,9 +49,9 @@ Package::Package( QString n, PackageManagerSettings *s )
if ( !QFile::exists( n ) )
{
_name = QString( n );
}else{
- pvDebug(2,"remote file: "+n);
+ pvDebug(4,"remote file: "+n);
parseIpkgFile( n );
_useFileName = true;
_fileName = QString( n );
}
diff --git a/noncore/unsupported/oipkg/pmipkg.cpp b/noncore/unsupported/oipkg/pmipkg.cpp
index 30777c2..0fa4c61 100644
--- a/noncore/unsupported/oipkg/pmipkg.cpp
+++ b/noncore/unsupported/oipkg/pmipkg.cpp
@@ -339,10 +339,11 @@ void PmIpkg::removeLinks( const QString &dest )
void PmIpkg::update()
{
show();
- runIpkg( "update" );
- runwindow->close();
+ if ( runIpkg( "update" ) )
+ runwindow->close();
+ else out("An error occurred!\nPlease check the log.");
}
void PmIpkg::out( QString o )
{