Changeset 744


Ignore:
Timestamp:
Nov 16, 2012, 7:32:52 PM (13 years ago)
Author:
Herwig Bauernfeind
Message:

GUI-Tools: EVFSGUI 2.5 fix a bunch of bugs

Location:
trunk/guitools/evfsgui
Files:
3 edited

Legend:

Unmodified
Added
Removed

  • trunk/guitools/evfsgui/evfsgui.vrp

    r707 r744  
    1212VRXWindow: __VRESectionListWindow,1,1156,12382,12238,6914
    1313VRXWindow: __VREToolsWindow,0,3096,8528,6486,1669
    14 VRXWindow: __VREWindListWindow,1,723,8239,3686,3150
     14VRXWindow: __VREWindListWindow,1,723,8239,4963,3150
    1515UserFile: 1
    1616UserWindow: Main,1
    1717UserWindow: SW_LOGIN,1
    1818UserWindow: SW_INFO,1
     19UserWindow: SW_PORTCONNECT,1
     20UserWindow: SW_SMBTREE,1
    1921UserWindow: SW_CONDET,1
    2022UserWindow: SW_DIALOG,1

  • trunk/guitools/evfsgui/evfsgui.vrx

    r703 r744  
    379379    CD.mpointFH    = VRMethod( "CN_CONDET", "AddField", "String", "mpoint" )
    380380    CD.mpidxFH     = VRMethod( "CN_CONDET", "AddField", "String", "index" )
    381     CD.workgroupFH = VRMethod( "CN_CONDET", "AddField", "String", "workgroup" )
     381    CD.workgrpFH  = VRMethod( "CN_CONDET", "AddField", "String", "workgroup" )
    382382    CD.serverFH    = VRMethod( "CN_CONDET", "AddField", "String", "server" )
    383383    CD.shareFH     = VRMethod( "CN_CONDET", "AddField", "String", "share" )
    … …  
    397397
    398398    /* Connection details */
    399     ok = VRMethod("CN_CONDET", "SetFieldAttr", cd.mpidxfh ,       "Visible", 0)
    400     ok = VRMethod("CN_CONDET", "SetFieldAttr", cd.passwordfh ,    "Visible", 0)
    401     ok = VRMethod("CN_CONDET", "SetFieldAttr", cd.spasswordfh ,   "Visible", 0)
    402     ok = VRMethod("CN_CONDET", "SetFieldAttr", cd.masterFH ,      "Visible", 0)
    403     ok = VRMethod("CN_CONDET", "SetFieldAttr", cd.mtypeFH ,       "Visible", 0)
    404     ok = VRMethod("CN_CONDET", "SetFieldAttr", cd.memlenfh ,      "Visible", 0)
    405     ok = VRMethod("CN_CONDET", "SetFieldAttr", cd.logfilefh ,     "Visible", 0)
    406     ok = VRMethod("CN_CONDET", "SetFieldAttr", cd.loglevelfh ,    "Visible", 0)
    407     ok = VRMethod("CN_CONDET", "SetFieldAttr", cd.hashfh ,        "Visible", 0)
     399    ok = VRMethod("CN_CONDET", "SetFieldAttr", cd.mpidxfh ,       "Visible", options.!debug)
     400    ok = VRMethod("CN_CONDET", "SetFieldAttr", cd.passwordfh ,    "Visible", options.!debug)
     401    ok = VRMethod("CN_CONDET", "SetFieldAttr", cd.spasswordfh ,   "Visible", options.!debug)
     402    ok = VRMethod("CN_CONDET", "SetFieldAttr", cd.masterFH ,      "Visible", options.!debug)
     403    ok = VRMethod("CN_CONDET", "SetFieldAttr", cd.mtypeFH ,       "Visible", options.!debug)
     404    ok = VRMethod("CN_CONDET", "SetFieldAttr", cd.memlenfh ,      "Visible", options.!debug)
     405    ok = VRMethod("CN_CONDET", "SetFieldAttr", cd.logfilefh ,     "Visible", options.!debug)
     406    ok = VRMethod("CN_CONDET", "SetFieldAttr", cd.loglevelfh ,    "Visible", options.!debug)
     407    ok = VRMethod("CN_CONDET", "SetFieldAttr", cd.hashfh ,        "Visible", options.!debug)
    408408
    409409    ok = VRSet("CN_CONDET", "DetailSort", cd.mpointfh )
    … …  
    412412    ok = VRMethod("CN_CONDET", "SetFieldAttr", cd.statusfh ,      "Title", strip(NLVGetMessage(67),"T",":"))
    413413    ok = VRMethod("CN_CONDET", "SetFieldAttr", cd.mpointfh ,      "Title", strip(NLVGetMessage(27),"T",":"))
    414     ok = VRMethod("CN_CONDET", "SetFieldAttr", cd.workgroupfh ,   "Title", strip(NLVGetMessage(21),"T",":"))
     414    ok = VRMethod("CN_CONDET", "SetFieldAttr", cd.workgrpFH  ,   "Title", strip(NLVGetMessage(21),"T",":"))
    415415    ok = VRMethod("CN_CONDET", "SetFieldAttr", cd.serverFH ,      "Title", strip(NLVGetMessage(19),"T",":"))
    416416    ok = VRMethod("CN_CONDET", "SetFieldAttr", cd.shareFH ,       "Title", strip(NLVGetMessage(20),"T",":"))
    … …  
    12401240        if resdata = "" then leave
    12411241
    1242         PARSE Var resdata p_mpoint resource rwFlag
     1242        parse var resdata p_mpoint resource rwFlag
    12431243        if options.!debug == 1 then do
    1244             say "  resdata  ="resdata
    1245             say "  p_mpoint ="p_mpoint
    1246             say "  resource ="resource
    1247             say "  rwFlag   ="rwFlag
     1244            say '  'cnt' resdata  ="'resdata'"'
    12481245        end
    12491246
    … …  
    12601257        p_rw = rwFlag
    12611258
     1259        /* Create the hash string */
     1260        hashstr = p_mpoint' 'translate(p_workgroup)' 'translate(p_server)' 'translate(p_share)' 'p_user' 'p_spassword' 'p_easupport' 'p_rw
     1261
     1262        /* A truncated, useless entry - skip it */
     1263        if p_server = "" & p_share = ""& p_workgroup = "" then iterate
     1264
     1265        md5.cnt = rexx_md5(hashstr)
     1266        md5.0   = cnt
     1267
     1268        /* Passive connection already restored - skip the dupe one */
     1269        PassiveDupe = 0
     1270        do X = 1 to md5.0-1
     1271            if md5.cnt = md5.X then PassiveDupe = 1
     1272        end
     1273        if PassiveDupe = 1 then iterate /* do not add record for a duplicate passive connection */
     1274
     1275        /* Everything is ok, let's add a new entry */
    12621276        cd.lastrh = VRMethod("CN_CONDET","AddRecord")
    1263         if options.!debug == 1 then say "  cd.lastrh = "cd.lastrh
    1264 
    1265         ok = VRMethod("CN_CONDET", "SetFieldData", cd.lastrh, cd.mpointFH, p_mpoint, cd.mpidxfh, p_mpidx)
    1266         ok = VRMethod("CN_CONDET", "SetFieldData", cd.lastrh, cd.workgroupfh, p_workgroup, cd.serverfh, p_server, cd.sharefh, p_share)
    1267         ok = VRMethod("CN_CONDET", "SetFieldData", cd.lastrh, cd.userfh, p_user, cd.passwordfh, p_password, cd.spasswordfh, p_spassword)
    1268         ok = VRMethod("CN_CONDET", "SetFieldData", cd.lastrh, cd.ctoFH, p_cachetimeout,cd.cldFH, p_cachelistings)
    1269         ok = VRMethod("CN_CONDET", "SetFieldData", cd.lastrh, cd.masterfh, p_master, cd.mtypefh, p_mtype, cd.easupportfh, p_easupport, cd.rwfh, p_rw)
    1270 
    1271 /*      ok = VRMethod("CN_CONDET", "SetFieldData", cd.lastrh, cd.memlenfh, p_memlen, cd.logfilefh, p_logfile, cd.loglevelfh, p_loglevel ) */
    1272 
    1273         ok = VRMethod("CN_CONDET", "SetFieldData",  cd.lastrh, cd.statusfh, icons.!passive) /* Passive */
    1274         ok = VRMethod("CN_CONDET", "SetRecordAttr", cd.lastrh, "Icon", icons.!passive) /* Passive */
    1275 
    1276         hashstr = p_mpoint' 'translate(p_workgroup)' 'translate(p_server)' 'translate(p_share)' 'p_user' 'p_spassword' 'p_easupport' 'p_rw
    1277 
    1278         md5 = rexx_md5(hashstr)
    1279 
    1280         ok = VRMethod("CN_CONDET", "SetFieldData", cd.lastrh, cd.hashfh,md5)
    1281 
     1277
     1278        /* Fill columns now */
     1279        ok = VRMethod("CN_CONDET", "SetFieldData",  cd.lastrh, cd.mpointFH,    p_mpoint)
     1280        ok = VRMethod("CN_CONDET", "SetFieldData",  cd.lastrh, cd.mpidxfh,     p_mpidx)
     1281        ok = VRMethod("CN_CONDET", "SetFieldData",  cd.lastrh, cd.workgrpFH  , p_workgroup)
     1282        ok = VRMethod("CN_CONDET", "SetFieldData",  cd.lastrh, cd.serverfh,    p_server)
     1283        ok = VRMethod("CN_CONDET", "SetFieldData",  cd.lastrh, cd.sharefh,     p_share)
     1284        ok = VRMethod("CN_CONDET", "SetFieldData",  cd.lastrh, cd.userfh,      p_user)
     1285        ok = VRMethod("CN_CONDET", "SetFieldData",  cd.lastrh, cd.passwordfh,  p_password)
     1286        ok = VRMethod("CN_CONDET", "SetFieldData",  cd.lastrh, cd.spasswordfh, p_spassword)
     1287        ok = VRMethod("CN_CONDET", "SetFieldData",  cd.lastrh, cd.ctoFH,       p_cachetimeout)
     1288        ok = VRMethod("CN_CONDET", "SetFieldData",  cd.lastrh, cd.cldFH,       p_cachelistings)
     1289        ok = VRMethod("CN_CONDET", "SetFieldData",  cd.lastrh, cd.masterfh,    p_master)
     1290        ok = VRMethod("CN_CONDET", "SetFieldData",  cd.lastrh, cd.mtypefh,     p_mtype)
     1291        ok = VRMethod("CN_CONDET", "SetFieldData",  cd.lastrh, cd.easupportfh, p_easupport)
     1292        ok = VRMethod("CN_CONDET", "SetFieldData",  cd.lastrh, cd.rwfh,        p_rw)
     1293        ok = VRMethod("CN_CONDET", "SetFieldData",  cd.lastrh, cd.hashfh,      md5.cnt)
     1294        ok = VRMethod("CN_CONDET", "SetFieldData",  cd.lastrh, cd.statusfh,    icons.!passive)
     1295        ok = VRMethod("CN_CONDET", "SetRecordAttr", cd.lastrh, "Icon",         icons.!passive)
     1296
     1297/*      Obsolete fields:
     1298        ok = VRMethod("CN_CONDET", "SetFieldData",  cd.lastrh, cd.memlenfh,    p_memlen)
     1299        ok = VRMethod("CN_CONDET", "SetFieldData",  cd.lastrh, cd.logfilefh,   p_logfile)
     1300        ok = VRMethod("CN_CONDET", "SetFieldData",  cd.lastrh, cd.loglevelfh,  p_loglevel) */
    12821301    end
    12831302    if options.!debug == 1 then say time()' '||"_PassiveLoad done"
    … …  
    12991318            resdata = ""
    13001319            resdata = resdata||VRMethod("CN_CONDET","GetFieldData", records.i, cd.mpointfh)||" "
    1301             resdata = resdata||'\\'||VRMethod("CN_CONDET","GetFieldData", records.i, cd.workgroupfh)
     1320            resdata = resdata||'\\'||VRMethod("CN_CONDET","GetFieldData", records.i, cd.workgrpFH  )
    13021321            resdata = resdata||':'||VRMethod("CN_CONDET","GetFieldData", records.i, cd.serverfh)
    13031322            resdata = resdata||'\'||VRMethod("CN_CONDET","GetFieldData", records.i, cd.sharefh)
    13041323            resdata = resdata||'@'||VRMethod("CN_CONDET","GetFieldData", records.i, cd.userfh)
    1305             resdata = resdata||';WORKGROUP='||VRMethod("CN_CONDET","GetFieldData", records.i, cd.workgroupfh)
     1324            resdata = resdata||';WORKGROUP='||VRMethod("CN_CONDET","GetFieldData", records.i, cd.workgrpFH  )
    13061325            resdata = resdata||';SERVER='||VRMethod("CN_CONDET","GetFieldData", records.i, cd.serverfh)
    13071326            resdata = resdata||';SHARE='||VRMethod("CN_CONDET","GetFieldData", records.i, cd.sharefh)
    … …  
    17321751
    17331752    if Icon = icons.!printer then do /* Printers not supported at the moment */
     1753        call beep 4800,100
    17341754        CALL VRMessage 'Main', NLVGetMessage( 62 ), NLVGetMessage( 5 ), 'E'
    17351755    end
    … …  
    18041824/*      CALL VRSet 'MENU_CONTEXT_SEP2',       'Visible', 0 */
    18051825    END
    1806    
    1807     parse var p_string p_workgroup':\\'p_server'\'p_share
     1826
     1827    parse var p_string p_workgroup'\\'p_server'\'p_share
     1828
     1829    p_workgroup = strip(p_workgroup,'T',':')
     1830
     1831say "p_workgroup = "p_workgroup
     1832say "p_server    = "p_server
     1833say "p_share     = "p_share
    18081834
    18091835    p_server = translate(p_server)
    … …  
    19972023        p_mpoint    = VRMethod("CN_CONDET", "GetFieldData", srcRec, CD.MpointFH)
    19982024
    1999         p_workgroup = VRMethod("CN_CONDET", "GetFieldData", srcRec, CD.WorkgroupFH)
     2025        p_workgroup = VRMethod("CN_CONDET", "GetFieldData", srcRec, cd.workgrpFH  )
    20002026        p_server    = VRMethod("CN_CONDET", "GetFieldData", srcRec, CD.ServerFH)
    20012027        p_share     = VRMethod("CN_CONDET", "GetFieldData", srcRec, CD.ShareFH)
    … …  
    33313357/*:VRX         Menu_Selected_Retry_Click
    33323358*/
    3333 Menu_Selected_Retry_Click: PROCEDURE EXPOSE settings. options. icons. vfs. fs. advanced. cd. samba.
     3359Menu_Selected_Retry_Click: PROCEDURE EXPOSE settings. options. icons. vfs. fs. advanced. cd. samba. mtype.
    33343360
    33353361    ok = VRMethod( "CN_CONDET", "GetRecordList", "SourceOrSelected", "srcrec." )
    … …  
    33403366    p_mpoint    = VRMethod("CN_CONDET", "GetFieldData", srcrec, CD.MpointFH)
    33413367
    3342     p_workgroup = VRMethod("CN_CONDET", "GetFieldData", srcrec, CD.WorkgroupFH)
     3368    p_workgroup = VRMethod("CN_CONDET", "GetFieldData", srcrec, cd.workgrpFH  )
    33433369    p_server    = VRMethod("CN_CONDET", "GetFieldData", srcrec, CD.ServerFH)
    33443370    p_share     = VRMethod("CN_CONDET", "GetFieldData", srcrec, CD.ShareFH)
    … …  
    33693395    CALL PB_MOUNT_Click
    33703396
    3371     if VRMethod( "CN_CONDET", "ValidateRecord", srcRec) = 1 then do
     3397/*  if VRMethod( "CN_CONDET", "ValidateRecord", srcRec) = 1 then do
    33723398        if VRMethod("CN_CONDET", "GetRecordAttr", srcRec, "Icon") = icons.!passive then ok = VRMethod( "CN_CONDET", "RemoveRecord", srcRec)
    3373     end
     3399    end */
    33743400return
    33753401
    … …  
    36203646        end
    36213647
    3622         ok = VRMethod("CN_CONDET", "SetFieldData", cd.lastrh, cd.mpointFH, p_mpoint, cd.mpidxfh, p_mpidx, cd.workgroupfh, p_workgroup, cd.serverfh, p_server, cd.sharefh, p_share, cd.userfh, p_user)
     3648        ok = VRMethod("CN_CONDET", "SetFieldData", cd.lastrh, cd.mpointFH, p_mpoint, cd.mpidxfh, p_mpidx, cd.workgrpFH  , p_workgroup, cd.serverfh, p_server, cd.sharefh, p_share, cd.userfh, p_user)
    36233649        ok = VRMethod("CN_CONDET", "SetFieldData", cd.lastrh, cd.passwordfh, p_password, cd.spasswordfh, p_spassword, cd.masterfh, p_master, cd.mtypefh, p_mtype)
    36243650        ok = VRMethod("CN_CONDET", "SetFieldData", cd.lastrh, cd.ctoFH, p_cachetimeout, cd.cldFH, p_cachelistings)
    … …  
    37653791        resource = ""
    37663792        resource = resource||VRMethod("CN_CONDET","GetFieldData", records.i, cd.mpointfh)||" "
    3767         resource = resource||'\\'||VRMethod("CN_CONDET","GetFieldData", records.i, cd.workgroupfh)
     3793        resource = resource||'\\'||VRMethod("CN_CONDET","GetFieldData", records.i, cd.workgrpFH  )
    37683794        resource = resource||':'||VRMethod("CN_CONDET","GetFieldData", records.i, cd.serverfh)
    37693795        resource = resource||'\'||VRMethod("CN_CONDET","GetFieldData", records.i, cd.sharefh)
    37703796        resource = resource||'@'||VRMethod("CN_CONDET","GetFieldData", records.i, cd.userfh)
    3771         resource = resource||';WORKGROUP='||VRMethod("CN_CONDET","GetFieldData", records.i, cd.workgroupfh)
     3797        resource = resource||';WORKGROUP='||VRMethod("CN_CONDET","GetFieldData", records.i, cd.workgrpFH  )
    37723798        resource = resource||';SERVER='||VRMethod("CN_CONDET","GetFieldData", records.i, cd.serverfh)
    37733799        resource = resource||';SHARE='||VRMethod("CN_CONDET","GetFieldData", records.i, cd.sharefh)
    … …  
    43294355Quit:
    43304356    if Fatal <> 1 then CALL _INISave
    4331     ok = VRREdirectSTdio("OFF")
     4357    /* ok = VRREdirectSTdio("OFF") */
    43324358    window = VRWindow()
    43334359    call VRSet window, "Shutdown", 1
    … …  
    46534679        ok = VRMethod( "CN_INFO", "SetFieldData", Info.!status, Info.TypeFH, strip(NLVGetMessage(67),'T',':'),Info.ValueFH, rpc.srvinfo.LOGONSTATUS )
    46544680        /* we did not get these, but we know them anyway */
    4655         if rpc.srvinfo.NETBIOSNAME  = "" then ok = VRMethod( "CN_INFO", "SetFieldData", Info.!nbname, Info.TypeFH, strip(NLVGetMessage(137),'T',':'),Info.ValueFH, SMBObj.resname'ø')
    4656         if rpc.srvinfo.SERVERSTRING = "" then ok = VRMethod( "CN_INFO", "SetFieldData", Info.!comment,Info.TypeFH, strip(NLVGetMessage(125),'T',':'),Info.ValueFH, SMBObj.comment'ø')
     4681        if rpc.srvinfo.NETBIOSNAME  = "" then ok = VRMethod( "CN_INFO", "SetFieldData", Info.!nbname, Info.TypeFH, strip(NLVGetMessage(137),'T',':'),Info.ValueFH, SMBObj.resname)
     4682        if rpc.srvinfo.SERVERSTRING = "" then ok = VRMethod( "CN_INFO", "SetFieldData", Info.!comment,Info.TypeFH, strip(NLVGetMessage(125),'T',':'),Info.ValueFH, SMBObj.comment)
    46574683    end
    46584684    else do
Note: See TracChangeset for help on using the changeset viewer.