4 files changed, 19 insertions, 7 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
@@ -15,10 +15,12 @@ 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);
 
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
@@ -21,12 +21,13 @@ Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 #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;
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,9 +1,10 @@
-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
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
@@ -128,13 +128,13 @@ void printusage()
 	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++)
@@ -147,12 +147,17 @@ int fileviewer(QPEApplication *a, int argc, QStringList args)
 			}
 		}
 
+		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();
@@ -193,8 +198,11 @@ int input(int wi, int h, QWidget *w, int argc, QStringList args)
 
 		if(args[i] == "-F")
 		{
+			if(args[i+1][0] != '-')
+			{
 			filename = args[i+1];
 		}
+		}
 
 		if(args[i] =="-E")
 		{