Changeset 317 for branches


Ignore:
Timestamp:
Aug 21, 2009, 7:53:42 AM (16 years ago)
Author:
Herwig Bauernfeind
Message:

GUI-Tools: More work on EVFSGUI V.next (connection details view)

Location:
branches/guitools-2.0
Files:
1 added
7 edited

Legend:

Unmodified
Added
Removed

  • branches/guitools-2.0/evfsgui/changes

    r316 r317  
    1010- Added: Splitbar between panels
    1111- Added: Create rudimentary %ETC%\samba\smb.conf
     12- Added: Connection details view (preliminary)
     13- Added: Double connection detection using hashes
     14- Added: New profile saving code
    1215- Fixed: CltInit uses smbclient.exe instead of smbd.exe to find Samba binaries
    1316- Fixed: Message queue during resize isn't cleared (no flashing during resize)
    … …  
    1518ToDo:
    1619- CltInit requires resync with SambaInit
    17 - Connection details page (required for new profile code)
    1820- Debug on/off option is badly implemented (rework required)
    1921- Advanced dialog should be split into connection options and global options

  • branches/guitools-2.0/evfsgui/evfsgui.VRP

    r316 r317  
    88VRXWindow: __VREMainWindow,1,530,2457,879,4071
    99VRXWindow: __VRESectionListWindow,1,337,11708,11623,3686
    10 VRXWindow: __VREToolsWindow,1,518,530,6993,1669
     10VRXWindow: __VREToolsWindow,1,518,530,6990,1659
    1111VRXWindow: __VREWindListWindow,1,482,7661,2650,3150
    1212UserFile: 1
    1313UserWindow: Main,1
    14 UserWindow: SW_ADVANCED,1
     14UserWindow: SW_LOGIN,1
     15UserWindow: SW_MOUNTPOINT,1

  • branches/guitools-2.0/evfsgui/evfsgui.VRX

    r316 r317  
    9494#append U:\Develop\Samba\guitools-2.0\shared\cltinit.vrs
    9595#append U:\Develop\Samba\guitools-2.0\shared\inittempdir.vrs
     96#append U:\Develop\Samba\guitools-2.0\shared\rexx_md5.VRS
    9697*/
    9798return
    … …  
    102103    VolTplRH = VRMethod('CN_CURRENT', 'AddRecord', , 'First', 'Volume template', '#10:PMWP.DLL' )
    103104    MpTplRH = VRMethod('CN_CURRENT', 'AddRecord', VolTplRH, 'First', 'Mountpoint template', '#10:PMWP.DLL'  )
     105return
     106
     107/*:VRX         _ContainersInit
     108*/
     109_ContainersInit:
     110
     111    /* Connection details */
     112    CD.StatusFH    = VRMethod( "CN_CONDET", "AddField", "Icon", "Status" )
     113    CD.mpointFH    = VRMethod( "CN_CONDET", "AddField", "String", "mpoint" )
     114    CD.workgroupFH = VRMethod( "CN_CONDET", "AddField", "String", "workgroup" )
     115    CD.serverFH    = VRMethod( "CN_CONDET", "AddField", "String", "server" )
     116    CD.shareFH     = VRMethod( "CN_CONDET", "AddField", "String", "share" )
     117    CD.userFH      = VRMethod( "CN_CONDET", "AddField", "String", "user" )
     118    CD.passwordFH  = VRMethod( "CN_CONDET", "AddField", "String", "password" )
     119    CD.spasswordFH = VRMethod( "CN_CONDET", "AddField", "String", "spassword" )
     120    CD.masterFH    = VRMethod( "CN_CONDET", "AddField", "String", "master" )
     121    CD.mtypeFH     = VRMethod( "CN_CONDET", "AddField", "String", "mastertype" )
     122    CD.memlenFH    = VRMethod( "CN_CONDET", "AddField", "String", "memlen" )
     123    CD.easupportFH = VRMethod( "CN_CONDET", "AddField", "String", "easupport" )
     124    CD.logfileFH   = VRMethod( "CN_CONDET", "AddField", "String", "logfile" )
     125    CD.loglevelFH  = VRMethod( "CN_CONDET", "AddField", "String", "loglevel" )
     126    CD.rwFH        = VRMethod( "CN_CONDET", "AddField", "String", "readonly" )
     127    CD.hashFH      = VRMethod( "CN_CONDET", "AddField", "String", "hash" )
     128
    104129return
    105130
    … …  
    226251RETURN
    227252
     253/*:VRX         CN_CONDET_DragStart
     254*/
     255CN_CONDET_DragStart:
     256   
     257    obj = VRInfo( "object" )
     258    ok = VRMethod( "CN_SMBTREE", "GetRecordList", "SourceOrSelected", "selrec." )
     259    if selrec.0 = 0 then return
     260
     261    Icon = VRMethod("CN_SMBTREE", "GetRecordAttr", selrec.1, "Icon")
     262
     263    if Icon = "#65:PMWP.DLL" then do /* Printers not supported at the moment */
     264        CALL VRMessage 'Main', NLVGetMessage( 62 ), NLVGetMessage( 5 ), 'E'
     265    end
     266    else call VRMethod obj, 'StartDrag'
     267return
     268
    228269/*:VRX         CN_CURRENT_Click
    229270*/
    … …  
    532573/*:VRX         GetChildren
    533574*/
    534 GetChildren: PROCEDURE EXPOSE existrec. exc options. fs.
     575GetChildren: PROCEDURE EXPOSE existrec. exc options. fs. cd.
    535576    IF options.!debug == 1 THEN SAY time()' '||"GetChildren started"
    536577    PARSE ARG node, parec
    … …  
    564605/*:VRX         GetMountPoints
    565606*/
    566 GetMountPoints: PROCEDURE EXPOSE existrec. options. fs.
     607GetMountPoints: PROCEDURE EXPOSE existrec. options. fs. cd.
    567608    IF options.!debug == 1 THEN SAY time()' '||"GetMountPoints started"
    568609    CALL VRSet 'CN_CURRENT', 'Painting', 0
    … …  
    592633        IF info.2 > 0 THEN icon = '#16:PMWP.DLL'
    593634        ELSE               icon = '#70:PMWP.DLL'
     635
    594636        rh = VRMethod('CN_CURRENT', 'AddRecord',, 'Last', attached.i, icon )
    595637        IF rh == '' THEN ITERATE
    … …  
    601643            userdata = ParseResourceData( userdata, res.j )
    602644        END
     645say '"'attached.i'" "'userdata'"'
    603646        CALL VRMethod 'CN_CURRENT', 'SetRecordAttr', rh, 'UserData', userdata
    604647        CALL VRMethod 'CN_CURRENT', 'SetRecordAttr', rh, 'Expanded', 1
    … …  
    747790        IF settings.!dialogon = "" then settings.!dialogon = 1
    748791
     792        settings.!condeton = VRGetIni('Settings', 'ConDetOn', settings.!ini, 'NoClose')
     793        IF settings.!condeton = "" then settings.!condeton = 1
     794
    749795        /* Load network */
    750796        settings.!network = VRGetIni('Settings', 'Network', settings.!ini, 'NoClose')
    … …  
    772818        options.!debug = advanced.!debug
    773819        IF options.!debug <> 1 THEN ok = VRRedirectStdIO("OFF")
     820
     821        advanced.!alwaysmp = VRGetIni('Settings', 'AlwaysMP', settings.!ini)
     822        IF advanced.!alwaysmp == '' THEN advanced.!alwaysmp = 1
    774823
    775824        /* Apply the settings
    … …  
    790839        if settings.!dialogon then call Menu_View_Dialog_Click
    791840
     841        ok = VRSet("Menu_View_ConDet","Checked", settings.!condeton)
     842        if settings.!condeton then do
     843            call Menu_View_ConDet_Click
     844            ok = VRset("GB_CONDET","Painting", 1)
     845            ok = VRset("GB_CONDET","Visible", 1)
     846        end
     847
     848
    792849        ok = VRSet("Menu_View_Smbtree","Checked", settings.!smbtreeon)
    793850        if settings.!smbtreeon then do
    … …  
    845902    CALL StemsInit
    846903
     904    CALL _ContainersInit
     905
    847906    CALL ParseCommandLine
    848907
    … …  
    854913
    855914    CALL LoadSettings
     915say 'advanced.!alwaysmp='advanced.!alwaysmp
    856916
    857917    /* Populate the GUI */
    … …  
    860920    ELSE
    861921        CALL Refresh
    862 
     922say 'advanced.!alwaysmp='advanced.!alwaysmp
    863923    CALL VRSet "CB_MOUNT",  "Selected", 1
    864924    CALL VRSet "CB_DRIVES", "Selected", 1
    … …  
    868928        if advanced.!browseimme == 1 then call PB_REFRESH_Click
    869929    end
     930say 'advanced.!alwaysmp='advanced.!alwaysmp
    870931    IF options.!debug == 1 THEN SAY time()' '||"Main_Create done"
    871932return
    … …  
    9541015    ok = VRset("PICT_THROBBER", "Top",   VRGet("CN_SMBTREE","Height")%2+100)
    9551016    ok = VRset("PICT_THROBBER", "Left",  VRGet("CN_SMBTREE","Width")%2-200)
     1017
     1018    /* Conection details stuff */
     1019    ok = VRSet("GB_CONDET", "Top",     FWidth)
     1020    ok = VRSet("GB_CONDET", "Left",    VRGet("SPLIT_Main","Left")+60)
     1021    ok = VRset("GB_CONDET", "Height",  VRGet("GB_CURRENT","Height"))
     1022    ok = VRset("GB_CONDET", "Width",   VRGet("Main","Width")-VRGet("SPLIT_Main","Left")-60-FWidth*2-32)
     1023
     1024    ok = VRset("GB_CONDET3","Top",     FWidth)
     1025    ok = VRset("GB_CONDET3","Left",    FWidth)
     1026    ok = VRset("GB_CONDET3","Height",  245  )
     1027    ok = VRset("GB_CONDET3","Width",   VRGet("GB_CONDET","Width") -(FWidth*2))
     1028
     1029    ok = VRset("DT_CONDET", "Top",     8)
     1030    ok = VRset("DT_CONDET", "Left",    8)
     1031    ok = VRset("DT_CONDET", "Width",   VRGet("GB_CONDET3","Width") - 24)
     1032
     1033    ok = VRset("GB_CONDET2","Left",    FWidth)
     1034    ok = VRset("GB_CONDET2","Top",     245 + FWidth*2)
     1035    ok = VRset("GB_CONDET2","Width",   VRGet("GB_CONDET","Width")-FWidth*2)
     1036    ok = VRset("GB_CONDET2","Height",  VRGet("GB_CONDET","Height")-FWidth*4-400-245)
     1037
     1038    ok = VRset("CN_CONDET",  "Top",    FWidth)
     1039    ok = VRset("CN_CONDET",  "Left",   FWidth)
     1040    ok = VRset("CN_CONDET",  "Width",  VRGet("GB_CONDET2","Width") -(FWidth*2))
     1041    ok = VRset("CN_CONDET",  "Height", VRGet("GB_CONDET2","Height")-(FWidth*2))
     1042
     1043    ok = VRset("PB_CONDET_SAVE", "Left",   FWidth)
     1044    ok = VRset("PB_CONDET_SAVE", "Top",    VRGet("GB_CONDET","Height")- 400-FWidth-12)
     1045    ok = VRset("PB_CONDET_LOAD", "Left",   FWidth*2 +1313 - 12)
     1046    ok = VRset("PB_CONDET_LOAD", "Top",    VRGet("GB_CONDET","Height")- 400-FWidth-12)
    9561047
    9571048    /* Dialog stuff */
    … …  
    11171208return
    11181209
     1210/*:VRX         Menu_View_ConDet_Click
     1211*/
     1212Menu_View_ConDet_Click:
     1213    if VRGet("TM_Throbber","Enabled") = 1 then ok = VRset("Pict_Throbber", "Visible", 0)
     1214
     1215    ok = VRset("GB_SMBTREE","Visible",  0)
     1216    ok = VRset("GB_SMBTREE","Painting", 0)
     1217    ok = VRset("GB_Dialog", "Visible",  0)
     1218    ok = VRset("GB_Dialog", "Painting", 0)
     1219    ok = VRset("GB_CONDET", "Visible",  1)
     1220    ok = VRset("GB_CONDET", "Painting", 1)
     1221
     1222    ok = VRSet("Menu_View_SmbTree","Checked",  0)
     1223    ok = VRSet("Menu_View_Dialog", "Checked",  0)
     1224    ok = VRSet("Menu_View_ConDet", "Checked",  1)
     1225return
     1226
    11191227/*:VRX         Menu_View_Dialog_Click
    11201228*/
    11211229Menu_View_Dialog_Click:
    11221230    if VRGet("TM_Throbber","Enabled") = 1 then ok = VRset("Pict_Throbber", "Visible", 0)
     1231
    11231232    ok = VRset("GB_SMBTREE","Visible", 0)
    11241233    ok = VRset("GB_SMBTREE","Painting", 0)
    1125     ok = VRset("GB_Dialog","Visible", 1)
    1126     ok = VRset("GB_Dialog","Painting", 1)
     1234    ok = VRset("GB_CONDET", "Visible",  0)
     1235    ok = VRset("GB_CONDET", "Painting", 0)
     1236    ok = VRset("GB_Dialog", "Visible", 1)
     1237    ok = VRset("GB_Dialog", "Painting", 1)
     1238
    11271239    ok = VRSet("Menu_View_SmbTree","Checked", 0)
    1128     ok = VRSet("Menu_View_Dialog","Checked", 1)
     1240    ok = VRSet("Menu_View_ConDet", "Checked", 0)
     1241    ok = VRSet("Menu_View_Dialog", "Checked", 1)
    11291242return
    11301243
    … …  
    11331246Menu_View_SmbTree_Click:
    11341247    if VRGet("TM_Throbber","Enabled") = 1 then ok = VRset("Pict_Throbber", "Visible", 1)
    1135     ok = VRset("GB_Dialog","Visible", 0)
     1248
     1249    ok = VRset("GB_Dialog",  "Visible", 0)
     1250    ok = VRset("GB_Dialog", "Painting", 0)
     1251    ok = VRset("GB_CONDET", "Visible",  0)
     1252    ok = VRset("GB_CONDET", "Painting", 0)
    11361253    ok = VRset("GB_SMBTREE","Painting", 1)
    1137     ok = VRset("GB_SMBTREE","Visible", 1)
     1254    ok = VRset("GB_SMBTREE","Visible",  1)
     1255
     1256    ok = VRSet("Menu_View_Dialog","Checked",  0)
     1257    ok = VRSet("Menu_View_ConDet","Checked",  0)
    11381258    ok = VRSet("Menu_View_SmbTree","Checked", 1)
    1139     ok = VRSet("Menu_View_Dialog","Checked", 0)
    11401259return
    11411260
    11421261/*:VRX         Mount
    11431262*/
    1144 Mount: PROCEDURE EXPOSE settings. options. vfs. fs. advanced.
     1263Mount: PROCEDURE EXPOSE settings. options. vfs. fs. advanced. cd.
    11451264    IF options.!debug == 1 THEN SAY time()' Mount procedure started'
    11461265    /* Set mouse pointer to wait - this operation might take a few seconds */
    … …  
    11711290    IF options.!debug == 1 THEN SAY time()' '||'Create "'vfs.!mountpoint'" = 'CreateMP
    11721291
    1173 say "options.!workgroup="options.!workgroup
     1292
    11741293    /* Build the resource parameter string */
    11751294    src = ''
    … …  
    11831302    IF options.!mastertype \= '' THEN src = src';MASTERTYPE='options.!mastertype
    11841303    IF options.!memlen     \= '' THEN src = src';MEMLEN='options.!memlen
    1185     IF options.!easupport  \= '' THEN src = src';EASUPPORT='options.!easupport
    11861304    IF options.!logfile    \= '' THEN src = src';LOGFILE='options.!logfile
    11871305    IF options.!loglevel   \= '' THEN src = src';LOGLEVEL='options.!loglevel
     1306    IF options.!easupport  \= '' THEN src = src';EASUPPORT='options.!easupport
    11881307
    11891308    IF options.!readonly = 1 then rwFlag = 'R'; else rwFlag = 'W'
    11901309
    1191 say 'src="'src'"'
     1310    parse var vfs.!mountpoint mpoint ';' .
     1311    mpoint = strip(mpoint,'T','\')||'\'
     1312
     1313    if options.!master   = "" then options.!master   = "WORKGROUP"
     1314    if options.!mtype    = "" then options.!mtype    = "1"
     1315    if options.!loglevel = "" then options.!loglevel = "0"
     1316    if options.!memlen   = "" then options.!memlen   = "2"
     1317    if options.!easupport= "" | options.!easupport= " " then options.!easupport = strip(options.!easupport)
     1318    if options.!password <> "" & options.!spassword = "" then do
     1319        options.!spassword = c2x(options.!password)
     1320        options.!password = ""
     1321    end
     1322
     1323    hashstr = mpoint' 'translate(options.!workgroup)' 'translate(options.!server)' 'translate(options.!share)' 'options.!user' 'options.!spassword' 'options.!easupport' 'rwFlag
     1324
     1325    md5 = rexx_md5(hashstr)
     1326
     1327    CALL VRMethod 'CN_CONDET', 'GetRecordList', 'All', 'records.'
     1328    DO i = 1 TO records.0
     1329        hash = VRMethod("CN_CONDET","GetFieldData", records.i, cd.hashfh)
     1330        if hash = md5 then do
     1331            buttons.0 = 2
     1332            buttons.1 = NLVGetMessage(9)
     1333            buttons.2 = NLVGetMessage(3)
     1334            Answer = VRMessage('Main',NLVGetMessage(64) , NLVGetMessage( 36,  options.!user||upw'@'options.!workgroup'\\'options.!server'\'options.!share, vfs.!mountpoint ), 'W','buttons.')
     1335            if Answer = 2 then do
     1336                call VRSet VRWindow(), 'Pointer', '<default>'
     1337                return
     1338            end
     1339        end
     1340    end
     1341
     1342    cd.lastrh = ""
     1343    ok = ParseResourceData(vfs.!mountpoint,'SMBFS SMBFS64 \\'options.!workgroup':'options.!server'\'options.!share'@'options.!user||src' 'rwFlag)
    11921344
    11931345    /* Now mount the resource */   
    … …  
    12071359            xx = VRMessage('Main', NLVGetMessage( 36,  options.!user||upw'@'options.!workgroup'\\'options.!server'\'options.!share, vfs.!mountpoint )||'0D0A'x||'0D0A'x||SysGetMessage(ok)||'0D0A'x||'0D0A'x||SysGetMessage(ok, 'OSO001H.MSG'), NLVGetMessage(37), 'W')
    12081360        end
    1209         /* In case the mountpoint was created for this failed operation, it is removed again */
    1210         if CreateMP = 0 then do       
     1361        if cd.lastrh <> '' then ok = VRMethod("CN_CONDET", "SetFieldData", cd.lastrh, cd.statusfh, '#68:PMWP.DLL')
     1362
     1363        /* In case the mountpoint was created for this failed operation, it is (optionally) removed again */
     1364        if CreateMP = 0 & \advanced.!alwaysmp then do       
    12111365            dyn ="ok = "fs.!prefix"RxDeleteMountPoint( vfs.!mountpoint )"
    12121366            interpret dyn
    … …  
    13731527    CALL NLVSetText 'Menu_View_SmbTree',  'Caption', 86
    13741528    CALL NLVSetText 'Menu_View_Buttons',  'Caption', 87
     1529    CALL NLVSetText 'Menu_View_ConDet',   'Caption', 88
    13751530
    13761531    CALL NLVSetText 'Menu_File_Autostart','Caption', 35
    … …  
    13841539    CALL NLVSetText 'PB_CONNECT',          'Caption', 28
    13851540    CALL NLVSetText 'PB_REFRESH',          'Caption', 38
    1386     /* Herwig B. */
     1541
     1542    CALL NLVSetText 'DT_CONDET',          'Caption', 63
     1543    CALL NLVSetText 'PB_CONDET_SAVE',     'Caption', 30
     1544    ok = VRSet("PB_CONDET_SAVE","Caption",VRGet("PB_CONDET_SAVE","Caption")||'(2)')
     1545    CALL NLVSetText 'PB_CONDET_LOAD',     'Caption', 31
     1546
    13871547
    13881548    mtype.0 = 4
    … …  
    14531613/*:VRX         ParseResourceData
    14541614*/
    1455 ParseResourceData: PROCEDURE EXPOSE userdata options. fs.
     1615ParseResourceData: PROCEDURE EXPOSE userdata options. advanced. fs. cd.
    14561616    PARSE ARG userdata, resdata
    1457     IF options.!debug == 1 THEN SAY time()' '||'ParseResourceData started, got "'resdata'"'
     1617    IF options.!debug == 1 THEN SAY time()' '||'ParseResourceData started, got "'userdata'" "'resdata'"'
    14581618
    14591619/*    PARSE VAR resdata . ';WORKGROUP='p_domain';SERVER='p_server';SHARE='p_share';' . */
    … …  
    14611621    if left(word(resdata,1),5) <> "SMBFS" then userData = "UNKNOWN"
    14621622    else do
     1623        cd.lastrh = VRMethod("CN_CONDET","AddRecord")
     1624        PARSE VAR userdata p_mpoint ';' .
     1625
     1626        p_mpoint = strip(p_mpoint,'T','\')||'\'
     1627        p_rw     = word(resdata, words(resdata))
     1628        resdata  = left(resdata,length(resdata)-length(p_rw))
     1629
    14631630        PARSE VAR resdata . 'WORKGROUP=' p_domain ';' .
    1464         PARSE VAR resdata . 'SERVER=' p_server ';' .
     1631        PARSE VAR resdata . 'SERVER=' p_server ';' . 
    14651632        PARSE VAR resdata . 'SHARE=' p_share ';' .
     1633        PARSE VAR resdata . 'USER=' p_user ';' .
     1634        PARSE VAR resdata . ';PASSWORD=' p_password ';' .
     1635        PARSE VAR resdata . 'SPASSWORD=' p_spassword ';' .
     1636        PARSE VAR resdata . 'MASTER=' p_master ';' .
     1637        PARSE VAR resdata . 'MASTERTYPE=' p_mtype ';' .
     1638        PARSE VAR resdata . 'MEMLEN=' p_memlen ';' .
     1639        PARSE VAR resdata . 'LOGFILE=' p_logfile ';' .
     1640        PARSE VAR resdata . 'LOGLEVEL=' p_loglevel ';' .
     1641        PARSE VAR resdata . 'EASUPPORT=' p_easupport ' '
     1642
     1643say "p_easupport = '"p_easupport"'"
     1644say "options.!easupport = '"options.!easupport"'"
     1645
     1646        if p_master   = "" then p_master   = "WORKGROUP"
     1647        if p_mtype    = "" then p_mtype    = "1"
     1648        if p_loglevel = "" then p_loglevel = "0"
     1649        if p_memlen   = "" then p_memlen   = "2"
     1650        if p_easupport= "" | p_easupport= " " then p_easupport = strip(options.!easupport)
     1651        if p_password <> "" & p_spassword = "" then do
     1652            p_spassword = c2x(p_password)
     1653            p_password = ""
     1654        end
     1655
     1656        ok = VRMethod("CN_CONDET", "SetFieldData", cd.lastrh, cd.mpointFH, p_mpoint, cd.workgroupfh, p_domain, cd.serverfh, p_server, cd.sharefh, p_share, cd.userfh, p_user)
     1657        ok = VRMethod("CN_CONDET", "SetFieldData", cd.lastrh, cd.passwordfh, p_password, cd.spasswordfh, p_spassword, cd.masterfh, p_master, cd.mtypefh, p_mtype)
     1658        ok = VRMethod("CN_CONDET", "SetFieldData", cd.lastrh, cd.memlenfh, p_memlen, cd.easupportfh, p_easupport, cd.logfilefh, p_logfile, cd.loglevelfh, p_loglevel, cd.rwfh, p_rw)
     1659        ok = VRMethod("CN_CONDET", "SetFieldData", cd.lastrh, cd.statusfh, '#64:PMWP.DLL')
     1660
     1661        hashstr = p_mpoint' 'translate(p_domain)' 'translate(p_server)' 'translate(p_share)' 'p_user' 'p_spassword' 'p_easupport' 'p_rw
     1662say "HashStr='"hashStr"'"
     1663        md5 = rexx_md5(hashstr)
     1664
     1665        ok = VRMethod("CN_CONDET", "SetFieldData", cd.lastrh, cd.hashfh,md5)
    14661666
    14671667        SELECT
    … …  
    14841684        END
    14851685    end
    1486     IF options.!debug == 1 THEN SAY time()' '||'ParseResourceData done, returning "'userdata'"'
     1686    IF options.!debug == 1 THEN SAY time()' '||'ParseresdataData done, returning "'userdata'"'
    14871687RETURN userdata
    14881688
    … …  
    15021702        advanced.!browseimme= adv_browseimme
    15031703        advanced.!debug     = adv_debug
     1704        advanced.!alwaysmp  = adv_alwaysmp
    15041705    END
    15051706
    … …  
    15251726PB_ADVOK_Click:
    15261727
    1527     adv_memlen   = VRGet( "SPB_MEMLEN",    "Value" )
    1528     adv_eas      = VRGet( "CB_EAS",        "Set" )
    1529     adv_readonly = VRGet( "CB_READONLY",   "Set" )
    1530     adv_loglevel = VRGet( "SPIN_LOGLEVEL", "Value" )
    1531     adv_logfile  = VRGet( "EF_LOGFILE",  "Value" )
    1532     adv_browseauth=VRGet( "CB_BROWSEAUTH", "Set" )
    1533     adv_browseimme=VRGet( "CB_BROWSEIMME", "Set" )
    1534     adv_debug     =VRGet( "CB_DEBUG",      "Set" )
     1728    adv_memlen     = VRGet( "SPB_MEMLEN",    "Value" )
     1729    adv_eas        = VRGet( "CB_EAS",        "Set" )
     1730    adv_readonly   = VRGet( "CB_READONLY",   "Set" )
     1731    adv_loglevel   = VRGet( "SPIN_LOGLEVEL", "Value" )
     1732    adv_logfile    = VRGet( "EF_LOGFILE",    "Value" )
     1733    adv_browseauth = VRGet( "CB_BROWSEAUTH", "Set" )
     1734    adv_browseimme = VRGet( "CB_BROWSEIMME", "Set" )
     1735    adv_debug      = VRGet( "CB_DEBUG",      "Set" )
     1736    adv_alwaysmp   = VRGet( "CB_ALWAYSMP",   "Set" )
    15351737
    15361738    adv_changed  = 1
    … …  
    15761778return
    15771779
     1780/*:VRX         PB_CONDET_LOAD_Click
     1781*/
     1782PB_CONDET_LOAD_Click:
     1783    IF options.!debug == 1 THEN SAY time()' '||"PB_REFRESH_Click started"
     1784    call PB_LOAD_CLICK
     1785    IF options.!debug == 1 THEN SAY time()' '||"PB_REFRESH_Click done"
     1786RETURN
     1787
     1788/*:VRX         PB_CONDET_SAVE_Click
     1789*/
     1790PB_CONDET_SAVE_Click: PROCEDURE EXPOSE settings. options. fs.  cd. advanced.
     1791    IF options.!debug == 1 THEN SAY time()' '||"PB_CONDET_SAVE_Click started"
     1792
     1793    if options.!autostart == 0 THEN filename = VRFileDialog('Main', NLVGetMessage( 50 ), 'S', '*.'fs.!profileext)
     1794    ELSE filename = Profile
     1795
     1796    IF filename == '' THEN RETURN
     1797
     1798    IF STREAM( filename, 'C', 'QUERY EXISTS') \= '' THEN DO
     1799        btns.0 = 2
     1800        btns.1 = NLVGetMessage( 6 )
     1801        btns.2 = NLVGetMessage( 7 )
     1802        confirm = VRMessage('Main', NLVGetMessage( 54, filename ), NLVGetMessage( 53 ), 'W', 'btns.', 1, 2 )
     1803        IF confirm \= 1 THEN RETURN
     1804        CALL VRChAttr filename,, 'HSR'
     1805        CALL VRDeleteFile filename
     1806    END
     1807
     1808    CALL VRMethod 'CN_CONDET', 'GetRecordList', 'All', 'records.'
     1809    DO i = 1 TO records.0
     1810        resdata = ""
     1811        resdata = resdata||VRMethod("CN_CONDET","GetFieldData", records.i, cd.mpointfh)||" "
     1812        resdata = resdata||'\\'||VRMethod("CN_CONDET","GetFieldData", records.i, cd.workgroupfh)
     1813        resdata = resdata||':'||VRMethod("CN_CONDET","GetFieldData", records.i, cd.serverfh)
     1814        resdata = resdata||'\'||VRMethod("CN_CONDET","GetFieldData", records.i, cd.sharefh)
     1815        resdata = resdata||'@'||VRMethod("CN_CONDET","GetFieldData", records.i, cd.userfh)
     1816        resdata = resdata||';WORKGROUP='||VRMethod("CN_CONDET","GetFieldData", records.i, cd.workgroupfh)
     1817        resdata = resdata||';SERVER='||VRMethod("CN_CONDET","GetFieldData", records.i, cd.serverfh)
     1818        resdata = resdata||';SHARE='||VRMethod("CN_CONDET","GetFieldData", records.i, cd.sharefh)
     1819        resdata = resdata||';USER='||VRMethod("CN_CONDET","GetFieldData", records.i, cd.userfh)
     1820        resdata = resdata||';PASSWORD='||VRMethod("CN_CONDET","GetFieldData", records.i, cd.passwordfh)
     1821        resdata = resdata||';SPASSWORD='||VRMethod("CN_CONDET","GetFieldData", records.i, cd.spasswordfh)
     1822        resdata = resdata||';MASTER='||VRMethod("CN_CONDET","GetFieldData", records.i, cd.masterfh)
     1823        resdata = resdata||';MASTERTYPE='||VRMethod("CN_CONDET","GetFieldData", records.i, cd.mtypefh)
     1824        resdata = resdata||';MEMLEN='||VRMethod("CN_CONDET","GetFieldData", records.i, cd.memlenfh)
     1825        resdata = resdata||';LOGFILE='||VRMethod("CN_CONDET","GetFieldData", records.i, cd.logfilefh)
     1826        resdata = resdata||';LOGLEVEL='||VRMethod("CN_CONDET","GetFieldData", records.i, cd.loglevelfh)
     1827        resdata = resdata||';EASUPPORT='||VRMethod("CN_CONDET","GetFieldData", records.i, cd.easupportfh)
     1828        resdata = resdata||' '||VRMethod("CN_CONDET","GetFieldData", records.i, cd.rwfh)
     1829        call lineout filename, resdata
     1830    END
     1831    CALL STREAM filename, 'C', 'CLOSE'
     1832    IF options.!debug == 1 THEN SAY time()' '||"PB_CONDET_SAVE_Click done"
     1833RETURN
     1834
    15781835/*:VRX         PB_CONNECT_Click
    15791836*/
    … …  
    16861943/*:VRX         PB_DETACH_Click
    16871944*/
    1688 PB_DETACH_Click: PROCEDURE EXPOSE settings. options. fs.
     1945PB_DETACH_Click: PROCEDURE EXPOSE settings. options. fs. cd.
    16891946    IF options.!debug == 1 THEN SAY time()' '||"PB_DETACH_Click started"
    16901947    CALL VRMethod 'CN_CURRENT', 'GetRecordList', 'Selected', 'select.'
    … …  
    17401997/*:VRX         PB_LOAD_Click
    17411998*/
    1742 PB_LOAD_Click: PROCEDURE EXPOSE settings. options. vfs. Profile fs.
    1743 
     1999PB_LOAD_Click: PROCEDURE EXPOSE settings. options. advanced. vfs. Profile fs. cd.
     2000say 'PB_load advanced.!browseimme='advanced.!browseimme
     2001say 'PB_load advanced.!alwaysmp='advanced.!alwaysmp
    17442002    IF options.!autoload == 1 then filename = Profile
    17452003    else filename = VRFileDialog('Main', NLVGetMessage( 55 ), 'L', '*.'fs.!profileext)
    … …  
    17522010    CALL LINEIN filename, 1, 0
    17532011    DO WHILE LINES( filename )
    1754         PARSE VALUE LINEIN( filename ) WITH node resource flag
     2012        PARSE VALUE LINEIN( filename ) WITH node resource rwFlag
    17552013
    17562014        vfs.!drive      = FILESPEC('DRIVE', node )
    … …  
    17702028        PARSE VAR resource . 'MASTERTYPE=' mtype ';' .
    17712029        PARSE VAR resource . 'MEMLEN=' memlen ';' .
     2030        PARSE VAR resource . 'LOGFILE=' logfile ';'.
     2031        PARSE VAR resource . 'LOGLEVEL=' loglevel ';' .
    17722032        PARSE VAR resource . 'EASUPPORT=' easupport .
    1773         PARSE VAR resource . 'LOGFILE=' logfile .
    1774         PARSE VAR resource . 'LOGLEVEL=' loglevel .
    17752033
    17762034        options.!workgroup  = workgroup
    … …  
    17872045        options.!loglevel   = loglevel
    17882046
    1789         IF flag == 'R' THEN
     2047        IF rwFlag == 'R' THEN
    17902048            options.!readonly = 1
    17912049        ELSE
    … …  
    18972155            END
    18982156            options.!server = server
     2157            options.!workgroup = network
    18992158        END
    19002159
    … …  
    19532212    advanced.!readonly  = VRGet("CB_READONLY1","Set")
    19542213    advanced.!easupport = VRGet("CB_EAS1","Set")
     2214    advanced.!alwaysmp  = VRGet("CB_ALWAYSMP1","Set")
    19552215say "advanced.!readonly = "advanced.!readonly
    19562216say "options.!readonly  = "options.!readonly
    … …  
    20212281/*:VRX         PB_UNMOUNT_Click
    20222282*/
    2023 PB_UNMOUNT_Click: PROCEDURE EXPOSE settings. options. fs.
     2283PB_UNMOUNT_Click: PROCEDURE EXPOSE settings. options. fs. cd.
    20242284    IF options.!debug == 1 THEN SAY time()' '||"PB_UNMOUNT_Click started"
    20252285    IF options.!debug == 1 THEN SAY time()' '||'options.!editmode = 'options.!editmode
    … …  
    20292289    userdata = VRMethod( 'CN_CURRENT', 'GetRecordAttr', select.1, 'UserData')
    20302290    PARSE VAR userdata mountpoint ';' mounts ';' .
    2031 
     2291say 'userdata="'userdata'"'
    20322292    IF mounts > 0 & options.!editmode = 0 THEN DO
    20332293        btns.0 = 2
    … …  
    20772337    IF options.!debug == 1 THEN SAY time()' '||"Refresh started"
    20782338    CALL VRMethod 'CN_CURRENT', 'RemoveRecord', 'All'
     2339
     2340    /* Remove Active connections from details view */
     2341    ok = VRMethod( 'CN_CONDET', "GetRecordList", 'All', "rh." )
     2342say "rh.0 = "rh.0
     2343    do I = 1 to rh.0
     2344say rh.i
     2345say cd.statusfh
     2346say VRMethod( "CN_CONDET", "GetFieldData", rh.i, cd.statusfh)
     2347        if VRMethod("CN_CONDET","GetFieldData", rh.i, cd.statusfh) = '#64:PMWP.DLL' then CALL VRMethod 'CN_CONDET', 'RemoveRecord', rh.i
     2348    end
    20792349
    20802350/* call _AddTemplates */
    … …  
    21372407    CALL VRSetIni 'Settings', 'DialogOn', settings.!dialogon, settings.!ini, 'NoClose'
    21382408
     2409    settings.!condeton = VRGet("Menu_View_ConDet","Checked")
     2410    CALL VRSetIni 'Settings', 'ConDetOn', settings.!condeton, settings.!ini, 'NoClose'
     2411
    21392412    CALL VRSetIni 'Settings', 'BrowseAuth', advanced.!browseauth, settings.!ini, 'NoClose'
    21402413    CALL VRSetIni 'Settings', 'BrowseImme', advanced.!browseimme, settings.!ini, 'NoClose'
    21412414    CALL VRSetIni 'Settings', 'Debug'     , advanced.!debug     , settings.!ini, 'NoClose'
     2415    CALL VRSetIni 'Settings', 'AlwaysMP'  , advanced.!alwaysmp  , settings.!ini, 'NoClose'
    21422416
    21432417    /* Save position and size */
    … …  
    21802454    options.!master     = ''
    21812455    options.!mastertype = ''
    2182     options.!memlen     = ''
    2183     options.!easupport  = ''
     2456    options.!memlen     = '2'
     2457    options.!easupport  = '1'
    21842458    options.!readonly   = ''
    21852459    options.!loglevel   = 0
    … …  
    21962470
    21972471    advanced.!memlen    = ''
    2198     advanced.!easupport = ''
     2472    advanced.!easupport = '1'
    21992473    advanced.!readonly  = ''
    2200     advanced.!loglevel  = 0
     2474    advanced.!loglevel  = '0'
    22012475    advanced.!logfile   = ''
    22022476    advanced.!browseauth= ''
    22032477    advanced.!browseimme= ''
    22042478    advanced.!debug     = ''
     2479    advanced.!alwaysmp  = ''
    22052480
    22062481    credentials.!username = ""
    … …  
    22702545        CALL VRSet 'CB_debug', 'Set', advanced.!debug
    22712546
     2547    IF advanced.!alwaysmp \= '' THEN
     2548        CALL VRSet 'CB_alwaysmp', 'Set', advanced.!alwaysmp
     2549
    22722550    window = VRInfo( "Object" )
    22732551    if( \VRIsChildOf( window, "Notebook" ) ) then do
    … …  
    23372615    ok = VRSet("CB_DRIVES1", "Value", VRGet("CB_Drives","Value"))
    23382616    ok = VRSet("EF_DIRECTORY1", "Value", VRGet("EF_Directory","Value"))
     2617    ok = VRSet("CB_ALWAYSMP1","set",advanced.!alwaysmp)
    23392618return
    23402619

  • branches/guitools-2.0/evfsgui/evfsi_de.mkm

    r316 r317  
    1111EVG0007I: ~Nein
    1212EVG0008I: Best„tige
    13 EVG0009?:
     13EVG0009I: Fortfahren
    1414; Main window UI
    1515EVG0010I: Aktuelle Verbindungen
    … …  
    6868EVG0061I: Fehler - konnte Objekt im Systemstart Ordner nicht erzeugen.
    6969EVG0062I: Drucker werden im Moment nicht untersttzt!
    70 EVG0063?:
    71 EVG0064?:
     70EVG0063I: Verbindungsdetails
     71EVG0064I: Diese Verbindung besteht bereits - trotzdem fortfahren?
    7272EVG0065?:
    7373EVG0066?:
    … …  
    9494EVG0086I: ~Strukturanzeige
    9595EVG0087I: ~Knopfleiste
    96 EVG0088I:
     96EVG0088I: ~Verbindungsdetailanzeige
    9797EVG0089?:
    9898EVG0090?:

  • branches/guitools-2.0/evfsgui/evfsi_en.mkm

    r316 r317  
    1111EVG0007I: ~No
    1212EVG0008I: Confirm
    13 EVG0009?:
     13EVG0009I: Continue
    1414; Main window UI
    1515EVG0010I: Current Resources
    … …  
    6868EVG0061I: Error - could not create object in Startup folder.
    6969EVG0062I: Printers are not supported at the moment!
    70 EVG0063?:
    71 EVG0064?:
     70EVG0063I: Connection details
     71EVG0064I: This connection already exists - continue anyway?
    7272EVG0065?:
    7373EVG0066?:
    … …  
    9494EVG0086I: ~Tree view
    9595EVG0087I: ~Buttons
    96 EVG0088?:
     96EVG0088?: ~Connection details view
    9797EVG0089?:
    9898EVG0090?:

  • branches/guitools-2.0/evfsgui/evfsi_fr.mkm

    r316 r317  
    1313EVG0007I: ~Non
    1414EVG0008I: Confirmer
    15 EVG0009?:
     15EVG0009I: Continuer
    1616; Main window UI
    1717EVG0010I: Ressources actuelles
Note: See TracChangeset for help on using the changeset viewer.