Changeset 361

Timestamp:

Jan 6, 2010, 3:01:57 PM (16 years ago)

Author:

Herwig Bauernfeind

Message:

GUI-Tools: EVFSGUI basics for printer support

Location:

branches/guitools-2.0

Files:

• evfsgui/changes (modified) (1 diff)
• evfsgui/evfsgui.VRP (modified) (1 diff)
• evfsgui/evfsgui.VRX (modified) (3 diffs)
• evfsgui/evfsgui.VRY (modified) ( previous)
• shared/nlv.vrs (modified) (2 diffs)
• shared/smbtree.vrs (modified) (2 diffs)

branches/guitools-2.0/evfsgui/changes

@@ -3 +3 @@
 - Debug on/off option is badly implemented (rework required)
 - Create Icon. stem in order to ease maintainance of icons
+
+Version 2.0.0 (Refresh)
+- Changed: Rewrite routines to find .msg and .hlp files
+- Fixed: Set size of throbber object according to screen dimensions
 
 Version 2.0 GA

branches/guitools-2.0/evfsgui/evfsgui.VRP

@@ -8 +8 @@
 VRXWindow: __VREMainWindow,1,1072,1783,891,3951
 VRXWindow: __VRESectionListWindow,1,602,11033,11033,3975
-VRXWindow: __VREToolsWindow,1,1963,819,6992,1661
+VRXWindow: __VREToolsWindow,1,1963,819,6992,1665
 VRXWindow: __VREWindListWindow,1,470,8528,2650,3150
 UserFile: 1

branches/guitools-2.0/evfsgui/evfsgui.VRX

@@ -284 +284 @@
 
     ok = VRSet("Main","Width", 8200)
+    ok = VRseT("Pict_Throbber","Width",  VRMethod( "Screen", "PixelsToTwips", 32 ))
+    ok = VRseT("Pict_Throbber","Height", VRMethod( "Screen", "PixelsToTwips", 32 ))
 
     /* Setup SmbTree View */
@@ -386 +388 @@
         END
         else iterate
+    end
+return
+
+/*:VRX         _PrinterInfo
+*/
+_PrinterInfo: 
+    /* rh = currently selected record handle */
+    capt = VRMethod("CN_SMBTREE", "GetRecordAttr", rh, "Caption")
+    parse var Capt p_printer '0D0A'x .
+    parRH = VRMethod("CN_SMBTREE", "GetRecordAttr", rh, "Parent")
+    capt = VRMethod("CN_SMBTREE", "GetRecordAttr", Parrh, "Caption")
+    parse var Capt p_prtsrv '0D0A'x .
+    p_prtsrv = strip(p_prtsrv)
+    GparRH = VRMethod("CN_SMBTREE", "GetRecordAttr", Parrh, "Parent")
+    capt = VRMethod("CN_SMBTREE", "GetRecordAttr", GParrh, "Caption")
+    parse var Capt p_workgroup '0D0A'x .
+    DescStr = translate(p_prtsrv'#'p_printer'#'p_workgroup'#')
+say '"'DescStr'"'
+    LDescStr = length(DescStr)
+    ok = SysIni('SYSTEM','PM_SPOOLER_PORT',"All:",'ports')
+
+    FoundPort = 0
+    do I = 1 to ports.0
+        if left(ports.i,3) = 'SMB' then do
+            say ports.I
+            say translate(left(SysIni('SYSTEM','PM_'ports.I,'INITIALIZATION'),LDescStr))
+            say DescStr
+            if translate(left(SysIni('SYSTEM','PM_'ports.I,'INITIALIZATION'),LDescStr)) = DescStr then do
+                OurPort = ports.I
+                FoundPort = 1
+                leave
+            end
+        end
+    end
+
+    if Foundport then do
+        ok = SysIni('SYSTEM','PM_SPOOLER_PRINTER',"All:",'printer')
+
+        do I = 1 to printer.0
+            say printer.I
+            prtsummary = SysINi('SYSTEM','PM_SPOOLER_PRINTER',printer.i)
+            parse var prtsummary port ';'PrinterDriver';'PrinterQueue';' .
+            if port = ourPort then do
+                PrinterName = SysINi('SYSTEM','PM_SPOOLER_PRINTER_DESCR',printer.i)
+                parse var Printername Printername ';' .
+                leave
+            end
+
+        end
+
+        CALL VRMessage 'Main', PrinterName' ('PrinterQueue') prints to port ' Port' connected to \\'p_workgroup'\'p_prtsrv'\'p_printer, NLVGetMessage( 1 ), 'I'
+    end
+    else do
+        CALL VRMessage 'Main', NLVGetMessage( 62 ), NLVGetMessage( 5 ), 'E'
     end
 return
@@ -863 +919 @@
     ok = VRset("Menu_Selected_Default_Workgroup","Visible", (Icon = "#62:PMWP.DLL"))
 
-    if Icon = "#65:PMWP.DLL" then do /* Printers not supported at the moment */
+    if Icon = "#65:PMWP.DLL" then do /* Printer installation not supported at the moment */
+        /* call _Printerinfo */
         CALL VRMessage 'Main', NLVGetMessage( 62 ), NLVGetMessage( 5 ), 'E'
         return

branches/guitools-2.0/shared/nlv.vrs

@@ -12 +12 @@
     execPath = VRGet("Application", "Program")
     if execPath = "" then parse source . . execPath
-    execDir  = VRParseFileName( execPath, "DP")
+    execDir  = translate(VRParseFileName( execPath, "DP"))
+    parse var execDir srchroot '\BIN'
+
     say '  NLV execDir    = "'execDir'"'
+    say '  NLV srchroot   = "'srchRoot'"'
 
     filestem = VRParseFileName( execPath, "N")'_'
@@ -19 +22 @@
     say '  NLV filestem   = "'filestem'"'
 
-    /* First, figure out what language/message file to use.
-     */
+    /* First, figure out what language/message file to use */
     Syslang = TRANSLATE( VALUE('LANG',,'OS2ENVIRONMENT'))
     SELECT
-        WHEN Syslang == 'ZH_TW' THEN nlv = 'tw'
-        WHEN Syslang == 'ZH_CN' THEN nlv = 'cx'
+        WHEN Syslang == 'ZH_TW' THEN nlv = 'TW'
+        WHEN Syslang == 'ZH_CN' THEN nlv = 'CX'
         OTHERWISE PARSE VAR Syslang nlv '_' .
     END
 
-    /* Find the language file */
-    select
-        when STREAM( execDir'\'filestem||nlv'.msg', 'C', 'QUERY EXISTS') \= '' then do
-            say "  Found NLV file directly!"
-            settings.!messages = strip(execdir'\'filestem||nlv'.msg','L','\')
-            settings.!helpfile = strip(execdir'\'filestem||nlv'.hlp','L','\')
-        end
-        when SysSearchPath('DPATH', filestem||nlv'.msg') \= '' THEN DO
-            execDir = VRParseFileName(SysSearchPath('DPATH', filestem||nlv'.msg'),"DP")
-            say "  Found NLV file via DPATH"
-            settings.!messages = strip(execdir'\'filestem||nlv'.msg','L','\')
-            settings.!helpfile = strip(execdir'\'filestem||nlv'.hlp','L','\')
-        end
-        otherwise do
-            /* Added by Herwig Bauernfeind */
-            say "  Searching subdirectories"
-            ok = SysFileTree(execDir'\'filestem||nlv'.msg',nlvmsg.,'FOS')
-            if nlvmsg.0 = 1 then do
-                say "  Found NLV file in subdirectory"
-                settings.!messages = VRParseFilename(nlvmsg.1,"DPN")'.msg'
-                settings.!helpfile = VRParseFilename(nlvmsg.1,"DPN")'.hlp'
-                say "  Adding NLV file path to DPATH"
-                OldDPATH = value("DPATH",,"OS2ENVIRONMENT")
-                ok = value("DPATH",VRParseFilename(nlvmsg.1,"DP")';'OldDPATH,"OS2ENVIRONMENT")
-                say "  DPATH="value("DPATH",,"OS2ENVIRONMENT")
-            /* End addition by Herwig Bauernfeind */
-            end
-            else do
-                say "  Fallback to English"
-                if STREAM( execDir'\'filestem||'en.msg', 'C', 'QUERY EXISTS') = '' then do
-                    say "  Found English via DPATH"
-                    execDir = VRParseFileName(SysSearchPath('DPATH', filestem||'en.msg'),"DP")
-                end
-                settings.!messages = strip(execDir'\'filestem||'en.msg','L','\')
-                settings.!helpfile = strip(execDir'\'filestem||'en.hlp','L','\')
-            end
-        end
-    end
+    /* Find the messagefile and helpfile */
+    settings.!messages = NLVsearch(nlv,'LANG','MSG','DPATH')
+    settings.!helpfile = NLVsearch(nlv,'HELP','HLP','HELP')
 
-    /* In case the message file exists but not the help file */
-    if STREAM( settings.!helpfile , 'C', 'QUERY EXISTS') = "" then do
-        settings.!helpfile =  strip(execDir'\'filestem||'en.hlp','L','\')
-    end
-
-    IF options.!debug == 1 THEN SAY '  NLVMessageFile = "'settings.!messages'"'
-    IF options.!debug == 1 THEN SAY '  NLVHelpFile    = "'settings.!helpfile'"'
+    IF options.!debug == 1 THEN SAY '  NLV MessageFile = "'settings.!messages'"'
+    IF options.!debug == 1 THEN SAY '  NLV HelpFile    = "'settings.!helpfile'"'
 
     IF options.!debug == 1 THEN SAY time()' NLVSetup() done'
 RETURN
+
+/*:VRX         NLVSearch
+*/
+NLVSearch: procedure expose filestem execdir srchroot
+    nlv     = arg(1)
+    SubDir  = arg(2)
+    Suffix  = arg(3)
+    PathVar = arg(4)
+    say time()" NLVSearch() started"
+    NLVSrchDone = 0
+    NLVFile = ""
+    do until NLVSrchDone = 1
+        say '  NLV 'Suffix' file   = "'filestem||nlv'.'Suffix'"'
+        select
+            when VRFileExists(srchRoot'\'SubDir'\'filestem||nlv'.'Suffix) then do
+                say "  NLV "Suffix" file found directly!"
+                NLVFile = strip(srchRoot'\'SubDir'\'filestem||nlv'.'Suffix,'L','\')
+                NLVSrchDone = 1
+            end
+            when SysSearchPath(PathVar, filestem||nlv'.'Suffix) \= '' then do
+                execDir = VRParseFileName(SysSearchPath(PathVar, filestem||nlv'.'Suffix),"DP")
+                say "  NLV "Suffix" file found via "PathVar
+                NLVFile = strip(execdir'\'filestem||nlv'.'Suffix,'L','\')
+                NLVSrchDone = 1
+            end
+            otherwise do
+                say "  Searching subdirectories"
+                ok = SysFileTree(srchRoot'\'filestem||nlv'.'Suffix,nlvmsg.,'FOS')
+                if nlvmsg.0 = 1 then do
+                    say "  Found  NLV "Suffix" file in subdirectory"
+                    settings.!messages = VRParseFilename(nlvmsg.1,"DPN")'.msg'
+                    say "  Adding NLV "Suffix" path to "PathVar
+                    OldPathVar = value(PathVar,,"OS2ENVIRONMENT")
+                    ok = value(PathVar,VRParseFilename(nlvmsg.1,"DP")';'OldPathVar,"OS2ENVIRONMENT")
+                    NLVSrchDone = 1
+                end
+                else say "  NLV "Suffix" file not found in subdirectories!"
+            end
+        end
+        if NLVSrchDone = 0 then do /* Fallback to English */
+            if nlv = "EN" then NLVSrchDone = 1 /* We give up and leave */
+            else do
+                say "  NLV "Suffix" File not found, falling back to EN."
+                nlv = "EN"
+            end
+        end
+    end    
+    say time()' NLVSearch() done, returning "'NLVFile'"'
+return NLVFile
 
 /*:VRX         NLVGetMessage

branches/guitools-2.0/shared/smbtree.vrs

@@ -253 +253 @@
             if left(line,5) = "Error" then ok = VRMethod('CN_smbtree', 'SetRecordAttr', smbtree.!machine, 'UserData', "SERVER|"||strip(line))
 
-            do while(left(line,1) = '09'x)
+            do while(left(line,1) = '09'x) /* Share loop */
                 parse var line '09'x share type comment
                 type = translate(strip(type))
@@ -275 +275 @@
                 /* get next share */
                 line = linein(smbmachine.I)
-            end
+            end /* Share loop */
 
             do until left(line,10) = '09'x||'Workgroup'