Changeset 1012


Ignore:
Timestamp:
Mar 5, 2017, 11:39:32 AM (4 years ago)
Author:
Herwig Bauernfeind
Message:

GUITools: EVFSGUI start work on WebDAV support

Location:
trunk/guitools/evfsgui
Files:
9 edited

Legend:

Unmodified
Added
Removed
  • trunk/guitools/evfsgui/evfsgui.vrp

    r990 r1012  
    77MacroPath: VRM:G:\netlabs\svn\samba\trunk\guitools\evfsgui
    88EXEPath:
    9 RunParameters:
     9RunParameters: -NDFS
    1010RunDirectory: G:\netlabs\svn\samba\trunk\guitools\evfsgui
    1111VRXWindow: __VREMainWindow,1,1831,2457,1012,7841
    1212VRXWindow: __VREFileListWindow,1,711,14020,2665,3358
    1313VRXWindow: __VRESectionListWindow,1,1072,11708,12238,6914
    14 VRXWindow: __VREToolsWindow,1,2951,12479,6992,1661
     14VRXWindow: __VREToolsWindow,1,2951,12479,6986,1665
    1515VRXWindow: __VREWindListWindow,1,566,10262,4963,3150
    1616UserFile: 1
    1717UserWindow: Main,1
    1818UserWindow: SW_PROGRESS,1
    19 UserWindow: SW_SETTINGS,1
    20 UserWindow: SW_SMBCONF,1
     19UserWindow: SW_DIALOG,1
  • trunk/guitools/evfsgui/evfsgui.vrx

    r1009 r1012  
    16461646
    16471647    if options.!debug == 1 then say '  initializing mtype. '
    1648     mtype.0 = 4
     1648    mtype.0 = 5
    16491649    mtype.1 = NLVGetMessage( 15 )
    16501650    mtype.2 = NLVGetMessage( 16 )
    16511651    mtype.3 = NLVGetMessage( 17 )
    16521652    mtype.4 = NLVGetMessage( 18 )
     1653    mtype.5 = NLVGetMessage(110 )
    16531654
    16541655    if options.!debug == 1 then say '  initializing icons. '
     
    18621863            CALL VRSet "DT_SERVER",  "Visible", 1
    18631864            CALL VRSet "EF_SERVER",  "Visible", 1
     1865            CALL VRSet "DT_NETWORK", "Visible", 1
     1866            CALL VRSet "EF_NETWORK", "Visible", 1
    18641867            CALL VRSet "CHK_MTYPE",  "Visible", 0
    18651868            CALL NLVSetText "DT_NETWORK", "Caption", 21
     
    18701873            CALL VRSet "DT_SERVER",  "Visible", 1
    18711874            CALL VRSet "EF_SERVER",  "Visible", 1
     1875            CALL VRSet "DT_NETWORK", "Visible", 1
     1876            CALL VRSet "EF_NETWORK", "Visible", 1
    18721877            CALL VRSet "CHK_MTYPE",  "Visible", 0
    18731878            CALL NLVSetText "DT_NETWORK", "Caption", 21
     
    18781883            CALL VRSet "DT_SERVER",  "Visible", 0
    18791884            CALL VRSet "EF_SERVER",  "Visible", 0
     1885            CALL VRSet "DT_NETWORK", "Visible", 1
     1886            CALL VRSet "EF_NETWORK", "Visible", 1
    18801887            CALL VRSet "CHK_MTYPE",  "Visible", 0
    18811888            CALL NLVSetText "DT_NETWORK", "Caption", 21
     
    18861893            CALL VRSet "DT_SERVER",  "Visible", 0
    18871894            CALL VRSet "EF_SERVER",  "Visible", 0
     1895            CALL VRSet "DT_NETWORK", "Visible", 1
     1896            CALL VRSet "EF_NETWORK", "Visible", 1
    18881897            CALL VRSet "CHK_MTYPE",  "Visible", 1
    18891898            CALL NLVSetText "DT_NETWORK", "Caption", 22
     1899        END
     1900        WHEN mount == mtype.5 THEN DO
     1901            CALL VRSet "DT_SHARE",   "Visible", 0
     1902            CALL VRSet "EF_SHARE",   "Visible", 0
     1903            CALL VRSet "DT_SERVER",  "Visible", 1
     1904            CALL VRSet "EF_SERVER",  "Visible", 1
     1905            CALL VRSet "DT_NETWORK", "Visible", 0
     1906            CALL VRSet "EF_NETWORK", "Visible", 0
     1907            CALL VRSet "CHK_MTYPE",  "Visible", 0
     1908            CALL NLVSetText "DT_Server", "Caption", 111
    18901909        END
    18911910        OTHERWISE DO
     
    39113930/*  PARSE VAR resource . ';WORKGROUP='p_workgroup';SERVER='p_server';SHARE='p_share';' . */
    39123931
     3932    select /* Support for other filesystems comes here! */
     3933        when left(word(resource,1),5) = "SMBFS" then do
     3934            cd.lastrh = VRMethod("CN_CONDET","AddRecord")
     3935            PARSE VAR userdata p_mpoint ';' p_mpidx ';' .
     3936   
     3937            p_mpoint = strip(p_mpoint,'T','\')||'\'
     3938            p_rw     = word(resource, words(resource))
     3939   
     3940            /* Workaround for truncated resource string */
     3941            if length(p_rw) > 1 then do
     3942                /* The resource string must have been truncated
     3943                   p_rw is already wrong and
     3944                   p_easupport will most likely be also wrong (look below for workaround!) */
     3945                p_rw ="W" /* this is guessed only!!! */
     3946                if options.!debug == 1 then say '  WARNING! Detected truncated resource string - shorten workgroup name, server name, share name until this message goes away!'
     3947            end
     3948            /* this should be done unconditionally if the resource string is never truncated */
     3949            else resource  = left(resource,length(resource)-length(p_rw))
     3950   
     3951            call ParseResParmString
     3952   
     3953            if p_master   = "" then p_master   = "WORKGROUP"
     3954            if p_mtype    = "" then p_mtype    = "1"
     3955            if p_loglevel = "" then p_loglevel = "0"
     3956            if p_memlen   = "" then p_memlen   = "2"
     3957   
     3958            /* Also works around for a truncated resource string! */
     3959            if p_easupport= "" | p_easupport= " " then p_easupport = strip(options.!easupport)
     3960   
     3961            if p_password <> "" & p_spassword = "" then do
     3962                p_spassword = c2x(p_password)
     3963                p_password = ""
     3964            end
     3965   
     3966            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)
     3967            ok = VRMethod("CN_CONDET", "SetFieldData", cd.lastrh, cd.passwordfh, p_password, cd.spasswordfh, p_spassword, cd.masterfh, p_master, cd.mtypefh, p_mtype)
     3968            ok = VRMethod("CN_CONDET", "SetFieldData", cd.lastrh, cd.ctoFH, p_cachetimeout, cd.cldFH, p_cachelistings)
     3969            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)
     3970            ok = VRMethod("CN_CONDET", "SetFieldData", cd.lastrh, cd.statusfh, icons.!active) /* Active */
     3971            ok = VRMethod("CN_CONDET", "SetRecordAttr", cd.lastrh, "Icon", icons.!active) /* Active */
     3972   
     3973            hashstr = p_mpoint' 'translate(p_workgroup)' 'translate(p_server)' 'translate(p_share)' 'p_user' 'p_spassword' 'p_easupport' 'p_rw
     3974   
     3975            md5 = rexx_md5(hashstr)
     3976   
     3977            ok = VRMethod("CN_CONDET", "SetFieldData", cd.lastrh, cd.hashfh,md5)
     3978   
     3979            SELECT
     3980                WHEN p_share  == '' & p_server \= '' THEN DO   /* all shares on server */
     3981                    IF p_workgroup == '' THEN
     3982                        userdata = userdata';\\'p_server'\*'
     3983                    ELSE
     3984                        userdata = userdata';'p_workgroup':\\'p_server'\*'
     3985                END
     3986                WHEN p_server == '' & p_workgroup \= '' THEN    /* all servers in workgroup */
     3987                    userdata = userdata';'p_workgroup':\\*'
     3988                WHEN p_server == '' & p_workgroup == '' THEN    /* all workgroups */
     3989                    userdata = userdata';*:\\*'
     3990                OTHERWISE DO
     3991                    IF p_workgroup == '' THEN
     3992                        userdata = userdata';\\'p_server'\'p_share
     3993                    ELSE
     3994                        userdata = userdata';'p_workgroup':\\'p_server'\'p_share
     3995                END
     3996            END
     3997
     3998        end
     3999        when left(word(resource,1),3) = "DAV" then do
     4000            userdata = "webDAV"
     4001        end
     4002        otherwise do /* All unsupported filesystems end here! */
     4003            userData = "UNKNOWN"
     4004        end
     4005    end
    39134006    if left(word(resource,1),5) <> "SMBFS" then do
    3914         /* Support for other filesystems would come here! */
    3915         userData = "UNKNOWN"
    39164007    end
    39174008    else do
    3918         cd.lastrh = VRMethod("CN_CONDET","AddRecord")
    3919         PARSE VAR userdata p_mpoint ';' p_mpidx ';' .
    3920 
    3921         p_mpoint = strip(p_mpoint,'T','\')||'\'
    3922         p_rw     = word(resource, words(resource))
    3923 
    3924         /* Workaround for truncated resource string */
    3925         if length(p_rw) > 1 then do
    3926             /* The resource string must have been truncated
    3927                p_rw is already wrong and
    3928                p_easupport will most likely be also wrong (look below for workaround!) */
    3929             p_rw ="W" /* this is guessed only!!! */
    3930             if options.!debug == 1 then say '  WARNING! Detected truncated resource string - shorten workgroup name, server name, share name until this message goes away!'
    3931         end
    3932         /* this should be done unconditionally if the resource string is never truncated */
    3933         else resource  = left(resource,length(resource)-length(p_rw))
    3934 
    3935         call ParseResParmString
    3936 
    3937         if p_master   = "" then p_master   = "WORKGROUP"
    3938         if p_mtype    = "" then p_mtype    = "1"
    3939         if p_loglevel = "" then p_loglevel = "0"
    3940         if p_memlen   = "" then p_memlen   = "2"
    3941 
    3942         /* Also works around for a truncated resource string! */
    3943         if p_easupport= "" | p_easupport= " " then p_easupport = strip(options.!easupport)
    3944 
    3945         if p_password <> "" & p_spassword = "" then do
    3946             p_spassword = c2x(p_password)
    3947             p_password = ""
    3948         end
    3949 
    3950         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)
    3951         ok = VRMethod("CN_CONDET", "SetFieldData", cd.lastrh, cd.passwordfh, p_password, cd.spasswordfh, p_spassword, cd.masterfh, p_master, cd.mtypefh, p_mtype)
    3952         ok = VRMethod("CN_CONDET", "SetFieldData", cd.lastrh, cd.ctoFH, p_cachetimeout, cd.cldFH, p_cachelistings)
    3953         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)
    3954         ok = VRMethod("CN_CONDET", "SetFieldData", cd.lastrh, cd.statusfh, icons.!active) /* Active */
    3955         ok = VRMethod("CN_CONDET", "SetRecordAttr", cd.lastrh, "Icon", icons.!active) /* Active */
    3956 
    3957         hashstr = p_mpoint' 'translate(p_workgroup)' 'translate(p_server)' 'translate(p_share)' 'p_user' 'p_spassword' 'p_easupport' 'p_rw
    3958 
    3959         md5 = rexx_md5(hashstr)
    3960 
    3961         ok = VRMethod("CN_CONDET", "SetFieldData", cd.lastrh, cd.hashfh,md5)
    3962 
    3963         SELECT
    3964             WHEN p_share  == '' & p_server \= '' THEN DO   /* all shares on server */
    3965                 IF p_workgroup == '' THEN
    3966                     userdata = userdata';\\'p_server'\*'
    3967                 ELSE
    3968                     userdata = userdata';'p_workgroup':\\'p_server'\*'
    3969             END
    3970             WHEN p_server == '' & p_workgroup \= '' THEN    /* all servers in workgroup */
    3971                 userdata = userdata';'p_workgroup':\\*'
    3972             WHEN p_server == '' & p_workgroup == '' THEN    /* all workgroups */
    3973                 userdata = userdata';*:\\*'
    3974             OTHERWISE DO
    3975                 IF p_workgroup == '' THEN
    3976                     userdata = userdata';\\'p_server'\'p_share
    3977                 ELSE
    3978                     userdata = userdata';'p_workgroup':\\'p_server'\'p_share
    3979             END
    3980         END
    39814009    end
    39824010
     
    48684896    CALL VRSet 'CB_TRAC', 'Set', options.!tracmark
    48694897
    4870     ok = VRSet("DT_About","Caption", Program' (c) 2007-2017 Alexander Taylor'||'0D0A'x||'and Herwig Bauernfeind for bww bitwise works GmbH.')
     4898    ok = VRSet("DT_About","Caption", Program' (c) 2007-2017 Alexander Taylor for Arca Noae '||'0D0A'x||'and Herwig Bauernfeind for bww bitwise works GmbH.')
    48714899
    48724900    About.DscFH  = VRMethod( "CN_ABOUT", "AddField", "String", "Component" )
  • trunk/guitools/evfsgui/rc/lang/evfsi_de.mkm

    r909 r1012  
    117117EVG0108?:
    118118EVG0109?:
    119 EVG0110?:
    120 EVG0111?:
     119EVG0110!: webDAV
     120EVG0111!: URL:
    121121EVG0112?:
    122122EVG0113?:
  • trunk/guitools/evfsgui/rc/lang/evfsi_en.mkm

    r909 r1012  
    117117EVG0108?:
    118118EVG0109?:
    119 EVG0110?:
    120 EVG0111?:
     119EVG0110!: webDAV
     120EVG0111!: URL:
    121121EVG0112?:
    122122EVG0113?:
  • trunk/guitools/evfsgui/rc/lang/evfsi_es.mkm

    r913 r1012  
    117117EVG0108?:
    118118EVG0109?:
    119 EVG0110?:
    120 EVG0111?:
     119EVG0110!: webDAV
     120EVG0111!: URL:
    121121EVG0112?:
    122122EVG0113?:
  • trunk/guitools/evfsgui/rc/lang/evfsi_fr.mkm

    r909 r1012  
    123123EVG0108?:
    124124EVG0109?:
    125 EVG0110?:
    126 EVG0111?:
     125EVG0110!: webDAV
     126EVG0111!: URL
    127127EVG0112?:
    128128EVG0113?:
  • trunk/guitools/evfsgui/rc/lang/evfsi_it.mkm

    r909 r1012  
    121121EVG0108?:
    122122EVG0109?:
    123 EVG0110?:
    124 EVG0111?:
     123EVG0110!: webDAV
     124EVG0111!: URL:
    125125EVG0112?:
    126126EVG0113?:
  • trunk/guitools/evfsgui/rc/lang/evfsi_nl.mkm

    r913 r1012  
    117117EVG0108?:
    118118EVG0109?:
    119 EVG0110?:
    120 EVG0111?:
     119EVG0110!: webDAV
     120EVG0111!: URL:
    121121EVG0112?:
    122122EVG0113?:
  • trunk/guitools/evfsgui/rc/lang/evfsi_sv.mkm

    r913 r1012  
    117117EVG0108?:
    118118EVG0109?:
    119 EVG0110?:
    120 EVG0111?:
     119EVG0110!: webDAV
     120EVG0111!: URL:
    121121EVG0112?:
    122122EVG0113?:
Note: See TracChangeset for help on using the changeset viewer.