summaryrefslogtreecommitdiff
Unidiff
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
@@ -136,13 +136,12 @@ void MainWindow::makeMenu()
136 // SECTIONS 136 // SECTIONS
137 sectionBar = new QPEToolBar( this ); 137 sectionBar = new QPEToolBar( this );
138 addToolBar( sectionBar, "Section", QMainWindow::Top, TRUE ); 138 addToolBar( sectionBar, "Section", QMainWindow::Top, TRUE );
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() );
146 subsection = new QComboBox( false, sectionBar ); 145 subsection = new QComboBox( false, sectionBar );
147 a = new QAction( tr( "Close Section" ), Resource::loadPixmap( "close" ), QString::null, 0, this, 0 ); 146 a = new QAction( tr( "Close Section" ), Resource::loadPixmap( "close" ), QString::null, 0, this, 0 );
148 connect( a, SIGNAL( activated() ), this, SLOT( sectionClose() ) ); 147 connect( a, SIGNAL( activated() ), this, SLOT( sectionClose() ) );
@@ -150,12 +149,13 @@ void MainWindow::makeMenu()
150 setSections(); 149 setSections();
151 setSubSections(); 150 setSubSections();
152 sectionAction = new QAction( tr( "Sections" ), QString::null, 0, this, 0 ); 151 sectionAction = new QAction( tr( "Sections" ), QString::null, 0, this, 0 );
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);
159 addToolBar( findBar, "Filter", QMainWindow::Top, TRUE ); 159 addToolBar( findBar, "Filter", QMainWindow::Top, TRUE );
160 label = new QLabel( tr("Filter: "), findBar ); 160 label = new QLabel( tr("Filter: "), findBar );
161 label->setBackgroundColor( findBar->backgroundColor() ); 161 label->setBackgroundColor( findBar->backgroundColor() );
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
@@ -47,13 +47,13 @@ Package::Package( QString n, PackageManagerSettings *s )
47 { 47 {
48 init(s); 48 init(s);
49 if ( !QFile::exists( n ) ) 49 if ( !QFile::exists( n ) )
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 );
57 } 57 }
58} 58}
59 59
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
@@ -337,14 +337,15 @@ void PmIpkg::removeLinks( const QString &dest )
337 processLinkDir( "/usr", url ); 337 processLinkDir( "/usr", url );
338} 338}
339 339
340void PmIpkg::update() 340void 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
347void PmIpkg::out( QString o ) 348void PmIpkg::out( QString o )
348{ 349{
349 runwindow->outPut->append(o); 350 runwindow->outPut->append(o);
350 runwindow->outPut->setCursorPosition(runwindow->outPut->numLines() + 1,0,FALSE); 351 runwindow->outPut->setCursorPosition(runwindow->outPut->numLines() + 1,0,FALSE);