Changeset 525
- Timestamp:
- Jan 19, 2011, 8:48:29 AM (15 years ago)
- Location:
- branches/guitools-2.0/evfsgui
- Files:
-
- 11 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/guitools-2.0/evfsgui/changes
r511 r525 4 4 - Support server based logon scripts (requires REXX rpc library, 5 5 partly done) (works in a separate utility right now) 6 7 ToDo for 2.1: 6 - Enable WPS integration code (partly done) 7 8 Known problems: 8 9 - Fix endless loop if neither EVFS nor Netdrive is installed 9 10 under all conditions 10 - Enable WPS integration code (partly done)11 11 - Passive connections/double connection detection does not seem 12 12 to work properly 13 13 14 Version 2.1 beta3 2011-XX-XX 14 Version 2.1.0 2011-01-18 15 - Added: Support for new CTO and CLD parameters introduced with 2.0.0 beta3 15 16 - Fixed: Behaviour of login box did not work as designed 16 17 - Fixed: No mount attempt if entering credentials was aborted 17 18 - Fixed: Do not crash during "Detach all" 19 - Refactoring: Streamline parameter parsing code 20 - Refactoring: Remove double variables for parameters 18 21 - Refactoring: Create Icon. stem in order to ease maintenance of icons 19 22 - Refactoring: Common wrapper around all dynamic functions -
branches/guitools-2.0/evfsgui/evfsgui.VRP
r511 r525 10 10 VRXWindow: __VREFileListWindow,1,807,11033,1590,3358 11 11 VRXWindow: __VRESectionListWindow,1,2674,10648,8696,4794 12 VRXWindow: __VREToolsWindow,1,2517,7082,648 6,166112 VRXWindow: __VREToolsWindow,1,2517,7082,6489,1659 13 13 VRXWindow: __VREWindListWindow,1,542,8721,2650,3150 14 14 UserFile: 1 15 15 UserWindow: Main,1 16 UserWindow: SW_ADVANCED,1 16 17 UserWindow: SW_LOGIN,1 18 UserWindow: SW_MOUNTPOINT,1 -
branches/guitools-2.0/evfsgui/evfsgui.VRX
r511 r525 296 296 CD.loglevelFH = VRMethod( "CN_CONDET", "AddField", "String", "loglevel" ) 297 297 CD.rwFH = VRMethod( "CN_CONDET", "AddField", "String", "readonly" ) 298 CD.ctoFH = VRMethod( "CN_CONDET", "AddField", "String", "cachetimeout" ) 299 CD.cldFH = VRMethod( "CN_CONDET", "AddField", "String", "cachelistings" ) 298 300 CD.hashFH = VRMethod( "CN_CONDET", "AddField", "String", "hash" ) 299 301 … … 317 319 ok = VRMethod("CN_CONDET", "SetFieldAttr", cd.serverFH , "Title", strip(NLVGetMessage(19),"T",":")) 318 320 ok = VRMethod("CN_CONDET", "SetFieldAttr", cd.shareFH , "Title", strip(NLVGetMessage(20),"T",":")) 319 ok = VRMethod("CN_CONDET", "SetFieldAttr", cd.userfh , "Title", strip(NLVGetMessage(25),"T",":")) 320 ok = VRMethod("CN_CONDET", "SetFieldAttr", cd.easupportfh , "Title", strip(NLVGetMessage(68),"T",":")) 321 ok = VRMethod("CN_CONDET", "SetFieldAttr", cd.userFH , "Title", strip(NLVGetMessage(25),"T",":")) 322 ok = VRMethod("CN_CONDET", "SetFieldAttr", cd.ctoFH , "Title", strip(NLVGetMessage(130),"T",":")) 323 ok = VRMethod("CN_CONDET", "SetFieldAttr", cd.cldFH , "Title", strip(NLVGetMessage(131),"T",":")) 324 ok = VRMethod("CN_CONDET", "SetFieldAttr", cd.easupportFH , "Title", strip(NLVGetMessage(68),"T",":")) 321 325 ok = VRMethod("CN_CONDET", "SetFieldAttr", cd.rwfh , "Title", strip(NLVGetMessage(69),"T",":")) 322 326 return … … 568 572 p_mpidx = "" 569 573 570 PARSE VAR resource . 'WORKGROUP=' p_workgroup ';' . 571 PARSE VAR resource . 'SERVER=' p_server ';' . 572 PARSE VAR resource . 'SHARE=' p_share ';' . 573 PARSE VAR resource . 'USER=' p_user ';' . 574 PARSE VAR resource . 'PASSWORD=' p_password ';' . 575 PARSE VAR resource . 'SPASSWORD=' p_spassword ';' . 576 PARSE VAR resource . 'MASTER=' p_master ';' . 577 PARSE VAR resource . 'MASTERTYPE=' p_mtype ';' . 578 /* PARSE VAR resource . 'MEMLEN=' p_memlen ';' . 579 PARSE VAR resource . 'LOGFILE=' p_logfile ';'. 580 PARSE VAR resource . 'LOGLEVEL=' p_loglevel ';' . */ 581 PARSE VAR resource . 'EASUPPORT=' p_easupport . 574 call ParseResParmString 582 575 583 576 p_rw = rwFlag … … 589 582 ok = VRMethod("CN_CONDET", "SetFieldData", cd.lastrh, cd.workgroupfh, p_workgroup, cd.serverfh, p_server, cd.sharefh, p_share) 590 583 ok = VRMethod("CN_CONDET", "SetFieldData", cd.lastrh, cd.userfh, p_user, cd.passwordfh, p_password, cd.spasswordfh, p_spassword) 591 ok = VRMethod("CN_CONDET", "SetFieldData", cd.masterfh, p_master, cd.mtypefh, p_mtype, cd.lastrh, cd.easupportfh, p_easupport, cd.rwfh, p_rw) 584 ok = VRMethod("CN_CONDET", "SetFieldData", cd.lastrh, cd.ctoFH, p_cachetimeout,cd.cldFH, p_cachelistings) 585 ok = VRMethod("CN_CONDET", "SetFieldData", cd.lastrh, cd.masterfh, p_master, cd.mtypefh, p_mtype, cd.easupportfh, p_easupport, cd.rwfh, p_rw) 586 592 587 /* ok = VRMethod("CN_CONDET", "SetFieldData", cd.lastrh, cd.memlenfh, p_memlen, cd.logfilefh, p_logfile, cd.loglevelfh, p_loglevel ) */ 593 ok = VRMethod("CN_CONDET", "SetFieldData", cd.lastrh, cd.statusfh, icons.!passive) /* Passive */ 594 ok = VRMethod("CN_CONDET", "SetRecordAttr", cd.lastrh, "Icon", icons.!passive) /* Active */ 595 596 hashstr = p_mpoint' 'translate(p_domain)' 'translate(p_server)' 'translate(p_share)' 'p_user' 'p_spassword' 'p_easupport' 'p_rw 588 589 ok = VRMethod("CN_CONDET", "SetFieldData", cd.lastrh, cd.statusfh, icons.!passive) /* Passive */ 590 ok = VRMethod("CN_CONDET", "SetRecordAttr", cd.lastrh, "Icon", icons.!passive) /* Passive */ 591 592 hashstr = p_mpoint' 'translate(p_workgroup)' 'translate(p_server)' 'translate(p_share)' 'p_user' 'p_spassword' 'p_easupport' 'p_rw 597 593 598 594 md5 = rexx_md5(hashstr) … … 634 630 resdata = resdata||';LOGFILE='||VRMethod("CN_CONDET","GetFieldData", records.i, cd.logfilefh) 635 631 resdata = resdata||';LOGLEVEL='||VRMethod("CN_CONDET","GetFieldData", records.i, cd.loglevelfh) */ 632 resdata = resdata||';CTO='||VRMethod("CN_CONDET","GetFieldData", records.i, cd.ctoFH) 633 resdata = resdata||';CLD='||VRMethod("CN_CONDET","GetFieldData", records.i, cd.cldFH) 636 634 resdata = resdata||';EASUPPORT='||VRMethod("CN_CONDET","GetFieldData", records.i, cd.easupportfh) 637 635 resdata = resdata||' '||VRMethod("CN_CONDET","GetFieldData", records.i, cd.rwfh) … … 901 899 902 900 END 903 parse var p_string p_ domain':\\'p_server'\'p_share901 parse var p_string p_workgroup':\\'p_server'\'p_share 904 902 905 903 ok = VRSet("EF_Server","Value", p_server) … … 1769 1767 options.!debug = VRGetIni('Settings', 'Debug', settings.!ini) 1770 1768 IF options.!debug == '' THEN options.!debug = 0 /* Turn off debug by default for release builds */ 1771 1772 /* This is a hack and should be reworked! - using several variables for debug is bad! */1773 options.!debug = options.!debug1774 1769 IF options.!debug <> 1 THEN ok = VRRedirectStdIO("OFF") 1775 1770 … … 2159 2154 ok = VRSet("CB_MOUNT","Value",mtype.1) 2160 2155 2161 parse var p_string p_ domain':\\'p_server'\'p_share2162 2163 /* IF options.!debug == 1 THEN SAY time()' '||p_ domain*/2156 parse var p_string p_workgroup':\\'p_server'\'p_share 2157 2158 /* IF options.!debug == 1 THEN SAY time()' '||p_workgroup */ 2164 2159 2165 2160 IF options.!debug == 1 THEN SAY time()' data '||data 2166 IF options.!debug == 1 THEN SAY time()' domain '||p_ domain2161 IF options.!debug == 1 THEN SAY time()' domain '||p_workgroup 2167 2162 IF options.!debug == 1 THEN SAY time()' server '||p_server 2168 2163 IF options.!debug == 1 THEN SAY time()' share '||p_share … … 2172 2167 CALL VRSet "EF_SHARE", "VALUE", p_share 2173 2168 CALL VRSet "EF_SERVER", "VALUE", p_server 2174 CALL VRSet "EF_NETWORK","VALUE", p_ domain2169 CALL VRSet "EF_NETWORK","VALUE", p_workgroup 2175 2170 2176 2171 /* IF options.!debug == 1 THEN SAY time()' '||p_node */ … … 2614 2609 IF options.!logfile \= '' THEN src = src';LOGFILE='options.!logfile 2615 2610 IF options.!loglevel \= '' THEN src = src';LOGLEVEL='options.!loglevel */ 2611 IF options.!cachetimeout \= '' THEN src = src';CTO='options.!cachetimeout 2612 IF options.!cachelistings \= '' THEN src = src';CLD='options.!cachelistings 2616 2613 IF options.!easupport \= '' THEN src = src';EASUPPORT='options.!easupport 2617 2614 … … 2625 2622 if options.!loglevel = "" then options.!loglevel = "0" 2626 2623 if options.!memlen = "" then options.!memlen = "2" 2624 if options.!cachetimeout = "" then options.!cachetimeout = "10" 2625 if options.!cachelistings = "" then options.!cachelistings = "32" 2627 2626 if options.!easupport= "" | options.!easupport= " " then options.!easupport = strip(options.!easupport) 2628 2627 if options.!password <> "" & options.!spassword = "" then do … … 2808 2807 */ 2809 2808 ParseResourceData: PROCEDURE EXPOSE userdata options. icons. advanced. fs. cd. samba. 2810 PARSE ARG userdata, res data2809 PARSE ARG userdata, resource 2811 2810 IF options.!debug == 1 THEN SAY time()' ParseResourceData started' 2812 IF options.!debug == 1 THEN SAY ' receiving "'userdata'" "'res data'" length ('length(resdata)')'2813 2814 /* WARNING! res datahas a maximal length of 255 and is truncated otherwise */2815 2816 /* PARSE VAR res data . ';WORKGROUP='p_domain';SERVER='p_server';SHARE='p_share';' . */2817 2818 if left(word(res data,1),5) <> "SMBFS" then do2811 IF options.!debug == 1 THEN SAY ' receiving "'userdata'" "'resource'" length ('length(resource)')' 2812 2813 /* WARNING! resource has a maximal length of 255 and is truncated otherwise */ 2814 2815 /* PARSE VAR resource . ';WORKGROUP='p_workgroup';SERVER='p_server';SHARE='p_share';' . */ 2816 2817 if left(word(resource,1),5) <> "SMBFS" then do 2819 2818 /* Support for other filesystems would come here! */ 2820 2819 userData = "UNKNOWN" … … 2825 2824 2826 2825 p_mpoint = strip(p_mpoint,'T','\')||'\' 2827 p_rw = word(res data, words(resdata))2828 2829 /* Workaround for truncated res datastring */2826 p_rw = word(resource, words(resource)) 2827 2828 /* Workaround for truncated resource string */ 2830 2829 if length(p_rw) > 1 then do 2831 /* The res datastring must have been truncated2830 /* The resource string must have been truncated 2832 2831 p_rw is already wrong and 2833 2832 p_easupport will most likely be also wrong (look below for workaround!) */ 2834 2833 p_rw ="W" /* this is guessed only!!! */ 2835 IF options.!debug == 1 THEN SAY ' WARNING! Detected truncated resdata string - shorten workgroup name, server name, share name until this message goes away!' 2836 end 2837 /* this should be done unconditionally if the resdata string is never truncated */ 2838 else resdata = left(resdata,length(resdata)-length(p_rw)) 2839 2840 PARSE VAR resdata . 'WORKGROUP=' p_domain ';' . 2841 PARSE VAR resdata . 'SERVER=' p_server ';' . 2842 PARSE VAR resdata . 'SHARE=' p_share ';' . 2843 PARSE VAR resdata . 'USER=' p_user ';' . 2844 PARSE VAR resdata . ';PASSWORD=' p_password ';' . 2845 PARSE VAR resdata . 'SPASSWORD=' p_spassword ';' . 2846 PARSE VAR resdata . 'MASTER=' p_master ';' . 2847 PARSE VAR resdata . 'MASTERTYPE=' p_mtype ';' . 2848 PARSE VAR resdata . 'MEMLEN=' p_memlen ';' . 2849 PARSE VAR resdata . 'LOGFILE=' p_logfile ';' . 2850 PARSE VAR resdata . 'LOGLEVEL=' p_loglevel ';' . 2851 PARSE VAR resdata . 'EASUPPORT=' p_easupport ' ' 2834 IF options.!debug == 1 THEN SAY ' WARNING! Detected truncated resource string - shorten workgroup name, server name, share name until this message goes away!' 2835 end 2836 /* this should be done unconditionally if the resource string is never truncated */ 2837 else resource = left(resource,length(resource)-length(p_rw)) 2838 2839 call ParseResParmString 2852 2840 2853 2841 if p_master = "" then p_master = "WORKGROUP" … … 2856 2844 if p_memlen = "" then p_memlen = "2" 2857 2845 2858 /* Also works around for a truncated res datastring! */2846 /* Also works around for a truncated resource string! */ 2859 2847 if p_easupport= "" | p_easupport= " " then p_easupport = strip(options.!easupport) 2860 2848 … … 2864 2852 end 2865 2853 2866 ok = VRMethod("CN_CONDET", "SetFieldData", cd.lastrh, cd.mpointFH, p_mpoint, cd.mpidxfh, p_mpidx, cd.workgroupfh, p_ domain, cd.serverfh, p_server, cd.sharefh, p_share, cd.userfh, p_user)2854 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) 2867 2855 ok = VRMethod("CN_CONDET", "SetFieldData", cd.lastrh, cd.passwordfh, p_password, cd.spasswordfh, p_spassword, cd.masterfh, p_master, cd.mtypefh, p_mtype) 2856 ok = VRMethod("CN_CONDET", "SetFieldData", cd.lastrh, cd.ctoFH, p_cachetimeout, cd.cldFH, p_cachelistings) 2868 2857 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) 2869 2858 ok = VRMethod("CN_CONDET", "SetFieldData", cd.lastrh, cd.statusfh, icons.!active) /* Active */ 2870 2859 ok = VRMethod("CN_CONDET", "SetRecordAttr", cd.lastrh, "Icon", icons.!active) /* Active */ 2871 2860 2872 hashstr = p_mpoint' 'translate(p_ domain)' 'translate(p_server)' 'translate(p_share)' 'p_user' 'p_spassword' 'p_easupport' 'p_rw2861 hashstr = p_mpoint' 'translate(p_workgroup)' 'translate(p_server)' 'translate(p_share)' 'p_user' 'p_spassword' 'p_easupport' 'p_rw 2873 2862 2874 2863 md5 = rexx_md5(hashstr) … … 2878 2867 SELECT 2879 2868 WHEN p_share == '' & p_server \= '' THEN DO /* all shares on server */ 2880 IF p_ domain== '' THEN2869 IF p_workgroup == '' THEN 2881 2870 userdata = userdata';\\'p_server'\*' 2882 2871 ELSE 2883 userdata = userdata';'p_ domain':\\'p_server'\*'2872 userdata = userdata';'p_workgroup':\\'p_server'\*' 2884 2873 END 2885 WHEN p_server == '' & p_ domain\= '' THEN /* all servers in workgroup */2886 userdata = userdata';'p_ domain':\\*'2887 WHEN p_server == '' & p_ domain== '' THEN /* all workgroups */2874 WHEN p_server == '' & p_workgroup \= '' THEN /* all servers in workgroup */ 2875 userdata = userdata';'p_workgroup':\\*' 2876 WHEN p_server == '' & p_workgroup == '' THEN /* all workgroups */ 2888 2877 userdata = userdata';*:\\*' 2889 2878 OTHERWISE DO 2890 IF p_ domain== '' THEN2879 IF p_workgroup == '' THEN 2891 2880 userdata = userdata';\\'p_server'\'p_share 2892 2881 ELSE 2893 userdata = userdata';'p_ domain':\\'p_server'\'p_share2882 userdata = userdata';'p_workgroup':\\'p_server'\'p_share 2894 2883 END 2895 2884 END … … 2897 2886 2898 2887 IF options.!debug == 1 THEN SAY ' returning "'userdata'"' 2899 IF options.!debug == 1 THEN SAY time()' Parse resdataData done'2888 IF options.!debug == 1 THEN SAY time()' ParseResourceData done' 2900 2889 RETURN userdata 2901 2890 2891 /*:VRX ParseResParmString 2892 */ 2893 ParseResParmString: 2894 PARSE VAR resource . ';WORKGROUP=' p_workgroup ';' . 2895 PARSE VAR resource . ';SERVER=' p_server ';' . 2896 PARSE VAR resource . ';SHARE=' p_share ';' . 2897 PARSE VAR resource . ';USER=' p_user ';' . 2898 PARSE VAR resource . ';PASSWORD=' p_password ';' . 2899 PARSE VAR resource . ';SPASSWORD=' p_spassword ';' . 2900 PARSE VAR resource . ';MASTER=' p_master ';' . 2901 PARSE VAR resource . ';MASTERTYPE=' p_mtype ';' . 2902 PARSE VAR resource . ';MEMLEN=' p_memlen ';' . 2903 PARSE VAR resource . ';LOGFILE=' p_logfile ';' . 2904 PARSE VAR resource . ';LOGLEVEL=' p_loglevel ';' . 2905 PARSE VAR resource . ';CTO=' p_cachetimeout ';' . 2906 PARSE VAR resource . ';CLD=' p_cachelistings ';' . 2907 PARSE VAR resource . ';EASUPPORT=' p_easupport ' ' 2908 return 2902 2909 /*:VRX PB_ABOUT_CLOSE_Click 2903 2910 */ … … 2935 2942 */ 2936 2943 PB_ADVOK_Click: 2937 advanced.!memlen = VRGet( "SPB_MEMLEN", "Value" ) 2938 advanced.!easupport = VRGet( "CB_EAS", "Set" ) 2939 advanced.!readonly = VRGet( "CB_READONLY", "Set" ) 2940 advanced.!alwaysmp = VRGet( "CB_ALWAYSMP", "Set" ) 2944 advanced.!memlen = VRGet( "SPB_MEMLEN", "Value" ) 2945 advanced.!easupport = VRGet( "CB_EAS", "Set" ) 2946 advanced.!readonly = VRGet( "CB_READONLY", "Set" ) 2947 advanced.!alwaysmp = VRGet( "CB_ALWAYSMP", "Set" ) 2948 advanced.!cachetimeout = VRGet( "SPIN_CACHETIMEOUT", "Value" ) 2949 advanced.!cachelistings = VRGet( "SPIN_CACHELISTINGS", "Value" ) 2941 2950 2942 2951 CALL SW_ADVANCED_Close … … 3038 3047 CALL VRMethod "CN_CONDET", 'GetRecordList', 'All', 'records.' 3039 3048 DO i = 1 TO records.0 3040 resdata = "" 3041 resdata = resdata||VRMethod("CN_CONDET","GetFieldData", records.i, cd.mpointfh)||" " 3042 resdata = resdata||'\\'||VRMethod("CN_CONDET","GetFieldData", records.i, cd.workgroupfh) 3043 resdata = resdata||':'||VRMethod("CN_CONDET","GetFieldData", records.i, cd.serverfh) 3044 resdata = resdata||'\'||VRMethod("CN_CONDET","GetFieldData", records.i, cd.sharefh) 3045 resdata = resdata||'@'||VRMethod("CN_CONDET","GetFieldData", records.i, cd.userfh) 3046 resdata = resdata||';WORKGROUP='||VRMethod("CN_CONDET","GetFieldData", records.i, cd.workgroupfh) 3047 resdata = resdata||';SERVER='||VRMethod("CN_CONDET","GetFieldData", records.i, cd.serverfh) 3048 resdata = resdata||';SHARE='||VRMethod("CN_CONDET","GetFieldData", records.i, cd.sharefh) 3049 resdata = resdata||';USER='||VRMethod("CN_CONDET","GetFieldData", records.i, cd.userfh) 3050 resdata = resdata||';PASSWORD='||VRMethod("CN_CONDET","GetFieldData", records.i, cd.passwordfh) 3051 resdata = resdata||';SPASSWORD='||VRMethod("CN_CONDET","GetFieldData", records.i, cd.spasswordfh) 3052 resdata = resdata||';MASTER='||VRMethod("CN_CONDET","GetFieldData", records.i, cd.masterfh) 3053 resdata = resdata||';MASTERTYPE='||VRMethod("CN_CONDET","GetFieldData", records.i, cd.mtypefh) 3054 /* resdata = resdata||';MEMLEN='||VRMethod("CN_CONDET","GetFieldData", records.i, cd.memlenfh) 3055 resdata = resdata||';LOGFILE='||VRMethod("CN_CONDET","GetFieldData", records.i, cd.logfilefh) 3056 resdata = resdata||';LOGLEVEL='||VRMethod("CN_CONDET","GetFieldData", records.i, cd.loglevelfh) */ 3057 resdata = resdata||';EASUPPORT='||VRMethod("CN_CONDET","GetFieldData", records.i, cd.easupportfh) 3058 resdata = resdata||' '||VRMethod("CN_CONDET","GetFieldData", records.i, cd.rwfh) 3059 call lineout filename, resdata 3049 resource = "" 3050 resource = resource||VRMethod("CN_CONDET","GetFieldData", records.i, cd.mpointfh)||" " 3051 resource = resource||'\\'||VRMethod("CN_CONDET","GetFieldData", records.i, cd.workgroupfh) 3052 resource = resource||':'||VRMethod("CN_CONDET","GetFieldData", records.i, cd.serverfh) 3053 resource = resource||'\'||VRMethod("CN_CONDET","GetFieldData", records.i, cd.sharefh) 3054 resource = resource||'@'||VRMethod("CN_CONDET","GetFieldData", records.i, cd.userfh) 3055 resource = resource||';WORKGROUP='||VRMethod("CN_CONDET","GetFieldData", records.i, cd.workgroupfh) 3056 resource = resource||';SERVER='||VRMethod("CN_CONDET","GetFieldData", records.i, cd.serverfh) 3057 resource = resource||';SHARE='||VRMethod("CN_CONDET","GetFieldData", records.i, cd.sharefh) 3058 resource = resource||';USER='||VRMethod("CN_CONDET","GetFieldData", records.i, cd.userfh) 3059 resource = resource||';PASSWORD='||VRMethod("CN_CONDET","GetFieldData", records.i, cd.passwordfh) 3060 resource = resource||';SPASSWORD='||VRMethod("CN_CONDET","GetFieldData", records.i, cd.spasswordfh) 3061 resource = resource||';MASTER='||VRMethod("CN_CONDET","GetFieldData", records.i, cd.masterfh) 3062 resource = resource||';MASTERTYPE='||VRMethod("CN_CONDET","GetFieldData", records.i, cd.mtypefh) 3063 resource = resource||';CTO='||VRMethod("CN_CONDET","GetFieldData", records.i, cd.ctoFH) 3064 resource = resource||';CLD='||VRMethod("CN_CONDET","GetFieldData", records.i, cd.cldFH) 3065 /* resource = resource||';MEMLEN='||VRMethod("CN_CONDET","GetFieldData", records.i, cd.memlenfh) 3066 resource = resource||';LOGFILE='||VRMethod("CN_CONDET","GetFieldData", records.i, cd.logfilefh) 3067 resource = resource||';LOGLEVEL='||VRMethod("CN_CONDET","GetFieldData", records.i, cd.loglevelfh) */ 3068 resource = resource||';EASUPPORT='||VRMethod("CN_CONDET","GetFieldData", records.i, cd.easupportfh) 3069 resource = resource||' '||VRMethod("CN_CONDET","GetFieldData", records.i, cd.rwfh) 3070 call lineout filename, resource 3060 3071 END 3061 3072 CALL STREAM filename, 'C', 'CLOSE' … … 3267 3278 if vfs.!drive = vfs.!mountpoint then vfs.!mountpoint = vfs.!mountpoint||'\' 3268 3279 3269 3270 PARSE VAR resource . 'WORKGROUP=' workgroup ';' . 3271 PARSE VAR resource . 'SERVER=' server ';' . 3272 PARSE VAR resource . 'SHARE=' share ';' . 3273 PARSE VAR resource . 'USER=' user ';' . 3274 PARSE VAR resource . 'PASSWORD=' password ';' . 3275 PARSE VAR resource . 'SPASSWORD=' spassword ';' . 3276 PARSE VAR resource . 'MASTER=' master ';' . 3277 PARSE VAR resource . 'MASTERTYPE=' mtype ';' . 3278 /* PARSE VAR resource . 'MEMLEN=' memlen ';' . 3279 PARSE VAR resource . 'LOGFILE=' logfile ';'. 3280 PARSE VAR resource . 'LOGLEVEL=' loglevel ';' . */ 3281 PARSE VAR resource . 'EASUPPORT=' easupport . 3282 3283 options.!workgroup = workgroup 3284 options.!server = server 3285 options.!share = share 3286 options.!user = user 3287 options.!password = password 3288 options.!spassword = spassword 3289 options.!master = master 3290 options.!mastertype = mtype 3291 /* options.!memlen = memlen 3292 options.!logfile = logfile 3293 options.!loglevel = loglevel */ 3294 options.!easupport = easupport 3280 call ParseResParmString 3281 3282 options.!workgroup = p_workgroup 3283 options.!server = p_server 3284 options.!share = p_share 3285 options.!user = p_user 3286 options.!password = p_password 3287 options.!spassword = p_spassword 3288 options.!master = p_master 3289 options.!mastertype = p_mtype 3290 /* options.!memlen = p_memlen 3291 options.!logfile = p_logfile 3292 options.!loglevel = p_loglevel */ 3293 options.!cachetimeout = p_cachetimeout 3294 options.!cachelistings = p_cachelistings 3295 options.!easupport = p_easupport 3295 3296 3296 3297 IF rwFlag == 'R' THEN … … 3354 3355 options.!loglevel = advanced.!loglevel 3355 3356 options.!logfile = advanced.!logfile 3357 options.!cachetimeout = advanced.!cachetimeout 3358 options.!cachelistings = advanced.!cachelistings 3356 3359 3357 3360 vfs.!drive = '' … … 3458 3461 ok = VRSet("CB_DRIVES","Value",VRGet("CB_DRIVES1","Value")) 3459 3462 ok = VRSet("EF_DIRECTORY","Value",VRGet("EF_DIRECTORY1","Value")) 3463 3460 3464 advanced.!readonly = VRGet("CB_READONLY1","Set") 3461 3465 advanced.!easupport = VRGet("CB_EAS1","Set") 3462 3466 advanced.!alwaysmp = VRGet("CB_ALWAYSMP1","Set") 3463 say "advanced.!readonly = "advanced.!readonly 3464 say "options.!readonly = "options.!readonly 3467 advanced.!cachetimeout = VRGet( "SPIN_CACHETIMEOUT1", "Value" ) 3468 advanced.!cachelistings = VRGet( "SPIN_CACHELISTINGS1", "Value" ) 3469 3465 3470 call SW_MOUNTPOINT_Close 3466 3471 RETURN … … 3494 3499 PB_SAVE_Click: PROCEDURE EXPOSE settings. options. icons. Profile fs. cd. advanced. samba. 3495 3500 call PB_CONDET_SAVE_Click 3496 3497 /* if options.!autostart == 0 THEN filename = VRFileDialog('Main', NLVGetMessage( 50 ), 'S', '*.'fs.!profileext) 3501 RETURN 3502 3503 /* Old deprecated code: 3504 3505 if options.!autostart == 0 THEN filename = VRFileDialog('Main', NLVGetMessage( 50 ), 'S', '*.'fs.!profileext) 3498 3506 ELSE filename = Profile 3499 3507 … … 3528 3536 if options.!autostart == 0 THEN CALL VRMessage 'Main', NLVGetMessage( 52, filename ), NLVGetMessage( 51 ), 'I' 3529 3537 */ 3530 RETURN3531 3538 3532 3539 /*:VRX PB_SETTINGS_CANCEL_Click … … 3776 3783 options.!mastertype = '' 3777 3784 options.!memlen = '2' 3785 options.!cachetimeout = '10' 3786 options.!cachelistings = '32' 3778 3787 options.!easupport = '1' 3779 3788 options.!readonly = '' … … 3791 3800 3792 3801 advanced.!memlen = '' 3793 advanced.!easupport = '1' 3794 advanced.!readonly = '' 3802 3803 3795 3804 advanced.!loglevel = '0' 3796 3805 advanced.!logfile = '' 3797 3806 advanced.!browseauth = '' 3798 3807 advanced.!browseimme = '' 3808 advanced.!broadcast = '' 3799 3809 advanced.!savepassive= '' 3800 advanced.!broadcast = ''3801 advanced.!alwaysmp = ''3802 3810 advanced.!special = '' 3803 3811 advanced.!bigicons = '' 3812 3813 advanced.!easupport = '1' 3814 advanced.!readonly = '' 3815 advanced.!alwaysmp = '' 3816 advanced.!cachetimeout = '10' 3817 advanced.!cachelistings = '32' 3804 3818 3805 3819 credentials.!username = "" … … 3968 3982 3969 3983 /* Options */ 3970 CALL NLVSetText "GB_MISC", "Caption", 43 3971 CALL NLVSetText "CB_EAS", "Caption", 44 3972 CALL NLVSetText "CB_READONLY", "Caption", 45 3973 CALL NLVSetText "CB_ALWAYSMP", "Caption", 65 3984 CALL NLVSetText "GB_MISC", "Caption", 43 3985 CALL NLVSetText "CB_EAS", "Caption", 44 3986 CALL NLVSetText "CB_READONLY", "Caption", 45 3987 CALL NLVSetText "CB_ALWAYSMP", "Caption", 65 3988 CALL NLVSetText "DT_CACHETIMEOUT", "Caption", 130 3989 CALL NLVSetText "DT_CACHELISTINGS", "Caption", 131 3974 3990 3975 3991 /* Buttons */ … … 3985 4001 IF advanced.!readonly \= "" THEN ok = VRSet("CB_READONLY","Set", advanced.!readonly) 3986 4002 IF advanced.!alwaysmp \= "" THEN ok = VRSet("CB_ALWAYSMP","Set", advanced.!alwaysmp) 4003 IF advanced.!cachetimeout \= "" THEN ok = VRSet("SPIN_CACHETIMEOUT", "Value", advanced.!cachetimeout) 4004 IF advanced.!cachelistings \= "" THEN ok = VRSet("SPIN_CACHELISTINGS","Value", advanced.!cachelistings) 3987 4005 3988 4006 call VRMethod "SW_ADVANCED", "CenterWindow" … … 4108 4126 CALL NLVSetText 'CB_READONLY1', "Caption", 45 4109 4127 CALL NLVSetText 'CB_ALWAYSMP1', "Caption", 65 4128 CALL NLVSetText "DT_CACHETIMEOUT1", "Caption", 130 4129 CALL NLVSetText "DT_CACHELISTINGS1", "Caption", 131 4130 4110 4131 ok = VRMethod( "CB_DRIVES", "GetStringList", "freedrives." ) 4111 4132 ok = VRMethod( "CB_DRIVES1", "AddStringList", "freedrives." ) … … 4113 4134 ok = VRSet("EF_DIRECTORY1", "Value", VRGet("EF_Directory","Value")) 4114 4135 ok = VRMethod("EF_DIRECTORY1","AddString",p_share) 4115 ok = VRSet("CB_ALWAYSMP1","set",advanced.!alwaysmp) 4136 4137 IF advanced.!easupport \= "" THEN ok = VRSet("CB_EAS1", "Set", advanced.!easupport) 4138 IF advanced.!readonly \= "" THEN ok = VRSet("CB_READONLY1","Set", advanced.!readonly) 4139 IF advanced.!alwaysmp \= "" THEN ok = VRSet("CB_ALWAYSMP1","Set", advanced.!alwaysmp) 4140 IF advanced.!cachetimeout \= "" THEN ok = VRSet("SPIN_CACHETIMEOUT1", "Value", advanced.!cachetimeout) 4141 IF advanced.!cachelistings \= "" THEN ok = VRSet("SPIN_CACHELISTINGS1","Value", advanced.!cachelistings) 4116 4142 return 4117 4143 -
branches/guitools-2.0/evfsgui/evfsi_de.ipf
r506 r525 144 144 :h2 res=420 name=current.Aktuelle Verbindungen 145 145 146 : p.:font facename='Default' size=0x0.Das Bedienfeld f&ue.r aktuelle Ressourcen auf der linken Seite146 :font facename='Default' size=0x0.:p.Das Bedienfeld f&ue.r aktuelle Ressourcen auf der linken Seite 147 147 des Fensters zeigt alle virtuellen EVFS Laufwerke und 148 148 Mount-Points&comma. die derzeit angelegt sind&comma. und die … … 259 259 :h2 res=440 name=smbtree.Netzwerkumgebung 260 260 261 : p.:font facename='Default' size=0x0.In der Netzwerkumgebung werden im LAN verf&ue.gbare261 :font facename='Default' size=0x0.:p.In der Netzwerkumgebung werden im LAN verf&ue.gbare 262 262 Arbeitsgruppen (Domains)&comma. Server bzw. deren Freigaben 263 263 angezeigt. … … 268 268 :h2 res=450 name=condet.Verbindungsdetails 269 269 270 : p.:font facename='Default' size=0x0.In der Ansicht Verbindungsdetails werden die Eigenschaften aller270 :font facename='Default' size=0x0.:p.In der Ansicht Verbindungsdetails werden die Eigenschaften aller 271 271 im Verbindungen dargestellt&comma. sowohl f&ue.r aktive als auch 272 272 passive Verbindungen. … … 301 301 einer fehlgeschlagenen Verbindung angelegt. Normalerweise wird er 302 302 in diesem Fall wieder entfernt. 303 304 :p.:hp2.Cache timeout:ehp2.&colon. 305 :p.Die Zeit in Sekunden f&ue.r die der Cache g&ue.1ltig ist. Wenn 306 die Zeit verstrichen ist&comma. wird das Verzeichnis neu 307 eingelesen. F&ue.r ein sehr grosses Verzeichnis kann es von 308 Vorteil sein&comma. wenn die Zeit erh&oe.ht wird (Als 309 Regel&colon. pro 500-800 Dateien 10 Sekunden). 310 :p.Standardwert&colon. 10 Sekunden. 311 312 :p.:hp2.Cache listings:ehp2.&colon. 313 :p.Die Anzahl der Verzeichnisse&comma. die der Cache behalten soll. 314 Vorsicht&comma. je h&oe.her dieser Wert desto mehr Speicher wird 315 gebraucht. 316 :p.Standardwert&colon. 32 Verzeichnisse 303 317 304 318 :p.:hp2.Anzahl der Bl&oe.cke 64 kB (nur Version 1.x)&colon. … … 369 383 (EVFSGUI) 370 384 371 :p.Version 2.1 ( Dezember&comma. 2010)372 373 :p.(c) 2009-201 0Herwig Bauernfeind&comma. teilweise auch (c)385 :p.Version 2.1 (J&ae.nner&comma. 2011) 386 387 :p.(c) 2009-2011 Herwig Bauernfeind&comma. teilweise auch (c) 374 388 2007-2009 Alex Taylor. All rights reserved. 375 389 … … 386 400 :p.Samba home page&colon. http&colon.&slr.&slr.www.samba.org 387 401 :p.NetDrive home page&colon. 388 http&colon.&slr.&slr.www.blueprintsoftwareworks.com&slr.netdrive&slr. :euserdoc. 402 http&colon.&slr.&slr.www.blueprintsoftwareworks.com&slr.netdrive&slr. 403 404 405 406 407 408 :euserdoc. -
branches/guitools-2.0/evfsgui/evfsi_de.mkm
r506 r525 130 130 EVG0120I: A~lle abhngen 131 131 EVG0121I: ~Kopieren 132 EVG0122?: 133 EVG0123?: 134 EVG0124?: 135 EVG0125?: 136 EVG0126?: 137 EVG0127?: 138 EVG0128?: 139 EVG0129?: 140 ;More advanced properties 141 EVG0130I: Zeitablauf Cache 142 EVG0131I: Verzeichnisse cachen -
branches/guitools-2.0/evfsgui/evfsi_en.ipf
r506 r525 248 248 :h2 res=440 name=smbtree.Network neighbourhood 249 249 250 : p.:font facename='Default' size=0x0.The Network Neighbourhood View shows available LAN workgroups250 :font facename='Default' size=0x0.:p.The Network Neighbourhood View shows available LAN workgroups 251 251 (domains)&comma. server or its shares. 252 252 … … 256 256 :h2 res=450 name=condet.Connection details 257 257 258 : p.:font facename='Default' size=0x0.Connection Details View shows the properties of all258 :font facename='Default' size=0x0.:p.Connection Details View shows the properties of all 259 259 connections&comma. both active and passive ones. 260 260 … … 287 287 failed connection attempt is preserved. Normally&comma. it is 288 288 removed in this case. 289 290 :p.:hp2.Cache timeout 291 :p.:ehp2.The time in seconds for which the cache is valid. If the time is 292 over the client rereads the directory again. For a directory with 293 many files&comma. it may be better to increase the timeout (rule 294 of thumb&colon. per 500-800 files 10 seconds). 295 :p.Default&colon. 10 seconds. 296 297 :p.:hp2.Cache listings 298 :p.:ehp2.The amount of directories the cache should hold. Be aware the 299 higher the value the more memory will be used. 300 :p.Default&colon. 32 listings. 289 301 290 302 :p.:hp2.No. of 64 kB blocks (only Version 1.x) … … 352 364 (EVFSGUI) 353 365 354 :p.Version 2.1 ( Dezember&comma. 2010)355 356 :p.(c) 2009-201 0Herwig Bauernfeind&comma. parts also (c) 2007-2009366 :p.Version 2.1 (January&comma. 2011) 367 368 :p.(c) 2009-2011 Herwig Bauernfeind&comma. parts also (c) 2007-2009 357 369 Alex Taylor. All rights reserved. 358 370 … … 373 385 374 386 375 376 377 387 :euserdoc. -
branches/guitools-2.0/evfsgui/evfsi_en.mkm
r506 r525 130 130 EVG0120I: Detach a~ll 131 131 EVG0121I: To c~lipboard 132 EVG0122?: 133 EVG0123?: 134 EVG0124?: 135 EVG0125?: 136 EVG0126?: 137 EVG0127?: 138 EVG0128?: 139 EVG0129?: 140 ;More advanced properties 141 EVG0130I: sec. cache timeout 142 EVG0131I: listings to cache -
branches/guitools-2.0/evfsgui/evfsi_fr.ipf
r503 r525 115 115 :dd.EVFSGUI se ferme automatiquement aprs 3 secondes. 116 116 :dt.:hp2.-delay [n]:ehp2.&colon. 117 :dd.Attente de 'n' secondes avant restauration des connexions. Le118 dlai est optionnel. 60secondes par dfaut.117 :dd.Attente de 'n' secondes avant restauration des connexions. 60 118 secondes par dfaut. 119 119 :edl. 120 120 … … 301 301 removed in this case. 302 302 303 :p.:hp2.Cache timeout 304 :p.:ehp2.The time in seconds for which the cache is valid. If the time is 305 over the client rereads the directory again. For a directory with 306 manyfiles it may be better to increase the timeout (rule of 307 thumb&colon. per 500-800 files 10 seconds). 308 :p.Default&colon. 10 seconds 309 310 :p.:hp2.Cache listings 311 :p.:ehp2.The amount of directories the cache should hold. Be aware the 312 higher the value the more memory is used. 313 :p.Default&colon. 32 314 303 315 :p.:hp2.Nb de blocs de 64 ko (seulement Version 1.x) 304 316 :p.:ehp2.Vous permet de paramtrer la taille du tampon de mmoire partage … … 356 368 drive. This option creates this file or removes it again. 357 369 358 The logfile ndpsmb.log logis stored in the LOGFILES environment 359 variable. In case this does not exist&comma. the file is placed 360 into the EVFS (Netdrive) directory. 370 The logfiles log.ndpsmb and log.smbc are stored in the path of 371 the LOGFILES environment variable. In case this does not 372 exist&comma. the file is placed into the EVFS (Netdrive) 373 directory. 361 374 362 375 :p.:hp2.Debug:ehp2.&colon. … … 370 383 Virtual File System pour SMB (EVFSGUI) 371 384 372 :p.Version 2. 0 (Octobre&comma. 2009)373 374 :p.(c) 2009 Herwig Bauernfeind&comma. parts also (c) 2007-2009 Alex375 Taylor. Tous droits rservs.385 :p.Version 2.1 (Decembre&comma. 2010) 386 387 :p.(c) 2009-2010 Herwig Bauernfeind&comma. parts also (c) 2007-2009 388 Alex Taylor. Tous droits rservs. 376 389 377 390 :p.La permission d'utiliser&comma. de modifier et&slr.ou de … … 394 407 395 408 396 397 398 399 409 :euserdoc. -
branches/guitools-2.0/evfsgui/evfsi_fr.mkm
r506 r525 136 136 EVG0120I: Dtache~r tous 137 137 EVG0121I: ~Copier 138 138 EVG0122?: 139 EVG0123?: 140 EVG0124?: 141 EVG0125?: 142 EVG0126?: 143 EVG0127?: 144 EVG0128?: 145 EVG0129?: 146 ;More advanced properties 147 EVG0130I: Cache Timeout 148 EVG0131I: Cache Listings -
branches/guitools-2.0/evfsgui/evfsi_it.mkm
r506 r525 134 134 EVG0120I: Rimuovi ~tutti 135 135 EVG0121I: ~Copia 136 EVG0122?: 137 EVG0123?: 138 EVG0124?: 139 EVG0125?: 140 EVG0126?: 141 EVG0127?: 142 EVG0128?: 143 EVG0129?: 144 ;More advanced properties 145 EVG0130I: Cache timeout 146 EVG0131I: Cache listings
Note:
See TracChangeset
for help on using the changeset viewer.