| -rw-r--r-- | noncore/tools/opie-sh/fviewer.cpp | 4 | ||||
| -rw-r--r-- | noncore/tools/opie-sh/fviewer.h | 3 | ||||
| -rw-r--r-- | noncore/tools/opie-sh/opie-sh.control | 5 | ||||
| -rw-r--r-- | noncore/tools/opie-sh/opie-sh.cpp | 16 |
4 files changed, 20 insertions, 8 deletions
diff --git a/noncore/tools/opie-sh/fviewer.cpp b/noncore/tools/opie-sh/fviewer.cpp index 5dc09ff..882c72c 100644 --- a/noncore/tools/opie-sh/fviewer.cpp +++ b/noncore/tools/opie-sh/fviewer.cpp @@ -6,27 +6,29 @@ This program is free software; you can redistribute it and/or modify it under th License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #include "fviewer.h" -FViewer::FViewer(QString filename, QString title, QWidget *parent=0, const char*name=0):QWidget(parent, name) +FViewer::FViewer(QString icon, QString filename, QString title, QWidget *parent=0, const char*name=0):QWidget(parent, name) { QVBoxLayout *layout = new QVBoxLayout(this); + + setIcon(Resource::loadPixmap("opie-sh")); textView = new QTextBrowser(this, "textview"); layout->addWidget(textView); QString string; if(title.isNull()) { setCaption(filename); } else { diff --git a/noncore/tools/opie-sh/fviewer.h b/noncore/tools/opie-sh/fviewer.h index 488b6ed..cd5206c 100644 --- a/noncore/tools/opie-sh/fviewer.h +++ b/noncore/tools/opie-sh/fviewer.h @@ -12,24 +12,25 @@ Public License for more details. You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #include <qwidget.h> #include <qfile.h> #include <qtextstream.h> #include <qtextbrowser.h> #include <qlayout.h> #include <qtimer.h> #include <qdir.h> +#include <qpe/resource.h> class FViewer :public QWidget { Q_OBJECT public: - FViewer(QString filename, QString title, QWidget *parent=0, const char*name=0); + FViewer(QString icon, QString filename, QString title, QWidget *parent=0, const char*name=0); private: QFile *file; QTextBrowser *textView; QTextStream *stream; QTimer *timer; }; diff --git a/noncore/tools/opie-sh/opie-sh.control b/noncore/tools/opie-sh/opie-sh.control index e9b13a5..8f586fe 100644 --- a/noncore/tools/opie-sh/opie-sh.control +++ b/noncore/tools/opie-sh/opie-sh.control @@ -1,10 +1,11 @@ -Files: bin/opie-sh pics/opie-sh/*.png +Files: bin/opie-sh* apps/Applications/opie-sh.desktop pics/opie-sh/*.png help/opie-sh/*.html Priority: optional +Package: opie-sh Section: opie/applications Maintainer: Thomas Stephens <spiralman@softhome.net> Architecture: arm -Version: 0.4-$SUB_VERSION +Version: 0.5-$SUB_VERSION Depends: opie-base ($QPE_VERSION) License: GPL Description: a QDialog shell frontend A program to let you use various dialogs from the console (or a shell script) diff --git a/noncore/tools/opie-sh/opie-sh.cpp b/noncore/tools/opie-sh/opie-sh.cpp index a1b8035..e898cb1 100644 --- a/noncore/tools/opie-sh/opie-sh.cpp +++ b/noncore/tools/opie-sh/opie-sh.cpp @@ -119,49 +119,54 @@ void printusage() printf(" -e Use the error icon\n"); printf(" -0 [text] First button text [Default = OK]\n"); printf(" -1 [text] Second button text\n"); printf(" -2 [text] Third button text\n"); printf(" -g Disable fullscreen\n"); printf("Input Dialog options:\n"); printf(" -s A single line of input (output to console)\n"); printf(" -l List input (newline separated list read in from file)\n"); printf(" -b A list box, enabling multiple selections (input same as -l)\n"); printf(" -L [label] The label for the input field\n"); printf(" -F [filename] An input file (for when it makes sense) [Default = stdin]\n"); printf(" -E Makes list input editable\n"); - printf(" -g Disable fullscreen\n"); + printf(" -g Disable fullscreen\n\0"); } int fileviewer(QPEApplication *a, int argc, QStringList args) { int i; - QString filename, title; + QString filename, title, icon; bool update=false; for(i=0; i < argc; i++) { if(args[i] == "-f") { if(args[i+1][0] != '-') { filename = args[i+1]; } } + if(args[i] == "-I") + { + icon=args[i+1]; + } + if(args[i] == "-t") { title = args[i+1]; } } - FViewer *fview = new FViewer(filename, title, 0, (QString) "fileviewer"); + FViewer *fview = new FViewer(icon, filename, title, 0, (QString) "fileviewer"); a->setMainWidget(fview); fview->showMaximized(); return a->exec(); } int input(int wi, int h, QWidget *w, int argc, QStringList args) { int i, type = 0; QString title, label, filename; bool edit=false, full=true; for(i=0; i < argc; i++) @@ -184,25 +189,28 @@ int input(int wi, int h, QWidget *w, int argc, QStringList args) if(args[i] == "-t") { title = args[i+1]; } if(args[i] == "-L") { label = args[i+1]; } if(args[i] == "-F") { - filename = args[i+1]; + if(args[i+1][0] != '-') + { + filename = args[i+1]; + } } if(args[i] =="-E") { edit = true; } if(args[i] == "-g") { full = false; } } |