summaryrefslogtreecommitdiff
authortille <tille>2002-07-06 15:26:04 (UTC)
committer tille <tille>2002-07-06 15:26:04 (UTC)
commit7fcf35f1632134cc9f0b3d38949864df3df59c4c (patch) (side-by-side diff)
tree1c3ef72622877e4d9b59fd73880fa8ffe7936897
parent76685f88ebcfd475c2d3c6d8c69271883053b09f (diff)
downloadopie-7fcf35f1632134cc9f0b3d38949864df3df59c4c.zip
opie-7fcf35f1632134cc9f0b3d38949864df3df59c4c.tar.gz
opie-7fcf35f1632134cc9f0b3d38949864df3df59c4c.tar.bz2
cmd line dialog
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
@@ -53,5 +53,5 @@ MainWindow::MainWindow( QWidget *parent, const char *name, WFlags f ) :
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 );
@@ -193,5 +193,5 @@ void MainWindow::makeMenu()
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 );
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
@@ -26,5 +26,5 @@
#include <qtextstream.h>
#include <qtextview.h>
-
+#include <qmessagebox.h>
#include <qprogressbar.h>
#include <qpushbutton.h>
@@ -40,5 +40,5 @@
PmIpkg::PmIpkg( PackageManagerSettings* s, QWidget* p, const char * name, WFlags f )
- : QObject ( p )
+ : QObject ( p ), shellWarning(true)
{
settings = s;
@@ -157,4 +157,10 @@ bool PmIpkg::runIpkg(const QString& args, const QString& dest )
}
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!");
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
@@ -39,5 +39,4 @@ public:
void update();
void show();
- /** No descriptions */
void clearLists();
@@ -55,4 +54,5 @@ public slots:
private:
+ bool shellWarning;
OProcess *ipkgProcess;
PackageManagerSettings* settings;