author | tille <tille> | 2002-05-26 12:17:56 (UTC) |
---|---|---|
committer | tille <tille> | 2002-05-26 12:17:56 (UTC) |
commit | 602e52f454a3d3a5cd973f3d7957d2d96f86464e (patch) (unidiff) | |
tree | eff9aabdbf44804c1dcc42639eaa00fa92dd200c | |
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 | 5 |
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 | |||
@@ -139,7 +139,6 @@ void MainWindow::makeMenu() | |||
139 | sectionBar->setHorizontalStretchable( true ); | 139 | sectionBar->setHorizontalStretchable( true ); |
140 | QLabel *label = new QLabel( tr("Section: "), sectionBar ); | 140 | QLabel *label = new QLabel( tr("Section: "), sectionBar ); |
141 | label->setBackgroundColor( sectionBar->backgroundColor() ); | 141 | label->setBackgroundColor( sectionBar->backgroundColor() ); |
142 | sectionBar->setStretchableWidget( label ); | ||
143 | section = new QComboBox( false, sectionBar ); | 142 | section = new QComboBox( false, sectionBar ); |
144 | label = new QLabel( " / ", sectionBar ); | 143 | label = new QLabel( " / ", sectionBar ); |
145 | label->setBackgroundColor( sectionBar->backgroundColor() ); | 144 | label->setBackgroundColor( sectionBar->backgroundColor() ); |
@@ -153,6 +152,7 @@ void MainWindow::makeMenu() | |||
153 | connect( sectionAction, SIGNAL( toggled(bool) ), this, SLOT( sectionShow(bool) ) ); | 152 | connect( sectionAction, SIGNAL( toggled(bool) ), this, SLOT( sectionShow(bool) ) ); |
154 | sectionAction->setToggleAction( true ); | 153 | sectionAction->setToggleAction( true ); |
155 | sectionAction->addTo( viewMenu ); | 154 | sectionAction->addTo( viewMenu ); |
155 | sectionBar->setStretchableWidget( section ); | ||
156 | 156 | ||
157 | //FIND | 157 | //FIND |
158 | findBar = new QPEToolBar(this); | 158 | 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 ) | |||
50 | { | 50 | { |
51 | _name = QString( n ); | 51 | _name = QString( n ); |
52 | }else{ | 52 | }else{ |
53 | pvDebug(2,"remote file: "+n); | 53 | pvDebug(4,"remote file: "+n); |
54 | parseIpkgFile( n ); | 54 | parseIpkgFile( n ); |
55 | _useFileName = true; | 55 | _useFileName = true; |
56 | _fileName = QString( n ); | 56 | _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 ) | |||
340 | void PmIpkg::update() | 340 | void PmIpkg::update() |
341 | { | 341 | { |
342 | show(); | 342 | show(); |
343 | runIpkg( "update" ); | 343 | if ( runIpkg( "update" ) ) |
344 | runwindow->close(); | 344 | runwindow->close(); |
345 | else out("An error occurred!\nPlease check the log."); | ||
345 | } | 346 | } |
346 | 347 | ||
347 | void PmIpkg::out( QString o ) | 348 | void PmIpkg::out( QString o ) |