Index: /trunk/gui/printer/cupswiz/cupswiz.VRP
===================================================================
--- /trunk/gui/printer/cupswiz/cupswiz.VRP	(revision 62)
+++ /trunk/gui/printer/cupswiz/cupswiz.VRP	(revision 63)
@@ -7,5 +7,5 @@
 VRXWindow: __VREMainWindow,1,578,2746,5770,9106
 VRXWindow: __VRESectionListWindow,1,675,11900,4529,3891
-VRXWindow: __VREToolsWindow,1,1650,9973,5477,1667
+VRXWindow: __VREToolsWindow,1,1650,9973,5474,1661
 VRXWindow: __VREWindListWindow,1,5191,11900,2650,3891
 UserFile: 1
Index: /trunk/gui/printer/cupswiz/cupswiz.VRX
===================================================================
--- /trunk/gui/printer/cupswiz/cupswiz.VRX	(revision 62)
+++ /trunk/gui/printer/cupswiz/cupswiz.VRX	(revision 63)
@@ -388,5 +388,5 @@
 cups_etc = globals.!cupsdir'\etc'
 IF \VRIsDir( cups_etc'\cups\ppd') THEN
- cups_etc = globals.!cupsdrv'\etc'
+ cups_etc = globals.!cupsroot'\etc'
 IF \VRIsDir( cups_etc'\cups\ppd') THEN
 cups_etc = VALUE('ETC',,'OS2ENVIRONMENT')
@@ -437,6 +437,10 @@
 * to get the exact model name.
 */
+ CALL LINEOUT globals.!log1, 'No PPD yet, looking for' cups_etc'\cups\ppd\'globals.!prt_name'.ppd'
 cups_ppd = STREAM( cups_etc'\cups\ppd\'globals.!prt_name'.ppd', 'C', 'QUERY EXISTS')
- globals.!prt_nick = GetNameFromPPD( cups_ppd )
+ IF cups_ppd <strong> '' THEN
+ globals.!prt_nick = GetNameFromPPD( cups_ppd )
+ ELSE
+ CALL LINEOUT globals.!log1, 'PPD not found. Looking for model:' globals.!os2driver'.'globals.!prt_nick
 END
 drv_model = PrinterExistsInDRV( globals.!os2driver, globals.!prt_nick )
@@ -1226,4 +1230,10 @@
 CALL LINEOUT globals.!log1, '--[' datestr ']' &#124;&#124;,
 COPIES('-', 73 - LENGTH( datestr ))
+
+ CALL LINEOUT globals.!log1, 'System boot volume:' TRANSLATE( globals.!bootdrv )
+ CALL LINEOUT globals.!log1, 'Local CUPS directory:' TRANSLATE( globals.!cupsdir )
+ CALL LINEOUT globals.!log1, 'Local driver repository:' TRANSLATE( globals.!repository )
+ CALL LINEOUT globals.!log1, ''
+
 RETURN
 
@@ -2001,5 +2011,5 @@
 CALL NLSSetText 'SW_ABOUT', 'Caption', 10 /* 10: Product Information */
 CALL NLSSetText 'DT_ABOUT1', 'Caption', 11 /* 11: eCups Printer Install Utility */
- CALL NLSSetText 'DT_ABOUT2', 'Caption', 12, '1.13' /* 12: Version %1 */
+ CALL NLSSetText 'DT_ABOUT2', 'Caption', 12, '1.15' /* 12: Version %1 */
 CALL NLSSetText 'DT_ABOUT3', 'Caption', 13, '2010-2017' /* 13: (C) %1 Alex Taylor */
 CALL NLSSetText 'PB_ABOUT', 'Caption', 2 /* 10: Product Information */
</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/63?format=diff&amp;new=63">(-&gt;オリジナル)</a>
/ <label>アドレス: <input type="text" name="naked_post_url" value="http://trac.netlabs.org/ecups/changeset/63?format=diff&amp;new=63" 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>