-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 | |||
@@ -16,7 +16,9 @@ Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA | |||
16 | #include "fviewer.h" | 16 | #include "fviewer.h" |
17 | 17 | ||
18 | FViewer::FViewer(QString filename, QString title, QWidget *parent=0, const char*name=0):QWidget(parent, name) | 18 | FViewer::FViewer(QString icon, QString filename, QString title, QWidget *parent=0, const char*name=0):QWidget(parent, name) |
19 | { | 19 | { |
20 | QVBoxLayout *layout = new QVBoxLayout(this); | 20 | QVBoxLayout *layout = new QVBoxLayout(this); |
21 | |||
22 | setIcon(Resource::loadPixmap("opie-sh")); | ||
21 | 23 | ||
22 | textView = new QTextBrowser(this, "textview"); | 24 | textView = new QTextBrowser(this, "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 | |||
@@ -22,4 +22,5 @@ Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA | |||
22 | #include <qtimer.h> | 22 | #include <qtimer.h> |
23 | #include <qdir.h> | 23 | #include <qdir.h> |
24 | #include <qpe/resource.h> | ||
24 | 25 | ||
25 | class FViewer :public QWidget | 26 | class FViewer :public QWidget |
@@ -27,5 +28,5 @@ class FViewer :public QWidget | |||
27 | Q_OBJECT | 28 | Q_OBJECT |
28 | public: | 29 | public: |
29 | FViewer(QString filename, QString title, QWidget *parent=0, const char*name=0); | 30 | FViewer(QString icon, QString filename, QString title, QWidget *parent=0, const char*name=0); |
30 | private: | 31 | private: |
31 | QFile *file; | 32 | QFile *file; |
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,8 +1,9 @@ | |||
1 | Files: bin/opie-sh pics/opie-sh/*.png | 1 | Files: bin/opie-sh* apps/Applications/opie-sh.desktop pics/opie-sh/*.png help/opie-sh/*.html |
2 | Priority: optional | 2 | Priority: optional |
3 | Package: opie-sh | ||
3 | Section: opie/applications | 4 | Section: opie/applications |
4 | Maintainer: Thomas Stephens <spiralman@softhome.net> | 5 | Maintainer: Thomas Stephens <spiralman@softhome.net> |
5 | Architecture: arm | 6 | Architecture: arm |
6 | Version: 0.4-$SUB_VERSION | 7 | Version: 0.5-$SUB_VERSION |
7 | Depends: opie-base ($QPE_VERSION) | 8 | Depends: opie-base ($QPE_VERSION) |
8 | License: GPL | 9 | License: GPL |
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 | |||
@@ -129,5 +129,5 @@ void printusage() | |||
129 | printf(" -F [filename] An input file (for when it makes sense) [Default = stdin]\n"); | 129 | printf(" -F [filename] An input file (for when it makes sense) [Default = stdin]\n"); |
130 | printf(" -E Makes list input editable\n"); | 130 | printf(" -E Makes list input editable\n"); |
131 | printf(" -g Disable fullscreen\n"); | 131 | printf(" -g Disable fullscreen\n\0"); |
132 | } | 132 | } |
133 | 133 | ||
@@ -135,5 +135,5 @@ int fileviewer(QPEApplication *a, int argc, QStringList args) | |||
135 | { | 135 | { |
136 | int i; | 136 | int i; |
137 | QString filename, title; | 137 | QString filename, title, icon; |
138 | bool update=false; | 138 | bool update=false; |
139 | 139 | ||
@@ -148,4 +148,9 @@ int fileviewer(QPEApplication *a, int argc, QStringList args) | |||
148 | } | 148 | } |
149 | 149 | ||
150 | if(args[i] == "-I") | ||
151 | { | ||
152 | icon=args[i+1]; | ||
153 | } | ||
154 | |||
150 | if(args[i] == "-t") | 155 | if(args[i] == "-t") |
151 | { | 156 | { |
@@ -153,5 +158,5 @@ int fileviewer(QPEApplication *a, int argc, QStringList args) | |||
153 | } | 158 | } |
154 | } | 159 | } |
155 | FViewer *fview = new FViewer(filename, title, 0, (QString) "fileviewer"); | 160 | FViewer *fview = new FViewer(icon, filename, title, 0, (QString) "fileviewer"); |
156 | a->setMainWidget(fview); | 161 | a->setMainWidget(fview); |
157 | fview->showMaximized(); | 162 | fview->showMaximized(); |
@@ -194,5 +199,8 @@ int input(int wi, int h, QWidget *w, int argc, QStringList args) | |||
194 | if(args[i] == "-F") | 199 | if(args[i] == "-F") |
195 | { | 200 | { |
196 | filename = args[i+1]; | 201 | if(args[i+1][0] != '-') |
202 | { | ||
203 | filename = args[i+1]; | ||
204 | } | ||
197 | } | 205 | } |
198 | 206 | ||