Changeset 324


Ignore:
Timestamp:
Sep 2, 2009, 9:50:14 AM (16 years ago)
Author:
Herwig Bauernfeind
Message:

GUI-Tools: More work on EVFSGUI V.next (NLV, sort, shared...)

Location:
branches/guitools-2.0
Files:
7 edited

Legend:

Unmodified
Added
Removed

  • branches/guitools-2.0/evfsgui/changes

    r321 r324  
    1818- Added: Preliminary context menus for Browse View and Connection details view
    1919- Added: "Retry" for passive connections (only manually for now)
     20- Added: Drag and drop for passive connections
     21- Added: Hide columns not useful for endusers
     22- Added: NLV enable (parts of) connection details
     23- Added: Disabled old profile saving code
     24- Added: Sort smbtree view ascending
    2025- Changed: Several changes in GUI style (as suggested by Alex Taylor)
    2126- Changed: Left align buttons in current connections panel (as suggested by
    … …  
    3035- Fixed: Missing NLV aware strings
    3136ToDo:
    32 - CltInit requires resync with SambaInit
     37- Major code refactoring
    3338- Create Icon. stem in order to ease maintainance of icons
    3439- Create mechanism to save passive connections across sessions
    3540- Debug on/off option is badly implemented (rework required)
    36 - smbtree.vrs: Sort options
     41- Edit and Selected menu easily get out of sync
    3742- Advanced dialog should be split into connection options and global options
    3843- smbtree error messages are ignored (requires more code from smbmon)

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

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

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

    r321 r324  
    127127    CD.hashFH      = VRMethod( "CN_CONDET", "AddField", "String", "hash" )
    128128
    129 return
    130 
     129    /* Connection details */
     130    ok = VRMethod("CN_CONDET", "SetFieldAttr", cd.passwordfh ,    "Visible", 0)
     131    ok = VRMethod("CN_CONDET", "SetFieldAttr", cd.spasswordfh ,   "Visible", 0)
     132    ok = VRMethod("CN_CONDET", "SetFieldAttr", cd.masterFH ,      "Visible", 0)
     133    ok = VRMethod("CN_CONDET", "SetFieldAttr", cd.mtypeFH ,       "Visible", 0)
     134    ok = VRMethod("CN_CONDET", "SetFieldAttr", cd.memlenfh ,      "Visible", 0)
     135    ok = VRMethod("CN_CONDET", "SetFieldAttr", cd.logfilefh ,     "Visible", 0)
     136    ok = VRMethod("CN_CONDET", "SetFieldAttr", cd.loglevelfh ,    "Visible", 0)
     137    ok = VRMethod("CN_CONDET", "SetFieldAttr", cd.hashfh ,        "Visible", 0)
     138
     139    /* NLV columns */
     140    ok = VRMethod("CN_CONDET", "SetFieldAttr", cd.statusfh ,      "Title", "Status")
     141    ok = VRMethod("CN_CONDET", "SetFieldAttr", cd.mpointfh ,      "Title", strip(NLVGetMessage(27),"T",":"))
     142    ok = VRMethod("CN_CONDET", "SetFieldAttr", cd.workgroupfh ,   "Title", strip(NLVGetMessage(21),"T",":"))
     143    ok = VRMethod("CN_CONDET", "SetFieldAttr", cd.serverFH ,      "Title", strip(NLVGetMessage(19),"T",":"))
     144    ok = VRMethod("CN_CONDET", "SetFieldAttr", cd.shareFH ,       "Title", strip(NLVGetMessage(20),"T",":"))
     145    ok = VRMethod("CN_CONDET", "SetFieldAttr", cd.userfh ,        "Title", strip(NLVGetMessage(25),"T",":"))
     146    ok = VRMethod("CN_CONDET", "SetFieldAttr", cd.easupportfh ,   "Title", "EA")
     147    ok = VRMethod("CN_CONDET", "SetFieldAttr", cd.rwfh ,          "Title", "R/W") 
     148return
    131149/*:VRX         _CreateSmbConf
    132150*/
    … …  
    436454CN_CURRENT_DragDrop:
    437455say "settings.!network = "settings.!network
    438     NewWG    = ''
    439     NewSrv   = ''
    440     NewShare = ''
     456    p_workgroup    = ''
     457    p_server   = ''
     458    p_share = ''
    441459
    442460    srcCtn = VRInfo( "SourceObject" )
    … …  
    450468    say "TargetRecord = '"trgRec"'"
    451469
    452     DragCapt = VRMethod(srcCtn, "GetRecordAttr", srcRec, "Caption")
    453     parRH = VRMethod(srcCtn, "GetRecordAttr", srcRec, "Parent")
    454 
    455     if parRH = "" then do /* A workgroup was dragged */
    456         say "Workgroup dragged!"
    457         parse var DragCapt NewWG '0D0A'x .
    458         NewWG = strip(NewWG)
    459         ok = VRSet("EF_NETWORK","Value",strip(NewWG))
    460         ok = VRSet("EF_SERVER","Value","")
    461         ok = VRSet("EF_SHARE","Value","")
    462 
    463         ShareLevel = 3
    464     end
    465     else do
    466         ParDragCapt = VRMethod(srcCtn, "GetRecordAttr", ParRH, "Caption")
    467         GParRH = VRMethod(srcCtn, "GetRecordAttr", ParRH, "Parent")
    468 
    469         if GParRH = "" then do /* A server was dragged */
    470             say "Server dragged!"
    471             parse var ParDragCapt NewWG '0D0A'x .
    472             ok = VRSet("EF_NETWORK","Value",strip(NewWG))
    473             NewWG = strip(NewWG)
    474 
    475             parse var DragCapt NewSrv '0D0A'x .
    476             NewSrv = strip(NewSrv)
    477             ok = VRSet("EF_SERVER","Value",strip(NewSrv))
    478             ok = VRSet("EF_Share","Value","")
    479 
    480             ShareLevel = 2
     470    if VRGet(srcCtn,'Name') = "CN_CONDET" then do
     471        p_mpoint    = VRMethod("CN_CONDET", "GetFieldData", srcRec, CD.MpointFH)
     472
     473        p_workgroup = VRMethod("CN_CONDET", "GetFieldData", srcRec, CD.WorkgroupFH)
     474        p_server    = VRMethod("CN_CONDET", "GetFieldData", srcRec, CD.ServerFH)
     475        p_share     = VRMethod("CN_CONDET", "GetFieldData", srcRec, CD.ShareFH)
     476        p_user      = VRMethod("CN_CONDET", "GetFieldData", srcRec, CD.UserFH)
     477        p_password  = x2c(VRMethod("CN_CONDET", "GetFieldData", srcRec, CD.SpasswordFH))
     478
     479        ShareLevel = 1
     480        if p_share     = "" then ShareLevel = 2
     481        if p_server    = "" then ShareLevel = 3
     482        if p_workgroup = "" then ShareLevel = 4
     483
     484        ok = VRSet( "CB_MOUNT", "Selected", Sharelevel )
     485        ok = VRset("CB_MOUNT"  , "Value", mtype.sharelevel)
     486
     487        ok = VRset("EF_SERVER" ,  "Value", p_server)
     488        ok = VRset("EF_SHARE"  ,  "Value", p_share)
     489        ok = VRset("EF_NETWORK",  "Value", p_workgroup)
     490        ok = VRset("EF_USER"   ,  "Value", p_user)
     491        ok = VRset("EF_PASSWORD", "Value", p_password)
     492
     493        parse var p_mpoint p_drv '\' p_dir
     494
     495        p_dir = strip(p_dir,'T','\')
     496
     497        ok = VRset("CB_DRIVES"      ,  "Value", p_drv)
     498        ok = VRset("EF_DIRECTORY"   ,  "Value", p_dir)
     499
     500        ok = VRMethod( srcCtn, "RemoveRecord", srcRec)
     501
     502
     503    end
     504    else do /* SmbTree */
     505        DragCapt = VRMethod(srcCtn, "GetRecordAttr", srcRec, "Caption")
     506        parRH = VRMethod(srcCtn, "GetRecordAttr", srcRec, "Parent")
     507
     508        if parRH = "" then do /* A workgroup was dragged */
     509            say "Workgroup dragged!"
     510            parse var DragCapt p_workgroup '0D0A'x .
     511            p_workgroup = strip(p_workgroup)
     512            ok = VRSet("EF_NETWORK","Value",strip(p_workgroup))
     513            ok = VRSet("EF_SERVER","Value","")
     514            ok = VRSet("EF_SHARE","Value","")
     515
     516            ShareLevel = 3
    481517        end
    482         else do /* A share was dragged */
    483             say "Share dragged!"
    484             GParDragCapt = VRMethod(srcCtn, "GetRecordAttr", GParRH, "Caption")
    485 
    486             parse var GParDragCapt NewWG '0D0A'x .
    487             NewWG = strip(NewWG)
    488             ok = VRSet("EF_NETWORK","Value",strip(NewWG))
    489 
    490             parse var ParDragCapt NewSrv '0D0A'x .
    491             NewSrv = strip(NewSrv)
    492             ok = VRSet("EF_SERVER","Value",strip(NewSrv))
    493 
    494             parse var DragCapt NewShare '0D0A'x .
    495             NewShare = strip(NewShare)
    496             ok = VRSet("EF_Share","Value",strip(NewShare))
    497 
    498             ShareLevel = 1
     518        else do
     519            ParDragCapt = VRMethod(srcCtn, "GetRecordAttr", ParRH, "Caption")
     520            GParRH = VRMethod(srcCtn, "GetRecordAttr", ParRH, "Parent")
     521   
     522            if GParRH = "" then do /* A server was dragged */
     523                say "Server dragged!"
     524                parse var ParDragCapt p_workgroup '0D0A'x .
     525                ok = VRSet("EF_NETWORK","Value",strip(p_workgroup))
     526                p_workgroup = strip(p_workgroup)
     527
     528                parse var DragCapt p_server '0D0A'x .
     529                p_server = strip(p_server)
     530                ok = VRSet("EF_SERVER","Value",strip(p_server))
     531                ok = VRSet("EF_Share","Value","")
     532
     533                ShareLevel = 2
     534            end
     535            else do /* A share was dragged */
     536                say "Share dragged!"
     537                GParDragCapt = VRMethod(srcCtn, "GetRecordAttr", GParRH, "Caption")
     538
     539                parse var GParDragCapt p_workgroup '0D0A'x .
     540                p_workgroup = strip(p_workgroup)
     541                ok = VRSet("EF_NETWORK","Value",strip(p_workgroup))
     542
     543                parse var ParDragCapt p_server '0D0A'x .
     544                p_server = strip(p_server)
     545                ok = VRSet("EF_SERVER","Value",strip(p_server))
     546
     547                parse var DragCapt p_share '0D0A'x .
     548                p_share = strip(p_share)
     549                ok = VRSet("EF_Share","Value",strip(p_share))
     550
     551                ShareLevel = 1
     552            end
    499553        end
    500554    end
    501555
    502     say 'NewWG    = "'NewWG'"'
    503     say 'NewSrv   = "'NewSrv'"'
    504     say 'NewShare = "'NewShare'"'
     556    say 'p_workgroup    = "'p_workgroup'"'
     557    say 'p_server   = "'p_server'"'
     558    say 'p_share = "'p_share'"'
    505559
    506560    ok = VRSet( "CB_MOUNT", "Selected", Sharelevel )
    … …  
    12161270*/
    12171271Menu_File_Save_Click:
    1218     call PB_SAVE_Click
     1272    call PB_CONDET_SAVE_Click
    12191273return
    12201274
    … …  
    13251379    ok = VRSet("Menu_View_ConDet", "Checked",  1)
    13261380
    1327     ok = VRSet("Menu_Selected_Remove", "Visible",  1)
    1328     ok = VRSet("Menu_Selected_Retry", "Visible",  1)
    13291381    ok = VRMethod( "CN_CONDET", "GetRecordList", "All", "records." )
    1330     ok = VRSet("Menu_Selected_Remove", "Enabled",  (records.0 = 0))
    1331     ok = VRSet("Menu_Selected_Retry", "Enabled",  (records.0 = 0))
    1332 
     1382    ok = VRSet("Menu_Selected_Remove", "Visible",  (records.0 <> 0))
     1383    ok = VRSet("Menu_Selected_Retry", "Visible",  (records.0 <> 0))
    13331384    ok = VRSet("Menu_Selected_Connect", "Visible",  0)
    13341385return
    … …  
    13511402
    13521403    ok = VRSet("Menu_Selected_Remove", "Visible",  0)
    1353     ok = VRSet("Menu_Selected_Retry", "Visible",  0)
     1404    ok = VRSet("Menu_Selected_Retry",  "Visible",  0)
    13541405
    13551406    ok = VRSet("Menu_Selected_Connect", "Visible",  0)
    … …  
    14791530        end
    14801531        if cd.lastrh <> '' then do
    1481             ok = VRMethod("CN_CONDET", "SetFieldData", cd.lastrh, cd.statusfh, '#68:PMWP.DLL') /* Passive Connection icon */
    1482             ok = VRMethod("CN_CONDET", "SetFieldData", cd.lastrh, cd.passwordfh, '') /* remove pain text password */
     1532            ok = VRMethod("CN_CONDET", "SetFieldData",  cd.lastrh, cd.statusfh, '#68:PMWP.DLL') /* Passive Connection icon */
     1533            ok = VRMethod("CN_CONDET", "SetRecordAttr", cd.lastrh, "Icon", '#68:PMWP.DLL') /* Passive Connection icon */
     1534            ok = VRMethod("CN_CONDET", "SetFieldData",  cd.lastrh, cd.passwordfh, '') /* remove pain text password */
    14831535        end
    14841536
    … …  
    16691721    CALL NLVSetText 'DT_CONDET',          'Caption', 63
    16701722    CALL NLVSetText 'PB_CONDET_SAVE',     'Caption', 30
    1671     ok = VRSet("PB_CONDET_SAVE","Caption",VRGet("PB_CONDET_SAVE","Caption")||'(2)')
    16721723    CALL NLVSetText 'PB_CONDET_LOAD',     'Caption', 31
    16731724
    … …  
    17851836        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)
    17861837        ok = VRMethod("CN_CONDET", "SetFieldData", cd.lastrh, cd.statusfh, '#64:PMWP.DLL') /* Active */
     1838        ok = VRMethod("CN_CONDET", "SetRecordAttr", cd.lastrh, "Icon", '#64:PMWP.DLL') /* Active */
    17871839
    17881840        hashstr = p_mpoint' 'translate(p_domain)' 'translate(p_server)' 'translate(p_share)' 'p_user' 'p_spassword' 'p_easupport' 'p_rw
    … …  
    19572009    END
    19582010    CALL STREAM filename, 'C', 'CLOSE'
     2011
     2012    if options.!autostart == 0 THEN CALL VRMessage 'Main', NLVGetMessage( 52, filename ), NLVGetMessage( 51 ), 'I'
     2013
    19592014    IF options.!debug == 1 THEN SAY time()' '||"PB_CONDET_SAVE_Click done"
    19602015RETURN
    … …  
    19642019PB_CONNECT_Click: PROCEDURE EXPOSE settings. options. fs. advanced.
    19652020    IF options.!debug == 1 THEN SAY time()' '||"PB_CONNECT_Click started"
    1966     NewWG    = ''
    1967     NewSrv   = ''
    1968     NewShare = ''
     2021    p_workgroup    = ''
     2022    p_server   = ''
     2023    p_share = ''
    19692024
    19702025    ok = VRMethod( "CN_SMBTREE", "GetRecordList", "Selected", "handle." )
    … …  
    19892044    if parRH = "" then do /* A workgroup was dragged */
    19902045        say "Workgroup dragged!"
    1991         parse var DragCapt NewWG '0D0A'x .
    1992         NewWG = strip(NewWG)
    1993         ok = VRSet("EF_NETWORK","Value",strip(NewWG))
     2046        parse var DragCapt p_workgroup '0D0A'x .
     2047        p_workgroup = strip(p_workgroup)
     2048        ok = VRSet("EF_NETWORK","Value",strip(p_workgroup))
    19942049        ok = VRSet("EF_SERVER","Value","")
    19952050        ok = VRSet("EF_SHARE","Value","")
    … …  
    20032058        if GParRH = "" then do /* A server was dragged */
    20042059            say "Server dragged!"
    2005             parse var ParDragCapt NewWG '0D0A'x .
    2006             ok = VRSet("EF_NETWORK","Value",strip(NewWG))
    2007             NewWG = strip(NewWG)
    2008 
    2009             parse var DragCapt NewSrv '0D0A'x .
    2010             NewSrv = strip(NewSrv)
    2011             ok = VRSet("EF_SERVER","Value",strip(NewSrv))
     2060            parse var ParDragCapt p_workgroup '0D0A'x .
     2061            ok = VRSet("EF_NETWORK","Value",strip(p_workgroup))
     2062            p_workgroup = strip(p_workgroup)
     2063
     2064            parse var DragCapt p_server '0D0A'x .
     2065            p_server = strip(p_server)
     2066            ok = VRSet("EF_SERVER","Value",strip(p_server))
    20122067            ok = VRSet("EF_Share","Value","")
    20132068
    … …  
    20182073            GParDragCapt = VRMethod(srcCtn, "GetRecordAttr", GParRH, "Caption")
    20192074
    2020             parse var GParDragCapt NewWG '0D0A'x .
    2021             NewWG = strip(NewWG)
    2022             ok = VRSet("EF_NETWORK","Value",strip(NewWG))
    2023 
    2024             parse var ParDragCapt NewSrv '0D0A'x .
    2025             NewSrv = strip(NewSrv)
    2026             ok = VRSet("EF_SERVER","Value",strip(NewSrv))
    2027 
    2028             parse var DragCapt NewShare '0D0A'x .
    2029             NewShare = strip(NewShare)
    2030             ok = VRSet("EF_Share","Value",strip(NewShare))
     2075            parse var GParDragCapt p_workgroup '0D0A'x .
     2076            p_workgroup = strip(p_workgroup)
     2077            ok = VRSet("EF_NETWORK","Value",strip(p_workgroup))
     2078
     2079            parse var ParDragCapt p_server '0D0A'x .
     2080            p_server = strip(p_server)
     2081            ok = VRSet("EF_SERVER","Value",strip(p_server))
     2082
     2083            parse var DragCapt p_share '0D0A'x .
     2084            p_share = strip(p_share)
     2085            ok = VRSet("EF_Share","Value",strip(p_share))
    20312086
    20322087            ShareLevel = 1
    … …  
    20342089    end
    20352090
    2036     say 'NewWG    = "'NewWG'"'
    2037     say 'NewSrv   = "'NewSrv'"'
    2038     say 'NewShare = "'NewShare'"'
     2091    say 'p_workgroup    = "'p_workgroup'"'
     2092    say 'p_server   = "'p_server'"'
     2093    say 'p_share = "'p_share'"'
    20392094
    20402095    ok = VRSet( "CB_MOUNT", "Selected", Sharelevel )
    … …  
    23682423*/
    23692424PB_SAVE_Click: PROCEDURE EXPOSE settings. options. Profile fs.
    2370 
    2371     if options.!autostart == 0 THEN filename = VRFileDialog('Main', NLVGetMessage( 50 ), 'S', '*.'fs.!profileext)
     2425    call PB_CONDET_SAVE_Click
     2426
     2427/*  if options.!autostart == 0 THEN filename = VRFileDialog('Main', NLVGetMessage( 50 ), 'S', '*.'fs.!profileext)
    23722428    ELSE filename = Profile
    23732429
    … …  
    24032459
    24042460    if options.!autostart == 0 THEN CALL VRMessage 'Main', NLVGetMessage( 52, filename ), NLVGetMessage( 51 ), 'I'
    2405 
     2461*/
    24062462RETURN
    24072463
    … …  
    24712527say rh.i
    24722528say cd.statusfh
    2473 say VRMethod( "CN_CONDET", "GetFieldData", rh.i, cd.statusfh)
     2529        /* This catches the bug we observed exactly once and were unable to reproduce! */
     2530        if cd.statusfh = 'CD.STATUSFH' then do
     2531            call beep 880, 50
     2532            call beep 880, 50
     2533            say "cd.statusfh is undefined - check why!!!!!!"
     2534            leave
     2535        end
     2536        say VRMethod( "CN_CONDET", "GetFieldData", rh.i, cd.statusfh)
    24742537        if VRMethod("CN_CONDET","GetFieldData", rh.i, cd.statusfh) = '#64:PMWP.DLL' then CALL VRMethod 'CN_CONDET', 'RemoveRecord', rh.i
    24752538    end
    … …  
    26472710    CALL NLVSetText 'CB_BROWSEIMME','Caption', 48
    26482711    CALL NLVSetText 'CB_BROWSEAUTH','Caption', 49
     2712    CALL NLVSetText 'CB_ALWAYSMP',  'Caption', 65
    26492713
    26502714    CALL VRSet "SW_ADVANCED", "HelpTag", NLVGetMessage(40)
    … …  
    27322796    call SW_MOUNTPOINT_Init
    27332797/* NLVGetMessage(14)' ' */
    2734     ok = VRSet("SW_MOUNTPOINT","Caption",strip(NewWG' \\'NewSRV'\'NewShare,'T','\'))
     2798    ok = VRSet("SW_MOUNTPOINT","Caption",strip(p_workgroup' \\'p_server'\'p_share,'T','\'))
    27352799    CALL NLVSetText 'DT_MPOINT1',   'Caption', 27
    27362800    CALL NLVSetText 'PB_NEWMOUNTPOINTOK',    'Caption', 2
    … …  
    27382802    CALL NLVSetText 'CB_EAS1',       'Caption', 44
    27392803    CALL NLVSetText 'CB_READONLY1',  'Caption', 45
     2804    CALL NLVSetText 'CB_ALWAYSMP1',  'Caption', 65
    27402805    ok = VRMethod( "CB_DRIVES", "GetStringList", "freedrives." )
    27412806    ok = VRMethod( "CB_DRIVES1", "AddStringList", "freedrives." )

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

    r321 r324  
    5757EVG0050I: Profildatei sichern
    5858EVG0051I: Profil gesichert
    59 EVG0052I: Profil aller allenfalls momentan aktiven Verbindungen wurde gesichert als %1.
     59EVG0052I: Profil aller Verbindungen wurde gesichert als %1.
    6060EVG0053I: Datei existiert
    6161EVG0054I: Die Datei %1 existiert bereits. šberschreiben?
    … …  
    7070EVG0063I: Verbindungsdetails
    7171EVG0064I: Diese Verbindung besteht bereits - trotzdem fortfahren?
    72 EVG0065?:
     72EVG0065I: Mountpoint auch bei Fehlschlag anlegen
    7373EVG0066?:
    7474EVG0067?:

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

    r321 r324  
    5757EVG0050I: Save Profile File
    5858EVG0051I: Profile Saved
    59 EVG0052I: Profile of currently active connections (if any) was saved to %1.
     59EVG0052I: Profile of connections was saved to %1.
    6060EVG0053I: File Exists
    6161EVG0054I: The file %1 already exists. Overwrite it?
    … …  
    7070EVG0063I: Connection details
    7171EVG0064I: This connection already exists - continue anyway?
    72 EVG0065?:
     72EVG0065I: Create mountpoint, even when connection attempt fails
    7373EVG0066?:
    7474EVG0067?:

  • branches/guitools-2.0/shared/cltinit.vrs

    r316 r324  
    137137    msg = arg(1)
    138138    say "ERROR: "msg
    139     id = VRMessage( VRWindow(), msg, "Samba Installation", "E" )
     139    id = VRMessage( VRWindow(), msg, "Samba Client Installation", "E" )
    140140    ErrorState = (1|ErrorState)
    141141return
Note: See TracChangeset for help on using the changeset viewer.