Changeset 643


Ignore:
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:
4 edited

Legend:

Unmodified
Added
Removed

  • trunk/guitools/evfsgui/evfsgui.vrp

    r641 r643  
    44VXOFile: VROBJEX
    55VXOFile: VRSPLIT
    6 MacroPath: VRM:U:\Develop\Samba\trunk\guitools\evfsgui
     6MacroPath: VRM:
    77EXEPath:
    88RunParameters:
    99RunDirectory: U:\Develop\Samba\trunk\guitools\evfsgui
    10 VRXWindow: __VREMainWindow,1,1482,915,891,8034
    11 VRXWindow: __VREFileListWindow,1,807,11033,1590,3358
    12 VRXWindow: __VRESectionListWindow,1,2674,10648,8696,4782
    13 VRXWindow: __VREToolsWindow,1,2529,723,6480,1661
    14 VRXWindow: __VREWindListWindow,1,542,8721,3770,3150
     10VRXWindow: __VREMainWindow,1,1951,2361,891,7841
     11VRXWindow: __VREFileListWindow,1,2987,5155,2665,3358
     12VRXWindow: __VREToolsWindow,0,2987,9010,6486,1669
     13VRXWindow: __VREWindListWindow,1,1168,10841,2650,3150
    1514UserFile: 1
    1615UserWindow: Main,1
    17 UserWindow: SW_INFO,1
    18 UserWindow: SW_DIALOG,1
     16UserWindow: SW_SMBTREE,1

  • trunk/guitools/evfsgui/evfsgui.vrx

    r641 r643  
    9999*/
    100100return
     101/*:VRX         _AboutSambaClientGetInfo
     102*/
     103_AboutSambaClientGetInfo:
     104    call VRSet "SW_ABOUT", "Painting", 0
     105    if VRGet("CB_TRAC","set") then BR = '[[BR]]'
     106                              else BR = ''
     107
     108    ok = VRMethod( "CN_About", "RemoveRecord", "All" )
     109
     110    /* Filesystem version */
     111    DummyRH = VRMethod('CN_About', 'AddRecord')
     112    ok = VRMethod("CN_ABOUT", "SetFieldData", DummyRH, About.DscFH, "File system", About.ValFH, fs.!name' Version 'fs.!version)
     113    ABoutStr = "Samba Client Versions:"||BR
     114    AboutStr = AboutStr||'0D0A'x||"File system "||fs.!name' Version 'fs.!version||BR
     115    plugindll. =""
     116
     117    address cmd 'look4dll.exe ndpsmb.dll >'samba.!msg
     118    if RC <> 0 then do
     119        /* Plugin */
     120        NDFSDir = value("NDFSDIR",,"OS2ENVIRONMENT")
     121        if NDFSDir = "" then NDFSDir = SysBootDrive()'\ecs\dll'
     122        ok = SysFileTree(NDFSDir'\ndpsmb.dll', "plugindll.", 'FOS')
     123    end
     124    else do
     125        pluginline = linein(samba.!msg)
     126        ok = stream(samba.!msg,'c','close')
     127        ok = SysFileDelete(samba.!msg)
     128        parse var pluginline . 'loaded ' pluginline
     129        NDFSDir = VRParseFileName(pluginline,"DP")
     130        plugindll.0 = 1
     131        plugindll.1 = pluginline
     132    end
     133
     134    if plugindll.0 > 0 then do
     135      do J = 1 to plugindll.0
     136        DummyRH.1 = VRMethod('CN_About', 'AddRecord')
     137        ok = VRMethod("CN_ABOUT", "SetFieldData", DummyRH.1, About.DscFH, "Plugin file", About.ValFH, plugindll.J)
     138        AboutStr = AboutStr||'0D0A'x||"Plugin file "plugindll.J||BR
     139
     140        address cmd 'bldlevel.exe 'plugindll.J' >'samba.!msg
     141
     142        I = 0
     143        Dummy = linein(samba.!msg)
     144        say Dummy
     145        Dummy = linein(samba.!msg)
     146        say Dummy
     147        Dummy = linein(samba.!msg)
     148        say Dummy
     149        do until lines(samba.!msg) = 0
     150            I = I + 1
     151            line.I = linein(samba.!msg)
     152            if pos('has no LAN component-style version string', line.I) > 0 then do
     153                DummyRH = VRMethod('CN_About', 'AddRecord')
     154                ok = VRMethod("CN_ABOUT", "SetFieldData", DummyRH, About.DscFH, "Error", About.ValFH, "Plugin has no LAN component-style version string")
     155                leave
     156            end
     157            else do
     158                parse var line.I desc':'vers
     159                DummyRH = VRMethod('CN_About', 'AddRecord')
     160                ok = VRMethod("CN_ABOUT", "SetFieldData", DummyRH, About.DscFH, "Plugin "Desc, About.ValFH, strip(Vers))
     161                AboutStr = AboutStr||'0D0A'x||"Plugin "Desc" "strip(Vers)||BR
     162            end
     163        end
     164        line.0 = I
     165        ok = stream(samba.!msg,'c','close')
     166        ok = SysFileDelete(samba.!msg)
     167      end
     168    end
     169    else do
     170        DummyRH = VRMethod('CN_About', 'AddRecord')
     171        ok = VRMethod("CN_ABOUT", "SetFieldData", DummyRH, About.DscFH, "Plugin", About.ValFH, "Not found!")
     172        AboutStr = AboutStr||'0D0A'x||"Plugin not found!"||BR
     173    end
     174
     175    /* Commandline utilities */
     176    address cmd samba.!smbclientexe' -V >'samba.!msg
     177    ClutVer = linein(samba.!msg)
     178    ok = stream(samba.!msg,'c','close')
     179    ok = SysFileDelete(samba.!msg)
     180
     181    DummyRH = VRMethod('CN_About', 'AddRecord')
     182    ok = VRMethod("CN_ABOUT", "SetFieldData", DummyRH, About.DscFH, "Commandline utility path", About.ValFH, VRParseFileName(samba.!smbclientexe,"DP"))
     183
     184    DummyRH = VRMethod('CN_About', 'AddRecord')
     185    ok = VRMethod("CN_ABOUT", "SetFieldData", DummyRH, About.DscFH, "Commandline utilities", About.ValFH, ClutVer)
     186    AboutStr = AboutStr||'0D0A'x||"Commandline utilities "||ClutVer||BR
     187
     188    /* GUI Version */
     189    DummyRH = VRMethod('CN_About', 'AddRecord')
     190    ok = VRMethod("CN_ABOUT", "SetFieldData", DummyRH, About.DscFH, "EVFSGUI", About.ValFH, VRGet("Main", "HintText"))
     191    AboutStr = AboutStr||'0D0A'x||"EVFSGUI"||VRGet("Main", "HintText")||BR
     192    call VRSet "SW_ABOUT", "Painting", 1
     193return
     194
    101195/*:VRX         _AddTemplates
    102196*/
    … …  
    37993893/*:VRX         PB_SMBTREE_REFRESH_Click
    38003894*/
    3801 PB_SMBTREE_REFRESH_Click: PROCEDURE EXPOSE settings. options. icons. fs. samba. debuglevel advanced. UserCred Refreshmode
     3895PB_SMBTREE_REFRESH_Click: PROCEDURE EXPOSE settings. options. icons. fs. samba. debuglevel advanced. UserCred Refreshmode Tempdir
    38023896    IF options.!debug == 1 THEN SAY time()' '||"PB_REFRESH_Click started"
    38033897
    … …  
    39484042    CALL NLVSetText 'PB_ABOUT_COPY',   "Caption", 121
    39494043
    3950     ok = VRSEt("DT_About","Caption", 'EVFSGUI (c) 2007-2011 Alexander Taylor and Herwig Bauernfeind')
    3951     ABoutStr = "Samba Client Versions:"
     4044    ok = VRSet("DT_About","Caption", 'EVFSGUI (c) 2007-2011 Alexander Taylor and Herwig Bauernfeind')
    39524045
    39534046    About.DscFH  = VRMethod( "CN_ABOUT", "AddField", "String", "Component" )
    39544047    About.ValFH  = VRMethod( "CN_ABOUT", "AddField", "String", "Version" )
    39554048
    3956     call VRSet "SW_ABOUT", "Painting", 0
    3957     /* Filesystem version */
    3958     DummyRH = VRMethod('CN_About', 'AddRecord')
    3959     ok = VRMethod("CN_ABOUT", "SetFieldData", DummyRH, About.DscFH, "File system", About.ValFH, fs.!name' Version 'fs.!version)
    3960 
    3961     AboutStr = AboutStr||'0D0A'x||"File system "||fs.!name' Version 'fs.!version
    3962 
    3963     /* Plugin */
    3964     NDFSDir = value("NDFSDIR",,"OS2ENVIRONMENT")
    3965     plugindll. =""
    3966 
    3967     if NDFSDir = "" then NDFSDir = SysBootDrive()'\ecs\dll'
    3968 
    3969     ok = SysFileTree(NDFSDir'\ndpsmb.dll', "plugindll.", 'FOS')
    3970 
    3971     if plugindll.0 > 0 then do
    3972         DummyRH = VRMethod('CN_About', 'AddRecord')
    3973         ok = VRMethod("CN_ABOUT", "SetFieldData", DummyRH, About.DscFH, "Plugin file", About.ValFH, plugindll.1)
    3974         AboutStr = AboutStr||'0D0A'x||"Plugin file "plugindll.1
    3975 
    3976         address cmd 'bldlevel.exe 'plugindll.1' >'samba.!msg
    3977 
    3978         I = 0
    3979         Dummy = linein(samba.!msg)
    3980         say Dummy
    3981         Dummy = linein(samba.!msg)
    3982         say Dummy
    3983         Dummy = linein(samba.!msg)
    3984         say Dummy
    3985         do until lines(samba.!msg) = 0
    3986             I = I + 1
    3987             line.I = linein(samba.!msg)
    3988             if pos('has no LAN component-style version string', line.I) > 0 then do
    3989                 DummyRH = VRMethod('CN_About', 'AddRecord')
    3990                 ok = VRMethod("CN_ABOUT", "SetFieldData", DummyRH, About.DscFH, "Error", About.ValFH, "Plugin has no LAN component-style version string")
    3991                 leave
    3992             end
    3993             else do
    3994                 parse var line.I desc':'vers
    3995                 DummyRH = VRMethod('CN_About', 'AddRecord')
    3996                 ok = VRMethod("CN_ABOUT", "SetFieldData", DummyRH, About.DscFH, "Plugin "Desc, About.ValFH, strip(Vers))
    3997                 AboutStr = AboutStr||'0D0A'x||"Plugin "Desc" "strip(Vers)
    3998             end
    3999         end
    4000         line.0 = I
    4001         ok = stream(samba.!msg,'c','close')
    4002         ok = SysFileDelete(samba.!msg)
    4003     end
    4004     else do
    4005         DummyRH = VRMethod('CN_About', 'AddRecord')
    4006         ok = VRMethod("CN_ABOUT", "SetFieldData", DummyRH, About.DscFH, "Plugin", About.ValFH, "Not found!")
    4007         AboutStr = AboutStr||'0D0A'x||"Plugin not found!"
    4008     end
    4009 
    4010     /* Commandline utilities */
    4011     address cmd samba.!smbclientexe' -V >'samba.!msg
    4012     ClutVer = linein(samba.!msg)
    4013     ok = stream(samba.!msg,'c','close')
    4014     ok = SysFileDelete(samba.!msg)
    4015 
    4016     DummyRH = VRMethod('CN_About', 'AddRecord')
    4017     ok = VRMethod("CN_ABOUT", "SetFieldData", DummyRH, About.DscFH, "Commandline utility path", About.ValFH, VRParseFileName(samba.!smbclientexe,"DP"))
    4018 
    4019     DummyRH = VRMethod('CN_About', 'AddRecord')
    4020     ok = VRMethod("CN_ABOUT", "SetFieldData", DummyRH, About.DscFH, "Commandline utilities", About.ValFH, ClutVer)
    4021     AboutStr = AboutStr||'0D0A'x||"Commandline utilities "||ClutVer
    4022 
    4023     /* GUI Version */
    4024     DummyRH = VRMethod('CN_About', 'AddRecord')
    4025     ok = VRMethod("CN_ABOUT", "SetFieldData", DummyRH, About.DscFH, "EVFSGUI", About.ValFH, VRGet("Main", "HintText"))
    4026     AboutStr = AboutStr||'0D0A'x||"EVFSGUI"||VRGet("Main", "HintText")
    4027     call VRSet "SW_ABOUT", "Painting", 1
     4049    call _AboutSambaClientGetInfo
     4050
    40284051return
    40294052/*:VRX         SW_ABOUT_Fini

  • trunk/guitools/shared/smbtree.vrs

    r641 r643  
    1313
    1414    say "  UserCred="UserCred
     15    samba.!serverlist = TempDir'smbtree.srvlst'
    1516
    1617    /* smbtree -S = List workgroups (domains) and servers of tree */
    17     say       '  detach 'samba.!smbtreeexe' 'BroadCast' -S 'UserCred' 'debuglevel' >'samba.!msg
    18     address cmd 'detach 'samba.!smbtreeexe' 'BroadCast' -S 'UserCred' 'debuglevel' >'samba.!msg
     18    say       '  detach 'samba.!smbtreeexe' 'BroadCast' -S 'UserCred' 'debuglevel' >'samba.!serverlist
     19    address cmd 'detach 'samba.!smbtreeexe' 'BroadCast' -S 'UserCred' 'debuglevel' >'samba.!serverlist
    1920
    2021    if BroadCast = '-b' then BroadCast = 1; else BroadCast = 0
    … …  
    3435    say time()' _RefreshTreeDisplay() started'
    3536
    36     stat = stream(samba.!msg,'c','open read')
     37    stat = stream(samba.!serverlist,'c','open read')
    3738    if stat <> "READY:" then return
    3839
    … …  
    4950    drop smbtree.
    5051
    51     ok = file2stem(samba.!msg,"smbtreeline.")
     52    ok = file2stem(samba.!serverlist,"smbtreeline.")
    5253
    5354    do sl = 1 to smbtreeline.0
Note: See TracChangeset for help on using the changeset viewer.