summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/unsupported/oipkg/mainwindow.cpp4
-rw-r--r--noncore/unsupported/oipkg/pmipkg.cpp10
-rw-r--r--noncore/unsupported/oipkg/pmipkg.h2
3 files changed, 11 insertions, 5 deletions
diff --git a/noncore/unsupported/oipkg/mainwindow.cpp b/noncore/unsupported/oipkg/mainwindow.cpp
index 53db477..d1be8d0 100644
--- a/noncore/unsupported/oipkg/mainwindow.cpp
+++ b/noncore/unsupported/oipkg/mainwindow.cpp
@@ -52,7 +52,7 @@ MainWindow::MainWindow( QWidget *parent, const char *name, WFlags f ) :
52 listViewPackages = new PackageListView( this,"listViewPackages",settings ); 52 listViewPackages = new PackageListView( this,"listViewPackages",settings );
53 setCentralWidget( listViewPackages ); 53 setCentralWidget( listViewPackages );
54 listViewPackages->addList( tr("feeds"), &packageListServers ); 54 listViewPackages->addList( tr("feeds"), &packageListServers );
55 listViewPackages->addList( tr("ipkgfind"), &packageListSearch ); 55 listViewPackages->addList( tr("ipkgfind&killefiz"), &packageListSearch );
56 listViewPackages->addList( tr("documents"), &packageListDocLnk ); 56 listViewPackages->addList( tr("documents"), &packageListDocLnk );
57 ipkg = new PmIpkg( settings, this ); 57 ipkg = new PmIpkg( settings, this );
58 packageListServers.setSettings( settings ); 58 packageListServers.setSettings( settings );
@@ -192,7 +192,7 @@ void MainWindow::makeMenu()
192 //SEARCH 192 //SEARCH
193 searchBar = new QPEToolBar(this); 193 searchBar = new QPEToolBar(this);
194 addToolBar( searchBar, "Search", QMainWindow::Top, TRUE ); 194 addToolBar( searchBar, "Search", QMainWindow::Top, TRUE );
195 label = new QLabel( tr("ipkgfind: "), searchBar ); 195 label = new QLabel( tr("Search: "), searchBar );
196// label->setBackgroundMode( PaletteForeground ); 196// label->setBackgroundMode( PaletteForeground );
197 searchBar->setHorizontalStretchable( TRUE ); 197 searchBar->setHorizontalStretchable( TRUE );
198 searchEdit = new QLineEdit( searchBar, "seachEdit" ); 198 searchEdit = new QLineEdit( searchBar, "seachEdit" );
diff --git a/noncore/unsupported/oipkg/pmipkg.cpp b/noncore/unsupported/oipkg/pmipkg.cpp
index d29036b..71e9b88 100644
--- a/noncore/unsupported/oipkg/pmipkg.cpp
+++ b/noncore/unsupported/oipkg/pmipkg.cpp
@@ -25,7 +25,7 @@
25#include <qcheckbox.h> 25#include <qcheckbox.h>
26#include <qtextstream.h> 26#include <qtextstream.h>
27#include <qtextview.h> 27#include <qtextview.h>
28 28#include <qmessagebox.h>
29#include <qprogressbar.h> 29#include <qprogressbar.h>
30#include <qpushbutton.h> 30#include <qpushbutton.h>
31#include <qlayout.h> 31#include <qlayout.h>
@@ -39,7 +39,7 @@
39//#define OPROCESS 39//#define OPROCESS
40 40
41PmIpkg::PmIpkg( PackageManagerSettings* s, QWidget* p, const char * name, WFlags f ) 41PmIpkg::PmIpkg( PackageManagerSettings* s, QWidget* p, const char * name, WFlags f )
42 : QObject ( p ) 42 : QObject ( p ), shellWarning(true)
43{ 43{
44 settings = s; 44 settings = s;
45 runwindow = new RunWindow( p, name, true, f ); 45 runwindow = new RunWindow( p, name, true, f );
@@ -156,6 +156,12 @@ bool PmIpkg::runIpkg(const QString& args, const QString& dest )
156 } 156 }
157 } 157 }
158 pclose(fp); 158 pclose(fp);
159 if (!ret && shellWarning)
160 {
161 shellWarning = false;
162 QMessageBox::critical( runwindow, tr("install failure"),
163 tr("<p>Did you start me from the command line?</p>"));
164 }
159#endif 165#endif
160 //out( "Finished!"); 166 //out( "Finished!");
161 pvDebug(2,QString(ret?"success\n":"failure\n")); 167 pvDebug(2,QString(ret?"success\n":"failure\n"));
diff --git a/noncore/unsupported/oipkg/pmipkg.h b/noncore/unsupported/oipkg/pmipkg.h
index 28bc5dd..662800a 100644
--- a/noncore/unsupported/oipkg/pmipkg.h
+++ b/noncore/unsupported/oipkg/pmipkg.h
@@ -38,7 +38,6 @@ public:
38 void commit(); 38 void commit();
39 void update(); 39 void update();
40 void show(); 40 void show();
41 /** No descriptions */
42 void clearLists(); 41 void clearLists();
43 42
44public slots: 43public slots:
@@ -54,6 +53,7 @@ public slots:
54 void getIpkgOutput(OProcess *proc, char *buffer, int buflen); 53 void getIpkgOutput(OProcess *proc, char *buffer, int buflen);
55 54
56private: 55private:
56 bool shellWarning;
57 OProcess *ipkgProcess; 57 OProcess *ipkgProcess;
58 PackageManagerSettings* settings; 58 PackageManagerSettings* settings;
59 RunWindow *runwindow; 59 RunWindow *runwindow;