Changeset 325


Ignore:
Timestamp:
Sep 4, 2009, 9:08:19 AM (16 years ago)
Author:
Herwig Bauernfeind
Message:

GUI-Tools: More work on EVFSGUI V.next (Fixed several bugs)

Location:
branches/guitools-2.0
Files:
7 edited

Legend:

Unmodified
Added
Removed

  • TabularUnified branches/guitools-2.0/evfsgui/changes

    r324 r325  
    2323- Added: Disabled old profile saving code
    2424- Added: Sort smbtree view ascending
     25- Added: Optionally turn on/off special ($) shares
    2526- Changed: Several changes in GUI style (as suggested by Alex Taylor)
    2627- Changed: Left align buttons in current connections panel (as suggested by
    … …  
    3435- Fixed: Message queue during resize isn't cleared (no flashing during resize)
    3536- Fixed: Missing NLV aware strings
     37- Fixed: Don't let user edit network neighbourhood results
    3638ToDo:
     39- Edit and Selected menu easily got out of sync (partly fixed)
    3740- Major code refactoring
    3841- Create Icon. stem in order to ease maintainance of icons
    3942- Create mechanism to save passive connections across sessions
    4043- Debug on/off option is badly implemented (rework required)
    41 - Edit and Selected menu easily get out of sync
    4244- Advanced dialog should be split into connection options and global options
    4345- smbtree error messages are ignored (requires more code from smbmon)
    44 - Connecting to IPC$ still possible (if it is visible)
    4546- printer share detection is flaky
    4647- error checking

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

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

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

    r324 r325  
    137137    ok = VRMethod("CN_CONDET", "SetFieldAttr", cd.hashfh ,        "Visible", 0)
    138138
     139    ok = VRSet("CN_CONDET", "DetailSort", cd.mpointfh )
     140
    139141    /* NLV columns */
    140     ok = VRMethod("CN_CONDET", "SetFieldAttr", cd.statusfh ,      "Title", "Status")
     142    ok = VRMethod("CN_CONDET", "SetFieldAttr", cd.statusfh ,      "Title", strip(NLVGetMessage(67),"T",":"))
    141143    ok = VRMethod("CN_CONDET", "SetFieldAttr", cd.mpointfh ,      "Title", strip(NLVGetMessage(27),"T",":"))
    142144    ok = VRMethod("CN_CONDET", "SetFieldAttr", cd.workgroupfh ,   "Title", strip(NLVGetMessage(21),"T",":"))
    … …  
    144146    ok = VRMethod("CN_CONDET", "SetFieldAttr", cd.shareFH ,       "Title", strip(NLVGetMessage(20),"T",":"))
    145147    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") 
     148    ok = VRMethod("CN_CONDET", "SetFieldAttr", cd.easupportfh ,   "Title", strip(NLVGetMessage(68),"T",":"))
     149    ok = VRMethod("CN_CONDET", "SetFieldAttr", cd.rwfh ,          "Title", strip(NLVGetMessage(69),"T",":"))
    148150return
    149151/*:VRX         _CreateSmbConf
    … …  
    230232            CALL VRSet "CHK_MTYPE",  "Visible", 0
    231233            CALL NLVSetText "DT_NETWORK", "Caption", 21
    232             /* Herwig B. */
     234            /* Does not make sense anymore
    233235            if options.!editmode = 0 Then CALL VRSet "EF_NETWORK",  "Value", settings.!network
    234             /* Herwig B. */
     236            */
    235237        END
    236238        WHEN mount == 2 THEN DO
    … …  
    241243            CALL VRSet "CHK_MTYPE",  "Visible", 0
    242244            CALL NLVSetText "DT_NETWORK", "Caption", 21
    243             /* Herwig B. */
     245            /* Does not make sense anymore
    244246            CALL VRSet "EF_NETWORK",  "Value", settings.!network
    245             /* Herwig B. */
     247            */
    246248        END
    247249        WHEN mount == 3 THEN DO
    … …  
    252254            CALL VRSet "CHK_MTYPE",  "Visible", 0
    253255            CALL NLVSetText "DT_NETWORK", "Caption", 21
    254             /* Herwig B. */
     256            /* Does not make sense anymore
    255257            CALL VRSet "EF_NETWORK",  "Value", settings.!network
    256             /* Herwig B. */
     258            */
    257259        END
    258260        WHEN mount == 4 THEN DO
    … …  
    263265            CALL VRSet "CHK_MTYPE",  "Visible", 1
    264266            CALL NLVSetText "DT_NETWORK", "Caption", 22
    265             /* Herwig B. */
     267            /* Does not make sense anymore
    266268            CALL VRSet "EF_NETWORK",  "Value", ""
    267             /* Herwig B. */
     269            */
    268270        END
    269271    END
    … …  
    497499        ok = VRset("CB_DRIVES"      ,  "Value", p_drv)
    498500        ok = VRset("EF_DIRECTORY"   ,  "Value", p_dir)
    499 
    500         ok = VRMethod( srcCtn, "RemoveRecord", srcRec)
    501 
    502 
    503501    end
    504502    else do /* SmbTree */
    … …  
    590588    window = VRLoadSecondary( "SW_LOGIN", "W" )
    591589    call PB_MOUNT_CLICK
     590    if VRGet(srcCtn,'Name') = "CN_CONDET" &,
     591       VRMethod("CN_CONDET", "GetRecordAttr", srcRec, "Icon") = '#68:PMWP.DLL' then ok = VRMethod( srcCtn, "RemoveRecord", srcRec)
    592592return
    593593
    … …  
    868868        IF settings.!condeton = "" then settings.!condeton = 1
    869869
    870         /* Load network */
     870        /* Load network - does not make sense anymore
    871871        settings.!network = VRGetIni('Settings', 'Network', settings.!ini, 'NoClose')
    872         IF settings.!network == '' THEN settings.!network = ''
    873 say "Loadsettings" samba.!smbconf
     872        IF settings.!network == '' THEN settings.!network = '' */
     873
    874874        if \VRFileExists( samba.!smbconf ) then call _CreateSmbConf       
    875 
    876         /* Hardcoded for EVFSGUI for now */
    877         ShowHidden = 0
    878875
    879876        /* Load font settings.
    … …  
    900897        IF advanced.!alwaysmp == '' THEN advanced.!alwaysmp = 1
    901898
     899        advanced.!special = VRGetIni('Settings', 'SpecialShares', settings.!ini)
     900        IF advanced.!special == '' THEN advanced.!special = 0
     901
    902902        /* Apply the settings
    903903         */
     904        /* Does not make sense anymore
    904905        ok = VRSet("EF_NETWORK","Value", settings.!network)
     906         */
    905907        ok = VRSet("DT_CURRENT","BACKCOLOR", settings.!curbcolor )
    906908        ok = VRSet("DT_CURRENT","FORECOLOR", settings.!curfcolor )
    … …  
    13031305/*:VRX         Menu_Selected_Retry_Click
    13041306*/
    1305 Menu_Selected_Retry_Click:
     1307Menu_Selected_Retry_Click: PROCEDURE EXPOSE settings. options. vfs. fs. advanced. cd.
     1308
    13061309    ok = VRMethod( "CN_CONDET", "GetRecordList", "SourceOrSelected", "selrec." )
    13071310    if selrec.0 = 0 then return
    13081311
    1309     do I = 1 to selrec.0
    1310 
    1311         p_mpoint    = VRMethod("CN_CONDET", "GetFieldData", selrec.I, CD.MpointFH)
    1312 
    1313         p_workgroup = VRMethod("CN_CONDET", "GetFieldData", selrec.I, CD.WorkgroupFH)
    1314         p_server    = VRMethod("CN_CONDET", "GetFieldData", selrec.I, CD.ServerFH)
    1315         p_share     = VRMethod("CN_CONDET", "GetFieldData", selrec.I, CD.ShareFH)
    1316         p_user      = VRMethod("CN_CONDET", "GetFieldData", selrec.I, CD.UserFH)
    1317         p_password  = x2c(VRMethod("CN_CONDET", "GetFieldData", selrec.I, CD.SpasswordFH))
    1318 
    1319         ShareLevel = 1
    1320         if p_share     = "" then ShareLevel = 2
    1321         if p_server    = "" then ShareLevel = 3
    1322         if p_workgroup = "" then ShareLevel = 4
    1323 
    1324         ok = VRSet( "CB_MOUNT", "Selected", Sharelevel )
    1325         ok = VRset("CB_MOUNT"  , "Value", mtype.sharelevel)
    1326 
    1327         ok = VRset("EF_SERVER" ,  "Value", p_server)
    1328         ok = VRset("EF_SHARE"  ,  "Value", p_share)
    1329         ok = VRset("EF_NETWORK",  "Value", p_workgroup)
    1330         ok = VRset("EF_USER"   ,  "Value", p_user)
    1331         ok = VRset("EF_PASSWORD", "Value", p_password)
    1332 
    1333         parse var p_mpoint p_drv '\' p_dir
    1334 
    1335         p_dir = strip(p_dir,'T','\')
    1336 
    1337         ok = VRset("CB_DRIVES"      ,  "Value", p_drv)
    1338         ok = VRset("EF_DIRECTORY"   ,  "Value", p_dir)
    1339 
    1340         ok = VRMethod("CN_CONDET", "RemoveRecord", selrec.I)
    1341 
    1342         CALL PB_MOUNT_Click
    1343 
    1344     end
     1312    selrec = selrec.1
     1313
     1314    p_mpoint    = VRMethod("CN_CONDET", "GetFieldData", selrec, CD.MpointFH)
     1315
     1316    p_workgroup = VRMethod("CN_CONDET", "GetFieldData", selrec, CD.WorkgroupFH)
     1317    p_server    = VRMethod("CN_CONDET", "GetFieldData", selrec, CD.ServerFH)
     1318    p_share     = VRMethod("CN_CONDET", "GetFieldData", selrec, CD.ShareFH)
     1319    p_user      = VRMethod("CN_CONDET", "GetFieldData", selrec, CD.UserFH)
     1320    p_password  = x2c(VRMethod("CN_CONDET", "GetFieldData", selrec, CD.SpasswordFH))
     1321
     1322    ShareLevel = 1
     1323    if p_share     = "" then ShareLevel = 2
     1324    if p_server    = "" then ShareLevel = 3
     1325    if p_workgroup = "" then ShareLevel = 4
     1326
     1327    ok = VRSet( "CB_MOUNT", "Selected", Sharelevel )
     1328    ok = VRset("CB_MOUNT"  , "Value", mtype.sharelevel)
     1329
     1330    ok = VRset("EF_SERVER" ,  "Value", p_server)
     1331    ok = VRset("EF_SHARE"  ,  "Value", p_share)
     1332    ok = VRset("EF_NETWORK",  "Value", p_workgroup)
     1333    ok = VRset("EF_USER"   ,  "Value", p_user)
     1334    ok = VRset("EF_PASSWORD", "Value", p_password)
     1335
     1336    parse var p_mpoint p_drv '\' p_dir
     1337
     1338    p_dir = strip(p_dir,'T','\')
     1339
     1340    ok = VRset("CB_DRIVES"      ,  "Value", p_drv)
     1341    ok = VRset("EF_DIRECTORY"   ,  "Value", p_dir)
     1342
     1343    CALL PB_MOUNT_Click
     1344
     1345    ok = VRMethod("CN_CONDET", "RemoveRecord", selrec)
    13451346return
    13461347
    … …  
    18821883        advanced.!debug     = adv_debug
    18831884        advanced.!alwaysmp  = adv_alwaysmp
     1885        advanced.!special   = adv_special
    18841886    END
    18851887
    … …  
    19141916    adv_debug      = VRGet( "CB_DEBUG",      "Set" )
    19151917    adv_alwaysmp   = VRGet( "CB_ALWAYSMP",   "Set" )
     1918    adv_special    = VRGet( "CB_SPECIAL",    "Set" )
    19161919
    19171920    adv_changed  = 1
    … …  
    20172020/*:VRX         PB_CONNECT_Click
    20182021*/
    2019 PB_CONNECT_Click: PROCEDURE EXPOSE settings. options. fs. advanced.
     2022PB_CONNECT_Click: PROCEDURE EXPOSE settings. options. fs. advanced. cd.
    20202023    IF options.!debug == 1 THEN SAY time()' '||"PB_CONNECT_Click started"
    2021     p_workgroup    = ''
    2022     p_server   = ''
    2023     p_share = ''
     2024    p_workgroup = ''
     2025    p_server    = ''
     2026    p_share     = ''
    20242027
    20252028    ok = VRMethod( "CN_SMBTREE", "GetRecordList", "Selected", "handle." )
    … …  
    22802283    options.!mastertype = ''
    22812284    options.!memlen     = advanced.!memlen
    2282 say "advanced.!readonly = "advanced.!readonly
    2283 say "options.!readonly  = "options.!readonly
    2284     options.!easupport  = advanced.!easupport/* Hier wird das zeug vom Dialog berschrieben */
    2285     options.!readonly   = advanced.!readonly /* Hier wird das zeug vom Dialog berschrieben */
    2286 say "advanced.!readonly = "advanced.!readonly
    2287 say "options.!readonly  = "options.!readonly
     2285    options.!easupport  = advanced.!easupport
     2286    options.!readonly   = advanced.!readonly
    22882287    options.!loglevel   = advanced.!loglevel
    22892288    options.!logfile    = advanced.!logfile
    … …  
    22962295    server   = STRIP( VRGet( "EF_SERVER",    "Value" ))
    22972296    network  = STRIP( VRGet( "EF_NETWORK",   "Value" ))
    2298 say "network = "network
    22992297    mtype    = VRGet( "CHK_MTYPE",           "Set" )
    23002298    userid   = STRIP( VRGet( "EF_USER",      "Value" ))
    … …  
    24112409/*:VRX         PB_REFRESH_Click
    24122410*/
    2413 PB_REFRESH_Click: PROCEDURE EXPOSE settings. options. fs. samba. debuglevel
     2411PB_REFRESH_Click: PROCEDURE EXPOSE settings. options. fs. samba. debuglevel advanced.
    24142412    IF options.!debug == 1 THEN SAY time()' '||"PB_REFRESH_Click started"
    24152413    call _UserCredUpdate
    24162414    ok = VRset("Pict_Throbber", "Visible", 1)
    24172415    ok = VRset("TM_Throbber", "Enabled", 1)
     2416    ShowHidden = advanced.!special
    24182417    call _RefreshTree
    24192418    IF options.!debug == 1 THEN SAY time()' '||"PB_REFRESH_Click done"
    … …  
    25412540    CALL VRSet "PB_DETACH", "Enabled", 0
    25422541    CALL VRSet "PB_UNMOUNT", "Enabled", 0
     2542
     2543    ok = VRSet("Menu_Selected_Remove", "Visible",  0)
     2544    ok = VRSet("Menu_Selected_Retry",  "Visible",  0)
     2545
    25432546    IF options.!debug == 1 THEN SAY time()' '||'Refresh: Remove records, disable buttons done.'
    25442547   
    … …  
    25732576    IF options.!debug == 1 THEN SAY time()' '||"SaveSettings started"
    25742577
     2578/* This does not make sense anymore
    25752579    settings.!network = VRGet("EF_NETWORK","Value")
    25762580    CALL VRSetIni 'Settings', 'Network', settings.!network, settings.!ini, 'NoClose'
     2581 */
    25772582
    25782583    font = VRGet('CN_CURRENT', 'Font')
    … …  
    26002605    CALL VRSetIni 'Settings', 'ConDetOn', settings.!condeton, settings.!ini, 'NoClose'
    26012606
    2602     CALL VRSetIni 'Settings', 'BrowseAuth', advanced.!browseauth, settings.!ini, 'NoClose'
    2603     CALL VRSetIni 'Settings', 'BrowseImme', advanced.!browseimme, settings.!ini, 'NoClose'
    2604     CALL VRSetIni 'Settings', 'Debug'     , advanced.!debug     , settings.!ini, 'NoClose'
    2605     CALL VRSetIni 'Settings', 'AlwaysMP'  , advanced.!alwaysmp  , settings.!ini, 'NoClose'
     2607    CALL VRSetIni 'Settings', 'BrowseAuth',    advanced.!browseauth, settings.!ini, 'NoClose'
     2608    CALL VRSetIni 'Settings', 'BrowseImme',    advanced.!browseimme, settings.!ini, 'NoClose'
     2609    CALL VRSetIni 'Settings', 'Debug',         advanced.!debug     , settings.!ini, 'NoClose'
     2610    CALL VRSetIni 'Settings', 'AlwaysMP',      advanced.!alwaysmp  , settings.!ini, 'NoClose'
     2611    CALL VRSetIni 'Settings', 'SpecialShares', advanced.!special   , settings.!ini, 'NoClose'
    26062612
    26072613    /* Save position and size */
    … …  
    26682674    advanced.!debug     = ''
    26692675    advanced.!alwaysmp  = ''
     2676    advanced.!special   = ''
    26702677
    26712678    credentials.!username = ""
    … …  
    27112718    CALL NLVSetText 'CB_BROWSEAUTH','Caption', 49
    27122719    CALL NLVSetText 'CB_ALWAYSMP',  'Caption', 65
     2720    CALL NLVSetText 'CB_SPECIAL',   'Caption', 66
    27132721
    27142722    CALL VRSet "SW_ADVANCED", "HelpTag", NLVGetMessage(40)
    … …  
    27262734
    27272735    CALL VRSet 'CB_LOGGING', 'Set', VRFileExists(SysBootDrive()'\ndpsmb.dbg')
     2736
     2737    IF advanced.!special \= '' THEN
     2738        CALL VRSet 'CB_SPECIAL', 'Set', advanced.!special
    27282739
    27292740    IF advanced.!browseauth \= '' THEN
    … …  
    28722883*/
    28732884TM_RefreshTreeDisplay_Trigger:
     2885    ShowHidden = advanced.!special
    28742886    call _RefreshTreeDisplay
    28752887return

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

    r324 r325  
    4242EVG0037I: Erkl„rung
    4343EVG0038I: Er~neuern
    44 EVG0039I: LAN-Ressourcen-Browser
     44EVG0039I: Netzwerkumgebung
    4545; Erweitert properties window UI
    4646EVG0040I: Erweiterte Verbindungsoptionen
    … …  
    5252EVG0046I: Protokollierung
    5353EVG0047I: Globale Optionen
    54 EVG0048I: LAN-Ressourcen sofort aktualisieren
     54EVG0048I: Netzwerkumgebung sofort aktualisieren
    5555EVG0049I: Fr Browsing authentifizieren
    5656; Prompts and other messages
    … …  
    7171EVG0064I: Diese Verbindung besteht bereits - trotzdem fortfahren?
    7272EVG0065I: Mountpoint auch bei Fehlschlag anlegen
    73 EVG0066?:
    74 EVG0067?:
    75 EVG0068?:
    76 EVG0069?:
     73EVG0066I: Alle (auch spezielle) Freigaben zeigen
     74EVG0067I: Status
     75EVG0068I: EA
     76EVG0069I: R/W
    7777EVG0070?:
    7878EVG0071?:
    … …  
    9191EVG0083I: Ausge~w„hlt
    9292EVG0084I: ~Hilfe
    93 EVG0085I: ~Dialoganzeige
    94 EVG0086I: ~Strukturanzeige
     93EVG0085I: ~Dialog
     94EVG0086I: ~Netzwerkumgebung
    9595EVG0087I: ~Knopfleiste
    96 EVG0088I: ~Verbindungsdetailanzeige
     96EVG0088I: ~Verbindungsdetails
    9797EVG0089I: Entfernen
    9898EVG0090I: Nochmals versuchen

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

    r324 r325  
    4242EVG0037I: Explanation
    4343EVG0038I: ~Refresh
    44 EVG0039I: LAN-Resource-Browser
     44EVG0039I: Network neighbourhood
    4545; Advanced properties window UI
    4646EVG0040I: Advanced Mount Options
    … …  
    5252EVG0046I: Logging
    5353EVG0047I: Global settings
    54 EVG0048I: Browse immediately
     54EVG0048I: Refresh network neighbourhood immediately
    5555EVG0049I: Authenticate for browsing
    5656; Prompts and other messages
    … …  
    7171EVG0064I: This connection already exists - continue anyway?
    7272EVG0065I: Create mountpoint, even when connection attempt fails
    73 EVG0066?:
    74 EVG0067?:
    75 EVG0068?:
    76 EVG0069?:
     73EVG0066I: Show all (special) shares
     74EVG0067I: Status
     75EVG0068I: EA
     76EVG0069I: R/W
    7777EVG0070?:
    7878EVG0071?:
    … …  
    9191EVG0083I: ~Selected
    9292EVG0084I: ~Help
    93 EVG0085I: ~Dialog view
    94 EVG0086I: ~Tree view
     93EVG0085I: ~Dialog
     94EVG0086I: ~LAN-Resource browser
    9595EVG0087I: ~Buttons
    96 EVG0088I: ~Connection details view
     96EVG0088I: ~Connection details
    9797EVG0089I: Remove
    9898EVG0090I: Retry

  • TabularUnified branches/guitools-2.0/shared/smbtree.vrs

    r319 r325  
    6666                    parent = smbtree.!machine
    6767                    smbtree.!share = VRMethod( "CN_smbtree", "AddRecord",parent,, share||'0D0A'x||comment, res)
     68                    ok = VRMethod( "CN_smbtree", "SetRecordAttr", smbtree.!share, "ReadOnly", 1)
    6869                    if pos("$", share) > 0 then ok = VRMethod( "CN_smbtree", "SetRecordAttr", smbtree.!share, "Visible", ShowHidden)
    6970                end
    … …  
    7677                if VRGet("CN_smbtree","View") = "IconTree" then parent = smbtree.!workgroup; else parent = ""
    7778                smbtree.!machine = VRMethod( "CN_smbtree", "AddRecord",parent,, machine||'0D0A'x||comment,"#35:PMWP.DLL")
     79                ok = VRMethod( "CN_smbtree", "SetRecordAttr", smbtree.!machine, "ReadOnly", 1)
    7880                ok = VRMethod( "CN_smbtree", "SetFieldData", smbtree.!machine, NBFH, machine, CommentFH, Comment, WorkGroupFH, CurWG)
    7981                if VRGet("CN_smbtree","View") = "Detail" then do
    … …  
    116118                    end
    117119                end
    118                         ok = VRSet( "CN_smbtree", "Painting", 1  )
    119                         ok = VRSet( "CN_smbtree", "Painting", 0  )
    120 
     120                ok = VRSet( "CN_smbtree", "Painting", 1  )
     121                ok = VRSet( "CN_smbtree", "Painting", 0  )
    121122            end
    122123            otherwise do
    … …  
    132133                        ok = VRMethod( "CN_smbtree", "SetFieldData", smbtree.!workgroup, WorkGroupFH, smbtreeline.sl)
    133134                        ok = VRMethod( "CN_smbtree", "SetRecordAttr", smbtree.!workgroup, "Collapsed", 0)
     135                        ok = VRMethod( "CN_smbtree", "SetRecordAttr", smbtree.!workgroup, "ReadOnly", 1)
    134136                    end
    135137                    CurWG = smbtreeline.sl
Note: See TracChangeset for help on using the changeset viewer.