summaryrefslogtreecommitdiff
Side-by-side diff
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
@@ -51,9 +51,9 @@ MainWindow::MainWindow( QWidget *parent, const char *name, WFlags f ) :
settings = new PackageManagerSettings(this,0,TRUE);
listViewPackages = new PackageListView( this,"listViewPackages",settings );
setCentralWidget( listViewPackages );
listViewPackages->addList( tr("feeds"), &packageListServers );
- listViewPackages->addList( tr("ipkgfind"), &packageListSearch );
+ listViewPackages->addList( tr("ipkgfind&killefiz"), &packageListSearch );
listViewPackages->addList( tr("documents"), &packageListDocLnk );
ipkg = new PmIpkg( settings, this );
packageListServers.setSettings( settings );
packageListSearch.setSettings( settings );
@@ -191,9 +191,9 @@ void MainWindow::makeMenu()
//SEARCH
searchBar = new QPEToolBar(this);
addToolBar( searchBar, "Search", QMainWindow::Top, TRUE );
- label = new QLabel( tr("ipkgfind: "), searchBar );
+ label = new QLabel( tr("Search: "), searchBar );
// label->setBackgroundMode( PaletteForeground );
searchBar->setHorizontalStretchable( TRUE );
searchEdit = new QLineEdit( searchBar, "seachEdit" );
searchBar->setStretchableWidget( searchEdit );
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
@@ -24,9 +24,9 @@
#include <qstring.h>
#include <qcheckbox.h>
#include <qtextstream.h>
#include <qtextview.h>
-
+#include <qmessagebox.h>
#include <qprogressbar.h>
#include <qpushbutton.h>
#include <qlayout.h>
@@ -38,9 +38,9 @@
//#define OPROCESS
PmIpkg::PmIpkg( PackageManagerSettings* s, QWidget* p, const char * name, WFlags f )
- : QObject ( p )
+ : QObject ( p ), shellWarning(true)
{
settings = s;
runwindow = new RunWindow( p, name, true, f );
#ifdef OPROCESS
@@ -155,8 +155,14 @@ bool PmIpkg::runIpkg(const QString& args, const QString& dest )
qApp->processEvents();
}
}
pclose(fp);
+ if (!ret && shellWarning)
+ {
+ shellWarning = false;
+ QMessageBox::critical( runwindow, tr("install failure"),
+ tr("<p>Did you start me from the command line?</p>"));
+ }
#endif
//out( "Finished!");
pvDebug(2,QString(ret?"success\n":"failure\n"));
return ret;
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
@@ -37,9 +37,8 @@ public:
void loadList( PackageList* );
void commit();
void update();
void show();
- /** No descriptions */
void clearLists();
public slots:
void doIt();
@@ -53,8 +52,9 @@ public slots:
//private slots:
void getIpkgOutput(OProcess *proc, char *buffer, int buflen);
private:
+ bool shellWarning;
OProcess *ipkgProcess;
PackageManagerSettings* settings;
RunWindow *runwindow;
InstallDialog *installDialog;