Changeset 640 for trunk/guitools/evfsgui


Ignore:
Timestamp:
Sep 25, 2011, 7:05:11 PM (14 years ago)
Author:
Herwig Bauernfeind
Message:

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

Location:
trunk/guitools/evfsgui
Files:
3 edited

Legend:

Unmodified
Added
Removed

  • trunk/guitools/evfsgui/evfsgui.vrp

    r639 r640  
    1111VRXWindow: __VREFileListWindow,1,807,11033,1590,3358
    1212VRXWindow: __VRESectionListWindow,1,2674,10648,8696,4782
    13 VRXWindow: __VREToolsWindow,1,2529,723,6486,1665
     13VRXWindow: __VREToolsWindow,1,2529,723,6489,1667
    1414VRXWindow: __VREWindListWindow,1,542,8721,3770,3150
    1515UserFile: 1
    1616UserWindow: Main,1
    17 UserWindow: SW_MOUNTPOINT,1
    18 UserWindow: SW_SMBTREE,1
     17UserWindow: SW_INFO,1
    1918UserWindow: SW_CONDET,1

  • trunk/guitools/evfsgui/evfsgui.vrx

    r639 r640  
    324324    ok = VRMethod("CN_CONDET", "SetFieldAttr", cd.easupportFH ,   "Title", strip(NLVGetMessage(68),"T",":"))
    325325    ok = VRMethod("CN_CONDET", "SetFieldAttr", cd.rwfh ,          "Title", strip(NLVGetMessage(69),"T",":"))
     326
     327    /* SMBTree columns */
     328    WorkgroupFH= VRMethod( "CN_smbtree", "AddField", "String", "Workgroup"  )
     329    NBFH       = VRMethod( "CN_smbtree", "AddField", "String", "NetBIOS name" )
     330    IpFH       = VRMethod( "CN_smbtree", "AddField", "String", "IP"  )
     331    MBFH       = VRMethod( "CN_smbtree", "AddField", "String", "Role" )   
     332    OSFH       = VRMethod( "CN_smbtree", "AddField", "String", "OS" )   
     333    VersionFH  = VRMethod( "CN_SmbTree", "AddField", "String", "Version" )
     334    CommentFH  = VRMethod( "CN_smbtree", "AddField", "String", "Comment" )
     335    MacFH      = VRMethod( "CN_smbtree", "AddField", "String", "MAC" )
     336
     337    ok = VRMethod("CN_smbtree","SetfieldAttr",IPFH,       "ReadOnly", 1)
     338    ok = VRMethod("CN_smbtree","SetfieldAttr",NBFH,       "ReadOnly", 1)
     339    ok = VRMethod("CN_smbtree","SetfieldAttr",MBFH,       "ReadOnly", 1)
     340    ok = VRMethod("CN_smbtree","SetfieldAttr",WorkGroupFH,"ReadOnly", 1)
     341    ok = VRMethod("CN_smbtree","SetfieldAttr",OSFH,       "ReadOnly", 1)
     342    ok = VRMethod("CN_smbtree","SetfieldAttr",MacFH,      "ReadOnly", 1)
     343
    326344    IF options.!debug == 1 THEN SAY time()' _ContainersInit done'
    327345return
    … …  
    728746
    729747    /* Advanced */
    730     CALL VRSetIni 'Settings', 'EAS',           advanced.!eas          , settings.!ini, 'NoClose'
     748    CALL VRSetIni 'Settings', 'EAS',           advanced.!easupport    , settings.!ini, 'NoClose'
    731749    CALL VRSetIni 'Settings', 'ReadOnly',      advanced.!readonly     , settings.!ini, 'NoClose'
    732750    CALL VRSetIni 'Settings', 'AlwaysMP',      advanced.!alwaysmp     , settings.!ini, 'NoClose'
    … …  
    778796        upCmdLine = translate(CmdLine)
    779797        ForceNDFS = 1
    780         CALL VRSet "PB_AutoStart","Visible", 0
     798        CALL VRSet "Menu_File_Autostart","Visible", 0
    781799    end
    782800
    … …  
    11911209            CALL VRSet "CHK_MTYPE",  "Visible", 0
    11921210            CALL NLVSetText "DT_NETWORK", "Caption", 21
    1193             /* Does not make sense anymore */
    1194             /* if options.!editmode = 0 Then CALL VRSet "EF_NETWORK","Value", settings.!network */
    11951211        END
    11961212        WHEN mount == 2 THEN DO
    … …  
    12011217            CALL VRSet "CHK_MTYPE",  "Visible", 0
    12021218            CALL NLVSetText "DT_NETWORK", "Caption", 21
    1203             /* Does not make sense anymore  */
    1204             /* CALL VRSet "EF_NETWORK","Value", settings.!network */
    12051219        END
    12061220        WHEN mount == 3 THEN DO
    … …  
    12111225            CALL VRSet "CHK_MTYPE",  "Visible", 0
    12121226            CALL NLVSetText "DT_NETWORK", "Caption", 21
    1213             /* Does not make sense anymore */
    1214             /* CALL VRSet "EF_NETWORK","Value", settings.!network */
    12151227        END
    12161228        WHEN mount == 4 THEN DO
    … …  
    12211233            CALL VRSet "CHK_MTYPE",  "Visible", 1
    12221234            CALL NLVSetText "DT_NETWORK", "Caption", 22
    1223             /* Does not make sense anymore */
    1224             /* CALL VRSet "EF_NETWORK","Value", "" */
    12251235        END
    12261236    END
    … …  
    12921302        SAY '  p_string = "'p_string'"'
    12931303    end
    1294 /*
    1295     infotext = p_node
    1296     DO i = 1 TO p_mounts
    1297         infotext = infotext ' ['p_string']'
    1298     END
    1299 */
    1300     if p_string = "" then
    1301         infotext = fs.!name' 'fs.!version
    1302     else
    1303         infotext = p_string
    1304 
    1305 /* Herwig B.
    1306     CALL VRSet 'Main', 'StatusText', infotext */
     1304
     1305    if p_string = ""
     1306        then infotext = fs.!name' 'fs.!version
     1307        else infotext = p_string
     1308
    13071309    if infotext = "" then infotext = " "
    13081310    CALL VRSet "CN_CURRENT", "Caption", infotext
    13091311    CALL VRSet "CN_CURRENT", 'HintText',infotext
    1310 /* Herwig B. */
    13111312
    13121313    IF p_mounts > 0 THEN DO
    … …  
    13141315        CALL VRSet 'MENU_CONTEXT_UNMOUNT',     'Visible', 1
    13151316       
    1316         if pos("*",p_string) > 0 | pos(";",p_string) > 0 then CALL VRSet 'MENU_CONTEXT_EDIT', 'Visible', 0
    1317                                  else CALL VRSet 'MENU_CONTEXT_EDIT', 'Visible', 1
     1317        if pos("*",p_string) > 0 | pos(";",p_string) > 0
     1318            then CALL VRSet 'MENU_CONTEXT_EDIT', 'Visible', 0
     1319            else CALL VRSet 'MENU_CONTEXT_EDIT', 'Visible', 1
    13181320    END
    13191321    ELSE DO
    … …  
    13431345       
    13441346    END
     1347   
    13451348    parse var p_string p_workgroup':\\'p_server'\'p_share
    13461349
    1347     ok = VRSet("EF_Server","Value", p_server)
    1348 
     1350    p_server = translate(p_server)
     1351
     1352    ok = VRSet("EF_NETWORK","Value", p_workgroup)
     1353    wgh = _GetMachineHandle(p_workgroup)
     1354    if wgh = "" then wgh = _AddWorkGroup(p_workgroup)
     1355    ok = VRSet("EF_SERVER","Value", p_server)
     1356    mh = _GetMachineHandle(p_server)
     1357    if mh = "" then mh = _AddSleepingMachine(p_server,'',wgh)
     1358    machine = p_server
     1359    call _RefreshShares
     1360    ok = VRSet("EF_SHARE","Value", p_share)
    13491361    IF options.!debug == 1 THEN SAY time()' CN_CURRENT_Click done'
    13501362RETURN
    … …  
    13821394    END
    13831395*/
    1384     if p_string = "" then
    1385         infotext = fs.!name' 'fs.!version
    1386     else
    1387         infotext = p_string
    1388 
    1389 /* Herwig B.
    1390     CALL VRSet 'Main', 'StatusText', infotext */
     1396    if p_string = ""
     1397        then infotext = fs.!name' 'fs.!version
     1398        else infotext = p_string
     1399
    13911400    if infotext = "" then infotext = " "
    13921401    CALL VRSet "CN_CURRENT", "Caption", infotext
    13931402    CALL VRSet "CN_CURRENT", 'HintText',infotext
    1394 /* Herwig B. */
    13951403
    13961404    CALL VRSet 'MENU_CONTEXT_OPEN', 'Visible', 1
    … …  
    15031511            options.!autoload = 1
    15041512            Profile = srcFile
    1505             call PB_LOAD_Click
     1513            call Menu_File_Load_Click
    15061514            ok = VRSet("EF_NETWORK","Value",options.!workgroup)
    15071515        end
    … …  
    16721680    ok = VRSet("Menu_Selected_Info",             "Visible", 0) /* CN_SMBTREE */
    16731681    ok = VRSet("Menu_Selected_Default_Workgroup","Visible", 0) /* CN_SMBTREE */
    1674 
     1682ok = VRSet("Menu_Selected_TreeView","Visible",1)
     1683ok = VRSet("Menu_Selected_DetailsView","Visible",1)
    16751684    select
    16761685        when SMBObj.udatatype = "DISK" then do
    … …  
    18611870*/
    18621871EF_SERVER_Change:
     1872    IF options.!debug == 1 THEN SAY time()' EF_SERVER_Change started'
    18631873    Now = VRGet("EF_SERVER","value")
    18641874    if Now = "" then return
    1865     ok = SysSleep(1)
     1875    ok = SysSleep(2)
    18661876    if Now <> VRGet("EF_SERVER","value") then return
    18671877
    … …  
    18761886
    18771887    do I = 1 to rh.0
    1878 
    18791888        Userdata = VRMethod("CN_SMBTREE","GetRecordAttr",rh.I,"Userdata")
    18801889        ResName  = VRMethod("CN_SMBTREE","GetRecordAttr",rh.I,"Caption")
    … …  
    19191928        call _RefreshWorkgroups
    19201929        machine = VRGet("EF_SERVER","value")
    1921         smbtree.!machine = VRMethod( "CN_SMBTREE", "AddRecord",,, machine)
    1922         /* We make any machine as sleeping initially */
    1923         ok = VRMethod( "CN_SMBTREE", "SetRecordAttr", smbtree.!machine, "Icon",icons.!machine_sleeping)
    1924         ok = VRMethod( "CN_SMBTREE", "SetRecordAttr", smbtree.!machine, "ReadOnly", 1)
    1925         ok = VRMethod( "CN_SMBTREE", "SetFieldData",  smbtree.!machine, NBFH, machine)
     1930        smbtree.!machine = _AddSleepingMachine(machine,"","")
    19261931        call _UserCredUpdate
    19271932        call _RefreshShares
    … …  
    19331938        ok = VRSet("Pict_Throbber","Visible", 0)
    19341939    end
     1940    IF options.!debug == 1 THEN SAY time()' EF_SERVER_Change done'
    19351941return
    19361942
    … …  
    21482154
    21492155    Fatal = 0
     2156
    21502157    IF options.!debug == 1 THEN SAY time()' LoadFileSysFuncs() done'
    21512158return
    … …  
    22332240
    22342241    /* Tabbed Dialog = right pane */
     2242    ok = VRset("TDL_1", "Top",    marginx2)
    22352243    ok = VRset("TDL_1", "Left",   split_left + 60)
    22362244    ok = VRset("TDL_1", "Width",  rpane_width    )
    … …  
    23062314    ok = VRset("GB_SHARE", "Left",  margin )
    23072315    ok = VRset("GB_SHARE", "Top",   marginx2 /* 245 + marginx2 */ )
     2316    ok = VRset("GB_SHARE", "Height",  2252 )
    23082317    ok = VRset("GB_SHARE", "Width", rpane_width - marginx2 )
    23092318
    … …  
    26752684return
    26762685
     2686/*:VRX         Menu_File_Daemon_Start_Click
     2687*/
     2688Menu_File_Daemon_Start_Click:
     2689    IF options.!debug == 1 THEN SAY time()' Menu_File_Daemon_Start_Click started'
     2690    address cmd 'detach 'fs.!prefix'CTL.EXE'
     2691    ok = VRset("GB_CURRENT","Enabled", 1)
     2692    ok = VRset("TDL_1","Enabled", 1)
     2693    CALL REFRESH
     2694    ok = VRSet("Menu_File_Daemon_Start","Enabled",0)
     2695    ok = VRSet("Menu_File_Daemon_Stop","Enabled",1)
     2696    IF options.!debug == 1 THEN SAY time()' Menu_File_Daemon_Start_Click done'
     2697return
     2698
     2699/*:VRX         Menu_File_Daemon_Stop_Click
     2700*/
     2701Menu_File_Daemon_Stop_Click:
     2702    IF options.!debug == 1 THEN SAY time()' Menu_File_Daemon_Stop_Click started'
     2703    ok = PRProcessList(proc)
     2704    do I = 1 to proc.0
     2705        CurProc = VRParseFileName(proc.i.name,'NE')
     2706        if CurProc = fs.!prefix"CTL.EXE" then  do
     2707            call charout , '  'CurProc' RC='
     2708            ok = PRKillProcess(1,proc.i.pid)
     2709            say ok
     2710        end
     2711    end
     2712    ok = VRset("GB_CURRENT","Enabled", 0)
     2713    ok = VRset("TDL_1","Enabled", 0)
     2714    ok = VRSet("Menu_File_Daemon_Start","Enabled",1)
     2715    ok = VRSet("Menu_File_Daemon_Stop","Enabled",0)
     2716    IF options.!debug == 1 THEN SAY time()' Menu_File_Daemon_Stop_Click stopped'
     2717return
    26772718/*:VRX         Menu_File_Load_Click
    26782719*/
    … …  
    27582799return
    27592800
     2801/*:VRX         Menu_Selected_DetailsView_Click
     2802*/
     2803Menu_Selected_DetailsView_Click:
     2804    ok = VRSet("CN_smbtree", "View", "Detail")
     2805return
     2806
    27602807/*:VRX         Menu_Selected_Info_Click
    27612808*/
    … …  
    27702817
    27712818    call _GetSMBObjectProperties SelRH.1
    2772    
    2773     IF options.!debug == 1 THEN say '  'samba.!smbclientexe' -L "'SMBObj.resname'" -N 'debuglevel' 2>'samba.!msg' 1>NUL'
    2774     address cmd samba.!smbclientexe' -L "'SMBObj.resname'" -N 'debuglevel' 2>'samba.!msg' 1>NUL'
    2775     infoline = linein(samba.!msg)
    2776     if word(infoline,1) = "creating" then do /* upcase tables are missing */
    2777         say "Missing upcase tables detected!"
    2778         infoline = linein(samba.!msg)
    2779         infoline = linein(samba.!msg)
    2780     end
    2781     IF options.!debug == 1 THEN say '  Response = "'Infoline'"'
    2782     ok = stream(samba.!msg,'c','close')
    2783     ok = SysFileDelete(samba.!msg)
    27842819
    27852820    window = VRLoadSecondary( "SW_INFO", "W" )
    … …  
    28612896        if VRMethod("CN_CONDET", "GetRecordAttr", srcRec, "Icon") = icons.!passive then ok = VRMethod( "CN_CONDET", "RemoveRecord", srcRec)
    28622897    end
     2898return
     2899
     2900/*:VRX         Menu_Selected_TreeView_Click
     2901*/
     2902Menu_Selected_TreeView_Click:
     2903    ok = VRSet("CN_smbtree", "View", "IconTree")
    28632904return
    28642905
    … …  
    31813222*/
    31823223PB_CONDET_LOAD_Click:
    3183     IF options.!debug == 1 THEN SAY time()' '||"PB_REFRESH_Click started"
    3184     call PB_LOAD_CLICK
    3185     IF options.!debug == 1 THEN SAY time()' '||"PB_REFRESH_Click done"
     3224    IF options.!debug == 1 THEN SAY time()' '||"PB_CONDET_LOAD_Click started"
     3225    call Menu_File_Load_Click
     3226    IF options.!debug == 1 THEN SAY time()' '||"PB_CONDET_LOAD_Click done"
    31863227RETURN
    31873228
    … …  
    33303371    IF options.!debug == 1 THEN SAY time()' '||"PB_MOUNT_Click started"
    33313372    ok = VRSet("TM_RefreshCurrentDisplay","Enabled", 0)
    3332 say "network = "network
     3373    say "network = "network
    33333374    if options.!editmode = 1 then do
    33343375        CALL PB_UNMOUNT_Click
    33353376        options.!editmode = 0
    3336         ok = VRMethod("TDL_1","SetTabText", " "NLVGetMessage(13)" ")
     3377        ok = VRMethod("TDL_1","SetTabText", " "strip(NLVGetMessage(13))" ")
    33373378/*      CALL NLVSetText 'DT_DIALOG',        "Caption", 13 */
    33383379
    33393380        CALL VRSet "PB_UNMOUNT","Enabled", 1
    3340         CALL VRSet "PB_SAVE","Enabled", 1
    3341         CALL VRSet "PB_LOAD","Enabled", 1
    33423381        CALL VRSet "GB_CURRENT", "ENABLED", 1
    33433382    end
    … …  
    37853824    CALL VRMethod 'CB_DRIVES', 'Clear'
    37863825
    3787     CALL VRSet "CN_CURRENT", "Caption", ' '
     3826    CALL VRSet "CN_CURRENT", "Caption", fs.!Name' 'fs.!version
    37883827
    37893828    /* Herwig B.: Attention! The SysDrivemap function with the "free" parameter causes hangs in case it is called repeatedly! */
    … …  
    40674106*/
    40684107SW_INFO_Create:
     4108    IF options.!debug == 1 THEN SAY time()' SW_INFO_Create started'   
    40694109    call SW_INFO_Init
    40704110    CALL NLVSetText 'SW_INFO',    "Caption", 92
    … …  
    40744114    Info.ValueFH   = VRMethod( "CN_INFO", "AddField", "String", "Value" )
    40754115
    4076     parse var infoline "Domain=["WorkGroup"] OS=["OS"] Server=["Server"]"Rest
    40774116    Info.!domain = VRMethod( "CN_INFO", "AddRecord")
    4078     ok = VRMethod( "CN_INFO", "SetFieldData", Info.!domain, Info.TypeFH, strip(NLVGetMessage(21),'T',':'),Info.ValueFH, Workgroup )
    4079     Info.!os = VRMethod( "CN_INFO", "AddRecord")
    4080     ok = VRMethod( "CN_INFO", "SetFieldData", Info.!os, Info.TypeFH, strip(NLVGetMessage(93),'T',':'),Info.ValueFH, OS )
     4117    Info.!os     = VRMethod( "CN_INFO", "AddRecord")
    40814118    Info.!server = VRMethod( "CN_INFO", "AddRecord")
    4082     ok = VRMethod( "CN_INFO", "SetFieldData", Info.!server, Info.TypeFH, strip(NLVGetMessage(19),'T',':'),Info.ValueFH, Server )
    4083 
    40844119    Info.!status = VRMethod( "CN_INFO", "AddRecord")
     4120    Info.!DMBLMB = VRMethod( "CN_INFO", "AddRecord")
     4121    Info.!IP     = VRMethod( "CN_INFO", "AddRecord")
     4122    Info.!MAC    = VRMethod( "CN_INFO", "AddRecord")
     4123
     4124
     4125    ok = VRMethod( "CN_INFO", "SetFieldData", Info.!domain, Info.TypeFH, strip(NLVGetMessage(21),'T',':'),Info.ValueFH, VRMethod("CN_SMBTREE", "GetFieldData", SMBObj.RH, WorkGroupFH ))
     4126    ok = VRMethod( "CN_INFO", "SetFieldData", Info.!os,     Info.TypeFH, strip(NLVGetMessage(93),'T',':'),Info.ValueFH, VRMethod("CN_SMBTREE", "GetFieldData", SMBObj.RH, OSFH  ))
     4127    ok = VRMethod( "CN_INFO", "SetFieldData", Info.!server, Info.TypeFH, strip(NLVGetMessage(19),'T',':'),Info.ValueFH, VRMethod("CN_SMBTREE", "GetFieldData", SMBObj.RH, VersionFH  ))
     4128    ok = VRMethod( "CN_INFO", "SetFieldData", Info.!DMBLMB, Info.TypeFH, "Role",Info.ValueFH, VRMethod("CN_SMBTREE", "GetFieldData", SMBObj.RH, MBFH  ))
     4129    ok = VRMethod( "CN_INFO", "SetFieldData", Info.!IP,     Info.TypeFH, "IP"  ,Info.ValueFH, VRMethod("CN_SMBTREE", "GetFieldData", SMBObj.RH, IPFH  ))
     4130    ok = VRMethod( "CN_INFO", "SetFieldData", Info.!MAC,    Info.TypeFH, "MAC" ,Info.ValueFH, VRMethod("CN_SMBTREE", "GetFieldData", SMBObj.RH, MacFH ))
     4131
    40854132    ok = VRMethod( "CN_INFO", "SetFieldData", Info.!status, Info.TypeFH, strip(NLVGetMessage(67),'T',':'),Info.ValueFH, SMBObj.udatamsg )
    4086 
     4133    IF options.!debug == 1 THEN SAY time()' SW_INFO_Create done'   
    40874134return
    40884135
    … …  
    44064453TDL_1_PageSelected:
    44074454    page =  VRInfo("Page")
    4408 say "Page="page
     4455
    44094456    /* call _TabsStrip */
    44104457    select
Note: See TracChangeset for help on using the changeset viewer.