Index: /trunk/gui/printer/cupswiz/cupswiz.VRP
===================================================================
--- /trunk/gui/printer/cupswiz/cupswiz.VRP	(revision 83)
+++ /trunk/gui/printer/cupswiz/cupswiz.VRP	(revision 84)
@@ -7,5 +7,5 @@
 VRXWindow: __VREMainWindow,1,578,2746,5770,9106
 VRXWindow: __VRESectionListWindow,1,723,11900,4529,3891
-VRXWindow: __VREToolsWindow,1,1650,9973,5468,1661
+VRXWindow: __VREToolsWindow,1,1650,9973,5474,1665
 VRXWindow: __VREWindListWindow,1,5191,11900,2650,3891
 UserFile: 1
Index: /trunk/gui/printer/cupswiz/cupswiz.VRX
===================================================================
--- /trunk/gui/printer/cupswiz/cupswiz.VRX	(revision 83)
+++ /trunk/gui/printer/cupswiz/cupswiz.VRX	(revision 84)
@@ -736,7 +736,7 @@
 PARSE VAR models.i _brand _model ' - CUPS+' _type
 IF _type == '' THEN DO
- IF POS('hpcups', _model )> 0 THEN 
+ IF POS('hpcups', _model )> 0 THEN
 _type = 'HPLIP'
- ELSE IF POS('hpijs', _model )> 0 THEN 
+ ELSE IF POS('hpijs', _model )> 0 THEN
 _type = 'HPLIP'
 ELSE IF ( _type == '') & ( LEFT( ppds.i, 3 ) == 'hp/') THEN
@@ -1687,5 +1687,5 @@
 WORD( globals.!prt_nick, 1 ) == 'Hewlett-Packard' THEN
 globals.!os2driver = 'ECUPS-HP'
- ELSE IF TRANSLATE( WORD( globals.!prt_nick, 1 )) == 'Epson' THEN
+ ELSE IF TRANSLATE( WORD( globals.!prt_nick, 1 )) == 'EPSON' THEN
 globals.!os2driver = 'EPSONINK'
 ELSE
@@ -2103,4 +2103,6 @@
 LEAVE
 END
+ /* If PSPRINT is present use it as a fallback default */
+ ELSE IF drv_list.i == 'PSPRINT' THEN def_idx = i
 END
 CALL VRSet 'DDCB_PRESDRV', 'Selected', def_idx
Index: /trunk/gui/printer/cupswiz/readme.1st
===================================================================
--- /trunk/gui/printer/cupswiz/readme.1st	(revision 83)
+++ /trunk/gui/printer/cupswiz/readme.1st	(revision 84)
@@ -103,7 +103,7 @@
 - There is no way to go 'back' in the wizard; if you need to go back and
 change a previous selection, you must cancel and start over.
- - The program has only been tested with Gutenprint, HPLIP, and native
- Postscript printers with imported PPDs. Other drivers packages such as
- SpliX or foo2qpdl may work but this is not guaranteed.
+ - This program has not been exhaustively tested with all possible driver
+ packages; they should generally work, but it may be possible to encounter
+ a driver package which behaves in a way CUPSWIZ does not expect.
 - If your %TMP% directory has spaces in the pathname, the program will almost
 certainly fail to work properly. The same applies to your %LOGFILES%
@@ -113,5 +113,4 @@
 - Password-protected local CUPS queues are not supported. (Network printers
 connected with LPD, IPP or SMB should work, however.)
- - There may well be undiscovered bugs; please report any you find.
 
 Contact: Alex Taylor (alex at altsan dot org)
</div><div class="naked_ctrl">
<form action="/index.cgi/larger-text" method="get" name="gate">
<p><a href="http://altstyle.alfasado.net">AltStyle</a> によって変換されたページ <a href="http://trac.netlabs.org/ecups/changeset/84?format=diff&amp;new=84">(-&gt;オリジナル)</a>
/ <label>アドレス: <input type="text" name="naked_post_url" value="http://trac.netlabs.org/ecups/changeset/84?format=diff&amp;new=84" size="22" /></label> <label>モード: <select name="naked_post_mode">
<option value="default">デフォルト</option>
<option value="speech">音声ブラウザ</option>
<option value="ruby">ルビ付き</option>
<option value="contrast">配色反転</option>
<option value="larger-text" selected="selected">文字拡大</option>
<option value="mobile">モバイル</option>
</select>
<input type="submit" value="表示" />
</p>
</form>
</div>