Changeset 410 for branches

Timestamp:

Feb 21, 2010, 6:47:36 PM (15 years ago)

Author:

Herwig Bauernfeind

Message:

GUI-Tools: Latest EVFSGUI changes

Location:

branches/guitools-2.0

Files:

• evfsgui/changes (modified) (1 diff)
• evfsgui/evfsgui.VRP (modified) (1 diff)
• evfsgui/evfsgui.VRX (modified) (7 diffs)
• evfsgui/evfsgui.VRY (modified) ( previous)
• evfsgui/evfsi_de.mkm (modified) (1 diff)
• evfsgui/evfsi_en.mkm (modified) (1 diff)
• evfsgui/evfsi_fr.mkm (modified) (1 diff)
• shared/cltinit.vrs (modified) (3 diffs)
• shared/nlv.vrs (modified) (2 diffs)

branches/guitools-2.0/evfsgui/changes

@@ -5 +5 @@
 - Fix endless loop if neither EVFS nor Netdrive is installed 
   under all conditions
-- Enable WPS integration code
+- Enable WPS integration code (partly done)
 - Enable and complete printer support code
 - Eventually support on-the-fly browsing of directories/files in EVFSGUI 
-
-Version 2.0.3 2010-01-29
+- Eventually support server based logon scripts (requires REXX rpc library,
+  partly done)
+- Opening WPS folders should be done in a separate Thread (in order not to
+  block EVFSGUI while waiting for a slow WPS folder...)
+
+Version 2.0.3 2010-02-20
+- Fixed: The NLV subroutine now properly falls back to the builtin (bracketed)
+         message files in case NO (not even an english message file) can be 
+         found.
+- Fixed: Open mountpoint as WPS object fully workable 
+- Fixed: Open mountpint now has a consistent behaviour with other actions
+- Changed: Open context menu item enabled for testing (experimental)
+- Changed: Show wait pointer while opening WPS folder
+- Changed: CltInit: Now scans wellknown locations for Samba binaries 
+           (faster at least in theory)
 - Changed: In the 1.5.0 GA version of the plugin the MEMLEN, LOGFILE and 
            LOGLEVEL tokens are removed in order to address the problem with

branches/guitools-2.0/evfsgui/evfsgui.VRP

@@ -1 +1 @@
 VX-REXX OS/2 V2.14 Build B3
 VRX: evfsgui.VRX
+VXOFile: VRSPLIT
+MacroPath: VRM:U:\Develop\Samba\guitools-2.0\evfsgui
+EXEPath: 
+RunParameters: 
+RunDirectory: U:\Develop\Samba\guitools-2.0\evfsgui
+VRXWindow: __VREMainWindow,1,1482,915,891,8034
+VRXWindow: __VRESectionListWindow,1,1469,10551,8696,4794
+VRXWindow: __VREToolsWindow,0,2517,7082,6992,1669
+UserFile: 1
+UserWindow: Main,1

branches/guitools-2.0/evfsgui/evfsgui.VRX

@@ -232 +232 @@
     CALL NLVSetText 'MENU_CONTEXT_UNMOUNT',  'Caption', 12
     CALL NLVSetText 'MENU_CONTEXT_EDIT',     'Caption', 32
+    CALL NLVSetText 'MENU_CONTEXT_OPEN',     'Caption', 94
 
     CALL NLVSetText 'Menu_File',          'Caption', 80
@@ -686 +687 @@
 /* Herwig B. */
 
+    CALL VRSet 'MENU_CONTEXT_OPEN', 'Visible', 1
+
     IF p_mounts > 0 THEN DO
+
         CALL VRSet 'MENU_CONTEXT_UNMOUNT', 'Visible', 1
         CALL VRSet 'PB_UNMOUNT', 'Enabled', 1
@@ -1284 +1288 @@
 
     settings.!ini = inipath'\evfsgui.ini'
-    IF options.!debug == 1 THEN SAY '  INI = "'settings.!ini'"'
+    IF options.!debug == 1 THEN SAY '  EVFSGUI INIfile = "'settings.!ini'"'
 
     IF STREAM( settings.!ini, 'C', 'QUERY EXISTS') == '' THEN DO
@@ -1454 +1458 @@
     /* else call VRSet 'Main',    'Visible', 1 */
 
+    /* in non debug versions this is normally not visible */
+    IF options.!debug == 1 THEN SAY '  NLV MessageFile = "'settings.!messages'"'
+    IF options.!debug == 1 THEN SAY '  NLV HelpFile    = "'settings.!helpfile'"'
+
     IF options.!debug == 1 THEN SAY time()' LoadSettings done'
 RETURN
@@ -1467 +1475 @@
 Main_Create:
     ok = VRRedirectStdIO("OFF")
-    options.!debug    = 0
+    options.!debug    = 1
 
     IF options.!debug == 1 THEN ok = VRREdirectStdIO("ON")
@@ -1757 +1765 @@
 */
 Menu_Context_Open_Click:
-    CALL VRMethod 'CN_CURRENT', 'GetRecordList', 'Selected', 'select.'
-    IF select.0 < 1 THEN RETURN
-
-    userdata = VRMethod( 'CN_CURRENT', 'GetRecordAttr', select.1, 'UserData')
+    IF options.!debug == 1 THEN SAY time()' '||"Menu_Context_Open_Click started"
+    userdata = VRMethod( 'CN_CURRENT', 'GetRecordAttr', rh, 'UserData')
     PARSE VAR userdata mountpoint ';' mounts ';' .
 
-    say mountpoint
+
+    if length(mountpoint) > 3 then mountpoint = strip(mountpoint,'T','\')
+    IF options.!debug == 1 THEN SAY '  Opening WPS folder "'mountpoint'"'
+    call VRSet VRWindow(), 'Pointer', 'Wait'
     rc = SysOpenObject(mountpoint, "DEFAULT", 1)
+    call VRSet VRWindow(), 'Pointer', '<default>'
+
+    IF options.!debug == 1 THEN SAY time()' '||"Menu_Context_Open_Click done"
 return
 
@@ -1837 +1849 @@
 */
 Menu_Help_About_Click:
-    CALL VRMessage 'Main', VRGet("Main", "HintText")||'0D0A'x||'(c) 2007-2009 Alex Taylor and Herwig Bauernfeind',NLVGetMessage( 1 ), 'I'
+    CALL VRMessage 'Main', VRGet("Main", "HintText")||'0D0A'x||'(c) 2007-2010 Alex Taylor and Herwig Bauernfeind',NLVGetMessage( 1 ), 'I'
 return
 

branches/guitools-2.0/evfsgui/evfsi_de.mkm

@@ -100 +100 @@
 EVG0092I: Information
 EVG0093I: Betriebsystem:
-EVG0094?:
+EVG0094I: ~™ffnen
 EVG0095?:
 EVG0096?:

branches/guitools-2.0/evfsgui/evfsi_en.mkm

@@ -100 +100 @@
 EVG0092I: Information
 EVG0093I: Operating System
-EVG0094?:
+EVG0094I: ~Open
 EVG0095?:
 EVG0096?:

branches/guitools-2.0/evfsgui/evfsi_fr.mkm

@@ -105 +105 @@
 EVG0092I: Informations
 EVG0093I: SystŠme d'exploitation
-EVG0094?:
+EVG0094I: ~Ouvrir
 EVG0095?:
 EVG0096?:

branches/guitools-2.0/shared/cltinit.vrs

@@ -38 +38 @@
     end
     IF options.!debug == 1 THEN say '  Samba tools    = "'samba.!tools'"'
-    say '  Changing into "'directory(samba.!tools)'"'
+    say '  Changing into tools "'directory(samba.!tools)'"'
 
     /* smbclient.exe */
     samba.!smbclientexe = ""
+    if samba.!smbclientexe = "" then do /* wellknown locations */
+        WellKnown = sysBootdrive()"\ecs\system\samba;"sysBootdrive()"\samba"
+        Programs = value("PROGRAMS",,'OS2ENVIRONMENT')
+        if Programs <> "" then WellKnown = Wellknown';'Programs'\samba'
+        Tools = value("TOOLS",,'OS2ENVIRONMENT')
+        if Programs <> "" then WellKnown = Wellknown';'Tools'\samba'
+        say Wellknown
+        call charout , "  Are binaries in wellknown locations? "
+        ok = VRFindFile("smbclient.exe",WellKnown)
+        if ok <> "" then say "Yes."; else say "No."
+        if ok <> "" then samba.!smbclientexe = ok
+        drop Wellknown
+    end
     if samba.!smbclientexe = "" then do /* in current directory? */
         call charout , "  Are binaries in current directory? "
         ok = SysFileTree('.\smbclient.exe', exist.,'FO')
-        say exist.0' (1 = Yes, 0 = No)'
+        if exist.0 = 1 then say "Yes."; else say "No."
         if exist.0 = 1 then samba.!smbclientexe = exist.1
     end
@@ -51 +64 @@
         call charout , "  Are binaries in parent directory? "
         ok = SysFileTree('..\smbclient.exe', exist.,'FO')
-        say exist.0' (1 = Yes, 0 = No)'
+        if exist.0 = 1 then say "Yes."; else say "No."
         if exist.0 = 1 then samba.!smbclientexe = exist.1
     end
@@ -57 +70 @@
         call charout , "  Are binaries in ..\BIN directory? "
         ok = SysFileTree('..\bin\smbclient.exe', exist.,'FO')
-        say exist.0' (1 = Yes, 0 = No)'
+        if exist.0 = 1 then say "Yes."; else say "No."
         if exist.0 = 1 then samba.!smbclientexe = exist.1
     end

branches/guitools-2.0/shared/nlv.vrs

@@ -79 +79 @@
         end
         if NLVSrchDone = 0 then do /* Fallback to English */
-            if nlv = "EN" then NLVSrchDone = 1 /* We give up and leave */
+            if nlv = "EN" then do
+                NLVSrchDone = 1 /* We give up and leave */
+                /* We will leave without a valid NLV file here! */
+            end
             else do
                 say "  NLV "Suffix" File not found, falling back to EN."
                 nlv = "EN"
+                /* Now we repeat the whole procedure to find the EN file */
             end
         end
@@ -96 +100 @@
     msgnum  = ARG( 1 )
 
+    IF msgfile == '' THEN RETURN ''
     IF msgnum == '' THEN RETURN ''