Changeset 909 for trunk/guitools/evfsgui/evfsgui.vrx

Timestamp:

May 26, 2016, 12:51:38 PM (9 years ago)

Author:

Herwig Bauernfeind

Message:

GUITools: EVFSGUI bugfixes, license, new throbber, shared library updates

File:

• trunk/guitools/evfsgui/evfsgui.vrx (modified) (8 diffs)

trunk/guitools/evfsgui/evfsgui.vrx

@@ -4 +4 @@
 */
 Main:
+/*
+    Samba Connections GUI for OS/2 based systems
+    Copyright (C) 2007-2016 by Alexander Taylor and Herwig Bauernfeind
+    Derived works must contain this copyright notice.
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
 /*  Process the arguments.
     Get the parent window.
@@ -724 +742 @@
 /*:VRX         _GetSMBObjectShares
 */
-_GetSMBObjectShares: procedure expose samba. options. SMBObj. rh
+_GetSMBObjectShares: procedure expose samba. options. SMBObj.
     /* Purpose: Return stem with shares for a given Object (as handle) */
 
@@ -731 +749 @@
     SmbObj.shares. = ''
     SmbObj.shares.0 = 0
-
+    I = 0
     ok = VRMethod("CN_smbtree", "GetRecordList", "All", rh.)
 
@@ -742 +760 @@
         ResName = strip(ResName)
         parse var userdata ResType  '|' .
-        I = 0
+
         if ParentRH = rh then do /* we found a share belonging to our server */
             if ResType = "DISK" then do
@@ -834 +852 @@
     CALL NLVSetText 'PB_SMBTREE_CONNECT',             "Caption", 28
     CALL NLVSetText 'PB_SMBTREE_REFRESH',             "Caption", 38
-    CALL NLVSetText 'PB_SMBTREE_HELP',                "Caption", 4
-    CALL NLVSetText 'CN_SMBTREE',                     "Caption", 140
+    CALL NLVSetText 'PB_SMBTREE_HELP',                "Caption",  4
+    CALL NLVSetText 'CN_SMBTREE',                     "Caption",140
+
 /** Use AutoSize property instead
     ok = VRSet("Pict_Throbber","Width",  VRMethod( "Screen", "PixelsToTwips", 32 ))
@@ -1029 +1048 @@
         ok = VRSet("EF_USER",    "Value",Credentials.!username)
         ok = VRSet("EF_PASSWORD","Value",Credentials.!password)
-    end
+        ok = VRSet("CN_SMBTREE","Caption",VRGet("CN_SMBTREE","Caption")||": "Credentials.!username)
+    end
+    else ok = VRSet("CN_SMBTREE","Caption",VRGet("CN_SMBTREE","Caption")||": Guest")
 
     /* SambaInit.VRS needs these 2 */
@@ -2465 +2486 @@
 
     machine = VRGet("EF_SERVER","value")
+    ok = VRSet("EF_SHARE","Value", "")
+    ok = VRMethod("EF_SHARE","Reset")
+
     rh = _GetMachineHandle(machine)
-
     if rh <> "" then do
         call _GetSMBObjectProperties rh
-
         if SMBObj.parentrh = ""
             then ok = VRSet("EF_NETWORK","Value", "") /* The workgroup might be unknown at this moment */
             else ok = VRSet("EF_NETWORK","Value", VRMethod("CN_SMBTREE","GetRecordAttr",SMBObj.parentRH,"Caption"))
 
-        call _GetSMBObjectShares rh
-
-        ok = VRMethod("EF_SHARE",   "Reset")
-        if SMBObj.shares.0 > 0 then ok = VRMethod("EF_SHARE",   "AddRecordList", "SMBObj.shares.")
+        call _GetSMBObjectShares SMBObj.rh
+
+        if SMBObj.shares.0 > 0 then do
+            ok = VRMethod("EF_SHARE",   "AddStringList", "SMBObj.shares.")
+        end
     end
     else do
@@ -5379 +5402 @@
     parse var pIdx '#' pidx
     pidx = pidx + 1
-    if pidx = 36 then pidx = 11
+    if pidx = 23 then pidx = 11
     ok = VRSet("Pict_Throbber","PicturePath","#"pidx)
 return