author | tille <tille> | 2002-05-26 12:17:56 (UTC) |
---|---|---|
committer | tille <tille> | 2002-05-26 12:17:56 (UTC) |
commit | 602e52f454a3d3a5cd973f3d7957d2d96f86464e (patch) (side-by-side diff) | |
tree | eff9aabdbf44804c1dcc42639eaa00fa92dd200c /noncore/unsupported | |
parent | 26eb036407dbade370032dcca6af49d682f0ebf3 (diff) | |
download | opie-602e52f454a3d3a5cd973f3d7957d2d96f86464e.zip opie-602e52f454a3d3a5cd973f3d7957d2d96f86464e.tar.gz opie-602e52f454a3d3a5cd973f3d7957d2d96f86464e.tar.bz2 |
do not close update windows when not successful
-rw-r--r-- | noncore/unsupported/oipkg/mainwindow.cpp | 2 | ||||
-rw-r--r-- | noncore/unsupported/oipkg/package.cpp | 2 | ||||
-rw-r--r-- | noncore/unsupported/oipkg/pmipkg.cpp | 3 |
3 files changed, 4 insertions, 3 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 @@ -139,7 +139,6 @@ void MainWindow::makeMenu() 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() ); @@ -153,6 +152,7 @@ void MainWindow::makeMenu() connect( sectionAction, SIGNAL( toggled(bool) ), this, SLOT( sectionShow(bool) ) ); sectionAction->setToggleAction( true ); sectionAction->addTo( viewMenu ); + sectionBar->setStretchableWidget( section ); //FIND findBar = new QPEToolBar(this); 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 @@ -50,7 +50,7 @@ Package::Package( QString n, PackageManagerSettings *s ) { _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 @@ -340,8 +340,9 @@ void PmIpkg::removeLinks( const QString &dest ) void PmIpkg::update() { show(); - runIpkg( "update" ); + if ( runIpkg( "update" ) ) runwindow->close(); + else out("An error occurred!\nPlease check the log."); } void PmIpkg::out( QString o ) |