Changeset 327 for branches

Timestamp:

Sep 7, 2009, 3:05:52 PM (16 years ago)

Author:

Herwig Bauernfeind

Message:

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

Location:

branches/guitools-2.0

Files:

• evfsgui/changes (modified) (3 diffs)
• evfsgui/evfsgui.RC (modified) (1 diff)
• evfsgui/evfsgui.VRP (modified) (1 diff)
• evfsgui/evfsgui.VRX (modified) (17 diffs)
• evfsgui/evfsgui.VRY (modified) ( previous)
• shared/smbtree.vrs (modified) (2 diffs)

branches/guitools-2.0/evfsgui/changes

@@ -25 +25 @@
 - Added: Optionally turn on/off special ($) shares
 - Added: Optionally use big icons
+- Added: Profile files may be dropped onto the current connections container
 - Changed: Several changes in GUI style (as suggested by Alex Taylor)
 - Changed: Left align buttons in current connections panel (as suggested by 
@@ -33 +34 @@
 - Changed: Use PM_Default_Colors for title sections (as suggested by Alex Taylor)
 - Changed: German translation of "Retry" 
+- Changed: Profile behaviour: In 1.3 a new profile replaced older connections
+           on the same volume only, in 2.x a new profile is merged with the
+           old connections one.
 - Fixed: Loading a profile presented the user a half drawn window
+- Fixed: Startup code if no evfsgui.ini is present
 - Fixed: CltInit uses smbclient.exe instead of smbd.exe to find Samba binaries
 - Fixed: Message queue during resize isn't cleared (no flashing during resize)
@@ -42 +47 @@
 - Fixed: Edit and Selected menu easily got out of sync
 - Fixed: Another missing record validation
+- Fixed: Password display broken on double connection warning
 
 ToDo:

branches/guitools-2.0/evfsgui/evfsgui.RC

@@ -26 +26 @@
 BITMAP 34  eBall_24.bmp
 BITMAP 35  eBall_25.bmp
+icon 68 passive.ico

branches/guitools-2.0/evfsgui/evfsgui.VRP

@@ -4 +4 @@
 MacroPath: VRM: U:\Develop\Samba\guitools-2.0\smbclgui
 EXEPath: 
-RunParameters: -ndfs
+RunParameters: 
 RunDirectory: 
 VRXWindow: __VREMainWindow,1,530,2457,879,4071
 VRXWindow: __VRESectionListWindow,1,337,11708,11623,3686
-VRXWindow: __VREToolsWindow,1,518,530,6984,1663
+VRXWindow: __VREToolsWindow,1,518,530,6993,1665
 VRXWindow: __VREWindListWindow,1,482,7661,2650,3150
 UserFile: 1
 UserWindow: Main,1
-UserWindow: SW_ADVANCED,1

branches/guitools-2.0/evfsgui/evfsgui.VRX

@@ -280 +280 @@
     if VRMethod( 'CN_CONDET', "ValidateRecord", rh) <> 1 then return
 
+    /* This is the place to enable specific context menu entries */
+    ok = VRMethod( "CN_CONDET", "GetRecordList", "All", "records." ) 
+    ok = VRSet("Menu_Selected_Remove", "Visible",  (records.0 <> 0))
+    ok = VRSet("Menu_Selected_Retry",  "Visible",  (records.0 <> 0))
+
     if VRMethod( 'CN_CONDET', "GetFieldData", rh, CD.StatusFH) = '#68:PMWP.DLL' then do
         ok = VRSet("Menu_Selected_Retry",  "Enabled",1)
@@ -291 +296 @@
    
     obj = VRInfo( "object" )
-    ok = VRMethod( "CN_SMBTREE", "GetRecordList", "SourceOrSelected", "selrec." ) 
+    ok = VRMethod( "CN_CONDET", "GetRecordList", "SourceOrSelected", "selrec." ) 
     if selrec.0 = 0 then return
 
-    Icon = VRMethod("CN_SMBTREE", "GetRecordAttr", selrec.1, "Icon")
+    Icon = VRMethod("CN_CONDET", "GetRecordAttr", selrec.1, "Icon")
 
     if Icon = "#65:PMWP.DLL" then do /* Printers not supported at the moment */
@@ -460 +465 @@
     p_share = ''
 
-    srcCtn = VRInfo( "SourceObject" )
-    srcRec = VRInfo( "SourceRecord" )
-    trgCtn = VRInfo( "TargetObject" )
-    trgRec = VRInfo( "TargetRecord" )
+    srcFile = VRInfo( "SourceFile" )
+    srcCtn  = VRInfo( "SourceObject" )
+    srcRec  = VRInfo( "SourceRecord" )
+    trgCtn  = VRInfo( "TargetObject" )
+    trgRec  = VRInfo( "TargetRecord" )
+
+say "srcFile = '"srcFile"'"
+say "srcCtn  = '"srcCtn"'"
+say "srcRec  = '"srcRec"'"
+say "TrgCtn  = '"trgCtn"'"
+say "TrgRec  = '"trgRec"'"
+
+    if srcFile <> "" then do /* A file was dropped onto the conatainer - load it */
+        if translate(VRParseFileName(srcFile,'E')) <> translate(fs.!profileext) then do
+            buttons.0 = 1
+            buttons.1 = NLVGetMessage(9)
+            ok = VRMessage('Main', "TITEL" , "TEXT", 'E','buttons.')
+        end
+        else do
+            options.!autoload = 1
+            Profile = srcFile
+            call PB_LOAD_Click
+        end
+        return
+    end
+
+    say VRGet(srcCtn,'Name')
 
     ok = VRMethod("CB_MOUNT", "GetStringList", "ShareLevels." )
-
-    say VRGet(srcCtn,'Name')
-    say "TargetRecord = '"trgRec"'"
 
     if VRGet(srcCtn,'Name') = "CN_CONDET" then do
@@ -606 +631 @@
         return
     end
+
+    /* This is the place to enable specific context menu entries */
 
     ok = VRMethod( "Menu_Selected", "Popup", , , "", "" )
@@ -831 +858 @@
 /*:VRX         LoadSettings
 */
-LoadSettings: PROCEDURE EXPOSE settings. options. fs. advanced. samba. ShowHidden
+LoadSettings: PROCEDURE EXPOSE settings. options. fs. advanced. samba. ShowHidden FWidth
     IF options.!debug == 1 THEN SAY time()' '||'LoadSettings started'
 
@@ -842 +869 @@
     settings.!ini = inipath'\evfsgui.ini'
     IF STREAM( settings.!ini, 'C', 'QUERY EXISTS') == '' THEN DO
+        say "First start!"
+        settings.!network = ""
+        settings.!buttonson = 1
+        settings.!smbtreeon = 1
+        advanced.!browseimme = 1
+
+        ShowHidden = 0
+
+        CALL VRSet VRWindow(), 'Height', 7576
+        CALL VRSet VRWindow(), 'Width',  8200
+        CALL VRSet "SPLIT_MAIN", 'Left',  2915
         CALL VRMethod VRWindow(), 'CenterWindow'
-        settings.!network = ""
+        call Menu_View_Buttons_Click
+        call Menu_View_SmbTree_Click
+        ok = VRset("GB_SMBTREE","Painting", 1)
+        ok = VRset("GB_SMBTREE","Visible", 1)
+
+        call VRSet 'Main',    'Visible', 1
+        call Main_Resize
     END
     ELSE DO
@@ -883 +927 @@
         settings.!network = VRGetIni('Settings', 'Network', settings.!ini, 'NoClose')
         IF settings.!network == '' THEN settings.!network = '' */
+        settings.!network = ''
 
         if \VRFileExists( samba.!smbconf ) then call _CreateSmbConf        
@@ -897 +942 @@
 
         advanced.!browseimme = VRGetIni('Settings', 'BrowseImme', settings.!ini)
-        IF advanced.!browseimme == '' THEN advanced.!browseimme = 0
+        IF advanced.!browseimme == '' THEN advanced.!browseimme = 1
 
         advanced.!debug = VRGetIni('Settings', 'Debug', settings.!ini)
@@ -922 +967 @@
         ok = VRSet("DT_CURRENT","BACKCOLOR", settings.!curbcolor )
         ok = VRSet("DT_CURRENT","FORECOLOR", settings.!curfcolor )
-        ok = VRSet("DT_DIALOG","BACKCOLOR", settings.!curbcolor )
-        ok = VRSet("DT_DIALOG","FORECOLOR", settings.!curfcolor )
+        ok = VRSet("DT_DIALOG","BACKCOLOR",  settings.!curbcolor )
+        ok = VRSet("DT_DIALOG","FORECOLOR",  settings.!curfcolor )
         ok = VRSet("DT_SMBTREE","BACKCOLOR", settings.!curbcolor )
         ok = VRSet("DT_SMBTREE","FORECOLOR", settings.!curfcolor )
@@ -1382 +1427 @@
         settings.!buttonson = 1
     end
+
     ok = VRSet("Main","Height", VRGet("GB_CURRENT", "Height") +920 +FWidth +options.!buttondelta)
 return
@@ -1401 +1447 @@
     ok = VRSet("Menu_View_ConDet", "Checked",  1)
 
-    ok = VRMethod( "CN_CONDET", "GetRecordList", "All", "records." ) 
-    ok = VRSet("Menu_Selected_Remove", "Visible",  (records.0 <> 0))
-    ok = VRSet("Menu_Selected_Retry", "Visible",  (records.0 <> 0))
-    ok = VRSet("Menu_Selected_Connect", "Visible",  0)
+    /* Hide any "foreign" menu entries */
+    ok = VRSet("Menu_Selected_Connect", "Visible", 0)
 return
 
@@ -1445 +1489 @@
     ok = VRSet("Menu_View_SmbTree","Checked", 1)
 
-    ok = VRSet("Menu_Selected_Remove", "Visible",  0)
-    ok = VRSet("Menu_Selected_Retry", "Visible",  0)
-
-    ok = VRSet("Menu_Selected_Connect", "Visible",  1)
+    /* Hide any "foreign" menu entries */
+    ok = VRSet("Menu_Selected_Remove", "Visible", 0)
+    ok = VRSet("Menu_Selected_Retry",  "Visible", 0)
 return
 
@@ -1458 +1501 @@
     call VRSet VRWindow(), 'Pointer', 'Wait'
 
-    /* Attach the virtual drive */
+/*  Disabled because we merge profile now - in earlier revisions 
+    we replaced it but only for preexisting drives - this made only 
+    as long as we were unabled to detect double connections - this could be made an option! 
     IF options.!autoload then do
         dyn = "ok = "fs.!prefix"RxDetach(vfs.!drive)"
@@ -1465 +1510 @@
         
         IF options.!debug == 1 THEN SAY time()' '||'Autoload Detach "'vfs.!drive'" =' ok 
-    end
-    /* Only if drive is not already attached */
+    end */
+
+    /* Attach the virtual drive - only if drive is not already attached */
     if pos(vfs.!drive,MyFreeDriveMap("C:","FREE")) > 0 then do
         dyn = "ok = "fs.!prefix"RxAttach( vfs.!drive )"
         IF options.!debug == 1 THEN SAY time()' '||dyn
-            interpret dyn; drop dyn
+
+        interpret dyn; drop dyn
         
         IF options.!debug == 1 THEN SAY time()' '||'Attach "'vfs.!drive'" =' ok 
@@ -1521 +1568 @@
         hash = VRMethod("CN_CONDET","GetFieldData", records.i, cd.hashfh)
         if hash = md5 & VRMethod("CN_CONDET","GetFieldData", records.i, cd.statusfh) = '#64:PMWP.DLL' then do /* Same hash, status active */
+            say "Double connection deteced!!"
+            if options.!spassword <> "" then upw = ":********"
+            else upw = ""
             buttons.0 = 2
             buttons.1 = NLVGetMessage(9)
             buttons.2 = NLVGetMessage(3)
-            Answer = VRMessage('Main',NLVGetMessage(64) , NLVGetMessage( 36,  options.!user||upw'@'options.!workgroup'\\'options.!server'\'options.!share, vfs.!mountpoint ), 'W','buttons.')
+            Answer = VRMessage('Main',NLVGetMessage(64) , NLVGetMessage( 36,options.!user||upw'@'options.!workgroup'\\'options.!server'\'options.!share, vfs.!mountpoint ), 'W','buttons.')
             if Answer = 2 then do
                 call VRSet VRWindow(), 'Pointer', '<default>'
+                say "Double connection - do not mount!!"
                 return
             end
@@ -2439 +2490 @@
     call _UserCredUpdate
     ok = VRset("Pict_Throbber", "Visible", 1)
+    ok = VRset("Menu_Selected_Connect", "Visible", 0)
     ok = VRset("TM_Throbber", "Enabled", 1)
     ShowHidden = advanced.!special
@@ -2921 +2973 @@
     ShowHidden = advanced.!special
     call _RefreshTreeDisplay
+    if VRget("Menu_View_SmbTree", "Checked") then do
+        if smbtree.!workgroup <> 'SMBTREE.!WORKGROUP' then do
+            ok = VRset("Menu_Selected_Connect", "Visible", VRMethod("CN_SmbTree", "ValidateRecord", smbtree.!workgroup ) )
+        end
+    end
 return
 

branches/guitools-2.0/shared/smbtree.vrs

@@ -12 +12 @@
     end
 
-    if ShowHidden = 'SHOWHIDDEN' | ShowHidden = '' then ShowHidden = 1
+    if ShowHidden = 'SHOWHIDDEN' | ShowHidden = '' then ShowHidden = 0
 
     say 'detach 'samba.!smbtreeexe' 'debuglevel' 'UserCred' >'samba.!msg
@@ -31 +31 @@
     stat = stream(samba.!msg,'c','open read')
     if stat <> "READY:" then return
+
+    if ShowHidden = 'SHOWHIDDEN' | ShowHidden = '' then ShowHidden = 0
 
     ok = VRset("TM_RefreshTreeDisplay","Enabled",0)