Diffstat (limited to 'noncore/tools/opie-sh/opie-sh.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r-- | noncore/tools/opie-sh/opie-sh.cpp | 16 |
1 files changed, 12 insertions, 4 deletions
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() | |||
119 | printf(" -e Use the error icon\n"); | 119 | printf(" -e Use the error icon\n"); |
120 | printf(" -0 [text] First button text [Default = OK]\n"); | 120 | printf(" -0 [text] First button text [Default = OK]\n"); |
121 | printf(" -1 [text] Second button text\n"); | 121 | printf(" -1 [text] Second button text\n"); |
122 | printf(" -2 [text] Third button text\n"); | 122 | printf(" -2 [text] Third button text\n"); |
123 | printf(" -g Disable fullscreen\n"); | 123 | printf(" -g Disable fullscreen\n"); |
124 | printf("Input Dialog options:\n"); | 124 | printf("Input Dialog options:\n"); |
125 | printf(" -s A single line of input (output to console)\n"); | 125 | printf(" -s A single line of input (output to console)\n"); |
126 | printf(" -l List input (newline separated list read in from file)\n"); | 126 | printf(" -l List input (newline separated list read in from file)\n"); |
127 | printf(" -b A list box, enabling multiple selections (input same as -l)\n"); | 127 | printf(" -b A list box, enabling multiple selections (input same as -l)\n"); |
128 | printf(" -L [label] The label for the input field\n"); | 128 | printf(" -L [label] The label for the input field\n"); |
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 | ||
134 | int fileviewer(QPEApplication *a, int argc, QStringList args) | 134 | 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 | ||
140 | for(i=0; i < argc; i++) | 140 | for(i=0; i < argc; i++) |
141 | { | 141 | { |
142 | if(args[i] == "-f") | 142 | if(args[i] == "-f") |
143 | { | 143 | { |
144 | if(args[i+1][0] != '-') | 144 | if(args[i+1][0] != '-') |
145 | { | 145 | { |
146 | filename = args[i+1]; | 146 | filename = args[i+1]; |
147 | } | 147 | } |
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 | { |
152 | title = args[i+1]; | 157 | title = args[i+1]; |
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(); |
158 | return a->exec(); | 163 | return a->exec(); |
159 | } | 164 | } |
160 | 165 | ||
161 | int input(int wi, int h, QWidget *w, int argc, QStringList args) | 166 | int input(int wi, int h, QWidget *w, int argc, QStringList args) |
162 | { | 167 | { |
163 | int i, type = 0; | 168 | int i, type = 0; |
164 | QString title, label, filename; | 169 | QString title, label, filename; |
165 | bool edit=false, full=true; | 170 | bool edit=false, full=true; |
166 | 171 | ||
167 | for(i=0; i < argc; i++) | 172 | for(i=0; i < argc; i++) |
@@ -184,25 +189,28 @@ int input(int wi, int h, QWidget *w, int argc, QStringList args) | |||
184 | if(args[i] == "-t") | 189 | if(args[i] == "-t") |
185 | { | 190 | { |
186 | title = args[i+1]; | 191 | title = args[i+1]; |
187 | } | 192 | } |
188 | 193 | ||
189 | if(args[i] == "-L") | 194 | if(args[i] == "-L") |
190 | { | 195 | { |
191 | label = args[i+1]; | 196 | label = args[i+1]; |
192 | } | 197 | } |
193 | 198 | ||
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 | ||
199 | if(args[i] =="-E") | 207 | if(args[i] =="-E") |
200 | { | 208 | { |
201 | edit = true; | 209 | edit = true; |
202 | } | 210 | } |
203 | 211 | ||
204 | if(args[i] == "-g") | 212 | if(args[i] == "-g") |
205 | { | 213 | { |
206 | full = false; | 214 | full = false; |
207 | } | 215 | } |
208 | } | 216 | } |