Changeset 643 for trunk/guitools

Timestamp:

Oct 16, 2011, 6:14:07 PM (14 years ago)

Author:

Herwig Bauernfeind

Message:

GUI-Tools: EVFSGUI 2.5.x: More work done

Location:

trunk/guitools

Files:

• evfsgui/evfsgui.vrp (modified) (1 diff)
• evfsgui/evfsgui.vrx (modified) (3 diffs)
• evfsgui/evfsgui.vry (modified) ( previous)
• shared/smbtree.vrs (modified) (3 diffs)

trunk/guitools/evfsgui/evfsgui.vrp

@@ -4 +4 @@
 VXOFile: VROBJEX
 VXOFile: VRSPLIT
-MacroPath: VRM:U:\Develop\Samba\trunk\guitools\evfsgui
+MacroPath: VRM:
 EXEPath: 
 RunParameters: 
 RunDirectory: U:\Develop\Samba\trunk\guitools\evfsgui
-VRXWindow: __VREMainWindow,1,1482,915,891,8034
-VRXWindow: __VREFileListWindow,1,807,11033,1590,3358
-VRXWindow: __VRESectionListWindow,1,2674,10648,8696,4782
-VRXWindow: __VREToolsWindow,1,2529,723,6480,1661
-VRXWindow: __VREWindListWindow,1,542,8721,3770,3150
+VRXWindow: __VREMainWindow,1,1951,2361,891,7841
+VRXWindow: __VREFileListWindow,1,2987,5155,2665,3358
+VRXWindow: __VREToolsWindow,0,2987,9010,6486,1669
+VRXWindow: __VREWindListWindow,1,1168,10841,2650,3150
 UserFile: 1
 UserWindow: Main,1
-UserWindow: SW_INFO,1
-UserWindow: SW_DIALOG,1
+UserWindow: SW_SMBTREE,1

trunk/guitools/evfsgui/evfsgui.vrx

@@ -99 +99 @@
 */
 return
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 /*:VRX         _AddTemplates
 */
@@ -3799 +3893 @@
 /*:VRX         PB_SMBTREE_REFRESH_Click
 */
-PB_SMBTREE_REFRESH_Click: PROCEDURE EXPOSE settings. options. icons. fs. samba. debuglevel advanced. UserCred Refreshmode
+PB_SMBTREE_REFRESH_Click: PROCEDURE EXPOSE settings. options. icons. fs. samba. debuglevel advanced. UserCred Refreshmode
     IF options.!debug == 1 THEN SAY time()' '||"PB_REFRESH_Click started"
 
@@ -3948 +4042 @@
     CALL NLVSetText 'PB_ABOUT_COPY',   "Caption", 121
 
-    ok = VRSEt("DT_About","Caption", 'EVFSGUI (c) 2007-2011 Alexander Taylor and Herwig Bauernfeind')
-    ABoutStr = "Samba Client Versions:"
+    ok = VRSet("DT_About","Caption", 'EVFSGUI (c) 2007-2011 Alexander Taylor and Herwig Bauernfeind')
 
     About.DscFH  = VRMethod( "CN_ABOUT", "AddField", "String", "Component" )
     About.ValFH  = VRMethod( "CN_ABOUT", "AddField", "String", "Version" )
 
-    call VRSet "SW_ABOUT", "Painting", 0
-    /* Filesystem version */
-    DummyRH = VRMethod('CN_About', 'AddRecord')
-    ok = VRMethod("CN_ABOUT", "SetFieldData", DummyRH, About.DscFH, "File system", About.ValFH, fs.!name' Version 'fs.!version)
-
-    AboutStr = AboutStr||'0D0A'x||"File system "||fs.!name' Version 'fs.!version
-
-    /* Plugin */
-    NDFSDir = value("NDFSDIR",,"OS2ENVIRONMENT")
-    plugindll. =""
-
-    if NDFSDir = "" then NDFSDir = SysBootDrive()'\ecs\dll'
-
-    ok = SysFileTree(NDFSDir'\ndpsmb.dll', "plugindll.", 'FOS')
-
-    if plugindll.0 > 0 then do
-        DummyRH = VRMethod('CN_About', 'AddRecord')
-        ok = VRMethod("CN_ABOUT", "SetFieldData", DummyRH, About.DscFH, "Plugin file", About.ValFH, plugindll.1)
-        AboutStr = AboutStr||'0D0A'x||"Plugin file "plugindll.1
-
-        address cmd 'bldlevel.exe 'plugindll.1' >'samba.!msg
-
-        I = 0
-        Dummy = linein(samba.!msg)
-        say Dummy
-        Dummy = linein(samba.!msg)
-        say Dummy
-        Dummy = linein(samba.!msg)
-        say Dummy
-        do until lines(samba.!msg) = 0
-            I = I + 1
-            line.I = linein(samba.!msg)
-            if pos('has no LAN component-style version string', line.I) > 0 then do
-                DummyRH = VRMethod('CN_About', 'AddRecord')
-                ok = VRMethod("CN_ABOUT", "SetFieldData", DummyRH, About.DscFH, "Error", About.ValFH, "Plugin has no LAN component-style version string")
-                leave
-            end
-            else do
-                parse var line.I desc':'vers
-                DummyRH = VRMethod('CN_About', 'AddRecord')
-                ok = VRMethod("CN_ABOUT", "SetFieldData", DummyRH, About.DscFH, "Plugin "Desc, About.ValFH, strip(Vers))
-                AboutStr = AboutStr||'0D0A'x||"Plugin "Desc" "strip(Vers)
-            end
-        end
-        line.0 = I
-        ok = stream(samba.!msg,'c','close')
-        ok = SysFileDelete(samba.!msg)
-    end
-    else do
-        DummyRH = VRMethod('CN_About', 'AddRecord')
-        ok = VRMethod("CN_ABOUT", "SetFieldData", DummyRH, About.DscFH, "Plugin", About.ValFH, "Not found!")
-        AboutStr = AboutStr||'0D0A'x||"Plugin not found!"
-    end
-
-    /* Commandline utilities */
-    address cmd samba.!smbclientexe' -V >'samba.!msg
-    ClutVer = linein(samba.!msg)
-    ok = stream(samba.!msg,'c','close')
-    ok = SysFileDelete(samba.!msg)
-
-    DummyRH = VRMethod('CN_About', 'AddRecord')
-    ok = VRMethod("CN_ABOUT", "SetFieldData", DummyRH, About.DscFH, "Commandline utility path", About.ValFH, VRParseFileName(samba.!smbclientexe,"DP"))
-
-    DummyRH = VRMethod('CN_About', 'AddRecord')
-    ok = VRMethod("CN_ABOUT", "SetFieldData", DummyRH, About.DscFH, "Commandline utilities", About.ValFH, ClutVer)
-    AboutStr = AboutStr||'0D0A'x||"Commandline utilities "||ClutVer
-
-    /* GUI Version */
-    DummyRH = VRMethod('CN_About', 'AddRecord')
-    ok = VRMethod("CN_ABOUT", "SetFieldData", DummyRH, About.DscFH, "EVFSGUI", About.ValFH, VRGet("Main", "HintText"))
-    AboutStr = AboutStr||'0D0A'x||"EVFSGUI"||VRGet("Main", "HintText")
-    call VRSet "SW_ABOUT", "Painting", 1
+    call _AboutSambaClientGetInfo
+
 return
 /*:VRX         SW_ABOUT_Fini

trunk/guitools/shared/smbtree.vrs

@@ -13 +13 @@
 
     say "  UserCred="UserCred
+
 
     /* smbtree -S = List workgroups (domains) and servers of tree */
-    say       '  detach 'samba.!smbtreeexe' 'BroadCast' -S 'UserCred' 'debuglevel' >'samba.!msg
-    address cmd 'detach 'samba.!smbtreeexe' 'BroadCast' -S 'UserCred' 'debuglevel' >'samba.!msg
+    say       '  detach 'samba.!smbtreeexe' 'BroadCast' -S 'UserCred' 'debuglevel' >'samba.!
+    address cmd 'detach 'samba.!smbtreeexe' 'BroadCast' -S 'UserCred' 'debuglevel' >'samba.!
 
     if BroadCast = '-b' then BroadCast = 1; else BroadCast = 0
@@ -34 +35 @@
     say time()' _RefreshTreeDisplay() started'
 
-    stat = stream(samba.!msg,'c','open read')
+    stat = stream(samba.!,'c','open read')
     if stat <> "READY:" then return
 
@@ -49 +50 @@
     drop smbtree.
 
-    ok = file2stem(samba.!msg,"smbtreeline.")
+    ok = file2stem(samba.!,"smbtreeline.")
 
     do sl = 1 to smbtreeline.0